From cd7cb27263cb172b174c52c22c819dc191b1792d Mon Sep 17 00:00:00 2001 From: Abigail McPhillips Date: Fri, 5 Jul 2024 11:12:24 +0100 Subject: [PATCH 1/4] Copy production env vars from keyvault into code --- .../application/config/production_app_env.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 terraform/application/config/production_app_env.yml diff --git a/terraform/application/config/production_app_env.yml b/terraform/application/config/production_app_env.yml new file mode 100644 index 0000000000..223fb0a6f0 --- /dev/null +++ b/terraform/application/config/production_app_env.yml @@ -0,0 +1,17 @@ +--- +DFE_SIGN_IN_API_CLIENT_ID: teacherpayments +DFE_SIGN_IN_API_ENDPOINT: https://api.signin.education.gov.uk +DFE_SIGN_IN_IDENTIFIER: teacherpayments +DFE_SIGN_IN_ISSUER: https://oidc.signin.education.gov.uk:443 + +DQT_API_URL: https://teacher-qualifications-api.education.gov.uk/v1 +DQT_BASE_URL: https://api-customerengagement.platform.education.gov.uk/dqt-crm/v1/ + +HMRC_API_BASE_URL: https://api.service.hmrc.gov.uk +HMRC_API_BANK_VALIDATION_ENABLED: true + +ORDNANCE_SURVEY_API_BASE_URL: https://api.os.uk + +TID_SIGN_IN_API_ENDPOINT: https://teaching-identity.education.gov.uk/ +TID_SIGN_IN_CLIENT_ID: claim +TID_SIGN_IN_ISSUER: https://teaching-identity.education.gov.uk/ From 778451e408e3ee2ec383d3ce1fea292656767ac8 Mon Sep 17 00:00:00 2001 From: Abigail McPhillips Date: Thu, 11 Jul 2024 12:42:00 +0100 Subject: [PATCH 2/4] Add +DFE_SIGN_IN_REDIRECT_BASE_URL and +TID_BASE_URL variables --- terraform/application/config/production_app_env.yml | 2 ++ terraform/application/config/review_app_env.yml | 1 + terraform/application/config/test_app_env.yml | 2 ++ 3 files changed, 5 insertions(+) diff --git a/terraform/application/config/production_app_env.yml b/terraform/application/config/production_app_env.yml index 223fb0a6f0..88e9dc26e9 100644 --- a/terraform/application/config/production_app_env.yml +++ b/terraform/application/config/production_app_env.yml @@ -3,6 +3,7 @@ DFE_SIGN_IN_API_CLIENT_ID: teacherpayments DFE_SIGN_IN_API_ENDPOINT: https://api.signin.education.gov.uk DFE_SIGN_IN_IDENTIFIER: teacherpayments DFE_SIGN_IN_ISSUER: https://oidc.signin.education.gov.uk:443 +DFE_SIGN_IN_REDIRECT_BASE_URL: claim-additional-teaching-payment.service.gov.uk DQT_API_URL: https://teacher-qualifications-api.education.gov.uk/v1 DQT_BASE_URL: https://api-customerengagement.platform.education.gov.uk/dqt-crm/v1/ @@ -12,6 +13,7 @@ HMRC_API_BANK_VALIDATION_ENABLED: true ORDNANCE_SURVEY_API_BASE_URL: https://api.os.uk +TID_BASE_URL: claim-additional-teaching-payment.service.gov.uk/additional-payments/claim TID_SIGN_IN_API_ENDPOINT: https://teaching-identity.education.gov.uk/ TID_SIGN_IN_CLIENT_ID: claim TID_SIGN_IN_ISSUER: https://teaching-identity.education.gov.uk/ diff --git a/terraform/application/config/review_app_env.yml b/terraform/application/config/review_app_env.yml index 1376e72ede..0c3804dd1c 100644 --- a/terraform/application/config/review_app_env.yml +++ b/terraform/application/config/review_app_env.yml @@ -19,3 +19,4 @@ SUPPRESS_DFE_ANALYTICS_INIT: true TID_SIGN_IN_API_ENDPOINT: https://preprod.teaching-identity.education.gov.uk:433 TID_SIGN_IN_CLIENT_ID: claim TID_SIGN_IN_ISSUER: https://preprod.teaching-identity.education.gov.uk/ +TID_BASE_URL: https://claim-additional-payments-for-teaching-review-*.test.teacherservices.cloud/additional-payments/claim diff --git a/terraform/application/config/test_app_env.yml b/terraform/application/config/test_app_env.yml index 395608fa0f..fec62c3d6d 100644 --- a/terraform/application/config/test_app_env.yml +++ b/terraform/application/config/test_app_env.yml @@ -3,6 +3,7 @@ DFE_SIGN_IN_API_CLIENT_ID: teacherpayments DFE_SIGN_IN_API_ENDPOINT: https://test-api.signin.education.gov.uk/ DFE_SIGN_IN_IDENTIFIER: teacherpayments DFE_SIGN_IN_ISSUER: https://test-oidc.signin.education.gov.uk:443 +DFE_SIGN_IN_REDIRECT_BASE_URL: test.claim-additional-teaching-payment.service.gov.uk DQT_API_URL: https://test.teacher-qualifications-api.education.gov.uk/v1 DQT_BASE_URL: https://test-api-customerengagement.platform.education.gov.uk/dqt-crm/v1/ @@ -14,6 +15,7 @@ ORDNANCE_SURVEY_API_BASE_URL: https://api.os.uk SUPPRESS_DFE_ANALYTICS_INIT: true +TID_BASE_URL: test.claim-additional-teaching-payment.service.gov.uk/additional-payments/claim TID_SIGN_IN_API_ENDPOINT: https://preprod.teaching-identity.education.gov.uk:433 TID_SIGN_IN_CLIENT_ID: claim TID_SIGN_IN_ISSUER: https://preprod.teaching-identity.education.gov.uk/ From bce4db3dbed3154277ac3c4e6f5c700125b5c9b6 Mon Sep 17 00:00:00 2001 From: Abigail McPhillips Date: Wed, 17 Jul 2024 10:20:40 +0100 Subject: [PATCH 3/4] Fix app env yml formatting --- terraform/application/config/production_app_env.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/terraform/application/config/production_app_env.yml b/terraform/application/config/production_app_env.yml index dd06733f0d..88e9dc26e9 100644 --- a/terraform/application/config/production_app_env.yml +++ b/terraform/application/config/production_app_env.yml @@ -1,3 +1,4 @@ +--- DFE_SIGN_IN_API_CLIENT_ID: teacherpayments DFE_SIGN_IN_API_ENDPOINT: https://api.signin.education.gov.uk DFE_SIGN_IN_IDENTIFIER: teacherpayments From 25c5a00f15f2613c573688170c1246abfd777f49 Mon Sep 17 00:00:00 2001 From: Abigail McPhillips Date: Wed, 17 Jul 2024 10:30:59 +0100 Subject: [PATCH 4/4] Update redirect URLs for https --- terraform/application/config/production_app_env.yml | 4 ++-- terraform/application/config/test_app_env.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/terraform/application/config/production_app_env.yml b/terraform/application/config/production_app_env.yml index 88e9dc26e9..31d9159022 100644 --- a/terraform/application/config/production_app_env.yml +++ b/terraform/application/config/production_app_env.yml @@ -3,7 +3,7 @@ DFE_SIGN_IN_API_CLIENT_ID: teacherpayments DFE_SIGN_IN_API_ENDPOINT: https://api.signin.education.gov.uk DFE_SIGN_IN_IDENTIFIER: teacherpayments DFE_SIGN_IN_ISSUER: https://oidc.signin.education.gov.uk:443 -DFE_SIGN_IN_REDIRECT_BASE_URL: claim-additional-teaching-payment.service.gov.uk +DFE_SIGN_IN_REDIRECT_BASE_URL: https://claim-additional-teaching-payment.service.gov.uk DQT_API_URL: https://teacher-qualifications-api.education.gov.uk/v1 DQT_BASE_URL: https://api-customerengagement.platform.education.gov.uk/dqt-crm/v1/ @@ -13,7 +13,7 @@ HMRC_API_BANK_VALIDATION_ENABLED: true ORDNANCE_SURVEY_API_BASE_URL: https://api.os.uk -TID_BASE_URL: claim-additional-teaching-payment.service.gov.uk/additional-payments/claim +TID_BASE_URL: https://claim-additional-teaching-payment.service.gov.uk/additional-payments/claim TID_SIGN_IN_API_ENDPOINT: https://teaching-identity.education.gov.uk/ TID_SIGN_IN_CLIENT_ID: claim TID_SIGN_IN_ISSUER: https://teaching-identity.education.gov.uk/ diff --git a/terraform/application/config/test_app_env.yml b/terraform/application/config/test_app_env.yml index fec62c3d6d..6d52c73112 100644 --- a/terraform/application/config/test_app_env.yml +++ b/terraform/application/config/test_app_env.yml @@ -3,7 +3,7 @@ DFE_SIGN_IN_API_CLIENT_ID: teacherpayments DFE_SIGN_IN_API_ENDPOINT: https://test-api.signin.education.gov.uk/ DFE_SIGN_IN_IDENTIFIER: teacherpayments DFE_SIGN_IN_ISSUER: https://test-oidc.signin.education.gov.uk:443 -DFE_SIGN_IN_REDIRECT_BASE_URL: test.claim-additional-teaching-payment.service.gov.uk +DFE_SIGN_IN_REDIRECT_BASE_URL: https://test.claim-additional-teaching-payment.service.gov.uk DQT_API_URL: https://test.teacher-qualifications-api.education.gov.uk/v1 DQT_BASE_URL: https://test-api-customerengagement.platform.education.gov.uk/dqt-crm/v1/ @@ -15,7 +15,7 @@ ORDNANCE_SURVEY_API_BASE_URL: https://api.os.uk SUPPRESS_DFE_ANALYTICS_INIT: true -TID_BASE_URL: test.claim-additional-teaching-payment.service.gov.uk/additional-payments/claim +TID_BASE_URL: https://test.claim-additional-teaching-payment.service.gov.uk/additional-payments/claim TID_SIGN_IN_API_ENDPOINT: https://preprod.teaching-identity.education.gov.uk:433 TID_SIGN_IN_CLIENT_ID: claim TID_SIGN_IN_ISSUER: https://preprod.teaching-identity.education.gov.uk/