Updating all references of 'master' branch to 'main' (#16398)

* Updating all references of 'master' branch to 'main' * Updating GitHub Workflows references from 'master' to 'main' * Performing last-minute housekeeping tasks (#16485) --------- Co-authored-by: matts <[email protected]>
CDCgov · Nov 7, 2024 · e884294 · e884294
1 parent 7895c62
commit e884294
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 66 deletions.
diff --git a/.github/ISSUE_TEMPLATE/up-receiver-migration-set-up-receiver-settings.md b/.github/ISSUE_TEMPLATE/up-receiver-migration-set-up-receiver-settings.md
@@ -19,9 +19,9 @@ As a developer, I want to compare the messages generated from the Covid and Univ
 ### Dev Notes:
 
 - [ ] Fetch [STLT] organization settings from production and load them locally
-- [ ] Use the attached SimpleReport covid postman collection and make sure the message gets routed to [STLT] locally. Modify the message to meet [STLT] filter if needed [Simple Report Covid.postman_collection](https://github.com/CDCgov/prime-reportstream/blob/master/prime-router/docs/onboarding-users/samples/SimpleReport/Simple%20Report%20Covid.postman_collection.json)
-- [ ] Make a copy of the [STLT] organization settings to onboard them to the UP. See How to Migrate an existing receiver to the UP documentation for more details: https://github.com/CDCgov/prime-reportstream/blob/master/prime-router/docs/onboarding-users/migrating-receivers.md
-- [ ] Use this Postman collection to send a FHIR bundle the UP and make sure the message gets routed to the new UP [STLT] receiver. You may need to update the Simple Report sender to use the simple-report-sender-transform.yml if it's not using it. [Simple Report UP.postman_collection](https://github.com/CDCgov/prime-reportstream/blob/master/prime-router/docs/onboarding-users/samples/SimpleReport/Simple%20Report%20UP.postman_collection.json)
+- [ ] Use the attached SimpleReport covid postman collection and make sure the message gets routed to [STLT] locally. Modify the message to meet [STLT] filter if needed [Simple Report Covid.postman_collection](https://github.com/CDCgov/prime-reportstream/blob/main/prime-router/docs/onboarding-users/samples/SimpleReport/Simple%20Report%20Covid.postman_collection.json)
+- [ ] Make a copy of the [STLT] organization settings to onboard them to the UP. See How to Migrate an existing receiver to the UP documentation for more details: https://github.com/CDCgov/prime-reportstream/blob/main/prime-router/docs/onboarding-users/migrating-receivers.md
+- [ ] Use this Postman collection to send a FHIR bundle the UP and make sure the message gets routed to the new UP [STLT] receiver. You may need to update the Simple Report sender to use the simple-report-sender-transform.yml if it's not using it. [Simple Report UP.postman_collection](https://github.com/CDCgov/prime-reportstream/blob/main/prime-router/docs/onboarding-users/samples/SimpleReport/Simple%20Report%20UP.postman_collection.json)
 - To migrate the Covid translation settings start by looking at their current translation settings. If the receiver uses  any of the following settings you will need to create a receiver schema:
 	- receivingApplicationName
 	- receivingApplicationOID
@@ -45,7 +45,7 @@ As a developer, I want to compare the messages generated from the Covid and Univ
     - useOrderingFacilityName not STANDARD
     - receivingOrganization
     - stripInvalidCharsRegex
-    
+
 - More documentation on how to set-up these transforms in the UP will be provided, but for now you can look for examples on how to set this up in either the NY-receiver-transforms or CA-receiver-transforms
 
 - If the receiver uses any of those transforms you will need to create a receiver transform under `metadata/hl7_mapping/receivers/STLTs/` and update the receiver settings to point to this schema.
@@ -60,11 +60,10 @@ As a developer, I want to compare the messages generated from the Covid and Univ
 - If there are no major differences we can move on to sending test messages to the STLTs staging environment.
 
 
-### Acceptance Criteria 
+### Acceptance Criteria
 - [ ] Created and sent data to [STLT] through the covid pipeline locally
 - [ ] Created and sent data to [STLTS] through the universal pipeline locally
 - [ ] Migrated  Covid receiver translation settings to the UP receiver settings
 - [ ] Successfully generated a message with migrated UP receiver settings
 - [ ] Review transforms settings with the team
 - [ ] Compared messages from the covid and universal pipelines and documented differences and review with team
-
diff --git a/.github/vpn/config.ovpn → .github/actions/connect-ovpn/config.ovpn b/.github/vpn/config.ovpn → .github/actions/connect-ovpn/config.ovpn
diff --git a/.github/actions/connect-ovpn/example.ovpn b/.github/actions/connect-ovpn/example.ovpn
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,6 +1,6 @@
 This PR ...
 
-**If you are suggesting a fix for a currently exploitable issue, please disclose the issue to the prime-reportstream team directly outside of GitHub instead of filing a PR, so we may immediately patch the affected systems before a disclosure. See [SECURITY.md/Reporting a Vulnerability](https://github.com/CDCgov/prime-reportstream/blob/master/SECURITY.md#reporting-a-vulnerability) for more information.**
+**If you are suggesting a fix for a currently exploitable issue, please disclose the issue to the prime-reportstream team directly outside of GitHub instead of filing a PR, so we may immediately patch the affected systems before a disclosure. See [SECURITY.md/Reporting a Vulnerability](https://github.com/CDCgov/prime-reportstream/blob/main/SECURITY.md#reporting-a-vulnerability) for more information.**
 
 Test Steps:
 1. *Include steps to test these changes*
@@ -14,7 +14,7 @@ Test Steps:
 ### Testing
 - [ ] Tested locally?
 - [ ] Ran `./prime test` or `./gradlew testSmoke` against local Docker ReportStream container?
-- [ ] (For Changes to /frontend-react/...) Ran `npm run lint:write`? 
+- [ ] (For Changes to /frontend-react/...) Ran `npm run lint:write`?
 - [ ] Added tests?
 
 ### Process

diff --git a/.github/workflows/build_frontend.yaml b/.github/workflows/build_frontend.yaml
@@ -3,16 +3,16 @@ name: Build Frontend
 on:
   pull_request:
     branches:
-      - master
+      - main
       - production
   push:
     branches:
-      - master
+      - main
   merge_group:
     types:
       - checks_requested
     branches:
-      - master
+      - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

diff --git a/.github/workflows/build_hub.yml b/.github/workflows/build_hub.yml
@@ -3,15 +3,15 @@ name: Build Hub
 on:
   pull_request:
     branches:
-      - master
+      - main
   push:
     branches:
-      - master
+      - main
   merge_group:
     types:
       - checks_requested
     branches:
-      - master
+      - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -14,10 +14,10 @@ name: "CodeQL"
 on: 
   push:
     branches: 
-      - master
+      - main
   pull_request:
     branches: 
-      - master
+      - main
     paths:
       - "frontend-react/**"
       - "prime-router/src/scripts/**"

diff --git a/.github/workflows/dependency_review.yml b/.github/workflows/dependency_review.yml
@@ -8,7 +8,7 @@ name: 'Dependency Review'
 on: 
   pull_request:
     branches: 
-      - master
+      - main
     paths:
       - 'frontend-react/**'
       - 'prime-router/**'

diff --git a/.github/workflows/deploy_terraform.yml b/.github/workflows/deploy_terraform.yml
@@ -3,7 +3,7 @@ name: Deploy Terraform
 on:
   push:
     branches:
-      - master
+      - main
       - production
     paths:
       - '**.tf'

diff --git a/.github/workflows/publish_docker.yaml b/.github/workflows/publish_docker.yaml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - master
+      - main
   schedule:
     - cron:  "0 0 1 * *"
 

diff --git a/.github/workflows/release_chatops_app.yml b/.github/workflows/release_chatops_app.yml
@@ -8,7 +8,7 @@ on:
       - "operations/slack-boltjs-app"
   pull_request:
     branches:
-      - master
+      - main
     paths:
       - "operations/slack-boltjs-app"
 

diff --git a/.github/workflows/release_to_azure.yml b/.github/workflows/release_to_azure.yml
@@ -4,7 +4,7 @@ name: Release to Azure
 on:
   push:
     branches:
-      - master
+      - main
       - production
       - test
       - demo1

diff --git a/.github/workflows/release_to_github.yml b/.github/workflows/release_to_github.yml
@@ -3,7 +3,7 @@ name: Release to GitHub
 on:
   push:
     branches:
-      - master
+      - main
       - production
 
 concurrency: ${{ github.ref }}-gh-release

diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml
@@ -4,7 +4,7 @@ name: Snyk Java/Kotlin scan
 on:
   push:
     branches:
-      - master
+      - main
     paths:
       -  "prime-router/**"
       -  "submissions/**"

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -4,10 +4,10 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
     paths:
       - "prime-router/**"
       - "frontend-react/**"

diff --git a/.github/workflows/validate_resources.yml b/.github/workflows/validate_resources.yml
@@ -4,12 +4,12 @@ on:
   pull_request:
     branches:
       - production
-      - master
+      - main
       - test
   push:
     branches:
       - production
-      - master
+      - main
       - test
   schedule:
     - cron: "36 3 * * *"

diff --git a/.github/workflows/validate_terraform.yml b/.github/workflows/validate_terraform.yml
@@ -4,7 +4,7 @@ on:
    pull_request:
      branches:
        - production
-       - master
+       - main
        - test
      paths:
        - '**.tf'