Skip to content

Commit 613df0b

Browse files
committed
Refactoring to use locals instead of null
1 parent c02efce commit 613df0b

File tree

4 files changed

+65
-4
lines changed

4 files changed

+65
-4
lines changed

main.tf

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,19 @@
55
# Add attributes to name if not empty
66
# return name as lowercase
77
# return id and id_20, id_32 for combined name
8+
# Refactor to use local and output the locals. Test - test - test
89

10+
locals {
11+
attr = "${lower(format("%s", join(var.delimiter, compact(var.attributes))))}"
12+
env = "${lower(format("%s", var.environment))}"
13+
name_low = "${lower(format("%s", var.name))}"
14+
org = "${lower(format("%s", var.organization))}"
15+
name_env = "${var.namespace-env ? join(var.delimiter, list(local.env, local.name_low)) : local.name_low}"
16+
name_org = "${var.namespace-org ? join(var.delimiter, list(local.org, local.name_env)) : local.name_env}"
17+
name_20 = "${substr(replace(local.name_org,"_","-"),0,19 <= length(local.name_org) ? 19 : length(local.name_org))}"
18+
name_32 = "${substr(replace(local.name_org,"_","-"),0,31 <= length(local.name_org) ? 31 : length(local.name_org))}"
19+
}
20+
/*
921
resource "null_resource" "pre1" {
1022
count = "${var.enabled ? 1 : 0}"
1123
triggers = {
@@ -32,6 +44,7 @@ resource "null_resource" "this" {
3244
triggers = {
3345
attributes = "${null_resource.pre1.triggers.attributes}"
3446
environment = "${null_resource.pre1.triggers.environment}"
47+
id = "${local.name_org}"
3548
organization = "${null_resource.pre1.triggers.organization}"
3649
name = "${null_resource.pre3.triggers.name_org}"
3750
name_20 = "${substr(replace(null_resource.pre3.triggers.name_org,"_","-"),0,19 <= length(null_resource.pre3.triggers.name_org) ? 19 : length(null_resource.pre3.triggers.name_org))}"
@@ -42,5 +55,6 @@ resource "null_resource" "this" {
4255
map("Name", var.name),
4356
map("Environment", var.environment),
4457
map("Terraform", "true") )}"*/
45-
}
58+
/* }
4659
}
60+
*/

outputs.tf

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,35 @@
11

2+
output "attributes" {
3+
description = "Attribute string lowercase"
4+
value = "${local.attr}"
5+
}
6+
output "environment" {
7+
description = "Environment name lowercase"
8+
value = "${local.env}"
9+
}
10+
output "id" {
11+
description = "Full formatted name ID"
12+
#value = "${null_resource.this.triggers.id}"
13+
value = "${local.name_org}"
14+
}
15+
output "name" {
16+
description = "Name"
17+
value = "${local.name_low}"
18+
}
19+
output "name_20" {
20+
description = "Name truncated to 20 characters"
21+
value = "${local.name_20}"
22+
}
23+
output "name_32" {
24+
description = "Name truncated to 32 characters"
25+
value = "${local.name_32}"
26+
}
27+
output "organization" {
28+
description = "Organization name lowercase"
29+
value = "${local.org}"
30+
}
31+
32+
/*
233
output "attributes" {
334
description = "Attribute string lowercase"
435
value = "${null_resource.this.triggers.attributes}"
@@ -7,6 +38,11 @@ output "environment" {
738
description = "Environment name lowercase"
839
value = "${null_resource.this.triggers.environment}"
940
}
41+
output "id" {
42+
description = "Full formatted name ID"
43+
#value = "${null_resource.this.triggers.id}"
44+
value = "${local.name_org}=new"
45+
}
1046
output "name" {
1147
description = "Name"
1248
value = "${null_resource.this.triggers.name}"
@@ -23,13 +59,14 @@ output "organization" {
2359
description = "Organization name lowercase"
2460
value = "${null_resource.this.triggers.organization}"
2561
}
62+
*/
2663
output "tags" {
2764
value = "${ merge(
2865
var.tags,
2966
map(
30-
"Name", "${null_resource.this.triggers.name}",
31-
"Environment", "${null_resource.this.triggers.environment}",
32-
"Organization", "${null_resource.this.triggers.organization}",
67+
"Name", "${local.name_org}",
68+
"Environment", "${local.env}",
69+
"Organization", "${local.org}",
3370
"Terraform", "true"
3471
))}"
3572
}

test/outputs.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ output "environment" {
77
description = "Environment name lowercase"
88
value = "${module.labels.environment}"
99
}
10+
output "id" {
11+
value = "${module.labels.id}"
12+
}
1013
output "name" {
1114
description = "Name"
1215
value = "${module.labels.name}"

variables.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ variable "tags" {
3737
}
3838

3939
// Internal Variables
40+
variable "id" {
41+
default = ""
42+
}
4043
variable "name_lower" {
4144
description = "Internal"
4245
default = ""
@@ -49,3 +52,7 @@ variable "name_org" {
4952
description = "Internal"
5053
default = ""
5154
}
55+
variable "nameo" {
56+
description = "Internal"
57+
default = ""
58+
}

0 commit comments

Comments
 (0)