Merge branch 'master' into alessio/BFD-3809__pipeline-9am-slo-lambda

CMSgov · Jan 22, 2025 · 3e807b1 · 3e807b1
2 parents fdbc160 + daf0e1e
commit 3e807b1
Show file tree

Hide file tree

Showing 38 changed files with 213 additions and 149 deletions.
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.175.0-SNAPSHOT</version>
+        <version>2.176.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.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <groupId>gov.cms.bfd.data.npi</groupId>

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.175.0-SNAPSHOT</version>
+        <version>2.176.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.175.0-SNAPSHOT</version>
+        <version>2.176.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.175.0-SNAPSHOT</version>
+        <version>2.176.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.175.0-SNAPSHOT</version>
+        <version>2.176.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.175.0-SNAPSHOT</version>
+        <version>2.176.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.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-model-dsl-codegen-plugin</artifactId>
-    <version>2.175.0-SNAPSHOT</version>
+    <version>2.176.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.175.0-SNAPSHOT</version>
+        <version>2.176.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.175.0-SNAPSHOT</version>
+        <version>2.176.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.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-model-rif-samples</artifactId>

diff --git a/apps/bfd-model/bfd-model-rif/mappings/PartDEvent.yaml b/apps/bfd-model/bfd-model-rif/mappings/PartDEvent.yaml
@@ -67,7 +67,7 @@ mappings:
       dbName: prscrbr_id
       name: prescriberId
       nullable: false
-      sqlType: varchar(15)
+      sqlType: varchar(35)
     - comment: RX Service Reference Number (https://www.ccwdata.org/cs/groups/public/documents/datadictionary/rx_srvc_rfrnc_num.txt)
       dbName: rx_srvc_rfrnc_num
       name: prescriptionReferenceNumber
@@ -77,7 +77,7 @@ mappings:
       dbName: prod_srvc_id
       name: nationalDrugCode
       nullable: false
-      sqlType: varchar(19)
+      sqlType: varchar(40)
     - comment: Plan Contract Record ID (https://www.ccwdata.org/cs/groups/public/documents/datadictionary/plan_cntrct_rec_id.txt)
       dbName: plan_cntrct_rec_id
       name: planContractId
@@ -219,7 +219,7 @@ mappings:
     - comment: Submission Clarification Code (https://www.ccwdata.org/cs/groups/public/documents/datadictionary/submsn_clr_cd.txt)
       dbName: submsn_clr_cd
       name: submissionClarificationCode
-      sqlType: varchar(2)
+      sqlType: varchar(3)
     - comment: LAST_UPDATED (https://bluebutton.cms.gov/resources/variables/lastUpdated)
       dbName: last_updated
       name: lastUpdated

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

diff --git a/...d-model-rif/src/main/resources/db/migration/V20250121143014662__update_pde_col_widths.sql b/...d-model-rif/src/main/resources/db/migration/V20250121143014662__update_pde_col_widths.sql
@@ -0,0 +1,8 @@
+ALTER TABLE ccw.partd_events
+ALTER COLUMN prscrbr_id type varchar(35);
+
+ALTER TABLE ccw.partd_events
+ALTER COLUMN prod_srvc_id type varchar(40);
+
+ALTER TABLE ccw.partd_events
+ALTER COLUMN submsn_clr_cd type varchar(3);
diff --git a/apps/bfd-model/pom.xml b/apps/bfd-model/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-model-parent</artifactId>

diff --git a/apps/bfd-ops/pom.xml b/apps/bfd-ops/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-ops</artifactId>

diff --git a/apps/bfd-pipeline/bfd-pipeline-app/pom.xml b/apps/bfd-pipeline/bfd-pipeline-app/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-pipeline-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-pipeline-app</artifactId>

diff --git a/apps/bfd-pipeline/bfd-pipeline-ccw-rif/pom.xml b/apps/bfd-pipeline/bfd-pipeline-ccw-rif/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-pipeline-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-pipeline-ccw-rif</artifactId>

diff --git a/apps/bfd-pipeline/bfd-pipeline-rda-bridge/pom.xml b/apps/bfd-pipeline/bfd-pipeline-rda-bridge/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-pipeline-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-pipeline-rda-bridge</artifactId>

diff --git a/apps/bfd-pipeline/bfd-pipeline-rda-grpc-apps/pom.xml b/apps/bfd-pipeline/bfd-pipeline-rda-grpc-apps/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-pipeline-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-pipeline-rda-grpc-apps</artifactId>

diff --git a/apps/bfd-pipeline/bfd-pipeline-rda-grpc/pom.xml b/apps/bfd-pipeline/bfd-pipeline-rda-grpc/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-pipeline-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-pipeline-rda-grpc</artifactId>

diff --git a/apps/bfd-pipeline/bfd-pipeline-shared-test-utils/pom.xml b/apps/bfd-pipeline/bfd-pipeline-shared-test-utils/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-pipeline-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-pipeline-shared-test-utils</artifactId>

diff --git a/apps/bfd-pipeline/bfd-pipeline-shared-utils/pom.xml b/apps/bfd-pipeline/bfd-pipeline-shared-utils/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-pipeline-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-pipeline-shared-utils</artifactId>

diff --git a/apps/bfd-pipeline/pom.xml b/apps/bfd-pipeline/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-pipeline-parent</artifactId>

diff --git a/apps/bfd-server/bfd-server-docs/pom.xml b/apps/bfd-server/bfd-server-docs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-server-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
     <artifactId>bfd-server-docs</artifactId>
     <dependencies>

diff --git a/apps/bfd-server/bfd-server-image/pom.xml b/apps/bfd-server/bfd-server-image/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-server-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-server-image</artifactId>

diff --git a/apps/bfd-server/bfd-server-launcher-sample/pom.xml b/apps/bfd-server/bfd-server-launcher-sample/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-server-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-server-launcher-sample</artifactId>

diff --git a/apps/bfd-server/bfd-server-launcher/pom.xml b/apps/bfd-server/bfd-server-launcher/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-server-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-server-launcher</artifactId>

diff --git a/apps/bfd-server/bfd-server-shared-utils/pom.xml b/apps/bfd-server/bfd-server-shared-utils/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-server-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-server-shared-utils</artifactId>

diff --git a/apps/bfd-server/bfd-server-war/pom.xml b/apps/bfd-server/bfd-server-war/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-server-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-server-war</artifactId>

diff --git a/apps/bfd-server/pom.xml b/apps/bfd-server/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-server-parent</artifactId>

diff --git a/apps/bfd-shared-test-utils/pom.xml b/apps/bfd-shared-test-utils/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-shared-test-utils</artifactId>

diff --git a/apps/bfd-shared-utils/pom.xml b/apps/bfd-shared-utils/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-parent</artifactId>
-        <version>2.175.0-SNAPSHOT</version>
+        <version>2.176.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-shared-utils</artifactId>

diff --git a/apps/pom.xml b/apps/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>gov.cms.bfd</groupId>
     <artifactId>bfd-parent</artifactId>
-    <version>2.175.0-SNAPSHOT</version>
+    <version>2.176.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>bfd-parent</name>
@@ -65,7 +65,7 @@
         <!-- The version of Java that we'll use for everything. -->
         <javaSourceVersion>21</javaSourceVersion>
 
-        <project.build.outputTimestamp>2025-01-16T21:29:31Z</project.build.outputTimestamp>
+        <project.build.outputTimestamp>2025-01-22T16:46:25Z</project.build.outputTimestamp>
         <!-- Disable jacoco until automated coverage generation is desired -->
         <maven.jacoco.skip>true</maven.jacoco.skip>
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>

diff --git a/apps/utils/locust_tests/README.md b/apps/utils/locust_tests/README.md
@@ -9,7 +9,7 @@ to avoid caching affecting the response times of repeat runs.
 
 These tests are intended to be run from a server instance which has access permissions to reach out to the BFD endpoints. How to
 do this is outside the scope of this document, but instructions for this can be found in this more detailed run guide on confluence:
-https://confluence.cms.gov/display/BB2/Run+the+BFD+Load+Tests. 
+https://confluence.cms.gov/display/BFD/2022+Run+the+BFD+Load+Tests. 
 
 The following test suites ([Locustfiles](https://docs.locust.io/en/stable/writing-a-locustfile.html)) are available to run:
 
@@ -22,7 +22,7 @@ The following test suites ([Locustfiles](https://docs.locust.io/en/stable/writin
 | Load Testing Suite | `high_volume_suite.py` | Used to exhibit distributed load on a target BFD Server to produce performance metrics under stress. Invoked by the `bfd-run-server-load` Jenkins pipeline job |
 ## Dependencies
 
-> **Important:** This project is targeting Python 3.8. Ensure that your local Python is version 3.8 **before** attempting to work in this project!
+> **Important:** This project is targeting Python 3.11. Ensure that your local Python is version 3.11 **before** attempting to work in this project!
 > A good utility for managing multiple Python versions along with [virtualenv](https://virtualenv.pypa.io/en/latest/)s is [`pew`](https://github.com/berdario/pew).
 
 The tests use a few python libraries that will need to be installed on the run box prior to starting the tests. 

diff --git a/apps/utils/locust_tests/dev-requirements.txt b/apps/utils/locust_tests/dev-requirements.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --allow-unsafe --constraint=requirements.txt --generate-hashes --output-file=dev-requirements.txt dev-requirements.in
+#    pip-compile --allow-unsafe --constraint=requirements.txt --generate-hashes --no-reuse-hashes --output-file=dev-requirements.txt --strip-extras dev-requirements.in
 #
 astroid==2.15.6 \
     --hash=sha256:389656ca57b6108f939cf5d2f9a2a825a3be50ba9d589670f393236e0a03b91c \

diff --git a/apps/utils/locust_tests/requirements.in b/apps/utils/locust_tests/requirements.in
@@ -6,9 +6,9 @@ setuptools>=70.0.0
 flask==2.3.3
 flask-cors==5.0.0
 requests==2.32.2
-gevent==23.9.1
+gevent==24.10.1
 urllib3==1.26.19
-werkzeug==3.0.3
-jinja2==3.1.4
+werkzeug==3.0.6
+jinja2==3.1.5
 idna>=3.7
 certifi==2024.7.4