Skip to content

Commit 3f7e8d4

Browse files
committed
chore: updating inline with the template
1 parent 6ab2671 commit 3f7e8d4

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

.gitignore

+11-8
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*.tfstate
66
*.tfstate.*
77

8+
# terraform lock file
9+
.terraform.lock.hcl
10+
811
# Crash log files
912
crash.log
1013
crash.*.log
@@ -30,15 +33,15 @@ terraform.rc
3033
.DS_Store
3134
todo.md
3235

33-
# Ignore vim swap files
34-
*.swp
35-
*.swo
36+
# Ignore vim swap files
37+
*.swp
38+
*.swo
3639

37-
# Ignore meld diff files
38-
*.orig
39-
*.backup
40-
*.rej
40+
# Ignore meld diff files
41+
*.orig
42+
*.backup
43+
*.rej
4144

4245
# Ignore lambda zip files and build directories
43-
*.zip
46+
*.zip
4447
builds/

.tflint.hcl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
plugin "aws" {
22
enabled = true
3-
version = "0.34.0"
3+
version = "0.35.0"
44
source = "github.com/terraform-linters/tflint-ruleset-aws"
55
}
66

77
plugin "terraform" {
88
enabled = true
9-
version = "0.9.1"
9+
version = "0.10.0"
1010
source = "github.com/terraform-linters/tflint-ruleset-terraform"
1111
}
1212

Makefile

+7-1
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,12 @@ upgrade-terraform-example-providers:
7070
init:
7171
@echo "--> Running terraform init"
7272
@terraform init -backend=false
73+
@find . -type f -name "*.tf" -not -path '*.terraform*' -exec dirname {} \; | sort -u | while read -r dir; do \
74+
echo "--> Running terraform init in $$dir"; \
75+
terraform -chdir=$$dir init -backend=false; \
76+
done;
7377

74-
security:
78+
security: init
7579
@echo "--> Running Security checks"
7680
@trivy config .
7781
$(MAKE) security-modules
@@ -81,13 +85,15 @@ security-modules:
8185
@echo "--> Running Security checks on modules"
8286
@find . -type d -regex '.*/modules/[a-zA-Z\-_$$]*' -not -path '*.terraform*' 2>/dev/null | while read -r dir; do \
8387
echo "--> Validating $$dir"; \
88+
terraform init -backend=false; \
8489
trivy config --format table --exit-code 1 --severity CRITICAL,HIGH --ignorefile .trivyignore $$dir; \
8590
done;
8691

8792
security-examples:
8893
@echo "--> Running Security checks on examples"
8994
@find . -type d -path '*/examples/*' -not -path '*.terraform*' 2>/dev/null | while read -r dir; do \
9095
echo "--> Validating $$dir"; \
96+
terraform init -backend=false; \
9197
trivy config --format table --exit-code 1 --severity CRITICAL,HIGH --ignorefile .trivyignore $$dir; \
9298
done;
9399

0 commit comments

Comments
 (0)