Merge pull request #1449 from CMSgov/release/v2024.2.0

Release/v2024.2.0

.github/workflows/checkov-tf.yml

@@ -23,5 +23,5 @@ jobs:
         uses: bridgecrewio/checkov-action@master
         with:
           directory: infrastructure
-          skip_check: CKV_AWS_316,CKV_AWS_18,CKV_AWS_23,CKV_AWS_115,CKV_AWS_116,CKV_AWS_117,CKV_AWS_40,CKV_AWS_50,CKV_AWS_144,CKV_AWS_145,CKV_AWS_131,CKV_AWS_103,CKV_AWS_51,CKV_AWS_136,CKV_AWS_158,CKV_AWS_173,CKV_AWS_32,CKV_AWS_337,CKV_AWS_272,CKV_AWS_61,CKV2_AWS_62
-          framework: terraform
+          skip_check: CKV_AWS_316,CKV_AWS_18,CKV_AWS_23,CKV_AWS_115,CKV_AWS_116,CKV_AWS_117,CKV_AWS_40,CKV_AWS_50,CKV_AWS_144,CKV_AWS_145,CKV_AWS_131,CKV_AWS_103,CKV_AWS_51,CKV_AWS_136,CKV_AWS_158,CKV_AWS_173,CKV_AWS_32,CKV_AWS_337,CKV_AWS_272,CKV_AWS_61,CKV2_AWS_62,CKV2_AWS_355,CKV2_AWS_365,CKV2_AWS_67,CKV_AWS_355,CKV_AWS_290
+          framework: terraform

acceptance-tests/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 	<artifactId>acceptance-tests</artifactId>
 	<groupId>gov.cms.qpp.conversion</groupId>
-	<version>2024.1.0-RELEASE</version>
+	<version>2024.2.0-RELEASE</version>
 	<name>conversion-tests</name>
 	<packaging>jar</packaging>
 	<properties>

buildspec.yml

@@ -2,12 +2,15 @@ version: 0.2
 env:
   shell: bash
   variables:
-    SLACK_CHANNEL: "p-qpp-sub-alerts"
+    #SLACK_CHANNEL: "p-qpp-sub-alerts"
+    SLACK_API_URL: "https://slack.com/api/chat.postMessage"
   parameter-store:
     AWS_ACCOUNT_ID: "/qppar-sf/account_id"
     DOCKERHUB_USERNAME: "/qppar-sf/DOCKERHUB_USERNAME"
     DOCKERHUB_PASS: "/qppar-sf/DOCKERHUB_PASS"
-    SLACK_WEBHOOK: "/qppar-sf/dev/conversion_tool/slack_hook_url"
+    #SLACK_WEBHOOK: "/qppar-sf/dev/conversion_tool/slack_hook_url"
+    SLACK_CHANNEL: "/qppar-sf/global/slack_channel"
+    SLACK_SECRET_TOKEN: "/qppar-sf/global/slack_token"
     PART_FILE: "/qppar-sf/conversion_tool/CPC_PLUS_FILE_NAME"
     PART_FILE_BUCKET: "/qppar-sf/$ENVIRONMENT/conversion_tool/CPC_PLUS_BUCKET_NAME"
     OUTPUT_PART_FILE: "/qppar-sf/$ENVIRONMENT/conversion_tool/CPC_PLUS_VALIDATION_FILE"
@@ -16,6 +19,7 @@ phases:
     runtime-versions:
       python: 3.8
   pre_build:
+    on-failure: ABORT
     commands:
       - echo ${CODEBUILD_SRC_DIR}
       - echo ${AWS_DEFAULT_REGION}
@@ -36,6 +40,7 @@ phases:
       - aws ecr get-login-password --region $AWS_DEFAULT_REGION | docker login --username AWS --password-stdin ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com
 
   build:
+    on-failure: ABORT
     commands:
       - REPOSITORY_URI="${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/qppsf/conversion-tool/${ENVIRONMENT}"
       - COMMIT_HASH=$(echo $CODEBUILD_RESOLVED_SOURCE_VERSION)
@@ -63,10 +68,17 @@ phases:
   post_build:
     commands:
       - |
-        if [[ $CODEBUILD_BUILD_SUCCEEDING -eq 1 ]]; then
-          SLACK_MSG="BUILD SUCCEEDED for Conversion Tool ${ENVIRONMENT} Environment, ${CODEBUILD_BUILD_ARN}"
-          curl -X POST -H 'Content-type: application/json' --data "{ \"attachments\": [{\"color\":\"good\",\"channel\":\"${SLACK_CHANNEL}\",\"username\":\"aws-codebuild\",\"text\":\"${SLACK_MSG}\",}]}" ${SLACK_WEBHOOK}
+        SLACK_MSG=""
+        SLACK_EMOJI=""
+        if [[ $CODEBUILD_BUILD_SUCCEEDING -eq 1 ]]
+        then
+          SLACK_EMOJI=":ok:"
+          SLACK_MSG="${SLACK_EMOJI} BUILD SUCCEEDED for Conversion Tool ${ENVIRONMENT} Environment, ${CODEBUILD_BUILD_ARN}"
         else
-          SLACK_MSG="BUILD FAILED for Conversion Tool ${ENVIRONMENT} Environment, ${CODEBUILD_BUILD_ARN}"
-          curl -X POST -H 'Content-type: application/json' --data "{ \"attachments\": [{\"color\":\"danger\",\"channel\":\"${SLACK_CHANNEL}\",\"username\":\"aws-codebuild\",\"text\":\"${SLACK_MSG}\",}]}" ${SLACK_WEBHOOK}
-        fi
+          SLACK_EMOJI=":warning:"
+          SLACK_MSG="${SLACK_EMOJI} BUILD FAILED for Conversion Tool ${ENVIRONMENT} Environment, ${CODEBUILD_BUILD_ARN}"
+        fi
+        SLACK_HDR1="'Authorization:Bearer ${SLACK_SECRET_TOKEN}'"
+        SLACK_HDR2="'Content-type: application/json'"
+        SLACK_PAYLOAD="'"$(echo "{ \"channel\":\"${SLACK_CHANNEL}\", \"blocks\": [ { \"type\":\"section\", \"text\": { \"type\":\"mrkdwn\", \"text\":\"${SLACK_MSG}\" } } ] }" | jq -rc '.')"'"
+        eval $(echo curl -X POST -H ${SLACK_HDR1} -H ${SLACK_HDR2} -d ${SLACK_PAYLOAD} ${SLACK_API_URL} )

commandline/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>gov.cms.qpp.conversion</groupId>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
-		<version>2024.1.0-RELEASE</version>
+		<version>2024.2.0-RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

commandline/src/test/java/gov/cms/qpp/conversion/ConversionFileWriterWrapperTest.java

@@ -35,7 +35,7 @@ public void deleteFiles() throws IOException {
 
 	@Test
 	public void testValidQpp() {
-		Path path = Paths.get("../qrda-files/valid-QRDA-III-latest.xml");
+		Path path = Paths.get("src/test/resources/valid-QRDA-III-latest.xml");
 		ConversionFileWriterWrapper converterWrapper = new ConversionFileWriterWrapper(path);
 
 		Context context = new Context();