Skip to content

fix: clb failed unit test #1313

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

Merged
merged 1 commit into from
Oct 17, 2022
Merged

fix: clb failed unit test #1313

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
10 changes: 1 addition & 9 deletions tencentcloud/resource_tc_clb_attachment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,6 @@ func testAccCheckClbServerAttachmentExists(n string) resource.TestCheckFunc {
}

const testAccClbServerAttachment_tcp = instanceCommonTestCase + `
data "tencentcloud_ssl_certificates" "foo" {
name = "keep"
}

resource "tencentcloud_clb_instance" "foo" {
network_type = "OPEN"
clb_name = "tf-clb-attach-tcp-test"
Expand Down Expand Up @@ -200,10 +196,6 @@ resource "tencentcloud_clb_attachment" "foo" {
`

const testAccClbServerAttachment_tcp_update = instanceCommonTestCase + presetCVM + `
data "tencentcloud_ssl_certificates" "foo" {
name = "keep"
}

resource "tencentcloud_clb_instance" "foo" {
network_type = "OPEN"
clb_name = "tf-clb-attach-tcp-test"
Expand Down Expand Up @@ -239,7 +231,7 @@ resource "tencentcloud_clb_attachment" "foo" {

const testAccClbServerAttachment_tcp_update_ssl = instanceCommonTestCase + presetCVM + `
data "tencentcloud_ssl_certificates" "foo" {
name = "keep"
name = "keep-svr-ca"
}

resource "tencentcloud_clb_instance" "foo" {
Expand Down
16 changes: 8 additions & 8 deletions tencentcloud/resource_tc_clb_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ func TestAccTencentCloudClbInstance_multiple_instance(t *testing.T) {
testAccCheckClbInstanceExists("tencentcloud_clb_instance.multiple_instance"),
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "network_type", "OPEN"),
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "clb_name", MultiClbName),
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "master_zone_id", "100003"),
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "slave_zone_id", "100004"),
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "master_zone_id", "100004"),
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "slave_zone_id", "100003"),
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "tags.test", "mytest"),
),
},
Expand All @@ -266,8 +266,8 @@ func TestAccTencentCloudClbInstance_multiple_instance(t *testing.T) {
testAccCheckClbInstanceExists("tencentcloud_clb_instance.multiple_instance"),
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "network_type", "OPEN"),
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "clb_name", MultiClbName),
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "master_zone_id", "100003"),
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "slave_zone_id", "100004"),
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "master_zone_id", "100004"),
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "slave_zone_id", "100003"),
resource.TestCheckResourceAttr("tencentcloud_clb_instance.multiple_instance", "tags.test", "open"),
),
},
Expand Down Expand Up @@ -567,8 +567,8 @@ const testAccClbInstance__multi_instance = `
resource "tencentcloud_clb_instance" "multiple_instance" {
network_type = "OPEN"
clb_name = "` + MultiClbName + `"
master_zone_id = "100003"
slave_zone_id = "100004"
master_zone_id = "100004"
slave_zone_id = "100003"

tags = {
test = "mytest"
Expand All @@ -580,8 +580,8 @@ const testAccClbInstance__multi_instance_update = `
resource "tencentcloud_clb_instance" "multiple_instance" {
network_type = "OPEN"
clb_name = "` + MultiClbName + `"
master_zone_id = "100003"
slave_zone_id = "100004"
master_zone_id = "100004"
slave_zone_id = "100003"

tags = {
test = "open"
Expand Down
1 change: 0 additions & 1 deletion tencentcloud/resource_tc_clb_log_topic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
)

func TestAccTencentCloudClbInstanceTopic(t *testing.T) {
t.Parallel()

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Expand Down
12 changes: 6 additions & 6 deletions tencentcloud/resource_tc_clb_redirection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,20 +100,20 @@ func testAccCheckClbRedirectionExists(n string) resource.TestCheckFunc {
}

const testAccClbRedirection_basic = `
resource "tencentcloud_clb_instance" "clb_basic" {
resource "tencentcloud_clb_instance" "clb_basic_redirection" {
network_type = "OPEN"
clb_name = "tf-clb-redirection-basic"
}

resource "tencentcloud_clb_listener" "listener_basic" {
clb_id = tencentcloud_clb_instance.clb_basic.id
clb_id = tencentcloud_clb_instance.clb_basic_redirection.id
port = 1
protocol = "HTTP"
listener_name = "listener_basic"
}

resource "tencentcloud_clb_listener_rule" "rule_basic" {
clb_id = tencentcloud_clb_instance.clb_basic.id
clb_id = tencentcloud_clb_instance.clb_basic_redirection.id
listener_id = tencentcloud_clb_listener.listener_basic.listener_id
domain = "abc.com"
url = "/"
Expand All @@ -122,14 +122,14 @@ resource "tencentcloud_clb_listener_rule" "rule_basic" {
}

resource "tencentcloud_clb_listener" "listener_target" {
clb_id = tencentcloud_clb_instance.clb_basic.id
clb_id = tencentcloud_clb_instance.clb_basic_redirection.id
port = 44
protocol = "HTTP"
listener_name = "listener_basic1"
}

resource "tencentcloud_clb_listener_rule" "rule_target" {
clb_id = tencentcloud_clb_instance.clb_basic.id
clb_id = tencentcloud_clb_instance.clb_basic_redirection.id
listener_id = tencentcloud_clb_listener.listener_target.listener_id
domain = "abcd.com"
url = "/"
Expand All @@ -138,7 +138,7 @@ resource "tencentcloud_clb_listener_rule" "rule_target" {
}

resource "tencentcloud_clb_redirection" "redirection_basic" {
clb_id = tencentcloud_clb_instance.clb_basic.id
clb_id = tencentcloud_clb_instance.clb_basic_redirection.id
source_listener_id = tencentcloud_clb_listener.listener_basic.listener_id
target_listener_id = tencentcloud_clb_listener.listener_target.listener_id
source_rule_id = tencentcloud_clb_listener_rule.rule_basic.rule_id
Expand Down