Rename development_environment variable to environmentx

nimh-dsst · Sep 24, 2024 · 6a569b1 · 6a569b1
1 parent 552e816
commit 6a569b1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/web/deploy/terraform/modules/bootstrap/state_storage/main.tf b/web/deploy/terraform/modules/bootstrap/state_storage/main.tf
@@ -14,17 +14,17 @@ provider "aws" {
 }
 
 resource "aws_s3_bucket" "tf_state" {
-  bucket = "${var.bucket_name}-${var.development_environment}"
+  bucket = "${var.bucket_name}-${var.environment}"
 
   tags = {
-    Name = "${var.bucket_name}-${var.development_environment}"
+    Name = "${var.bucket_name}-${var.environment}"
   }
 }
 
 resource "aws_s3_bucket_lifecycle_configuration" "tf_state" {
   bucket = aws_s3_bucket.tf_state.id
   rule {
-    id     = "tf_state_${var.development_environment}"
+    id     = "tf_state_${var.environment}"
     status = "Enabled"
 
     transition {
@@ -57,7 +57,7 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "default" {
 }
 
 resource "aws_dynamodb_table" "tf_locks" {
-  name         = "${var.table_name}-${var.development_environment}"
+  name         = "${var.table_name}-${var.environment}"
   billing_mode = "PAY_PER_REQUEST"
   hash_key     = "LockID"
 
@@ -67,6 +67,6 @@ resource "aws_dynamodb_table" "tf_locks" {
   }
 
   tags = {
-    Name = "${var.bucket_name}-${var.development_environment}"
+    Name = "${var.bucket_name}-${var.environment}"
   }
 }
diff --git a/web/deploy/terraform/modules/bootstrap/state_storage/variables.tf b/web/deploy/terraform/modules/bootstrap/state_storage/variables.tf
@@ -16,7 +16,7 @@ variable "aws_region" {
   default     = "us-east-1"
 }
 
-variable "development_environment" {
+variable "environment" {
   description = "The name of the development environment. Usually `stage` or `prod`."
   type        = string
 }
diff --git a/web/deploy/terraform/production/bootstrap/state_storage/main.tf b/web/deploy/terraform/production/bootstrap/state_storage/main.tf
@@ -6,5 +6,5 @@ module "prod_state_bootstrap" {
   # I would like to make this path more robust using something like `path.root`
   source = "../../../modules/bootstrap/state_storage/"
 
-  development_environment = var.development_environment
+  environment = var.environment
 }
diff --git a/web/deploy/terraform/production/bootstrap/state_storage/variables.tf b/web/deploy/terraform/production/bootstrap/state_storage/variables.tf
@@ -1,4 +1,4 @@
-variable "development_environment" {
+variable "environment" {
   description = "The name of the development environment. Usually `stage` or `prod`. Defaults to `prod`"
   type        = string
   default     = "prod"

diff --git a/web/deploy/terraform/staging/bootstrap/state_storage/main.tf b/web/deploy/terraform/staging/bootstrap/state_storage/main.tf
@@ -6,5 +6,5 @@ module "stage_state_bootstrap" {
   # I would like to make this path more robust using something like `path.root`
   source = "../../../modules/bootstrap/state_storage/"
 
-  development_environment = var.development_environment
+  environment = var.environment
 }
diff --git a/web/deploy/terraform/staging/bootstrap/state_storage/variables.tf b/web/deploy/terraform/staging/bootstrap/state_storage/variables.tf
@@ -1,4 +1,4 @@
-variable "development_environment" {
+variable "environment" {
   description = "The name of the development environment. Usually `stage` or `prod`. Defaults to `stage`"
   type        = string
   default     = "stage"