Merge branch 'main' into dependabot/maven/software.amazon.lambda-powertools-logging-2.1.1

Author: anthony-nhs

.github/scripts/release_code.sh

@@ -14,4 +14,29 @@ LATEST_TRUSTSTORE_VERSION=$(aws s3api list-object-versions --bucket "${TRUSTSTOR
 export LATEST_TRUSTSTORE_VERSION
 
 cd ../../ || exit
-make sam-deploy-package
+
+REPO=eps-FHIR-validator-lambda
+CFN_DRIFT_DETECTION_GROUP="fhir-validator"
+if [[ "$STACK_NAME" =~ -pr-[0-9]+$ ]]; then
+  CFN_DRIFT_DETECTION_GROUP="fhir-validator-pull-request"
+fi
+
+
+sam deploy \
+    --template-file "$TEMPLATE_FILE" \
+    --stack-name "$STACK_NAME" \
+    --capabilities CAPABILITY_NAMED_IAM CAPABILITY_AUTO_EXPAND \
+    --region eu-west-2 \
+    --s3-bucket "$artifact_bucket" \
+    --s3-prefix "$ARTIFACT_BUCKET_PREFIX" \
+    --config-file samconfig_package_and_deploy.toml \
+    --no-fail-on-empty-changeset \
+    --role-arn "$cloud_formation_execution_role" \
+    --no-confirm-changeset \
+    --force-upload \
+    --tags "version=$VERSION_NUMBER stack=$STACK_NAME repo=$REPO cfnDriftDetectionGroup=$CFN_DRIFT_DETECTION_GROUP" \
+    --parameter-overrides \
+            EnableSplunk=true \
+            LogLevel="$LOG_LEVEL" \
+            LogRetentionDays="$LOG_RETENTION_DAYS" \
+            EnableAlerts="$ENABLE_ALERTS"

.github/workflows/sam_release_code.yml

@@ -100,13 +100,13 @@ jobs:
         shell: bash
         working-directory: .github/scripts
         env:
-          artifact_bucket_prefix: fhir_validator/${{ inputs.ARTIFACT_BUCKET_PREFIX }}
+          ARTIFACT_BUCKET_PREFIX: fhir_validator/${{ inputs.ARTIFACT_BUCKET_PREFIX }}
           COMMIT_ID: ${{ inputs.COMMIT_ID }}
           LOG_LEVEL: ${{ inputs.LOG_LEVEL }}
           LOG_RETENTION_DAYS: ${{ inputs.LOG_RETENTION_DAYS }}
-          stack_name: ${{ inputs.STACK_NAME }}
+          STACK_NAME: ${{ inputs.STACK_NAME }}
           TARGET_ENVIRONMENT: ${{ inputs.TARGET_ENVIRONMENT }}
-          template_file: template.yaml
+          TEMPLATE_FILE: template.yaml
           VERSION_NUMBER: ${{ inputs.VERSION_NUMBER }}
           ENABLE_ALERTS: ${{ inputs.ENABLE_ALERTS }}
         run: ./release_code.sh

pom.xml

@@ -20,7 +20,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <fhir.version>7.6.1</fhir.version>
         <log4j.version>2.24.3</log4j.version>
-        <fasterxml.version>2.19.1</fasterxml.version>
+        <fasterxml.version>2.19.2</fasterxml.version>
         <sonar.organization>nhsdigital</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <sonar.projectKey>NHSDigital_eps-FHIR-validator-lambda</sonar.projectKey>
@@ -31,7 +31,7 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.13.3</version>
+                <version>5.13.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-events</artifactId>
-            <version>3.16.0</version>
+            <version>3.16.1</version>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>