Skip to content

Commit 0cd5427

Browse files
Sherlock-HoloSherlock-Holo
committed
fix: layer7 listener test check destroy may fail
1 parent 8df4a38 commit 0cd5427

File tree

3 files changed

+22
-63
lines changed

3 files changed

+22
-63
lines changed

‎tencentcloud/resource_tc_gaap_layer4_listener_test.go‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -293,14 +293,8 @@ func testAccCheckGaapLayer4ListenerDestroy(id *string, protocol string) resource
293293
listeners, err := service.DescribeTCPListeners(context.TODO(), nil, id, nil, nil)
294294
if err != nil {
295295
if sdkError, ok := err.(*sdkErrors.TencentCloudSDKError); ok {
296-
switch sdkError.Code {
297-
case GAAPResourceNotFound:
296+
if sdkError.Code == GAAPResourceNotFound || (sdkError.Code == "InvalidParameter" && sdkError.Message == "ListenerId") {
298297
return nil
299-
300-
case "InvalidParameter":
301-
if sdkError.Message == "ListenerId" {
302-
return nil
303-
}
304298
}
305299
}
306300

‎tencentcloud/resource_tc_gaap_layer7_listener_test.go‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
1010
"github.com/hashicorp/terraform-plugin-sdk/terraform"
11+
sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
1112
)
1213

1314
func TestAccTencentCloudGaapLayer7Listener_basic(t *testing.T) {
@@ -291,6 +292,12 @@ func testAccCheckGaapLayer7ListenerDestroy(id *string, protocol string) resource
291292
case "HTTP":
292293
listeners, err := service.DescribeHTTPListeners(context.TODO(), nil, id, nil, nil)
293294
if err != nil {
295+
if sdkError, ok := err.(*sdkErrors.TencentCloudSDKError); ok {
296+
if sdkError.Code == GAAPResourceNotFound || (sdkError.Code == "InvalidParameter" && sdkError.Message == "ListenerId") {
297+
return nil
298+
}
299+
}
300+
294301
return err
295302
}
296303
if len(listeners) > 0 {
@@ -300,6 +307,12 @@ func testAccCheckGaapLayer7ListenerDestroy(id *string, protocol string) resource
300307
case "HTTPS":
301308
listeners, err := service.DescribeHTTPSListeners(context.TODO(), nil, id, nil, nil)
302309
if err != nil {
310+
if sdkError, ok := err.(*sdkErrors.TencentCloudSDKError); ok {
311+
if sdkError.Code == GAAPResourceNotFound || (sdkError.Code == "InvalidParameter" && sdkError.Message == "ListenerId") {
312+
return nil
313+
}
314+
}
315+
303316
return err
304317
}
305318
if len(listeners) > 0 {

‎tencentcloud/service_tencentcloud_gaap.go‎

Lines changed: 8 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,14 +1013,8 @@ func (me *GaapService) DescribeTCPListeners(ctx context.Context, proxyId, listen
10131013
count = 0
10141014

10151015
if sdkError, ok := err.(*sdkErrors.TencentCloudSDKError); ok {
1016-
switch sdkError.Code {
1017-
case GAAPResourceNotFound:
1016+
if sdkError.Code == GAAPResourceNotFound || (sdkError.Code == "InvalidParameter" && sdkError.Message == "ListenerId") {
10181017
return nil
1019-
1020-
case "InvalidParameter":
1021-
if sdkError.Message == "ListenerId" {
1022-
return nil
1023-
}
10241018
}
10251019
}
10261020

@@ -1080,14 +1074,8 @@ func (me *GaapService) DescribeUDPListeners(ctx context.Context, proxyId, id, na
10801074
count = 0
10811075

10821076
if sdkError, ok := err.(*sdkErrors.TencentCloudSDKError); ok {
1083-
switch sdkError.Code {
1084-
case GAAPResourceNotFound:
1077+
if sdkError.Code == GAAPResourceNotFound || (sdkError.Code == "InvalidParameter" && sdkError.Message == "ListenerId") {
10851078
return nil
1086-
1087-
case "InvalidParameter":
1088-
if sdkError.Message == "ListenerId" {
1089-
return nil
1090-
}
10911079
}
10921080
}
10931081

@@ -1249,14 +1237,8 @@ func (me *GaapService) DeleteLayer4Listener(ctx context.Context, id, proxyId, pr
12491237
response, err := client.DescribeTCPListeners(describeRequest)
12501238
if err != nil {
12511239
if sdkError, ok := err.(*sdkErrors.TencentCloudSDKError); ok {
1252-
switch sdkError.Code {
1253-
case GAAPResourceNotFound:
1240+
if sdkError.Code == GAAPResourceNotFound || (sdkError.Code == "InvalidParameter" && sdkError.Message == "ListenerId") {
12541241
return nil
1255-
1256-
case "InvalidParameter":
1257-
if sdkError.Message == "ListenerId" {
1258-
return nil
1259-
}
12601242
}
12611243
}
12621244

@@ -1287,14 +1269,8 @@ func (me *GaapService) DeleteLayer4Listener(ctx context.Context, id, proxyId, pr
12871269
response, err := client.DescribeUDPListeners(describeRequest)
12881270
if err != nil {
12891271
if sdkError, ok := err.(*sdkErrors.TencentCloudSDKError); ok {
1290-
switch sdkError.Code {
1291-
case GAAPResourceNotFound:
1272+
if sdkError.Code == GAAPResourceNotFound || (sdkError.Code == "InvalidParameter" && sdkError.Message == "ListenerId") {
12921273
return nil
1293-
1294-
case "InvalidParameter":
1295-
if sdkError.Message == "ListenerId" {
1296-
return nil
1297-
}
12981274
}
12991275
}
13001276

@@ -1839,14 +1815,8 @@ func (me *GaapService) DescribeHTTPListeners(
18391815
count = 0
18401816

18411817
if sdkError, ok := err.(*sdkErrors.TencentCloudSDKError); ok {
1842-
switch sdkError.Code {
1843-
case GAAPResourceNotFound:
1818+
if sdkError.Code == GAAPResourceNotFound || (sdkError.Code == "InvalidParameter" && sdkError.Message == "ListenerId") {
18441819
return nil
1845-
1846-
case "InvalidParameter":
1847-
if sdkError.Message == "ListenerId" {
1848-
return nil
1849-
}
18501820
}
18511821
}
18521822

@@ -1910,14 +1880,8 @@ func (me *GaapService) DescribeHTTPSListeners(
19101880
count = 0
19111881

19121882
if sdkError, ok := err.(*sdkErrors.TencentCloudSDKError); ok {
1913-
switch sdkError.Code {
1914-
case GAAPResourceNotFound:
1883+
if sdkError.Code == GAAPResourceNotFound || (sdkError.Code == "InvalidParameter" && sdkError.Message == "ListenerId") {
19151884
return nil
1916-
1917-
case "InvalidParameter":
1918-
if sdkError.Message == "ListenerId" {
1919-
return nil
1920-
}
19211885
}
19221886
}
19231887

@@ -2068,14 +2032,8 @@ func (me *GaapService) DeleteLayer7Listener(ctx context.Context, id, proxyId, pr
20682032
response, err := client.DescribeHTTPListeners(describeRequest)
20692033
if err != nil {
20702034
if sdkError, ok := err.(*sdkErrors.TencentCloudSDKError); ok {
2071-
switch sdkError.Code {
2072-
case GAAPResourceNotFound:
2035+
if sdkError.Code == GAAPResourceNotFound || (sdkError.Code == "InvalidParameter" && sdkError.Message == "ListenerId") {
20732036
return nil
2074-
2075-
case "InvalidParameter":
2076-
if sdkError.Message == "ListenerId" {
2077-
return nil
2078-
}
20792037
}
20802038
}
20812039

@@ -2108,14 +2066,8 @@ func (me *GaapService) DeleteLayer7Listener(ctx context.Context, id, proxyId, pr
21082066
response, err := client.DescribeHTTPSListeners(describeRequest)
21092067
if err != nil {
21102068
if sdkError, ok := err.(*sdkErrors.TencentCloudSDKError); ok {
2111-
switch sdkError.Code {
2112-
case GAAPResourceNotFound:
2069+
if sdkError.Code == GAAPResourceNotFound || (sdkError.Code == "InvalidParameter" && sdkError.Message == "ListenerId") {
21132070
return nil
2114-
2115-
case "InvalidParameter":
2116-
if sdkError.Message == "ListenerId" {
2117-
return nil
2118-
}
21192071
}
21202072
}
21212073

0 commit comments

Comments
 (0)