Skip to content

Commit fcadcf8

Browse files
authored
Fix: [AEA-0000] - do not use an environment for cdk diff (#1581)
## Summary - Routine Change ### Details - do not use environment for cdk diff
1 parent dce61bd commit fcadcf8

4 files changed

Lines changed: 4 additions & 7 deletions

File tree

.github/workflows/cdk_release_code.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
required: true
2626
type: boolean
2727
DEPLOYMENT_ENVIRONMENT:
28-
required: true
28+
required: false
2929
type: string
3030
secrets:
3131
CLOUD_FORMATION_DEPLOY_ROLE:
@@ -37,7 +37,7 @@ jobs:
3737
deploy_cdk_code:
3838
runs-on: ubuntu-22.04
3939
name: "${{ inputs.DEPLOY_CDK_CODE && 'Deploy' || 'Diff' }} cdk app ${{ inputs.CDK_APP_NAME }}"
40-
environment: ${{ inputs.DEPLOYMENT_ENVIRONMENT }}
40+
environment: ${{ fromJSON(inputs.DEPLOYMENT_ENVIRONMENT != '' && format('"{0}"', inputs.DEPLOYMENT_ENVIRONMENT) || 'null') }}
4141
permissions:
4242
id-token: write
4343
contents: write

.github/workflows/release_all_stacks.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ jobs:
132132
CDK_APP_NAME: MonitoringApp
133133
DEPLOY_CDK_CODE: false
134134
IS_PULL_REQUEST: ${{ inputs.is_pull_request }}
135-
DEPLOYMENT_ENVIRONMENT: dev-account # set to dev as we are just running a diff
136135
secrets:
137136
CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.cf_create_changeset_role }} # use create changeset role as we are just doing a diff
138137
CDK_PULL_IMAGE_ROLE: ${{ secrets.CDK_PULL_IMAGE_ROLE }}

environmentSettings/int.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
"NONE"
3737
],
3838
"PrepareChangesetClaimFilters": [
39-
"repo:NHSDigital/electronic-prescription-service-account-resources:ref:refs/heads/main",
40-
"repo:NHSDigital/electronic-prescription-service-account-resources:environment:dev-account"
39+
"repo:NHSDigital/electronic-prescription-service-account-resources:ref:refs/heads/main"
4140
],
4241
"ArtilleryLoadTestRoleClaimFilters": [
4342
"NONE"

environmentSettings/prod.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535
"NONE"
3636
],
3737
"PrepareChangesetClaimFilters": [
38-
"repo:NHSDigital/electronic-prescription-service-account-resources:ref:refs/heads/main",
39-
"repo:NHSDigital/electronic-prescription-service-account-resources:environment:dev-account"
38+
"repo:NHSDigital/electronic-prescription-service-account-resources:ref:refs/heads/main"
4039
],
4140
"ArtilleryLoadTestRoleClaimFilters": [
4241
"NONE"

0 commit comments

Comments
 (0)