Skip to content

Commit 217e75d

Browse files
SevenEarthSevenEarth
authored
fix(tke): [120382472] tencentcloud_kubernetes_auth_attachment update the logic of the read function (#2953)
* add * add * add
1 parent 021604c commit 217e75d

File tree

5 files changed

+26
-21
lines changed

5 files changed

+26
-21
lines changed

‎.changelog/2953.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_kubernetes_auth_attachment: Update the logic of the read function
3+
```

‎GNUmakefile

+1
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.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
6161
cluster_deploy_type = "MANAGED_CLUSTER"
6262
}
6363
64-
resource "tencentcloud_kubernetes_auth_attachment" "test_auth_attach" {
64+
resource "tencentcloud_kubernetes_auth_attachment" "example" {
6565
cluster_id = tencentcloud_kubernetes_cluster.managed_cluster.id
6666
jwks_uri = "https://${tencentcloud_kubernetes_cluster.managed_cluster.id}.ccs.tencent-cloud.com/openid/v1/jwks"
6767
issuer = "https://${tencentcloud_kubernetes_cluster.managed_cluster.id}.ccs.tencent-cloud.com"
@@ -129,16 +129,17 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
129129
}
130130
131131
# if you want to use tke default issuer and jwks_uri, please set use_tke_default to true and set issuer to empty string.
132-
resource "tencentcloud_kubernetes_auth_attachment" "test_use_tke_default_auth_attach" {
132+
resource "tencentcloud_kubernetes_auth_attachment" "example" {
133133
cluster_id = tencentcloud_kubernetes_cluster.managed_cluster.id
134134
auto_create_discovery_anonymous_auth = true
135135
use_tke_default = true
136136
}
137137
```
138138

139139
Use OIDC Config
140+
140141
```
141-
resource "tencentcloud_kubernetes_auth_attachment" "test_auth_attach" {
142+
resource "tencentcloud_kubernetes_auth_attachment" "example" {
142143
cluster_id = tencentcloud_kubernetes_cluster.managed_cluster.id
143144
use_tke_default = true
144145
auto_create_discovery_anonymous_auth = true
@@ -149,7 +150,7 @@ resource "tencentcloud_kubernetes_auth_attachment" "test_auth_attach" {
149150
data "tencentcloud_cam_oidc_config" "oidc_config" {
150151
name = tencentcloud_kubernetes_cluster.managed_cluster.id
151152
depends_on = [
152-
tencentcloud_kubernetes_auth_attachment.test_auth_attach
153+
tencentcloud_kubernetes_auth_attachment.example
153154
]
154155
}
155156
@@ -160,13 +161,12 @@ output "identity_key" {
160161
output "identity_url" {
161162
value = data.tencentcloud_cam_oidc_config.oidc_config.identity_url
162163
}
163-
164164
```
165165

166166
Import
167167

168168
tke cluster authentication can be imported, e.g.
169169

170170
```
171-
$ terraform import tencentcloud_kubernetes_auth_attachment.test cls-xxx
171+
$ terraform import tencentcloud_kubernetes_auth_attachment.example cls-fp5o961e
172172
```

‎tencentcloud/services/tke/resource_tc_kubernetes_auth_attachment_extension.go

+11-10
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

‎website/docs/r/kubernetes_auth_attachment.html.markdown

+5-5
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
7272
cluster_deploy_type = "MANAGED_CLUSTER"
7373
}
7474
75-
resource "tencentcloud_kubernetes_auth_attachment" "test_auth_attach" {
75+
resource "tencentcloud_kubernetes_auth_attachment" "example" {
7676
cluster_id = tencentcloud_kubernetes_cluster.managed_cluster.id
7777
jwks_uri = "https://${tencentcloud_kubernetes_cluster.managed_cluster.id}.ccs.tencent-cloud.com/openid/v1/jwks"
7878
issuer = "https://${tencentcloud_kubernetes_cluster.managed_cluster.id}.ccs.tencent-cloud.com"
@@ -140,7 +140,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
140140
}
141141
142142
# if you want to use tke default issuer and jwks_uri, please set use_tke_default to true and set issuer to empty string.
143-
resource "tencentcloud_kubernetes_auth_attachment" "test_use_tke_default_auth_attach" {
143+
resource "tencentcloud_kubernetes_auth_attachment" "example" {
144144
cluster_id = tencentcloud_kubernetes_cluster.managed_cluster.id
145145
auto_create_discovery_anonymous_auth = true
146146
use_tke_default = true
@@ -150,7 +150,7 @@ resource "tencentcloud_kubernetes_auth_attachment" "test_use_tke_default_auth_at
150150
### Use OIDC Config
151151

152152
```hcl
153-
resource "tencentcloud_kubernetes_auth_attachment" "test_auth_attach" {
153+
resource "tencentcloud_kubernetes_auth_attachment" "example" {
154154
cluster_id = tencentcloud_kubernetes_cluster.managed_cluster.id
155155
use_tke_default = true
156156
auto_create_discovery_anonymous_auth = true
@@ -161,7 +161,7 @@ resource "tencentcloud_kubernetes_auth_attachment" "test_auth_attach" {
161161
data "tencentcloud_cam_oidc_config" "oidc_config" {
162162
name = tencentcloud_kubernetes_cluster.managed_cluster.id
163163
depends_on = [
164-
tencentcloud_kubernetes_auth_attachment.test_auth_attach
164+
tencentcloud_kubernetes_auth_attachment.example
165165
]
166166
}
167167
@@ -201,6 +201,6 @@ In addition to all arguments above, the following attributes are exported:
201201
tke cluster authentication can be imported, e.g.
202202

203203
```
204-
$ terraform import tencentcloud_kubernetes_auth_attachment.test cls-xxx
204+
$ terraform import tencentcloud_kubernetes_auth_attachment.example cls-fp5o961e
205205
```
206206

0 commit comments

Comments
 (0)