Skip to content

Commit

Permalink
Merge branch 'master' into BFD-3126
Browse files Browse the repository at this point in the history
  • Loading branch information
aschey-forpeople authored Jan 22, 2025
2 parents 344b687 + ebb08b0 commit 973cccb
Show file tree
Hide file tree
Showing 63 changed files with 1,727 additions and 158 deletions.
15 changes: 11 additions & 4 deletions .github/workflows/build-docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
!.github
!.sensitive-files
!.terraform-docs.yml
!.python-version

# Ignore everything within top-level dist directory
/dist/**/*
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-data-fda/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-data-npi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-db-migrator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-model/bfd-model-codebook-data/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-model/bfd-model-codebook-library/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-model/bfd-model-codebook-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-model/bfd-model-dsl-codegen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-model/bfd-model-rda/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-model/bfd-model-rif-samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions apps/bfd-model/bfd-model-rif/mappings/PartDEvent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-model/bfd-model-rif/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
2 changes: 1 addition & 1 deletion apps/bfd-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-ops/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-pipeline/bfd-pipeline-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-pipeline/bfd-pipeline-ccw-rif/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-pipeline/bfd-pipeline-rda-bridge/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-pipeline/bfd-pipeline-rda-grpc-apps/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-pipeline/bfd-pipeline-rda-grpc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-pipeline/bfd-pipeline-shared-test-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-pipeline/bfd-pipeline-shared-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-pipeline/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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-pipeline-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-server/bfd-server-docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-server/bfd-server-image/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-server/bfd-server-launcher-sample/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-server/bfd-server-launcher/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-server/bfd-server-shared-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-server/bfd-server-war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-shared-test-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/bfd-shared-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions apps/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Loading

0 comments on commit 973cccb

Please sign in to comment.