Skip to content
This repository was archived by the owner on Jun 6, 2025. It is now read-only.

Commit a1bcc7b

Browse files
author
Dan Kelly
committed
Merge branch 'terraform-aws-modules-master' into fetch_upstream_20211118
* terraform-aws-modules-master: (32 commits) chore: Giving up on releaserc config (for now) (terraform-aws-modules#257) chore(release): version 6.1.3 [skip ci] fix: Revert small useless change in main.tf (terraform-aws-modules#256) chore(release): version 6.1.2 [skip ci] fix: Small useless change in main.tf to test semantic-release (last one, I promise) (terraform-aws-modules#255) fix: Small useless change in main.tf to test semantic-release (terraform-aws-modules#254) chore: Updated .releaserc config and tf file (to trigger release) (terraform-aws-modules#253) chore: Updated .releaserc config (terraform-aws-modules#252) chore(release): version 6.1.1 [skip ci] chore: Added workflow_dispatch to allow manual releases (terraform-aws-modules#251) fix: update CI/CD process to enable auto-release workflow (terraform-aws-modules#250) Updated CHANGELOG feat: Add security group egress rule support, fix documentation links (terraform-aws-modules#249) Updated CHANGELOG chore: Updated release Makefile Updated CHANGELOG BREAKING CHANGE: update module to allow for control over individual cluster instances and latest features (terraform-aws-modules#243) chore: update CI workflow to use composite actions, update pre-commit versions (terraform-aws-modules#242) Updated CHANGELOG feat: Add support for restore_to_point_in_time (terraform-aws-modules#194) ...
2 parents 0a108ee + c2df8cc commit a1bcc7b

43 files changed

Lines changed: 2676 additions & 1290 deletions

Some content is hidden

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

‎.chglog/CHANGELOG.tpl.md‎

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

‎.chglog/config.yml‎

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

‎.github/workflows/pre-commit.yml‎

Lines changed: 46 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -2,101 +2,77 @@ name: Pre-Commit
22

33
on:
44
pull_request:
5-
push:
65
branches:
6+
- main
77
- master
88

9+
env:
10+
TERRAFORM_DOCS_VERSION: v0.16.0
11+
912
jobs:
10-
# Min Terraform version(s)
11-
getDirectories:
12-
name: Get root directories
13-
runs-on: ubuntu-latest
14-
steps:
15-
- name: Checkout
16-
uses: actions/checkout@v2
17-
- name: Install Python
18-
uses: actions/setup-python@v2
19-
- name: Build matrix
20-
id: matrix
21-
run: |
22-
DIRS=$(python -c "import json; import glob; print(json.dumps([x.replace('/versions.tf', '') for x in glob.glob('./**/versions.tf', recursive=True)]))")
23-
echo "::set-output name=directories::$DIRS"
24-
outputs:
25-
directories: ${{ steps.matrix.outputs.directories }}
13+
collectInputs:
14+
name: Collect workflow inputs
15+
runs-on: ubuntu-latest
16+
outputs:
17+
directories: ${{ steps.dirs.outputs.directories }}
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v2
21+
22+
- name: Get root directories
23+
id: dirs
24+
uses: clowdhaus/terraform-composite-actions/directories@v1.3.0
2625

2726
preCommitMinVersions:
28-
name: Min TF validate
29-
needs: getDirectories
27+
name: Min TF pre-commit
28+
needs: collectInputs
3029
runs-on: ubuntu-latest
3130
strategy:
32-
matrix:
33-
directory: ${{ fromJson(needs.getDirectories.outputs.directories) }}
31+
matrix:
32+
directory: ${{ fromJson(needs.collectInputs.outputs.directories) }}
3433
steps:
3534
- name: Checkout
3635
uses: actions/checkout@v2
37-
- name: Install Python
38-
uses: actions/setup-python@v2
36+
3937
- name: Terraform min/max versions
4038
id: minMax
41-
uses: clowdhaus/terraform-min-max@v1.0.1
39+
uses: clowdhaus/terraform-min-max@v1.0.3
4240
with:
4341
directory: ${{ matrix.directory }}
44-
- name: Install Terraform v${{ steps.minMax.outputs.minVersion }}
45-
uses: hashicorp/setup-terraform@v1
46-
with:
47-
terraform_version: ${{ steps.minMax.outputs.minVersion }}
48-
- name: Install pre-commit dependencies
49-
run: pip install pre-commit
50-
- name: Execute pre-commit
42+
43+
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
5144
# Run only validate pre-commit check on min version supported
5245
if: ${{ matrix.directory != '.' }}
53-
run:
54-
pre-commit run terraform_validate --color=always --show-diff-on-failure --files ${{ matrix.directory }}/*
55-
- name: Execute pre-commit
46+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.3.0
47+
with:
48+
terraform-version: ${{ steps.minMax.outputs.minVersion }}
49+
args: 'terraform_validate --color=always --show-diff-on-failure --files ${{ matrix.directory }}/*'
50+
51+
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
5652
# Run only validate pre-commit check on min version supported
5753
if: ${{ matrix.directory == '.' }}
58-
run:
59-
pre-commit run terraform_validate --color=always --show-diff-on-failure --files $(ls *.tf)
60-
54+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.3.0
55+
with:
56+
terraform-version: ${{ steps.minMax.outputs.minVersion }}
57+
args: 'terraform_validate --color=always --show-diff-on-failure --files $(ls *.tf)'
6158

62-
# Max Terraform version
63-
getBaseVersion:
64-
name: Module max TF version
59+
preCommitMaxVersion:
60+
name: Max TF pre-commit
6561
runs-on: ubuntu-latest
62+
needs: collectInputs
6663
steps:
6764
- name: Checkout
6865
uses: actions/checkout@v2
66+
with:
67+
ref: ${{ github.event.pull_request.head.ref }}
68+
repository: ${{github.event.pull_request.head.repo.full_name}}
69+
6970
- name: Terraform min/max versions
7071
id: minMax
71-
uses: clowdhaus/terraform-min-max@v1.0.1
72-
outputs:
73-
minVersion: ${{ steps.minMax.outputs.minVersion }}
74-
maxVersion: ${{ steps.minMax.outputs.maxVersion }}
72+
uses: clowdhaus/terraform-min-max@v1.0.3
7573

76-
preCommitMaxVersion:
77-
name: Max TF pre-commit
78-
runs-on: ubuntu-latest
79-
needs: getBaseVersion
80-
strategy:
81-
fail-fast: false
82-
matrix:
83-
version:
84-
- ${{ needs.getBaseVersion.outputs.maxVersion }}
85-
steps:
86-
- name: Checkout
87-
uses: actions/checkout@v2
88-
- name: Install Python
89-
uses: actions/setup-python@v2
90-
- name: Install Terraform v${{ matrix.version }}
91-
uses: hashicorp/setup-terraform@v1
74+
- name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }}
75+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.3.0
9276
with:
93-
terraform_version: ${{ matrix.version }}
94-
- name: Install pre-commit dependencies
95-
run: |
96-
pip install pre-commit
97-
curl -L "$(curl -s https://api.github.com/repos/terraform-docs/terraform-docs/releases/latest | grep -o -E "https://.+?-v0.12\..+?-linux-amd64" | head -n1)" > terraform-docs && chmod +x terraform-docs && sudo mv terraform-docs /usr/bin/
98-
curl -L "$(curl -s https://api.github.com/repos/terraform-linters/tflint/releases/latest | grep -o -E "https://.+?_linux_amd64.zip")" > tflint.zip && unzip tflint.zip && rm tflint.zip && sudo mv tflint /usr/bin/
99-
- name: Execute pre-commit
100-
# Run all pre-commit checks on max version supported
101-
if: ${{ matrix.version == needs.getBaseVersion.outputs.maxVersion }}
102-
run: pre-commit run --color=always --show-diff-on-failure --all-files
77+
terraform-version: ${{ steps.minMax.outputs.maxVersion }}
78+
terraform-docs-version: ${{ env.TERRAFORM_DOCS_VERSION }}

‎.github/workflows/release.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Release
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- main
8+
- master
9+
paths:
10+
- '**/*.py'
11+
- '**/*.tf'
12+
13+
jobs:
14+
release:
15+
name: Release
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v2
20+
with:
21+
persist-credentials: false
22+
fetch-depth: 0
23+
24+
- name: Release
25+
uses: cycjimmy/semantic-release-action@v2
26+
with:
27+
semantic_version: 18.0.0
28+
extra_plugins: |
29+
@semantic-release/changelog@6.0.0
30+
@semantic-release/git@10.0.0
31+
env:
32+
GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}

‎.pre-commit-config.yaml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
repos:
2-
- repo: git://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.48.0
2+
- repo: https://github.com/antonbabenko/pre-commit-terraform
3+
rev: v1.55.0
44
hooks:
55
- id: terraform_fmt
66
- id: terraform_validate
77
- id: terraform_docs
8+
args:
9+
- '--args=--lockfile=false'
810
- id: terraform_tflint
911
args:
1012
- '--args=--only=terraform_deprecated_interpolation'
@@ -20,7 +22,8 @@ repos:
2022
- '--args=--only=terraform_required_providers'
2123
- '--args=--only=terraform_standard_module_structure'
2224
- '--args=--only=terraform_workspace_remote'
23-
- repo: git://github.com/pre-commit/pre-commit-hooks
24-
rev: v3.4.0
25+
- repo: https://github.com/pre-commit/pre-commit-hooks
26+
rev: v4.0.1
2527
hooks:
2628
- id: check-merge-conflict
29+
- id: end-of-file-fixer

‎.releaserc.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"branches": [
3+
"main",
4+
"master"
5+
],
6+
"ci": false,
7+
"plugins": [
8+
"@semantic-release/commit-analyzer",
9+
"@semantic-release/release-notes-generator",
10+
[
11+
"@semantic-release/github",
12+
{
13+
"successComment": "This ${issue.pull_request ? 'PR is included' : 'issue has been resolved'} in version [${nextRelease.version}](${releaseInfos[0].url}) :tada:",
14+
"labels": false,
15+
"releasedLabels": false
16+
}
17+
],
18+
[
19+
"@semantic-release/changelog",
20+
{
21+
"changelogFile": "CHANGELOG.md",
22+
"changelogTitle": "# Changelog\n\nAll notable changes to this project will be documented in this file."
23+
}
24+
],
25+
[
26+
"@semantic-release/git",
27+
{
28+
"assets": [
29+
"CHANGELOG.md"
30+
],
31+
"message": "chore(release): version ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
32+
}
33+
]
34+
]
35+
}

0 commit comments

Comments
 (0)