refactor: standardize variables like in other modules

camptocamp · Jun 28, 2023 · 30a9f81 · 30a9f81
1 parent 9574559
commit 30a9f81
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/kind/extra-variables.tf b/kind/extra-variables.tf
@@ -1,9 +1,10 @@
 variable "metrics_storage" {
   description = "MinIO S3 bucket configuration values for the bucket where the archived metrics will be stored."
   type = object({
-    bucket_name       = string
-    endpoint          = string
-    access_key        = string
-    secret_access_key = string
+    bucket_name = string
+    endpoint    = string
+    access_key  = string
+    secret_key  = string
+    insecure    = optional(bool, true)
   })
 }
diff --git a/kind/locals.tf b/kind/locals.tf
@@ -7,8 +7,8 @@ locals {
           bucket     = "${var.metrics_storage.bucket_name}"
           endpoint   = "${var.metrics_storage.endpoint}"
           access_key = "${var.metrics_storage.access_key}"
-          secret_key = "${var.metrics_storage.secret_access_key}"
-          insecure   = true
+          secret_key = "${var.metrics_storage.secret_key}"
+          insecure   = var.metrics_storage.insecure
         }
       }
     }

diff --git a/sks/extra-variables.tf b/sks/extra-variables.tf
@@ -6,9 +6,9 @@ variable "cluster_id" {
 variable "metrics_storage" {
   description = "Exoscale SOS bucket configuration values for the bucket where the archived metrics will be stored."
   type = object({
-    bucket_name       = string
-    bucket_region     = string
-    access_key        = string
-    secret_access_key = string
+    bucket_name = string
+    region      = string
+    access_key  = string
+    secret_key  = string
   })
 }
diff --git a/sks/locals.tf b/sks/locals.tf
@@ -6,9 +6,9 @@ locals {
         type = "S3"
         config = {
           bucket     = "${var.metrics_storage.bucket_name}"
-          endpoint   = "sos-${var.metrics_storage.bucket_region}.exo.io"
+          endpoint   = "sos-${var.metrics_storage.region}.exo.io"
           access_key = "${var.metrics_storage.access_key}"
-          secret_key = "${var.metrics_storage.secret_access_key}"
+          secret_key = "${var.metrics_storage.secret_key}"
         }
       }
     }