From b511c7b659cfa6c482df541b0cee506a10d1d76a Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Fri, 19 Dec 2025 18:41:58 -0500 Subject: [PATCH 01/10] terraform: add tflint --- .github/workflows/terraform-examples.yml | 24 ++++++++++++++++++------ Makefile | 10 +++++++--- terraform/.tflint.hcl | 4 ++++ 3 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 terraform/.tflint.hcl diff --git a/.github/workflows/terraform-examples.yml b/.github/workflows/terraform-examples.yml index 2a655de..10da890 100644 --- a/.github/workflows/terraform-examples.yml +++ b/.github/workflows/terraform-examples.yml @@ -9,32 +9,44 @@ on: jobs: - check-terraform-fmt: + terraform-tflint: + runs-on: ubuntu-latest + steps: + - name: Check out code + uses: actions/checkout@v4 + - name: Setup TFLint + uses: terraform-linters/setup-tflint@v6 + with: + cache: true + - name: Show version + run: tflint --version + - name: help # TODO: remove + run: tflint -help + - name: Run + run: tflint --chdir=terraform --recursive -f compact + + terraform-check-fmt: runs-on: ubuntu-latest steps: - name: Check out code uses: actions/checkout@v4 - - name: Install Terraform uses: hashicorp/setup-terraform@v2 - - name: Check Terraform formatting run: | bash terraform/repo-scripts/check-terraform-fmt.sh terraform - check-terraform-variables-tailscale-install-scripts: + terraform-check-variables-tailscale-install-scripts: runs-on: ubuntu-latest steps: - name: Check out code uses: actions/checkout@v4 - # - name: tree # working-directory: terraform # run: | # apt-get -y update # apt-get -y install tree # tree -a - - name: Check variables-tailscale-install-scripts.tf files run: | bash terraform/repo-scripts/check-variables-tailscale-install-scripts.sh terraform diff --git a/Makefile b/Makefile index 6bde89d..5273da4 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,13 @@ default: help +.PHONY: terraform-tflint +terraform-tflint: ## Run 'terraform-tflint' github actions with https://github.com/nektos/act + act -j terraform-tflint + .PHONY: check-terraform-examples -check-terraform-examples: ## Run specific 'check' github actions with https://github.com/nektos/act - act -j check-terraform-fmt - act -j check-variables-tailscale-install-scripts +terraform-check-examples: ## Run specific 'check' github actions with https://github.com/nektos/act + act -j terraform-check-fmt + act -j terraform-check-variables-tailscale-install-scripts .PHONY: help help: ## Display this information. Default target. diff --git a/terraform/.tflint.hcl b/terraform/.tflint.hcl new file mode 100644 index 0000000..b8edc99 --- /dev/null +++ b/terraform/.tflint.hcl @@ -0,0 +1,4 @@ +plugin "terraform" { + enabled = true + preset = "all" +} From 48cc7f52ddfce05af360531f25e9b678ca8e0e5c Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Fri, 19 Dec 2025 18:44:29 -0500 Subject: [PATCH 02/10] fix tflint rule - required_version for providers https://github.com/terraform-linters/tflint-ruleset-terraform/blob/da326848fc0b8ad835a7a19d6d114a061509a0cc/docs/rules/terraform_required_version.md --- .../aws-ec2-autoscaling-relay-to-private-subnet/versions.tf | 2 ++ terraform/aws/aws-ec2-autoscaling-session-recorder/versions.tf | 2 ++ terraform/aws/aws-ec2-autoscaling/versions.tf | 2 ++ .../aws/aws-ec2-instance-dual-stack-ipv4-ipv6/versions.tf | 2 ++ terraform/aws/aws-ec2-instance/versions.tf | 2 ++ terraform/aws/internal-modules/aws-ec2-autoscaling/versions.tf | 2 ++ terraform/aws/internal-modules/aws-ec2-instance/versions.tf | 2 ++ terraform/aws/internal-modules/aws-vpc/versions.tf | 2 ++ terraform/azure/azure-linux-vm/versions.tf | 2 ++ terraform/azure/internal-modules/azure-linux-vm/versions.tf | 2 ++ terraform/azure/internal-modules/azure-network/versions.tf | 2 ++ terraform/google/google-compute-instance/versions.tf | 2 ++ .../internal-modules/google-compute-instance/versions.tf | 3 ++- terraform/google/internal-modules/google-vpc/versions.tf | 3 ++- 14 files changed, 28 insertions(+), 2 deletions(-) diff --git a/terraform/aws/aws-ec2-autoscaling-relay-to-private-subnet/versions.tf b/terraform/aws/aws-ec2-autoscaling-relay-to-private-subnet/versions.tf index 8906343..333b284 100644 --- a/terraform/aws/aws-ec2-autoscaling-relay-to-private-subnet/versions.tf +++ b/terraform/aws/aws-ec2-autoscaling-relay-to-private-subnet/versions.tf @@ -5,4 +5,6 @@ terraform { version = ">= 0.24" } } + + required_version = ">= 1.0, < 2.0" } diff --git a/terraform/aws/aws-ec2-autoscaling-session-recorder/versions.tf b/terraform/aws/aws-ec2-autoscaling-session-recorder/versions.tf index 8906343..333b284 100644 --- a/terraform/aws/aws-ec2-autoscaling-session-recorder/versions.tf +++ b/terraform/aws/aws-ec2-autoscaling-session-recorder/versions.tf @@ -5,4 +5,6 @@ terraform { version = ">= 0.24" } } + + required_version = ">= 1.0, < 2.0" } diff --git a/terraform/aws/aws-ec2-autoscaling/versions.tf b/terraform/aws/aws-ec2-autoscaling/versions.tf index 8906343..333b284 100644 --- a/terraform/aws/aws-ec2-autoscaling/versions.tf +++ b/terraform/aws/aws-ec2-autoscaling/versions.tf @@ -5,4 +5,6 @@ terraform { version = ">= 0.24" } } + + required_version = ">= 1.0, < 2.0" } diff --git a/terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/versions.tf b/terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/versions.tf index 8906343..333b284 100644 --- a/terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/versions.tf +++ b/terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/versions.tf @@ -5,4 +5,6 @@ terraform { version = ">= 0.24" } } + + required_version = ">= 1.0, < 2.0" } diff --git a/terraform/aws/aws-ec2-instance/versions.tf b/terraform/aws/aws-ec2-instance/versions.tf index 8906343..333b284 100644 --- a/terraform/aws/aws-ec2-instance/versions.tf +++ b/terraform/aws/aws-ec2-instance/versions.tf @@ -5,4 +5,6 @@ terraform { version = ">= 0.24" } } + + required_version = ">= 1.0, < 2.0" } diff --git a/terraform/aws/internal-modules/aws-ec2-autoscaling/versions.tf b/terraform/aws/internal-modules/aws-ec2-autoscaling/versions.tf index 951051f..310c3f7 100644 --- a/terraform/aws/internal-modules/aws-ec2-autoscaling/versions.tf +++ b/terraform/aws/internal-modules/aws-ec2-autoscaling/versions.tf @@ -5,4 +5,6 @@ terraform { version = ">= 6.0, < 7.0" } } + + required_version = ">= 1.0, < 2.0" } diff --git a/terraform/aws/internal-modules/aws-ec2-instance/versions.tf b/terraform/aws/internal-modules/aws-ec2-instance/versions.tf index 951051f..310c3f7 100644 --- a/terraform/aws/internal-modules/aws-ec2-instance/versions.tf +++ b/terraform/aws/internal-modules/aws-ec2-instance/versions.tf @@ -5,4 +5,6 @@ terraform { version = ">= 6.0, < 7.0" } } + + required_version = ">= 1.0, < 2.0" } diff --git a/terraform/aws/internal-modules/aws-vpc/versions.tf b/terraform/aws/internal-modules/aws-vpc/versions.tf index 951051f..310c3f7 100644 --- a/terraform/aws/internal-modules/aws-vpc/versions.tf +++ b/terraform/aws/internal-modules/aws-vpc/versions.tf @@ -5,4 +5,6 @@ terraform { version = ">= 6.0, < 7.0" } } + + required_version = ">= 1.0, < 2.0" } diff --git a/terraform/azure/azure-linux-vm/versions.tf b/terraform/azure/azure-linux-vm/versions.tf index 8906343..333b284 100644 --- a/terraform/azure/azure-linux-vm/versions.tf +++ b/terraform/azure/azure-linux-vm/versions.tf @@ -5,4 +5,6 @@ terraform { version = ">= 0.24" } } + + required_version = ">= 1.0, < 2.0" } diff --git a/terraform/azure/internal-modules/azure-linux-vm/versions.tf b/terraform/azure/internal-modules/azure-linux-vm/versions.tf index 7746b9c..6bfcb98 100644 --- a/terraform/azure/internal-modules/azure-linux-vm/versions.tf +++ b/terraform/azure/internal-modules/azure-linux-vm/versions.tf @@ -5,4 +5,6 @@ terraform { version = ">= 4.0, < 5.0" } } + + required_version = ">= 1.0, < 2.0" } diff --git a/terraform/azure/internal-modules/azure-network/versions.tf b/terraform/azure/internal-modules/azure-network/versions.tf index 7746b9c..6bfcb98 100644 --- a/terraform/azure/internal-modules/azure-network/versions.tf +++ b/terraform/azure/internal-modules/azure-network/versions.tf @@ -5,4 +5,6 @@ terraform { version = ">= 4.0, < 5.0" } } + + required_version = ">= 1.0, < 2.0" } diff --git a/terraform/google/google-compute-instance/versions.tf b/terraform/google/google-compute-instance/versions.tf index 8906343..333b284 100644 --- a/terraform/google/google-compute-instance/versions.tf +++ b/terraform/google/google-compute-instance/versions.tf @@ -5,4 +5,6 @@ terraform { version = ">= 0.24" } } + + required_version = ">= 1.0, < 2.0" } diff --git a/terraform/google/internal-modules/google-compute-instance/versions.tf b/terraform/google/internal-modules/google-compute-instance/versions.tf index b3679ed..98cc894 100644 --- a/terraform/google/internal-modules/google-compute-instance/versions.tf +++ b/terraform/google/internal-modules/google-compute-instance/versions.tf @@ -5,5 +5,6 @@ terraform { version = ">= 7.0, < 8.0" } } -} + required_version = ">= 1.0, < 2.0" +} diff --git a/terraform/google/internal-modules/google-vpc/versions.tf b/terraform/google/internal-modules/google-vpc/versions.tf index b3679ed..98cc894 100644 --- a/terraform/google/internal-modules/google-vpc/versions.tf +++ b/terraform/google/internal-modules/google-vpc/versions.tf @@ -5,5 +5,6 @@ terraform { version = ">= 7.0, < 8.0" } } -} + required_version = ">= 1.0, < 2.0" +} From 7596aca529e28428538ac598ee6528193178c435 Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Fri, 19 Dec 2025 18:46:37 -0500 Subject: [PATCH 03/10] more fix tflint rule - required_version for providers --- .../internal-modules/tailscale-install-scripts/versions.tf | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 terraform/internal-modules/tailscale-install-scripts/versions.tf diff --git a/terraform/internal-modules/tailscale-install-scripts/versions.tf b/terraform/internal-modules/tailscale-install-scripts/versions.tf new file mode 100644 index 0000000..f8f3ed3 --- /dev/null +++ b/terraform/internal-modules/tailscale-install-scripts/versions.tf @@ -0,0 +1,3 @@ +terraform { + required_version = ">= 1.0, < 2.0" +} From 2f64d7f61002a5d72f4e624b6df5c519446fc1b8 Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Fri, 19 Dec 2025 18:49:18 -0500 Subject: [PATCH 04/10] fix terraform_unused_declarations https://github.com/terraform-linters/tflint-ruleset-terraform/blob/da326848fc0b8ad835a7a19d6d114a061509a0cc/docs/rules/terraform_unused_declarations.md --- terraform/azure/azure-linux-vm/main.tf | 1 - .../google/internal-modules/google-compute-instance/main.tf | 4 ---- 2 files changed, 5 deletions(-) diff --git a/terraform/azure/azure-linux-vm/main.tf b/terraform/azure/azure-linux-vm/main.tf index 45138cf..2c39950 100644 --- a/terraform/azure/azure-linux-vm/main.tf +++ b/terraform/azure/azure-linux-vm/main.tf @@ -27,7 +27,6 @@ locals { location = azurerm_resource_group.main.location vpc_cidr_block = module.vpc.vnet_address_space - vpc_id = module.vpc.vnet_id subnet_id = module.vpc.public_subnet_id network_security_group_id = azurerm_network_security_group.tailscale_ingress.id instance_type = "Standard_D2as_v6" diff --git a/terraform/google/internal-modules/google-compute-instance/main.tf b/terraform/google/internal-modules/google-compute-instance/main.tf index 38baf4d..fb26d9f 100644 --- a/terraform/google/internal-modules/google-compute-instance/main.tf +++ b/terraform/google/internal-modules/google-compute-instance/main.tf @@ -9,10 +9,6 @@ module "tailscale_install_scripts" { additional_after_scripts = var.additional_after_scripts } -data "google_compute_subnetwork" "selected" { - self_link = "https://www.googleapis.com/compute/v1/${var.subnet}" # requires full URL - https://github.com/hashicorp/terraform-provider-google/issues/9919 -} - data "google_compute_image" "ubuntu" { project = "ubuntu-os-cloud" family = "ubuntu-2404-lts-amd64" From 3ac91ecec4b6c075be52a1879411116363894d75 Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Fri, 19 Dec 2025 19:02:39 -0500 Subject: [PATCH 05/10] fix terraform_deprecated_index --- .../aws/aws-ec2-instance-dual-stack-ipv4-ipv6/outputs.tf | 2 +- terraform/aws/aws-ec2-instance/outputs.tf | 2 +- terraform/azure/internal-modules/azure-network/outputs.tf | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/outputs.tf b/terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/outputs.tf index 8ed38ee..739e305 100644 --- a/terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/outputs.tf +++ b/terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/outputs.tf @@ -15,7 +15,7 @@ output "nat_public_ips" { } output "instance_ids" { - value = module.tailscale_aws_ec2.*.instance_id + value = module.tailscale_aws_ec2[*].instance_id } output "user_data_md5" { diff --git a/terraform/aws/aws-ec2-instance/outputs.tf b/terraform/aws/aws-ec2-instance/outputs.tf index 8ed38ee..739e305 100644 --- a/terraform/aws/aws-ec2-instance/outputs.tf +++ b/terraform/aws/aws-ec2-instance/outputs.tf @@ -15,7 +15,7 @@ output "nat_public_ips" { } output "instance_ids" { - value = module.tailscale_aws_ec2.*.instance_id + value = module.tailscale_aws_ec2[*].instance_id } output "user_data_md5" { diff --git a/terraform/azure/internal-modules/azure-network/outputs.tf b/terraform/azure/internal-modules/azure-network/outputs.tf index aad274a..36f9ef3 100644 --- a/terraform/azure/internal-modules/azure-network/outputs.tf +++ b/terraform/azure/internal-modules/azure-network/outputs.tf @@ -37,10 +37,10 @@ output "private_dns_resolver_inbound_endpoint_ip" { } output "nat_public_ips" { - value = azurerm_public_ip.nat.*.ip_address + value = azurerm_public_ip.nat[*].ip_address } output "nat_ids" { description = "Useful for using within `depends_on` for other resources" - value = azurerm_nat_gateway.nat.*.id + value = azurerm_nat_gateway.nat[*].id } From 1b008650157366d8a2c0ffaedb5520ca9224e6ed Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Fri, 19 Dec 2025 19:02:58 -0500 Subject: [PATCH 06/10] change tflint to print full output --- .github/workflows/terraform-examples.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform-examples.yml b/.github/workflows/terraform-examples.yml index 10da890..9ffcd08 100644 --- a/.github/workflows/terraform-examples.yml +++ b/.github/workflows/terraform-examples.yml @@ -23,7 +23,7 @@ jobs: - name: help # TODO: remove run: tflint -help - name: Run - run: tflint --chdir=terraform --recursive -f compact + run: tflint --chdir=terraform --recursive terraform-check-fmt: runs-on: ubuntu-latest From 004b9e0a0f84f46070f7b2637570e29df0d98553 Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Fri, 19 Dec 2025 20:01:26 -0500 Subject: [PATCH 07/10] fix required_version https://github.com/terraform-linters/tflint-ruleset-terraform/blob/53021f076defc0b32ae310f69f5d28f08b5f548e/docs/rules/terraform_required_version.md --- .../aws-ec2-autoscaling-relay-to-private-subnet/versions.tf | 4 ++++ .../aws/aws-ec2-autoscaling-session-recorder/versions.tf | 4 ++++ terraform/aws/aws-ec2-autoscaling/versions.tf | 4 ++++ .../aws/aws-ec2-instance-dual-stack-ipv4-ipv6/versions.tf | 4 ++++ terraform/aws/aws-ec2-instance/versions.tf | 4 ++++ terraform/aws/internal-modules/aws-vpc/versions.tf | 4 ++++ terraform/azure/azure-linux-vm/versions.tf | 4 ++++ terraform/azure/internal-modules/azure-network/versions.tf | 4 ++++ terraform/google/google-compute-instance/versions.tf | 4 ++++ terraform/google/internal-modules/google-vpc/versions.tf | 4 ++++ .../internal-modules/tailscale-advertise-routes/versions.tf | 3 +++ 11 files changed, 43 insertions(+) create mode 100644 terraform/internal-modules/tailscale-advertise-routes/versions.tf diff --git a/terraform/aws/aws-ec2-autoscaling-relay-to-private-subnet/versions.tf b/terraform/aws/aws-ec2-autoscaling-relay-to-private-subnet/versions.tf index 333b284..70d492f 100644 --- a/terraform/aws/aws-ec2-autoscaling-relay-to-private-subnet/versions.tf +++ b/terraform/aws/aws-ec2-autoscaling-relay-to-private-subnet/versions.tf @@ -1,5 +1,9 @@ terraform { required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 6.0, < 7.0" + } tailscale = { source = "tailscale/tailscale" version = ">= 0.24" diff --git a/terraform/aws/aws-ec2-autoscaling-session-recorder/versions.tf b/terraform/aws/aws-ec2-autoscaling-session-recorder/versions.tf index 333b284..70d492f 100644 --- a/terraform/aws/aws-ec2-autoscaling-session-recorder/versions.tf +++ b/terraform/aws/aws-ec2-autoscaling-session-recorder/versions.tf @@ -1,5 +1,9 @@ terraform { required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 6.0, < 7.0" + } tailscale = { source = "tailscale/tailscale" version = ">= 0.24" diff --git a/terraform/aws/aws-ec2-autoscaling/versions.tf b/terraform/aws/aws-ec2-autoscaling/versions.tf index 333b284..70d492f 100644 --- a/terraform/aws/aws-ec2-autoscaling/versions.tf +++ b/terraform/aws/aws-ec2-autoscaling/versions.tf @@ -1,5 +1,9 @@ terraform { required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 6.0, < 7.0" + } tailscale = { source = "tailscale/tailscale" version = ">= 0.24" diff --git a/terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/versions.tf b/terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/versions.tf index 333b284..70d492f 100644 --- a/terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/versions.tf +++ b/terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/versions.tf @@ -1,5 +1,9 @@ terraform { required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 6.0, < 7.0" + } tailscale = { source = "tailscale/tailscale" version = ">= 0.24" diff --git a/terraform/aws/aws-ec2-instance/versions.tf b/terraform/aws/aws-ec2-instance/versions.tf index 333b284..70d492f 100644 --- a/terraform/aws/aws-ec2-instance/versions.tf +++ b/terraform/aws/aws-ec2-instance/versions.tf @@ -1,5 +1,9 @@ terraform { required_providers { + aws = { + source = "hashicorp/aws" + version = ">= 6.0, < 7.0" + } tailscale = { source = "tailscale/tailscale" version = ">= 0.24" diff --git a/terraform/aws/internal-modules/aws-vpc/versions.tf b/terraform/aws/internal-modules/aws-vpc/versions.tf index 310c3f7..32ccbe9 100644 --- a/terraform/aws/internal-modules/aws-vpc/versions.tf +++ b/terraform/aws/internal-modules/aws-vpc/versions.tf @@ -4,6 +4,10 @@ terraform { source = "hashicorp/aws" version = ">= 6.0, < 7.0" } + random = { + source = "hashicorp/random" + version = ">= 3.0, < 4.0" + } } required_version = ">= 1.0, < 2.0" diff --git a/terraform/azure/azure-linux-vm/versions.tf b/terraform/azure/azure-linux-vm/versions.tf index 333b284..d5e75c5 100644 --- a/terraform/azure/azure-linux-vm/versions.tf +++ b/terraform/azure/azure-linux-vm/versions.tf @@ -1,5 +1,9 @@ terraform { required_providers { + azurerm = { + source = "hashicorp/azurerm" + version = ">= 4.0, < 5.0" + } tailscale = { source = "tailscale/tailscale" version = ">= 0.24" diff --git a/terraform/azure/internal-modules/azure-network/versions.tf b/terraform/azure/internal-modules/azure-network/versions.tf index 6bfcb98..963d0dd 100644 --- a/terraform/azure/internal-modules/azure-network/versions.tf +++ b/terraform/azure/internal-modules/azure-network/versions.tf @@ -4,6 +4,10 @@ terraform { source = "hashicorp/azurerm" version = ">= 4.0, < 5.0" } + random = { + source = "hashicorp/random" + version = ">= 3.0, < 4.0" + } } required_version = ">= 1.0, < 2.0" diff --git a/terraform/google/google-compute-instance/versions.tf b/terraform/google/google-compute-instance/versions.tf index 333b284..97df296 100644 --- a/terraform/google/google-compute-instance/versions.tf +++ b/terraform/google/google-compute-instance/versions.tf @@ -1,5 +1,9 @@ terraform { required_providers { + google = { + source = "hashicorp/google" + version = ">= 7.0, < 8.0" + } tailscale = { source = "tailscale/tailscale" version = ">= 0.24" diff --git a/terraform/google/internal-modules/google-vpc/versions.tf b/terraform/google/internal-modules/google-vpc/versions.tf index 98cc894..3d6cd98 100644 --- a/terraform/google/internal-modules/google-vpc/versions.tf +++ b/terraform/google/internal-modules/google-vpc/versions.tf @@ -4,6 +4,10 @@ terraform { source = "hashicorp/google" version = ">= 7.0, < 8.0" } + random = { + source = "hashicorp/random" + version = ">= 3.0, < 4.0" + } } required_version = ">= 1.0, < 2.0" diff --git a/terraform/internal-modules/tailscale-advertise-routes/versions.tf b/terraform/internal-modules/tailscale-advertise-routes/versions.tf new file mode 100644 index 0000000..f8f3ed3 --- /dev/null +++ b/terraform/internal-modules/tailscale-advertise-routes/versions.tf @@ -0,0 +1,3 @@ +terraform { + required_version = ">= 1.0, < 2.0" +} From 68342acb9fc41b939db8929d0a5f263f82d10bef Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Fri, 19 Dec 2025 20:01:34 -0500 Subject: [PATCH 08/10] comment out help step --- .github/workflows/terraform-examples.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/terraform-examples.yml b/.github/workflows/terraform-examples.yml index 9ffcd08..25f812e 100644 --- a/.github/workflows/terraform-examples.yml +++ b/.github/workflows/terraform-examples.yml @@ -20,8 +20,8 @@ jobs: cache: true - name: Show version run: tflint --version - - name: help # TODO: remove - run: tflint -help + # - name: help + # run: tflint -help - name: Run run: tflint --chdir=terraform --recursive From 0a9e23e7841462b28a7314ab85a091e02c29368a Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Fri, 19 Dec 2025 20:26:04 -0500 Subject: [PATCH 09/10] add unused variable to test workflow --- terraform/google/google-compute-instance/main.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/terraform/google/google-compute-instance/main.tf b/terraform/google/google-compute-instance/main.tf index 7aad25a..ca2b53c 100644 --- a/terraform/google/google-compute-instance/main.tf +++ b/terraform/google/google-compute-instance/main.tf @@ -1,3 +1,5 @@ +variable "not_used" {} + locals { name = "example-${basename(path.cwd)}" From 546d8ff762d4195c77a1b8e34d9cf2c4697b8649 Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Fri, 19 Dec 2025 20:27:16 -0500 Subject: [PATCH 10/10] remove unused variable --- terraform/google/google-compute-instance/main.tf | 2 -- 1 file changed, 2 deletions(-) diff --git a/terraform/google/google-compute-instance/main.tf b/terraform/google/google-compute-instance/main.tf index ca2b53c..7aad25a 100644 --- a/terraform/google/google-compute-instance/main.tf +++ b/terraform/google/google-compute-instance/main.tf @@ -1,5 +1,3 @@ -variable "not_used" {} - locals { name = "example-${basename(path.cwd)}"