diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de94656cbfd38849be4a32827a97128521b2c314..cbbf2159643793f5d61baeab695fa0495af74603 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,8 @@ variables: TESTING_NAME: airflow-testing TESTING_URL: https://zam10115.zam.kfa-juelich.de TESTING_DOMAIN: zam10115.zam.kfa-juelich.de + METADATA_URL: https://zam10045.zam.kfa-juelich.de:7000/oauth2/.well-known/openid-configuration + TESTING_OAUTH_ID: ff3f5a29-d210-4be2-a6d4-93c4fc755bfe # before script copied from gitlab docs @@ -101,7 +103,7 @@ full-deploy-testing: - ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP "docker volume create --name=persistent_postgres-db-volume" - ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP "docker volume create --name=persistent_certs" - ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP 'sed -i "s_eflows-airflow:latest_eflows-airflow:testing_g" /home/airflow/data-logistics-service/dockers/docker-compose.yaml' - - ssh -oStrictHostKeyChecking=accept-new airflow@$PTESTING_IP "sudo /home/airflow/data-logistics-service/scripts/deployment.sh /home/airflow /home/airflow/data-logistics-service $TESTING_DOMAIN $AIRFLOW__SECRETS__BACKEND $AIRFLOW__SECRETS__BACKEND_KWARGS $AIRFLOW_FERNET_KEY $DAG_GIT_URL $SSO_CLIENT_SECRET" + - ssh -oStrictHostKeyChecking=accept-new airflow@$PTESTING_IP "sudo /home/airflow/data-logistics-service/scripts/deployment.sh /home/airflow /home/airflow/data-logistics-service $TESTING_DOMAIN $AIRFLOW__SECRETS__BACKEND $AIRFLOW__SECRETS__BACKEND_KWARGS $AIRFLOW_FERNET_KEY $DAG_GIT_URL $TESTING_OAUTH_ID $SSO_CLIENT_SECRET $METADATA_URL" - echo "Done" light-deploy-testing: @@ -114,7 +116,7 @@ light-deploy-testing: script: - ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP "cd /home/airflow/data-logistics-service && git stash && git stash clear && git checkout main && git checkout -f $CI_COMMIT_TAG && git pull --all" - ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP 'sed -i "s_eflows-airflow:latest_eflows-airflow:testing_g" /home/airflow/data-logistics-service/dockers/docker-compose.yaml' - - ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP "sudo /home/airflow/data-logistics-service/scripts/deployment.sh /home/airflow /home/airflow/data-logistics-service $TESTING_DOMAIN $AIRFLOW__SECRETS__BACKEND $AIRFLOW__SECRETS__BACKEND_KWARGS $AIRFLOW_FERNET_KEY $DAG_GIT_URL $SSO_CLIENT_SECRET" + - ssh -oStrictHostKeyChecking=accept-new airflow@$TESTING_IP "sudo /home/airflow/data-logistics-service/scripts/deployment.sh /home/airflow /home/airflow/data-logistics-service $TESTING_DOMAIN $AIRFLOW__SECRETS__BACKEND $AIRFLOW__SECRETS__BACKEND_KWARGS $AIRFLOW_FERNET_KEY $DAG_GIT_URL $TESTING_OAUTH_ID $SSO_CLIENT_SECRET $METADATA_URL" diff --git a/dockers/docker-compose.yaml b/dockers/docker-compose.yaml index c651b27f54a35a578fef211851060e7ce8c38ee4..ef38c2c9e2a189fdd7eaa79215131c3ac1d4ae64 100644 --- a/dockers/docker-compose.yaml +++ b/dockers/docker-compose.yaml @@ -58,6 +58,9 @@ x-airflow-common: AIRFLOW__API__AUTH_BACKEND: 'airflow.api.auth.backend.basic_auth' AIRFLOW__SECRETS__BACKEND_KWARGS: ${AIRFLOW__SECRETS__BACKEND_KWARGS} AIRFLOW__SECRETS__BACKEND: ${AIRFLOW__SECRETS__BACKEND} + OAUTH_CLIENT_ID: ${OAUTH_CLIENT_ID} + OAUTH_METADATA_URL: ${OAUTH_METADATA_URL} + OAUTH_CLIENT_SECRET: ${OAUTH_CLIENT_SECRET} # _PIP_ADDITIONAL_REQUIREMENTS: ${_PIP_ADDITIONAL_REQUIREMENTS:-} volumes: - ./dags:/opt/airflow/dags diff --git a/plugins/unity_integration.py b/plugins/unity_integration.py index 4dd8a0f019073057f1c7b0ae09e01f372da1f99b..a798bde98c90600f8265aabb76f77d3fb751f2e6 100644 --- a/plugins/unity_integration.py +++ b/plugins/unity_integration.py @@ -34,6 +34,7 @@ class UnityIntegrationView(AppBuilderBaseView): @unity.route('/login') def login(): redirect_uri = url_for('unity.authorize', _external=True) + log.debug("Redirect uri is " + str(redirect_uri)) return oauth.unity.authorize_redirect(redirect_uri) @unity.route('/authorize')