Merge pull request #14 from AutoMQ/zhaoxi-ebs

Kris20030907 · web-flow · commit 93f5d9de93d6 · 2024-08-27T14:07:13.000+08:00
feat: Obtain availability zones based on subnets to avoid releasing d…
diff --git a/aws.tf b/aws.tf
@@ -252,4 +252,12 @@ resource "aws_eip" "web_ip" {
     automqVendor   = "automq"
     automqEnvironmentID = var.automq_byoc_env_id
   }
+}
+
+locals {
+  public_subnet_id = var.create_new_vpc ? module.automq_byoc_vpc[0].public_subnets[0] : var.automq_byoc_env_console_public_subnet_id
+}
+
+data "aws_subnet" "public_subnet_info" {
+  id = local.public_subnet_id
 }
diff --git a/main.tf b/main.tf
@@ -32,7 +32,7 @@ resource "aws_instance" "automq_byoc_console" {
 }
 
 resource "aws_ebs_volume" "data_volume" {
-  availability_zone = aws_instance.automq_byoc_console.availability_zone
+  availability_zone = data.aws_subnet.public_subnet_info.availability_zone
   size              = 20
   type              = "gp3"
 

Original file line number	Diff line number	Diff line change
`@@ -252,4 +252,12 @@ resource "aws_eip" "web_ip" {`
`252`	`252`	`automqVendor = "automq"`
`253`	`253`	`automqEnvironmentID = var.automq_byoc_env_id`
`254`	`254`	`}`
	`255`	`+}`
	`256`	`+`
	`257`	`+locals {`
	`258`	`+ public_subnet_id = var.create_new_vpc ? module.automq_byoc_vpc[0].public_subnets[0] : var.automq_byoc_env_console_public_subnet_id`
	`259`	`+}`
	`260`	`+`
	`261`	`+data "aws_subnet" "public_subnet_info" {`
	`262`	`+ id = local.public_subnet_id`
`255`	`263`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ resource "aws_instance" "automq_byoc_console" {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`resource "aws_ebs_volume" "data_volume" {`
`35`		`- availability_zone = aws_instance.automq_byoc_console.availability_zone`
	`35`	`+ availability_zone = data.aws_subnet.public_subnet_info.availability_zone`
`36`	`36`	`size = 20`
`37`	`37`	`type = "gp3"`
`38`	`38`