Upgrade trunk

.terraform.lock.hcl

@@ -3,7 +3,7 @@
 
 provider "registry.terraform.io/brendanthompson/scratch" {
   version     = "0.4.0"
-  constraints = "0.4.0, ~> 0.4"
+  constraints = "0.4.0"
   hashes = [
     "h1:MTVRrvKcbCMw67V+QMOWkHaH5W6wusaBwoB2e6HcELM=",
     "zh:02de448b66fa61d39588dadb267698f361a3b681beb48d6576068923de600df7",
@@ -106,25 +106,3 @@ provider "registry.terraform.io/matthewbaggett/ssh" {
     "zh:d2f7677b7b27ae80395bc4e7606cb25fb1c84770a1b6a7042dcc6b92558c7d1b",
   ]
 }
-
-provider "registry.terraform.io/telmate/proxmox" {
-  version     = "2.9.14"
-  constraints = "~> 2.9"
-  hashes = [
-    "h1:H/f+LbVyPOLslHLAYnGuMMRqWFZ65K6E3V+MCYgfAyk=",
-    "zh:0d049d33f705e5b814d30028770c084151218439424e99684ce31d7e26a720b5",
-    "zh:20b1c64ed56d81de95f3f37b82b45b4654c0de26670c0e87a474c5cce13cd015",
-    "zh:2946058abd1d8e50e475b9ec39781eb02576b40dbd80f4653fade4493a4514c6",
-    "zh:29e50a25c456f040ce072f23ac57b5b82ebd3b916ca5ae6688332b5ec62adc4a",
-    "zh:3612932306ce5f08db94868f526cbb8c56d0d3c6ebe1c11a83f92bbf94354296",
-    "zh:42d1699b0abebaac82ea5a19f4393541d8bb2741bde204a8ac1028cdc29d1b14",
-    "zh:5ffd5dc567262eb8aafdf2f6eac63f7f21361da9c5d75a3c36b479638a0001b0",
-    "zh:6692ef323e3b89de99934ad731f6a1850525bf8142916ae28ea4e4048d73a787",
-    "zh:a5afc98e9a4038516bb58e788cb77dea67a60dce780dfcd206d7373c5a56b776",
-    "zh:bf902cded709d84fa27fbf91b589c241f2238a6c4924e4e479eebd74320b93a5",
-    "zh:cab0e1e72c9cebcf669fc6f35ec28cb8ab2dffb0237afc8860aa40d23bf8a49f",
-    "zh:e523b99a48beec83d9bc04b2d336266044f9f53514cefb652fe6768611847196",
-    "zh:f593915e8a24829d322d2eaeedcb153328cf9042f0d84f66040dde1be70ede04",
-    "zh:fba1aff541133e2129dfda0160369635ab48503d5c44b8407ce5922ecc15d0bd",
-  ]
-}

.trunk/trunk.yaml

@@ -2,12 +2,12 @@
 # To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
 version: 0.1
 cli:
-  version: 1.22.3
+  version: 1.22.2
 # Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins)
 plugins:
   sources:
     - id: trunk
-      ref: v1.6.2
+      ref: v1.6.1
       uri: https://github.com/trunk-io/plugins
 # Many linters and tools depend on runtimes - configure them here. (https://docs.trunk.io/runtimes)
 runtimes:
@@ -24,10 +24,10 @@ lint:
     - checkov
   enabled:
     - hadolint@2.12.0
-    - tflint@0.53.0
+    - tflint@0.52.0
     - gitleaks@8.18.4
     - markdownlint@0.41.0
-    - taplo@0.9.3
+    - taplo@0.9.2
     - actionlint@1.7.1
     - git-diff-check
     - prettier@3.3.3
@@ -49,12 +49,12 @@ tools:
     - gh@2.49.2
     - jq@jq-1.7.1
     - yq@4.44.1
-    - awscli@1.33.17
+    - awscli@1.33.31
     - action-validator@0.6.0
-    - act@0.2.65
+    - act@0.2.63
     - shellcheck@0.10.0
     - hadolint@2.12.0
-    - tofu@1.8.1
+    - tofu@1.7.2
     - trunk-toolbox@0.3.2
-    - tflint@0.53.0
+    - tflint@0.52.0
     - terraform@1.9.0

flatcars.tf

@@ -1,19 +0,0 @@
-resource "proxmox_vm_qemu" "flatcar_test" {
-  name = "flatcar-test"
-  target_node = "longhorn"
-  iso = "local_vms/iso/flatcar_production_iso_image.iso"
-  cores = 2
-  memory = 4096
-  automatic_reboot = true
-  disk {
-    type = "ide"
-    storage = "local_vms"
-    size = "32G"
-    backup = false
-  }
-    network {
-        model = "e1000"
-        bridge = "vmbr13"
-        firewall = false
-    }
-}

modules/vigil/inputs.tf

@@ -25,7 +25,7 @@ variable "notify_telegram" {
   type = object({
     token   = string
     channel = string
-    topic   = optional(string, null)
+    topic = optional(string, null)
   })
   description = "Telegram configuration"
   default     = null

nginx.tf

@@ -15,7 +15,7 @@ module "nginx" {
   source = "git::https://code.techinc.nl/grey/terraform-nginx.git"
   configs = concat(
     module.minio.nginx_files,
-    //module.vigil_nginx_config.files,
+    module.vigil_nginx_config.files,
     module.videobucket_nginx_config.files,
     //module.netbox_nginx_config.files,
     module.orcaslicer_nginx_config.files,

orca-slicer.tf

@@ -12,7 +12,7 @@ resource "docker_service" "orcaslicer" {
       env = {
         PUID = 1000
         PGID = 1000
-        TZ   = "Europe/Amsterdam"
+        TZ = "Europe/Amsterdam"
       }
       mounts {
         target = "/config"

proxmox.tf

@@ -1,15 +0,0 @@
-variable "proxmox_endpoint" {
-  type = string
-}
-variable "proxmox_token_id" {
-  type = string
-}
-variable "proxmox_token_secret" {
-  type = string
-}
-provider "proxmox" {
-  pm_debug            = true
-  pm_api_url          = var.proxmox_endpoint
-  pm_api_token_id     = var.proxmox_token_id
-  pm_api_token_secret = var.proxmox_token_secret
-}

terraform.tf

@@ -16,11 +16,7 @@ terraform {
     }
     scratch = {
       source  = "BrendanThompson/scratch"
-      version = "~> 0.4"
-    }
-    proxmox = {
-      source  = "Telmate/proxmox"
-      version = "~> 2.9"
+      version = "0.4.0"
     }
   }
 

vigil.tf

@@ -10,15 +10,15 @@ module "vigil_nginx_config" {
   allow_ssl     = false
 }
 variable "telegram_token" {
-  type    = string
+  type = string
   default = ""
 }
 variable "telegram_channel" {
-  type    = string
+  type = string
   default = ""
 }
 variable "telegram_topic" {
-  type    = string
+  type = string
   default = ""
 }
 module "vigil" {
@@ -72,21 +72,21 @@ module "vigil" {
     ]
     "PDUs" = [
       {
-        id    = "pdu-main"
+        id = "pdu-main"
         label = "PDU Main Space"
         endpoints = [
           "icmp://main.pdu.ti",
           "tcp://main.pdu.ti:23",
         ]
-        }, {
-        id    = "pdu-aux"
+      },{
+        id = "pdu-aux"
         label = "PDU Aux Space"
         endpoints = [
           "icmp://aux.pdu.ti",
           "tcp://aux.pdu.ti:23",
         ]
-        }, {
-        id    = "pdu-printers"
+      },{
+        id = "pdu-printers"
         label = "PDU Printers"
         endpoints = [
           "icmp://printer.pdu.ti",
@@ -243,6 +243,6 @@ module "vigil" {
   notify_telegram = {
     token   = var.telegram_token
     channel = var.telegram_channel
-    topic   = var.telegram_topic
+    topic = var.telegram_topic
   }
 }