Merge pull request #50 from 7Factor/clayton/user-data-template-fix

concourse_base_resource_type_defaults fix
7Factor · Apr 26, 2024 · 99924c5 · 99924c5
2 parents 2113729 + 857bc93
commit 99924c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/s3.tf b/s3.tf
@@ -1,6 +1,6 @@
 locals {
-  web_user_data_content    = sensitive(templatefile("${path.module}/templates/web_user_data.sh", local.web_interpolation_vars))
-  worker_user_data_content = sensitive(templatefile("${path.module}/templates/worker_user_data.sh", local.worker_interpolation_vars))
+  web_user_data_content    = templatefile("${path.module}/templates/web_user_data.sh", local.web_interpolation_vars)
+  worker_user_data_content = templatefile("${path.module}/templates/worker_user_data.sh", local.worker_interpolation_vars)
 }
 
 resource "aws_s3_bucket" "user_data" {
@@ -64,13 +64,13 @@ resource "aws_s3_object" "cw_agent_prometheus_init" {
 resource "aws_s3_object" "web_user_data" {
   bucket      = aws_s3_bucket.user_data.id
   key         = "web_user_data.sh"
-  content     = local.web_user_data_content
+  content     = sensitive(local.web_user_data_content)
   source_hash = md5(local.web_user_data_content)
 }
 
 resource "aws_s3_object" "worker_user_data" {
   bucket      = aws_s3_bucket.user_data.id
   key         = "worker_user_data.sh"
-  content     = local.worker_user_data_content
+  content     = sensitive(local.worker_user_data_content)
   source_hash = md5(local.worker_user_data_content)
 }
diff --git a/web_variables.tf b/web_variables.tf
@@ -73,7 +73,7 @@ variable "web_patch_schedule" {
 }
 
 variable "concourse_base_resource_type_defaults" {
-  type        = object({})
+  type        = map(any)
   default     = {}
   description = "Pass default base resource type options here. Defaults to nothing."
 }