Skip to content

Commit 7985862

Browse files
Merge branch 'main' into fix/proxmox-default-node-name
2 parents 85a30da + 6e35f5f commit 7985862

27 files changed

Lines changed: 210 additions & 206 deletions

File tree

.github/workflows/goreleaser.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
run: git fetch --force --tags
2525

2626
- name: Set up Go
27-
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
27+
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6
2828
with:
2929
go-version: "${{ env.GO_VERSION }}"
3030
cache-dependency-path: "**/*.sum"

.github/workflows/pre-commit.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,15 @@ jobs:
4040
- name: Checkout git repository
4141
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4242
with:
43+
# For fork PRs the head branch only exists on the fork, so the
44+
# repository must point at the fork or the checkout fails. Falls
45+
# back to the base repo for non-pull_request events.
46+
repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
4347
ref: ${{ github.event.pull_request.head.ref || github.ref }}
4448
persist-credentials: false
4549

4650
- name: Set up Python
47-
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
51+
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6
4852
with:
4953
python-version: ${{ env.PYTHON_VERSION }}
5054
cache: 'pip'
@@ -96,7 +100,7 @@ jobs:
96100
terraform-docs --version
97101
98102
- name: Set up Go
99-
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
103+
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6
100104
with:
101105
go-version: ${{ env.GO_VERSION }}
102106

.github/workflows/semgrep.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
name: Semgrep Analysis
3232
runs-on: ubuntu-latest
3333
container:
34-
image: returntocorp/semgrep@sha256:c180f0c93a17b420c0af5006214a29d3c747c5459c732b740191adf657dd0068 # v1.160.0
34+
image: returntocorp/semgrep@sha256:06938c1f365d3f67b8cedd8bc117607ae64253f88a0e768e9da9408548927dd6 # v1.160.0
3535

3636
if: (github.actor != 'dependabot[bot]')
3737

.github/workflows/syntax-check.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,14 @@ jobs:
128128
path: ${{ env.COLLECTION_PATH }}
129129

130130
- name: Set up Python
131-
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
131+
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6
132132
with:
133133
python-version: ${{ env.PYTHON_VERSION }}
134134
cache: 'pip'
135135
cache-dependency-path: '${{ env.COLLECTION_PATH }}/${{ env.REQUIREMENTS_FILE }}'
136136

137137
- name: Cache Ansible collections
138-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
138+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
139139
with:
140140
path: ~/.ansible/collections
141141
key: ${{ runner.os }}-ansible-${{ github.ref }}-${{ hashFiles('**/requirements.yml') }}

.github/workflows/terratest.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
sudo apt-get install -y --no-install-recommends jq curl unzip
124124
125125
- name: Configure AWS Credentials
126-
uses: aws-actions/configure-aws-credentials@e7f100cf4c008499ea8adda475de1042d6975c7b # v6.2.0
126+
uses: aws-actions/configure-aws-credentials@254c19bd240aabef8777f48595e9d2d7b972184b # v6.2.1
127127
with:
128128
aws-region: ${{ env.AWS_DEFAULT_REGION }}
129129
role-to-assume: ${{ secrets.OIDC_ROLE_ARN }}
@@ -136,7 +136,7 @@ jobs:
136136
echo "::add-mask::${AWS_ACCOUNT_ID}"
137137
138138
- name: Setup Go
139-
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
139+
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6
140140
with:
141141
go-version: ${{ env.GO_VERSION }}
142142
check-latest: true
@@ -190,7 +190,7 @@ jobs:
190190
sudo apt-get install -y --no-install-recommends jq curl unzip
191191
192192
- name: Configure AWS Credentials
193-
uses: aws-actions/configure-aws-credentials@e7f100cf4c008499ea8adda475de1042d6975c7b # v6.2.0
193+
uses: aws-actions/configure-aws-credentials@254c19bd240aabef8777f48595e9d2d7b972184b # v6.2.1
194194
with:
195195
aws-region: ${{ env.AWS_DEFAULT_REGION }}
196196
role-to-assume: ${{ secrets.OIDC_ROLE_ARN }}
@@ -203,7 +203,7 @@ jobs:
203203
echo "::add-mask::${AWS_ACCOUNT_ID}"
204204
205205
- name: Setup Go
206-
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
206+
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6
207207
with:
208208
go-version: ${{ env.GO_VERSION }}
209209
check-latest: true

.github/workflows/tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3737

3838
- name: Setup Go
39-
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
39+
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6
4040
with:
4141
go-version: ${{ env.GO_VERSION }}
4242
check-latest: true

ansible/requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ collections:
1515
- name: microsoft.ad
1616
version: 1.11.0
1717
- name: amazon.aws
18-
version: 11.3.0
18+
version: 11.4.0
1919

2020
roles:
2121
- name: geerlingguy.mysql

docs/architecture.svg

Lines changed: 1 addition & 1 deletion
Loading

modules/terraform-aws-instance-factory/.terraform.lock.hcl

Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/terraform-aws-instance-factory/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,15 @@ module "asg_deployment" {
141141
| Name | Version |
142142
| ---- | ------- |
143143
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.7 |
144-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 6.51.0 |
144+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 6.52.0 |
145145
| <a name="requirement_http"></a> [http](#requirement\_http) | ~> 3.6.0 |
146146
| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.9.0 |
147147

148148
## Providers
149149

150150
| Name | Version |
151151
| ---- | ------- |
152-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 6.51.0 |
152+
| <a name="provider_aws"></a> [aws](#provider\_aws) | 6.52.0 |
153153
| <a name="provider_http"></a> [http](#provider\_http) | 3.6.0 |
154154

155155
## Modules

0 commit comments

Comments
 (0)