eli-239 tidying up

Author: eddalmond1

infrastructure/stacks/_shared/default_variables.tf

@@ -15,8 +15,3 @@ variable "default_aws_region" {
   description = "Default AWS region"
   type        = string
 }
-
-variable "workspace" {
-  description = "Usually the developer short code or the name of the environment."
-  type        = string
-}

infrastructure/stacks/api-layer/s3_buckets.tf

@@ -3,6 +3,8 @@ module "s3_rules_bucket" {
   bucket_name  = "eli-rules"
   environment  = var.environment
   project_name = var.project_name
+  stack_name   = local.stack_name
+  workspace    = terraform.workspace
 }
 
 module "s3_audit_bucket" {
@@ -11,4 +13,6 @@ module "s3_audit_bucket" {
   environment            = var.environment
   project_name           = var.project_name
   bucket_expiration_days = 180
+  stack_name             = local.stack_name
+  workspace              = terraform.workspace
 }

infrastructure/stacks/api-layer/truststore_s3_bucket.tf

@@ -3,6 +3,8 @@ module "s3_truststore_bucket" {
   bucket_name  = "truststore"
   environment  = var.environment
   project_name = var.project_name
+  stack_name   = local.stack_name
+  workspace    = terraform.workspace
 }
 
 resource "aws_s3_bucket_policy" "truststore" {

infrastructure/stacks/bootstrap/modules.tf

@@ -3,6 +3,6 @@ module "tfstate" {
 
   project_name = var.project_name
   environment  = var.environment
-  workspace    = var.workspace
+  workspace    = terraform.workspace
   stack_name   = local.stack_name
 }