Skip to content

Commit 92966b8

Browse files
SevenEarthSevenEarth
committed
add
1 parent f04592d commit 92966b8

13 files changed

+260
-68
lines changed

‎tencentcloud/services/wedata/resource_tc_wedata_code_file.go‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,18 @@ func ResourceTencentCloudWedataCodeFile() *schema.Resource {
9393
Computed: true,
9494
Description: "Code file ID.",
9595
},
96+
97+
"access_scope": {
98+
Type: schema.TypeString,
99+
Computed: true,
100+
Description: "Permission range: SHARED, PRIVATE.",
101+
},
102+
103+
"path": {
104+
Type: schema.TypeString,
105+
Computed: true,
106+
Description: "The full path of the node, /aaa/bbb/ccc.ipynb, consists of the names of each node.",
107+
},
96108
},
97109
}
98110
}
@@ -216,8 +228,12 @@ func resourceTencentCloudWedataCodeFileRead(d *schema.ResourceData, meta interfa
216228
_ = d.Set("code_file_name", respData.CodeFileName)
217229
}
218230

219-
if respData.Path != nil {
220-
_ = d.Set("parent_folder_path", respData.Path)
231+
if respData.ParentFolderPath != nil {
232+
if *respData.ParentFolderPath == "" {
233+
_ = d.Set("parent_folder_path", "/")
234+
} else {
235+
_ = d.Set("parent_folder_path", *respData.ParentFolderPath)
236+
}
221237
}
222238

223239
if respData.CodeFileConfig != nil {
@@ -250,6 +266,14 @@ func resourceTencentCloudWedataCodeFileRead(d *schema.ResourceData, meta interfa
250266
_ = d.Set("code_file_id", respData.CodeFileId)
251267
}
252268

269+
if respData.AccessScope != nil {
270+
_ = d.Set("access_scope", *respData.AccessScope)
271+
}
272+
273+
if respData.Path != nil {
274+
_ = d.Set("path", *respData.Path)
275+
}
276+
253277
return nil
254278
}
255279

‎tencentcloud/services/wedata/resource_tc_wedata_code_folder.go‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,18 @@ func ResourceTencentCloudWedataCodeFolder() *schema.Resource {
5050
Computed: true,
5151
Description: "Folder ID.",
5252
},
53+
54+
"access_scope": {
55+
Type: schema.TypeString,
56+
Computed: true,
57+
Description: "Permission range: SHARED, PRIVATE.",
58+
},
59+
60+
"type": {
61+
Type: schema.TypeString,
62+
Computed: true,
63+
Description: "Type. folder, script.",
64+
},
5365
},
5466
}
5567
}
@@ -128,7 +140,7 @@ func resourceTencentCloudWedataCodeFolderRead(d *schema.ResourceData, meta inter
128140
projectId := idSplit[0]
129141
folderId := idSplit[1]
130142

131-
respData, err := service.DescribeWedataCodeFolderById(ctx, projectId, folderId)
143+
respData, err := service.DescribeWedataGetCodeFolderById(ctx, projectId, folderId)
132144
if err != nil {
133145
return err
134146
}
@@ -145,14 +157,26 @@ func resourceTencentCloudWedataCodeFolderRead(d *schema.ResourceData, meta inter
145157
_ = d.Set("folder_name", *respData.Title)
146158
}
147159

148-
if respData.Path != nil {
149-
_ = d.Set("parent_folder_path", *respData.Path)
160+
if respData.ParentFolderPath != nil {
161+
if *respData.ParentFolderPath == "" {
162+
_ = d.Set("parent_folder_path", "/")
163+
} else {
164+
_ = d.Set("parent_folder_path", *respData.ParentFolderPath)
165+
}
150166
}
151167

152168
if respData.Id != nil {
153169
_ = d.Set("folder_id", *respData.Id)
154170
}
155171

172+
if respData.AccessScope != nil {
173+
_ = d.Set("access_scope", *respData.AccessScope)
174+
}
175+
176+
if respData.Type != nil {
177+
_ = d.Set("type", *respData.Type)
178+
}
179+
156180
return nil
157181
}
158182

‎tencentcloud/services/wedata/resource_tc_wedata_code_folder.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Example Usage
44

55
```hcl
66
resource "tencentcloud_wedata_code_folder" "example" {
7-
project_id = ""
8-
folder_name = ""
9-
parent_folder_path = ""
7+
project_id = "2983848457986924544"
8+
folder_name = "tf_example"
9+
parent_folder_path = "/"
1010
}
1111
```
1212

‎tencentcloud/services/wedata/resource_tc_wedata_code_folder_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@ func TestAccTencentCloudWedataCodeFolderResource_basic(t *testing.T) {
4545

4646
const testAccWedataCodeFolder = `
4747
resource "tencentcloud_wedata_code_folder" "example" {
48-
project_id = ""
49-
folder_name = ""
50-
parent_folder_path = ""
48+
project_id = "2983848457986924544"
49+
folder_name = "tf_example"
50+
parent_folder_path = "/"
5151
}
5252
`
5353

5454
const testAccWedataCodeFolderUpdate = `
5555
resource "tencentcloud_wedata_code_folder" "example" {
56-
project_id = ""
57-
folder_name = ""
58-
parent_folder_path = ""
56+
project_id = "2983848457986924544"
57+
folder_name = "tf_example_update"
58+
parent_folder_path = "/"
5959
}
6060
`

‎tencentcloud/services/wedata/resource_tc_wedata_sql_folder.go‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ func ResourceTencentCloudWedataSqlFolder() *schema.Resource {
5656
Computed: true,
5757
Description: "Folder ID.",
5858
},
59+
60+
"path": {
61+
Type: schema.TypeString,
62+
Computed: true,
63+
Description: "Node path.",
64+
},
5965
},
6066
}
6167
}
@@ -138,7 +144,7 @@ func resourceTencentCloudWedataSqlFolderRead(d *schema.ResourceData, meta interf
138144
projectId := idSplit[0]
139145
folderId := idSplit[1]
140146

141-
respData, err := service.DescribeWedataSqlFolderById(ctx, projectId, folderId)
147+
respData, err := service.DescribeWedataGetSqlFolderById(ctx, projectId, folderId)
142148
if err != nil {
143149
return err
144150
}
@@ -156,7 +162,11 @@ func resourceTencentCloudWedataSqlFolderRead(d *schema.ResourceData, meta interf
156162
}
157163

158164
if respData.ParentFolderPath != nil {
159-
_ = d.Set("parent_folder_path", *respData.ParentFolderPath)
165+
if *respData.ParentFolderPath == "" {
166+
_ = d.Set("parent_folder_path", "/")
167+
} else {
168+
_ = d.Set("parent_folder_path", *respData.ParentFolderPath)
169+
}
160170
}
161171

162172
if respData.AccessScope != nil {
@@ -167,6 +177,10 @@ func resourceTencentCloudWedataSqlFolderRead(d *schema.ResourceData, meta interf
167177
_ = d.Set("folder_id", *respData.Id)
168178
}
169179

180+
if respData.Path != nil {
181+
_ = d.Set("path", *respData.Path)
182+
}
183+
170184
return nil
171185
}
172186

‎tencentcloud/services/wedata/resource_tc_wedata_sql_folder.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Example Usage
44

55
```hcl
66
resource "tencentcloud_wedata_sql_folder" "example" {
7-
folder_name = "tf-example"
8-
project_id = "2917455276892352512"
7+
folder_name = "tf_example"
8+
project_id = "2983848457986924544"
99
parent_folder_path = "/"
1010
access_scope = "SHARED"
1111
}

‎tencentcloud/services/wedata/resource_tc_wedata_sql_folder_test.go‎

Lines changed: 40 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,50 @@ func TestAccTencentCloudWedataSqlFolderResource_basic(t *testing.T) {
1515
tcacctest.AccPreCheck(t)
1616
},
1717
Providers: tcacctest.AccProviders,
18-
Steps: []resource.TestStep{{
19-
Config: testAccWedataSqlFolder,
20-
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_wedata_sql_folder.wedata_sql_folder", "id")),
21-
}, {
22-
ResourceName: "tencentcloud_wedata_sql_folder.wedata_sql_folder",
23-
ImportState: true,
24-
ImportStateVerify: true,
25-
}},
18+
Steps: []resource.TestStep{
19+
{
20+
Config: testAccWedataSqlFolder,
21+
Check: resource.ComposeTestCheckFunc(
22+
resource.TestCheckResourceAttrSet("tencentcloud_wedata_sql_folder.example", "id"),
23+
resource.TestCheckResourceAttrSet("tencentcloud_wedata_sql_folder.example", "folder_name"),
24+
resource.TestCheckResourceAttrSet("tencentcloud_wedata_sql_folder.example", "project_id"),
25+
resource.TestCheckResourceAttrSet("tencentcloud_wedata_sql_folder.example", "parent_folder_path"),
26+
resource.TestCheckResourceAttrSet("tencentcloud_wedata_sql_folder.example", "access_scope"),
27+
),
28+
},
29+
{
30+
Config: testAccWedataSqlFolderUpdate,
31+
Check: resource.ComposeTestCheckFunc(
32+
resource.TestCheckResourceAttrSet("tencentcloud_wedata_sql_folder.example", "id"),
33+
resource.TestCheckResourceAttrSet("tencentcloud_wedata_sql_folder.example", "folder_name"),
34+
resource.TestCheckResourceAttrSet("tencentcloud_wedata_sql_folder.example", "project_id"),
35+
resource.TestCheckResourceAttrSet("tencentcloud_wedata_sql_folder.example", "parent_folder_path"),
36+
resource.TestCheckResourceAttrSet("tencentcloud_wedata_sql_folder.example", "access_scope"),
37+
),
38+
},
39+
{
40+
ResourceName: "tencentcloud_wedata_sql_folder.example",
41+
ImportState: true,
42+
ImportStateVerify: true,
43+
},
44+
},
2645
})
2746
}
2847

2948
const testAccWedataSqlFolder = `
49+
resource "tencentcloud_wedata_sql_folder" "example" {
50+
folder_name = "tf_example"
51+
project_id = "2983848457986924544"
52+
parent_folder_path = "/"
53+
access_scope = "SHARED"
54+
}
55+
`
3056

31-
resource "tencentcloud_wedata_sql_folder" "wedata_sql_folder" {
57+
const testAccWedataSqlFolderUpdate = `
58+
resource "tencentcloud_wedata_sql_folder" "example" {
59+
folder_name = "tf_example_update"
60+
project_id = "2983848457986924544"
61+
parent_folder_path = "/"
62+
access_scope = "PRIVATE"
3263
}
3364
`

‎tencentcloud/services/wedata/resource_tc_wedata_sql_script.go‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ func ResourceTencentCloudWedataSqlScript() *schema.Resource {
2020
Read: resourceTencentCloudWedataSqlScriptRead,
2121
Update: resourceTencentCloudWedataSqlScriptUpdate,
2222
Delete: resourceTencentCloudWedataSqlScriptDelete,
23+
Importer: &schema.ResourceImporter{
24+
State: schema.ImportStatePassthrough,
25+
},
2326
Schema: map[string]*schema.Schema{
2427
"script_name": {
2528
Type: schema.TypeString,
@@ -45,6 +48,7 @@ func ResourceTencentCloudWedataSqlScript() *schema.Resource {
4548
"script_config": {
4649
Type: schema.TypeList,
4750
Optional: true,
51+
Computed: true,
4852
MaxItems: 1,
4953
Description: "Data exploration script configuration.",
5054
Elem: &schema.Resource{
@@ -86,12 +90,13 @@ func ResourceTencentCloudWedataSqlScript() *schema.Resource {
8690
"script_content": {
8791
Type: schema.TypeString,
8892
Optional: true,
89-
Description: "Script content, if there is a value, it needs to be base64 encoded.",
93+
Description: "Script content, if there is a value.",
9094
},
9195

9296
"access_scope": {
9397
Type: schema.TypeString,
9498
Optional: true,
99+
Computed: true,
95100
ForceNew: true,
96101
Description: "Permission scope: SHARED, PRIVATE.",
97102
},
@@ -102,6 +107,12 @@ func ResourceTencentCloudWedataSqlScript() *schema.Resource {
102107
Computed: true,
103108
Description: "Script ID.",
104109
},
110+
111+
"path": {
112+
Type: schema.TypeString,
113+
Computed: true,
114+
Description: "The full path of the node, /aaa/bbb/ccc.ipynb, consists of the names of each node.",
115+
},
105116
},
106117
}
107118
}
@@ -162,7 +173,7 @@ func resourceTencentCloudWedataSqlScriptCreate(d *schema.ResourceData, meta inte
162173
}
163174

164175
if v, ok := d.GetOk("script_content"); ok {
165-
request.ScriptContent = helper.String(v.(string))
176+
request.ScriptContent = helper.String(tccommon.StringToBase64(v.(string)))
166177
}
167178

168179
if v, ok := d.GetOk("access_scope"); ok {
@@ -270,7 +281,13 @@ func resourceTencentCloudWedataSqlScriptRead(d *schema.ResourceData, meta interf
270281
}
271282

272283
if respData.ScriptContent != nil {
273-
_ = d.Set("script_content", respData.ScriptContent)
284+
sqlStr, err := tccommon.Base64ToString(*respData.ScriptContent)
285+
if err != nil {
286+
log.Printf("[ERROR]%s base64 decode failed, reason:%+v", logId, err)
287+
return err
288+
}
289+
290+
_ = d.Set("script_content", sqlStr)
274291
}
275292

276293
if respData.AccessScope != nil {
@@ -281,6 +298,10 @@ func resourceTencentCloudWedataSqlScriptRead(d *schema.ResourceData, meta interf
281298
_ = d.Set("script_id", respData.ScriptId)
282299
}
283300

301+
if respData.Path != nil {
302+
_ = d.Set("path", *respData.Path)
303+
}
304+
284305
return nil
285306
}
286307

‎tencentcloud/services/wedata/resource_tc_wedata_sql_script.md‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,16 @@ Example Usage
44

55
```hcl
66
resource "tencentcloud_wedata_sql_script" "example" {
7-
script_name = "tf-example"
8-
project_id = ""
9-
parent_folder_path = ""
7+
script_name = "tf_example_script"
8+
project_id = "2983848457986924544"
9+
parent_folder_path = "/tf_example"
1010
script_config {
11-
datasource_id = ""
12-
datasource_env = ""
13-
compute_resource = ""
14-
executor_group_id = ""
15-
params = ""
16-
advance_config = ""
11+
datasource_id = "108826"
12+
compute_resource = "svmgao_stability"
1713
}
1814
19-
script_content = ""
20-
access_scope = ""
15+
script_content = "SHOW DATABASES;"
16+
access_scope = "SHARED"
2117
}
2218
```
2319

@@ -26,5 +22,5 @@ Import
2622
WeData sql script can be imported using the projectId#scriptId, e.g.
2723

2824
```
29-
terraform import tencentcloud_wedata_sql_script.example 2917455276892352512#bf6a325f-ab82-4fba-9eac-1b6ae58f20f6
25+
terraform import tencentcloud_wedata_sql_script.example 2983848457986924544#cccc3170-6334-46c3-adce-c5776ad2280c
3026
```

0 commit comments

Comments
 (0)