diff --git a/tencentcloud/data_source_tc_kubernetes_charts.go b/tencentcloud/data_source_tc_kubernetes_charts.go index 024f327ee0..d7917ce130 100644 --- a/tencentcloud/data_source_tc_kubernetes_charts.go +++ b/tencentcloud/data_source_tc_kubernetes_charts.go @@ -12,6 +12,7 @@ package tencentcloud import ( "context" "encoding/json" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper" diff --git a/tencentcloud/data_source_tc_kubernetes_charts_test.go b/tencentcloud/data_source_tc_kubernetes_charts_test.go index 3a54bd898e..fa32b83548 100644 --- a/tencentcloud/data_source_tc_kubernetes_charts_test.go +++ b/tencentcloud/data_source_tc_kubernetes_charts_test.go @@ -23,8 +23,7 @@ func TestAccTencentCloudKubernetesChartsDataSource(t *testing.T) { }) } - const testAccDataSourceKubernetesCharts = ` data "tencentcloud_kubernetes_charts" "test" { } -` \ No newline at end of file +` diff --git a/tencentcloud/extension_tke.go b/tencentcloud/extension_tke.go index fbec26fd57..5c4497df17 100644 --- a/tencentcloud/extension_tke.go +++ b/tencentcloud/extension_tke.go @@ -119,4 +119,4 @@ var TKE_ADDON_DEFAULT_VALUES_KEY = []string{ "global.cluster.clustertype", "global.cluster.kubeversion", "global.cluster.kubeminor", -} \ No newline at end of file +} diff --git a/tencentcloud/resource_tc_clb_customized_config.go b/tencentcloud/resource_tc_clb_customized_config.go index 3e3a5aa860..fdbed09971 100644 --- a/tencentcloud/resource_tc_clb_customized_config.go +++ b/tencentcloud/resource_tc_clb_customized_config.go @@ -25,12 +25,13 @@ package tencentcloud import ( "context" + "log" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/pkg/errors" clb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317" "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper" - "log" ) func resourceTencentCloudClbCustomizedConfig() *schema.Resource { diff --git a/tencentcloud/resource_tc_clb_log_set.go b/tencentcloud/resource_tc_clb_log_set.go index 4c12182ea8..00a5c6f101 100644 --- a/tencentcloud/resource_tc_clb_log_set.go +++ b/tencentcloud/resource_tc_clb_log_set.go @@ -22,10 +22,11 @@ package tencentcloud import ( "context" "fmt" + "time" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" cls "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016" "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper" - "time" ) func resourceTencentCloudClbLogSet() *schema.Resource { diff --git a/tencentcloud/resource_tc_eks_container_instance.go b/tencentcloud/resource_tc_eks_container_instance.go index ac34308c3e..9e3fe1bc05 100644 --- a/tencentcloud/resource_tc_eks_container_instance.go +++ b/tencentcloud/resource_tc_eks_container_instance.go @@ -87,6 +87,7 @@ package tencentcloud import ( "context" "fmt" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" diff --git a/tencentcloud/resource_tc_eks_container_instance_test.go b/tencentcloud/resource_tc_eks_container_instance_test.go index 25dff131b0..f143843ffa 100644 --- a/tencentcloud/resource_tc_eks_container_instance_test.go +++ b/tencentcloud/resource_tc_eks_container_instance_test.go @@ -3,9 +3,10 @@ package tencentcloud import ( "context" "fmt" + "testing" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" - "testing" ) func TestAccTencentCloudEKSContainerInstance_basic(t *testing.T) { diff --git a/tencentcloud/resource_tc_kubernetes_addon_attachment.go b/tencentcloud/resource_tc_kubernetes_addon_attachment.go index 0471d6f56c..f0bcf52958 100644 --- a/tencentcloud/resource_tc_kubernetes_addon_attachment.go +++ b/tencentcloud/resource_tc_kubernetes_addon_attachment.go @@ -74,10 +74,11 @@ package tencentcloud import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper" "log" "strings" + + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper" ) func resourceTencentCloudTkeAddonAttachment() *schema.Resource { @@ -121,9 +122,9 @@ func resourceTencentCloudTkeAddonAttachment() *schema.Resource { Description: "Addon response body.", }, "status": { - Type: schema.TypeMap, - Computed: true, - Description: "Addon current status.", + Type: schema.TypeMap, + Computed: true, + Description: "Addon current status.", }, }, Create: resourceTencentCloudTkeAddonAttachmentCreate, @@ -209,13 +210,12 @@ func resourceTencentCloudTkeAddonAttachmentRead(d *schema.ResourceData, meta int addonName := split[1] var ( - err error - response string + err error + response string addonResponseData = &AddonResponseData{} - status = make(map[string]*string) + status = make(map[string]*string) ) - _, has, err = service.PollingAddonsPhase(ctx, clusterId, addonName, addonResponseData) if err != nil || !has { @@ -300,7 +300,7 @@ func resourceTencentCloudTkeAddonAttachmentDelete(d *schema.ResourceData, meta i split = strings.Split(id, FILED_SP) clusterId = split[0] addonName = split[1] - has bool + has bool ) if err := service.DeleteExtensionAddon(ctx, clusterId, addonName); err != nil { @@ -330,4 +330,4 @@ func getFilteredValues(d *schema.ResourceData, values []*string) []string { rawValues = append(rawValues, *value) } return rawValues -} \ No newline at end of file +} diff --git a/tencentcloud/resource_tc_kubernetes_cluster.go b/tencentcloud/resource_tc_kubernetes_cluster.go index 1baa5e8883..7a98092e56 100644 --- a/tencentcloud/resource_tc_kubernetes_cluster.go +++ b/tencentcloud/resource_tc_kubernetes_cluster.go @@ -993,9 +993,9 @@ func resourceTencentCloudTkeCluster() *schema.Resource { Description: "Vpc Id of the cluster.", }, "cluster_internet": { - Type: schema.TypeBool, - Default: false, - Optional: true, + Type: schema.TypeBool, + Default: false, + Optional: true, Description: "Open internet access or not." + " If this field is set 'true', the field below `worker_config` must be set." + " Because only cluster with node is allowed enable access endpoint.", diff --git a/tencentcloud/resource_tc_redis_instance.go b/tencentcloud/resource_tc_redis_instance.go index 71628891a1..c716a98bb6 100644 --- a/tencentcloud/resource_tc_redis_instance.go +++ b/tencentcloud/resource_tc_redis_instance.go @@ -160,10 +160,10 @@ func resourceTencentCloudRedisInstance() *schema.Resource { Description: "Password for a Redis user, which should be 8 to 16 characters. NOTE: Only `no_auth=true` specified can make password empty.", }, "no_auth": { - Type: schema.TypeBool, - Optional: true, - ForceNew: true, - Description: "Indicates whether the redis instance support no-auth access. NOTE: Only available in private cloud environment.", + Type: schema.TypeBool, + Optional: true, + ForceNew: true, + Description: "Indicates whether the redis instance support no-auth access. NOTE: Only available in private cloud environment.", }, "mem_size": { Type: schema.TypeInt, diff --git a/tencentcloud/resource_tc_scf_layer.go b/tencentcloud/resource_tc_scf_layer.go index 79c7fe7c9f..0ab0f70c49 100644 --- a/tencentcloud/resource_tc_scf_layer.go +++ b/tencentcloud/resource_tc_scf_layer.go @@ -30,12 +30,13 @@ package tencentcloud import ( "encoding/base64" "fmt" - "github.com/mitchellh/go-homedir" "io/ioutil" "log" "os" "strings" + "github.com/mitchellh/go-homedir" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" scf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416" diff --git a/tencentcloud/resource_tc_tcr_instance.go b/tencentcloud/resource_tc_tcr_instance.go index 910c657a78..9b673d50ef 100644 --- a/tencentcloud/resource_tc_tcr_instance.go +++ b/tencentcloud/resource_tc_tcr_instance.go @@ -42,11 +42,12 @@ package tencentcloud import ( "context" "fmt" + "log" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" tcr "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr/v20190924" "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper" - "log" ) func resourceTencentCloudTcrInstance() *schema.Resource { diff --git a/tencentcloud/service_tencentcloud_cos.go b/tencentcloud/service_tencentcloud_cos.go index f5b5054b90..dc1071e845 100644 --- a/tencentcloud/service_tencentcloud_cos.go +++ b/tencentcloud/service_tencentcloud_cos.go @@ -1003,6 +1003,11 @@ func (me *CosService) GetBucketOriginDomain(ctx context.Context, bucket string) ratelimit.Check("TencentcloudCosGetBucketOriginDomain") domain, response, err := me.client.UseTencentCosClient(bucket).Bucket.GetDomain(ctx) + if response.StatusCode == 404 { + log.Printf("[WARN] [GetBucketOriginDomain] returns %d, %s", 404, err) + return make([]map[string]interface{}, 0), nil + } + if err != nil { errRet = fmt.Errorf("cos [GetBucketOriginDomain] error: %s, bucket: %s", err.Error(), bucket) return nil, errRet diff --git a/tencentcloud/service_tencentcloud_dnspod.go b/tencentcloud/service_tencentcloud_dnspod.go index 63c8ce5e9b..9e9ae12c54 100644 --- a/tencentcloud/service_tencentcloud_dnspod.go +++ b/tencentcloud/service_tencentcloud_dnspod.go @@ -2,9 +2,10 @@ package tencentcloud import ( "context" - "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper" "log" + "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" dnspod "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod/v20210323" "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/connectivity" diff --git a/tencentcloud/service_tencentcloud_tke_addons.go b/tencentcloud/service_tencentcloud_tke_addons.go index 5d0c6d1de9..f151fd8f4d 100644 --- a/tencentcloud/service_tencentcloud_tke_addons.go +++ b/tencentcloud/service_tencentcloud_tke_addons.go @@ -4,11 +4,12 @@ import ( "context" "encoding/json" "fmt" + "log" + "github.com/hashicorp/terraform-plugin-sdk/helper/resource" tke "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525" "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper" "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/ratelimit" - "log" ) type AddonSpecChart struct {