From 4c293545df32970d009425fa7e028e68378aa303 Mon Sep 17 00:00:00 2001 From: Aditya Khatri Date: Tue, 15 Oct 2024 17:26:35 +0545 Subject: [PATCH] Remove HID login from deployment configurations --- .env-sample | 4 ---- copilot/export-worker/manifest.yml | 3 --- copilot/web/manifest.yml | 3 --- copilot/worker/manifest.yml | 3 --- docker-compose-alpha.yml | 4 ---- docker-compose.yml | 4 ---- secrets-sample.yml | 10 ---------- 7 files changed, 31 deletions(-) diff --git a/.env-sample b/.env-sample index cff85f81..356f663b 100644 --- a/.env-sample +++ b/.env-sample @@ -21,10 +21,6 @@ DJANGO_SECRET_KEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX # ### From redis # CELERY_REDIS_URL= # DJANGO_CACHE_REDIS_URL= -# ### HID -# HID_CLIENT_ID= -# HID_CLIENT_REDIRECT_URL= -# HID_AUTH_URI= # DEEPL_SERVICE_DOMAIN= # DEEPL_SERVICE_CALLBACK_DOMAIN= # UNHCR_PORTAL_API_KEY= diff --git a/copilot/export-worker/manifest.yml b/copilot/export-worker/manifest.yml index 83df01f6..a2b7ff64 100644 --- a/copilot/export-worker/manifest.yml +++ b/copilot/export-worker/manifest.yml @@ -47,9 +47,6 @@ secrets: DEEP_BACKEND_HOST: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/DEEP_BACKEND_HOST HCAPTCHA_SECRET: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/HCAPTCHA_SECRET SENTRY_DSN: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/SENTRY_DSN - HID_CLIENT_ID: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/HID_CLIENT_ID - HID_CLIENT_REDIRECT_URL: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/HID_CLIENT_REDIRECT_URL - HID_AUTH_URI: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/HID_AUTH_URI DEEP_FRONTEND_HOST: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/DEEP_FRONTEND_HOST DEEP_FRONTEND_ARY_HOST: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/DEEP_FRONTEND_ARY_HOST EMAIL_FROM: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/EMAIL_FROM diff --git a/copilot/web/manifest.yml b/copilot/web/manifest.yml index a5674a81..0fe6bb3a 100644 --- a/copilot/web/manifest.yml +++ b/copilot/web/manifest.yml @@ -43,9 +43,6 @@ secrets: DEEP_BACKEND_HOST: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/DEEP_BACKEND_HOST HCAPTCHA_SECRET: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/HCAPTCHA_SECRET SENTRY_DSN: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/SENTRY_DSN - HID_CLIENT_ID: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/HID_CLIENT_ID - HID_CLIENT_REDIRECT_URL: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/HID_CLIENT_REDIRECT_URL - HID_AUTH_URI: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/HID_AUTH_URI DEEP_FRONTEND_HOST: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/DEEP_FRONTEND_HOST DEEP_FRONTEND_ARY_HOST: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/DEEP_FRONTEND_ARY_HOST EMAIL_FROM: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/EMAIL_FROM diff --git a/copilot/worker/manifest.yml b/copilot/worker/manifest.yml index 38c1e5b5..ed6b52a0 100644 --- a/copilot/worker/manifest.yml +++ b/copilot/worker/manifest.yml @@ -47,9 +47,6 @@ secrets: DEEP_BACKEND_HOST: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/DEEP_BACKEND_HOST HCAPTCHA_SECRET: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/HCAPTCHA_SECRET SENTRY_DSN: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/SENTRY_DSN - HID_CLIENT_ID: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/HID_CLIENT_ID - HID_CLIENT_REDIRECT_URL: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/HID_CLIENT_REDIRECT_URL - HID_AUTH_URI: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/HID_AUTH_URI DEEP_FRONTEND_HOST: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/DEEP_FRONTEND_HOST DEEP_FRONTEND_ARY_HOST: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/DEEP_FRONTEND_ARY_HOST EMAIL_FROM: /copilot/${COPILOT_APPLICATION_NAME}/${COPILOT_ENVIRONMENT_NAME}/secrets/EMAIL_FROM diff --git a/docker-compose-alpha.yml b/docker-compose-alpha.yml index 147cbe6e..202e893f 100644 --- a/docker-compose-alpha.yml +++ b/docker-compose-alpha.yml @@ -27,10 +27,6 @@ x-server: &base_server_setup # From redis CELERY_REDIS_URL: ${CELERY_REDIS_URL:-redis://redis:6379/0} DJANGO_CACHE_REDIS_URL: ${DJANGO_CACHE_REDIS_URL:-redis://redis:6379/2} - # HID - HID_CLIENT_ID: ${HID_CLIENT_ID:-deep-local} - HID_CLIENT_REDIRECT_URL: ${HID_CLIENT_REDIRECT_URL:-http://localhost:3000/login/} - HID_AUTH_URI: ${HID_AUTH_URI:-https://api2.dev.humanitarian.id} # DEEPL Service DEEPL_SERVICE_DOMAIN: ${DEEPL_SERVICE_DOMAIN:-http://extractor:8001} DEEPL_SERVICE_CALLBACK_DOMAIN: ${DEEPL_SERVICE_CALLBACK_DOMAIN:-http://web:8000} diff --git a/docker-compose.yml b/docker-compose.yml index 77f4b5e5..78e2eeb5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,10 +29,6 @@ x-server: &base_server_setup CELERY_REDIS_URL: ${CELERY_REDIS_URL:-redis://redis:6379/0} DJANGO_CACHE_REDIS_URL: ${DJANGO_CACHE_REDIS_URL:-redis://redis:6379/2} TEST_DJANGO_CACHE_REDIS_URL: ${TEST_DJANGO_CACHE_REDIS_URL:-redis://redis:6379/12} - # HID - HID_CLIENT_ID: ${HID_CLIENT_ID:-deep-local} - HID_CLIENT_REDIRECT_URL: ${HID_CLIENT_REDIRECT_URL:-http://localhost:3000/login/} - HID_AUTH_URI: ${HID_AUTH_URI:-https://api2.dev.humanitarian.id} # DEEPL Service DEEPL_SERVICE_DOMAIN: ${DEEPL_SERVICE_DOMAIN:-http://extractor:8001} DEEPL_SERVICE_CALLBACK_DOMAIN: ${DEEPL_SERVICE_CALLBACK_DOMAIN:-http://web:8000} diff --git a/secrets-sample.yml b/secrets-sample.yml index 4ae442ea..891d2784 100644 --- a/secrets-sample.yml +++ b/secrets-sample.yml @@ -19,16 +19,6 @@ AWS_S3_ACCESS_KEY_ID: prod: XXXXXXXXXXXXXXXXXXXXXXXXXXXx AWS_S3_SECRET_ACCESS_KEY: prod: XXXXXXXXXXXXXXXXXXXXXXXXXXXx -# HID CONFIGS -HID_CLIENT_ID: - prod: XXXXXXXXXXXXXXXXXXXXXXXXXXXx - staging: XXXXXXXXXXXXXXXXXXXXXXXXXXXx -HID_CLIENT_REDIRECT_URL: - prod: XXXXXXXXXXXXXXXXXXXXXXXXXXXx - staging: XXXXXXXXXXXXXXXXXXXXXXXXXXXx -HID_AUTH_URI: - prod: XXXXXXXXXXXXXXXXXXXXXXXXXXXx - staging: XXXXXXXXXXXXXXXXXXXXXXXXXXXx # Captcha Configs HCAPTCHA_SECRET: prod: XXXXXXXXXXXXXXXXXXXXXXXXXXXx