diff --git a/tencentcloud/connectivity/client.go b/tencentcloud/connectivity/client.go index 23e3be58b1..026dce081b 100644 --- a/tencentcloud/connectivity/client.go +++ b/tencentcloud/connectivity/client.go @@ -9,24 +9,6 @@ import ( "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" @@ -44,25 +26,31 @@ import ( 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" cdwdoris "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdwdoris/v20211228" 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" - cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" + csip "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip/v20221121" + cvmv20170312 "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" @@ -77,6 +65,7 @@ import ( 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" @@ -100,14 +89,17 @@ import ( tdmq "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq/v20200217" tem "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem/v20210701" 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" + tkev20180525 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" + tkev20220501 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20220501" 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. @@ -132,13 +124,13 @@ type TencentCloudClient struct { asConn *as.Client vpcConn *vpc.Client cbsConn *cbs.Client - cvmConn *cvm.Client + cvmv20170312Conn *cvmv20170312.Client clbConn *clb.Client dayuConn *dayu.Client dcConn *dc.Client tagConn *tag.Client mongodbConn *mongodb.Client - tkeConn *tke.Client + tkev20180525Conn *tkev20180525.Client tdmqConn *tdmq.Client tcrConn *tcr.Client camConn *cam.Client @@ -210,9 +202,9 @@ type TencentCloudClient struct { regionConn *region.Client //internal version: replace client begin, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation. //internal version: replace client end, please do not modify this annotation and refrain from inserting any code between the beginning and end lines of the annotation. - tke2Conn *tke2.Client - cdcConn *cdc.Client - cdwdorisConn *cdwdoris.Client + tkev20220501Conn *tkev20220501.Client + cdcConn *cdc.Client + cdwdorisConn *cdwdoris.Client //omit nil client omitNilConn *common.Client } @@ -452,23 +444,43 @@ func (me *TencentCloudClient) UseClbClient(iacExtInfo ...IacExtInfo) *clb.Client } // UseCvmClient returns cvm client for service -func (me *TencentCloudClient) UseCvmClient(iacExtInfo ...IacExtInfo) *cvm.Client { +func (me *TencentCloudClient) UseCvmClient(iacExtInfo ...IacExtInfo) *cvmv20170312.Client { + var logRoundTripper LogRoundTripper + if len(iacExtInfo) != 0 { + logRoundTripper.InstanceId = iacExtInfo[0].InstanceId + } + + if me.cvmv20170312Conn != nil { + me.cvmv20170312Conn.WithHttpTransport(&logRoundTripper) + return me.cvmv20170312Conn + } + + var reqTimeout = getEnvDefault(PROVIDER_CVM_REQUEST_TIMEOUT, 300) + cpf := me.NewClientProfile(reqTimeout) + me.cvmv20170312Conn, _ = cvmv20170312.NewClient(me.Credential, me.Region, cpf) + me.cvmv20170312Conn.WithHttpTransport(&logRoundTripper) + + return me.cvmv20170312Conn +} + +// UseCvmV20170312Client returns cvm client for service +func (me *TencentCloudClient) UseCvmV20170312Client(iacExtInfo ...IacExtInfo) *cvmv20170312.Client { var logRoundTripper LogRoundTripper if len(iacExtInfo) != 0 { logRoundTripper.InstanceId = iacExtInfo[0].InstanceId } - if me.cvmConn != nil { - me.cvmConn.WithHttpTransport(&logRoundTripper) - return me.cvmConn + if me.cvmv20170312Conn != nil { + me.cvmv20170312Conn.WithHttpTransport(&logRoundTripper) + return me.cvmv20170312Conn } var reqTimeout = getEnvDefault(PROVIDER_CVM_REQUEST_TIMEOUT, 300) cpf := me.NewClientProfile(reqTimeout) - me.cvmConn, _ = cvm.NewClient(me.Credential, me.Region, cpf) - me.cvmConn.WithHttpTransport(&logRoundTripper) + me.cvmv20170312Conn, _ = cvmv20170312.NewClient(me.Credential, me.Region, cpf) + me.cvmv20170312Conn.WithHttpTransport(&logRoundTripper) - return me.cvmConn + return me.cvmv20170312Conn } // UseTagClient returns tag client for service @@ -485,22 +497,41 @@ func (me *TencentCloudClient) UseTagClient() *tag.Client { } // UseTkeClient returns tke client for service -func (me *TencentCloudClient) UseTkeClient(iacExtInfo ...IacExtInfo) *tke.Client { +func (me *TencentCloudClient) UseTkeClient(iacExtInfo ...IacExtInfo) *tkev20180525.Client { var logRoundTripper LogRoundTripper if len(iacExtInfo) != 0 { logRoundTripper.InstanceId = iacExtInfo[0].InstanceId } - if me.tkeConn != nil { - me.tkeConn.WithHttpTransport(&logRoundTripper) - return me.tkeConn + if me.tkev20180525Conn != nil { + me.tkev20180525Conn.WithHttpTransport(&logRoundTripper) + return me.tkev20180525Conn } cpf := me.NewClientProfile(300) cpf.Language = "zh-CN" - me.tkeConn, _ = tke.NewClient(me.Credential, me.Region, cpf) - me.tkeConn.WithHttpTransport(&logRoundTripper) + me.tkev20180525Conn, _ = tkev20180525.NewClient(me.Credential, me.Region, cpf) + me.tkev20180525Conn.WithHttpTransport(&logRoundTripper) - return me.tkeConn + return me.tkev20180525Conn +} + +// UseTkeV20180525Client returns tke client for service +func (me *TencentCloudClient) UseTkeV20180525Client(iacExtInfo ...IacExtInfo) *tkev20180525.Client { + var logRoundTripper LogRoundTripper + if len(iacExtInfo) != 0 { + logRoundTripper.InstanceId = iacExtInfo[0].InstanceId + } + + if me.tkev20180525Conn != nil { + me.tkev20180525Conn.WithHttpTransport(&logRoundTripper) + return me.tkev20180525Conn + } + cpf := me.NewClientProfile(300) + cpf.Language = "zh-CN" + me.tkev20180525Conn, _ = tkev20180525.NewClient(me.Credential, me.Region, cpf) + me.tkev20180525Conn.WithHttpTransport(&logRoundTripper) + + return me.tkev20180525Conn } // UseTdmqClient returns Tdmq client for service @@ -1605,22 +1636,41 @@ func getEnvDefault(key string, defVal int) int { } // UseTke2Client returns tke client for service -func (me *TencentCloudClient) UseTke2Client(iacExtInfo ...IacExtInfo) *tke2.Client { +func (me *TencentCloudClient) UseTke2Client(iacExtInfo ...IacExtInfo) *tkev20220501.Client { + var logRoundTripper LogRoundTripper + if len(iacExtInfo) != 0 { + logRoundTripper.InstanceId = iacExtInfo[0].InstanceId + } + + if me.tkev20220501Conn != nil { + me.tkev20220501Conn.WithHttpTransport(&logRoundTripper) + return me.tkev20220501Conn + } + + cpf := me.NewClientProfile(300) + me.tkev20220501Conn, _ = tkev20220501.NewClient(me.Credential, me.Region, cpf) + me.tkev20220501Conn.WithHttpTransport(&logRoundTripper) + + return me.tkev20220501Conn +} + +// UseTkeV20220501Client returns tke client for service +func (me *TencentCloudClient) UseTkeV20220501Client(iacExtInfo ...IacExtInfo) *tkev20220501.Client { var logRoundTripper LogRoundTripper if len(iacExtInfo) != 0 { logRoundTripper.InstanceId = iacExtInfo[0].InstanceId } - if me.tke2Conn != nil { - me.tke2Conn.WithHttpTransport(&logRoundTripper) - return me.tke2Conn + if me.tkev20220501Conn != nil { + me.tkev20220501Conn.WithHttpTransport(&logRoundTripper) + return me.tkev20220501Conn } cpf := me.NewClientProfile(300) - me.tke2Conn, _ = tke2.NewClient(me.Credential, me.Region, cpf) - me.tke2Conn.WithHttpTransport(&logRoundTripper) + me.tkev20220501Conn, _ = tkev20220501.NewClient(me.Credential, me.Region, cpf) + me.tkev20220501Conn.WithHttpTransport(&logRoundTripper) - return me.tke2Conn + return me.tkev20220501Conn } // UseCdcClient returns tem client for service diff --git a/tencentcloud/services/tke/data_source_tc_kubernetes_available_cluster_versions.go b/tencentcloud/services/tke/data_source_tc_kubernetes_available_cluster_versions.go index 77c676c451..bc4204cf80 100644 --- a/tencentcloud/services/tke/data_source_tc_kubernetes_available_cluster_versions.go +++ b/tencentcloud/services/tke/data_source_tc_kubernetes_available_cluster_versions.go @@ -1,14 +1,14 @@ +// Code generated by iacg; DO NOT EDIT. package tke import ( "context" - tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" + tkev20180525 "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" ) @@ -17,32 +17,32 @@ func DataSourceTencentCloudKubernetesAvailableClusterVersions() *schema.Resource Read: dataSourceTencentCloudKubernetesAvailableClusterVersionsRead, Schema: map[string]*schema.Schema{ "cluster_id": { - Optional: true, Type: schema.TypeString, + Optional: true, Description: "Cluster Id.", }, "cluster_ids": { - Optional: true, - Type: schema.TypeSet, + Type: schema.TypeSet, + Optional: true, + Description: "list of cluster IDs.", Elem: &schema.Schema{ Type: schema.TypeString, }, - Description: "list of cluster IDs.", }, "versions": { - Computed: true, - Type: schema.TypeSet, + Type: schema.TypeSet, + Computed: true, + Description: "Upgradable cluster version number. Note: This field may return null, indicating that no valid value can be obtained.", Elem: &schema.Schema{ Type: schema.TypeString, }, - Description: "Upgradable cluster version number. Note: This field may return null, indicating that no valid value can be obtained.", }, "clusters": { - Computed: true, Type: schema.TypeList, + Computed: true, Description: "cluster information. Note: This field may return null, indicating that no valid value can be obtained.", Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -52,12 +52,12 @@ func DataSourceTencentCloudKubernetesAvailableClusterVersions() *schema.Resource Description: "Cluster ID.", }, "versions": { - Type: schema.TypeSet, + Type: schema.TypeSet, + Computed: true, + Description: "list of cluster major version numbers, for example 1.18.4.", Elem: &schema.Schema{ Type: schema.TypeString, }, - Computed: true, - Description: "list of cluster major version numbers, for example 1.18.4.", }, }, }, @@ -76,7 +76,7 @@ func dataSourceTencentCloudKubernetesAvailableClusterVersionsRead(d *schema.Reso defer tccommon.LogElapsed("data_source.tencentcloud_kubernetes_available_cluster_versions.read")() defer tccommon.InconsistentCheck(d, meta)() - logId := tccommon.GetLogId(tccommon.ContextNil) + logId := tccommon.GetLogId(nil) ctx := tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta) service := TkeService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()} @@ -96,7 +96,7 @@ func dataSourceTencentCloudKubernetesAvailableClusterVersionsRead(d *schema.Reso paramMap["ClusterIds"] = clusterIdsList } - var respData *tke.DescribeAvailableClusterVersionResponseParams + var respData *tkev20180525.DescribeAvailableClusterVersionResponseParams err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { result, e := service.DescribeKubernetesAvailableClusterVersionsByFilter(ctx, paramMap) if e != nil { diff --git a/tencentcloud/services/tke/data_source_tc_kubernetes_available_cluster_versions_extension.go b/tencentcloud/services/tke/data_source_tc_kubernetes_available_cluster_versions_extension.go index e910629e70..1b851ef482 100644 --- a/tencentcloud/services/tke/data_source_tc_kubernetes_available_cluster_versions_extension.go +++ b/tencentcloud/services/tke/data_source_tc_kubernetes_available_cluster_versions_extension.go @@ -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" ) diff --git a/tencentcloud/services/tke/data_source_tc_kubernetes_charts.go b/tencentcloud/services/tke/data_source_tc_kubernetes_charts.go index d32d919126..ff1db5c2e7 100644 --- a/tencentcloud/services/tke/data_source_tc_kubernetes_charts.go +++ b/tencentcloud/services/tke/data_source_tc_kubernetes_charts.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" + tkev20180525 "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" @@ -106,7 +106,7 @@ func dataSourceTencentCloudKubernetesChartsRead(d *schema.ResourceData, meta int paramMap["ClusterType"] = helper.String(v.(string)) } - var respData []*tke.AppChart + var respData []*tkev20180525.AppChart err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { result, e := service.DescribeKubernetesChartsByFilter(ctx, paramMap) if e != nil { diff --git a/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_authentication_options.go b/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_authentication_options.go index ba815f897a..b68834c2ea 100644 --- a/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_authentication_options.go +++ b/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_authentication_options.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" + tkev20180525 "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" @@ -115,7 +115,7 @@ func dataSourceTencentCloudKubernetesClusterAuthenticationOptionsRead(d *schema. paramMap["ClusterId"] = helper.String(v.(string)) } - var respData *tke.DescribeClusterAuthenticationOptionsResponseParams + var respData *tkev20180525.DescribeClusterAuthenticationOptionsResponseParams err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { result, e := service.DescribeKubernetesClusterAuthenticationOptionsByFilter(ctx, paramMap) if e != nil { diff --git a/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_authentication_options_test.go b/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_authentication_options_test.go index df86b20040..38ebde2f85 100644 --- a/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_authentication_options_test.go +++ b/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_authentication_options_test.go @@ -24,10 +24,10 @@ func TestAccTencentCloudKubernetesClusterAuthenticationOptionsDataSource_basic(t }) } -const testAccKubernetesClusterAuthenticationOptionsDataSource = ` +const testAccKubernetesClusterAuthenticationOptionsDataSource = testAccTkeCluster + ` data "tencentcloud_kubernetes_cluster_authentication_options" "cluster_authentication_options" { - cluster_id = "cls-kzilgv5m" + cluster_id = tencentcloud_kubernetes_cluster.managed_cluster.id } ` diff --git a/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_common_names.go b/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_common_names.go index c394cd3fb8..4f2f81b5e2 100644 --- a/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_common_names.go +++ b/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_common_names.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" + tkev20180525 "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" @@ -93,7 +93,7 @@ func dataSourceTencentCloudKubernetesClusterCommonNamesRead(d *schema.ResourceDa paramMap["ClusterId"] = helper.String(v.(string)) } - var respData []*tke.CommonName + var respData []*tkev20180525.CommonName err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { result, e := service.DescribeKubernetesClusterCommonNamesByFilter(ctx, paramMap) if e != nil { @@ -106,17 +106,17 @@ func dataSourceTencentCloudKubernetesClusterCommonNamesRead(d *schema.ResourceDa return err } - cns := make([]string, 0, len(respData)) + var cns []string commonNamesList := make([]map[string]interface{}, 0, len(respData)) if respData != nil { for _, commonNames := range respData { commonNamesMap := map[string]interface{}{} + var cN string if commonNames.SubaccountUin != nil { commonNamesMap["subaccount_uin"] = commonNames.SubaccountUin } - var cN string if commonNames.CN != nil { commonNamesMap["common_names"] = commonNames.CN cN = *commonNames.CN diff --git a/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_common_names_test.go b/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_common_names_test.go index 5bf36cdf82..3d2ccee5ba 100644 --- a/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_common_names_test.go +++ b/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_common_names_test.go @@ -26,13 +26,13 @@ func TestAccTencentCloudKubernetesCommonNamesDataSource(t *testing.T) { }) } -const KeepTkeCNRoleName = ` -variable "keep_tke_cn" { - default = "keep-for-tke-cn" -} -` +// const KeepTkeCNRoleName = ` +// variable "keep_tke_cn" { +// default = "keep-for-tke-cn" +// } +// ` -const testAccKubernetesCommonNamesBasic = KeepTkeCNRoleName + ` +const testAccKubernetesCommonNamesBasic = testAccTkeCluster + ` data "tencentcloud_user_info" "info" {} locals { @@ -40,16 +40,17 @@ locals { uin = data.tencentcloud_user_info.info.uin } -data "tencentcloud_kubernetes_clusters" "cls" { - cluster_name = "` + tcacctest.DefaultTkeClusterName + `" -} +// data "tencentcloud_kubernetes_clusters" "cls" { +// cluster_name = "` + tcacctest.DefaultTkeClusterName + `" +// } data "tencentcloud_cam_roles" "role_basic" { - name = var.keep_tke_cn +// name = var.keep_tke_cn + name = "TKE_QCSRole" } data "tencentcloud_kubernetes_cluster_common_names" "foo" { - cluster_id = data.tencentcloud_kubernetes_clusters.cls.list.0.cluster_id + cluster_id = tencentcloud_kubernetes_cluster.managed_cluster.id role_ids = [data.tencentcloud_cam_roles.role_basic.role_list.0.role_id] } ` diff --git a/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_instances.go b/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_instances.go index d8fdc317f2..e7705deaa5 100644 --- a/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_instances.go +++ b/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_instances.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" + tkev20180525 "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" @@ -387,10 +387,10 @@ func dataSourceTencentCloudKubernetesClusterInstancesRead(d *schema.ResourceData if v, ok := d.GetOk("filters"); ok { filtersSet := v.([]interface{}) - tmpSet := make([]*tke.Filter, 0, len(filtersSet)) + tmpSet := make([]*tkev20180525.Filter, 0, len(filtersSet)) for _, item := range filtersSet { filtersMap := item.(map[string]interface{}) - filter := tke.Filter{} + filter := tkev20180525.Filter{} if v, ok := filtersMap["name"]; ok { filter.Name = helper.String(v.(string)) } @@ -406,7 +406,7 @@ func dataSourceTencentCloudKubernetesClusterInstancesRead(d *schema.ResourceData paramMap["Filters"] = tmpSet } - var respData []*tke.Instance + var respData []*tkev20180525.Instance err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { result, e := service.DescribeKubernetesClusterInstancesByFilter(ctx, paramMap) if e != nil { @@ -419,7 +419,7 @@ func dataSourceTencentCloudKubernetesClusterInstancesRead(d *schema.ResourceData return err } - ids := make([]string, 0, len(respData)) + var ids []string instanceSetList := make([]map[string]interface{}, 0, len(respData)) if respData != nil { for _, instanceSet := range respData { diff --git a/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_instances_test.go b/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_instances_test.go index 4a278f1f2c..a4c2813734 100644 --- a/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_instances_test.go +++ b/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_instances_test.go @@ -21,7 +21,7 @@ func TestAccTencentCloudKubernetesClusterInstancesDataSource_basic(t *testing.T) Check: resource.ComposeTestCheckFunc( tcacctest.AccCheckTencentCloudDataSourceID("data.tencentcloud_kubernetes_cluster_instances.cluster_instances"), resource.TestCheckResourceAttr("data.tencentcloud_kubernetes_cluster_instances.cluster_instances", "instance_set.#", "1"), - resource.TestCheckResourceAttr("data.tencentcloud_kubernetes_cluster_instances.cluster_instances", "instance_set.0.instance_id", "ins-1fb82v28"), + // resource.TestCheckResourceAttr("data.tencentcloud_kubernetes_cluster_instances.cluster_instances", "instance_set.0.instance_id", "ins-1fb82v28"), resource.TestCheckResourceAttr("data.tencentcloud_kubernetes_cluster_instances.cluster_instances", "instance_set.0.instance_role", "WORKER"), resource.TestCheckResourceAttr("data.tencentcloud_kubernetes_cluster_instances.cluster_instances", "instance_set.0.instance_state", "running"), ), @@ -37,22 +37,22 @@ func TestAccTencentCloudKubernetesClusterInstancesDataSource_basic(t *testing.T) }) } -const testAccKubernetesClusterInstancesDataSource = ` +const testAccKubernetesClusterInstancesDataSource = testAccTkeCluster + ` data "tencentcloud_kubernetes_cluster_instances" "cluster_instances" { - cluster_id = "cls-6l3thsra" - instance_ids = ["ins-1fb82v28"] + cluster_id = tencentcloud_kubernetes_cluster.managed_cluster.id +// instance_ids = ["ins-1fb82v28"] instance_role = "WORKER" } ` -const testAccKubernetesClusterInstancesDataSourceFilter = ` +const testAccKubernetesClusterInstancesDataSourceFilter = testAccTkeCluster + ` data "tencentcloud_kubernetes_cluster_instances" "cluster_instances" { - cluster_id = "cls-6l3thsra" - instance_ids = ["ins-qzkwjklk"] + cluster_id = tencentcloud_kubernetes_cluster.managed_cluster.id +// instance_ids = ["ins-qzkwjklk"] instance_role = "WORKER" - filters { - name = "nodepool-id" - values = ["np-qrez0ayk"] - } +// filters { +// name = "nodepool-id" +// values = ["np-qrez0ayk"] +// } } ` diff --git a/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_levels.go b/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_levels.go index e196368bee..dae41c5d9e 100644 --- a/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_levels.go +++ b/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_levels.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" + tkev20180525 "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" @@ -102,7 +102,7 @@ func dataSourceTencentCloudKubernetesClusterLevelsRead(d *schema.ResourceData, m paramMap["ClusterID"] = helper.String(v.(string)) } - var respData []*tke.ClusterLevelAttribute + var respData []*tkev20180525.ClusterLevelAttribute err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { result, e := service.DescribeKubernetesClusterLevelsByFilter(ctx, paramMap) if e != nil { @@ -115,7 +115,7 @@ func dataSourceTencentCloudKubernetesClusterLevelsRead(d *schema.ResourceData, m return err } - levels := make([]string, 0, len(respData)) + var levels []string itemsList := make([]map[string]interface{}, 0, len(respData)) if respData != nil { for _, items := range respData { diff --git a/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_levels_test.go b/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_levels_test.go index edaf8e359b..0232c61f38 100644 --- a/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_levels_test.go +++ b/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_levels_test.go @@ -39,14 +39,14 @@ func testAccDataSourceKubernetesClusterLevelDestroy(s *terraform.State) error { return nil } -const testAccDataSourceKubernetesClusterLevelBasic = ` +const testAccDataSourceKubernetesClusterLevelBasic = testAccTkeCluster + ` data "tencentcloud_kubernetes_cluster_levels" "foo" {} -data "tencentcloud_kubernetes_clusters" "cls" { - cluster_name = "` + tcacctest.DefaultTkeClusterName + `" -} +// data "tencentcloud_kubernetes_clusters" "cls" { +// cluster_name = "` + tcacctest.DefaultTkeClusterName + `" +// } data "tencentcloud_kubernetes_cluster_levels" "with_cluster" { - cluster_id = data.tencentcloud_kubernetes_clusters.cls.list.0.cluster_id + cluster_id = tencentcloud_kubernetes_cluster.managed_cluster.id } ` diff --git a/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_node_pools.go b/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_node_pools.go index 054286b3f8..c43f7a7649 100644 --- a/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_node_pools.go +++ b/tencentcloud/services/tke/data_source_tc_kubernetes_cluster_node_pools.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" + tkev20180525 "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" @@ -455,10 +455,10 @@ func dataSourceTencentCloudKubernetesClusterNodePoolsRead(d *schema.ResourceData if v, ok := d.GetOk("filters"); ok { filtersSet := v.([]interface{}) - tmpSet := make([]*tke.Filter, 0, len(filtersSet)) + tmpSet := make([]*tkev20180525.Filter, 0, len(filtersSet)) for _, item := range filtersSet { filtersMap := item.(map[string]interface{}) - filter := tke.Filter{} + filter := tkev20180525.Filter{} if v, ok := filtersMap["name"]; ok { filter.Name = helper.String(v.(string)) } @@ -474,7 +474,7 @@ func dataSourceTencentCloudKubernetesClusterNodePoolsRead(d *schema.ResourceData paramMap["Filters"] = tmpSet } - var respData []*tke.NodePool + var respData []*tkev20180525.NodePool err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { result, e := service.DescribeKubernetesClusterNodePoolsByFilter(ctx, paramMap) if e != nil { @@ -487,7 +487,7 @@ func dataSourceTencentCloudKubernetesClusterNodePoolsRead(d *schema.ResourceData return err } - ids := make([]string, 0, len(respData)) + var ids []string nodePoolSetList := make([]map[string]interface{}, 0, len(respData)) if respData != nil { for _, nodePoolSet := range respData { diff --git a/tencentcloud/services/tke/data_source_tc_kubernetes_clusters.go b/tencentcloud/services/tke/data_source_tc_kubernetes_clusters.go index b59ef2281a..c40135fd8b 100644 --- a/tencentcloud/services/tke/data_source_tc_kubernetes_clusters.go +++ b/tencentcloud/services/tke/data_source_tc_kubernetes_clusters.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" + tkev20180525 "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" @@ -320,7 +320,7 @@ func dataSourceTencentCloudKubernetesClustersRead(d *schema.ResourceData, meta i service := TkeService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()} paramMap := make(map[string]interface{}) - var respData []*tke.Cluster + var respData []*tkev20180525.Cluster err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { result, e := service.DescribeKubernetesClustersByFilter(ctx, paramMap) if e != nil { @@ -337,7 +337,7 @@ func dataSourceTencentCloudKubernetesClustersRead(d *schema.ResourceData, meta i return err } - ids := make([]string, 0, len(respData)) + var ids []string clustersList := make([]map[string]interface{}, 0, len(respData)) if respData != nil { for _, clusters := range respData { diff --git a/tencentcloud/services/tke/resource_tc_kubernetes_addon_attachment.go b/tencentcloud/services/tke/resource_tc_kubernetes_addon_attachment.go index 5b00d37441..7d1c3fa096 100644 --- a/tencentcloud/services/tke/resource_tc_kubernetes_addon_attachment.go +++ b/tencentcloud/services/tke/resource_tc_kubernetes_addon_attachment.go @@ -9,7 +9,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" + tkev20180525 "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" ) @@ -109,8 +110,8 @@ func resourceTencentCloudKubernetesAddonAttachmentCreate(d *schema.ResourceData, name string ) var ( - request = tke.NewForwardApplicationRequestV3Request() - response = tke.NewForwardApplicationRequestV3Response() + request = tkev20180525.NewForwardApplicationRequestV3Request() + response = tkev20180525.NewForwardApplicationRequestV3Response() ) if v, ok := d.GetOk("cluster_id"); ok { @@ -137,7 +138,7 @@ func resourceTencentCloudKubernetesAddonAttachmentCreate(d *schema.ResourceData, } err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().ForwardApplicationRequestV3WithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().ForwardApplicationRequestV3WithContext(ctx, request) if e != nil { return tccommon.RetryError(e) } else { @@ -214,12 +215,6 @@ func resourceTencentCloudKubernetesAddonAttachmentUpdate(d *schema.ResourceData, ctx := tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta) - immutableArgs := []string{"cluster_id", "name"} - for _, v := range immutableArgs { - if d.HasChange(v) { - return fmt.Errorf("argument `%s` cannot be changed", v) - } - } idSplit := strings.Split(d.Id(), tccommon.FILED_SP) if len(idSplit) != 2 { return fmt.Errorf("id is broken,%s", d.Id()) @@ -237,10 +232,10 @@ func resourceTencentCloudKubernetesAddonAttachmentUpdate(d *schema.ResourceData, } if needChange { - request := tke.NewForwardApplicationRequestV3Request() + request := tkev20180525.NewForwardApplicationRequestV3Request() err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().ForwardApplicationRequestV3WithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().ForwardApplicationRequestV3WithContext(ctx, request) if e != nil { return tccommon.RetryError(e) } else { @@ -278,23 +273,16 @@ func resourceTencentCloudKubernetesAddonAttachmentDelete(d *schema.ResourceData, name := idSplit[1] var ( - request = tke.NewForwardApplicationRequestV3Request() - response = tke.NewForwardApplicationRequestV3Response() + request = tkev20180525.NewForwardApplicationRequestV3Request() + response = tkev20180525.NewForwardApplicationRequestV3Response() ) - if v, ok := d.GetOk("cluster_id"); ok { - clusterId = v.(string) - } - if v, ok := d.GetOk("name"); ok { - name = v.(string) - } - if err := resourceTencentCloudKubernetesAddonAttachmentDeletePostFillRequest0(ctx, request); err != nil { return err } err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().ForwardApplicationRequestV3WithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().ForwardApplicationRequestV3WithContext(ctx, request) if e != nil { return tccommon.RetryError(e) } else { @@ -304,7 +292,7 @@ func resourceTencentCloudKubernetesAddonAttachmentDelete(d *schema.ResourceData, return nil }) if err != nil { - log.Printf("[CRITAL]%s create kubernetes addon attachment failed, reason:%+v", logId, err) + log.Printf("[CRITAL]%s delete kubernetes addon attachment failed, reason:%+v", logId, err) return err } diff --git a/tencentcloud/services/tke/resource_tc_kubernetes_addon_attachment_extension.go b/tencentcloud/services/tke/resource_tc_kubernetes_addon_attachment_extension.go index e29cd34b6a..8efe5bdbef 100644 --- a/tencentcloud/services/tke/resource_tc_kubernetes_addon_attachment_extension.go +++ b/tencentcloud/services/tke/resource_tc_kubernetes_addon_attachment_extension.go @@ -9,6 +9,7 @@ import ( "strings" 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" diff --git a/tencentcloud/services/tke/resource_tc_kubernetes_auth_attachment.go b/tencentcloud/services/tke/resource_tc_kubernetes_auth_attachment.go index c0b5dc69bd..cbcb519298 100644 --- a/tencentcloud/services/tke/resource_tc_kubernetes_auth_attachment.go +++ b/tencentcloud/services/tke/resource_tc_kubernetes_auth_attachment.go @@ -8,7 +8,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" + tkev20180525 "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" ) @@ -108,8 +109,8 @@ func resourceTencentCloudKubernetesAuthAttachmentCreate(d *schema.ResourceData, clusterId string ) var ( - request = tke.NewModifyClusterAuthenticationOptionsRequest() - response = tke.NewModifyClusterAuthenticationOptionsResponse() + request = tkev20180525.NewModifyClusterAuthenticationOptionsRequest() + response = tkev20180525.NewModifyClusterAuthenticationOptionsResponse() ) if v, ok := d.GetOk("cluster_id"); ok { @@ -120,7 +121,7 @@ func resourceTencentCloudKubernetesAuthAttachmentCreate(d *schema.ResourceData, request.ClusterId = helper.String(v.(string)) } - serviceAccountAuthenticationOptions := tke.ServiceAccountAuthenticationOptions{} + serviceAccountAuthenticationOptions := tkev20180525.ServiceAccountAuthenticationOptions{} if v, ok := d.GetOkExists("use_tke_default"); ok { serviceAccountAuthenticationOptions.UseTKEDefault = helper.Bool(v.(bool)) } @@ -135,7 +136,7 @@ func resourceTencentCloudKubernetesAuthAttachmentCreate(d *schema.ResourceData, } request.ServiceAccounts = &serviceAccountAuthenticationOptions - oIDCConfigAuthenticationOptions := tke.OIDCConfigAuthenticationOptions{} + oIDCConfigAuthenticationOptions := tkev20180525.OIDCConfigAuthenticationOptions{} if v, ok := d.GetOkExists("auto_create_oidc_config"); ok { oIDCConfigAuthenticationOptions.AutoCreateOIDCConfig = helper.Bool(v.(bool)) } @@ -156,7 +157,7 @@ func resourceTencentCloudKubernetesAuthAttachmentCreate(d *schema.ResourceData, return err } - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().ModifyClusterAuthenticationOptionsWithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().ModifyClusterAuthenticationOptionsWithContext(ctx, request) if e != nil { if err := resourceTencentCloudKubernetesAuthAttachmentCreateRequestOnError0(ctx, request, e); err != nil { return err @@ -194,12 +195,8 @@ func resourceTencentCloudKubernetesAuthAttachmentRead(d *schema.ResourceData, me _ = d.Set("cluster_id", clusterId) - respData, err := service.DescribeKubernetesAuthAttachmentById(ctx, clusterId) - if err != nil { - return err - } - - err = resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { + var respData *tkev20180525.DescribeClusterAuthenticationOptionsResponseParams + reqErr := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { result, e := service.DescribeKubernetesAuthAttachmentById(ctx, clusterId) if e != nil { return tccommon.RetryError(e) @@ -210,9 +207,9 @@ func resourceTencentCloudKubernetesAuthAttachmentRead(d *schema.ResourceData, me respData = result return nil }) - if err != nil { - log.Printf("[CRITAL]%s read kubernetes auth attachment failed, reason:%+v", logId, err) - return err + if reqErr != nil { + log.Printf("[CRITAL]%s read kubernetes auth attachment failed, reason:%+v", logId, reqErr) + return reqErr } if respData == nil { @@ -274,7 +271,7 @@ func resourceTencentCloudKubernetesAuthAttachmentUpdate(d *schema.ResourceData, clusterId := d.Id() needChange := false - mutableArgs := []string{"use_tke_default", "issuer", "jwksuri", "auto_create_discovery_anonymous_auth", "auto_create_oidc_config", "auto_create_client_id", "auto_install_pod_identity_webhook_addon"} + mutableArgs := []string{"use_tke_default", "issuer", "jwks_uri", "auto_create_discovery_anonymous_auth", "auto_create_oidc_config", "auto_create_client_id", "auto_install_pod_identity_webhook_addon"} for _, v := range mutableArgs { if d.HasChange(v) { needChange = true @@ -283,11 +280,11 @@ func resourceTencentCloudKubernetesAuthAttachmentUpdate(d *schema.ResourceData, } if needChange { - request := tke.NewModifyClusterAuthenticationOptionsRequest() + request := tkev20180525.NewModifyClusterAuthenticationOptionsRequest() - request.ClusterId = &clusterId + request.ClusterId = helper.String(clusterId) - serviceAccountAuthenticationOptions := tke.ServiceAccountAuthenticationOptions{} + serviceAccountAuthenticationOptions := tkev20180525.ServiceAccountAuthenticationOptions{} if v, ok := d.GetOkExists("use_tke_default"); ok { serviceAccountAuthenticationOptions.UseTKEDefault = helper.Bool(v.(bool)) } @@ -302,7 +299,7 @@ func resourceTencentCloudKubernetesAuthAttachmentUpdate(d *schema.ResourceData, } request.ServiceAccounts = &serviceAccountAuthenticationOptions - oIDCConfigAuthenticationOptions := tke.OIDCConfigAuthenticationOptions{} + oIDCConfigAuthenticationOptions := tkev20180525.OIDCConfigAuthenticationOptions{} if v, ok := d.GetOkExists("auto_create_oidc_config"); ok { oIDCConfigAuthenticationOptions.AutoCreateOIDCConfig = helper.Bool(v.(bool)) } @@ -323,7 +320,7 @@ func resourceTencentCloudKubernetesAuthAttachmentUpdate(d *schema.ResourceData, return err } - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().ModifyClusterAuthenticationOptionsWithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().ModifyClusterAuthenticationOptionsWithContext(ctx, request) if e != nil { if err := resourceTencentCloudKubernetesAuthAttachmentUpdateRequestOnError0(ctx, request, e); err != nil { return err @@ -353,22 +350,18 @@ func resourceTencentCloudKubernetesAuthAttachmentDelete(d *schema.ResourceData, clusterId := d.Id() var ( - request = tke.NewModifyClusterAuthenticationOptionsRequest() - response = tke.NewModifyClusterAuthenticationOptionsResponse() + request = tkev20180525.NewModifyClusterAuthenticationOptionsRequest() + response = tkev20180525.NewModifyClusterAuthenticationOptionsResponse() ) - if v, ok := d.GetOk("cluster_id"); ok { - clusterId = v.(string) - } - - request.ClusterId = &clusterId + request.ClusterId = helper.String(clusterId) err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { if err := resourceTencentCloudKubernetesAuthAttachmentDeletePreRequest0(ctx, request); err != nil { return err } - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().ModifyClusterAuthenticationOptionsWithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().ModifyClusterAuthenticationOptionsWithContext(ctx, request) if e != nil { return tccommon.RetryError(e) } else { @@ -378,7 +371,7 @@ func resourceTencentCloudKubernetesAuthAttachmentDelete(d *schema.ResourceData, return nil }) if err != nil { - log.Printf("[CRITAL]%s create kubernetes auth attachment failed, reason:%+v", logId, err) + log.Printf("[CRITAL]%s delete kubernetes auth attachment failed, reason:%+v", logId, err) return err } diff --git a/tencentcloud/services/tke/resource_tc_kubernetes_auth_attachment_extension.go b/tencentcloud/services/tke/resource_tc_kubernetes_auth_attachment_extension.go index e4dc968f5b..47047b87d8 100644 --- a/tencentcloud/services/tke/resource_tc_kubernetes_auth_attachment_extension.go +++ b/tencentcloud/services/tke/resource_tc_kubernetes_auth_attachment_extension.go @@ -5,6 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" 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" ) diff --git a/tencentcloud/services/tke/resource_tc_kubernetes_backup_storage_location.go b/tencentcloud/services/tke/resource_tc_kubernetes_backup_storage_location.go index 0a28fbf17c..fbae9ed729 100644 --- a/tencentcloud/services/tke/resource_tc_kubernetes_backup_storage_location.go +++ b/tencentcloud/services/tke/resource_tc_kubernetes_backup_storage_location.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" + tkev20180525 "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" @@ -77,8 +77,8 @@ func resourceTencentCloudKubernetesBackupStorageLocationCreate(d *schema.Resourc name string ) var ( - request = tke.NewCreateBackupStorageLocationRequest() - response = tke.NewCreateBackupStorageLocationResponse() + request = tkev20180525.NewCreateBackupStorageLocationRequest() + response = tkev20180525.NewCreateBackupStorageLocationResponse() ) if v, ok := d.GetOk("name"); ok { @@ -102,7 +102,7 @@ func resourceTencentCloudKubernetesBackupStorageLocationCreate(d *schema.Resourc } err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().CreateBackupStorageLocationWithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().CreateBackupStorageLocationWithContext(ctx, request) if e != nil { return tccommon.RetryError(e) } else { @@ -188,14 +188,14 @@ func resourceTencentCloudKubernetesBackupStorageLocationDelete(d *schema.Resourc name := d.Id() var ( - request = tke.NewDeleteBackupStorageLocationRequest() - response = tke.NewDeleteBackupStorageLocationResponse() + request = tkev20180525.NewDeleteBackupStorageLocationRequest() + response = tkev20180525.NewDeleteBackupStorageLocationResponse() ) request.Name = helper.String(name) err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().DeleteBackupStorageLocationWithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().DeleteBackupStorageLocationWithContext(ctx, request) if e != nil { return tccommon.RetryError(e) } else { diff --git a/tencentcloud/services/tke/resource_tc_kubernetes_cluster.go b/tencentcloud/services/tke/resource_tc_kubernetes_cluster.go index 4413252f3f..26f3ec1724 100644 --- a/tencentcloud/services/tke/resource_tc_kubernetes_cluster.go +++ b/tencentcloud/services/tke/resource_tc_kubernetes_cluster.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" + tkev20180525 "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" @@ -1303,11 +1303,11 @@ func resourceTencentCloudKubernetesClusterCreate(d *schema.ResourceData, meta in clusterId string ) var ( - request = tke.NewCreateClusterRequest() - response = tke.NewCreateClusterResponse() + request = tkev20180525.NewCreateClusterRequest() + response = tkev20180525.NewCreateClusterResponse() ) - clusterCIDRSettings := tke.ClusterCIDRSettings{} + clusterCIDRSettings := tkev20180525.ClusterCIDRSettings{} if v, ok := d.GetOk("cluster_cidr"); ok { clusterCIDRSettings.ClusterCIDR = helper.String(v.(string)) } @@ -1328,7 +1328,7 @@ func resourceTencentCloudKubernetesClusterCreate(d *schema.ResourceData, meta in } request.ClusterCIDRSettings = &clusterCIDRSettings - clusterBasicSettings := tke.ClusterBasicSettings{} + clusterBasicSettings := tkev20180525.ClusterBasicSettings{} if v, ok := d.GetOk("cluster_version"); ok { clusterBasicSettings.ClusterVersion = helper.String(v.(string)) } @@ -1350,14 +1350,14 @@ func resourceTencentCloudKubernetesClusterCreate(d *schema.ResourceData, meta in if v, ok := d.GetOk("cluster_level"); ok { clusterBasicSettings.ClusterLevel = helper.String(v.(string)) } - autoUpgradeClusterLevel := tke.AutoUpgradeClusterLevel{} + autoUpgradeClusterLevel := tkev20180525.AutoUpgradeClusterLevel{} if v, ok := d.GetOkExists("auto_upgrade_cluster_level"); ok { autoUpgradeClusterLevel.IsAutoUpgrade = helper.Bool(v.(bool)) } clusterBasicSettings.AutoUpgradeClusterLevel = &autoUpgradeClusterLevel request.ClusterBasicSettings = &clusterBasicSettings - clusterAdvancedSettings := tke.ClusterAdvancedSettings{} + clusterAdvancedSettings := tkev20180525.ClusterAdvancedSettings{} if v, ok := d.GetOkExists("cluster_ipvs"); ok { clusterAdvancedSettings.IPVS = helper.Bool(v.(bool)) } @@ -1371,23 +1371,23 @@ func resourceTencentCloudKubernetesClusterCreate(d *schema.ResourceData, meta in clusterAdvancedSettings.NodeNameType = helper.String(v.(string)) } if extraArgsMap, ok := helper.InterfacesHeadMap(d, "cluster_extra_args"); ok { - clusterExtraArgs := tke.ClusterExtraArgs{} + clusterExtraArgs := tkev20180525.ClusterExtraArgs{} if v, ok := extraArgsMap["kube_apiserver"]; ok { - kubeAPIServerSet := v.(*schema.Set).List() + kubeAPIServerSet := v.([]interface{}) for i := range kubeAPIServerSet { kubeAPIServer := kubeAPIServerSet[i].(string) clusterExtraArgs.KubeAPIServer = append(clusterExtraArgs.KubeAPIServer, helper.String(kubeAPIServer)) } } if v, ok := extraArgsMap["kube_controller_manager"]; ok { - kubeControllerManagerSet := v.(*schema.Set).List() + kubeControllerManagerSet := v.([]interface{}) for i := range kubeControllerManagerSet { kubeControllerManager := kubeControllerManagerSet[i].(string) clusterExtraArgs.KubeControllerManager = append(clusterExtraArgs.KubeControllerManager, helper.String(kubeControllerManager)) } } if v, ok := extraArgsMap["kube_scheduler"]; ok { - kubeSchedulerSet := v.(*schema.Set).List() + kubeSchedulerSet := v.([]interface{}) for i := range kubeSchedulerSet { kubeScheduler := kubeSchedulerSet[i].(string) clusterExtraArgs.KubeScheduler = append(clusterExtraArgs.KubeScheduler, helper.String(kubeScheduler)) @@ -1418,7 +1418,7 @@ func resourceTencentCloudKubernetesClusterCreate(d *schema.ResourceData, meta in } request.ClusterAdvancedSettings = &clusterAdvancedSettings - instanceAdvancedSettings := tke.InstanceAdvancedSettings{} + instanceAdvancedSettings := tkev20180525.InstanceAdvancedSettings{} if v, ok := d.GetOkExists("globe_desired_pod_num"); ok { instanceAdvancedSettings.DesiredPodNumber = helper.IntInt64(v.(int)) } @@ -1433,7 +1433,7 @@ func resourceTencentCloudKubernetesClusterCreate(d *schema.ResourceData, meta in if v, ok := d.GetOk("extension_addon"); ok { for _, item := range v.([]interface{}) { extensionAddonsMap := item.(map[string]interface{}) - extensionAddon := tke.ExtensionAddon{} + extensionAddon := tkev20180525.ExtensionAddon{} if v, ok := extensionAddonsMap["name"]; ok { extensionAddon.AddonName = helper.String(v.(string)) } @@ -1449,7 +1449,7 @@ func resourceTencentCloudKubernetesClusterCreate(d *schema.ResourceData, meta in } err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().CreateClusterWithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().CreateClusterWithContext(ctx, request) if e != nil { return tccommon.RetryError(e) } else { @@ -1567,7 +1567,7 @@ func resourceTencentCloudKubernetesClusterRead(d *schema.ResourceData, meta inte return err } - var respData1 *tke.DescribeClusterInstancesResponseParams + var respData1 *tkev20180525.DescribeClusterInstancesResponseParams reqErr1 := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { result, e := service.DescribeKubernetesClusterById1(ctx, clusterId) if e != nil { @@ -1620,7 +1620,7 @@ func resourceTencentCloudKubernetesClusterRead(d *schema.ResourceData, meta inte _ = d.Set("worker_instances_list", instanceSetList) } - var respData2 *tke.DescribeClusterSecurityResponseParams + var respData2 *tkev20180525.DescribeClusterSecurityResponseParams reqErr2 := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { result, e := service.DescribeKubernetesClusterById2(ctx, clusterId) if e != nil { @@ -1697,7 +1697,7 @@ func resourceTencentCloudKubernetesClusterUpdate(d *schema.ResourceData, meta in } if needChange { - request := tke.NewModifyClusterAttributeRequest() + request := tkev20180525.NewModifyClusterAttributeRequest() request.ClusterId = helper.String(clusterId) @@ -1718,7 +1718,7 @@ func resourceTencentCloudKubernetesClusterUpdate(d *schema.ResourceData, meta in } err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().ModifyClusterAttributeWithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().ModifyClusterAttributeWithContext(ctx, request) if e != nil { return tccommon.RetryError(e) } else { @@ -1742,9 +1742,9 @@ func resourceTencentCloudKubernetesClusterUpdate(d *schema.ResourceData, meta in } if needChange1 { - request1 := tke.NewUpdateClusterVersionRequest() + request1 := tkev20180525.NewUpdateClusterVersionRequest() - response1 := tke.NewUpdateClusterVersionResponse() + response1 := tkev20180525.NewUpdateClusterVersionResponse() request1.ClusterId = helper.String(clusterId) @@ -1757,7 +1757,7 @@ func resourceTencentCloudKubernetesClusterUpdate(d *schema.ResourceData, meta in } err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().UpdateClusterVersionWithContext(ctx, request1) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().UpdateClusterVersionWithContext(ctx, request1) if e != nil { return tccommon.RetryError(e) } else { @@ -1785,12 +1785,12 @@ func resourceTencentCloudKubernetesClusterUpdate(d *schema.ResourceData, meta in } if needChange2 { - request2 := tke.NewModifyClusterAsGroupOptionAttributeRequest() + request2 := tkev20180525.NewModifyClusterAsGroupOptionAttributeRequest() request2.ClusterId = helper.String(clusterId) if clusterAsGroupOptionMap, ok := helper.InterfacesHeadMap(d, "node_pool_global_config"); ok { - clusterAsGroupOption := tke.ClusterAsGroupOption{} + clusterAsGroupOption := tkev20180525.ClusterAsGroupOption{} if v, ok := clusterAsGroupOptionMap["is_scale_in_enabled"]; ok { clusterAsGroupOption.IsScaleDownEnabled = helper.Bool(v.(bool)) } @@ -1822,7 +1822,7 @@ func resourceTencentCloudKubernetesClusterUpdate(d *schema.ResourceData, meta in } err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().ModifyClusterAsGroupOptionAttributeWithContext(ctx, request2) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().ModifyClusterAsGroupOptionAttributeWithContext(ctx, request2) if e != nil { return tccommon.RetryError(e) } else { @@ -1853,8 +1853,8 @@ func resourceTencentCloudKubernetesClusterDelete(d *schema.ResourceData, meta in clusterId := d.Id() var ( - request = tke.NewDeleteClusterRequest() - response = tke.NewDeleteClusterResponse() + request = tkev20180525.NewDeleteClusterRequest() + response = tkev20180525.NewDeleteClusterResponse() ) request.ClusterId = helper.String(clusterId) @@ -1867,7 +1867,7 @@ func resourceTencentCloudKubernetesClusterDelete(d *schema.ResourceData, meta in } err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().DeleteClusterWithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().DeleteClusterWithContext(ctx, request) if e != nil { if err := resourceTencentCloudKubernetesClusterDeleteRequestOnError0(ctx, e); err != nil { return err diff --git a/tencentcloud/services/tke/resource_tc_kubernetes_encryption_protection.go b/tencentcloud/services/tke/resource_tc_kubernetes_encryption_protection.go index 1526479a0f..482df0d762 100644 --- a/tencentcloud/services/tke/resource_tc_kubernetes_encryption_protection.go +++ b/tencentcloud/services/tke/resource_tc_kubernetes_encryption_protection.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" + tkev20180525 "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" @@ -69,8 +69,8 @@ func resourceTencentCloudKubernetesEncryptionProtectionCreate(d *schema.Resource clusterId string ) var ( - request = tke.NewEnableEncryptionProtectionRequest() - response = tke.NewEnableEncryptionProtectionResponse() + request = tkev20180525.NewEnableEncryptionProtectionRequest() + response = tkev20180525.NewEnableEncryptionProtectionResponse() ) if v, ok := d.GetOk("cluster_id"); ok { @@ -82,7 +82,7 @@ func resourceTencentCloudKubernetesEncryptionProtectionCreate(d *schema.Resource } if kMSConfigurationMap, ok := helper.InterfacesHeadMap(d, "kms_configuration"); ok { - kMSConfiguration := tke.KMSConfiguration{} + kMSConfiguration := tkev20180525.KMSConfiguration{} if v, ok := kMSConfigurationMap["key_id"]; ok { kMSConfiguration.KeyId = helper.String(v.(string)) } @@ -93,7 +93,7 @@ func resourceTencentCloudKubernetesEncryptionProtectionCreate(d *schema.Resource } err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().EnableEncryptionProtectionWithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().EnableEncryptionProtectionWithContext(ctx, request) if e != nil { return tccommon.RetryError(e) } else { @@ -159,14 +159,14 @@ func resourceTencentCloudKubernetesEncryptionProtectionDelete(d *schema.Resource clusterId := d.Id() var ( - request = tke.NewDisableEncryptionProtectionRequest() - response = tke.NewDisableEncryptionProtectionResponse() + request = tkev20180525.NewDisableEncryptionProtectionRequest() + response = tkev20180525.NewDisableEncryptionProtectionResponse() ) request.ClusterId = helper.String(clusterId) err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().DisableEncryptionProtectionWithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().DisableEncryptionProtectionWithContext(ctx, request) if e != nil { return tccommon.RetryError(e) } else { diff --git a/tencentcloud/services/tke/resource_tc_kubernetes_node_pool.go b/tencentcloud/services/tke/resource_tc_kubernetes_node_pool.go index 2d87c2d827..7812b1d5e1 100644 --- a/tencentcloud/services/tke/resource_tc_kubernetes_node_pool.go +++ b/tencentcloud/services/tke/resource_tc_kubernetes_node_pool.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" + tkev20180525 "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" @@ -647,15 +647,15 @@ func resourceTencentCloudKubernetesNodePoolCreate(d *schema.ResourceData, meta i nodePoolId string ) var ( - request = tke.NewCreateClusterNodePoolRequest() - response = tke.NewCreateClusterNodePoolResponse() + request = tkev20180525.NewCreateClusterNodePoolRequest() + response = tkev20180525.NewCreateClusterNodePoolResponse() ) if v, ok := d.GetOk("cluster_id"); ok { clusterId = v.(string) } - request.ClusterId = &clusterId + request.ClusterId = helper.String(clusterId) if v, ok := d.GetOkExists("enable_auto_scale"); ok { request.EnableAutoscale = helper.Bool(v.(bool)) @@ -668,7 +668,7 @@ func resourceTencentCloudKubernetesNodePoolCreate(d *schema.ResourceData, meta i if v, ok := d.GetOk("taints"); ok { for _, item := range v.([]interface{}) { taintsMap := item.(map[string]interface{}) - taint := tke.Taint{} + taint := tkev20180525.Taint{} if v, ok := taintsMap["key"]; ok { taint.Key = helper.String(v.(string)) } @@ -691,7 +691,7 @@ func resourceTencentCloudKubernetesNodePoolCreate(d *schema.ResourceData, meta i } err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().CreateClusterNodePoolWithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().CreateClusterNodePoolWithContext(ctx, request) if e != nil { return tccommon.RetryError(e) } else { @@ -746,12 +746,8 @@ func resourceTencentCloudKubernetesNodePoolRead(d *schema.ResourceData, meta int return nil } - respData1, err := service.DescribeKubernetesNodePoolById1(ctx, clusterId, nodePoolId) - if err != nil { - return err - } - - err = resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { + var respData1 *tkev20180525.NodePool + reqErr1 := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { result, e := service.DescribeKubernetesNodePoolById1(ctx, clusterId, nodePoolId) if e != nil { if err := resourceTencentCloudKubernetesNodePoolReadRequestOnError1(ctx, result, e); err != nil { @@ -765,9 +761,9 @@ func resourceTencentCloudKubernetesNodePoolRead(d *schema.ResourceData, meta int respData1 = result return nil }) - if err != nil { - log.Printf("[CRITAL]%s read kubernetes node pool failed, reason:%+v", logId, err) - return err + if reqErr1 != nil { + log.Printf("[CRITAL]%s read kubernetes node pool failed, reason:%+v", logId, reqErr1) + return reqErr1 } if respData1 == nil { @@ -862,12 +858,6 @@ func resourceTencentCloudKubernetesNodePoolUpdate(d *schema.ResourceData, meta i ctx := tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta) - immutableArgs := []string{"cluster_id"} - for _, v := range immutableArgs { - if d.HasChange(v) { - return fmt.Errorf("argument `%s` cannot be changed", v) - } - } idSplit := strings.Split(d.Id(), tccommon.FILED_SP) if len(idSplit) != 2 { return fmt.Errorf("id is broken,%s", d.Id()) @@ -889,11 +879,11 @@ func resourceTencentCloudKubernetesNodePoolUpdate(d *schema.ResourceData, meta i } if needChange { - request := tke.NewModifyClusterNodePoolRequest() + request := tkev20180525.NewModifyClusterNodePoolRequest() - request.ClusterId = &clusterId + request.ClusterId = helper.String(clusterId) - request.NodePoolId = &nodePoolId + request.NodePoolId = helper.String(nodePoolId) if v, ok := d.GetOk("name"); ok { request.Name = helper.String(v.(string)) @@ -910,7 +900,7 @@ func resourceTencentCloudKubernetesNodePoolUpdate(d *schema.ResourceData, meta i if v, ok := d.GetOk("taints"); ok { for _, item := range v.([]interface{}) { taintsMap := item.(map[string]interface{}) - taint := tke.Taint{} + taint := tkev20180525.Taint{} if v, ok := taintsMap["key"]; ok { taint.Key = helper.String(v.(string)) } @@ -933,7 +923,7 @@ func resourceTencentCloudKubernetesNodePoolUpdate(d *schema.ResourceData, meta i } err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().ModifyClusterNodePoolWithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().ModifyClusterNodePoolWithContext(ctx, request) if e != nil { return tccommon.RetryError(e) } else { @@ -969,17 +959,13 @@ func resourceTencentCloudKubernetesNodePoolDelete(d *schema.ResourceData, meta i nodePoolId := idSplit[1] var ( - request = tke.NewDeleteClusterNodePoolRequest() - response = tke.NewDeleteClusterNodePoolResponse() + request = tkev20180525.NewDeleteClusterNodePoolRequest() + response = tkev20180525.NewDeleteClusterNodePoolResponse() ) - if v, ok := d.GetOk("cluster_id"); ok { - clusterId = v.(string) - } - - request.ClusterId = &clusterId + request.ClusterId = helper.String(clusterId) - request.NodePoolIds = []*string{&nodePoolId} + request.NodePoolIds = []*string{helper.String(nodePoolId)} if v, ok := d.GetOkExists("delete_keep_instance"); ok { request.KeepInstance = helper.Bool(v.(bool)) @@ -990,7 +976,7 @@ func resourceTencentCloudKubernetesNodePoolDelete(d *schema.ResourceData, meta i } err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().DeleteClusterNodePoolWithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().DeleteClusterNodePoolWithContext(ctx, request) if e != nil { if err := resourceTencentCloudKubernetesNodePoolDeleteRequestOnError0(ctx, e); err != nil { return err @@ -1003,7 +989,7 @@ func resourceTencentCloudKubernetesNodePoolDelete(d *schema.ResourceData, meta i return nil }) if err != nil { - log.Printf("[CRITAL]%s create kubernetes node pool failed, reason:%+v", logId, err) + log.Printf("[CRITAL]%s delete kubernetes node pool failed, reason:%+v", logId, err) return err } diff --git a/tencentcloud/services/tke/resource_tc_kubernetes_serverless_node_pool.go b/tencentcloud/services/tke/resource_tc_kubernetes_serverless_node_pool.go index 027e9da21b..9d691ead68 100644 --- a/tencentcloud/services/tke/resource_tc_kubernetes_serverless_node_pool.go +++ b/tencentcloud/services/tke/resource_tc_kubernetes_serverless_node_pool.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" - tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" + tkev20180525 "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" @@ -122,15 +122,15 @@ func resourceTencentCloudKubernetesServerlessNodePoolCreate(d *schema.ResourceDa nodePoolId string ) var ( - request = tke.NewCreateClusterVirtualNodePoolRequest() - response = tke.NewCreateClusterVirtualNodePoolResponse() + request = tkev20180525.NewCreateClusterVirtualNodePoolRequest() + response = tkev20180525.NewCreateClusterVirtualNodePoolResponse() ) if v, ok := d.GetOk("cluster_id"); ok { clusterId = v.(string) } - request.ClusterId = &clusterId + request.ClusterId = helper.String(clusterId) if v, ok := d.GetOk("name"); ok { request.Name = helper.String(v.(string)) @@ -139,7 +139,7 @@ func resourceTencentCloudKubernetesServerlessNodePoolCreate(d *schema.ResourceDa if v, ok := d.GetOk("taints"); ok { for _, item := range v.([]interface{}) { taintsMap := item.(map[string]interface{}) - taint := tke.Taint{} + taint := tkev20180525.Taint{} if v, ok := taintsMap["key"]; ok { taint.Key = helper.String(v.(string)) } @@ -156,7 +156,7 @@ func resourceTencentCloudKubernetesServerlessNodePoolCreate(d *schema.ResourceDa if v, ok := d.GetOk("serverless_nodes"); ok { for _, item := range v.([]interface{}) { virtualNodesMap := item.(map[string]interface{}) - virtualNodeSpec := tke.VirtualNodeSpec{} + virtualNodeSpec := tkev20180525.VirtualNodeSpec{} if v, ok := virtualNodesMap["display_name"]; ok { virtualNodeSpec.DisplayName = helper.String(v.(string)) } @@ -172,7 +172,7 @@ func resourceTencentCloudKubernetesServerlessNodePoolCreate(d *schema.ResourceDa } err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().CreateClusterVirtualNodePoolWithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().CreateClusterVirtualNodePoolWithContext(ctx, request) if e != nil { return tccommon.RetryError(e) } else { @@ -212,12 +212,8 @@ func resourceTencentCloudKubernetesServerlessNodePoolRead(d *schema.ResourceData _ = d.Set("cluster_id", clusterId) - respData, err := service.DescribeKubernetesServerlessNodePoolById(ctx, clusterId, nodePoolId) - if err != nil { - return err - } - - err = resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { + var respData *tkev20180525.VirtualNodePool + reqErr := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError { result, e := service.DescribeKubernetesServerlessNodePoolById(ctx, clusterId, nodePoolId) if e != nil { return tccommon.RetryError(e) @@ -228,9 +224,9 @@ func resourceTencentCloudKubernetesServerlessNodePoolRead(d *schema.ResourceData respData = result return nil }) - if err != nil { - log.Printf("[CRITAL]%s read kubernetes serverless node pool failed, reason:%+v", logId, err) - return err + if reqErr != nil { + log.Printf("[CRITAL]%s read kubernetes serverless node pool failed, reason:%+v", logId, reqErr) + return reqErr } if respData == nil { @@ -284,12 +280,6 @@ func resourceTencentCloudKubernetesServerlessNodePoolUpdate(d *schema.ResourceDa ctx := tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta) - immutableArgs := []string{"cluster_id"} - for _, v := range immutableArgs { - if d.HasChange(v) { - return fmt.Errorf("argument `%s` cannot be changed", v) - } - } idSplit := strings.Split(d.Id(), tccommon.FILED_SP) if len(idSplit) != 2 { return fmt.Errorf("id is broken,%s", d.Id()) @@ -307,11 +297,11 @@ func resourceTencentCloudKubernetesServerlessNodePoolUpdate(d *schema.ResourceDa } if needChange { - request := tke.NewModifyClusterVirtualNodePoolRequest() + request := tkev20180525.NewModifyClusterVirtualNodePoolRequest() - request.ClusterId = &clusterId + request.ClusterId = helper.String(clusterId) - request.NodePoolId = &nodePoolId + request.NodePoolId = helper.String(nodePoolId) if v, ok := d.GetOk("name"); ok { request.Name = helper.String(v.(string)) @@ -320,7 +310,7 @@ func resourceTencentCloudKubernetesServerlessNodePoolUpdate(d *schema.ResourceDa if v, ok := d.GetOk("taints"); ok { for _, item := range v.([]interface{}) { taintsMap := item.(map[string]interface{}) - taint := tke.Taint{} + taint := tkev20180525.Taint{} if v, ok := taintsMap["key"]; ok { taint.Key = helper.String(v.(string)) } @@ -339,7 +329,7 @@ func resourceTencentCloudKubernetesServerlessNodePoolUpdate(d *schema.ResourceDa } err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().ModifyClusterVirtualNodePoolWithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().ModifyClusterVirtualNodePoolWithContext(ctx, request) if e != nil { return tccommon.RetryError(e) } else { @@ -371,23 +361,19 @@ func resourceTencentCloudKubernetesServerlessNodePoolDelete(d *schema.ResourceDa nodePoolId := idSplit[1] var ( - request = tke.NewDeleteClusterVirtualNodePoolRequest() - response = tke.NewDeleteClusterVirtualNodePoolResponse() + request = tkev20180525.NewDeleteClusterVirtualNodePoolRequest() + response = tkev20180525.NewDeleteClusterVirtualNodePoolResponse() ) - if v, ok := d.GetOk("cluster_id"); ok { - clusterId = v.(string) - } - - request.ClusterId = &clusterId + request.ClusterId = helper.String(clusterId) - request.NodePoolIds = []*string{&nodePoolId} + request.NodePoolIds = []*string{helper.String(nodePoolId)} force := true request.Force = &force err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeClient().DeleteClusterVirtualNodePoolWithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseTkeV20180525Client().DeleteClusterVirtualNodePoolWithContext(ctx, request) if e != nil { return tccommon.RetryError(e) } else { @@ -397,7 +383,7 @@ func resourceTencentCloudKubernetesServerlessNodePoolDelete(d *schema.ResourceDa return nil }) if err != nil { - log.Printf("[CRITAL]%s create kubernetes serverless node pool failed, reason:%+v", logId, err) + log.Printf("[CRITAL]%s delete kubernetes serverless node pool failed, reason:%+v", logId, err) return err } diff --git a/tencentcloud/services/tke/service_tencentcloud_tke.go b/tencentcloud/services/tke/service_tencentcloud_tke.go index 303b29b369..8777af1c01 100644 --- a/tencentcloud/services/tke/service_tencentcloud_tke.go +++ b/tencentcloud/services/tke/service_tencentcloud_tke.go @@ -1342,7 +1342,7 @@ func (me *TkeService) DescribeKubernetesAvailableClusterVersionsByFilter(ctx con ratelimit.Check(request.GetAction()) - response, err := me.client.UseTkeClient().DescribeAvailableClusterVersion(request) + response, err := me.client.UseTkeV20180525Client().DescribeAvailableClusterVersion(request) if err != nil { errRet = err return @@ -2734,7 +2734,7 @@ func (me *TkeService) DescribeKubernetesClusterInstancesByFilter(ctx context.Con for { request.Offset = &offset request.Limit = &limit - response, err := me.client.UseTkeClient().DescribeClusterInstances(request) + response, err := me.client.UseTkeV20180525Client().DescribeClusterInstances(request) if err != nil { errRet = err return @@ -2778,7 +2778,7 @@ func (me *TkeService) DescribeKubernetesClusterNodePoolsByFilter(ctx context.Con ratelimit.Check(request.GetAction()) - response, err := me.client.UseTkeClient().DescribeClusterNodePools(request) + response, err := me.client.UseTkeV20180525Client().DescribeClusterNodePools(request) if err != nil { errRet = err return @@ -2841,7 +2841,7 @@ func (me *TkeService) DescribeKubernetesClustersByFilter(ctx context.Context, pa return nil, err } - response, err := me.client.UseTkeClient().DescribeClusters(request) + response, err := me.client.UseTkeV20180525Client().DescribeClusters(request) if err != nil { errRet = err return @@ -2876,7 +2876,7 @@ func (me *TkeService) DescribeKubernetesClusterLevelsByFilter(ctx context.Contex ratelimit.Check(request.GetAction()) - response, err := me.client.UseTkeClient().DescribeClusterLevelAttribute(request) + response, err := me.client.UseTkeV20180525Client().DescribeClusterLevelAttribute(request) if err != nil { errRet = err return @@ -2915,7 +2915,7 @@ func (me *TkeService) DescribeKubernetesClusterCommonNamesByFilter(ctx context.C return nil, err } - response, err := me.client.UseTkeClient().DescribeClusterCommonNames(request) + response, err := me.client.UseTkeV20180525Client().DescribeClusterCommonNames(request) if err != nil { errRet = err return @@ -2950,7 +2950,7 @@ func (me *TkeService) DescribeKubernetesClusterAuthenticationOptionsByFilter(ctx ratelimit.Check(request.GetAction()) - response, err := me.client.UseTkeClient().DescribeClusterAuthenticationOptions(request) + response, err := me.client.UseTkeV20180525Client().DescribeClusterAuthenticationOptions(request) if err != nil { errRet = err return @@ -2991,7 +2991,7 @@ func (me *TkeService) DescribeKubernetesChartsByFilter(ctx context.Context, para ratelimit.Check(request.GetAction()) - response, err := me.client.UseTkeClient().GetTkeAppChartList(request) + response, err := me.client.UseTkeV20180525Client().GetTkeAppChartList(request) if err != nil { errRet = err return @@ -3020,7 +3020,7 @@ func (me *TkeService) DescribeKubernetesEncryptionProtectionById(ctx context.Con ratelimit.Check(request.GetAction()) - response, err := me.client.UseTkeClient().DescribeEncryptionStatus(request) + response, err := me.client.UseTkeV20180525Client().DescribeEncryptionStatus(request) if err != nil { errRet = err return @@ -3138,7 +3138,7 @@ func (me *TkeService) DescribeKubernetesBackupStorageLocationById(ctx context.Co ratelimit.Check(request.GetAction()) - response, err := me.client.UseTkeClient().DescribeBackupStorageLocations(request) + response, err := me.client.UseTkeV20180525Client().DescribeBackupStorageLocations(request) if err != nil { errRet = err return @@ -3172,7 +3172,7 @@ func (me *TkeService) DescribeKubernetesClusterById(ctx context.Context, cluster ratelimit.Check(request.GetAction()) - response, err := me.client.UseTkeClient().DescribeClusters(request) + response, err := me.client.UseTkeV20180525Client().DescribeClusters(request) if err != nil { errRet = err return @@ -3201,7 +3201,7 @@ func (me *TkeService) DescribeKubernetesClusterById1(ctx context.Context, cluste ratelimit.Check(request.GetAction()) - response, err := me.client.UseTkeClient().DescribeClusterInstances(request) + response, err := me.client.UseTkeV20180525Client().DescribeClusterInstances(request) if err != nil { errRet = err return @@ -3226,7 +3226,7 @@ func (me *TkeService) DescribeKubernetesClusterById2(ctx context.Context, cluste ratelimit.Check(request.GetAction()) - response, err := me.client.UseTkeClient().DescribeClusterSecurity(request) + response, err := me.client.UseTkeV20180525Client().DescribeClusterSecurity(request) if err != nil { errRet = err return @@ -3241,7 +3241,7 @@ func (me *TkeService) DescribeKubernetesNodePoolById(ctx context.Context, cluste logId := tccommon.GetLogId(ctx) request := tke.NewDescribeClustersRequest() - request.ClusterIds = []*string{&clusterId} + request.ClusterIds = []*string{helper.String(clusterId)} defer func() { if errRet != nil { @@ -3251,14 +3251,14 @@ func (me *TkeService) DescribeKubernetesNodePoolById(ctx context.Context, cluste ratelimit.Check(request.GetAction()) - response, err := me.client.UseTkeClient().DescribeClusters(request) + response, err := me.client.UseTkeV20180525Client().DescribeClusters(request) if err != nil { errRet = err return } log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString()) - if response == nil || len(response.Response.Clusters) < 1 { + if len(response.Response.Clusters) < 1 { return } @@ -3270,8 +3270,8 @@ func (me *TkeService) DescribeKubernetesNodePoolById1(ctx context.Context, clust logId := tccommon.GetLogId(ctx) request := tke.NewDescribeClusterNodePoolDetailRequest() - request.ClusterId = &clusterId - request.NodePoolId = &nodePoolId + request.ClusterId = helper.String(clusterId) + request.NodePoolId = helper.String(nodePoolId) defer func() { if errRet != nil { @@ -3281,14 +3281,14 @@ func (me *TkeService) DescribeKubernetesNodePoolById1(ctx context.Context, clust ratelimit.Check(request.GetAction()) - response, err := me.client.UseTkeClient().DescribeClusterNodePoolDetail(request) + response, err := me.client.UseTkeV20180525Client().DescribeClusterNodePoolDetail(request) if err != nil { errRet = err return } log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString()) - if response == nil || response.Response.NodePool == nil { + if response.Response == nil { return } @@ -3300,7 +3300,7 @@ func (me *TkeService) DescribeKubernetesServerlessNodePoolById(ctx context.Conte logId := tccommon.GetLogId(ctx) request := tke.NewDescribeClusterVirtualNodePoolsRequest() - request.ClusterId = &clusterId + request.ClusterId = helper.String(clusterId) defer func() { if errRet != nil { @@ -3310,14 +3310,14 @@ func (me *TkeService) DescribeKubernetesServerlessNodePoolById(ctx context.Conte ratelimit.Check(request.GetAction()) - response, err := me.client.UseTkeClient().DescribeClusterVirtualNodePools(request) + response, err := me.client.UseTkeV20180525Client().DescribeClusterVirtualNodePools(request) if err != nil { errRet = err return } log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString()) - if response == nil || len(response.Response.NodePoolSet) < 1 { + if len(response.Response.NodePoolSet) < 1 { return } @@ -3334,10 +3334,12 @@ func (me *TkeService) DescribeKubernetesAuthAttachmentById(ctx context.Context, logId := tccommon.GetLogId(ctx) request := tke.NewDescribeClusterAuthenticationOptionsRequest() - request.ClusterId = &clusterId + request.ClusterId = helper.String(clusterId) + if err := resourceTencentCloudKubernetesAuthAttachmentReadPostFillRequest0(ctx, request); err != nil { return nil, err } + defer func() { if errRet != nil { log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error()) @@ -3346,7 +3348,7 @@ func (me *TkeService) DescribeKubernetesAuthAttachmentById(ctx context.Context, ratelimit.Check(request.GetAction()) - response, err := me.client.UseTkeClient().DescribeClusterAuthenticationOptions(request) + response, err := me.client.UseTkeV20180525Client().DescribeClusterAuthenticationOptions(request) if err != nil { errRet = err return @@ -3590,3 +3592,31 @@ func (me *TkeService) DescribeKubernetesClusterNativeNodePoolsByFilter(ctx conte ret = response.Response.NodePools return } + +func (me *TkeService) DescribeKubernetesAddonAttachmentById(ctx context.Context) (ret *tke.ForwardApplicationRequestV3ResponseParams, errRet error) { + logId := tccommon.GetLogId(ctx) + + request := tke.NewForwardApplicationRequestV3Request() + + defer func() { + if errRet != nil { + log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error()) + } + }() + + ratelimit.Check(request.GetAction()) + + if err := resourceTencentCloudKubernetesAddonAttachmentReadPreRequest0(ctx, request); err != nil { + return nil, err + } + + response, err := me.client.UseTkeV20180525Client().ForwardApplicationRequestV3(request) + if err != nil { + errRet = err + return + } + log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString()) + + ret = response.Response + return +} diff --git a/tencentcloud/services/tke/service_tencentcloud_tke_addons.go b/tencentcloud/services/tke/service_tencentcloud_tke_addons.go index 3c5b3a4046..c5b1c4a697 100644 --- a/tencentcloud/services/tke/service_tencentcloud_tke_addons.go +++ b/tencentcloud/services/tke/service_tencentcloud_tke_addons.go @@ -303,33 +303,6 @@ func (me *TkeService) GetAddonNameFromJson(reqJson string) (name string, err err } return } -func (me *TkeService) DescribeKubernetesAddonAttachmentById(ctx context.Context) (ret *tke.ForwardApplicationRequestV3ResponseParams, errRet error) { - logId := tccommon.GetLogId(ctx) - - request := tke.NewForwardApplicationRequestV3Request() - - defer func() { - if errRet != nil { - log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error()) - } - }() - - ratelimit.Check(request.GetAction()) - - if err := resourceTencentCloudKubernetesAddonAttachmentReadPreRequest0(ctx, request); err != nil { - return nil, err - } - - response, err := me.client.UseTkeClient().ForwardApplicationRequestV3(request) - if err != nil { - errRet = err - return - } - log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString()) - - ret = response.Response - return -} func (me *TkeService) DeleteKubernetesAddonAttachmentById(ctx context.Context) (errRet error) { logId := tccommon.GetLogId(ctx)