Merge branch 'master' into BFD-3706

CMSgov · Jan 29, 2025 · 3332b55 · 3332b55
2 parents b701cb5 + 7aba525
commit 3332b55
Show file tree

Hide file tree

Showing 280 changed files with 13,439 additions and 6,516 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -2,11 +2,10 @@
 
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence.
-* @mjburling @dondevun @meliGuzman @aschey-forpeople @malessi 
+* @mjburling @dondevun @aschey-forpeople @malessi
 
 # BB2 Insights
 /insights/terraform/projects/bb2/* @jimmyfagan @loganbertram
 
 # Administration
-/.github/CODEOWNERS @mjburling @dondevun @meliGuzman
-
+/.github/CODEOWNERS @mjburling @dondevun
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -52,5 +52,5 @@ Please indicate if this PR does any of the following:
 
 ### Validation
 
-Have you fully verified and tested these changes? Is the acceptance criteria met? Please provide reproducible testing instructions, code snippets, or screenshots as applicable.
+**Have you fully verified and tested these changes? Is the acceptance criteria met? Please provide reproducible testing instructions, code snippets, or screenshots as applicable.**
 
diff --git a/.github/scripts/pre-commit.sh b/.github/scripts/pre-commit.sh
@@ -59,12 +59,17 @@ runShellCheckForCommitFiles() {
     for file in $commits; do
       filename=$(basename -- "$file")
       extension="${filename##*.}"
-      if [ "$extension" == "zip" ]; then
-        continue
-      fi
+
+      # Skip binary formats
+      case "$extension" in
+        "zip" | "p12" | "pfx" | "cer" | "pem")
+          continue ;;
+        *) ;;
+      esac
+
       firstTwo=$( sed 's/^\(..\).*/\1/;q' "$file" )
       # check for a hashbang or a .sh extension to determine if this is a shell script.
-      if [ "$firstTwo" == "#!" ] || [ "$extension" == "sh" ]; then
+      if [ "$firstTwo" == "#!" ] && [ "$filename" != "Jenkinsfile" ] || [ "$extension" == "sh" ]; then
         # run shellcheck with severity level warning, and suppress warnings about invalid hashbangs (allows it to ignore other types of scripts, e.g. python)
         if ! shellcheck -e SC1071,SC2239 -S warning "$file"; then
           echo "Please fix errors before continuing."

diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
@@ -38,8 +38,8 @@ on:
         default: us-east-1
         type: choice
         options:
-         - us-east-1
-         - us-west-2
+          - us-east-1
+          - us-west-2
         required: true
 
 permissions:
@@ -63,6 +63,13 @@ jobs:
               name: "bfd-mgmt-eft-sftp-outbound-transfer-lambda",
               dockerfile: "ops/jenkins/bfd-build-eft-sftp-outbound-transfer-lambda/Dockerfile",
               contextDir: "ops/terraform/services/eft/lambda_src/sftp_outbound_transfer",
+              platform: "linux/amd64",
+            },
+            {
+              name: "bfd-mgmt-pipeline-ccw-manifests-verifier-lambda",
+              dockerfile: "ops/terraform/services/pipeline/modules/bfd_pipeline_ccw_manifests_verifier/lambda_src/Dockerfile",
+              contextDir: "ops/terraform/services/pipeline/modules/bfd_pipeline_ccw_manifests_verifier/lambda_src",
+              platform: "linux/arm64",
             },
           ]
     runs-on: ubuntu-latest
@@ -128,9 +135,9 @@ jobs:
           tags: ${{ steps.setup_tags.outputs.image_tags }}
           # AWS Lambda does not support multi-platform images, something that is enabled by default
           # by this Action via the "provenance" flag. Until AWS Lambda supports this feature
-          # properly, we must explicitly disable provenance and specify the amd64 platform.
+          # properly, we must explicitly disable provenance and specify the platform directly.
           # See https://github.com/docker/buildx/issues/1533
           provenance: false
-          platforms: "linux/amd64"
+          platforms: ${{ matrix.image.platform }}
         env:
           DOCKER_BUILDKIT: 1
diff --git a/.github/workflows/ci-base-container-image.yml b/.github/workflows/ci-base-container-image.yml
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 !.github
 !.sensitive-files
 !.terraform-docs.yml
+!.python-version
 
 # Ignore everything within top-level dist directory
 /dist/**/*

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -305,6 +305,17 @@ try {
 					milestone(label: 'stage_deploy_test_start')
 
 					container('bfd-cbc-build') {
+						// Initial `server` terraservice deployment (scale-out)
+						awsAuth.assumeRole()
+						terraform.deployTerraservice(
+							env: bfdEnv,
+							directory: "ops/terraform/services/server",
+							tfVars: [
+								ami_id_override: amiIds.bfdServerAmiId
+							]
+						)
+
+						// Secondary `server` terraservice deployment (scale-in)
 						awsAuth.assumeRole()
 						terraform.deployTerraservice(
 							env: bfdEnv,
@@ -471,6 +482,17 @@ try {
 					lock(resource: 'env_prod_sbx') {
 						milestone(label: 'stage_deploy_prod_sbx_start')
 						container('bfd-cbc-build') {
+							// Initial `server` terraservice deployment (scale-out)
+							awsAuth.assumeRole()
+							terraform.deployTerraservice(
+								env: bfdEnv,
+								directory: "ops/terraform/services/server",
+								tfVars: [
+									ami_id_override: amiIds.bfdServerAmiId
+								]
+							)
+
+							// Secondary `server` terraservice deployment (scale-in)
 							awsAuth.assumeRole()
 							terraform.deployTerraservice(
 								env: bfdEnv,
@@ -635,6 +657,17 @@ try {
 						milestone(label: 'stage_deploy_prod_start')
 
 						container('bfd-cbc-build') {
+							// Initial `server` terraservice deployment (scale-out)
+							awsAuth.assumeRole()
+							terraform.deployTerraservice(
+								env: bfdEnv,
+								directory: "ops/terraform/services/server",
+								tfVars: [
+									ami_id_override: amiIds.bfdServerAmiId
+								]
+							)
+
+							// Secondary `server` terraservice deployment (scale-in)
 							awsAuth.assumeRole()
 							terraform.deployTerraservice(
 								env: bfdEnv,

diff --git a/apps/bfd-data-fda/pom.xml b/apps/bfd-data-fda/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-parent</artifactId>
-        <version>2.162.0-SNAPSHOT</version>
+        <version>2.177.0-SNAPSHOT</version>
     </parent>
 
     <groupId>gov.cms.bfd.data.fda.utility</groupId>

diff --git a/apps/bfd-data-npi/pom.xml b/apps/bfd-data-npi/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-parent</artifactId>
-        <version>2.162.0-SNAPSHOT</version>
+        <version>2.177.0-SNAPSHOT</version>
     </parent>
 
     <groupId>gov.cms.bfd.data.npi</groupId>

diff --git a/apps/bfd-data-npi/src/main/java/gov/cms/bfd/data/npi/utility/DataUtilityCommons.java b/apps/bfd-data-npi/src/main/java/gov/cms/bfd/data/npi/utility/DataUtilityCommons.java
@@ -351,7 +351,7 @@ private static void convertNpiDataFile(Path convertedNpiDataFile, Path originalN
         FileOutputStream fw =
             new FileOutputStream(convertedNpiDataFile.toFile().getAbsolutePath());
         DeflaterOutputStream dos = new DeflaterOutputStream(fw); ) {
-      CSVParser csvParser =
+        CSVParser csvParser =
           new CSVParser(
               reader,
               CSVFormat.DEFAULT.withFirstRecordAsHeader().withIgnoreHeaderCase().withTrim());

diff --git a/apps/bfd-data-npi/src/test/java/gov/cms/bfd/data/npi/lookup/NPIOrgLookupE2E.java b/apps/bfd-data-npi/src/test/java/gov/cms/bfd/data/npi/lookup/NPIOrgLookupE2E.java
@@ -20,6 +20,9 @@ public class NPIOrgLookupE2E {
   /** Global variable for npiOrgDisplay. */
   Optional<NPIData> npiOrgDisplay;
 
+  /** Global variable for NPI taxonomy. */
+  Optional<String> npiTaxonomyDisplay;
+
   /** Global variable for valid npiOrgNumber. */
   private final String npiOrgNumber = "1992903249";
 
@@ -73,6 +76,7 @@ void setup() throws IOException {
     InputStream npiDataStream = new ByteArrayInputStream(initialString.toString().getBytes());
     npiOrgDataLookup = new NPIOrgLookup(npiDataStream);
     npiOrgDisplay = Optional.empty();
+    npiTaxonomyDisplay = Optional.empty();
   }
 
   /** End to End test for Npi Org Data with npi number. */
@@ -90,6 +94,13 @@ public void shouldCorrectlyReturnTaxonomyForNPI() throws IOException {
     assertEquals(taxonomyDisplay, npiOrgDisplay.get().getTaxonomyDisplay());
   }
 
+  /** End to End test for NPI Taxononomy Dislplay. */
+  @Test
+  public void shouldCorrectlyReturnTaxonomyForNPI() throws IOException {
+    npiTaxonomyDisplay = npiOrgDataLookup.retrieveNPIOrgDisplay(Optional.of(practitionerNPI));
+    assertEquals(taxononomyCode + "\t" + taxonomyDisplay, npiTaxonomyDisplay.get());
+  }
+
   /** End to End test for Npi Org Data with wrong npi number. */
   @Test
   public void shouldReturnEmptyOrganizationWithAWrongNpiNumber() throws IOException {

diff --git a/apps/bfd-data-npi/src/test/java/gov/cms/bfd/data/npi/lookup/NPIOrgLookupTest.java b/apps/bfd-data-npi/src/test/java/gov/cms/bfd/data/npi/lookup/NPIOrgLookupTest.java
@@ -25,6 +25,9 @@ public class NPIOrgLookupTest {
   /** A fake npi number. */
   public static final String FAKE_NPI_NUMBER = "0000000000";
 
+  /** A fake Practitioner NPI. */
+  public static final String FAKE_PRACTITIONER_NPI = "1111111111";
+
   /** A fake org name display that is associated with the FAKE_NPI_ORG_NAME. */
   public static final String FAKE_NPI_ORG_NAME = "Fake ORG Name";
 

diff --git a/apps/bfd-db-migrator/pom.xml b/apps/bfd-db-migrator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-parent</artifactId>
-        <version>2.162.0-SNAPSHOT</version>
+        <version>2.177.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-db-migrator</artifactId>

diff --git a/apps/bfd-model/bfd-model-codebook-data/pom.xml b/apps/bfd-model/bfd-model-codebook-data/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-model-parent</artifactId>
-        <version>2.162.0-SNAPSHOT</version>
+        <version>2.177.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-model-codebook-data</artifactId>

diff --git a/apps/bfd-model/bfd-model-codebook-library/pom.xml b/apps/bfd-model/bfd-model-codebook-library/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-model-parent</artifactId>
-        <version>2.162.0-SNAPSHOT</version>
+        <version>2.177.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-model-codebook-library</artifactId>

diff --git a/apps/bfd-model/bfd-model-codebook-plugin/pom.xml b/apps/bfd-model/bfd-model-codebook-plugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-model-parent</artifactId>
-        <version>2.162.0-SNAPSHOT</version>
+        <version>2.177.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-model-codebook-plugin</artifactId>

diff --git a/apps/bfd-model/bfd-model-dsl-codegen/bfd-model-dsl-codegen-library/pom.xml b/apps/bfd-model/bfd-model-dsl-codegen/bfd-model-dsl-codegen-library/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-model-dsl-codegen-parent</artifactId>
-        <version>2.162.0-SNAPSHOT</version>
+        <version>2.177.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-model-dsl-codegen-library</artifactId>

diff --git a/apps/bfd-model/bfd-model-dsl-codegen/bfd-model-dsl-codegen-plugin/pom.xml b/apps/bfd-model/bfd-model-dsl-codegen/bfd-model-dsl-codegen-plugin/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-model-dsl-codegen-parent</artifactId>
-        <version>2.162.0-SNAPSHOT</version>
+        <version>2.177.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-model-dsl-codegen-plugin</artifactId>
-    <version>2.162.0-SNAPSHOT</version>
+    <version>2.177.0-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
 
     <description>

diff --git a/apps/bfd-model/bfd-model-dsl-codegen/pom.xml b/apps/bfd-model/bfd-model-dsl-codegen/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-model-parent</artifactId>
-        <version>2.162.0-SNAPSHOT</version>
+        <version>2.177.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-model-dsl-codegen-parent</artifactId>

diff --git a/apps/bfd-model/bfd-model-rda/pom.xml b/apps/bfd-model/bfd-model-rda/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-model-parent</artifactId>
-        <version>2.162.0-SNAPSHOT</version>
+        <version>2.177.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-model-rda</artifactId>

diff --git a/apps/bfd-model/bfd-model-rif-samples/pom.xml b/apps/bfd-model/bfd-model-rif-samples/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-model-parent</artifactId>
-        <version>2.162.0-SNAPSHOT</version>
+        <version>2.177.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-model-rif-samples</artifactId>

diff --git a/...l/bfd-model-rif-samples/src/main/resources/rif-static-samples/samhsa/sample-a-carrier.txt b/...l/bfd-model-rif-samples/src/main/resources/rif-static-samples/samhsa/sample-a-carrier.txt
@@ -599,4 +599,9 @@ INSERT|567834|9991831596|900|F|O|71|27-OCT-1999|27-OCT-1999|06-NOV-1999|1|1|6102
 INSERT|567834|9991831597|900|F|O|71|27-OCT-1999|27-OCT-1999|06-NOV-1999|1|1|61026|1|199.99|0|1234534|8765676|A|123.45|888.00|245.04|166.23|777.00|5|K25852|A02|0|A02|0|A05|9|B04|0|B05|0|||||||||||||||||0|74655592568216|1234567890|6|K25555||1923124|0000000000|0|204299999|IL|555558202|41|1|0|1.0|1|11|15|27-OCT-1999|27-OCT-1999|G1028|LT||T2D|37.5|0|37.5|0|E|0|9.57|75|47.84|A|0|0|1|3|A52|0|||42.0|R1|000000000|BB889999AA|0
 INSERT|567834|9991831598|900|F|O|71|27-OCT-1999|27-OCT-1999|06-NOV-1999|1|1|61026|1|199.99|0|1234534|8765676|A|123.45|888.00|245.04|166.23|777.00|5|K25852|A02|0|A02|0|A05|9|B04|0|B05|0|||||||||||||||||0|74655592568216|1234567890|6|K25555||1923124|0000000000|0|204299999|IL|555558202|41|1|0|1.0|1|11|15|27-OCT-1999|27-OCT-1999|G2215|LT||T2D|37.5|0|37.5|0|E|0|9.57|75|47.84|A|0|0|1|3|A52|0|||42.0|R1|000000000|BB889999AA|0
 INSERT|567834|9991831599|900|F|O|71|27-OCT-1999|27-OCT-1999|06-NOV-1999|1|1|61026|1|199.99|0|1234534|8765676|A|123.45|888.00|245.04|166.23|777.00|5|K25852|A02|0|A02|0|A05|9|B04|0|B05|0|||||||||||||||||0|74655592568216|1234567890|6|K25555||1923124|0000000000|0|204299999|IL|555558202|41|1|0|1.0|1|11|15|27-OCT-1999|27-OCT-1999|G2216|LT||T2D|37.5|0|37.5|0|E|0|9.57|75|47.84|A|0|0|1|3|A52|0|||42.0|R1|000000000|BB889999AA|0
-INSERT|567834|9991831600|900|F|O|71|27-OCT-1999|27-OCT-1999|06-NOV-1999|1|1|61026|1|199.99|0|1234534|8765676|A|123.45|888.00|245.04|166.23|777.00|5|K25852|A02|0|A02|0|A05|9|B04|0|B05|0|||||||||||||||||0|74655592568216|1234567890|6|K25555||1923124|0000000000|0|204299999|IL|555558202|41|1|0|1.0|1|11|15|27-OCT-1999|27-OCT-1999|G0137|LT||T2D|37.5|0|37.5|0|E|0|9.57|75|47.84|A|0|0|1|3|A52|0|||42.0|R1|000000000|BB889999AA|0
+INSERT|567834|9991831600|900|F|O|71|27-OCT-1999|27-OCT-1999|06-NOV-1999|1|1|61026|1|199.99|0|1234534|8765676|A|123.45|888.00|245.04|166.23|777.00|5|K25852|A02|0|A02|0|A05|9|B04|0|B05|0|||||||||||||||||0|74655592568216|1234567890|6|K25555||1923124|0000000000|0|204299999|IL|555558202|41|1|0|1.0|1|11|15|27-OCT-1999|27-OCT-1999|G0137|LT||T2D|37.5|0|37.5|0|E|0|9.57|75|47.84|A|0|0|1|3|A52|0|||42.0|R1|000000000|BB889999AA|0
+INSERT|567834|9991831601|900|F|O|71|27-OCT-1999|27-OCT-1999|06-NOV-1999|1|1|61026|1|199.99|0|1234534|8765676|A|123.45|888.00|245.04|166.23|777.00|5|K25852|A02|0|A02|0|A05|9|B04|0|B05|0|||||||||||||||||0|74655592568216|1234567890|6|K25555||1923124|0000000000|0|204299999|IL|555558202|41|1|0|1.0|1|11|15|27-OCT-1999|27-OCT-1999|G0532|LT||T2D|37.5|0|37.5|0|E|0|9.57|75|47.84|A|0|0|1|3|A52|0|||42.0|R1|000000000|BB889999AA|0
+INSERT|567834|9991831602|900|F|O|71|27-OCT-1999|27-OCT-1999|06-NOV-1999|1|1|61026|1|199.99|0|1234534|8765676|A|123.45|888.00|245.04|166.23|777.00|5|K25852|A02|0|A02|0|A05|9|B04|0|B05|0|||||||||||||||||0|74655592568216|1234567890|6|K25555||1923124|0000000000|0|204299999|IL|555558202|41|1|0|1.0|1|11|15|27-OCT-1999|27-OCT-1999|G0533|LT||T2D|37.5|0|37.5|0|E|0|9.57|75|47.84|A|0|0|1|3|A52|0|||42.0|R1|000000000|BB889999AA|0
+INSERT|567834|9991831603|900|F|O|71|27-OCT-1999|27-OCT-1999|06-NOV-1999|1|1|61026|1|199.99|0|1234534|8765676|A|123.45|888.00|245.04|166.23|777.00|5|K25852|A02|0|A02|0|A05|9|B04|0|B05|0|||||||||||||||||0|74655592568216|1234567890|6|K25555||1923124|0000000000|0|204299999|IL|555558202|41|1|0|1.0|1|11|15|27-OCT-1999|27-OCT-1999|G0534|LT||T2D|37.5|0|37.5|0|E|0|9.57|75|47.84|A|0|0|1|3|A52|0|||42.0|R1|000000000|BB889999AA|0
+INSERT|567834|9991831604|900|F|O|71|27-OCT-1999|27-OCT-1999|06-NOV-1999|1|1|61026|1|199.99|0|1234534|8765676|A|123.45|888.00|245.04|166.23|777.00|5|K25852|A02|0|A02|0|A05|9|B04|0|B05|0|||||||||||||||||0|74655592568216|1234567890|6|K25555||1923124|0000000000|0|204299999|IL|555558202|41|1|0|1.0|1|11|15|27-OCT-1999|27-OCT-1999|G0535|LT||T2D|37.5|0|37.5|0|E|0|9.57|75|47.84|A|0|0|1|3|A52|0|||42.0|R1|000000000|BB889999AA|0
+INSERT|567834|9991831605|900|F|O|71|27-OCT-1999|27-OCT-1999|06-NOV-1999|1|1|61026|1|199.99|0|1234534|8765676|A|123.45|888.00|245.04|166.23|777.00|5|K25852|A02|0|A02|0|A05|9|B04|0|B05|0|||||||||||||||||0|74655592568216|1234567890|6|K25555||1923124|0000000000|0|204299999|IL|555558202|41|1|0|1.0|1|11|15|27-OCT-1999|27-OCT-1999|G0536|LT||T2D|37.5|0|37.5|0|E|0|9.57|75|47.84|A|0|0|1|3|A52|0|||42.0|R1|000000000|BB889999AA|0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,5 +52,5 @@ Please indicate if this PR does any of the following:

		### Validation

		Have you fully verified and tested these changes? Is the acceptance criteria met? Please provide reproducible testing instructions, code snippets, or screenshots as applicable.
		Have you fully verified and tested these changes? Is the acceptance criteria met? Please provide reproducible testing instructions, code snippets, or screenshots as applicable.