Resolve merge conflicts from master and revert fromNpiTypeCode function change in ProviderHistoryBase

Author: patrickgmayday

.github/workflows/build-release.yml

@@ -291,18 +291,6 @@ jobs:
         with:
           node-version: "22"
 
-      - name: Install Sushi
-        run: |
-          npm install -g fsh-sushi
-          sushi build
-          echo "Installed + run sushi"
-        working-directory: apps/bfd-model-idr/sushi
-
-      - name: Install fhirpath
-        run: |
-          npm install fhirpath
-        working-directory: apps/bfd-model-idr
-
       - name: Install uv
         uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
         with:
@@ -444,6 +432,7 @@ jobs:
         bfd-platform-server-regression,
         bfd-platform-mount-certstores,
         bfd-platform-server-fluent-bit,
+        bfd-platform-server-datadog-agent,
         bfd-platform-idr-pipeline,
         bfd-platform-migrator-ng,
         bfd-platform-run-locust,
@@ -455,7 +444,7 @@ jobs:
         bfd-platform-codebuild-runner,
         bfd-platform-idr-bfd-validator
       baseImagesVersion: ${{ needs.compute-version-strings.outputs.bfd_release }}
-      cleanupImageArtifacts: false # We'll cleanup at the end of build-release, so don't do anything
+      cleanupImageArtifacts: false
       tagLatest: ${{ !contains(needs.compute-version-strings.outputs.bfd_release, '-') }}
     secrets: inherit
 
@@ -487,14 +476,3 @@ jobs:
           tag: ${{ needs.compute-version-strings.outputs.bfd_release }}
           name: "v${{ needs.compute-version-strings.outputs.bfd_release }}"
           artifacts: "*.csv,*.json,*.xlsx,*.yaml"
-
-  cleanup-artifacts:
-    if: ${{ !cancelled() }}
-    needs: [build-other-images, create-gh-release]
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Delete all artifacts
-        uses: GeekyEggo/delete-artifact@176a747ab7e287e3ff4787bf8a148716375ca118 # v6
-        with:
-          name: '*'
-          failOnError: false

.github/workflows/build_container_images_matrix.json

@@ -91,5 +91,11 @@
       "idr-pipeline": "apps/bfd-pipeline-idr"
     },
     "platform": "linux/arm64"
+  },
+  {
+    "name": "bfd-platform-server-datadog-agent",
+    "dockerfile": "ops/images/bfd-platform-server-datadog-agent/Dockerfile",
+    "contextDir": "ops/images/bfd-platform-server-datadog-agent",
+    "platform": "linux/arm64"
   }
 ]

.github/workflows/ci-pipeline-synthetic.yml

@@ -29,16 +29,9 @@ jobs:
         with:
           java-version: "25"
           distribution: "corretto"
-      - name: Install dependencies
-        run: npm install -g fsh-sushi && npm install fhirpath
-        working-directory: apps/bfd-model-idr
       - name: Sync UV in bfd-model-idr
         run: uv sync
         working-directory: apps/bfd-model-idr
-      - name: Build sushi
-        run: |
-          cd ${{ github.workspace }}/apps/bfd-model-idr
-          sushi build ./sushi
       - name: Generate v3 Data Dictionary
         run: uv run gen_dd.py
         working-directory: apps/bfd-model-idr

.github/workflows/v3-release-deploy.yml

@@ -355,6 +355,7 @@ jobs:
       # See .github/workflows/build_container_images_matrix.json for list of buildable images
       imagesCsv: >-
         bfd-platform-server-fluent-bit,
+        bfd-platform-server-datadog-agent,
         bfd-platform-idr-pipeline,
         bfd-platform-migrator-ng,
         bfd-platform-consume-idr-events,
@@ -409,14 +410,3 @@ jobs:
           }
         }
     secrets: inherit
-
-  cleanup-artifacts:
-    if: ${{ !cancelled() }}
-    needs: [build-other-images]
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Delete all artifacts
-        uses: GeekyEggo/delete-artifact@176a747ab7e287e3ff4787bf8a148716375ca118 # v6.0.0
-        with:
-          name: "*"
-          failOnError: false

apps/bfd-db-migrator-ng/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-parent</artifactId>
-        <version>2.261.0-SNAPSHOT</version>
+        <version>2.263.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-db-migrator-ng</artifactId>

apps/bfd-db-migrator-synthetic/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-parent</artifactId>
-        <version>2.261.0-SNAPSHOT</version>
+        <version>2.263.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-db-migrator-synthetic</artifactId>

apps/bfd-db-migrator/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>gov.cms.bfd</groupId>
         <artifactId>bfd-parent</artifactId>
-        <version>2.261.0-SNAPSHOT</version>
+        <version>2.263.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>bfd-db-migrator</artifactId>

apps/bfd-model-idr/.gitignore

@@ -26,4 +26,5 @@ sushi/fsh-generated/*
 validator_cli.jar
 ReferenceTables/source-to-target-mappings
 data/*
-temp_packages/*
+temp_packages/*
+node_modules

apps/bfd-model-idr/README.md

@@ -27,9 +27,6 @@ npm --version
 brew install npm
 ```
 
-```sh
-npm install -g fsh-sushi fhirpath
-```
 
 ### Install packages  (via uv)
 
@@ -51,7 +48,7 @@ uv sync
 To compile the .fsh files from this folder
 
 ```sh
-cd sushi && sushi build && cd ..
+npm run sushi-build
 ```
 
 This will generate the StructureDefinition and CodeSystem resources necessary for synthetic data generation. Running compile_resources.py is not necessary to generate synthetic data.

apps/bfd-model-idr/claims_generator.py

@@ -35,8 +35,8 @@
     CLM_RLT_COND_SGNTR_MBR,
     CLM_VAL,
     CNTRCT_PBP_NUM,
-    PRVDR_HSTRY,
     PRAUC,
+    PRVDR_HSTRY,
     GeneratorUtil,
     RowAdapter,
     adapters_to_dicts,
@@ -788,7 +788,7 @@ def generate(
 
     if sushi:
         print("Running sushi build")
-        _, stderr = run_command(["sushi", "build"], cwd="./sushi")
+        _, stderr = run_command("npm run sushi-build", cwd=".")
         if stderr:
             print("SUSHI errors:")
             print(stderr)
@@ -828,12 +828,12 @@ def generate(
 
     other_util = OtherGeneratorUtil()
 
-    generated_provider_histories, generated_type_1_npis, generated_type_2_npis = other_util.gen_provider_history(amount=14, init_provider_historys=files[PRVDR_HSTRY])
-
-    out_tables[PRVDR_HSTRY].extend(
-        generated_provider_histories
+    generated_provider_histories, generated_type_1_npis, generated_type_2_npis = (
+        other_util.gen_provider_history(amount=14, init_provider_historys=files[PRVDR_HSTRY])
     )
 
+    out_tables[PRVDR_HSTRY].extend(generated_provider_histories)
+
     # This table is special in that its data is mostly static and read from a static file, so we
     # don't need to do anything fancy with it
     out_tables[CLM_ANSI_SGNTR] = other_util.gen_synthetic_clm_ansi_sgntr()
@@ -1051,7 +1051,7 @@ def generate(
                     else idx,
                     diagnoses=diagnoses,
                     init_clm_line=init_clm_line,
-                    type_1_npis= generated_type_1_npis
+                    type_1_npis=generated_type_1_npis,
                 )
                 adj_clms_tbls[CLM_LINE].append(clm_line)