Update hooks

.pre-commit-config.yaml

@@ -1,22 +1,26 @@
 ---
 repos:
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.64.1
+    rev: v1.76.0
     hooks:
       - id: terraform_fmt
       - id: terraform_validate
-      - id: terraform_providers_lock
+        args:
-      # - id: terraform_tflint
+          - --tf-init-args=-lockfile=readonly
-      # - id: terraform_tfsec
+      - id: terraform_tflint
+        args:
+          - --args=--config=__GIT_WORKING_DIR__/.tflint.hcl
+      - id: terraform_tfsec
+      # - id: terraform_providers_lock
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.3.0
     hooks:
       - id: check-added-large-files
       - id: check-merge-conflict
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/Yelp/detect-secrets
-    rev: v1.2.0
+    rev: v1.4.0
     hooks:
       - id: detect-secrets
         args: ['--baseline', '.secrets-baseline']

.secrets-baseline

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.0",
+  "version": "1.4.0",
   "plugins_used": [
     {
       "name": "ArtifactoryDetector"

.tflint.hcl

@@ -0,0 +1,7 @@
+rule "terraform_required_version" {
+  enabled = false
+}
+
+rule "terraform_required_providers" {
+  enabled = false
+}

core/blocky/blocky.tf

@@ -8,7 +8,7 @@ locals {
   config_data = templatefile(
     "${path.module}/config.yml",
     {
-      "base_hostname" = "${var.base_hostname}",
+      "base_hostname" = var.base_hostname,
     }
   )
 }
@@ -17,7 +17,7 @@ resource "nomad_job" "blocky" {
   hcl2 {
     enabled = true
     vars = {
-      "config_data" = "${local.config_data}",
+      "config_data" = local.config_data,
     }
   }
 

core/metrics/metrics.tf

@@ -6,12 +6,6 @@ resource "nomad_job" "exporters" {
   jobspec = file("${path.module}/exporters.nomad")
 }
 
-data "consul_nodes" "all-nodes" {
-  query_options {
-    datacenter = "dc1"
-  }
-}
-
 resource "nomad_job" "prometheus" {
   hcl2 {
     enabled = true
@@ -26,7 +20,7 @@ resource "nomad_job" "grafana" {
   }
 
   jobspec = templatefile("${path.module}/grafana.nomad", {
-    module_path = "${path.module}"
+    module_path = path.module
   })
 }
 

core/traefik/traefik.tf

@@ -8,7 +8,7 @@ resource "nomad_job" "traefik" {
   hcl2 {
     enabled = true
     vars = {
-      "base_hostname" = "${var.base_hostname}",
+      "base_hostname" = var.base_hostname,
     }
   }
 

requirements.txt

@@ -1,5 +1,5 @@
 pre-commit
-detect-secrets==1.2.0
+detect-secrets==1.4.0  # This should match what is in .pre-commit-config.yaml
 ansible
 python-consul
 hvac

root.tf

@@ -10,3 +10,7 @@
 # module "storage_plugins" {
 #   source = "./storage_plugins"
 # }
+
+terraform {
+  required_version = ">=1.2.9"
+}

services/backups/backups.tf

@@ -1,6 +1,6 @@
 resource "nomad_job" "backups" {
   jobspec = templatefile("${path.module}/backup.nomad", {
-    module_path = "${path.module}",
+    module_path = path.module,
     batch_node  = null,
   })
 }
@@ -18,7 +18,7 @@ resource "nomad_job" "backups-oneoff" {
   #   node.node_name
   # ])
   jobspec = templatefile("${path.module}/backup.nomad", {
-    module_path = "${path.module}",
+    module_path = path.module,
     batch_node  = each.key,
   })
 }

services/nextcloud/nextcloud.tf

@@ -6,7 +6,7 @@ resource "nomad_job" "nextcloud" {
   hcl2 {
     enabled = true
     vars = {
-      "backup_config" = "${local.backup_config}",
+      "backup_config" = local.backup_config,
     }
   }
 

storage_plugins/democratic-csi.tf

@@ -28,9 +28,9 @@ resource "nomad_job" "storage-controller" {
   hcl2 {
     enabled = true
     vars = {
-      "image_name"  = "${var.image_name}",
+      "image_name"  = var.image_name,
-      "csi_version" = "${var.csi_version}",
+      "csi_version" = var.csi_version,
-      "config_data" = "${local.democratic_nfs_config}"
+      "config_data" = local.democratic_nfs_config
     }
   }
 
@@ -41,9 +41,9 @@ resource "nomad_job" "storage-node" {
   hcl2 {
     enabled = true
     vars = {
-      "image_name"  = "${var.image_name}",
+      "image_name"  = var.image_name,
-      "csi_version" = "${var.csi_version}",
+      "csi_version" = var.csi_version,
-      "config_data" = "${local.democratic_nfs_config}"
+      "config_data" = local.democratic_nfs_config
     }
   }