feat: add EIP and modify AMI configuration (#21)

Author: Gezi-lzq

aws.tf

@@ -12,7 +12,7 @@ module "automq_byoc_data_bucket_name" {
   force_destroy = true
 
   tags = {
-    automqVendor   = "automq"
+    automqVendor        = "automq"
     automqEnvironmentID = var.automq_byoc_env_id
   }
 }
@@ -27,7 +27,7 @@ module "automq_byoc_ops_bucket_name" {
   force_destroy = true
 
   tags = {
-    automqVendor   = "automq"
+    automqVendor        = "automq"
     automqEnvironmentID = var.automq_byoc_env_id
   }
 }
@@ -39,8 +39,8 @@ module "automq_byoc_vpc" {
   version = "5.0.0"
 
   count = var.create_new_vpc ? 1 : 0
-  cidr = "10.0.0.0/16"
-  name = "automq-byoc-vpc-${var.automq_byoc_env_id}"
+  cidr  = "10.0.0.0/16"
+  name  = "automq-byoc-vpc-${var.automq_byoc_env_id}"
 
   azs             = slice(data.aws_availability_zones.available_azs.names, 0, 3)
   public_subnets  = ["10.0.0.0/20"]
@@ -50,7 +50,7 @@ module "automq_byoc_vpc" {
   enable_dns_hostnames = true
 
   tags = {
-    automqVendor   = "automq"
+    automqVendor        = "automq"
     automqEnvironmentID = var.automq_byoc_env_id
   }
 }
@@ -76,26 +76,26 @@ resource "aws_security_group" "vpc_endpoint_sg" {
   }
 
   tags = {
-    Name = "automq-byoc-endpoint-sg-${var.automq_byoc_env_id}"
-    automqVendor   = "automq"
+    Name                = "automq-byoc-endpoint-sg-${var.automq_byoc_env_id}"
+    automqVendor        = "automq"
     automqEnvironmentID = var.automq_byoc_env_id
   }
 }
 
 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"
+  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.vpc_endpoint_sg[0].id]
-  subnet_ids        = module.automq_byoc_vpc[0].private_subnets
+  subnet_ids         = module.automq_byoc_vpc[0].private_subnets
 
   private_dns_enabled = true
 
   tags = {
-    Name = "automq-byoc-ec2-endpoint-${var.automq_byoc_env_id}"
-    automqVendor   = "automq"
+    Name                = "automq-byoc-ec2-endpoint-${var.automq_byoc_env_id}"
+    automqVendor        = "automq"
     automqEnvironmentID = var.automq_byoc_env_id
   }
 }
@@ -113,8 +113,8 @@ resource "aws_vpc_endpoint" "s3_endpoint" {
   )
 
   tags = {
-    Name = "automq-byoc-s3-endpoint-${var.automq_byoc_env_id}"
-    automqVendor   = "automq"
+    Name                = "automq-byoc-s3-endpoint-${var.automq_byoc_env_id}"
+    automqVendor        = "automq"
     automqEnvironmentID = var.automq_byoc_env_id
   }
 }
@@ -131,19 +131,15 @@ data "aws_vpc" "vpc_id" {
 }
 
 locals {
-  ssm_parameter_path = "/aws/service/marketplace/prod-nl2cyzygb46fw/${var.automq_byoc_env_version}"
-}
-
-data "aws_ssm_parameter" "marketplace_ami" {
-  name = local.ssm_parameter_path
+  image_name  = var.use_custom_ami ? var.automq_byoc_env_console_ami : format("AutoMQ-control-center-Prod-%s-x86_64", var.automq_byoc_env_version)
 }
 
-data "aws_ami" "marketplace_ami_details" {
+data "aws_ami" "console_ami" {
   most_recent = true
 
   filter {
-    name   = "image-id"
-    values = [data.aws_ssm_parameter.marketplace_ami.value]
+    name   = "name"
+    values = [local.image_name]
   }
 }
 
@@ -166,7 +162,7 @@ resource "aws_security_group" "automq_byoc_console_sg" {
   }
 
   tags = {
-    automqVendor   = "automq"
+    automqVendor        = "automq"
     automqEnvironmentID = var.automq_byoc_env_id
   }
 }
@@ -178,9 +174,9 @@ resource "aws_iam_role" "automq_byoc_role" {
     Version = "2012-10-17"
     Statement = [
       {
-        Action    = "sts:AssumeRole"
-        Effect    = "Allow"
-        Sid       = ""
+        Action = "sts:AssumeRole"
+        Effect = "Allow"
+        Sid    = ""
         Principal = {
           Service = "ec2.amazonaws.com"
         }
@@ -189,7 +185,7 @@ resource "aws_iam_role" "automq_byoc_role" {
   })
 
   tags = {
-    automqVendor   = "automq"
+    automqVendor        = "automq"
     automqEnvironmentID = var.automq_byoc_env_id
   }
 }
@@ -204,7 +200,7 @@ resource "aws_iam_policy" "automq_byoc_policy" {
   })
 
   tags = {
-    automqVendor   = "automq"
+    automqVendor        = "automq"
     automqEnvironmentID = var.automq_byoc_env_id
   }
 }
@@ -219,7 +215,7 @@ resource "aws_iam_instance_profile" "automq_byoc_instance_profile" {
   role = aws_iam_role.automq_byoc_role.name
 
   tags = {
-    automqVendor   = "automq"
+    automqVendor        = "automq"
     automqEnvironmentID = var.automq_byoc_env_id
   }
 }
@@ -236,7 +232,15 @@ resource "aws_route53_zone" "private_r53" {
   }
 
   tags = {
-    automqVendor   = "automq"
+    automqVendor        = "automq"
+    automqEnvironmentID = var.automq_byoc_env_id
+  }
+}
+
+resource "aws_eip" "web_ip" {
+  instance = aws_instance.automq_byoc_console.id
+  tags = {
+    automqVendor        = "automq"
     automqEnvironmentID = var.automq_byoc_env_id
   }
 }
@@ -251,4 +255,4 @@ locals {
 
 data "aws_subnet" "public_subnet_info" {
   id = local.public_subnet_id
-}
+}

main.tf

@@ -1,5 +1,5 @@
 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
+  ami                    = data.aws_ami.console_ami.id
   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.automq_byoc_console_sg.id]

outputs.tf

@@ -5,7 +5,7 @@ output "automq_byoc_env_id" {
 
 output "automq_byoc_endpoint" {
   description = "The endpoint for the AutoMQ environment console. Users can set this endpoint to the AutoMQ Terraform Provider to manage resources through Terraform. Additionally, users can access this endpoint via web browser, log in, and manage resources within the environment using the WebUI."
-  value = "http://${aws_instance.automq_byoc_console.public_ip}:8080"
+  value = "http://${aws_eip.web_ip.public_ip}:8080"
 }
 
 output "automq_byoc_initial_username" {
@@ -41,7 +41,7 @@ output "automq_byoc_ops_bucket_name" {
 
 output "automq_byoc_env_console_ec2_instance_ip" {
   description = "The instance IP of the deployed AutoMQ BYOC control panel. You can access the service through this IP."
-  value = aws_instance.automq_byoc_console.public_ip
+  value = aws_eip.web_ip.public_ip
 }
 
 output "automq_byoc_env_console_public_subnet_id" {

variables.tf

@@ -57,17 +57,17 @@ 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     = "latest"
+  default     = "1.2.10"
 }
 
-variable "specified_ami_by_marketplace" {
-  description = "The parameter defaults to true, which means the AMI will be obtained from AWS Marketplace. If you wish to use a custom AMI, set this parameter to false and specify the `automq_byoc_env_console_ami` parameter with your custom AMI ID."
+variable "use_custom_ami" {
+  description = "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."
   type        = bool
-  default     = true
+  default     = false
 }
 
 variable "automq_byoc_env_console_ami" {
-  description = "When parameter `specified_ami_by_marketplace` set to false, this parameter must set a custom AMI to deploy automq console."
+  description = "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."
   type        = string
   default     = ""
 }