Skip to content

Commit 4b0a358

Browse files
authored
refactor: migrate some code to sub package (#2416)
* refactor: migrate package tencentcloud/services/cam * refactor: migrate package tencentcloud/services/cat * refactor: migrate package tencentcloud/services/cbs * refactor: migrate package tencentcloud/services/ccn * refactor: migrate package tencentcloud/services/cdh * fix: replace tccommon. tcacctest. in string * refactor: migrate package tencentcloud/services/cdb * refactor: migrate package tencentcloud/services/cdn * refactor: migrate package tencentcloud/services/cdwch * refactor: migrate package tencentcloud/services/cdwpg * refactor: migrate package tencentcloud/services/cfs * refactor: migrate package tencentcloud/services/cfw * refactor: migrate package tencentcloud/services/chdfs * refactor: migrate package tencentcloud/services/ci * refactor: migrate package tencentcloud/services/ciam * refactor: migrate package tencentcloud/services/ckafka * refactor: migrate package tencentcloud/services/clb * chore: remove unused code * refactor: migrate package tencentcloud/services/cls * refactor: migrate package tencentcloud/services/common * refactor: migrate package tencentcloud/services/cos * refactor: migrate package tencentcloud/services/crs * refactor: migrate package tencentcloud/services/css * refactor: migrate package tencentcloud/services/cwp * refactor: migrate package tencentcloud/services/cvm * refactor: migrate package tencentcloud/services/cynosdb * refactor: migrate package tencentcloud/services/apigateway * refactor: migrate package tencentcloud/services/as * refactor: migrate package tencentcloud/services/audit * fix: replace tccommon. tcacctest. in string * style: fmt
1 parent 942a291 commit 4b0a358

File tree

1,212 files changed

+69075
-16656
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,212 files changed

+69075
-16656
lines changed

tencentcloud/acctest/test_util.go

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ import (
99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1010
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
12+
"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
1213

1314
tcprovider "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud"
15+
providercommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
1416
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/connectivity"
1517
)
1618

@@ -206,3 +208,46 @@ func AccPreCheckBusiness(t *testing.T, accountType string) {
206208
AccPreCheck(t)
207209
}
208210
}
211+
212+
type TencentCloudClient struct {
213+
apiV3Conn *connectivity.TencentCloudClient
214+
}
215+
216+
var _ providercommon.ProviderMeta = &TencentCloudClient{}
217+
218+
// GetAPIV3Conn 返回访问云 API 的客户端连接对象
219+
func (meta *TencentCloudClient) GetAPIV3Conn() *connectivity.TencentCloudClient {
220+
return meta.apiV3Conn
221+
}
222+
223+
func SharedClientForRegion(region string) (interface{}, error) {
224+
var secretId string
225+
if secretId = os.Getenv(tcprovider.PROVIDER_SECRET_ID); secretId == "" {
226+
return nil, fmt.Errorf("%s can not be empty", tcprovider.PROVIDER_SECRET_ID)
227+
}
228+
229+
var secretKey string
230+
if secretKey = os.Getenv(tcprovider.PROVIDER_SECRET_KEY); secretKey == "" {
231+
return nil, fmt.Errorf("%s can not be empty", tcprovider.PROVIDER_SECRET_KEY)
232+
}
233+
234+
securityToken := os.Getenv(tcprovider.PROVIDER_SECURITY_TOKEN)
235+
protocol := os.Getenv(tcprovider.PROVIDER_PROTOCOL)
236+
domain := os.Getenv(tcprovider.PROVIDER_DOMAIN)
237+
238+
client := &connectivity.TencentCloudClient{
239+
Credential: common.NewTokenCredential(
240+
secretId,
241+
secretKey,
242+
securityToken,
243+
),
244+
Region: region,
245+
Protocol: protocol,
246+
Domain: domain,
247+
}
248+
249+
var tcClient TencentCloudClient
250+
tcClient.apiV3Conn = client
251+
252+
return &tcClient, nil
253+
}

tencentcloud/data_source_tc_clickhouse_backup_tables_test.go

Lines changed: 0 additions & 27 deletions
This file was deleted.

tencentcloud/data_source_tc_postgresql_instances_test.go

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
package tencentcloud
22

33
import (
4+
"context"
5+
"fmt"
46
"testing"
57

68
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
9+
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
10+
11+
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
712
)
813

914
var testDataPostgresqlInstancesName = "data.tencentcloud_postgresql_instances.id_test"
@@ -43,6 +48,26 @@ func TestAccTencentCloudPostgresqlInstancesDataSource(t *testing.T) {
4348
})
4449
}
4550

51+
func testAccCheckLBDestroy(s *terraform.State) error {
52+
logId := tccommon.GetLogId(tccommon.ContextNil)
53+
ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
54+
55+
clbService := ClbService{
56+
client: testAccProvider.Meta().(tccommon.ProviderMeta).GetAPIV3Conn(),
57+
}
58+
for _, rs := range s.RootModule().Resources {
59+
if rs.Type != "tencentcloud_lb" {
60+
continue
61+
}
62+
63+
_, err := clbService.DescribeLoadBalancerById(ctx, rs.Primary.ID)
64+
if err == nil {
65+
return fmt.Errorf("clb instance still exists: %s", rs.Primary.ID)
66+
}
67+
}
68+
return nil
69+
}
70+
4671
const testAccTencentCloudDataPostgresqlInstanceBasic = CommonPresetPGSQL + `
4772
4873
data "tencentcloud_postgresql_instances" "id_test"{

tencentcloud/provider.go

Lines changed: 579 additions & 552 deletions
Large diffs are not rendered by default.

tencentcloud/resource_tc_clb_replace_cert_for_lbs_test.go

Lines changed: 0 additions & 35 deletions
This file was deleted.

tencentcloud/resource_tc_mysql_switch_proxy.go

Lines changed: 0 additions & 188 deletions
This file was deleted.

0 commit comments

Comments
 (0)