refactor: Update the resource name

Author: Kris20030907

aws.tf

@@ -22,35 +22,32 @@ module "automq_byoc_ops_bucket_name" {
   force_destroy = true
 }
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available_azs" {}
 
 module "automq_byoc_vpc" {
   source  = "terraform-aws-modules/vpc/aws"
   version = "5.0.0"
 
   count = var.create_new_vpc ? 1 : 0
-
-  name = "automq-byoc-vpc-${var.automq_byoc_env_id}"
   cidr = "10.0.0.0/16"
 
-  azs             = slice(data.aws_availability_zones.available.names, 0, 3)
+  azs             = slice(data.aws_availability_zones.available_azs.names, 0, 3)
   public_subnets  = ["10.0.0.0/20"]
   private_subnets = ["10.0.128.0/20", "10.0.144.0/20", "10.0.160.0/20"]
 
   enable_dns_support   = true
   enable_dns_hostnames = true
 
   tags = {
-
+    Name = "automq-byoc-vpc-${var.automq_byoc_env_id}"
     automqVendor   = "automq"
     automqEnvironmentID = var.automq_byoc_env_id
   }
 }
 
-resource "aws_security_group" "endpoint_sg" {
+resource "aws_security_group" "vpc_endpoint_sg" {
   count = var.create_new_vpc ? 1 : 0
 
-  name        = "automq-byoc-endpoint-sg-${var.automq_byoc_env_id}"
   description = "Security group for VPC endpoint"
   vpc_id      = module.automq_byoc_vpc[0].vpc_id
 
@@ -75,13 +72,13 @@ resource "aws_security_group" "endpoint_sg" {
   }
 }
 
-resource "aws_vpc_endpoint" "ec2" {
+resource "aws_vpc_endpoint" "ec2_endpoint" {
   count = var.create_new_vpc ? 1 : 0
 
   vpc_id            = module.automq_byoc_vpc[0].vpc_id
   service_name      = "com.amazonaws.${var.cloud_provider_region}.ec2"
   vpc_endpoint_type = "Interface"
-  security_group_ids = [aws_security_group.endpoint_sg[0].id]
+  security_group_ids = [aws_security_group.vpc_endpoint_sg[0].id]
   subnet_ids        = module.automq_byoc_vpc[0].private_subnets
 
   private_dns_enabled = true
@@ -93,7 +90,7 @@ resource "aws_vpc_endpoint" "ec2" {
   }
 }
 
-resource "aws_vpc_endpoint" "s3" {
+resource "aws_vpc_endpoint" "s3_endpoint" {
   count = var.create_new_vpc ? 1 : 0
 
   vpc_id            = module.automq_byoc_vpc[0].vpc_id
@@ -119,7 +116,7 @@ locals {
   automq_ops_bucket                        = var.automq_byoc_ops_bucket_name == "" ? module.automq_byoc_ops_bucket_name.s3_bucket_id : "${var.automq_byoc_ops_bucket_name}-${var.automq_byoc_env_id}"
 }
 
-data "aws_vpc" "selected" {
+data "aws_vpc" "vpc_id" {
   id = local.automq_byoc_vpc_id
 }
 
@@ -140,9 +137,10 @@ data "aws_ami" "marketplace_ami_details" {
   }
 }
 
-resource "aws_security_group" "allow_all" {
-  vpc_id = data.aws_vpc.selected.id
+resource "aws_security_group" "automq_byoc_console_sg" {
+  vpc_id = data.aws_vpc.vpc_id.id
 
+  name = "automq-byoc-console-sg-${var.automq_byoc_env_id}"
   ingress {
     from_port   = 8080
     to_port     = 8080
@@ -196,7 +194,7 @@ resource "aws_iam_instance_profile" "automq_byoc_instance_profile" {
   role = aws_iam_role.automq_byoc_role.name
 }
 
-resource "aws_route53_zone" "private" {
+resource "aws_route53_zone" "private_r53" {
   name = "${var.automq_byoc_env_id}.automq.private"
 
   vpc {
@@ -213,5 +211,5 @@ locals {
 }
 
 resource "aws_eip" "web_ip" {
-  instance = aws_instance.web.id
+  instance = aws_instance.automq-byoc-console.id
 }

main.tf

@@ -1,8 +1,8 @@
-resource "aws_instance" "web" {
+resource "aws_instance" "automq-byoc-console" {
   ami                    = var.specified_ami_by_marketplace ? data.aws_ami.marketplace_ami_details.id : var.automq_byoc_env_console_ami
   instance_type          = var.automq_byoc_ec2_instance_type
   subnet_id              = local.automq_byoc_env_console_public_subnet_id
-  vpc_security_group_ids = [aws_security_group.allow_all.id]
+  vpc_security_group_ids = [aws_security_group.automq_byoc_console_sg.id]
 
   iam_instance_profile = aws_iam_instance_profile.automq_byoc_instance_profile.name
 
@@ -30,8 +30,8 @@ resource "aws_instance" "web" {
     aws_iam_instance_profile_arn_encoded = local.aws_iam_instance_profile_arn_encoded,
     automq_data_bucket                   = local.automq_data_bucket,
     automq_ops_bucket                    = local.automq_ops_bucket,
-    instance_security_group_id           = aws_security_group.allow_all.id,
-    instance_dns                         = aws_route53_zone.private.zone_id,
+    instance_security_group_id           = aws_security_group.automq_byoc_console_sg.id,
+    instance_dns                         = aws_route53_zone.private_r53.zone_id,
     instance_profile_arn                 = aws_iam_instance_profile.automq_byoc_instance_profile.arn,
     environment_id                       = var.automq_byoc_env_id
   })

outputs.tf

@@ -15,7 +15,7 @@ output "automq_byoc_initial_username" {
 
 output "automq_byoc_initial_password" {
   description = "The initial password for the AutoMQ environment console. This account is used to log in to the environment, create ServiceAccounts, and manage other resources. For detailed information about environment members, please refer to the [documentation](https://docs.automq.com/automq-cloud/manage-identities-and-access/member-accounts)."
-  value = aws_instance.web.id
+  value = aws_instance.automq-byoc-console.id
 }
 
 output "automq_byoc_vpc_id" {
@@ -25,7 +25,7 @@ output "automq_byoc_vpc_id" {
 
 output "automq_byoc_instance_id" {
   description = "The EC2 instance id for AutoMQ Console."
-  value = aws_instance.web.id
+  value = aws_instance.automq-byoc-console.id
 }
 
 /*
@@ -51,7 +51,7 @@ output "automq_byoc_env_console_public_subnet_id" {
 
 output "automq_byoc_security_group_name" {
   description = "Security group bound to the AutoMQ BYOC service."
-  value = aws_security_group.allow_all.name
+  value = aws_security_group.automq_byoc_console_sg.name
 }
 
 output "automq_byoc_role_arn" {