Skip to content

Commit 1fb0013

Browse files
Fix tf-plan step order: checkout platform scripts before broker (#87)
## Summary The broker invocation step (`invoke-ci-broker.sh`) runs from `.platform/scripts/` but the platform checkout happened 3 steps later. This broke app CI when the app repo doesn't have committed TF files (the test app case after deleting old expanded TF). Moved GitHub App token generation + platform checkout before the OIDC + broker steps. ## Test plan - [ ] Retrigger platform-test-app CI after merge
1 parent de57afc commit 1fb0013

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

.github/workflows/tf-plan.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,6 @@ jobs:
5858
terraform_version: "1.7"
5959
terraform_wrapper: false
6060

61-
- name: Assume broker role via OIDC
62-
uses: aws-actions/configure-aws-credentials@v6
63-
with:
64-
role-to-assume: arn:aws:iam::${{ inputs.aws_account_id }}:role/javabin-ci-app-broker
65-
aws-region: ${{ inputs.aws_region }}
66-
role-session-name: ${{ env.SESSION_NAME }}
67-
68-
- name: Get team credentials from broker
69-
id: broker
70-
env:
71-
PROJECT: javabin
72-
run: sh .platform/scripts/invoke-ci-broker.sh plan
73-
7461
- name: Generate GitHub App token
7562
id: app-token
7663
uses: actions/create-github-app-token@v2
@@ -87,6 +74,19 @@ jobs:
8774
path: .platform
8875
sparse-checkout: scripts
8976

77+
- name: Assume broker role via OIDC
78+
uses: aws-actions/configure-aws-credentials@v6
79+
with:
80+
role-to-assume: arn:aws:iam::${{ inputs.aws_account_id }}:role/javabin-ci-app-broker
81+
aws-region: ${{ inputs.aws_region }}
82+
role-session-name: ${{ env.SESSION_NAME }}
83+
84+
- name: Get team credentials from broker
85+
id: broker
86+
env:
87+
PROJECT: javabin
88+
run: sh .platform/scripts/invoke-ci-broker.sh plan
89+
9090
- name: Ensure Terraform boilerplate
9191
env:
9292
AWS_ACCOUNT_ID: ${{ inputs.aws_account_id }}

0 commit comments

Comments
 (0)