chore: tidy tags

nginxinc · Aug 18, 2023 · 2701cb9 · 2701cb9
1 parent c37b84f
commit 2701cb9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/terraform/basic-reference/aws/providers.tf b/terraform/basic-reference/aws/providers.tf
@@ -21,6 +21,7 @@ provider "aws" {
   default_tags {
     tags = {
       Deployment = "NGINX Management Suite Basic Reference Architecture"
+      Terraform  = "true"
     }
   }
 }

diff --git a/terraform/basic-reference/aws/storage.tf b/terraform/basic-reference/aws/storage.tf
@@ -20,7 +20,4 @@ resource "aws_volume_attachment" "disks" {
   volume_id                      = aws_ebs_volume.disks[count.index].id
   instance_id                    = aws_instance.nms_example.id
   stop_instance_before_detaching = true
-  tags                           = {
-    Owner = data.aws_caller_identity.current.user_id
-  }
 }
diff --git a/terraform/basic-reference/aws/vpc.tf b/terraform/basic-reference/aws/vpc.tf
@@ -17,8 +17,6 @@ module "vpc" {
   private_subnets = [local.controlplane_subnet_cidr_blocks, local.dataplane_subnet_cidr_blocks]
   enable_nat_gateway = true
   tags = {
-    Terraform   = "true"
-    Environment = "dev"
     Owner       = data.aws_caller_identity.current.user_id
   }
 }

diff --git a/terraform/standalone/nms/aws/main.tf b/terraform/standalone/nms/aws/main.tf
@@ -21,6 +21,7 @@ provider "aws" {
   default_tags {
     tags = {
       Deployment = "NGINX Management Suite Standalone"
+      Terraform  = "true"
     }
   }
 }
@@ -99,10 +100,8 @@ module "vpc" {
   azs            = [random_shuffle.random_az.result[0]]
   public_subnets = ["10.0.101.0/24"]
 
-  tags = {
-    Terraform   = "true"
-    Environment = "dev"
-    Owner       = data.aws_caller_identity.current.user_id
+  tags           = {
+    Owner = data.aws_caller_identity.current.user_id
   }
 }
 
@@ -179,7 +178,4 @@ resource "aws_volume_attachment" "disks" {
   volume_id                      = aws_ebs_volume.disks[count.index].id
   instance_id                    = aws_instance.nms_example.id
   stop_instance_before_detaching = true
-  tags                           = {
-    Owner = data.aws_caller_identity.current.user_id
-  }
 }