Skip to content

Commit 1bc71f6

Browse files
authored
fix: Update dependencies to resolve OIDC warnings. (#53)
Also update path of configurations to match other repositories (`configs` instead of `config`).
1 parent 01114b5 commit 1bc71f6

51 files changed

Lines changed: 106 additions & 91 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/setup-opentofu/action.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ runs:
1515
- name: Cache OpenTofu
1616
uses: actions/cache@v4
1717
with:
18-
path: ./tofu/config/${{ inputs.config }}/.terraform
19-
key: ${{ runner.os }}-tofu-${{ inputs.config }}-${{ inputs.cache-key }}-${{ hashFiles('./tofu/config/${{ inputs.config }}/.terraform.lock.hcl') }}
18+
path: ./tofu/configs/${{ inputs.config }}/.terraform
19+
key: ${{ runner.os }}-tofu-${{ inputs.config }}-${{ inputs.cache-key }}-${{ hashFiles('./tofu/configs/${{ inputs.config }}/.terraform.lock.hcl') }}
2020
restore-keys: |
2121
${{ runner.os }}-tofu-${{ inputs.config }}-${{ inputs.cache-key }}-
2222
- name: Setup OpenTofu
@@ -28,5 +28,5 @@ runs:
2828
run: tofu version
2929
- name: Initialize OpenTofu
3030
shell: bash
31-
working-directory: ./tofu/config/${{ inputs.config }}
31+
working-directory: ./tofu/configs/${{ inputs.config }}
3232
run: tofu init

.github/workflows/deploy-app.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
uses: andstor/file-existence-action@v3
4848
with:
4949
fail: true
50-
files: "tofu/config/hosting/specs/${{ inputs.application }}.yaml"
50+
files: "tofu/configs/hosting/specs/${{ inputs.application }}.yaml"
5151
- name: Set up AWS credentials
5252
uses: aws-actions/configure-aws-credentials@v4
5353
with:
@@ -60,5 +60,5 @@ jobs:
6060
cache-key: ${{ inputs.application }}
6161
config: hosting
6262
- name: Apply changes
63-
working-directory: ./tofu/config/hosting
63+
working-directory: ./tofu/configs/hosting
6464
run: tofu apply --auto-approve

.github/workflows/deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,5 @@ jobs:
5252
with:
5353
config: ${{ inputs.config }}
5454
- name: Apply changes
55-
working-directory: ./tofu/config/${{ inputs.config }}
55+
working-directory: ./tofu/configs/${{ inputs.config }}
5656
run: tofu apply --auto-approve

.github/workflows/destroy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,5 @@ jobs:
6363
with:
6464
config: ${{ inputs.config }}
6565
- name: Destroy infrastructure
66-
working-directory: ./tofu/config/${{ inputs.config }}
66+
working-directory: ./tofu/configs/${{ inputs.config }}
6767
run: tofu destroy -concise -auto-approve

.github/workflows/plan-app.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
uses: andstor/file-existence-action@v3
5151
with:
5252
fail: true
53-
files: "tofu/config/hosting/specs/${{ inputs.application }}.yaml"
53+
files: "tofu/configs/hosting/specs/${{ inputs.application }}.yaml"
5454
- name: Set up AWS credentials
5555
uses: aws-actions/configure-aws-credentials@v4
5656
with:
@@ -63,16 +63,16 @@ jobs:
6363
cache-key: ${{ inputs.application }}
6464
config: hosting
6565
- name: Plan changes
66-
working-directory: ./tofu/config/hosting
66+
working-directory: ./tofu/configs/hosting
6767
run: tofu plan -concise -no-color -out tfplan > plan.txt
6868
- name: Display plan
69-
working-directory: ./tofu/config/hosting
69+
working-directory: ./tofu/configs/hosting
7070
run: tofu show -plan tfplan
7171
- name: Upload plan file
7272
uses: actions/upload-artifact@v4
7373
with:
7474
name: hosting-tfplan
7575
path: |
76-
./tofu/config/hosting/plan.txt
77-
./tofu/config/hosting/tfplan
76+
./tofu/configs/hosting/plan.txt
77+
./tofu/configs/hosting/tfplan
7878
retention-days: 5

.github/workflows/plan.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,16 @@ jobs:
8686
with:
8787
config: ${{ inputs.config }}
8888
- name: Plan changes
89-
working-directory: ./tofu/config/${{ inputs.config }}
89+
working-directory: ./tofu/configs/${{ inputs.config }}
9090
run: tofu plan -concise -no-color -out tfplan > plan.txt
9191
- name: Display plan
92-
working-directory: ./tofu/config/${{ inputs.config }}
92+
working-directory: ./tofu/configs/${{ inputs.config }}
9393
run: tofu show -plan tfplan
9494
- name: Upload plan file
9595
uses: actions/upload-artifact@v4
9696
with:
9797
name: ${{ inputs.config }}-tfplan
9898
path: |
99-
./tofu/config/${{ inputs.config }}/plan.txt
100-
./tofu/config/${{ inputs.config }}/tfplan
99+
./tofu/configs/${{ inputs.config }}/plan.txt
100+
./tofu/configs/${{ inputs.config }}/tfplan
101101
retention-days: 5

.github/workflows/pull-request.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
id: modified
1616
uses: ./.github/actions/changed-modules
1717
with:
18-
working-directory: tofu/config
18+
working-directory: tofu/configs
1919
- name: Strip prefix from modified configs
2020
id: configs
2121
uses: actions/github-script@v7
2222
with:
2323
script: |
2424
const modules = ${{ steps.modified.outputs.modules }}
25-
const configs = modules.map(m => m.replace(/^tofu\/config\//, ''))
25+
const configs = modules.map(m => m.replace(/^tofu\/configs\//, ''))
2626
core.setOutput('configs', configs)
2727
- name: Show modified configs
2828
run: |

docs/services/documentation/usage.md

Lines changed: 1 addition & 1 deletion

docs/services/hosting/usage.md

Lines changed: 1 addition & 1 deletion

tofu/config/hosting/.terraform.lock.hcl

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)