From 6ed0e3a31339e10b3e2ac2bf214775ced55292cb Mon Sep 17 00:00:00 2001 From: Jim Wild Date: Wed, 30 Apr 2025 16:01:26 +0000 Subject: [PATCH 1/2] Meaningless commit --- SAMtemplates/parameters/main.yaml | 79 +++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 SAMtemplates/parameters/main.yaml diff --git a/SAMtemplates/parameters/main.yaml b/SAMtemplates/parameters/main.yaml new file mode 100644 index 0000000000..99b6dabfe5 --- /dev/null +++ b/SAMtemplates/parameters/main.yaml @@ -0,0 +1,79 @@ +AWSTemplateFormatVersion: '2010-09-09' +Description: >- + SSM Parameter Store entries. Values may differ between prod and non-prod environments + +Parameters: + StackName: + Type: String + + Environment: + Type: String + +Conditions: + IsProd: !Equals [ !Ref Environment, prod ] + +Resources: + EnabledSiteODSCodesParameter: + Type: AWS::SSM::Parameter + Properties: + Name: !Sub ${StackName}-PSUNotifyEnabledSiteODSCodes + Description: "List of site ODS codes for which notifications are enabled" + Type: String + Value: !If + - IsProd + - > # Prod notification enabled + FA565 + - > # Non-prod + FA565 + + EnabledSystemsParameter: + Type: AWS::SSM::Parameter + Properties: + Name: !Sub ${StackName}-PSUNotifyEnabledSystems + Description: "List of application names for which notifications are enabled" + Type: String + Value: !If + - IsProd + - > # Prod notification enabled + Apotec Ltd - Apotec CRM - Production, + CrxPatientApp, + nhsPrescriptionApp, + Titan PSU Prod + - > # Non-prodfdsaafdsa + Internal Test System, + Apotec Ltd - Apotec CRM - Production, + CrxPatientApp, + nhsPrescriptionApp, + Titan PSU Prod + + BlockedSiteODSCodesParameter: + Type: AWS::SSM::Parameter + Properties: + Name: !Sub ${StackName}-PSUNotifyBlockedSiteODSCodes + Description: "List of site ODS codes for which notifications are blocked" + Type: String + Value: !If + - IsProd + - > # Prod notification disabled + A83008 + - > # Non-prod + A83008 + +Outputs: + EnabledSiteODSCodesParameterName: + Description: "Name of the SSM parameter holding enabled site ODS codes" + Value: !Ref EnabledSiteODSCodesParameter + Export: + Name: !Sub ${StackName}-PSUNotifyEnabledSiteODSCodesParam + + EnabledSystemsParameterName: + Description: "Name of the SSM parameter holding enabled system names" + Value: !Ref EnabledSystemsParameter + Export: + Name: !Sub ${StackName}-PSUNotifyEnabledSystemsParam + + BlockedSiteODSCodesParameterName: + Description: "Name of the SSM parameter holding blocked site ODS codes" + Value: !Ref BlockedSiteODSCodesParameter + Export: + Name: !Sub ${StackName}-PSUNotifyBlockedSiteODSCodesParam From 8f7464e6fb04075d6ff0b38ad3e25dfd9f6d7e14 Mon Sep 17 00:00:00 2001 From: Jim Wild Date: Wed, 30 Apr 2025 16:28:17 +0000 Subject: [PATCH 2/2] Enable tls --- .github/workflows/pull_request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e6c138c09c..93931ca83e 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -65,7 +65,7 @@ jobs: ARTIFACT_BUCKET_PREFIX: PR-${{needs.get_issue_number.outputs.issue_number}} AWS_ENVIRONMENT: dev APIGEE_ENVIRONMENT: internal-dev - ENABLE_MUTUAL_TLS: false + ENABLE_MUTUAL_TLS: true BUILD_ARTIFACT: packaged_code TRUSTSTORE_FILE: psu-truststore.pem VERSION_NUMBER: PR-${{ needs.get_issue_number.outputs.issue_number }} @@ -91,7 +91,7 @@ jobs: ARTIFACT_BUCKET_PREFIX: PR-${{needs.get_issue_number.outputs.issue_number}}-sandbox AWS_ENVIRONMENT: dev APIGEE_ENVIRONMENT: internal-dev-sandbox - ENABLE_MUTUAL_TLS: false + ENABLE_MUTUAL_TLS: true BUILD_ARTIFACT: packaged_sandbox_code TRUSTSTORE_FILE: psu-sandbox-truststore.pem VERSION_NUMBER: PR-${{ needs.get_issue_number.outputs.issue_number }}