Skip to content

fix: Scope plan storage AWS credentials to prevent Atmos auth interference #93

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
Dan Miller (milldr) merged 1 commit into from
Dec 12, 2025
+17 −1
Merged

fix: Scope plan storage AWS credentials to prevent Atmos auth interference #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,11 @@ runs:
echo "renewed_plan_file=$RENEWED_PLAN_FILE" >> $GITHUB_OUTPUT
echo "lock_file=$LOCK_FILE" >> $GITHUB_OUTPUT

# Configure Plan Storage AWS Credentials with output-only mode to avoid polluting
# the environment. Credentials are passed explicitly to subsequent steps that need them.
# This prevents plan storage credentials from interfering with Atmos auth.
- name: Configure Plan Storage AWS Credentials
id: plan-storage-credentials
uses: aws-actions/configure-aws-credentials@v4
if: ${{ ( fromJson(steps.atmos-settings.outputs.settings).plan-repository-type == 's3' ||
fromJson(steps.atmos-settings.outputs.settings).plan-repository-type == '' ||
Expand All @@ -284,11 +288,18 @@ runs:
role-to-assume: ${{ fromJson(steps.atmos-settings.outputs.settings).terraform-state-role }}
role-session-name: "atmos-terraform-state-gitops"
mask-aws-account-id: "no"
output-credentials: true
output-env-credentials: false
Comment thread
milldr marked this conversation as resolved.

- name: Retrieve Plan
if: ${{ env.ACTIONS_ENABLED == 'true' && inputs.plan-storage == 'true'}}
uses: cloudposse/github-action-terraform-plan-storage@v1
continue-on-error: true
env:
AWS_ACCESS_KEY_ID: ${{ steps.plan-storage-credentials.outputs.aws-access-key-id }}
AWS_SECRET_ACCESS_KEY: ${{ steps.plan-storage-credentials.outputs.aws-secret-access-key }}
AWS_SESSION_TOKEN: ${{ steps.plan-storage-credentials.outputs.aws-session-token }}
AWS_REGION: ${{ fromJson(steps.atmos-settings.outputs.settings).aws-region }}
with:
action: getPlan
commitSHA: ${{ inputs.sha }}
Expand All @@ -309,6 +320,11 @@ runs:
if: ${{ env.ACTIONS_ENABLED == 'true' && inputs.plan-storage == 'true'}}
uses: cloudposse/github-action-terraform-plan-storage@v1
continue-on-error: true
env:
AWS_ACCESS_KEY_ID: ${{ steps.plan-storage-credentials.outputs.aws-access-key-id }}
AWS_SECRET_ACCESS_KEY: ${{ steps.plan-storage-credentials.outputs.aws-secret-access-key }}
AWS_SESSION_TOKEN: ${{ steps.plan-storage-credentials.outputs.aws-session-token }}
AWS_REGION: ${{ fromJson(steps.atmos-settings.outputs.settings).aws-region }}
with:
action: getPlan
commitSHA: ${{ inputs.sha }}
Expand All @@ -325,7 +341,7 @@ runs:
tableName: ${{ fromJson(steps.atmos-settings.outputs.settings).terraform-state-table }}
bucketName: ${{ fromJson(steps.atmos-settings.outputs.settings).terraform-state-bucket }}

- name: Configure Plan AWS Credentials
- name: Configure Apply AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
if: ${{ fromJson(steps.atmos-settings.outputs.settings).aws-region != '' &&
fromJson(steps.atmos-settings.outputs.settings).aws-region != 'null' &&
Expand Down
Loading