Skip to content

Fix empty map bug in aws scalardl #251

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

Merged
merged 2 commits into from
Dec 16, 2020
Merged

Fix empty map bug in aws scalardl #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b10549
Fix empty map bug in aws scalardl
tei-k Dec 15, 2020
74b7b2a
Fix remote resource
tei-k Dec 15, 2020
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
6 changes: 4 additions & 2 deletions examples/aws/scalardl/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ locals {
green_subnet_ids = join(",", data.terraform_remote_state.network.outputs.subnet_map["scalardl_green"])
}

database = lookup(var.scalardl, "database", "cassandra")

cassandra = {
start_on_initial_boot = var.scalardl.database == "cassandra" ? data.terraform_remote_state.cassandra.outputs.cassandra_start_on_initial_boot : false
provision_ids = var.scalardl.database == "cassandra" ? join(",", data.terraform_remote_state.cassandra.outputs.cassandra_provision_ids) : ""
start_on_initial_boot = local.database == "cassandra" ? data.terraform_remote_state.cassandra[0].outputs.cassandra_start_on_initial_boot : false
provision_ids = local.database == "cassandra" ? join(",", data.terraform_remote_state.cassandra[0].outputs.cassandra_provision_ids) : ""
}

custom_tags = data.terraform_remote_state.network.outputs.custom_tags
Expand Down
2 changes: 2 additions & 0 deletions examples/aws/scalardl/remote.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ data "terraform_remote_state" "network" {
}

data "terraform_remote_state" "cassandra" {
count = local.database == "cassandra" ? 1 : 0

backend = "local"

config = {
Expand Down
2 changes: 2 additions & 0 deletions examples/aws/scalardl/remote.tf.s3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ data "terraform_remote_state" "network" {
}

data "terraform_remote_state" "cassandra" {
count = local.database == "cassandra" ? 1 : 0

backend = "s3"

config = {
Expand Down
12 changes: 6 additions & 6 deletions modules/aws/scalardl/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@ locals {
blue_subnet_ids = split(",", var.network.blue_subnet_ids)
green_subnet_ids = split(",", var.network.green_subnet_ids)
internal_domain = var.network.internal_domain

triggers = [
(lookup(var.scalardl, "database", "cassandra") == "cassandra" && var.cassandra.start_on_initial_boot) ?
var.cassandra.provision_ids :
var.network.bastion_provision_id
]
}

### default
Expand Down Expand Up @@ -120,3 +114,9 @@ locals {
envoy_nlb_create_count = local.envoy.enable_nlb ? 1 : 0
envoy_nlb_subnet_ids = local.envoy.nlb_internal ? slice(local.private_subnet_ids, 0, length(distinct(local.locations))) : slice(local.public_subnet_ids, 0, length(distinct(local.locations)))
}

locals {
triggers = [
local.scalardl.database == "cassandra" && var.cassandra.start_on_initial_boot ? var.cassandra.provision_ids : var.network.bastion_provision_id
]
}