Merge branch 'main' into Fix/DTOSS-10515-Handling-not-found-in-pds-func

Author: SamRobinson75684

infrastructure/tf-core/environments/development.tfvars

@@ -1090,16 +1090,16 @@ linux_web_app = {
       env_vars = {
         static = {
           AUTH_CIS2_ISSUER_URL = "https://am.nhsint.auth-ptl.cis2.spineservices.nhs.uk:443"
-          AUTH_CIS2_CLIENT_ID  = "8257927333.cohort-manager-ui-rg-cohman-dev-uks.b099494b-7c49-4d78-9e3c-3a801aac691b.apps"
+          AUTH_CIS2_CLIENT_ID  = "0043273051.cohort-dev-non-live.b099494b-7c49-4d78-9e3c-3a801aac691b.apps"
           AUTH_TRUST_HOST      = "true"
           NEXTAUTH_URL         = "https://cohort-dev.non-live.screening.nhs.uk/api/auth"
           SERVICE_NAME         = "Cohort Manager"
         }
         from_key_vault = {
-          # env_var_name          = "key_vault_secret_name"
-          AUTH_CIS2_CLIENT_SECRET = "auth-cis2-client-secret"
-          COHORT_MANAGER_RBAC_CODE    = "cohort-manager-users"
-          NEXTAUTH_SECRET         = "nextauth-secret"
+          # env_var_name           = "key_vault_secret_name"
+          AUTH_CIS2_CLIENT_SECRET  = "auth-cis2-client-secret"
+          COHORT_MANAGER_RBAC_CODE = "cohort-manager-users"
+          NEXTAUTH_SECRET          = "nextauth-secret"
         }
         local_urls = {
           # %s becomes the environment and region prefix (e.g. dev-uks)

infrastructure/tf-core/environments/integration.tfvars

@@ -1095,10 +1095,10 @@ linux_web_app = {
           SERVICE_NAME         = "Cohort Manager"
         }
         from_key_vault = {
-          # env_var_name          = "key_vault_secret_name"
-          AUTH_CIS2_CLIENT_SECRET = "auth-cis2-client-secret"
-          COHORT_MANAGER_RBAC_CODE    = "cohort-manager-users"
-          NEXTAUTH_SECRET         = "nextauth-secret"
+          # env_var_name           = "key_vault_secret_name"
+          AUTH_CIS2_CLIENT_SECRET  = "auth-cis2-client-secret"
+          COHORT_MANAGER_RBAC_CODE = "cohort-manager-users"
+          NEXTAUTH_SECRET          = "nextauth-secret"
         }
         local_urls = {
           # %s becomes the environment and region prefix (e.g. dev-uks)

infrastructure/tf-core/environments/nft.tfvars

@@ -1088,16 +1088,16 @@ linux_web_app = {
       env_vars = {
         static = {
           AUTH_CIS2_ISSUER_URL = "https://am.nhsint.auth-ptl.cis2.spineservices.nhs.uk:443"
-          AUTH_CIS2_CLIENT_ID  = "5789849932.cohort-manager-ui-dev.b099494b-7c49-4d78-9e3c-3a801aac691b.apps"
+          AUTH_CIS2_CLIENT_ID  = "1404648352.cohort-nft-non-live.b099494b-7c49-4d78-9e3c-3a801aac691b.apps"
           AUTH_TRUST_HOST      = "true"
           NEXTAUTH_URL         = "https://cohort-nft.non-live.screening.nhs.uk/api/auth"
           SERVICE_NAME         = "Cohort Manager"
         }
         from_key_vault = {
-          # env_var_name          = "key_vault_secret_name"
-          AUTH_CIS2_CLIENT_SECRET = "auth-cis2-client-secret"
-          COHORT_MANAGER_RBAC_CODE    = "cohort-manager-users"
-          NEXTAUTH_SECRET         = "nextauth-secret"
+          # env_var_name           = "key_vault_secret_name"
+          AUTH_CIS2_CLIENT_SECRET  = "auth-cis2-client-secret"
+          COHORT_MANAGER_RBAC_CODE = "cohort-manager-users"
+          NEXTAUTH_SECRET          = "nextauth-secret"
         }
         local_urls = {
           # %s becomes the environment and region prefix (e.g. dev-uks)