Skip to content

Commit 3bf87f6

Browse files
committed
fixed tests, revert unintended changes
1 parent 30801f6 commit 3bf87f6

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

src/notifications.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,22 +219,22 @@ locals {
219219
if key != "ssm_path_prefix" && key != "webhook"
220220
},
221221
{
222-
for key, value in coalesce(local.notifications_notifiers.webhook, {}) :
222+
for key, value in lookup(local.notifications_notifiers, "webhook", {}) :
223223
format("webhook_%s", key) =>
224224
{ for param_name, param_value in value : param_name => param_value if param_value != null }
225225
}
226226
)
227227

228228
## Get paths to read configs for each notifier service
229-
notifications_notifiers_ssm_path = merge(
229+
notifications_notifiers_ssm_path = local.enabled ? merge(
230230
{
231231
for key, value in local.notifications_notifiers_variables :
232232
key => format("%s/%s/", local.notifications_notifiers.ssm_path_prefix, key)
233233
},
234234
{
235235
common = format("%s/common/", local.notifications_notifiers.ssm_path_prefix)
236236
},
237-
)
237+
) : {}
238238

239239
## Read SSM secrets into object for each notifier service
240240
notifications_notifiers_ssm_configs = {

src/provider-helm.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,8 @@ locals {
133133
"--profile", var.kube_exec_auth_aws_profile
134134
] : []
135135

136-
kube_exec_auth_role_arn = coalesce(var.kube_exec_auth_role_arn, module.iam_roles.terraform_role_arn)
137136
exec_role = local.kube_exec_auth_enabled && var.kube_exec_auth_role_arn_enabled ? [
138-
"--role-arn", local.kube_exec_auth_role_arn
137+
"--role-arn", coalesce(var.kube_exec_auth_role_arn, module.iam_roles.terraform_role_arn)
139138
] : []
140139

141140
# Provide dummy configuration for the case where the EKS cluster is not available.

src/remote-state.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module "eks" {
22
source = "cloudposse/stack-config/yaml//modules/remote-state"
3-
version = "1.5.0"
3+
version = "1.8.0"
44

55
component = var.eks_component_name
66

@@ -9,7 +9,7 @@ module "eks" {
99

1010
module "dns_gbl_delegated" {
1111
source = "cloudposse/stack-config/yaml//modules/remote-state"
12-
version = "1.5.0"
12+
version = "1.8.0"
1313

1414
environment = "gbl"
1515
component = "dns-delegated"
@@ -20,7 +20,7 @@ module "dns_gbl_delegated" {
2020
module "saml_sso_providers" {
2121
for_each = local.enabled ? var.saml_sso_providers : {}
2222
source = "cloudposse/stack-config/yaml//modules/remote-state"
23-
version = "1.5.0"
23+
version = "1.8.0"
2424

2525
component = each.value.component
2626
environment = each.value.environment
@@ -32,7 +32,7 @@ module "argocd_repo" {
3232
for_each = local.enabled ? var.argocd_repositories : {}
3333

3434
source = "cloudposse/stack-config/yaml//modules/remote-state"
35-
version = "1.5.0"
35+
version = "1.8.0"
3636

3737
component = each.key
3838
environment = each.value.environment

0 commit comments

Comments
 (0)