pull out tags and settings

terraform-modules · Nov 17, 2021 · d330eaf · d330eaf
1 parent 803de86
commit d330eaf
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 11 deletions.
diff --git a/common/base_settings.tf b/common/base_settings.tf
@@ -0,0 +1,6 @@
+locals {
+  account_id       = data.aws_caller_identity.current.account_id
+  current_user_arn = data.aws_caller_identity.current.arn
+  partition        = data.aws_arn.current.partition
+  region           = data.aws_region.current.name
+}
diff --git a/common/base_tags.tf b/common/base_tags.tf
@@ -0,0 +1,6 @@
+locals {
+  base_tags = {
+    "boc:tf_module_version" = local._module_version
+    "boc:created_by"        = "terraform"
+  }
+}
diff --git a/common/resources.tf b/common/resources.tf
@@ -1,10 +1,3 @@
-locals {
-  account_id       = data.aws_caller_identity.current.account_id
-  current_user_arn = data.aws_caller_identity.current.arn
-  partition        = data.aws_arn.current.partition
-  region           = data.aws_region.current.name
-}
-
 locals {
   base_name              = var.bucket_name
   name                   = replace(var.bucket_name, local._prefixes["s3"], "")
@@ -34,10 +27,6 @@ locals {
   #  enforced_tags = {
   #    "boc:safeguard" = "title26"
   #  }
-  base_tags = {
-    "boc:tf_module_version" = local._module_version
-    "boc:created_by"        = "terraform"
-  }
   # strip spaces, convert to lowercase, make distinct, sort. Remove those not in the _defaults
   add_safeguard_tags      = local.enable_title26 ? ["title26"] : []
   _default_safeguard_tags = { for d in local._defaults["data_safeguards"] : d => d }

diff --git a/kms_key/base_settings.tf b/kms_key/base_settings.tf
@@ -0,0 +1 @@
+../common/base_settings.tf
diff --git a/kms_key/base_tags.tf b/kms_key/base_tags.tf
@@ -0,0 +1 @@
+../common/base_tags.tf
diff --git a/standard/base_settings.tf b/standard/base_settings.tf
@@ -0,0 +1 @@
+../common/base_settings.tf
diff --git a/standard/base_tags.tf b/standard/base_tags.tf
@@ -0,0 +1 @@
+../common/base_tags.tf
diff --git a/title26/base_settings.tf b/title26/base_settings.tf
@@ -0,0 +1 @@
+../common/base_settings.tf
diff --git a/title26/base_tags.tf b/title26/base_tags.tf
@@ -0,0 +1 @@
+../common/base_tags.tf