Skip to content

Commit

Permalink
Merge pull request #24 from liatrio/demo-oidc
Browse files Browse the repository at this point in the history
  • Loading branch information
jburns24 authored Sep 28, 2023
2 parents 74b0409 + 7d52aa9 commit afca914
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ on:
branches:
- demo

# permissions:
# id-token: write # Needed to modify JWT token for OIDC
# contents: read # Needed for actions/checkout
permissions:
id-token: write # Needed to modify JWT token for OIDC
contents: read # Needed for actions/checkout

jobs:
run:
Expand All @@ -29,10 +29,10 @@ jobs:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@50ac8dd1e1b10d09dac7b8727528b91bed831ac0 # v3
with:
aws-access-key-id: ${{ secrets.PERSONAL_ACCESS_KEY }}
aws-secret-access-key: ${{ secrets.PERSONAL_SECRET_ACCESS_KEY }}
role-to-assume: ${{ secrets.ROLE_TO_ASSUME }}
# role-to-assume: ${{ vars.OIDC_ROLE }}
# aws-access-key-id: ${{ secrets.PERSONAL_ACCESS_KEY }}
# aws-secret-access-key: ${{ secrets.PERSONAL_SECRET_ACCESS_KEY }}
# role-to-assume: ${{ secrets.ROLE_TO_ASSUME }}
role-to-assume: ${{ vars.OIDC_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
role-skip-session-tagging: true

Expand Down
4 changes: 2 additions & 2 deletions src/components/ShareForm/ShareForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ const ShareForm = (props: Props) => {
<div className={styles.flexChildLeft}>
<Image
alt="exampleCompany Logo"
src="/dojo-logo-sm.png"
// src="/chico.png"
// src="/dojo-logo-sm.png"
src="/chico.png"
width="400px"
height="400px"
/>
Expand Down
2 changes: 1 addition & 1 deletion terraform/oidc/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ data "aws_iam_policy_document" "gha_trust_policy" {
condition {
test = "StringEquals"
variable = "token.actions.githubusercontent.com:sub"
values = ["repo:liatrio/keyless-workflow-demo:environment:production"]
values = ["repo:liatrio/keyless-workflow-demo:environment:demo"]
}
}
}
Expand Down

0 comments on commit afca914

Please sign in to comment.