dev: resolve all tflint issues

cruxstack · Aug 13, 2023 · 17ba6fd · 17ba6fd
1 parent cd51c7f
commit 17ba6fd
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -19,6 +19,9 @@ RUN SYSTEM_ARCH=$(dpkg --print-architecture) \
     && terraform version \
     && rm terraform_${TERRAFORM_VERSION}_linux_${SYSTEM_ARCH}.zip
 
+# install tflint
+RUN curl -s https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash
+
 # install docker
 COPY --from=docker:dind /usr/local/bin/docker /usr/local/bin/
 

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
   "name": "Terraform",
   "dockerFile": "Dockerfile",
   "features": {
-    "ghcr.io/devcontainers/features/docker-in-docker:2.0.1": {},
+    "ghcr.io/devcontainers/features/docker-in-docker:2.3.0": {}
   },
   "mounts": [
     "source=${localEnv:HOME}/.aws,target=/home/vscode/.aws,type=bind,consistency=cached"
@@ -37,8 +37,8 @@
         "hashicorp.terraform",
         "ms-azuretools.vscode-docker",
         "tsandall.opa",
-        "VisualStudioExptTeam.vscodeintellicode",
-      ],
+        "VisualStudioExptTeam.vscodeintellicode"
+      ]
     }
-  },
+  }
 }
diff --git a/Makefile b/Makefile
@@ -22,3 +22,6 @@ clean:
 	@find . -type d -name ".tfstate" -exec rm -rf {} +
 	@find . -type d -name ".tfstate.backup" -exec rm -rf {} +
 	@touch .devcontainer/.terraform.d/.gitkeep || true
+
+lint:
+	@tflint
diff --git a/main.tf b/main.tf
@@ -4,7 +4,7 @@ locals {
   auth_service_enabled       = local.enabled && var.auth_service_config.enabled
   urlrewrite_service_enabled = local.enabled && var.urlrewrite_service_config.enabled
 
-  aws_account_id  = try(coalesce(var.aws_account_id, data.aws_caller_identity.current[0].account_id), "")
+  aws_account_id  = try(coalesce(var.aws_account_id, data.aws_caller_identity.current[0].account_id), "") # tflint-ignore: terraform_unused_declarations
   aws_region_name = try(coalesce(var.aws_region_name, data.aws_region.current[0].name), "")
 
   service_config = {

diff --git a/version.tf b/version.tf
@@ -10,5 +10,9 @@ terraform {
       source  = "kreuzwerker/docker"
       version = ">= 3.0.0, < 4.0.0"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.5.1"
+    }
   }
 }