Skip to content

Commit a144628

Browse files
author
Steven Nemetz
committed
Add new variables and tags for current corporate standard
1 parent d8e1d75 commit a144628

File tree

3 files changed

+41
-4
lines changed

3 files changed

+41
-4
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
{
4444
echo -e "config {\nterraform_version = \"${tf_ver}\"\ndeep_check = true\nignore_module = {"
4545
for module in $(grep -h '[^a-zA-Z]source[ =]' *.tf | sed -r 's/.*=\s+//' | sort -u); do
46+
# if not ^"../
4647
echo "${module} = true"
4748
done
4849
echo "}}"

main.tf

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,16 @@ locals {
6161
tags = "${ merge(
6262
var.tags,
6363
map(
64-
"Name", "${local.id}",
65-
"Environment", "${local.env}",
64+
"Component", "${var.component}",
65+
"Environment", "${local.env}",
66+
"Monitor", "${var.monitor}",
67+
"Name", "${local.id}",
6668
"Organization", "${local.org}",
67-
"Terraform", "true"
69+
"Owner", "${var.owner}",
70+
"Product", "${var.product}",
71+
"Service", "${var.service}",
72+
"Team", "${var.team}",
73+
"Terraform", "true"
6874
)
6975
)}"
7076

variables.tf

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ variable "autoscaling_group" {
99
default = false
1010
}
1111

12+
variable "component" {
13+
description = "Underlying, dedicated piece of service (Cache, DB, ...)"
14+
default = "UNDEF"
15+
}
16+
1217
variable "delimiter" {
1318
description = "Delimiter to be used between `name`, `namespaces`, `attributes`, etc."
1419
default = "-"
@@ -18,6 +23,11 @@ variable "environment" {
1823
description = "Environment (ex: `dev`, `qa`, `stage`, `prod`). (Second or top level namespace. Depending on namespacing options)"
1924
}
2025

26+
variable "monitor" {
27+
description = "Should resource be monitored"
28+
default = "UNDEF"
29+
}
30+
2131
variable "name" {
2232
description = "Base name for resource"
2333
}
@@ -33,12 +43,32 @@ variable "namespace-org" {
3343
}
3444

3545
variable "organization" {
36-
description = "Organization name (Top level namespace)."
46+
description = "Organization name (Top level namespace)"
3747
default = ""
3848
}
3949

50+
variable "owner" {
51+
description = "Owner of the service"
52+
default = "UNDEF"
53+
}
54+
55+
variable "product" {
56+
description = "Company/business product"
57+
default = "UNDEF"
58+
}
59+
60+
variable "service" {
61+
description = "Application (microservice) name"
62+
default = "UNDEF"
63+
}
64+
4065
variable "tags" {
4166
description = "A map of additional tags"
4267
type = "map"
4368
default = {}
4469
}
70+
71+
variable "team" {
72+
description = "Department/team of people responsible for service"
73+
default = "UNDEF"
74+
}

0 commit comments

Comments
 (0)