Skip to content

Commit 70aff39

Browse files
committed
Add stricter constraints and pass secrets
1 parent 0971bb0 commit 70aff39

File tree

4 files changed

+50
-0
lines changed

4 files changed

+50
-0
lines changed

.github/workflows/continuous-deployment.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,23 @@ jobs:
1313
create_mns_subscription: true
1414
environment: dev
1515
sub_environment: internal-dev
16+
secrets:
17+
APIGEE_PASSWORD: ${{ secrets.APIGEE_PASSWORD }}
18+
APIGEE_BASIC_AUTH_TOKEN: ${{ secrets.APIGEE_BASIC_AUTH_TOKEN }}
19+
APIGEE_OTP_KEY: ${{ secrets.APIGEE_OTP_KEY }}
20+
STATUS_API_KEY: ${{ secrets.STATUS_API_KEY }}
1621

1722
deploy-internal-dev-sandbox:
1823
uses: ./.github/workflows/deploy-backend.yml
1924
with:
2025
apigee_environment: internal-dev-sandbox
2126
environment: dev
2227
sub_environment: internal-dev-sandbox
28+
secrets:
29+
APIGEE_PASSWORD: ${{ secrets.APIGEE_PASSWORD }}
30+
APIGEE_BASIC_AUTH_TOKEN: ${{ secrets.APIGEE_BASIC_AUTH_TOKEN }}
31+
APIGEE_OTP_KEY: ${{ secrets.APIGEE_OTP_KEY }}
32+
STATUS_API_KEY: ${{ secrets.STATUS_API_KEY }}
2333

2434
deploy-sandbox:
2535
needs: [deploy-internal-dev-sandbox]
@@ -28,6 +38,11 @@ jobs:
2838
apigee_environment: sandbox
2939
environment: dev
3040
sub_environment: sandbox
41+
secrets:
42+
APIGEE_PASSWORD: ${{ secrets.APIGEE_PASSWORD }}
43+
APIGEE_BASIC_AUTH_TOKEN: ${{ secrets.APIGEE_BASIC_AUTH_TOKEN }}
44+
APIGEE_OTP_KEY: ${{ secrets.APIGEE_OTP_KEY }}
45+
STATUS_API_KEY: ${{ secrets.STATUS_API_KEY }}
3146

3247
deploy-higher-dev-envs:
3348
needs: [deploy-internal-dev]
@@ -40,3 +55,8 @@ jobs:
4055
create_mns_subscription: true
4156
environment: dev
4257
sub_environment: ${{ matrix.sub_environment_name }}
58+
secrets:
59+
APIGEE_PASSWORD: ${{ secrets.APIGEE_PASSWORD }}
60+
APIGEE_BASIC_AUTH_TOKEN: ${{ secrets.APIGEE_BASIC_AUTH_TOKEN }}
61+
APIGEE_OTP_KEY: ${{ secrets.APIGEE_OTP_KEY }}
62+
STATUS_API_KEY: ${{ secrets.STATUS_API_KEY }}

.github/workflows/deploy-backend.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@ on:
1616
sub_environment:
1717
required: true
1818
type: string
19+
secrets:
20+
APIGEE_PASSWORD:
21+
required: true
22+
APIGEE_BASIC_AUTH_TOKEN:
23+
required: true
24+
APIGEE_OTP_KEY:
25+
required: true
26+
STATUS_API_KEY:
27+
required: true
1928
workflow_dispatch:
2029
inputs:
2130
apigee_environment:
@@ -148,8 +157,15 @@ jobs:
148157
make subscribe
149158
150159
run-e2e-tests:
160+
needs: [terraform-apply]
161+
if: ${{ needs.terraform-apply.result == 'success' || needs.terraform-apply.result == 'skipped' }}
151162
uses: ./.github/workflows/run-e2e-tests.yml
152163
with:
153164
apigee_environment: ${{ inputs.apigee_environment }}
154165
environment: ${{ inputs.environment }}
155166
sub_environment: ${{ inputs.sub_environment }}
167+
secrets:
168+
APIGEE_PASSWORD: ${{ secrets.APIGEE_PASSWORD }}
169+
APIGEE_BASIC_AUTH_TOKEN: ${{ secrets.APIGEE_BASIC_AUTH_TOKEN }}
170+
APIGEE_OTP_KEY: ${{ secrets.APIGEE_OTP_KEY }}
171+
STATUS_API_KEY: ${{ secrets.STATUS_API_KEY }}

.github/workflows/pr-deploy-and-test.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,8 @@ jobs:
1515
create_mns_subscription: true
1616
environment: dev
1717
sub_environment: pr-${{github.event.pull_request.number}}
18+
secrets:
19+
APIGEE_PASSWORD: ${{ secrets.APIGEE_PASSWORD }}
20+
APIGEE_BASIC_AUTH_TOKEN: ${{ secrets.APIGEE_BASIC_AUTH_TOKEN }}
21+
APIGEE_OTP_KEY: ${{ secrets.APIGEE_OTP_KEY }}
22+
STATUS_API_KEY: ${{ secrets.STATUS_API_KEY }}

.github/workflows/run-e2e-tests.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@ on:
1212
sub_environment:
1313
required: true
1414
type: string
15+
secrets:
16+
APIGEE_PASSWORD:
17+
required: true
18+
APIGEE_BASIC_AUTH_TOKEN:
19+
required: true
20+
APIGEE_OTP_KEY:
21+
required: true
22+
STATUS_API_KEY:
23+
required: true
1524
workflow_dispatch:
1625
inputs:
1726
apigee_environment:

0 commit comments

Comments
 (0)