From a392533816900c462caf793381923a179618abda Mon Sep 17 00:00:00 2001 From: Anthony Brown <121869075+anthony-nhs@users.noreply.github.com> Date: Wed, 24 Apr 2024 15:29:32 +0000 Subject: [PATCH 1/3] do not deploy apigee to prod --- .github/workflows/ci.yml | 3 ++ .github/workflows/pull_request.yml | 2 + .github/workflows/release.yml | 52 +++++++++++++++----------- .github/workflows/sam_release_code.yml | 4 ++ 4 files changed, 39 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75b0a0cf3..c36c141a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,6 +101,7 @@ jobs: LOG_RETENTION_DAYS: 30 CREATE_INT_RELEASE_NOTES: true CREATE_PROD_RELEASE_NOTES: true + DEPLOY_APIGEE: true secrets: CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }} DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }} @@ -122,6 +123,8 @@ jobs: VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}} COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}} LOG_RETENTION_DAYS: 30 + DEPLOY_APIGEE: true + secrets: CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }} diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index c2dae16a0..7d67517e3 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -72,6 +72,7 @@ jobs: VERSION_NUMBER: PR-${{ needs.get_issue_number.outputs.issue_number }} COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }} LOG_RETENTION_DAYS: 30 + DEPLOY_APIGEE: true secrets: CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }} @@ -89,5 +90,6 @@ jobs: VERSION_NUMBER: PR-${{ needs.get_issue_number.outputs.issue_number }} COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }} LOG_RETENTION_DAYS: 30 + DEPLOY_APIGEE: true secrets: CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f385d6be4..163cb8652 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -127,6 +127,7 @@ jobs: LOG_RETENTION_DAYS: 30 CREATE_INT_RELEASE_NOTES: true CREATE_PROD_RELEASE_NOTES: true + DEPLOY_APIGEE: true secrets: CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }} DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }} @@ -148,6 +149,7 @@ jobs: VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}} COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}} LOG_RETENTION_DAYS: 30 + DEPLOY_APIGEE: true secrets: CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }} @@ -166,6 +168,7 @@ jobs: COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}} LOG_LEVEL: DEBUG LOG_RETENTION_DAYS: 30 + DEPLOY_APIGEE: true secrets: CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.REF_CLOUD_FORMATION_DEPLOY_ROLE }} @@ -184,6 +187,7 @@ jobs: COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}} LOG_LEVEL: DEBUG LOG_RETENTION_DAYS: 30 + DEPLOY_APIGEE: true secrets: CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.QA_CLOUD_FORMATION_DEPLOY_ROLE }} @@ -204,6 +208,7 @@ jobs: LOG_RETENTION_DAYS: 30 CREATE_INT_RELEASE_NOTES: true CREATE_INT_RC_RELEASE_NOTES: true + DEPLOY_APIGEE: true secrets: CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.INT_CLOUD_FORMATION_DEPLOY_ROLE }} DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }} @@ -225,28 +230,31 @@ jobs: VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}} COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}} LOG_RETENTION_DAYS: 30 + DEPLOY_APIGEE: true secrets: CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }} -# release_prod: -# needs: [tag_release, release_int, release_int_sandbox, package_code, get_commit_id] -# uses: ./.github/workflows/sam_release_code.yml -# with: -# ARTIFACT_BUCKET_PREFIX: ${{needs.tag_release.outputs.version_tag}} -# STACK_NAME: psu -# TARGET_ENVIRONMENT: prod -# ENABLE_MUTUAL_TLS: true -# BUILD_ARTIFACT: packaged_code -# TRUSTSTORE_FILE: psu-truststore.pem -# VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}} -# COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}} -# LOG_LEVEL: INFO -# LOG_RETENTION_DAYS: 731 -# MARK_JIRA_RELEASED: true -# CREATE_PROD_RELEASE_NOTES: true -# secrets: -# CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_DEPLOY_ROLE }} -# DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }} -# INT_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.INT_CLOUD_FORMATION_CHECK_VERSION_ROLE }} -# PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE }} -# DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }} + release_prod: + needs: [tag_release, release_int, release_int_sandbox, package_code, get_commit_id] + uses: ./.github/workflows/sam_release_code.yml + with: + ARTIFACT_BUCKET_PREFIX: ${{needs.tag_release.outputs.version_tag}} + STACK_NAME: psu + TARGET_ENVIRONMENT: prod + ENABLE_MUTUAL_TLS: true + BUILD_ARTIFACT: packaged_code + SPEC_ARTIFACT: specification_code + TRUSTSTORE_FILE: psu-truststore.pem + VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}} + COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}} + LOG_LEVEL: INFO + LOG_RETENTION_DAYS: 731 + MARK_JIRA_RELEASED: true + CREATE_PROD_RELEASE_NOTES: true + DEPLOY_APIGEE: false + secrets: + CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_DEPLOY_ROLE }} + DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_CHECK_VERSION_ROLE }} + INT_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.INT_CLOUD_FORMATION_CHECK_VERSION_ROLE }} + PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE }} + DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }} diff --git a/.github/workflows/sam_release_code.yml b/.github/workflows/sam_release_code.yml index 2c8005f36..99aeae660 100644 --- a/.github/workflows/sam_release_code.yml +++ b/.github/workflows/sam_release_code.yml @@ -49,6 +49,9 @@ on: MARK_JIRA_RELEASED: type: boolean default: false + DEPLOY_APIGEE: + type: boolean + default: true secrets: CLOUD_FORMATION_DEPLOY_ROLE: required: true @@ -172,6 +175,7 @@ jobs: - name: Deploy API shell: bash working-directory: .github/scripts + if: ${{ inputs.DEPLOY_APIGEE == true && always() && !failure() && !cancelled() }} env: VERSION_NUMBER: ${{ inputs.VERSION_NUMBER }} PROXYGEN_PATH: ${{ env.PROXYGEN_PATH }} From 9222337d1e8e6f76d37ec8303af2eefca5e1f2a6 Mon Sep 17 00:00:00 2001 From: Anthony Brown <121869075+anthony-nhs@users.noreply.github.com> Date: Wed, 24 Apr 2024 15:36:44 +0000 Subject: [PATCH 2/3] test not deploying apigee --- .github/workflows/ci.yml | 2 +- .github/workflows/pull_request.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c36c141a3..db48bb65a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,7 +124,6 @@ jobs: COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}} LOG_RETENTION_DAYS: 30 DEPLOY_APIGEE: true - secrets: CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }} @@ -142,5 +141,6 @@ jobs: VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}} COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}} LOG_RETENTION_DAYS: 30 + DEPLOY_APIGEE: true secrets: CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.QA_CLOUD_FORMATION_DEPLOY_ROLE }} diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 7d67517e3..3e5041631 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -90,6 +90,6 @@ jobs: VERSION_NUMBER: PR-${{ needs.get_issue_number.outputs.issue_number }} COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }} LOG_RETENTION_DAYS: 30 - DEPLOY_APIGEE: true + DEPLOY_APIGEE: false secrets: CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }} From b11d01533c01e1366986fed7131df004efe555e9 Mon Sep 17 00:00:00 2001 From: Anthony Brown <121869075+anthony-nhs@users.noreply.github.com> Date: Wed, 24 Apr 2024 15:42:02 +0000 Subject: [PATCH 3/3] revert change for test --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 3e5041631..7d67517e3 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -90,6 +90,6 @@ jobs: VERSION_NUMBER: PR-${{ needs.get_issue_number.outputs.issue_number }} COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }} LOG_RETENTION_DAYS: 30 - DEPLOY_APIGEE: false + DEPLOY_APIGEE: true secrets: CLOUD_FORMATION_DEPLOY_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }}