DMP-2232 Updated resources with AAD_B2C_CLIENT_ID_KEY (#281)

Co-authored-by: hmcts-jenkins-cnp <60659747+hmcts-jenkins-cnp[bot]@users.noreply.github.com>
hmcts · Feb 26, 2024 · 957d61f · 957d61f
1 parent 4a0d855
commit 957d61f
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 4 deletions.
diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP
@@ -10,7 +10,8 @@ def branchesToSync = ['demo' ,'perftest']
 
 def secrets = [
   'darts-${env}': [
-    secret('app-insights-connection-string', 'app-insights-connection-string')
+    secret('app-insights-connection-string', 'app-insights-connection-string'),
+    secret('AzureAdB2CClientId', 'AAD_B2C_CLIENT_ID_KEY'),
   ],
 ]
 

diff --git a/Jenkinsfile_nightly b/Jenkinsfile_nightly
@@ -13,7 +13,8 @@ def component = "gateway"
 
 def secrets = [
   'darts-${env}': [
-    secret('app-insights-connection-string', 'app-insights-connection-string')
+    secret('app-insights-connection-string', 'app-insights-connection-string'),
+    secret('AzureAdB2CClientId', 'AAD_B2C_CLIENT_ID_KEY'),
   ],
 ]
 

diff --git a/Jenkinsfile_parameterized b/Jenkinsfile_parameterized
@@ -8,7 +8,8 @@ def component = "gateway"
 
 def secrets = [
   'darts-${env}': [
-    secret('app-insights-connection-string', 'app-insights-connection-string')
+    secret('app-insights-connection-string', 'app-insights-connection-string'),
+    secret('AzureAdB2CClientId', 'AAD_B2C_CLIENT_ID_KEY'),
   ],
 ]
 

diff --git a/README.md b/README.md
@@ -95,6 +95,7 @@ The required value of each variable is stored in Azure Key Vault as a Secret.
 | REDIS_CONNECTION_STRING             | redis-connection-string (local Redis uri by default)                                                           |
 | MAX_FILE_UPLOAD_SIZE_MEGABYTES      | MaxFileUploadSizeInMegabytes (350mb by default)                                                                |
 | AAD_B2C_ROPC_CLIENT_ID_KEY          | AzureAdB2CFuncTestROPCClientId                                                                                 |
+| AAD_B2C_CLIENT_ID_KEY               | AzureAdB2CClientId.                                                                                            |
 | DAR_NOTIFY_EVENT_SECUREMENT_PASSWORD | darts-gateway-DarNotifyEventSecurementPassword                                                                 |
 | DAR_NOTIFY_EVENT_SECUREMENT_USERNAME | darts-gateway-DarNotifyEventSecurementUsername                                                                 |
 | DAR_NOTIFY_DEFAULT_URL              | N/A (local darts notify url by default                                                                         |
@@ -150,6 +151,7 @@ export DAR_NOTIFY_EVENT_SECUREMENT_USERNAME=
 export DAR_NOTIFY_DEFAULT_URL=
 export DARTS_API_URL=
 export REDIS_SSL_ENABLED=
+export AAD_B2C_CLIENT_ID_KEY=
 
 ```
 

diff --git a/bin/secrets-stg.sh b/bin/secrets-stg.sh
@@ -8,6 +8,7 @@ export AAD_B2C_TENANT_ID_KEY="$(az keyvault secret show --vault-name darts-stg -
 export REDIS_CONNECTION_STRING="$(az keyvault secret show --vault-name darts-stg --name redis-connection-string  | jq .value -r)"
 export MAX_FILE_UPLOAD_SIZE_MEGABYTES="$(az keyvault secret show --vault-name darts-stg --name MaxFileUploadSizeInMegabytes | jq .value -r)"
 export AAD_B2C_ROPC_CLIENT_ID_KEY="$(az keyvault secret show --vault-name darts-stg --name AzureAdB2CFuncTestROPCClientId | jq .value -r)"
+export AAD_B2C_CLIENT_ID_KEY="$(az keyvault secret show --vault-name darts-stg --name AzureAdB2CClientId | jq .value -r)"
 export DAR_NOTIFY_EVENT_SECUREMENT_PASSWORD="$(az keyvault secret show --vault-name darts-stg --name darts-gateway-DarNotifyEventSecurementPassword | jq .value -r)"
 export DAR_NOTIFY_EVENT_SECUREMENT_USERNAME="$(az keyvault secret show --vault-name darts-stg --name darts-gateway-DarNotifyEventSecurementUsername   | jq .value -r)"
 export VIQ_EXTERNAL_USER_NAME="$(az keyvault secret show --vault-name darts-stg --name ViQExternalUserName | jq .value -r)"

diff --git a/charts/darts-gateway/Chart.yaml b/charts/darts-gateway/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "1.0"
 description: A Helm chart for darts-gateway App
 name: darts-gateway
 home: https://github.com/hmcts/darts-gateway
-version: 0.0.25
+version: 0.0.26
 maintainers:
   - name: HMCTS darts team
 dependencies:

diff --git a/charts/darts-gateway/values.dev.template.yaml b/charts/darts-gateway/values.dev.template.yaml
@@ -9,6 +9,8 @@ java:
           alias: app-insights-connection-string
         - name: AzureAdB2CFuncTestROPCClientId
           alias: AAD_B2C_ROPC_CLIENT_ID_KEY
+        - name: AzureAdB2CClientId
+          alias: AAD_B2C_CLIENT_ID_KEY
         - name: redis-connection-string
           alias: REDIS_CONNECTION_STRING
   environment:

diff --git a/charts/darts-gateway/values.yaml b/charts/darts-gateway/values.yaml
@@ -12,6 +12,8 @@ java:
           alias: DAR_NOTIFY_EVENT_SECUREMENT_PASSWORD
         - name: AzureAdB2CFuncTestROPCClientId
           alias: AAD_B2C_ROPC_CLIENT_ID_KEY
+        - name: AzureAdB2CClientId
+          alias: AAD_B2C_CLIENT_ID_KEY
         - name: AppInsightsInstrumentationKey
           alias: azure.application-insights.instrumentation-key
         - name: MaxFileUploadSizeInMegabytes

diff --git a/docker-compose-local.yml b/docker-compose-local.yml
@@ -56,6 +56,7 @@ services:
     environment:
       - DAR_NOTIFY_DEFAULT_URL=http://darts-stub-services:4551/VIQDARNotifyEvent/DARNotifyEvent.asmx
       - AAD_B2C_ROPC_CLIENT_ID_KEY
+      - AAD_B2C_CLIENT_ID_KEY
       - DARTS_API_URL=http://darts-api:4550
       - AAD_TENANT_ID
       - REDIS_CONNECTION_STRING

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,6 +5,7 @@ services:
     container_name: darts-gateway
     environment:
       - AAD_B2C_ROPC_CLIENT_ID_KEY
+      - AAD_B2C_CLIENT_ID_KEY
       - DAR_NOTIFY_DEFAULT_URL
       - DARTS_API_URL
       - AAD_TENANT_ID