Skip to content

Commit b4fa357

Browse files
authored
Merge pull request #1289 from splunk/ar_tags
tags improvement
2 parents 1d391f1 + ab31734 commit b4fa357

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ crash.log
5555
# version control.
5656
#
5757
# example.tfvars
58+
*.tfvars
59+
*.tfvars.json
5860

5961
# Ignore override files as they are usually used to override resources locally and so
6062
# are not checked in

terraform/aws/main.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11

22
provider "aws" {
33
region = var.aws.region
4+
5+
default_tags {
6+
tags = var.aws_default_tags
7+
}
8+
49
}

terraform/aws/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,10 @@ variable "caldera_server" {
9999
default = {
100100
"caldera_server" = "0"
101101
}
102+
}
103+
104+
variable "aws_default_tags" {
105+
type = map(string)
106+
description = "Default tags to apply to all AWS resources. Supply via tfvars or -var."
107+
default = {}
102108
}

0 commit comments

Comments
 (0)