Skip to content
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

Jump to bottom

Tweak AWS OIDC instructions #11621

Merged
merged 4 commits into from
Nov 30, 2021
Merged

Tweak AWS OIDC instructions #11621

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5089f7
Tweak AWS OIDC instructions
aripollak Nov 2, 2021
f7fccb8
Update to be valid JSON, and actually remove :aud
aripollak Nov 2, 2021
04d068e
Merge branch 'main' into patch-2
hubwriter Nov 29, 2021
440abe1
Merge branch 'main' into patch-2
hubwriter Nov 30, 2021
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
5 changes: 2 additions & 3 deletions ...hardening-your-deployments/configuring-openid-connect-in-amazon-web-services.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ To add the {% data variables.product.prodname_dotcom %} OIDC provider to IAM, se

To configure the role and trust in IAM, see the AWS documentation for ["Assuming a Role"](https://github.com/aws-actions/configure-aws-credentials#assuming-a-role) and ["Creating a role for web identity or OpenID connect federation"](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_create_for-idp_oidc.html).

By default, the validation only includes the audience (`aud`) condition, so you must manually add a subject (`sub`) condition. Edit the trust relationship to add the `sub` field to the validation conditions. For example:
Edit the trust relationship to add the `sub` field to the validation conditions. For example:

```json{:copy}
"Condition": {
"StringEquals": {
"token.actions.githubusercontent.com:aud": "https://github.com/octo-org",
"token.actions.githubusercontent.com:sub": "repo:octo-org/octo-repo:ref:refs/heads/octo-branch"
}
}
Expand Down Expand Up @@ -86,7 +85,7 @@ env:
# permission can be added at job level or workflow level
permissions:
id-token: write
contents: write # This is required for actions/checkout@v1
contents: read # This is required for actions/checkout@v1
jobs:
S3PackageUpload:
runs-on: ubuntu-latest
Expand Down