Skip to content

feat(tke): [WIP]tke provider gen update #2782

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.

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

Closed
wants to merge 2 commits into from
Closed
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
73 changes: 54 additions & 19 deletions tencentcloud/connectivity/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,6 @@
"strconv"
"time"

cdc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdc/v20201214"

csip "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip/v20221121"
cos "github.com/tencentyun/cos-go-sdk-v5"

dasb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb/v20191018"

oceanus "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/oceanus/v20190422"

cfw "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfw/v20190904"

waf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125"

dlc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dlc/v20210125"
wedata "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata/v20210820"

ciam "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ciam/v20220331"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/endpoints"
Expand All @@ -44,24 +26,30 @@
cat "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat/v20180409"
cbs "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs/v20170312"
cdb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb/v20170320"
cdc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdc/v20201214"
cdn "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn/v20180606"
cdwch "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdwch/v20200915"
cdwpg "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdwpg/v20201230"
cfs "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs/v20190719"
cfw "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfw/v20190904"
chdfs "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/chdfs/v20201112"
ciam "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ciam/v20220331"
ckafka "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka/v20190819"
clb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317"
audit "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit/v20190319"
cls "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016"
"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile"
csip "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip/v20221121"
cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
cwp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp/v20180228"
cynosdb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb/v20190107"
dasb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb/v20191018"
dayu "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu/v20180709"
dbbrain "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dbbrain/v20210527"
dc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dc/v20180410"
dcdb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dcdb/v20180411"
dlc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dlc/v20210125"
dnspod "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod/v20210323"
domain "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/domain/v20180808"
dts "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dts/v20211206"
Expand All @@ -76,6 +64,7 @@
mongodb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb/v20190725"
monitor "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor/v20180724"
mps "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps/v20190612"
oceanus "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/oceanus/v20190422"
organization "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/organization/v20210331"
postgre "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres/v20170312"
privatedns "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns/v20201028"
Expand All @@ -101,12 +90,16 @@
teo "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo/v20220901"
tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"
tke2 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20220501"
"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke2/v20220501"

Check failure on line 93 in tencentcloud/connectivity/client.go

View workflow job for this annotation

GitHub Actions / tfprovider-lint

cannot find package "." in:

Check failure on line 93 in tencentcloud/connectivity/client.go

View workflow job for this annotation

GitHub Actions / tfprovider-lint

could not import github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke2/v20220501 (invalid package name: "")
trocket "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket/v20230308"
tse "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse/v20201207"
tsf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf/v20180326"
vod "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717"
vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
waf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf/v20180125"
wedata "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata/v20210820"
ssl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss/v20180426"
cos "github.com/tencentyun/cos-go-sdk-v5"
)

//internal version: replace import begin, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation.
Expand Down Expand Up @@ -212,7 +205,10 @@
tke2Conn *tke2.Client
cdcConn *cdc.Client
//omit nil client
omitNilConn *common.Client
omitNilConn *common.Client
tkev20180525Conn *tke.Client
tke2v20220501Conn *v20220501.Client
tkev20220501Conn *tke2.Client
}

// NewClientProfile returns a new ClientProfile
Expand Down Expand Up @@ -1633,3 +1629,42 @@

return me.cdcConn
}

// UseTkeV20180525Client return TKE client for service
func (me *TencentCloudClient) UseTkeV20180525Client() *tke.Client {
if me.tkev20180525Conn != nil {
return me.tkev20180525Conn
}
cpf := me.NewClientProfile(300)
cpf.Language = "zh-CN"
me.tkev20180525Conn, _ = tke.NewClient(me.Credential, me.Region, cpf)
me.tkev20180525Conn.WithHttpTransport(&LogRoundTripper{})

return me.tkev20180525Conn
}

// UseTke2V20220501Client return TKE2 client for service
func (me *TencentCloudClient) UseTke2V20220501Client() *v20220501.Client {
if me.tke2v20220501Conn != nil {
return me.tke2v20220501Conn
}
cpf := me.NewClientProfile(300)
cpf.Language = "zh-CN"
me.tke2v20220501Conn, _ = v20220501.NewClient(me.Credential, me.Region, cpf)
me.tke2v20220501Conn.WithHttpTransport(&LogRoundTripper{})

return me.tke2v20220501Conn
}

// UseTkeV20220501Client return TKE client for service
func (me *TencentCloudClient) UseTkeV20220501Client() *tke2.Client {
if me.tkev20220501Conn != nil {
return me.tkev20220501Conn
}
cpf := me.NewClientProfile(300)
cpf.Language = "zh-CN"
me.tkev20220501Conn, _ = tke2.NewClient(me.Credential, me.Region, cpf)
me.tkev20220501Conn.WithHttpTransport(&LogRoundTripper{})

return me.tkev20220501Conn
}
2 changes: 1 addition & 1 deletion tencentcloud/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -2095,7 +2095,7 @@ func Provider() *schema.Provider {
"tencentcloud_kubernetes_native_node_pool": tke.ResourceTencentCloudKubernetesNativeNodePool(),
"tencentcloud_cdc_site": cdc.ResourceTencentCloudCdcSite(),
"tencentcloud_cdc_dedicated_cluster": cdc.ResourceTencentCloudCdcDedicatedCluster(),
},
"tencentcloud_kubernetes_native_node_pools": tke.ResourceTencentCloudKubernetesNativeNodePools()},

ConfigureFunc: providerConfigure,
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"

tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
)
Expand Down
4 changes: 2 additions & 2 deletions tencentcloud/services/tke/data_source_tc_kubernetes_charts.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading