Merge pull request #14 from camptocamp/oidc-default-value

OIDC default value
camptocamp · Oct 14, 2022 · 8b6ee0d · 8b6ee0d
2 parents b29c1c6 + 459d4a1
commit 8b6ee0d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/bootstrap/main.tf b/bootstrap/main.tf
@@ -45,7 +45,7 @@ resource "htpasswd_password" "argocd_server_admin" {
 }
 
 data "utils_deep_merge_yaml" "values" {
-  input = [for i in concat(local.helm_values, [{"argo-cd" = tomap(var.helm_values.0)}]) : yamlencode(i)]
+  input = [for i in concat(local.helm_values, [{ "argo-cd" = tomap(var.helm_values.0) }]) : yamlencode(i)]
 }
 
 resource "null_resource" "this" {

diff --git a/bootstrap/outputs.tf b/bootstrap/outputs.tf
@@ -30,7 +30,7 @@ output "argocd_domain" {
 }
 
 output "bootstrap_values" {
-  value = [yamldecode(data.utils_deep_merge_yaml.values.output)]
+  value     = [yamldecode(data.utils_deep_merge_yaml.values.output)]
   sensitive = true
 }
 

diff --git a/bootstrap/values.tf b/bootstrap/values.tf
@@ -8,8 +8,8 @@ locals {
           argocdServerAdminPassword      = "${htpasswd_password.argocd_server_admin.bcrypt}"
           argocdServerAdminPasswordMtime = "2020-07-23T11:31:23Z"
           extra = {
-            "accounts.pipeline.tokens"  = "${replace(local.argocd.accounts_pipeline_tokens, "\\\"", "\"")}"
-            "server.secretkey"          = "${replace(local.argocd.server_secretkey, "\\\"", "\"")}"
+            "accounts.pipeline.tokens" = "${replace(local.argocd.accounts_pipeline_tokens, "\\\"", "\"")}"
+            "server.secretkey"         = "${replace(local.argocd.server_secretkey, "\\\"", "\"")}"
           }
         }
       })

diff --git a/variables.tf b/variables.tf
@@ -19,6 +19,7 @@ variable "cluster_issuer" {
 variable "oidc" {
   description = "OIDC Settings"
   type        = any
+  default     = null
 }
 
 variable "argocd" {