Skip to content

fix(ci): conventional generated-TF commits and bot-safe session names #142

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

Merged
Alexanderamiri merged 2 commits into from
Oct 23, 2026
Merged

fix(ci): conventional generated-TF commits and bot-safe session names #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
107b69b
fix(ci): use a conventional commit message for generated Terraform
Alexanderamiri Oct 23, 2026
6af4f2c
fix(ci): sanitize STS role session names for bot actors
Alexanderamiri Oct 23, 2026
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: 2 additions & 1 deletion .github/workflows/docker-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ jobs:
image_tag: ${{ steps.tags.outputs.primary_tag }}
steps:
- name: Set session name
run: echo "SESSION_NAME=$(echo "${GITHUB_ACTOR}-${GITHUB_SHA:0:8}-${GITHUB_RUN_ID}" | head -c 64)" >> "$GITHUB_ENV"
# Bot actors (renovate[bot]) contain characters STS rejects in session names
run: echo "SESSION_NAME=$(echo "${GITHUB_ACTOR}-${GITHUB_SHA:0:8}-${GITHUB_RUN_ID}" | tr -c 'A-Za-z0-9+=,.@_\n-' '-' | head -c 64)" >> "$GITHUB_ENV"

- uses: actions/checkout@v6

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ecs-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set session name
run: echo "SESSION_NAME=$(echo "${GITHUB_ACTOR}-${GITHUB_SHA:0:8}-${GITHUB_RUN_ID}" | head -c 64)" >> "$GITHUB_ENV"
# Bot actors (renovate[bot]) contain characters STS rejects in session names
run: echo "SESSION_NAME=$(echo "${GITHUB_ACTOR}-${GITHUB_SHA:0:8}-${GITHUB_RUN_ID}" | tr -c 'A-Za-z0-9+=,.@_\n-' '-' | head -c 64)" >> "$GITHUB_ENV"

# javaBin/platform is public: the caller's own GITHUB_TOKEN can read it,
# so app repos need no GitHub App credentials for any pipeline step.
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/platform-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ jobs:
risk_level: ${{ steps.review.outputs.risk_level }}
steps:
- name: Set session name
run: echo "SESSION_NAME=$(echo "${GITHUB_ACTOR}-${GITHUB_SHA:0:8}-${GITHUB_RUN_ID}" | head -c 64)" >> "$GITHUB_ENV"
# Bot actors (renovate[bot]) contain characters STS rejects in session names
run: echo "SESSION_NAME=$(echo "${GITHUB_ACTOR}-${GITHUB_SHA:0:8}-${GITHUB_RUN_ID}" | tr -c 'A-Za-z0-9+=,.@_\n-' '-' | head -c 64)" >> "$GITHUB_ENV"

- uses: actions/checkout@v6
with:
Expand Down Expand Up @@ -195,7 +196,8 @@ jobs:
environment: production
steps:
- name: Set session name
run: echo "SESSION_NAME=$(echo "${GITHUB_ACTOR}-${GITHUB_SHA:0:8}-${GITHUB_RUN_ID}" | head -c 64)" >> "$GITHUB_ENV"
# Bot actors (renovate[bot]) contain characters STS rejects in session names
run: echo "SESSION_NAME=$(echo "${GITHUB_ACTOR}-${GITHUB_SHA:0:8}-${GITHUB_RUN_ID}" | tr -c 'A-Za-z0-9+=,.@_\n-' '-' | head -c 64)" >> "$GITHUB_ENV"

- uses: actions/checkout@v6

Expand Down Expand Up @@ -246,7 +248,8 @@ jobs:
if: github.event_name == 'schedule'
steps:
- name: Set session name
run: echo "SESSION_NAME=$(echo "${GITHUB_ACTOR}-${GITHUB_SHA:0:8}-${GITHUB_RUN_ID}" | head -c 64)" >> "$GITHUB_ENV"
# Bot actors (renovate[bot]) contain characters STS rejects in session names
run: echo "SESSION_NAME=$(echo "${GITHUB_ACTOR}-${GITHUB_SHA:0:8}-${GITHUB_RUN_ID}" | tr -c 'A-Za-z0-9+=,.@_\n-' '-' | head -c 64)" >> "$GITHUB_ENV"

- uses: actions/checkout@v6

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tf-plan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ jobs:
PLAN_BUCKET: javabin-ci-plan-artifacts-${{ inputs.aws_account_id }}
steps:
- name: Set session name
run: echo "SESSION_NAME=$(echo "${GITHUB_ACTOR}-${GITHUB_SHA:0:8}-${GITHUB_RUN_ID}" | head -c 64)" >> "$GITHUB_ENV"
# Bot actors (renovate[bot]) contain characters STS rejects in session names
run: echo "SESSION_NAME=$(echo "${GITHUB_ACTOR}-${GITHUB_SHA:0:8}-${GITHUB_RUN_ID}" | tr -c 'A-Za-z0-9+=,.@_\n-' '-' | head -c 64)" >> "$GITHUB_ENV"

# Branch head, not github.sha: expand may have just committed generated
# Terraform on top of the triggering commit.
Expand Down
2 changes: 1 addition & 1 deletion scripts/commit-generated-tf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ if [ "${FORK_PR:-false}" = "true" ]; then
exit 0
fi

git commit -m "[skip ci] Update generated Terraform from app.yaml"
git commit -m "chore(terraform): update generated Terraform from app.yaml [skip ci]"
git push origin "HEAD:${BRANCH}"
echo "Committed generated Terraform files."
Loading