Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

concourse_base_resource_type_defaults fix #50

Merged
merged 5 commits into from
Apr 26, 2024
Merged

concourse_base_resource_type_defaults fix #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8fa5b1c
removing sensitive function around the md5 contents
cbailey6079 Apr 26, 2024
4fb04f6
changing the object var to a map and seeing if we can determine if th…
cbailey6079 Apr 26, 2024
664b6c4
updating the variable type to map any
cbailey6079 Apr 26, 2024
ce1e4ed
testing if the map solved the issue
cbailey6079 Apr 26, 2024
857bc93
removed null check in asg and changed back to map with default being …
cbailey6079 Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions s3.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion web_variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
}
Loading