init

Author: alexnuttall

infrastructure/modules/amp_branch/locals.tf

@@ -1,32 +1,18 @@
 locals {
+  module = "amp"
+
   csi = format(
-    "%s-%s-%s-%s-%s",
+    "%s-%s-%s-%s",
     var.project,
     var.environment,
     var.component,
-    var.module,
     var.name,
   )
 
-  # CSI for use in resources with an account namespace, eg IAM roles
-  csi_account = replace(
-    format(
-      "%s-%s-%s-%s-%s-%s",
-      var.project,
-      var.region,
-      var.environment,
-      var.component,
-      var.module,
-      var.name,
-    ),
-    "_",
-    "",
-  )
-
   default_tags = merge(
     var.default_tags,
     {
-      Module = var.module
+      Module = local.module
       Name   = local.csi
     },
   )

infrastructure/modules/amp_branch/variables.tf

@@ -32,16 +32,6 @@ variable "description" {
   description = "Description for the branch"
 }
 
-##
-# Module self-identification
-##
-
-variable "module" {
-  type        = string
-  description = "The name of this module. This is a special variable, it should be set only here and never overridden."
-  default     = "kms"
-}
-
 ##
 # Variable specific to the module
 ##

infrastructure/modules/aws-backup-source/locals.tf

@@ -1,10 +1,12 @@
 locals {
+  module = "backup"
+
   csi = format(
     "%s-%s-%s-%s",
     var.project,
     var.environment,
     var.component,
-    "backup"
+    var.name
   )
 
   csi_underscore = replace(local.csi,"-","_")
@@ -13,6 +15,7 @@ locals {
     var.default_tags,
     {
       Name = local.csi
+      Module = local.module
     },
   )
 }

infrastructure/modules/aws-backup-source/variables.tf

@@ -13,6 +13,11 @@ variable "component" {
   description = "The name of the tfscaffold component"
 }
 
+variable "name" {
+  type        = string
+  description = "The variable encapsulating the name of this bucket"
+}
+
 variable "default_tags" {
   type        = map(string)
   description = "Default tag map for application to all taggable resources in the module"

infrastructure/modules/eventpub/locals.tf

@@ -1,4 +1,6 @@
 locals {
+  module = "eventpub"
+
   csi = replace(
     format(
       "%s-%s-%s-%s",
@@ -13,7 +15,7 @@ locals {
   default_tags = merge(
     var.default_tags,
     {
-      Module = var.module
+      Module = local.module
       Name   = local.csi
     },
   )

infrastructure/modules/eventpub/variables.tf

@@ -28,16 +28,6 @@ variable "group" {
   default     = null
 }
 
-##
-# Module self-identification
-##
-
-variable "module" {
-  type        = string
-  description = "The name of this module. This is a special variable, it should be set only here and never overridden."
-  default     = "eventpub"
-}
-
 ##
 # Variable specific to the module
 ##

infrastructure/modules/kms/locals.tf

@@ -1,22 +1,22 @@
 locals {
+  module = "kms"
+
   csi = format(
-    "%s-%s-%s-%s-%s",
+    "%s-%s-%s-%s",
     var.project,
     var.environment,
     var.component,
-    var.module,
     var.name,
   )
 
   # CSI for use in resources with an account namespace, eg IAM roles
   csi_account = replace(
     format(
-      "%s-%s-%s-%s-%s-%s",
+      "%s-%s-%s-%s-%s",
       var.project,
       var.region,
       var.environment,
       var.component,
-      var.module,
       var.name,
     ),
     "_",
@@ -26,7 +26,7 @@ locals {
   default_tags = merge(
     var.default_tags,
     {
-      Module = var.module
+      Module = local.module
       Name   = local.csi
     },
   )

infrastructure/modules/kms/variables.tf

@@ -22,16 +22,6 @@ variable "aws_account_id" {
   description = "The AWS Account ID (numeric)"
 }
 
-##
-# Module self-identification
-##
-
-variable "module" {
-  type        = string
-  description = "The name of this module. This is a special variable, it should be set only here and never overridden."
-  default     = "kms"
-}
-
 ##
 # Variable specific to the module
 ##

infrastructure/modules/lambda/locals.tf

@@ -1,12 +1,13 @@
 locals {
+  module = "lambda"
+
   # Compound Scope Identifier
   csi = replace(
     format(
-      "%s-%s-%s-%s-%s",
+      "%s-%s-%s-%s",
       var.project,
       var.environment,
       var.component,
-      var.module,
       var.function_name,
     ),
     "_",
@@ -16,7 +17,8 @@ locals {
   default_tags = merge(
     var.default_tags,
     {
-      "Module" = var.module
+      "Name"   = local.csi
+      "Module" = local.module
     },
   )
 }

infrastructure/modules/lambda/variables.tf

@@ -42,12 +42,6 @@ variable "kms_key_arn" {
 # tfscaffold variables specific to this module
 ##
 
-variable "module" {
-  type        = string
-  description = "The variable encapsulating the name of this module"
-  default     = "lambda"
-}
-
 variable "default_tags" {
   type        = map(string)
   description = "A map of default tags to apply to all taggable resources within the component"