Skip to content

Commit

Permalink
chore: rename VAULT_URL to be compliant with terraform vault provider
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolasbriere1 committed Dec 23, 2024
1 parent 62fcf97 commit ed8f9d7
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
environment:
name: ${{ inputs.environment_name }}
env:
VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
AWS_ACCOUNT_ID: ${{ vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
AWS_REGION: ${{ vars.AWS_REGION || vars.AWS_DEFAULT_REGION }}
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
attempt_limit: 15
attempt_delay: 500
with: |
url: ${{ env.VAULT_URL }}
url: ${{ env.VAULT_ADDR }}
role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
method: jwt
path: "github-actions"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/create-apk-artifact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
env:
smartway_keystore_name: smartway.keystore
apk_name: app-${{ inputs.configuration }}.apk
VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
AWS_REGION: ${{ inputs.AWS_REGION || vars.AWS_REGION || vars.AWS_DEFAULT_REGION }}
Expand All @@ -105,7 +105,7 @@ jobs:
attempt_limit: 15
attempt_delay: 500
with: |
url: ${{ env.VAULT_URL }}
url: ${{ env.VAULT_ADDR }}
role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
method: jwt
path: "github-actions"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/delete-docker-image.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Delete-Docker-Image'
name: "Delete-Docker-Image"

on:
workflow_call:
Expand All @@ -24,13 +24,13 @@ jobs:
delete:
runs-on: ubuntu-latest
permissions:
contents: read
id-token: write
packages: write
contents: read
id-token: write
packages: write
environment:
name: ${{ inputs.environment_name }}
env:
VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
steps:
# We keep this action as it is configure in lot of repo
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dotnet-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
packages: read
environment: ${{ inputs.environment_name }}
env:
VAULT_URL: ${{ vars.VAULT_URL }}
VAULT_ADDR: ${{ vars.VAULT_URL }}
VAULT_GITHUB_ACTIONS_ROLE: ${{ vars.VAULT_GITHUB_ACTIONS_ROLE }}
AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID }}
AWS_REGION: ${{ inputs.AWS_REGION || vars.AWS_REGION }}
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
attempt_limit: 15
attempt_delay: 500
with: |
url: ${{ env.VAULT_URL }}
url: ${{ env.VAULT_ADDR }}
role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
method: jwt
path: "github-actions"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-apk-s3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
environment:
name: ${{ inputs.environment_name }}
env:
VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
AWS_REGION: ${{ inputs.AWS_REGION || vars.AWS_REGION || vars.AWS_DEFAULT_REGION }}
Expand All @@ -70,7 +70,7 @@ jobs:
attempt_limit: 15
attempt_delay: 500
with: |
url: ${{ env.VAULT_URL }}
url: ${{ env.VAULT_ADDR }}
role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
method: jwt
path: "github-actions"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-bundle-codepush.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
run:
working-directory: ${{ inputs.working-directory }}
env:
VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
steps:
- name: Checkout
Expand All @@ -69,7 +69,7 @@ jobs:
attempt_limit: 15
attempt_delay: 500
with: |
url: ${{ env.VAULT_URL }}
url: ${{ env.VAULT_ADDR }}
role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
method: jwt
path: "github-actions"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run-aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
environment:
name: ${{ inputs.environment_name }}
env:
VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
AWS_REGION: ${{ inputs.AWS_REGION || vars.AWS_REGION || vars.AWS_DEFAULT_REGION }}
Expand All @@ -74,7 +74,7 @@ jobs:
attempt_limit: 15
attempt_delay: 500
with: |
url: ${{ env.VAULT_URL }}
url: ${{ env.VAULT_ADDR }}
role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
method: jwt
path: "github-actions"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run-docker-upload-artifact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
password: ${{ secrets.github_token }}
env:
DJANGO_SETTINGS_MODULE: ${{ inputs.env_django_settings_module }}
VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
AWS_REGION: ${{ inputs.AWS_REGION || vars.AWS_REGION || vars.AWS_DEFAULT_REGION }}
Expand All @@ -101,7 +101,7 @@ jobs:
attempt_limit: 15
attempt_delay: 500
with: |
url: ${{ env.VAULT_URL }}
url: ${{ env.VAULT_ADDR }}
role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
method: jwt
path: "github-actions"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run-docker-with-db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
env:
DJANGO_SETTINGS_MODULE: ${{ inputs.env_django_settings_module }}
GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
AWS_REGION: ${{ inputs.AWS_REGION || vars.AWS_REGION || vars.AWS_DEFAULT_REGION }}
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
attempt_limit: 15
attempt_delay: 500
with: |
url: ${{ env.VAULT_URL }}
url: ${{ env.VAULT_ADDR }}
role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
method: jwt
path: "github-actions"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
env:
DJANGO_SETTINGS_MODULE: ${{ inputs.env_django_settings_module }}
GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
AWS_REGION: ${{ inputs.AWS_REGION || vars.AWS_REGION || vars.AWS_DEFAULT_REGION }}
Expand All @@ -106,7 +106,7 @@ jobs:
attempt_limit: 15
attempt_delay: 500
with: |
url: ${{ env.VAULT_URL }}
url: ${{ env.VAULT_ADDR }}
role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
method: jwt
path: "github-actions"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
environment:
name: ${{ inputs.environment_name }}
env:
VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
AWS_REGION: ${{ inputs.AWS_REGION || vars.AWS_REGION || vars.AWS_DEFAULT_REGION }}
Expand All @@ -94,7 +94,7 @@ jobs:
attempt_limit: 15
attempt_delay: 500
with: |
url: ${{ env.VAULT_URL }}
url: ${{ env.VAULT_ADDR }}
role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
method: jwt
path: "github-actions"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/terraform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
environment:
name: ${{ inputs.environment_name }}
env:
VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
AWS_REGION: ${{ inputs.AWS_REGION || vars.AWS_REGION || vars.AWS_DEFAULT_REGION }}
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
attempt_limit: 15
attempt_delay: 500
with: |
url: ${{ env.VAULT_URL }}
url: ${{ env.VAULT_ADDR }}
role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
method: jwt
path: "github-actions"
Expand Down

0 comments on commit ed8f9d7

Please sign in to comment.