testcase: fix testcase for resource/alicloud_polardb_cluster_endpoint…

…, resource/alicloud_polardb_cluster, resource/alicloud_polardb_database, resource/alicloud_polardb_endpoint, resource/alicloud_polardb_global_database_network, resource/alicloud_polardb_primary_endpoint.
aliyun · Nov 5, 2024 · 21a76be · 21a76be
1 parent dca2da1
commit 21a76be
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 48 deletions.
diff --git a/alicloud/resource_alicloud_polardb_cluster_endpoint_test.go b/alicloud/resource_alicloud_polardb_cluster_endpoint_test.go
@@ -244,22 +244,34 @@ func resourcePolarDBClusterEndpointConfigDependence(name string) string {
         variable "name" {
 			default = "%s"
         }
-		
-		data "alicloud_polardb_zones" "default"{}
+
 		data "alicloud_vpcs" "default" {
 			name_regex = "^default-NODELETING$"
 		}
-		data "alicloud_vswitches" "default" {
-			zone_id = data.alicloud_polardb_zones.default.ids[length(data.alicloud_polardb_zones.default.ids) - 1]
-			vpc_id = data.alicloud_vpcs.default.ids.0
+
+		resource "alicloud_vpc" "default" {
+			vpc_name = var.name
+		}
+			
+		resource "alicloud_vswitch" "default" {
+			zone_id = data.alicloud_polardb_node_classes.default.classes.0.zone_id
+			vpc_id = alicloud_vpc.default.id
+			cidr_block = cidrsubnet(alicloud_vpc.default.cidr_block, 8, 4)
+		}
+
+		data "alicloud_polardb_node_classes" "default" {
+			pay_type   = "PostPaid"
+			db_type    = "MySQL"
+			db_version = "8.0"
+			category   = "Normal"
 		}
 
         resource "alicloud_polardb_cluster" "cluster" {
                 db_type = "MySQL"
                 db_version = "8.0"
                 pay_type = "PostPaid"
                 db_node_class = "polar.mysql.x4.medium"
-                vswitch_id = data.alicloud_vswitches.default.ids.0
+                vswitch_id =  alicloud_vswitch.default.id
                 description = "${var.name}"
         }
 

diff --git a/alicloud/resource_alicloud_polardb_cluster_test.go b/alicloud/resource_alicloud_polardb_cluster_test.go
@@ -1060,13 +1060,13 @@ func TestAccAliCloudPolarDBCluster_VpcId(t *testing.T) {
 					"description":       "${var.name}",
 					"resource_group_id": "${data.alicloud_resource_manager_resource_groups.default.ids.0}",
 					"vpc_id":            "${local.vpc_id}",
-					"security_ips":      []string{"10.168.1.12", "100.69.7.112"},
+					"security_ips":      []string{"10.168.1.12", "100.69.7.112", "127.0.0.1"},
 				}),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheck(map[string]string{
 						"resource_group_id": CHECKSET,
 						"vpc_id":            CHECKSET,
-						"security_ips.#":    "2",
+						"security_ips.#":    "3",
 					}),
 				),
 			},
@@ -1824,28 +1824,26 @@ func resourcePolarDBClusterPrePaidConfigDependence(name string) string {
 	data "alicloud_vpcs" "default" {
 		name_regex = "^default-NODELETING$"
 	}
-	data "alicloud_vswitches" "default" {
+	resource "alicloud_vpc" "default" {
+			vpc_name = var.name
+		}
+	
+	resource "alicloud_vswitch" "default" {
 		zone_id = data.alicloud_polardb_node_classes.this.classes.0.zone_id
-		vpc_id = data.alicloud_vpcs.default.ids.0
+		vpc_id = alicloud_vpc.default.id
+		cidr_block = cidrsubnet(alicloud_vpc.default.cidr_block, 8, 4)
 	}
 
-	resource "alicloud_vswitch" "vswitch" {
-		count             = length(data.alicloud_vswitches.default.ids) > 0 ? 0 : 1
-		vpc_id            = data.alicloud_vpcs.default.ids.0
-		cidr_block        = cidrsubnet(data.alicloud_vpcs.default.vpcs[0].cidr_block, 8, 8)
-		zone_id           = data.alicloud_polardb_node_classes.this.classes.0.zone_id
-		vswitch_name      = var.name
-	}
-	
-	locals {
-		vswitch_id = length(data.alicloud_vswitches.default.ids) > 0 ? data.alicloud_vswitches.default.ids[0] : concat(alicloud_vswitch.vswitch.*.id, [""])[0]
+	data "alicloud_polardb_node_classes" "this" {
+		  db_type    = "MySQL"
+		  db_version = "8.0"
+		  pay_type   = "PrePaid"
+		  category   = "Normal"
 	}
 
-	data "alicloud_polardb_node_classes" "this" {
-	  db_type    = "MySQL"
-	  db_version = "8.0"
-      pay_type   = "PrePaid"
-	  category   = "Normal"
+	locals {
+		vpc_id = alicloud_vpc.default.id
+		vswitch_id = concat(alicloud_vswitch.default.*.id, [""])[0]
 	}
 
 	data "alicloud_resource_manager_resource_groups" "default" {

diff --git a/alicloud/resource_alicloud_polardb_database_test.go b/alicloud/resource_alicloud_polardb_database_test.go
@@ -149,7 +149,7 @@ func resourcePolarDBDatabaseConfigPostgreSQLDependence(name string) string {
 		db_type = "PostgreSQL"
 		db_version = "14"
 		pay_type = "PostPaid"
-		db_node_class = data.alicloud_polardb_node_classes.this.classes.0.supported_engines.0.available_resources.0.db_node_class
+		db_node_class = "polar.pg.x4.medium"
 		vswitch_id = local.vswitch_id
 		description = "${var.name}"
 	}

diff --git a/alicloud/resource_alicloud_polardb_endpoint_test.go b/alicloud/resource_alicloud_polardb_endpoint_test.go
@@ -259,21 +259,33 @@ func resourcePolarDBEndpointConfigDependence(name string) string {
                 default = "%s"
         }
 
-		data "alicloud_polardb_zones" "default"{}
 		data "alicloud_vpcs" "default" {
 			name_regex = "^default-NODELETING$"
 		}
-		data "alicloud_vswitches" "default" {
-			zone_id = data.alicloud_polardb_zones.default.ids[length(data.alicloud_polardb_zones.default.ids) - 1]
-			vpc_id = data.alicloud_vpcs.default.ids.0
+
+		resource "alicloud_vpc" "default" {
+			vpc_name = var.name
+		}
+	
+		resource "alicloud_vswitch" "default" {
+			zone_id = data.alicloud_polardb_node_classes.default.classes.0.zone_id
+			vpc_id = alicloud_vpc.default.id
+			cidr_block = cidrsubnet(alicloud_vpc.default.cidr_block, 8, 4)
+		}
+
+		data "alicloud_polardb_node_classes" "default" {
+			pay_type   = "PostPaid"
+			db_type    = "MySQL"
+			db_version = "8.0"
+			category   = "Normal"
 		}
 
         resource "alicloud_polardb_cluster" "cluster" {
                 db_type = "MySQL"
                 db_version = "8.0"
                 pay_type = "PostPaid"
                 db_node_class = "polar.mysql.x4.medium"
-                vswitch_id = data.alicloud_vswitches.default.ids.0
+                vswitch_id = alicloud_vswitch.default.id
                 description = "${var.name}"
         }
 

diff --git a/alicloud/resource_alicloud_polardb_global_database_network_test.go b/alicloud/resource_alicloud_polardb_global_database_network_test.go
@@ -199,12 +199,17 @@ data "alicloud_vpcs" "default" {
 	name_regex = "^default-NODELETING$"
 }
 
-data "alicloud_vswitches" "default" {
-	vpc_id = data.alicloud_vpcs.default.ids.0
+resource "alicloud_vpc" "default" {
+	vpc_name = var.name
+}
+	
+resource "alicloud_vswitch" "default" {
+	zone_id = data.alicloud_polardb_node_classes.default.classes.0.zone_id
+	vpc_id = alicloud_vpc.default.id
+	cidr_block = cidrsubnet(alicloud_vpc.default.cidr_block, 8, 4)
 }
 
 data "alicloud_polardb_node_classes" "default" {
-	zone_id    = data.alicloud_vswitches.default.vswitches.0.zone_id
 	pay_type   = "PostPaid"
 	db_type    = "MySQL"
 	db_version = "8.0"
@@ -216,7 +221,7 @@ resource "alicloud_polardb_cluster" "default" {
 	db_version    = "8.0"
 	pay_type      = "PostPaid"
 	db_node_class = data.alicloud_polardb_node_classes.default.classes.0.supported_engines.0.available_resources.2.db_node_class
-	vswitch_id    = data.alicloud_vswitches.default.ids.0
+	vswitch_id    = alicloud_vswitch.default.id
 	description   = "${var.name}"
 }
 

diff --git a/alicloud/resource_alicloud_polardb_primary_endpoint_test.go b/alicloud/resource_alicloud_polardb_primary_endpoint_test.go
@@ -113,21 +113,32 @@ func resourcePolarDBPrimaryEndpointConfigDependence(name string) string {
 			default = "%s"
         }
 
-		data "alicloud_polardb_zones" "default"{}
 		data "alicloud_vpcs" "default" {
 			name_regex = "^default-NODELETING$"
 		}
-		data "alicloud_vswitches" "default" {
-			zone_id = data.alicloud_polardb_zones.default.ids[length(data.alicloud_polardb_zones.default.ids) - 1]
-			vpc_id = data.alicloud_vpcs.default.ids.0
+		resource "alicloud_vpc" "default" {
+			vpc_name = var.name
+		}
+	
+		resource "alicloud_vswitch" "default" {
+			zone_id = data.alicloud_polardb_node_classes.default.classes.0.zone_id
+			vpc_id = alicloud_vpc.default.id
+			cidr_block = cidrsubnet(alicloud_vpc.default.cidr_block, 8, 4)
+		}
+
+		data "alicloud_polardb_node_classes" "default" {
+			pay_type   = "PostPaid"
+			db_type    = "MySQL"
+			db_version = "8.0"
+			category   = "Normal"
 		}
 
         resource "alicloud_polardb_cluster" "cluster" {
                 db_type = "MySQL"
                 db_version = "8.0"
                 pay_type = "PostPaid"
                 db_node_class = "polar.mysql.x4.medium"
-                vswitch_id = data.alicloud_vswitches.default.ids.0
+                vswitch_id = alicloud_vswitch.default.id
                 description = "${var.name}"
         }
         `, name)

diff --git a/alicloud/service_alicloud_common_test.go b/alicloud/service_alicloud_common_test.go
@@ -933,20 +933,18 @@ data "alicloud_polardb_zones" "default"{}
 data "alicloud_vpcs" "default" {
 	name_regex = "^default-NODELETING$"
 }
-data "alicloud_vswitches" "default" {
-	zone_id = local.zone_id
-	vpc_id = data.alicloud_vpcs.default.ids.0
+resource "alicloud_vpc" "default" {
+    vpc_name = var.name
 }
 resource "alicloud_vswitch" "this" {
- count = length(data.alicloud_vswitches.default.ids) > 0 ? 0 : 1
  vswitch_name = "tf_testAccPolarDB"
- vpc_id = data.alicloud_vpcs.default.ids.0
+ vpc_id = alicloud_vpc.default.id
  zone_id = data.alicloud_polardb_zones.default.ids.0
- cidr_block = cidrsubnet(data.alicloud_vpcs.default.vpcs.0.cidr_block, 8, 4)
+ cidr_block = cidrsubnet(alicloud_vpc.default.cidr_block, 8, 4)
 }
 locals {
-  vpc_id = data.alicloud_vpcs.default.ids.0
-  vswitch_id = length(data.alicloud_vswitches.default.ids) > 0 ? data.alicloud_vswitches.default.ids.0 : concat(alicloud_vswitch.this.*.id, [""])[0]
+  vpc_id = alicloud_vpc.default.id
+  vswitch_id = concat(alicloud_vswitch.this.*.id, [""])[0]	
   zone_id = data.alicloud_polardb_zones.default.ids[length(data.alicloud_polardb_zones.default.ids)-2]
 }
 `