Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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. #7805

Merged
merged 1 commit into from
Nov 5, 2024
Merged

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. #7805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions alicloud/resource_alicloud_polardb_cluster_endpoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}

Expand Down
36 changes: 17 additions & 19 deletions alicloud/resource_alicloud_polardb_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}),
),
},
Expand Down Expand Up @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion alicloud/resource_alicloud_polardb_database_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}
Expand Down
22 changes: 17 additions & 5 deletions alicloud/resource_alicloud_polardb_endpoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}

Expand Down
13 changes: 9 additions & 4 deletions alicloud/resource_alicloud_polardb_global_database_network_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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}"
}

Expand Down
21 changes: 16 additions & 5 deletions alicloud/resource_alicloud_polardb_primary_endpoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
14 changes: 6 additions & 8 deletions alicloud/service_alicloud_common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}
`
Expand Down
Loading