From db057670d1b617f09ec21a753d1f904136eecd8b Mon Sep 17 00:00:00 2001 From: Tobias Reisinger <tobias@msrg.cc> Date: Tue, 22 Apr 2025 00:42:13 +0200 Subject: [PATCH] Update terraform backend config (use directly from env) --- .terraform.lock.hcl | 58 +++++++++++++++++----------------- main.tf | 8 +---- modules/infrastructure/main.tf | 2 +- variables.tf | 16 ---------- 4 files changed, 31 insertions(+), 53 deletions(-) diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index a8bcece..2b50708 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -46,20 +46,20 @@ provider "registry.opentofu.org/goauthentik/authentik" { } provider "registry.opentofu.org/hashicorp/aws" { - version = "5.94.1" + version = "5.95.0" constraints = "~> 5.0" hashes = [ - "h1:Jj2epe7xRnMxRvgQxkYYc48eGRtPTixTHW84D4ViNfg=", - "zh:2cdc129ba213e949e48ec8edd43b288a403de879a953fdf65b5a261d06e0a41b", - "zh:30729876ada83b3a87863097adcf43ba0f523adf0c123b64d6b07854252e3fa1", - "zh:3d3b0a09fce307848871f145a89edf26ab8dc6138d03bbb6effa280e904a7590", - "zh:4751905b38328d1358343adb1ca4de375cb5d04444b1b9ca65ede5f8673e99ea", - "zh:90f679d2c9ef92307b93e345f8617e2b8901d71b3843fd463e2206e632060d55", - "zh:a6afd6da08b27630e5d723983de2e5d72f559a4acd2cbe5d4f52c9d054958e02", - "zh:b718c6f1cfc19e61104f0c058e173db6a3720a7ffca226d2d0a16d899845d27d", - "zh:b738cfde4bbf22446d8fc0f1952f754ed3996c1a13395fc2d17c4fd904e9c110", - "zh:e0c0b8166abc935e30aaf834091424b710d1ce7b18d2da2e4619ee70f065904e", - "zh:eaf138b103328edf5317e64af3013e25ba337d20fa1854c2a4199fcb2a13cbf0", + "h1:c+V47v2phTnnkEEEywpWQ/ygMfI3A29fhfX96D9xHw4=", + "zh:0df3b32ee89d8eded1548bf2866aee5d40aab2e23930bf9411e7e03bfd982045", + "zh:1995729fff2eb9ae68e37ad6bdb7eee041a71008d2b30fa187b2347131878926", + "zh:1e2f89a09f8ea80097bc692ffe4b80a74d1ff7852cd14233ca2826897f0834f7", + "zh:7ad851d4ef77963bd97ae0b2dc4ea24d76f520883285f8d0a96476ed3015b014", + "zh:85ad403fdc1950a066156cde836d130593efa714b9b8b836540f465eb3cc9b09", + "zh:9cf5b52172dd6f8bc8eab3d83353de3419faed71d4e8b5def9042e82d2fea5f8", + "zh:b0ef2c4f8dcfd0d2d9996b8560f32b48938fcd4178ab279b545531f8e0e2a9e8", + "zh:d0a14a77b75f9949205df22364974f37d2c3d34698e92fe3ddc454364ef3e339", + "zh:e3a28054088c05edd5f867c7e3bd9d4d01908600f862993f6c8bcae4ab2156ef", + "zh:fe058932d4fb479f691f015d672f1e6e29d9f507c874fabc3a6e8362e7d2b03b", ] } @@ -195,24 +195,24 @@ provider "registry.opentofu.org/ovh/ovh" { } provider "registry.opentofu.org/scaleway/scaleway" { - version = "2.43.0" - constraints = "~> 2.43.0" + version = "2.53.0" + constraints = "~> 2.53.0" hashes = [ - "h1:adTVxpdKkSUVDasMWHrNqoSRDD6ztSVXONOEhnmIkyY=", - "zh:019b1d05013bed2ac7687d64ff51a5b150cefacaef4cc752d677cdb0c06b07a0", - "zh:0fc7a5e0178774945ca8135585ea51d755da66a2083e88e87b522efa058ac556", - "zh:295ee6f2b45deb01b0961d189110ad704b3634026d7d3ace424dba7a51623cf1", - "zh:526ef9b9a5678ab61537ba021f2421b8d11d893e3fdfcef15c720d309631ede0", - "zh:6624284c6424fe07c9cfd09204174c44716d26ed8b48d2d13ceaa937c3eb0b8a", - "zh:6ccc51561986facc7f8b25e148fa6b528afb04b65a8df7afba73fe65cf6c2f04", - "zh:790b74d9d85c8596fe5974cfb59740508668fb65c6dea04f08f769c08c917446", - "zh:9b58cd255511124458b03dac23e2db2625c8f2ef3148ea3ca10a514511233416", - "zh:b339ad67e9a7bbe02382d1c48b633e1a3da0c3c245093a50a86fedf33548339c", - "zh:cee426f008289568f20297775d689734fd674a03c2c9b9691fb38f94c4c0ab34", - "zh:e3f0e06190767aff4a2d7242a865f7ac2963eb59a00d86b2a8359911e2d514d1", - "zh:ef958ad54d4e6cd4d76a5fbe86a051fb411998a27cb1cf7229c05463d0ad535e", - "zh:f8608db4e7e7156c4f7f7205e8b3a2095a49e115402257323d0180a8bafc2d2e", - "zh:f88ce1874d5f2faa06c81bc1666ecf8ec1cc3dd7ffe68688c17ae8a2f30692e4", + "h1:hAANnqEQl4ITO3QtgZrF49TgwGA+3hFuyXwEvrHeBz0=", + "zh:043e9d776a823bfae06cdd9e58c6db3ba284628d9bf0d0241a0c48e9abab12a5", + "zh:29bfa7829f7227dc8756d66bd28744f80a66733ede6fcea3fea4440060841771", + "zh:34bac96d22613f8519b185cfde0db1891591fde6e89c7949105c3e7a664da522", + "zh:3d2370e2eb63fa7f9e94894df7d5c155276061b993b59fc658858f31685e3982", + "zh:54747c4d1d608e3239b7d52436db7efe5293859897b4e86e7cfd419673445586", + "zh:641fbdd9e47c642ca551f310bc6fae98c1e81ba7bf6e2a5db8754a8a9968b3a3", + "zh:6a57b720062e5d1e5ea7698f5ac1a76f6be82dc22ea7150a316680b65e9cac47", + "zh:7288ffa239d0282e2bdcdc46e9fd52c6147414d1c7218a8144ea207e1004b5cf", + "zh:928e6daa60c7247d73123f2f5d956b89e111bdac035edc1b8df02b4f54aca71f", + "zh:aeb852c289f53bdd2a3cc129279fe3325f93565ff72a9fe9e98ac3b87eed4a83", + "zh:b0a729b9272c8e44d4a54908557b4f220554acd6dbcf7ddab61562b08ed1ca8b", + "zh:b96d2dcb56fe090d24bc53348c10c685f82a7eb809ef688eac2624d6b0a7f422", + "zh:b9b223a0fe649035407e8c8a8d0f82b26078e1ef14f26dcfff6798a7c6940b7f", + "zh:d6c1ba9f8b9589e7508c53e071a13e9f2acaf4eb192b9bbb9d981e9f09b7e87d", ] } diff --git a/main.tf b/main.tf index 3f6ba38..860f2bf 100644 --- a/main.tf +++ b/main.tf @@ -18,7 +18,7 @@ terraform { } scaleway = { source = "scaleway/scaleway" - version = "~> 2.43.0" + version = "~> 2.53.0" } tailscale = { source = "tailscale/tailscale" @@ -41,14 +41,8 @@ terraform { backend "s3" { bucket = var.backend_bucket - access_key = var.backend_access_key - secret_key = var.backend_secret_key key = "terraform.tfstate" - region = var.backend_region encrypt = true - endpoints = { - s3 = var.backend_endpoint - } # Disable AWS-specific features skip_credentials_validation = true diff --git a/modules/infrastructure/main.tf b/modules/infrastructure/main.tf index 0858f81..bb7ed2d 100644 --- a/modules/infrastructure/main.tf +++ b/modules/infrastructure/main.tf @@ -18,7 +18,7 @@ terraform { } scaleway = { source = "scaleway/scaleway" - version = "~> 2.43.0" + version = "~> 2.53.0" } tailscale = { source = "tailscale/tailscale" diff --git a/variables.tf b/variables.tf index 4224771..ae30b4a 100644 --- a/variables.tf +++ b/variables.tf @@ -2,22 +2,6 @@ variable "passphrase" { sensitive = true } -variable "backend_access_key" { - sensitive = true -} - -variable "backend_secret_key" { - sensitive = true -} - -variable "backend_endpoint" { - sensitive = false -} - -variable "backend_region" { - sensitive = false -} - variable "backend_bucket" { sensitive = false }