Skip to content

Commit 73fc6ec

Browse files
committed
fix: Use correct state_id var in resource tags
Signed-off-by: Devon Crouse <[email protected]>
1 parent ebdab3e commit 73fc6ec

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

module-bastion.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ module "bastion" {
5656
use_defined_tags = var.use_defined_tags
5757
tag_namespace = var.tag_namespace
5858
defined_tags = merge(var.use_defined_tags ? {
59-
"${var.tag_namespace}.state_id" = var.state_id,
59+
"${var.tag_namespace}.state_id" = local.state_id,
6060
"${var.tag_namespace}.role" = "bastion",
6161
} : {}, local.bastion_defined_tags)
6262
freeform_tags = merge(var.use_defined_tags ? {} : {
63-
"state_id" = var.state_id,
63+
"state_id" = local.state_id,
6464
"role" = "bastion",
6565
}, local.bastion_freeform_tags)
6666
}

module-cluster.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,42 +71,42 @@ module "cluster" {
7171
# User-provided tags are merged last and take precedence
7272
cluster_defined_tags = var.use_defined_tags ? merge(
7373
{
74-
"${var.tag_namespace}.state_id" = var.state_id,
74+
"${var.tag_namespace}.state_id" = local.state_id,
7575
"${var.tag_namespace}.role" = "cluster",
7676
},
7777
local.cluster_defined_tags,
7878
) : {}
7979
cluster_freeform_tags = var.use_defined_tags ? {} : merge(
8080
{
81-
"state_id" = var.state_id,
81+
"state_id" = local.state_id,
8282
"role" = "cluster",
8383
},
8484
local.cluster_freeform_tags,
8585
)
8686
persistent_volume_defined_tags = var.use_defined_tags ? merge(
8787
{
88-
"${var.tag_namespace}.state_id" = var.state_id,
88+
"${var.tag_namespace}.state_id" = local.state_id,
8989
"${var.tag_namespace}.role" = "persistent_volume",
9090
},
9191
local.persistent_volume_defined_tags,
9292
) : {}
9393
persistent_volume_freeform_tags = var.use_defined_tags ? {} : merge(
9494
{
95-
"state_id" = var.state_id,
95+
"state_id" = local.state_id,
9696
"role" = "persistent_volume",
9797
},
9898
local.persistent_volume_freeform_tags,
9999
)
100100
service_lb_defined_tags = var.use_defined_tags ? merge(
101101
{
102-
"${var.tag_namespace}.state_id" = var.state_id,
102+
"${var.tag_namespace}.state_id" = local.state_id,
103103
"${var.tag_namespace}.role" = "service_lb"
104104
},
105105
local.service_lb_defined_tags,
106106
) : {}
107107
service_lb_freeform_tags = var.use_defined_tags ? {} : merge(
108108
{
109-
"state_id" = var.state_id,
109+
"state_id" = local.state_id,
110110
"role" = "service_lb"
111111
},
112112
local.service_lb_freeform_tags,

module-network.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ module "vcn" {
3131
# Standard tags as defined if enabled for use, or freeform
3232
# User-provided tags are merged last and take precedence
3333
defined_tags = merge(var.use_defined_tags ? {
34-
"${var.tag_namespace}.state_id" = var.state_id,
34+
"${var.tag_namespace}.state_id" = local.state_id,
3535
"${var.tag_namespace}.role" = "network",
3636
} : {},
3737
local.network_defined_tags,
3838
)
3939
freeform_tags = merge(var.use_defined_tags ? {} : {
40-
"state_id" = var.state_id,
40+
"state_id" = local.state_id,
4141
"role" = "network",
4242
},
4343
local.network_freeform_tags,

module-operator.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ module "operator" {
7373
# Standard tags as defined if enabled for use, or freeform
7474
# User-provided tags are merged last and take precedence
7575
defined_tags = merge(var.use_defined_tags ? {
76-
"${var.tag_namespace}.state_id" = var.state_id,
76+
"${var.tag_namespace}.state_id" = local.state_id,
7777
"${var.tag_namespace}.role" = "operator",
7878
} : {}, local.operator_defined_tags)
7979
freeform_tags = merge(var.use_defined_tags ? {} : {
80-
"state_id" = var.state_id,
80+
"state_id" = local.state_id,
8181
"role" = "operator",
8282
}, local.operator_freeform_tags)
8383
use_defined_tags = var.use_defined_tags

0 commit comments

Comments
 (0)