Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: [AEA-0000] - do not deploy apigee to prod #154

Merged
merged 7 commits into from
Apr 26, 2024
Merged

Fix: [AEA-0000] - do not deploy apigee to prod #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a392533
do not deploy apigee to prod
anthony-nhs Apr 24, 2024
9222337
test not deploying apigee
anthony-nhs Apr 24, 2024
b11d015
revert change for test
anthony-nhs Apr 24, 2024
1b6cb84
Merge branch 'main' into do_not_deploy_apigee_to_prod
anthony-nhs Apr 25, 2024
d07361f
Merge branch 'main' into do_not_deploy_apigee_to_prod
anthony-nhs Apr 26, 2024
b3cbb93
Merge remote-tracking branch 'origin/main' into do_not_deploy_apigee_…
anthony-nhs Apr 26, 2024
61c7483
Merge branch 'main' into do_not_deploy_apigee_to_prod
anthony-nhs Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,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 }}
Expand All @@ -124,6 +125,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 }}

Expand All @@ -142,5 +144,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 }}
2 changes: 2 additions & 0 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,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 }}

Expand All @@ -91,5 +92,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 }}
54 changes: 31 additions & 23 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,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 }}
Expand All @@ -150,6 +151,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 }}

Expand All @@ -169,6 +171,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 }}

Expand All @@ -188,6 +191,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 }}

Expand All @@ -209,6 +213,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 }}
Expand All @@ -231,29 +236,32 @@ 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
# AWS_ENVIRONMENT: prod
# APIGEE_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
AWS_ENVIRONMENT: prod
APIGEE_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 }}
4 changes: 4 additions & 0 deletions .github/workflows/sam_release_code.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ on:
MARK_JIRA_RELEASED:
type: boolean
default: false
DEPLOY_APIGEE:
type: boolean
default: true
secrets:
CLOUD_FORMATION_DEPLOY_ROLE:
required: true
Expand Down Expand Up @@ -175,6 +178,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 }}
Expand Down