Merge branch 'main' into test-dev

Author: Gezi-lzq

README.md

@@ -45,6 +45,14 @@ module "automq-byoc" {
 
   # Set the target regionId of aws
   cloud_provider_region                    = "ap-southeast-1"  
+  
+  # Optional: Add additional tags to all resources
+  additional_tags = {
+    Environment = "Production"
+    Project     = "MyProject"
+    Owner       = "TeamA"
+    CostCenter  = "Engineering"
+  }
 }
 
 # Necessary outputs
@@ -187,20 +195,20 @@ output "automq_byoc_instance_id" {
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement_aws) | >= 5.30 |
+| <a name="requirement_aws"></a> [aws](#requirement_aws) | >= 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider_aws) | 5.81.0 |
+| <a name="provider_aws"></a> [aws](#provider_aws) | 6.11.0 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_automq_byoc_data_bucket_name"></a> [automq_byoc_data_bucket_name](#module_automq_byoc_data_bucket_name) | terraform-aws-modules/s3-bucket/aws | 4.1.2 |
-| <a name="module_automq_byoc_ops_bucket_name"></a> [automq_byoc_ops_bucket_name](#module_automq_byoc_ops_bucket_name) | terraform-aws-modules/s3-bucket/aws | 4.1.2 |
+| <a name="module_automq_byoc_data_bucket_name"></a> [automq_byoc_data_bucket_name](#module_automq_byoc_data_bucket_name) | terraform-aws-modules/s3-bucket/aws | 5.4.0 |
+| <a name="module_automq_byoc_ops_bucket_name"></a> [automq_byoc_ops_bucket_name](#module_automq_byoc_ops_bucket_name) | terraform-aws-modules/s3-bucket/aws | 5.4.0 |
 | <a name="module_automq_byoc_vpc"></a> [automq_byoc_vpc](#module_automq_byoc_vpc) | terraform-aws-modules/vpc/aws | 5.0.0 |
 
 ## Resources
@@ -242,10 +250,12 @@ output "automq_byoc_instance_id" {
 | <a name="input_automq_byoc_data_bucket_name"></a> [automq_byoc_data_bucket_name](#input_automq_byoc_data_bucket_name) | Set the existed S3 bucket used to store message data generated by applications. If this parameter is not set, a new S3 bucket will be automatically created. The message data Bucket must be separate from the Ops Bucket. | `string` | `""` | no |
 | <a name="input_automq_byoc_ops_bucket_name"></a> [automq_byoc_ops_bucket_name](#input_automq_byoc_ops_bucket_name) | Set the existed S3 bucket used to store AutoMQ system logs and metrics data for system monitoring and alerts. If this parameter is not set, a new S3 bucket will be automatically created. This Bucket does not contain any application business data. The Ops Bucket must be separate from the message data Bucket. | `string` | `""` | no |
 | <a name="input_automq_byoc_ec2_instance_type"></a> [automq_byoc_ec2_instance_type](#input_automq_byoc_ec2_instance_type) | Set the EC2 instance type; this parameter is used only for deploying the AutoMQ environment console. You need to provide an EC2 instance type with at least 2 cores and 8 GB of memory. | `string` | `"t3.large"` | no |
-| <a name="input_automq_byoc_env_version"></a> [automq_byoc_env_version](#input_automq_byoc_env_version) | Set the version for the AutoMQ BYOC environment console. It is recommended to keep the default value, which is the latest version. Historical release note reference [document](https://docs.automq.com/automq-cloud/release-notes). | `string` | `"1.5.12"` | no |
+| <a name="input_automq_byoc_env_version"></a> [automq_byoc_env_version](#input_automq_byoc_env_version) | Set the version for the AutoMQ BYOC environment console. It is recommended to keep the default value, which is the latest version. Historical release note reference [document](https://docs.automq.com/automq-cloud/release-notes). | `string` | `"7.7.1"` | no |
 | <a name="input_automq_byoc_env_console_key_name"></a> [automq_byoc_env_console_key_name](#input_automq_byoc_env_console_key_name) | Specify the key pair name for accessing the AutoMQ BYOC environment console. If not specified, the console will be deployed without a key pair. | `string` | `""` | no |
 | <a name="input_use_custom_ami"></a> [use_custom_ami](#input_use_custom_ami) | The parameter defaults to false, which means a specific AMI is not specified. If you wish to use a custom AMI, set this parameter to true and specify the `automq_byoc_env_console_ami` parameter with your custom AMI ID. | `bool` | `false` | no |
 | <a name="input_automq_byoc_env_console_ami"></a> [automq_byoc_env_console_ami](#input_automq_byoc_env_console_ami) | When the `use_custom_ami` parameter is set to true, this parameter must be set with a custom AMI Name to deploy the AutoMQ console. | `string` | `""` | no |
+| <a name="input_automq_enviroment_console_init"></a> [automq_enviroment_console_init](#input_automq_enviroment_console_init) | Controls the environment console initialization. When false, manual initialization is required. Default is true. | `bool` | `true` | no |
+| <a name="input_additional_tags"></a> [additional_tags](#input_additional_tags) | Additional tags to apply to all resources created by this module. | `map(string)` | `{}` | no |
 
 ## Outputs
 
@@ -258,8 +268,11 @@ output "automq_byoc_instance_id" {
 | <a name="output_automq_byoc_vpc_id"></a> [automq_byoc_vpc_id](#output_automq_byoc_vpc_id) | The VPC ID for the AutoMQ environment deployment. |
 | <a name="output_automq_byoc_instance_id"></a> [automq_byoc_instance_id](#output_automq_byoc_instance_id) | The EC2 instance id for AutoMQ Console. |
 | <a name="output_automq_byoc_console_role_arn"></a> [automq_byoc_console_role_arn](#output_automq_byoc_console_role_arn) | AutoMQ BYOC is bound to the role arn of the Console. |
-| <a name="output_automq_byoc_eks_node_role_arn"></a> [automq_byoc_eks_node_role_arn](#output_automq_byoc_eks_node_role_arn) | AutoMQ BYOC requires this role to be bound to the EKS Node group. |
+| <a name="output_automq_byoc_console_instance_profile_arn"></a> [automq_byoc_console_instance_profile_arn](#output_automq_byoc_console_instance_profile_arn) | IAM Instance profiles ARN |
 | <a name="output_automq_byoc_security_group_id"></a> [automq_byoc_security_group_id](#output_automq_byoc_security_group_id) | Security group bound to the AutoMQ BYOC service. |
 | <a name="output_public_subnet_id"></a> [public_subnet_id](#output_public_subnet_id) | The VPC subnet for the AutoMQ environment deployment. |
 | <a name="output_private_subnets"></a> [private_subnets](#output_private_subnets) | The VPC subnet for the AutoMQ environment deployment.If the create_new_vpc is set to true, the private subnet will be created. |
+| <a name="output_automq_byoc_vpc_route53_zone_id"></a> [automq_byoc_vpc_route53_zone_id](#output_automq_byoc_vpc_route53_zone_id) | Route53 bound to the VPC. |
+| <a name="output_automq_byoc_data_bucket_name"></a> [automq_byoc_data_bucket_name](#output_automq_byoc_data_bucket_name) | The object storage bucket for that used to store message data generated by applications. The message data Bucket must be separate from the Ops Bucket. |
+| <a name="output_automq_byoc_ops_bucket_name"></a> [automq_byoc_ops_bucket_name](#output_automq_byoc_ops_bucket_name) | The object storage bucket for that used to store AutoMQ system logs and metrics data for system monitoring and alerts. This Bucket does not contain any application business data. The Ops Bucket must be separate from the message data Bucket. |
 <!-- END_TF_DOCS -->

aws.tf

@@ -5,31 +5,25 @@ provider "aws" {
 # Conditional creation of data bucket
 module "automq_byoc_data_bucket_name" {
   source  = "terraform-aws-modules/s3-bucket/aws"
-  version = "4.1.2"
+  version = "5.4.0"
 
   create_bucket = var.automq_byoc_data_bucket_name == "" ? true : false
   bucket        = "automq-data-${var.automq_byoc_env_id}"
   force_destroy = true
 
-  tags = {
-    automqVendor        = "automq"
-    automqEnvironmentID = var.automq_byoc_env_id
-  }
+  tags = local.common_tags
 }
 
 # Conditional creation of ops bucket
 module "automq_byoc_ops_bucket_name" {
   source  = "terraform-aws-modules/s3-bucket/aws"
-  version = "4.1.2"
+  version = "5.4.0"
 
   create_bucket = var.automq_byoc_ops_bucket_name == "" ? true : false
   bucket        = "automq-ops-${var.automq_byoc_env_id}"
   force_destroy = true
 
-  tags = {
-    automqVendor        = "automq"
-    automqEnvironmentID = var.automq_byoc_env_id
-  }
+  tags = local.common_tags
 }
 
 data "aws_availability_zones" "available_azs" {}
@@ -54,10 +48,7 @@ module "automq_byoc_vpc" {
   enable_nat_gateway = true
   single_nat_gateway = true
 
-  tags = {
-    automqVendor        = "automq"
-    automqEnvironmentID = var.automq_byoc_env_id
-  }
+  tags = local.common_tags
 }
 
 resource "aws_security_group" "vpc_endpoint_sg" {
@@ -80,11 +71,12 @@ resource "aws_security_group" "vpc_endpoint_sg" {
     cidr_blocks = ["0.0.0.0/0"]
   }
 
-  tags = {
-    Name                = "automq-byoc-endpoint-sg-${var.automq_byoc_env_id}"
-    automqVendor        = "automq"
-    automqEnvironmentID = var.automq_byoc_env_id
-  }
+  tags = merge(
+    local.common_tags,
+    {
+      Name = "automq-byoc-endpoint-sg-${var.automq_byoc_env_id}"
+    }
+  )
 }
 
 resource "aws_vpc_endpoint" "ec2_endpoint" {
@@ -98,11 +90,12 @@ resource "aws_vpc_endpoint" "ec2_endpoint" {
 
   private_dns_enabled = true
 
-  tags = {
-    Name                = "automq-byoc-ec2-endpoint-${var.automq_byoc_env_id}"
-    automqVendor        = "automq"
-    automqEnvironmentID = var.automq_byoc_env_id
-  }
+  tags = merge(
+    local.common_tags,
+    {
+      Name = "automq-byoc-ec2-endpoint-${var.automq_byoc_env_id}"
+    }
+  )
 }
 
 resource "aws_vpc_endpoint" "s3_endpoint" {
@@ -117,11 +110,12 @@ resource "aws_vpc_endpoint" "s3_endpoint" {
     module.automq_byoc_vpc[0].private_route_table_ids
   )
 
-  tags = {
-    Name                = "automq-byoc-s3-endpoint-${var.automq_byoc_env_id}"
-    automqVendor        = "automq"
-    automqEnvironmentID = var.automq_byoc_env_id
-  }
+  tags = merge(
+    local.common_tags,
+    {
+      Name = "automq-byoc-s3-endpoint-${var.automq_byoc_env_id}"
+    }
+  )
 }
 
 resource "aws_vpc_endpoint" "s3table_endpoint" {
@@ -135,11 +129,12 @@ resource "aws_vpc_endpoint" "s3table_endpoint" {
 
   private_dns_enabled = true
 
-  tags = {
-    Name                = "automq-byoc-ec2-endpoint-${var.automq_byoc_env_id}"
-    automqVendor        = "automq"
-    automqEnvironmentID = var.automq_byoc_env_id
-  }
+  tags = merge(
+    local.common_tags,
+    {
+      Name = "automq-byoc-s3table-endpoint-${var.automq_byoc_env_id}"
+    }
+  )
 }
 
 resource "aws_vpc_endpoint" "glue_endpoint" {
@@ -153,11 +148,12 @@ resource "aws_vpc_endpoint" "glue_endpoint" {
 
   private_dns_enabled = true
 
-  tags = {
-    Name                = "automq-byoc-ec2-endpoint-${var.automq_byoc_env_id}"
-    automqVendor        = "automq"
-    automqEnvironmentID = var.automq_byoc_env_id
-  }
+  tags = merge(
+    local.common_tags,
+    {
+      Name = "automq-byoc-glue-endpoint-${var.automq_byoc_env_id}"
+    }
+  )
 }
 
 locals {
@@ -166,6 +162,15 @@ locals {
   automq_data_bucket                       = var.automq_byoc_data_bucket_name == "" ? module.automq_byoc_data_bucket_name.s3_bucket_id : "${var.automq_byoc_data_bucket_name}"
   automq_ops_bucket                        = var.automq_byoc_ops_bucket_name == "" ? module.automq_byoc_ops_bucket_name.s3_bucket_id : "${var.automq_byoc_ops_bucket_name}"
   zone_id                                  = aws_route53_zone.private_r53.zone_id
+
+  # Common tags that will be applied to all resources
+  common_tags = merge(
+    {
+      automqVendor        = "automq"
+      automqEnvironmentID = var.automq_byoc_env_id
+    },
+    var.additional_tags
+  )
 }
 
 data "aws_vpc" "vpc_id" {
@@ -178,6 +183,7 @@ locals {
 
 data "aws_ami" "console_ami" {
   most_recent = true
+  owners      = ["730389100204"]
 
   filter {
     name   = "name"
@@ -210,10 +216,7 @@ resource "aws_security_group" "automq_byoc_console_sg" {
     cidr_blocks = ["0.0.0.0/0"]
   }
 
-  tags = {
-    automqVendor        = "automq"
-    automqEnvironmentID = var.automq_byoc_env_id
-  }
+  tags = local.common_tags
 }
 
 resource "aws_iam_role" "automq_byoc_role" {
@@ -233,10 +236,7 @@ resource "aws_iam_role" "automq_byoc_role" {
     ]
   })
 
-  tags = {
-    automqVendor        = "automq"
-    automqEnvironmentID = var.automq_byoc_env_id
-  }
+  tags = local.common_tags
 }
 
 resource "aws_iam_policy" "automq_byoc_policy" {
@@ -248,10 +248,7 @@ resource "aws_iam_policy" "automq_byoc_policy" {
     automq_ops_bucket  = local.automq_ops_bucket
   })
 
-  tags = {
-    automqVendor        = "automq"
-    automqEnvironmentID = var.automq_byoc_env_id
-  }
+  tags = local.common_tags
 }
 
 resource "aws_iam_policy" "automq_byoc_k8s_policy" {
@@ -263,10 +260,7 @@ resource "aws_iam_policy" "automq_byoc_k8s_policy" {
     automq_ops_bucket  = local.automq_ops_bucket
   })
 
-  tags = {
-    automqVendor        = "automq"
-    automqEnvironmentID = var.automq_byoc_env_id
-  }
+  tags = local.common_tags
 }
 
 resource "aws_iam_role_policy_attachment" "automq_byoc_role_attachment_k8s" {
@@ -283,10 +277,7 @@ resource "aws_iam_instance_profile" "automq_byoc_instance_profile" {
   name = "automq-byoc-instance-profile-${var.automq_byoc_env_id}"
   role = aws_iam_role.automq_byoc_role.name
 
-  tags = {
-    automqVendor        = "automq"
-    automqEnvironmentID = var.automq_byoc_env_id
-  }
+  tags = local.common_tags
 }
 
 resource "aws_route53_zone" "private_r53" {
@@ -300,18 +291,12 @@ resource "aws_route53_zone" "private_r53" {
     create_before_destroy = true
   }
 
-  tags = {
-    automqVendor        = "automq"
-    automqEnvironmentID = var.automq_byoc_env_id
-  }
+  tags = local.common_tags
 }
 
 resource "aws_eip" "web_ip" {
   instance = aws_instance.automq_byoc_console.id
-  tags = {
-    automqVendor        = "automq"
-    automqEnvironmentID = var.automq_byoc_env_id
-  }
+  tags     = local.common_tags
 }
 
 locals {

main.tf

@@ -13,11 +13,12 @@ resource "aws_instance" "automq_byoc_console" {
 
   key_name = var.automq_byoc_env_console_key_name
 
-  tags = {
-    Name                = "automq-byoc-console-${var.automq_byoc_env_id}"
-    automqVendor        = "automq"
-    automqEnvironmentID = var.automq_byoc_env_id
-  }
+  tags = merge(
+    local.common_tags,
+    {
+      Name = "automq-byoc-console-${var.automq_byoc_env_id}"
+    }
+  )
 
   associate_public_ip_address = true
 
@@ -38,10 +39,7 @@ resource "aws_ebs_volume" "data_volume" {
   size              = 20
   type              = "gp3"
 
-  tags = {
-    automqVendor        = "automq"
-    automqEnvironmentID = var.automq_byoc_env_id
-  }
+  tags = local.common_tags
 }
 
 resource "aws_volume_attachment" "data_volume_attachment" {

outputs.tf

@@ -61,12 +61,12 @@ output "automq_byoc_vpc_route53_zone_id" {
 
 output "automq_byoc_data_bucket_name" {
   description = "The object storage bucket for that used to store message data generated by applications. The message data Bucket must be separate from the Ops Bucket."
-  value = local.automq_data_bucket
+  value       = local.automq_data_bucket
 }
 
 output "automq_byoc_ops_bucket_name" {
   description = "The object storage bucket for that used to store AutoMQ system logs and metrics data for system monitoring and alerts. This Bucket does not contain any application business data. The Ops Bucket must be separate from the message data Bucket."
-  value = local.automq_ops_bucket
+  value       = local.automq_ops_bucket
 }
 
 /*

variables.tf

@@ -57,7 +57,7 @@ variable "automq_byoc_ec2_instance_type" {
 variable "automq_byoc_env_version" {
   description = "Set the version for the AutoMQ BYOC environment console. It is recommended to keep the default value, which is the latest version. Historical release note reference [document](https://docs.automq.com/automq-cloud/release-notes)."
   type        = string
-  default     = "7.5.1"
+  default     = "7.7.1"
 }
 
 variable "automq_byoc_env_console_key_name" {
@@ -78,8 +78,15 @@ variable "automq_byoc_env_console_ami" {
   default     = ""
 }
 
+
 variable "automq_enviroment_console_init" {
   description = "Controls the environment console initialization. When false, manual initialization is required. Default is true."
   type        = bool
   default     = true
-}
+}
+
+variable "additional_tags" {
+  description = "Additional tags to apply to all resources created by this module."
+  type        = map(string)
+  default     = {}
+}

versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.30"
+      version = ">= 6.0"
     }
   }
 }