Skip to content

Commit cb7d011

Browse files
lyu571lyu571
committed
feat(tke): [119782165]add tencentcloud_kubernetes_log_config
1 parent 3f38027 commit cb7d011

File tree

12 files changed

+973
-9
lines changed

12 files changed

+973
-9
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ require (
9191
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.955
9292
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578
9393
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912
94-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1001
94+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1008
9595
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947
9696
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857
9797
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674

‎go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -925,8 +925,6 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.978/go.mod
925925
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.984/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
926926
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.993/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
927927
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.995/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
928-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.995/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
929-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.998/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
930928
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.998/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
931929
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1001/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
932930
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1004/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
@@ -935,8 +933,6 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1006/go.mod
935933
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1008 h1:BQJUiwOi2d368bF1qmdCjHjUMEt24vM6d68r9S+OrQM=
936934
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1008/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
937935
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
938-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
939-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
940936
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
941937
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
942938
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860/go.mod h1:NZo1WplQcC314kMlCRUoy8NQju2BnolIJj7NAWgsuhY=
@@ -1040,6 +1036,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998 h1:f4/n0d
10401036
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/thpc v1.0.998/go.mod h1:fyi/HUwCwVe2NCCCjz8k/C5GwPu3QazCZO+OBJ3MhLk=
10411037
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1001 h1:qj+pw5MJFuOvA+a+yAA2JR8B4TmfX5H5D8jy3L0YKH0=
10421038
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1001/go.mod h1:FVJUGrfLPiJWiKrH+62h38Iyo9mA2O1wuaPLMlbeDBI=
1039+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1008 h1:Cz7JSuS2zxIBzAuZ2bKk3EmrZ1QgS2QAHmCDTDPWBz0=
1040+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.1008/go.mod h1:71PkDdVPT2Pd8yiuX6QFUDReTji39R/03dg1JwcjHWo=
10431041
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947 h1:iZfuU8S86kfqFsAVT/LUApP8L5cpT90hl2wSKiUDVvw=
10441042
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.947/go.mod h1:eAgJ+XUEhffMq79zjpgHoR3PBVcciSg+LuPDC8hLWsE=
10451043
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857 h1:TkJnvSeRSXsRCwOwcwXSvruSK9s/kw8LC3FLeccw+A0=

‎tencentcloud/provider.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2131,7 +2131,8 @@ func Provider() *schema.Provider {
21312131
"tencentcloud_batch_apply_account_baselines": controlcenter.ResourceTencentCloudBatchApplyAccountBaselines(),
21322132
"tencentcloud_thpc_workspaces": thpc.ResourceTencentCloudThpcWorkspaces(),
21332133
"tencentcloud_kubernetes_health_check_policy": tke.ResourceTencentCloudKubernetesHealthCheckPolicy(),
2134-
"tencentcloud_lite_hbase_instance": emr.ResourceTencentCloudLiteHbaseInstance()},
2134+
"tencentcloud_lite_hbase_instance": emr.ResourceTencentCloudLiteHbaseInstance(),
2135+
"tencentcloud_kubernetes_log_config": tke.ResourceTencentCloudKubernetesLogConfig()},
21352136

21362137
ConfigureFunc: providerConfigure,
21372138
}

‎tencentcloud/services/tke/resource_tc_kubernetes_log_config.go

Lines changed: 216 additions & 0 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_log_config.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Provides a resource to create a tke kubernetes_log_config
2+
3+
Example Usage
4+
5+
```hcl
6+
resource "tencentcloud_kubernetes_log_config" "kubernetes_log_config" {
7+
}
8+
```
9+
10+
Import
11+
12+
tke kubernetes_log_config can be imported using the id, e.g.
13+
14+
```
15+
terraform import tencentcloud_kubernetes_log_config.kubernetes_log_config kubernetes_log_config_id
16+
```

‎tencentcloud/services/tke/resource_tc_kubernetes_log_config_extension.go

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package tke
2+
3+
import (
4+
"context"
5+
"fmt"
6+
7+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
8+
v20180525 "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525"
9+
)
10+
11+
func resourceTencentCloudKubernetesLogConfigReadRequestOnSuccess0(ctx context.Context, resp *v20180525.DescribeLogConfigsResponseParams) *resource.RetryError {
12+
if resp != nil {
13+
if resp.Message != nil && *resp.Message != "" {
14+
e := fmt.Errorf(*resp.Message)
15+
return resource.NonRetryableError(e)
16+
}
17+
}
18+
19+
return nil
20+
}
21+
22+
func resourceTencentCloudKubernetesLogConfigDeletePostRequest0(ctx context.Context, req *v20180525.DeleteLogConfigsRequest, resp *v20180525.DeleteLogConfigsResponse) *resource.RetryError {
23+
if resp != nil && resp.Response != nil {
24+
message := resp.Response.Message
25+
if message != nil && *message != "" {
26+
e := fmt.Errorf(*message)
27+
return resource.NonRetryableError(e)
28+
}
29+
}
30+
31+
return nil
32+
}

‎tencentcloud/services/tke/resource_tc_kubernetes_log_config_test.go

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package tke_test
2+
3+
import (
4+
"testing"
5+
6+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
7+
8+
tcacctest "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/acctest"
9+
)
10+
11+
func TestAccTencentCloudKubernetesLogConfigResource_basic(t *testing.T) {
12+
t.Parallel()
13+
resource.Test(t, resource.TestCase{
14+
PreCheck: func() {
15+
tcacctest.AccPreCheck(t)
16+
},
17+
Providers: tcacctest.AccProviders,
18+
Steps: []resource.TestStep{{
19+
Config: testAccKubernetesLogConfig_cls,
20+
Check: resource.ComposeTestCheckFunc(
21+
resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_log_config.kubernetes_log_config", "id"),
22+
),
23+
}},
24+
})
25+
}
26+
27+
const testAccKubernetesLogConfig_cls = `
28+
29+
resource "tencentcloud_kubernetes_log_config" "kubernetes_log_config" {
30+
log_config_name = "xxx"
31+
cluster_id = ""
32+
logset_id = ""
33+
log_config = ""
34+
}
35+
`

‎tencentcloud/services/tke/service_tencentcloud_tke.go

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3673,3 +3673,30 @@ func (me *TkeService) DescribeKubernetesHealthCheckPolicyById(ctx context.Contex
36733673
ret = instances[0]
36743674
return
36753675
}
3676+
3677+
func (me *TkeService) DescribeKubernetesLogConfigById(ctx context.Context, clusterId string, logConfigName string, clusterType string) (ret *tke.DescribeLogConfigsResponseParams, errRet error) {
3678+
logId := tccommon.GetLogId(ctx)
3679+
3680+
request := tke.NewDescribeLogConfigsRequest()
3681+
request.ClusterId = helper.String(clusterId)
3682+
request.ClusterType = helper.String(clusterType)
3683+
request.LogConfigNames = helper.String(logConfigName)
3684+
3685+
defer func() {
3686+
if errRet != nil {
3687+
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())
3688+
}
3689+
}()
3690+
3691+
ratelimit.Check(request.GetAction())
3692+
3693+
response, err := me.client.UseTkeV20180525Client().DescribeLogConfigs(request)
3694+
if err != nil {
3695+
errRet = err
3696+
return
3697+
}
3698+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
3699+
3700+
ret = response.Response
3701+
return
3702+
}

0 commit comments

Comments
 (0)