Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 14 additions & 8 deletions tencentcloud/services/as/service_tencentcloud_as.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,23 @@ func (me *AsService) DescribeLaunchConfigurationById(ctx context.Context, config
func (me *AsService) DescribeLaunchConfigurationByFilter(ctx context.Context, configurationId, configurationName string) (configs []*as.LaunchConfiguration, errRet error) {
logId := tccommon.GetLogId(ctx)
request := as.NewDescribeLaunchConfigurationsRequest()
request.Filters = make([]*as.Filter, 0)
filters := make([]*as.Filter, 0)
if configurationId != "" {
filter := &as.Filter{
Name: helper.String("launch-configuration-id"),
Values: []*string{&configurationId},
}
request.Filters = append(request.Filters, filter)
filters = append(filters, filter)
}
if configurationName != "" {
filter := &as.Filter{
Name: helper.String("launch-configuration-name"),
Values: []*string{&configurationName},
}
request.Filters = append(request.Filters, filter)
filters = append(filters, filter)
}
if len(filters) > 0 {
request.Filters = filters
}

offset := 0
Expand Down Expand Up @@ -130,34 +133,37 @@ func (me *AsService) DescribeAutoScalingGroupByFilter(
) (scalingGroups []*as.AutoScalingGroup, errRet error) {
logId := tccommon.GetLogId(ctx)
request := as.NewDescribeAutoScalingGroupsRequest()
request.Filters = make([]*as.Filter, 0)
filters := make([]*as.Filter, 0)
if scalingGroupId != "" {
filter := &as.Filter{
Name: helper.String("auto-scaling-group-id"),
Values: []*string{&scalingGroupId},
}
request.Filters = append(request.Filters, filter)
filters = append(filters, filter)
}
if configurationId != "" {
filter := &as.Filter{
Name: helper.String("launch-configuration-id"),
Values: []*string{&configurationId},
}
request.Filters = append(request.Filters, filter)
filters = append(filters, filter)
}
if scalingGroupName != "" {
filter := &as.Filter{
Name: helper.String("auto-scaling-group-name"),
Values: []*string{&scalingGroupName},
}
request.Filters = append(request.Filters, filter)
filters = append(filters, filter)
}
for k, v := range tags {
request.Filters = append(request.Filters, &as.Filter{
filters = append(filters, &as.Filter{
Name: helper.String("tag:" + k),
Values: []*string{helper.String(v)},
})
}
if len(filters) > 0 {
request.Filters = filters
}

offset := 0
pageSize := 100
Expand Down
5 changes: 5 additions & 0 deletions tencentcloud/services/cam/resource_tc_cam_role_sso_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ func init() {
response, err := client.UseCamClient().DescribeOIDCConfig(request)

if err != nil {
tencentErr := err.(*errors.TencentCloudSDKError)
if tencentErr.Code == "ResourceNotFound.IdentityNotExist" {
log.Printf("sso role name %s not exists", defaultSSORoleName)
return nil
}
return err
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ func init() {
id := *groups[i].PGroupId
name := *groups[i].Name

if tcacctest.IsResourcePersist(name, nil) || !strings.HasPrefix(name, "test") {
continue
}

rules, err := service.DescribeAccessRule(ctx, id, "")

if err == nil { // ignore deleting the access rules when an error happened
Expand All @@ -55,9 +59,6 @@ func init() {
}
}

if tcacctest.IsResourcePersist(name, nil) || !strings.HasPrefix(name, "test") {
continue
}
if err := service.DeleteAccessGroup(ctx, id); err != nil {
continue
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package sqlserver_test
import (
"context"
"fmt"
"log"
"strings"
"testing"

Expand Down Expand Up @@ -35,7 +36,8 @@ func init() {
}

if len(db) == 0 {
return fmt.Errorf("%s not exists", tcacctest.DefaultSQLServerName)
log.Printf("sqlserver %s not exists", tcacctest.DefaultSQLServerName)
return nil
}

instanceId := *db[0].InstanceId
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package sqlserver_test
import (
"context"
"fmt"
"log"
"strings"
"testing"
"time"
Expand Down Expand Up @@ -37,7 +38,8 @@ func init() {
}

if len(db) == 0 {
return fmt.Errorf("%s not exists", tcacctest.DefaultSQLServerName)
log.Printf("%s not exists", tcacctest.DefaultSQLServerName)
return nil
}

instanceId := *db[0].InstanceId
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ func init() {
if err != nil {
return err
}
if len(instances) == 0 {
log.Println("sqlserver instance is empty")
return nil
}

var (
insId string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,19 @@ func testAccTencentCloudSQLServerPubSubSweeper(r string) error {
if err != nil {
return err
}
subInstances, err := service.DescribeSqlserverInstances(ctx, "", tcacctest.DefaultSubSQLServerName, -1, "", "", 1)
if len(instance) == 0 {
log.Printf("sqlserver publish instance %s not exists", tcacctest.DefaultPubSQLServerName)
return nil
}

subInstances, err := service.DescribeSqlserverInstances(ctx, "", tcacctest.DefaultSubSQLServerName, -1, "", "", 1)
if err != nil {
return err
}
if len(subInstances) == 0 {
log.Printf("sqlserver subscribe instance %s not exists", tcacctest.DefaultSubSQLServerName)
return nil
}

pubInstanceId := *instance[0].InstanceId
subInstanceId := *subInstances[0].InstanceId
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package tcaplusdb_test
import (
"context"
"fmt"
"log"
"testing"
"time"

Expand Down Expand Up @@ -35,7 +36,8 @@ func init() {
}

if len(clusters) == 0 {
return fmt.Errorf("no cluster named %s", tcacctest.DefaultTcaPlusClusterName)
log.Printf("no cluster named %s", tcacctest.DefaultTcaPlusClusterName)
return nil
}

clusterId := *clusters[0].ClusterId
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ package tcr_test
import (
"context"
"fmt"
"log"
"strings"
"testing"

"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"

tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
svctcr "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/tcr"
Expand Down Expand Up @@ -34,6 +37,11 @@ func testSweepTcrImmutableTagRule(r string) error {
// so... only need to care about the rules under the keep namespace
rules, err := tcrService.DescribeTcrImmutableTagRuleById(ctx, tcacctest.DefaultTCRInstanceId, helper.String(tcacctest.DefaultTCRNamespace), nil)
if err != nil {
tencentErr := err.(*errors.TencentCloudSDKError)
if tencentErr.Code == "ResourceNotFound" {
log.Printf("tcr instanceId %s not exists", tcacctest.DefaultTCRInstanceId)
return nil
}
return err
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package tke_test
import (
"context"
"fmt"
"log"
"strings"
"testing"

Expand Down Expand Up @@ -33,7 +34,8 @@ func init() {
}

if len(cls) == 0 {
return fmt.Errorf("no persistent cluster")
log.Println("no persistent cluster")
return nil
}

for _, c := range cls {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,15 @@ func testNodePoolSweep(region string) error {
client := cli.(tccommon.ProviderMeta).GetAPIV3Conn()
service := svctke.NewTkeService(client)

cls, err := service.DescribeClusters(ctx, tcacctest.DefaultTkeClusterId, "")
if err != nil {
return err
}
if len(cls) == 0 {
log.Println("no found clusterId " + tcacctest.DefaultTkeClusterId)
return nil
}

request := tke.NewDescribeClusterNodePoolsRequest()
request.ClusterId = helper.String(tcacctest.DefaultTkeClusterId)
response, err := client.UseTkeClient().DescribeClusterNodePools(request)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ func init() {
}

if len(clusters) == 0 {
return fmt.Errorf("no cluster names %s", tcacctest.DefaultTkeClusterName)
log.Println("no cluster names " + tcacctest.DefaultTkeClusterName)
return nil
}

clusterId := clusters[0].ClusterId
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package tmp_test
import (
"context"
"fmt"
"log"
"strings"
"testing"

Expand All @@ -13,6 +14,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
"github.com/pkg/errors"
tencent_errors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
monitor "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor/v20180724"
)

Expand All @@ -32,11 +34,17 @@ func init() {
promConfigs, err := service.DescribeTkeTmpConfigById(ctx, configId)

if err != nil {
tencentErr := err.(*tencent_errors.TencentCloudSDKError)
if tencentErr.Code == "InvalidParameter.PromInstanceNotFound" {
log.Println("prometheus instance not exists")
return nil
}
return err
}

if promConfigs == nil {
return fmt.Errorf("Prometheus config %s not exist", configId)
log.Printf("prometheus config %s not exist", configId)
return nil
}

ServiceMonitors := transObj2StrNames(promConfigs.ServiceMonitors)
Expand Down
28 changes: 20 additions & 8 deletions tencentcloud/services/vpc/service_tencentcloud_vpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -2543,13 +2543,16 @@ func (me *VpcService) DescribeNatGatewayByFilter(ctx context.Context, filters ma
logId = tccommon.GetLogId(ctx)
request = vpc.NewDescribeNatGatewaysRequest()
)
request.Filters = make([]*vpc.Filter, 0, len(filters))
reqFilters := make([]*vpc.Filter, 0, len(filters))
for k, v := range filters {
filter := vpc.Filter{
Name: helper.String(k),
Values: []*string{helper.String(v)},
}
request.Filters = append(request.Filters, &filter)
reqFilters = append(reqFilters, &filter)
}
if len(reqFilters) > 0 {
request.Filters = reqFilters
}

var offset uint64 = 0
Expand Down Expand Up @@ -3401,13 +3404,16 @@ func (me *VpcService) DescribeHaVipByFilter(ctx context.Context, filters map[str
logId = tccommon.GetLogId(ctx)
request = vpc.NewDescribeHaVipsRequest()
)
request.Filters = make([]*vpc.Filter, 0, len(filters))
reqFilters := make([]*vpc.Filter, 0, len(filters))
for k, v := range filters {
filter := vpc.Filter{
Name: helper.String(k),
Values: []*string{helper.String(v)},
}
request.Filters = append(request.Filters, &filter)
reqFilters = append(reqFilters, &filter)
}
if len(reqFilters) > 0 {
request.Filters = reqFilters
}

var offset uint64 = 0
Expand Down Expand Up @@ -4174,13 +4180,16 @@ func (me *VpcService) DescribeVpnGwByFilter(ctx context.Context, filters map[str
logId = tccommon.GetLogId(ctx)
request = vpc.NewDescribeVpnGatewaysRequest()
)
request.Filters = make([]*vpc.FilterObject, 0, len(filters))
reqFilters := make([]*vpc.FilterObject, 0, len(filters))
for k, v := range filters {
filter := vpc.FilterObject{
Name: helper.String(k),
Values: []*string{helper.String(v)},
}
request.Filters = append(request.Filters, &filter)
reqFilters = append(reqFilters, &filter)
}
if len(reqFilters) > 0 {
request.Filters = reqFilters
}

var offset uint64 = 0
Expand Down Expand Up @@ -4239,13 +4248,16 @@ func (me *VpcService) DescribeCustomerGatewayByFilter(ctx context.Context, filte
logId = tccommon.GetLogId(ctx)
request = vpc.NewDescribeCustomerGatewaysRequest()
)
request.Filters = make([]*vpc.Filter, 0, len(filters))
reqFilters := make([]*vpc.Filter, 0, len(filters))
for k, v := range filters {
filter := vpc.Filter{
Name: helper.String(k),
Values: []*string{helper.String(v)},
}
request.Filters = append(request.Filters, &filter)
reqFilters = append(reqFilters, &filter)
}
if len(reqFilters) > 0 {
request.Filters = reqFilters
}

var offset uint64 = 0
Expand Down