Skip to content

Terraform 1.0.0 compat #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
067a0dd
Merge pull request #7 from cytopia/master
cytopia Jan 18, 2021
57d2109
OPS-4290 add an optional instance profile and attach the role
ronny-panknin-flaconi Mar 30, 2021
e0ef5eb
OPS-4290 update README
ronny-panknin-flaconi Mar 30, 2021
3c20ce8
OPS-4290 update examples
ronny-panknin-flaconi Mar 30, 2021
a1a5f69
Merge pull request #8 from Flaconi/OPS-4290-instance-profiles
ronny-panknin-flaconi Mar 30, 2021
827f276
Allows templating of IAM role policies
danvaida Aug 9, 2021
81b8107
Removes obsolete options
danvaida Aug 9, 2021
5c31670
Corrects indentation
danvaida Aug 9, 2021
c9cdcd6
Pins Terraform version to address argument error
danvaida Aug 9, 2021
eadd598
Updates variable data structure for test case
danvaida Aug 9, 2021
1135bb6
Simplifies input by abstracting file vs template
danvaida Aug 26, 2021
95a790a
Merges origin/trust-policy-templating (pull request #9)
danvaida Aug 30, 2021
92d87fe
Tf013update (#10)
snovikov Sep 23, 2021
ae8fd27
Make module TF1.0 compatible (#11)
snovikov Sep 27, 2021
f6fa322
OPS-5042 Backup repo
vikkasyousaf Jun 8, 2022
fdfa996
Merge pull request #12 from Flaconi/OPS-5042
vikkasyousaf Jun 8, 2022
bc6b5c1
OPS-5190 Update backup action version (#13)
snovikov Feb 14, 2023
7931b66
Optional parameters (#14)
snovikov Jun 2, 2023
72687d6
Update TF-DOCS (#15)
snovikov Jun 2, 2023
a44ef6e
Add missing tags for resources (#16)
snovikov Jun 5, 2023
43c01c6
Fix missing release drafter permissions (#17)
snovikov Jun 6, 2023
6b5ba17
Remove debug outputs (#18)
snovikov Jun 22, 2023
06360e7
Add iam keys outputs (#19)
snovikov Oct 27, 2023
a3d23ee
OPS-5891 dynamic permission boundary
ronny-panknin-flaconi Apr 8, 2024
6ecd642
OPS-5891 fix suffix for template files
ronny-panknin-flaconi Apr 8, 2024
abf7aa2
Merge pull request #20 from Flaconi/OPS-5891-dynamic-boundaries
ronny-panknin-flaconi Apr 8, 2024
450af04
OPS-5891 add validation
ronny-panknin-flaconi Apr 8, 2024
bee99bd
OPS-5891 add missing tfvars for example
ronny-panknin-flaconi Apr 8, 2024
29eff98
Merge pull request #21 from Flaconi/OPS-5891-dynamic-boundary-fix
ronny-panknin-flaconi Apr 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @Flaconi/devops
24 changes: 24 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Configuration for Release Drafter: https://github.com/toolmantim/release-drafter
name-template: '$NEXT_MINOR_VERSION 🌈'
tag-template: 'v$NEXT_MINOR_VERSION'
categories:
- title: '🚀 Features'
labels:
- feature
- enhancement
- title: '🐛 Bug Fixes'
labels:
- fix
- bugfix
- bug
- title: '🧰 Maintenance'
labels:
- chore
- dependencies
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
branches:
- master
template: |
## What's Changed

$CHANGES
17 changes: 17 additions & 0 deletions .github/workflows/backups.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Backup Repository

on:
push:
branches:
- master

jobs:
backup:
uses: Flaconi/github-reusable-workflow/.github/workflows/backups.yml@v1
with:
enabled: True
region: eu-central-1
secrets:
iam_role_arn: ${{ secrets.BACKUP_REPO_IAM_ROLE }}
bucket_name: ${{ secrets.BACKUP_REPO_BUCKET }}
20 changes: 20 additions & 0 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Release Drafter

on:
push:
# branches to consider in the event; optional, defaults to all
branches:
- master

permissions:
contents: read

jobs:
update_release_draft:
permissions:
contents: write
runs-on: ubuntu-latest
steps:
- uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17 changes: 12 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Deny Terraform runtime files
.terraform
terraform.tfstate
*.tfstate*
# Local .terraform directories
**/.terraform/*

# .tfstate files
*.tfstate
*.tfstate.*

# exclude .tfvars except for examples
*.tfvars
!examples/*/*.tfvars

# lock file
.terraform.lock.hcl
/terraform.tfvars
61 changes: 46 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ TF_MODULES = $(sort $(dir $(wildcard $(CURRENT_DIR)modules/*/)))
# -------------------------------------------------------------------------------------------------
# Container versions
# -------------------------------------------------------------------------------------------------
TF_VERSION = light
TFDOCS_VERSION = 0.10.1
FL_VERSION = 0.3
JL_VERSION = latest-0.4
TF_VERSION = 1.3.9
TFDOCS_VERSION = 0.16.0-0.34
FL_VERSION = latest-0.8
JL_VERSION = 1.6.0-0.14


# -------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -77,16 +77,14 @@ test: _pull-tf
echo "------------------------------------------------------------"; \
echo "# Terraform init"; \
echo "------------------------------------------------------------"; \
if docker run $$(tty -s && echo "-it" || echo) --rm -v "$(CURRENT_DIR):/t" --workdir "$${DOCKER_PATH}" hashicorp/terraform:$(TF_VERSION) \
if docker run $$(tty -s && echo "-it" || echo) --rm --network host -v "$(CURRENT_DIR):/t" --workdir "$${DOCKER_PATH}" hashicorp/terraform:$(TF_VERSION) \
init \
-verify-plugins=true \
-lock=false \
-upgrade=true \
-upgrade \
-reconfigure \
-input=false \
-get-plugins=true \
-get=true \
.; then \
-get=true; \
then \
echo "OK"; \
else \
echo "Failed"; \
Expand Down Expand Up @@ -119,12 +117,45 @@ _gen-main:
@echo "------------------------------------------------------------"
@echo "# Main module"
@echo "------------------------------------------------------------"
@if docker run $$(tty -s && echo "-it" || echo) --rm \
-v $(CURRENT_DIR):/data \
-e DELIM_START='<!-- TFDOCS_HEADER_START -->' \
-e DELIM_CLOSE='<!-- TFDOCS_HEADER_END -->' \
cytopia/terraform-docs:$(TFDOCS_VERSION) \
terraform-docs-replace --show header markdown tbl --indent 2 --sort README.md; then \
echo "OK"; \
else \
echo "Failed"; \
exit 1; \
fi
@if docker run $$(tty -s && echo "-it" || echo) --rm \
-v $(CURRENT_DIR):/data \
-e DELIM_START='<!-- TFDOCS_PROVIDER_START -->' \
-e DELIM_CLOSE='<!-- TFDOCS_PROVIDER_END -->' \
cytopia/terraform-docs:$(TFDOCS_VERSION) \
terraform-docs-replace --show providers markdown tbl --indent 2 --sort README.md; then \
echo "OK"; \
else \
echo "Failed"; \
exit 1; \
fi
@if docker run $$(tty -s && echo "-it" || echo) --rm \
-v $(CURRENT_DIR):/data \
-e DELIM_START='<!-- TFDOCS_REQUIREMENTS_START -->' \
-e DELIM_CLOSE='<!-- TFDOCS_REQUIREMENTS_END -->' \
cytopia/terraform-docs:$(TFDOCS_VERSION) \
terraform-docs-replace --show requirements markdown tbl --indent 2 --sort README.md; then \
echo "OK"; \
else \
echo "Failed"; \
exit 1; \
fi
@if docker run $$(tty -s && echo "-it" || echo) --rm \
-v $(CURRENT_DIR):/data \
-e DELIM_START='<!-- TFDOCS_INPUTS_START -->' \
-e DELIM_CLOSE='<!-- TFDOCS_INPUTS_END -->' \
cytopia/terraform-docs:$(TFDOCS_VERSION) \
terraform-docs-replace-012 --show-all=false --show inputs md doc --indent 2 $(TFDOCS_ARGS) README.md; then \
terraform-docs-replace --show inputs markdown doc --indent 2 $(TFDOCS_ARGS) README.md; then \
echo "OK"; \
else \
echo "Failed"; \
Expand All @@ -135,7 +166,7 @@ _gen-main:
-e DELIM_START='<!-- TFDOCS_OUTPUTS_START -->' \
-e DELIM_CLOSE='<!-- TFDOCS_OUTPUTS_END -->' \
cytopia/terraform-docs:$(TFDOCS_VERSION) \
terraform-docs-replace-012 --show-all=false --show outputs md tbl --indent 2 --sort README.md; then \
terraform-docs-replace --show outputs markdown tbl --indent 2 --sort README.md; then \
echo "OK"; \
else \
echo "Failed"; \
Expand All @@ -154,7 +185,7 @@ _gen-examples:
-e DELIM_START='$(DELIM_START)' \
-e DELIM_CLOSE='$(DELIM_CLOSE)' \
cytopia/terraform-docs:$(TFDOCS_VERSION) \
terraform-docs-replace-012 $(TFDOCS_ARGS) md $${DOCKER_PATH}/README.md; then \
terraform-docs-replace $(TFDOCS_ARGS) markdown $${DOCKER_PATH}/README.md; then \
echo "OK"; \
else \
echo "Failed"; \
Expand All @@ -174,7 +205,7 @@ _gen-modules:
-e DELIM_START='$(DELIM_START)' \
-e DELIM_CLOSE='$(DELIM_CLOSE)' \
cytopia/terraform-docs:$(TFDOCS_VERSION) \
terraform-docs-replace-012 $(TFDOCS_ARGS) md $${DOCKER_PATH}/README.md; then \
terraform-docs-replace $(TFDOCS_ARGS) markdown $${DOCKER_PATH}/README.md; then \
echo "OK"; \
else \
echo "Failed"; \
Expand Down Expand Up @@ -204,7 +235,7 @@ _lint-fmt: _pull-tf
@echo "# *.tf files"
@echo "------------------------------------------------------------"
@if docker run $$(tty -s && echo "-it" || echo) --rm -v "$(CURRENT_DIR):/t:ro" --workdir "/t" hashicorp/terraform:$(TF_VERSION) \
fmt -check=true -diff=true -write=false -list=true .; then \
fmt -recursive -check=true -diff=true -write=false -list=true .; then \
echo "OK"; \
else \
echo "Failed"; \
Expand Down
Loading