chore: bump hw version to 1.57.0 to fix elb v3 issue (#1070)

FlexibleEngineCloud · Nov 25, 2023 · 2d17d17 · 2d17d17
1 parent 27fedef
commit 2d17d17
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 19 deletions.
diff --git a/flexibleengine/acceptance/resource_flexibleengine_lb_listener_v3_test.go b/flexibleengine/acceptance/resource_flexibleengine_lb_listener_v3_test.go
@@ -42,7 +42,8 @@ func TestAccElbV3Listener_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					rc.CheckResourceExists(),
 					resource.TestCheckResourceAttr(resourceName, "name", rName),
-					resource.TestCheckResourceAttr(resourceName, "forward_eip", "true"),
+					resource.TestCheckResourceAttr(resourceName, "description", "test description"),
+					resource.TestCheckResourceAttr(resourceName, "forward_eip", "false"),
 					resource.TestCheckResourceAttr(resourceName, "tags.key", "value"),
 					resource.TestCheckResourceAttr(resourceName, "tags.owner", "terraform"),
 				),
@@ -51,7 +52,8 @@ func TestAccElbV3Listener_basic(t *testing.T) {
 				Config: testAccElbV3ListenerConfig_update(rName, rNameUpdate),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "name", rNameUpdate),
-					resource.TestCheckResourceAttr(resourceName, "forward_eip", "false"),
+					resource.TestCheckResourceAttr(resourceName, "description", "update description"),
+					resource.TestCheckResourceAttr(resourceName, "forward_eip", "true"),
 					resource.TestCheckResourceAttr(resourceName, "tags.key1", "value1"),
 					resource.TestCheckResourceAttr(resourceName, "tags.owner", "terraform_update"),
 				),
@@ -75,7 +77,7 @@ resource "flexibleengine_lb_listener_v3" "test" {
   protocol        = "HTTP"
   protocol_port   = 8080
   loadbalancer_id = flexibleengine_lb_loadbalancer_v3.test.id
-  forward_eip     = true
+  forward_eip     = false
 
   idle_timeout     = 62
   request_timeout  = 63
@@ -95,10 +97,11 @@ func testAccElbV3ListenerConfig_update(rName, rNameUpdate string) string {
 
 resource "flexibleengine_lb_listener_v3" "test" {
   name            = "%s"
-  description     = "test description"
+  description     = "update description"
   protocol        = "HTTP"
   protocol_port   = 8080
   loadbalancer_id = flexibleengine_lb_loadbalancer_v3.test.id
+  forward_eip     = true
 
   idle_timeout     = 62
   request_timeout  = 63

diff --git a/flexibleengine/acceptance/resource_flexibleengine_lb_pool_v3_test.go b/flexibleengine/acceptance/resource_flexibleengine_lb_pool_v3_test.go
@@ -88,12 +88,12 @@ resource "flexibleengine_lb_loadbalancer_v3" "test" {
   ]
 }
 resource "flexibleengine_lb_listener_v3" "test" {
-  name            = "%[1]s"
-  description     = "test description"
-  protocol        = "HTTP"
-  protocol_port   = 8080
-  loadbalancer_id = flexibleengine_lb_loadbalancer_v3.test.id
-  forward_eip = true
+  name             = "%[1]s"
+  description      = "test description"
+  protocol         = "HTTP"
+  protocol_port    = 8080
+  loadbalancer_id  = flexibleengine_lb_loadbalancer_v3.test.id
+  forward_eip      = true
   idle_timeout     = 60
   request_timeout  = 60
   response_timeout = 60
@@ -104,6 +104,7 @@ resource "flexibleengine_lb_listener_v3" "test" {
 func testAccElbV3PoolConfig_basic(rName string) string {
 	return fmt.Sprintf(`
 %s
+
 resource "flexibleengine_lb_pool_v3" "test" {
   name        = "%s"
   protocol    = "HTTP"
@@ -116,6 +117,7 @@ resource "flexibleengine_lb_pool_v3" "test" {
 func testAccElbV3PoolConfig_update(rName, rNameUpdate string) string {
 	return fmt.Sprintf(`
 %s
+
 resource "flexibleengine_lb_pool_v3" "test" {
   name        = "%s"
   protocol    = "HTTP"

diff --git a/go.mod b/go.mod
@@ -4,14 +4,14 @@ go 1.18
 
 require (
 	github.com/aws/aws-sdk-go v1.34.0
-	github.com/chnsz/golangsdk v0.0.0-20230928032238-8368779eab9f
+	github.com/chnsz/golangsdk v0.0.0-20231027080141-c5721e2542e4
 	github.com/hashicorp/errwrap v1.1.0
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/go-uuid v1.0.3
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.0
-	github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.47
-	github.com/huaweicloud/terraform-provider-huaweicloud v1.56.0
+	github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.62
+	github.com/huaweicloud/terraform-provider-huaweicloud v1.57.0
 	github.com/jen20/awspolicyequivalence v1.1.0
 	github.com/jmespath/go-jmespath v0.4.0
 	github.com/mitchellh/go-homedir v1.1.0
@@ -54,6 +54,7 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/oklog/run v1.0.0 // indirect
+	github.com/tjfoc/gmsm v1.4.1 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
 	github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
 	github.com/vmihailenco/tagparser v0.1.1 // indirect