Skip to content

Commit e24fce3

Browse files
committed
add
1 parent 52ce1d6 commit e24fce3

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

GNUmakefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,3 +199,4 @@ changelog:
199199

200200
.PHONY: build sweep test testacc fmt fmtcheck lint tools test-compile doc hooks website website-lint website-test
201201

202+
ready: doc fmt-faster

tencentcloud/services/tke/resource_tc_kubernetes_auth_attachment_extension.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,22 @@ func resourceTencentCloudKubernetesAuthAttachmentCreatePreRequest0(ctx context.C
2424

2525
return nil
2626
}
27+
2728
func resourceTencentCloudKubernetesAuthAttachmentReadRequestOnSuccess0(ctx context.Context, resp *tke.DescribeClusterAuthenticationOptionsResponseParams) *resource.RetryError {
28-
tmpRespServiceAccount := tke.ServiceAccountAuthenticationOptions{}
2929
d := tccommon.ResourceDataFromContext(ctx)
3030

31-
if resp != nil && resp.ServiceAccounts != nil {
32-
if v, ok := d.GetOk("use_tke_default"); ok && v.(bool) {
33-
resp.ServiceAccounts.Issuer = tmpRespServiceAccount.Issuer
34-
resp.ServiceAccounts.JWKSURI = tmpRespServiceAccount.JWKSURI
35-
_ = d.Set("tke_default_issuer", resp.ServiceAccounts.Issuer)
36-
_ = d.Set("tke_default_jwks_uri", resp.ServiceAccounts.JWKSURI)
37-
}
31+
if resp != nil && resp.ServiceAccounts != nil && resp.ServiceAccounts.UseTKEDefault != nil && *resp.ServiceAccounts.UseTKEDefault {
32+
_ = d.Set("tke_default_issuer", resp.ServiceAccounts.Issuer)
33+
_ = d.Set("tke_default_jwks_uri", resp.ServiceAccounts.JWKSURI)
3834

39-
resp.ServiceAccounts.UseTKEDefault = tmpRespServiceAccount.UseTKEDefault
40-
resp.ServiceAccounts.AutoCreateDiscoveryAnonymousAuth = tmpRespServiceAccount.AutoCreateDiscoveryAnonymousAuth
35+
// if true, set params nil
36+
resp.ServiceAccounts.Issuer = nil
37+
resp.ServiceAccounts.JWKSURI = nil
4138
}
4239

4340
return nil
4441
}
42+
4543
func resourceTencentCloudKubernetesAuthAttachmentUpdatePreRequest0(ctx context.Context, req *tke.ModifyClusterAuthenticationOptionsRequest) *resource.RetryError {
4644
d := tccommon.ResourceDataFromContext(ctx)
4745

@@ -71,6 +69,7 @@ func resourceTencentCloudKubernetesAuthAttachmentUpdatePreRequest0(ctx context.C
7169
func resourceTencentCloudKubernetesAuthAttachmentUpdateRequestOnError0(ctx context.Context, req *tke.ModifyClusterAuthenticationOptionsRequest, e error) *resource.RetryError {
7270
return tccommon.RetryError(e, tke.RESOURCEUNAVAILABLE_CLUSTERSTATE)
7371
}
72+
7473
func resourceTencentCloudKubernetesAuthAttachmentReadPostFillRequest0(ctx context.Context, req *tke.DescribeClusterAuthenticationOptionsRequest) error {
7574
d := tccommon.ResourceDataFromContext(ctx)
7675

@@ -85,13 +84,15 @@ func resourceTencentCloudKubernetesAuthAttachmentReadPostFillRequest0(ctx contex
8584
}
8685
return nil
8786
}
87+
8888
func resourceTencentCloudKubernetesAuthAttachmentDeletePreRequest0(ctx context.Context, req *tke.ModifyClusterAuthenticationOptionsRequest) *resource.RetryError {
8989
req.ServiceAccounts = &tke.ServiceAccountAuthenticationOptions{
9090
JWKSURI: helper.String(""),
9191
Issuer: helper.String(DefaultAuthenticationOptionsIssuer),
9292
}
9393
return nil
9494
}
95+
9596
func resourceTencentCloudKubernetesAuthAttachmentDeletePostHandleResponse0(ctx context.Context, resp *tke.ModifyClusterAuthenticationOptionsResponse) error {
9697
d := tccommon.ResourceDataFromContext(ctx)
9798

0 commit comments

Comments
 (0)