add tfscaffold changes

Author: alexnuttall

infrastructure/terraform/components/app/module_backend_api.tf

@@ -3,8 +3,7 @@
 module "backend_api" {
   source = "../../modules/backend-api"
 
-  component             = "${var.component}-api"
-  base_component        = var.component
+  component             = var.component
   project               = var.project
   environment           = var.environment
   aws_account_id        = var.aws_account_id

infrastructure/terraform/components/sandbox/module_backend_api.tf

@@ -1,8 +1,7 @@
 module "backend_api" {
   source = "../../modules/backend-api"
 
-  component             = "${var.component}-api"
-  base_component        = var.component
+  component             = var.component
   project               = var.project
   environment           = var.environment
   aws_account_id        = var.aws_account_id

infrastructure/terraform/modules/backend-api/locals.tf

@@ -1,5 +1,5 @@
 locals {
-  csi = "${var.project}-${var.environment}-${var.component}"
+  csi = "${var.csi}-${var.module}"
 
   lambdas_source_code_dir = abspath("${path.module}/../../../../lambdas")
 
@@ -34,5 +34,5 @@ locals {
     for k, v in var.letter_suppliers : merge(v, { name = k }) if v.default_supplier
   ][0]
 
-  sftp_environment = "${var.group}-${var.environment}-${var.base_component}"
+  sftp_environment = "${var.group}-${var.environment}-${var.component}"
 }

infrastructure/terraform/modules/backend-api/variables.tf

@@ -27,19 +27,19 @@ variable "group" {
   description = "The group variables are being inherited from (often synonmous with account short-name)"
 }
 
-
-##
-# tfscaffold variables specific to this component
-##
-
 variable "component" {
   type        = string
   description = "The variable encapsulating the name of this component"
 }
 
-variable "base_component" {
+##
+# tfscaffold variables specific to this component
+##
+
+variable "module" {
   type        = string
-  description = "The top level component containing this module"
+  description = "The variable encapsulating the name of this module"
+  default     = "api"
 }
 
 variable "csi" {