Updated use of default resource tags

Author: RussellGilmore

red-instance/ec2_iam.tf

@@ -2,13 +2,13 @@
 
 # The role has a trust policy that allows EC2 instances to assume the role.
 resource "aws_iam_instance_profile" "red_instance_profile" {
-  name = "${lower(var.project_name)}-red-instance-profile"
+  name = "${lower(var.instance_name)}-red-instance-profile"
   role = aws_iam_role.red_role.name
 }
 
 # Create the IAM role for the Red Instance
 resource "aws_iam_role" "red_role" {
-  name               = "${lower(var.project_name)}-role"
+  name               = "${lower(var.instance_name)}-role"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -33,7 +33,7 @@ resource "aws_iam_role_policy_attachment" "red_ssm_policy_attachment" {
 
 # Role policy for S3 bucket access
 resource "aws_iam_role_policy" "s3_bucket_policy" {
-  name = "${lower(var.project_name)}-s3-bucket-policy"
+  name = "${lower(var.instance_name)}-s3-bucket-policy"
   role = aws_iam_role.red_role.name
 
   count = var.enable_s3_bucket_policy ? 1 : 0

red-instance/ec2_key.tf

@@ -3,12 +3,13 @@
 # Create a key pair for the EC2 instance
 resource "aws_key_pair" "red_key" {
   count      = var.create_ec2_key_pair ? 1 : 0
-  key_name   = "${lower(var.project_name)}-red-instance-key"
+  key_name   = "${lower(var.instance_name)}-red-instance-key"
   public_key = tls_private_key.red_private_key[count.index].public_key_openssh
 
   tags = merge(
     {
-      Name = "${lower(var.project_name)}-red-instance-key"
+      Name    = "${lower(var.instance_name)}-red-instance-key",
+      Project = var.project_name
     },
     var.additional_tags,
   )

red-instance/public_dns.tf

@@ -13,7 +13,8 @@ resource "aws_eip" "red_instance_eip" {
 
   tags = merge(
     {
-      Name = "${lower(var.project_name)}-red-instance-eip"
+      Name    = "${lower(var.instance_name)}-red-instance-eip"
+      Project = var.project_name
     },
     var.additional_tags,
   )

red-instance/public_vpc.tf

@@ -9,7 +9,8 @@ resource "aws_vpc" "main" {
 
   tags = merge(
     {
-      Name = "${lower(var.project_name)}-red-instance-vpc"
+      Name    = "${lower(var.instance_name)}-red-instance-vpc",
+      Project = var.project_name
     },
     var.additional_tags,
   )
@@ -24,7 +25,8 @@ resource "aws_subnet" "public" {
 
   tags = merge(
     {
-      Name = "${lower(var.project_name)}-red-instance-public-subnet"
+      Name    = "${lower(var.instance_name)}-red-instance-public-subnet"
+      Project = var.project_name
     },
     var.additional_tags,
   )
@@ -37,7 +39,8 @@ resource "aws_internet_gateway" "igw" {
 
   tags = merge(
     {
-      Name = "${lower(var.project_name)}-red-instance-igw"
+      Name    = "${lower(var.instance_name)}-red-instance-igw",
+      Project = var.project_name
     },
     var.additional_tags,
   )
@@ -55,7 +58,8 @@ resource "aws_route_table" "public" {
 
   tags = merge(
     {
-      Name = "${lower(var.project_name)}-red-instance-public-route-table"
+      Name    = "${lower(var.instance_name)}-red-instance-public-route-table",
+      Project = var.project_name
     },
     var.additional_tags,
   )