Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/approve-override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ jobs:
runs-on: ubuntu-latest
environment: override-approval
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
sparse-checkout: scripts

- name: Configure AWS credentials via OIDC
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v5
with:
role-to-assume: arn:aws:iam::${{ env.AWS_ACCOUNT_ID }}:role/javabin-ci-override-approver
aws-region: ${{ env.AWS_REGION }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-jvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: actions/setup-java@v4
with:
Expand All @@ -29,7 +29,7 @@ jobs:

- name: Upload test results
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: test-results
path: "**/target/surefire-reports/*.xml"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-ts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: pnpm/action-setup@v4
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/commit-terraform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ jobs:
commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
ref: ${{ github.ref }}

- name: Check for app.yaml
id: check
run: echo "has_yaml=$(test -f app.yaml && echo true || echo false)" >> "$GITHUB_OUTPUT"

- uses: hashicorp/setup-terraform@v3
- uses: hashicorp/setup-terraform@v4
if: steps.check.outputs.has_yaml == 'true'
with:
terraform_version: "1.7"
Expand All @@ -52,7 +52,7 @@ jobs:

- name: Checkout platform scripts
if: steps.check.outputs.has_yaml == 'true'
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
repository: javaBin/platform
token: ${{ steps.app-token.outputs.token }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/detect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
has_cdk: ${{ steps.check.outputs.has_cdk }}
app_name: ${{ steps.check.outputs.app_name }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Detect repo contents
id: check
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ jobs:
image_uri: ${{ steps.push.outputs.image_uri }}
image_tag: ${{ steps.tags.outputs.primary_tag }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Configure AWS credentials via OIDC
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v5
with:
role-to-assume: arn:aws:iam::${{ inputs.aws_account_id }}:role/javabin-ci-deploy-${{ github.event.repository.name }}
aws-region: ${{ inputs.aws_region }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/eb-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Configure AWS credentials via OIDC
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v5
with:
role-to-assume: arn:aws:iam::${{ inputs.aws_account_id }}:role/javabin-ci-deploy-${{ github.event.repository.name }}
aws-region: ${{ inputs.aws_region }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ecs-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
owner: javaBin

- name: Checkout platform scripts
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
repository: javaBin/platform
token: ${{ steps.app-token.outputs.token }}
Expand All @@ -50,7 +50,7 @@ jobs:
path: .platform

- name: Configure AWS credentials via OIDC
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v5
with:
role-to-assume: arn:aws:iam::${{ inputs.aws_account_id }}:role/javabin-ci-deploy-${{ github.event.repository.name }}
aws-region: ${{ inputs.aws_region }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/expand-terraform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
expand:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
ref: ${{ github.ref }}

Expand All @@ -40,7 +40,7 @@ jobs:
owner: javaBin

- name: Checkout platform scripts
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
repository: javaBin/platform
token: ${{ steps.app-token.outputs.token }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/plan-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
private-key: ${{ secrets.PLATFORM_APP_PRIVATE_KEY }}
owner: javaBin

- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
repository: javaBin/platform
token: ${{ steps.app-token.outputs.token }}
Expand All @@ -50,7 +50,7 @@ jobs:
path: platform

- name: Configure AWS credentials via OIDC
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v5
with:
role-to-assume: arn:aws:iam::${{ inputs.aws_account_id }}:role/javabin-ci-app-${{ github.event.repository.name }}
aws-region: ${{ inputs.aws_region }}
Expand Down
28 changes: 15 additions & 13 deletions .github/workflows/platform-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ on:
- 'terraform/platform/**'
- 'terraform/lambda-src/**'
- 'scripts/**'
- '.github/workflows/**'
pull_request:
paths:
- 'terraform/platform/**'
- 'terraform/lambda-src/**'
- 'scripts/**'
- '.github/workflows/**'
schedule:
# Drift detection — Monday 06:00 UTC
- cron: '0 6 * * 1'
Expand Down Expand Up @@ -45,15 +47,15 @@ jobs:
plan_text_key: ${{ steps.upload.outputs.plan_text_key }}
plan_sha256: ${{ steps.upload.outputs.plan_sha256 }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: hashicorp/setup-terraform@v3
- uses: hashicorp/setup-terraform@v4
with:
terraform_version: "1.7"
terraform_wrapper: false

- name: Configure AWS credentials via OIDC
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v5
with:
role-to-assume: arn:aws:iam::${{ env.AWS_ACCOUNT_ID }}:role/javabin-ci-infra
aws-region: ${{ env.AWS_REGION }}
Expand Down Expand Up @@ -82,7 +84,7 @@ jobs:

- name: Upload Lambda ZIPs as artifact
if: steps.plan.outputs.has_changes == 'true'
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: lambda-zips
path: ${{ env.TF_ROOT }}/lambdas/builds/
Expand All @@ -106,9 +108,9 @@ jobs:
outputs:
risk_level: ${{ steps.review.outputs.risk_level }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: aws-actions/configure-aws-credentials@v4
- uses: aws-actions/configure-aws-credentials@v5
with:
role-to-assume: arn:aws:iam::${{ env.AWS_ACCOUNT_ID }}:role/javabin-ci-infra
aws-region: ${{ env.AWS_REGION }}
Expand Down Expand Up @@ -147,14 +149,14 @@ jobs:
needs.plan.outputs.has_changes == 'true'
environment: production
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: hashicorp/setup-terraform@v3
- uses: hashicorp/setup-terraform@v4
with:
terraform_version: "1.7"
terraform_wrapper: false

- uses: aws-actions/configure-aws-credentials@v4
- uses: aws-actions/configure-aws-credentials@v5
with:
role-to-assume: arn:aws:iam::${{ env.AWS_ACCOUNT_ID }}:role/javabin-ci-infra
aws-region: ${{ env.AWS_REGION }}
Expand All @@ -166,7 +168,7 @@ jobs:
run: sh scripts/check-risk-block.sh "$RISK" /javabin/slack/platform-override-alerts-webhook "https://github.com/${{ github.repository }}/actions/workflows/approve-override.yml"

- name: Download Lambda ZIPs from artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: lambda-zips
path: ${{ env.TF_ROOT }}/lambdas/builds/
Expand Down Expand Up @@ -195,14 +197,14 @@ jobs:
runs-on: ubuntu-latest
if: github.event_name == 'schedule'
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: hashicorp/setup-terraform@v3
- uses: hashicorp/setup-terraform@v4
with:
terraform_version: "1.7"
terraform_wrapper: false

- uses: aws-actions/configure-aws-credentials@v4
- uses: aws-actions/configure-aws-credentials@v5
with:
role-to-assume: arn:aws:iam::${{ env.AWS_ACCOUNT_ID }}:role/javabin-ci-infra
aws-region: ${{ env.AWS_REGION }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tf-apply.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ jobs:
env:
PLAN_BUCKET: javabin-ci-plan-artifacts-${{ inputs.aws_account_id }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: hashicorp/setup-terraform@v3
- uses: hashicorp/setup-terraform@v4
with:
terraform_version: "1.7"
terraform_wrapper: false
Expand All @@ -50,7 +50,7 @@ jobs:
owner: javaBin

- name: Checkout platform scripts
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
repository: javaBin/platform
token: ${{ steps.app-token.outputs.token }}
Expand All @@ -59,7 +59,7 @@ jobs:

# Step 1: Lightweight OIDC role — can only invoke gate Lambda + read S3
- name: Configure gate credentials via OIDC
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v5
with:
role-to-assume: arn:aws:iam::${{ inputs.aws_account_id }}:role/javabin-ci-apply-gate
aws-region: ${{ inputs.aws_region }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tf-plan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ jobs:
env:
PLAN_BUCKET: javabin-ci-plan-artifacts-${{ inputs.aws_account_id }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: hashicorp/setup-terraform@v3
- uses: hashicorp/setup-terraform@v4
with:
terraform_version: "1.7"
terraform_wrapper: false

- name: Configure AWS credentials via OIDC
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v5
with:
role-to-assume: arn:aws:iam::${{ inputs.aws_account_id }}:role/javabin-ci-app-${{ github.event.repository.name }}
aws-region: ${{ inputs.aws_region }}
Expand All @@ -63,7 +63,7 @@ jobs:
owner: javaBin

- name: Checkout platform scripts
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
repository: javaBin/platform
token: ${{ steps.app-token.outputs.token }}
Expand Down
Loading