Merge pull request #195 from silinternational/hotfix/output-secret-salt

Release 10.4.0 output secret salt
silinternational · Jul 13, 2023 · cd7c3bc · cd7c3bc
2 parents f21901d + a3f82d7
commit cd7c3bc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/terraform/060-simplesamlphp/main.tf b/terraform/060-simplesamlphp/main.tf
@@ -53,6 +53,8 @@ locals {
 
   trusted_ip_addresses = concat(module.cf_ips.ipv4_cidrs, var.trusted_ip_addresses)
 
+  secret_salt = var.secret_salt == "" ? random_id.secretsalt.hex : var.secret_salt
+
   task_def = templatefile("${path.module}/task-definition.json", {
     memory                       = var.memory
     cpu                          = var.cpu
@@ -85,7 +87,7 @@ locals {
     recaptcha_key                = var.recaptcha_key
     recaptcha_secret             = var.recaptcha_secret
     remember_me_secret           = var.remember_me_secret
-    secret_salt                  = random_id.secretsalt.hex
+    secret_salt                  = local.secret_salt
     show_saml_errors             = var.show_saml_errors
     idp_name                     = var.idp_name
     idp_display_name             = var.idp_display_name

diff --git a/terraform/060-simplesamlphp/outputs.tf b/terraform/060-simplesamlphp/outputs.tf
@@ -10,3 +10,8 @@ output "admin_pass" {
   value = random_id.admin_pass.hex
 }
 
+output "secret_salt" {
+  value     = local.secret_salt
+  sensitive = true
+}
+
diff --git a/terraform/060-simplesamlphp/vars.tf b/terraform/060-simplesamlphp/vars.tf
@@ -1,3 +1,8 @@
+variable "secret_salt" {
+  default     = ""
+  description = "This allows for porting the value over from a primary to a secondary workspace (a random string that is 64 characters long)."
+}
+
 variable "memory" {
   default = "96"
 }