Skip to content

Commit 25fb1ee

Browse files
committed
fix: conflict
1 parent 1c7b69b commit 25fb1ee

4 files changed

+144
-31
lines changed

tencentcloud/services/tke/resource_tc_kubernetes_backup_storage_location.go

Lines changed: 2 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tencentcloud/services/tke/resource_tc_kubernetes_cluster_attachment.go

Lines changed: 11 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tencentcloud/services/tke/resource_tc_kubernetes_encryption_protection.go

Lines changed: 2 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tencentcloud/services/tke/service_tencentcloud_tke.go

Lines changed: 129 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
svccvm "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/services/cvm"
1111

1212
sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
13+
cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
1314
cwp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp/v20180228"
1415
tat "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tat/v20201028"
1516

@@ -3003,7 +3004,7 @@ func (me *TkeService) DescribeKubernetesEncryptionProtectionById(ctx context.Con
30033004
logId := tccommon.GetLogId(ctx)
30043005

30053006
request := tke.NewDescribeEncryptionStatusRequest()
3006-
request.ClusterId = &clusterId
3007+
request.ClusterId = helper.String(clusterId)
30073008

30083009
defer func() {
30093010
if errRet != nil {
@@ -3023,3 +3024,130 @@ func (me *TkeService) DescribeKubernetesEncryptionProtectionById(ctx context.Con
30233024
ret = response.Response
30243025
return
30253026
}
3027+
3028+
func (me *TkeService) DescribeKubernetesClusterAttachmentById(ctx context.Context, clusterId string) (ret *tke.Cluster, errRet error) {
3029+
logId := tccommon.GetLogId(ctx)
3030+
3031+
request := tke.NewDescribeClustersRequest()
3032+
request.ClusterIds = []*string{helper.String(clusterId)}
3033+
3034+
defer func() {
3035+
if errRet != nil {
3036+
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())
3037+
}
3038+
}()
3039+
3040+
ratelimit.Check(request.GetAction())
3041+
3042+
response, err := me.client.UseTkeClient().DescribeClusters(request)
3043+
if err != nil {
3044+
errRet = err
3045+
return
3046+
}
3047+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
3048+
3049+
if len(response.Response.Clusters) < 1 {
3050+
return
3051+
}
3052+
3053+
ret = response.Response.Clusters[0]
3054+
return
3055+
}
3056+
3057+
func (me *TkeService) DescribeKubernetesClusterAttachmentById1(ctx context.Context, instanceId string) (ret *cvm.Instance, errRet error) {
3058+
logId := tccommon.GetLogId(ctx)
3059+
3060+
request := cvm.NewDescribeInstancesRequest()
3061+
request.InstanceIds = []*string{helper.String(instanceId)}
3062+
3063+
defer func() {
3064+
if errRet != nil {
3065+
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())
3066+
}
3067+
}()
3068+
3069+
ratelimit.Check(request.GetAction())
3070+
3071+
response, err := me.client.UseCvmClient().DescribeInstances(request)
3072+
if err != nil {
3073+
errRet = err
3074+
return
3075+
}
3076+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
3077+
3078+
if len(response.Response.InstanceSet) < 1 {
3079+
return
3080+
}
3081+
3082+
ret = response.Response.InstanceSet[0]
3083+
return
3084+
}
3085+
3086+
func (me *TkeService) DescribeKubernetesClusterAttachmentById2(ctx context.Context, instanceId string, clusterId string) (ret *tke.Instance, errRet error) {
3087+
logId := tccommon.GetLogId(ctx)
3088+
3089+
request := tke.NewDescribeClusterInstancesRequest()
3090+
request.ClusterId = helper.String(clusterId)
3091+
request.InstanceIds = []*string{helper.String(instanceId)}
3092+
3093+
defer func() {
3094+
if errRet != nil {
3095+
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())
3096+
}
3097+
}()
3098+
3099+
ratelimit.Check(request.GetAction())
3100+
3101+
response, err := me.client.UseTkeClient().DescribeClusterInstances(request)
3102+
if err != nil {
3103+
errRet = err
3104+
return
3105+
}
3106+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
3107+
3108+
if len(response.Response.InstanceSet) < 1 {
3109+
return
3110+
}
3111+
3112+
for _, info := range response.Response.InstanceSet {
3113+
if info.InstanceId != nil && *info.InstanceId == instanceId {
3114+
ret = info
3115+
break
3116+
}
3117+
}
3118+
return
3119+
}
3120+
3121+
func (me *TkeService) DescribeKubernetesBackupStorageLocationById(ctx context.Context, name string) (ret *tke.BackupStorageLocation, errRet error) {
3122+
logId := tccommon.GetLogId(ctx)
3123+
3124+
request := tke.NewDescribeBackupStorageLocationsRequest()
3125+
request.Names = []*string{helper.String(name)}
3126+
3127+
defer func() {
3128+
if errRet != nil {
3129+
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())
3130+
}
3131+
}()
3132+
3133+
ratelimit.Check(request.GetAction())
3134+
3135+
response, err := me.client.UseTkeClient().DescribeBackupStorageLocations(request)
3136+
if err != nil {
3137+
errRet = err
3138+
return
3139+
}
3140+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
3141+
3142+
if len(response.Response.BackupStorageLocationSet) < 1 {
3143+
return
3144+
}
3145+
3146+
for _, info := range response.Response.BackupStorageLocationSet {
3147+
if info.Name != nil && *info.Name == name {
3148+
ret = info
3149+
break
3150+
}
3151+
}
3152+
return
3153+
}

0 commit comments

Comments
 (0)