chore: Update Terraform tags to use "ManagedBy" instead of "Terraform"

.gitignore

@@ -9,8 +9,8 @@
 crash.log
 
 # Exclude all .tfvars files, which are likely to contain sensitive data, such as
-# password, private keys, and other secrets. These should not be part of version 
-# control as they are data points which are potentially sensitive and subject 
+# password, private keys, and other secrets. These should not be part of version
+# control as they are data points which are potentially sensitive and subject
 # to change depending on the environment.
 # *.tfvars
 # *.tfvars.json
@@ -26,7 +26,7 @@ override.tf.json
 #
 # !example_override.tf
 
-# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
+# Include tfplan files to ignore the plan output of command: terraform plan -out tfplan
 # example: *tfplan*
 *tfplan*
 

live/common-infra/README.md

@@ -73,7 +73,7 @@
    Review and verify the deployment plan:
 
    ```sh
-   terraform plan -var-file ./configs/prod.tfvars -out=prod.tfplan
+   terraform plan -var-file ./configs/prod.tfvars -out prod.tfplan
    ```
 
 2. **Execute the Plan:**

live/core-networking/README.md

@@ -75,7 +75,7 @@
    Review and verify the deployment plan:
 
    ```sh
-   terraform plan -var-file ./configs/prod.tfvars -out=prod.tfplan
+   terraform plan -var-file ./configs/prod.tfvars -out prod.tfplan
    ```
 
 2. **Execute the Plan:**

live/terraform-backend/README.md

@@ -23,22 +23,31 @@
    terraform init
    ```
 
+2. **Workspace Management:**
+
+   Select or create a new workspace tailored to your deployment environment:
+
+   ```sh
+   # Switch to the another workspace or create it if it doesn't exist
+   terraform workspace select -or-create prod
+   ```
+
 ## Deploy
 
 1. **Plan the Deployment:**
 
    Generate an execution plan for Terraform:
 
    ```sh
-   terraform plan -var-file ./configs/common-infra.tfvars -out ./terraform-backend.tfplan
+   terraform plan -var-file ./configs/prod.tfvars -out ./prod.tfplan
    ```
 
 2. **Apply the Configuration:**
 
    Apply the configuration to set up the S3 bucket and DynamoDB table:
 
    ```sh
-   terraform apply "./terraform-backend.tfplan"
+   terraform apply "./prod.tfplan"
    ```
 
    🚀 **NOTE:** Confirm the actions before proceeding to ensure that the correct resources are being created or modified.

live/terraform-backend/backend.tf

@@ -6,13 +6,15 @@ module "terraform_state_backend" {
   source  = "cloudposse/tfstate-backend/aws"
   version = "1.1.1"
 
-  name       = var.name
-  namespace  = var.namespace
-  attributes = ["state"]
+  name        = var.name
+  namespace   = var.namespace
+  environment = var.environment
+  stage       = var.stage
+  attributes  = ["state"]
 
   terraform_backend_config_file_path = "."
   terraform_backend_config_file_name = "s3-backend.tf"
-  terraform_state_file               = "${var.namespace}-${var.name}.tfstate"
+  terraform_state_file               = "${module.label.id}.tfstate"
 
   bucket_enabled   = true
   dynamodb_enabled = true

live/terraform-backend/configs/prod.tfvars

@@ -0,0 +1,10 @@
+# General settings
+
+region      = "us-west-2"
+name        = "common-infra-tf-backend"
+namespace   = "nan"
+environment = "prod"
+tags = {
+  "ManagedBy"   = "Terraform"
+  "Environment" = "prod"
+}

live/terraform-backend/configs/staging.tfvars

@@ -0,0 +1,10 @@
+# General settings
+
+region      = "us-west-2"
+name        = "common-infra-tf-backend"
+namespace   = "nan"
+environment = "prod"
+tags = {
+  "ManagedBy"   = "Terraform"
+  "Environment" = "prod"
+}

live/terraform-backend/context.tf

@@ -10,6 +10,19 @@ variable "namespace" {
   default     = "development"
 }
 
+variable "environment" {
+  description = "Environment, e.g. 'prod', 'staging', 'dev', 'pre-prod', 'UAT'"
+  type        = string
+  default     = "development"
+}
+
+variable "stage" {
+  description = "Stage, e.g. 'build', 'test', 'deploy', 'release'"
+  type        = string
+  # not required, so no default
+  default = null
+}
+
 variable "tags" {
   description = "Any extra tags to assign to objects"
   type        = map(any)
@@ -24,3 +37,18 @@ locals {
     By        = data.aws_caller_identity.aws.arn
   }
 }
+
+// Keep labels, tags consistent
+module "label" {
+  source  = "cloudposse/label/null"
+  version = "0.25.0"
+
+  name        = var.name
+  environment = var.environment
+  namespace   = var.namespace
+  stage       = var.stage
+
+  delimiter   = "-"
+  label_order = ["namespace", "environment", "stage", "name", "attributes"]
+  tags        = merge(var.tags, local.tf_tags)
+}