From eb6b3a87f5d07690c39e71da7718bc4e04df1bc9 Mon Sep 17 00:00:00 2001 From: christopher Maboh Date: Sat, 25 May 2024 13:35:09 -0400 Subject: [PATCH] modify reference of master branch to main (#176) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 🎫 Ticket https://jira.cms.gov/browse/PLT-326 ## 🛠 Changes Reference to master branch was changed to main ## ℹ️ Context for reviewers Github repository master branch renamed to main. changes made to reference main in jenkins instead of master ## ✅ Acceptance Validation (How were the changes verified? Did you fully test the acceptance criteria in the ticket? Provide reproducible testing instructions and screenshots if applicable.) ## 🔒 Security Implications - [ ] This PR adds a new software dependency or dependencies. - [ ] This PR modifies or invalidates one or more of our security controls. - [ ] This PR stores or transmits data that was not stored or transmitted before. - [ ] This PR requires additional review of its security implications for other reasons. If any security implications apply, add Jason Ashbaugh (GitHub username: StewGoin) as a reviewer and do not merge this PR without his approval. --------- Co-authored-by: Maboh Christopher --- db/migrations/README.md | 4 ++-- ops/Jenkinsfile.build_trigger | 4 ++-- ssas/service/main/main.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/db/migrations/README.md b/db/migrations/README.md index e5ad0979..c4c84b3d 100644 --- a/db/migrations/README.md +++ b/db/migrations/README.md @@ -4,7 +4,7 @@ * All database changes will be modeled in discrete schema migrations * Code to roll back a migration will be included unless highly impracticable * Migrations will receive unique sequential integer identifiers. - * Engineers should keep aware of identifier collisions (and in some instances required migration order), and adjust their migration ID’s before merging with master, if necessary. + * Engineers should keep aware of identifier collisions (and in some instances required migration order), and adjust their migration ID’s before merging with main, if necessary. * Migrations will be written with production environments in mind * If data changes are required (default values instead of nulls, compound fields broken apart, etc.), the migration will include commands for these transformations. * If the migration would break running instances, reasonable effort will be made to write multiple migrations. In the first migration, a non-breaking transition schema will be used that can support both the old and new code versions. After all instances have been upgraded, the final version of the schema can be introduced in a second migration. @@ -19,4 +19,4 @@ * Using the file format `######_schema_name.[up|down].sql` create separate scripts for each schema change, and for reversing the schema change. * Add tests for both scripts in `migrations_test.go` * Test migration scripts - * Run `make migrations-test` \ No newline at end of file + * Run `make migrations-test` diff --git a/ops/Jenkinsfile.build_trigger b/ops/Jenkinsfile.build_trigger index d6dd59e6..cc4ca616 100644 --- a/ops/Jenkinsfile.build_trigger +++ b/ops/Jenkinsfile.build_trigger @@ -41,7 +41,7 @@ pipeline { ]] ]) script { - if (env.BRANCH_NAME == "master") { + if (env.BRANCH_NAME == "main") { DEPLOY='dev' } } @@ -51,7 +51,7 @@ pipeline { stage('Build and Package') { steps { build job: 'BCDA - Build and Package', - // Since this is being triggered by a code delivery to SSAS repo, it should always be built with BCDA master + // Since this is being triggered by a code delivery to SSAS repo, it should always be built with BCDA main parameters: [string(name: 'SSAS_GIT_VERSION', value: "${env.BRANCH_NAME}"), string(name: 'DEPLOY', value: "${DEPLOY}")], wait: true, propagate: true diff --git a/ssas/service/main/main.go b/ssas/service/main/main.go index 2bb65031..e4d9432c 100644 --- a/ssas/service/main/main.go +++ b/ssas/service/main/main.go @@ -5,13 +5,13 @@ For more details see our repository readme and Postman tests: - https://github.com/CMSgov/bcda-ssas-app - - https://github.com/CMSgov/bcda-ssas-app/tree/master/test/postman_test + - https://github.com/CMSgov/bcda-ssas-app/tree/main/test/postman_test If you have a Client ID and Secret you can use this page to explore the API. To do this, click the green "Authorize" button below and enter your Client ID and secret in the Basic Authentication username and password boxes. Until you click logout your token will be presented with every request made. To make requests click on the "Try it out" button for the desired endpoint. Version: 1.0.0 - License: Public Domain https://github.com/CMSgov/bcda-ssas-app/blob/master/LICENSE.md + License: Public Domain https://github.com/CMSgov/bcda-ssas-app/blob/main/LICENSE.md Contact: bcapi@cms.hhs.gov Produces: