Skip to content

Commit ee3a596

Browse files
spopelka-dsacwbpriceacme-cms-challengedturner5234IsaacMilarky
authored
Fixing Additional Merge Conflicts for Big Whammy Release (#319)
* add missing file (#209) Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * Update load balancer listener config, update allowed hosts in django (#210) Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * update allowed hosts (#211) Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * remove strategy page redirect - because it is difficult to read and reason about - the strategy of asking terraform to hop from one load balancer listener to another on the fly is brittle and failed out on me during a prod deploy * clean up remaining redirect to strategy page config * terraform fmt * Wbprice/internal dns configuration (#213) * create internal dns configuration to be imported into infoblocks --------- Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * Remove sandbox terraform definitions and github actions workflows (#214) Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * specify storage autoscaling limits (#215) Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * [NDH-303] Implement Custom Sorting in FHIR API (#195) * add custom sorting to endpoint view set Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * add custom sorting for practitioner role view set Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * add location view set Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * fix errors Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * add tests for custom sorting functionality Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * conform to proper parameter name in ticket Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * add sort parameter to swagger docs Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> --------- Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * Use an alias to describe directory domain (#217) Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * [NDH-446] ensure login header, footer, and body are responsive on mobile (#216) * ensure header title does not wrap at desktop size (#218) * ensure header title does not wrap at desktop size * handle logo margin at <desktop >mobile sizes * [NDH-399] Introducing feature flags! (#193) * [NDH-399] Introducing feature flags! * move feature flags under frontend settings * finish FeatureFlag support in frontend, including examples of testing * finish frontend feature flag setup work * remove 'localhost:8000' from ALLOWED_HOSTS * fix typo in comment * add repeatable seed migrations for local development * restore existing migration from main * fix typo in django_migrations readme * fix test fixture creation for feature flag condition * added ross miller to the team in COMMUNITY.md (#222) * added ross miller to the team in COMMUNITY.md * Address review feedback for changes to COMMUNITY.md * updating contributors list (#224) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * updating contributors list (#225) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * Provision test resources (#219) * test, not impl * add test env * update test image tf_vars * bring in dns module * update default images for services --------- Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * [NDH-401]: Refactored tests.py into different suites (#223) * refactored tests.py into different suites * reverted our init re exports in filters * removed some comments * removed redundant helper * added requested changes * fix: address sorting change test breakage for LocationViewSetTestCase (#221) * Update internal domains (#226) * For internal domains, update 'directory' to read 'cnpd' now that a FISMA code has been assigned * Update docs --------- Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * bump storage space in dev etl rds (#228) Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * removed browsableAPI renderer (#230) * [NDH-359] Establish code quality baseline for Python and Typescript (#173) * [NDH-359] Add precommit-config including auto-formatting * ruff format everything in backend/ * add Python linting to backend-test CI workflow * add backend/Makefile commands for installing ruff and pre-commit and running lint + format * update documentation * re-enable dms (#229) Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * Update CODEOWNERS file (#231) * update CODEOWNERS file to describe notification and reviewer expectations * rename CODEOWNERS file, swap comment syntax * Introduce Playwright for end-to-end-testing (#227) * introducing playwright for end-to-end testing of the NPD application * make sure the backend knows when it is running as a test-server * allow frontend dev server to use VITE_API_BASE_URL as proxy target * make frontend a little more testable * ensure backend works when TESTING is not in env * npm install insists * add Playwright running notes * backend `make` commands necessary for playwright and useful for development * update playwright documentation * Update code.json metadata (#235) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * CI Runner Out of Space Errors (#232) - Increase default size of CI instance from 31G (default) to 250G - Update documentation to describe how to increase size of volumes backing the root volume where the CI runner works Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * [NDH-398] Organization details screen - initial work (#198) * [NDH-398] introduce @tanstack/react-query, start shaping the Organization lookup page * ensure Organization page renders in test with feature flags obeyed * fix inverse feature flag logic * npm install inside container keeps fiddling with package-lock.json * set VITE_API_BASE_URL in GitHub Action frontend test workflow * add basic Organization page sections, update styles * put update your details alert inside feature flag block * Fixing Failing Gitleaks Action (#238) * added false positive fingerprints to .gitleaksignore * missed two of them * [NDH-448] Modify Django Tests to Use setUpTestData Methods Instead of Sample Data SQL (#234) * add flyway option to exclude sample data Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * First draft of creating fixture and factory test data helpers for implementation with tests Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * move fixtures file anfter moving in test refactor changes Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * get some of the fixtures working and patch overwrite in compose-test Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * bug fixes Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * need to insert all required data Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * now have working tests Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * make sure to use lists when it makes sense Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * ruff formatting Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * fix unused variables Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * add proper sorting test back Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> --------- Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * self-referencing rules for etl and fhir api db security groups (#233) * self-referencing for etl and fhir api db security groups * update dms to target npd_staging * Change task to full-load and CDC * revert stop task setting * "MaxFullLoadSubTasks": 2 for testing * remove local.multi_az reference; remove try statements --------- Co-authored-by: tspecht-cms <trevor.specht@hhs.cms.gov> Co-authored-by: Dan Turner <daniel.turner1@cms.hhs.gov> * Automate export of FHIR API schema to Typescript (#239) * automate export of FHIR API schema to Typescript * drop old types file * update test fixtures with new API types * http -> https redirect (#245) - creates http -> https redirect for directory.cms.gov (prod) - updates production domain names for directory.cms.gov and api.directory.cms.gov in domains module Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * correct typo in lvextend instructions (#244) Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * [NDH-424] Unified project tooling (#237) * [NDH-424] add bin/npr script to the project * drop make commands from npr * consolidate to a single docker compose configuration file setup * move project-central make commands to a top-level Makefile * don't run playwright host commands with bin/npr * ensure playwright can correctly start test-server, finish Makefile .PHONY entries * drop backend/docker-compose.yml reference from bin/npr * use bin/npr in make tasks whenever possible, rename test-fast to test-backend, add test-frontend * update GHA test jobs to match new structure * make and bin/npr should use compose.test.yml to run db migrations for test-setup * update documentation, ensure all make and npr commands work * update note on frontend dependencies * do not include flyway local_dev in compose.test.yml * Organization component test should wait for feature flag components to render (#246) * NDH-520: set up prod-test env (#248) * NDH-520: set up prod-test env * add prod-test map to domains module * name change to stay under 32 chars * apply name change * apply name change in all the places * update readme with prod-test info * more dagster -> etl naming change --------- Co-authored-by: tspecht-cms <trevor.specht@hhs.cms.gov> Co-authored-by: Blaine Price <1wbprice@gmail.com> * [NDH-553] Basic React error pages (#249) * [NDH-552] move default user creation to django command, add auth helper for e2e testing * [NDH-553] add basic ErrorBoundary and NotFound pages * add not_found end-to-end test * [NDH-324] Improve Practitioner Test Assertions (#250) * add equal checks to filter tests Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * add check for nucc codes in test practitioner Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * add functionality to create fixture data with practitioners tied to location Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * get all address related tests working Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * formatting Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> --------- Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * [NDH-397] Initial Practitioner page (#240) - generic API support updates - end-to-end test * [NDH-476]: Organization Detail MVP (#242) * used translation files to display text * fixed definitions * added about section * added contact section * implemented identifiers section * removed bad file * refactored into new type framework * added some tests * removed some tests * adding requested changes * [NDH-559] provider_directory.tests.test_views should not rely on file system (#252) * Wbprice/self hosted runner containers (#251) * exploratory work on self-hosted github runners running in ecs, adapted from https://www.warpbuild.com/blog/self-hosting-github-actions\#method-2-using-ecs-elastic-container-service --------- Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * Update internal route53 configuration (#253) Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * we want an internal domain for the directory in prod-test (#255) Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * [NDH-477]: Practitioner Page MVP (#254) * contact layout section + translations implemented * created baseline about and contact * implemted identifiers section * refactored selectors into a Presenter class * added more translations * added more translations that i forgor * some tweaks to support working with real data (#206) * some tweaks to support working with real data * reverting settings changes * fix failing test and remove print statement * tweaks * tweaks * adding parent_org and associated test * fixing broken tests * linting fixes * fixing accidental package-lock stuff * Change trigger for backend tests (#259) Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * Backend test fix (#260) * Change trigger for backend tests Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * remove upstream reporting tool Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> --------- Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * adding migration, updating models.py and updating serializers (#262) * fixing dumb db var name bug (#263) * adding public, npd as the search path (#265) * adding public, npd as the search path * whops, wrong place * deleted the thing * Disable ecs service for gha (#266) Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * hardcode npd database name (#267) Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * [NDH-574] Add Playwright GitHub Action (#264) - add optional "make watch-frontend-test-assets" target for live playwright testing - debug Practitioner end-to-end test in CI - update playwright documentation * [NDH-471] Organization listing page with pagination (#269) * initial Organization listing page * add e2e organization tests * update organization e2e test * add end-to-end fixture creation command, seedsystem * make e2e organizations tests rely on data present in system * support pagination on the organization listing page * add faker dependency, sort requirements * update organization listing frontend + e2e tests, fix bugs in pagination * EC2 Instance user data for semi-ephemeral EC2 GitHub Actions Runners (#271) Preconfigure EC2 instance for GitHub Actions with a User Data script --------- Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * update weekly refresh token using date modulo'd by 7 rather than milleseconds, which Terraform doesn't support (#274) Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * Update trust policy to read from npd-ops rather than NPD (#275) Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * Use templatefile() in place of "template_file" (#276) * Update weekly refresh token (#277) Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * NDH-572: apply AWS support recs (#258) * Ndh 613 delete test env (#280) * NDH-613: delete test env * delete envs/test directory --------- Co-authored-by: tspecht-cms <trevor.specht@hhs.cms.gov> * deleted clinical org repeatable-migration (#286) * Wbprice/ndh 584 resolve flyway schema already exists error (#281) * update db-migrations FLYWAY_DEFAULT_SCHEMA value --------- Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * [NDH-639] Add optional SQL query tracing to the backend test suite (#282) * add optional SQL query tracing to the backend test suite * only prepare file logging handler if SQL_TRACING is set * [NDH-479] Basic organization search (#272) * [NDH-479][WIP] Simple organization search * combine search and pagination for /organizations/search * react 19 doesn't need .Provider, swap context nesting * [NDH-618] Developer Page Content Changes (#288) * implemented content changes * adding robust tests * remove infrastructure definitions (#292) Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * Update code.json metadata (#293) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * updated CODEOWNERS file to reflect current staff (#291) * add csrf config and csrf logging config (#298) Co-authored-by: Blaine Price <william.price@cms.hhs.gov> * Adjusting Aria Levels and Side Bar (#290) * adjusting aria levels and accompanying tests * fixed inconsistent nav bar * [NDH-324] Amendments to Fixtures and Test cases (#256) * check all entries in filter assertions Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * address remaining comments Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * create fixtures module Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * fix imports Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * add another code to test data Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * format code with ruff Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * remove unused variables Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * patch location fixture Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * fix address use bug in serializer Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * create seperate create_address method Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * create non nurse records Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * rename test Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * change serializer for otherIDs Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * verify length in test_list_filter_by_npi_specific Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * rewrite the address filter to check to see if search appears in address when transformed into a string Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * check all addresses in tests Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * fix organization fixture module Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * formatting Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * fix imports in seedsystem Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * revise for pr review Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * unused import Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * debug remove print Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * apply revision to general id filter Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * resolve conflict in markdown Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * fix typo causing test failure Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> --------- Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * [NDH-641] Add Snyk GitHub Workflow (#284) * Create snyk.yml * Update snyk.yml * upgrade deps Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> * added npm override to fix transitive dependency --------- Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> Co-authored-by: Sachin Panayil <sachinpanayil01@gmail.com> Co-authored-by: Sachin Panayil <79382140+sachin-panayil@users.noreply.github.com> * backfilling hotfixes into main (#302) * fixing failing snyk status (#306) * Fixes in README.md (#307) Fix misspelled word and link in the repo structure section. * replicating changes off of main (#311) * upgraded vulnerable package (#312) * updated sytnax to fix string bug] (#315) * adding workflow that allows for automated sync from release to main (#313) --------- Signed-off-by: Isaac Milarsky <imilarsky@gmail.com> Co-authored-by: Blaine Price <1wbprice@gmail.com> Co-authored-by: Blaine Price <william.price@cms.hhs.gov> Co-authored-by: dturner5234 <daniel.r.turner@pilot.cms.gov> Co-authored-by: Isaac Milarsky <imilarsky@gmail.com> Co-authored-by: Adam Bachman <adam.bachman@cms.hhs.gov> Co-authored-by: rmillergv <ross.miller@cms.hhs.gov> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Sachin Panayil <79382140+sachin-panayil@users.noreply.github.com> Co-authored-by: tspecht-cms <trevor.specht@cms.hhs.gov> Co-authored-by: tspecht-cms <trevor.specht@hhs.cms.gov> Co-authored-by: Dan Turner <daniel.turner1@cms.hhs.gov> Co-authored-by: Sachin Panayil <sachinpanayil01@gmail.com> Co-authored-by: sman-dsac <sunil.manchikanti1@cms.hhs.gov>
1 parent 722a3ef commit ee3a596

File tree

8 files changed

+46
-537
lines changed

8 files changed

+46
-537
lines changed

.github/workflows/hotfix-sync.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Hotfix Sync
2+
3+
on:
4+
pull_request:
5+
branches: [release]
6+
types: [opened, closed]
7+
8+
permissions:
9+
contents: write
10+
pull-requests: write
11+
12+
jobs:
13+
remind-label:
14+
if: github.event.action == 'opened'
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/github-script@v7
18+
with:
19+
script: |
20+
const labels = context.payload.pull_request.labels.map(l => l.name);
21+
22+
if (!labels.includes('hotfix')) {
23+
await github.rest.issues.createComment({
24+
owner: context.repo.owner,
25+
repo: context.repo.repo,
26+
issue_number: context.payload.pull_request.number,
27+
body: `👋 If this is a hotfix, please add the \`hotfix\` label to automatically cherry pick and sync your changes with main via PR!`
28+
});
29+
}
30+
31+
cherry-pick:
32+
if: >
33+
github.event.action == 'closed' &&
34+
github.event.pull_request.merged == true &&
35+
contains(github.event.pull_request.labels.*.name, 'hotfix')
36+
runs-on: ubuntu-latest
37+
steps:
38+
- uses: actions/checkout@v4
39+
with:
40+
fetch-depth: 0
41+
- uses: carloscastrojumo/github-cherry-pick-action@v1.0.1
42+
with:
43+
branch: main
44+
labels: synced-cherry-pick
45+
env:
46+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

code.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "npd",
33
"version": "",
44
"description": "A modern version of a health provider directory to serve as a single source of truth for the benefit of all",
5-
"description": "A modern version of a health provider directory to serve as a single source of truth for the benefit of all",
65
"longDescription": "The CMS National Provider Directory addresses fragmented healthcare provider data that costs the industry an estimated $2.76 billion annually. Currently, provider information is duplicated and corrected across over 5,000 systems, leading to widespread inaccuracy. NPD creates a unified FHIR-compliant directory combining data from CMS sources (NPPES, PECOS) and industry partners into a single authoritative source. Built with Django REST Framework and React, the system provides APIs and a search interface for accessing provider practices, addresses, specialties, licenses, quality scores, insurance plan participation, and interoperability endpoints. By serving as the definitive provider directory, NPD reduces data collection burden on providers and payers while improving accuracy for over 100 million Medicare and Medicaid beneficiaries.",
76
"status": "Development",
87
"permissions": {
@@ -15,9 +14,6 @@
1514
"usageType": [
1615
"openSource"
1716
],
18-
"usageType": [
19-
"openSource"
20-
],
2117
"exemptionText": ""
2218
},
2319
"organization": "Centers for Medicare & Medicaid Services",

infrastructure/envs/prod-test/main.tf

Lines changed: 0 additions & 227 deletions
This file was deleted.

infrastructure/envs/prod-test/outputs.tf

Lines changed: 0 additions & 27 deletions
This file was deleted.

infrastructure/envs/prod-test/variables.tf

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)