Skip to content

Commit 80e3c65

Browse files
author
mikatong
committed
update unit test
1 parent 936f16d commit 80e3c65

6 files changed

+186
-37
lines changed

‎tencentcloud/services/wedata/resource_tc_wedata_resource_file_test.go‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,18 @@ func TestAccTencentCloudWedataResourceFileResource_basic(t *testing.T) {
1515
tcacctest.AccPreCheck(t)
1616
},
1717
Providers: tcacctest.AccProviders,
18-
Steps: []resource.TestStep{{
19-
Config: testAccWedataResourceFile,
20-
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_wedata_resource_file.wedata_resource_file", "id")),
21-
}},
18+
Steps: []resource.TestStep{
19+
{
20+
Config: testAccWedataResourceFile,
21+
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_wedata_resource_file.wedata_resource_file", "id")),
22+
},
23+
{
24+
Config: testAccWedataResourceFileUpdate,
25+
Check: resource.ComposeTestCheckFunc(
26+
resource.TestCheckResourceAttr("tencentcloud_wedata_resource_file.wedata_resource_file", "resource_name", "tftest1.txt"),
27+
),
28+
},
29+
},
2230
})
2331
}
2432

@@ -32,3 +40,14 @@ resource "tencentcloud_wedata_resource_file" "wedata_resource_file" {
3240
resource_file = "/datastudio/resource/2905622749543821312/test"
3341
}
3442
`
43+
44+
const testAccWedataResourceFileUpdate = `
45+
resource "tencentcloud_wedata_resource_file" "wedata_resource_file" {
46+
project_id = 2905622749543821312
47+
resource_name = "tftest1.txt"
48+
bucket_name = "data-manage-fsi-1315051789"
49+
cos_region = "ap-beijing-fsi"
50+
parent_folder_path = "/"
51+
resource_file = "/datastudio/resource/2905622749543821312/test"
52+
}
53+
`

‎tencentcloud/services/wedata/resource_tc_wedata_resource_folder_test.go‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,18 @@ func TestAccTencentCloudWedataResourceFolderResource_basic(t *testing.T) {
1515
tcacctest.AccPreCheck(t)
1616
},
1717
Providers: tcacctest.AccProviders,
18-
Steps: []resource.TestStep{{
19-
Config: testAccWedataResourceFolder,
20-
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_wedata_resource_folder.wedata_resource_folder", "id")),
21-
}},
18+
Steps: []resource.TestStep{
19+
{
20+
Config: testAccWedataResourceFolder,
21+
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_wedata_resource_folder.wedata_resource_folder", "id")),
22+
},
23+
{
24+
Config: testAccWedataResourceFolderUpdate,
25+
Check: resource.ComposeTestCheckFunc(
26+
resource.TestCheckResourceAttr("tencentcloud_wedata_resource_folder.wedata_resource_folder", "folder_name", "folder1"),
27+
),
28+
},
29+
},
2230
})
2331
}
2432

@@ -29,3 +37,11 @@ resource "tencentcloud_wedata_resource_folder" "wedata_resource_folder" {
2937
folder_name = "folder"
3038
}
3139
`
40+
41+
const testAccWedataResourceFolderUpdate = `
42+
resource "tencentcloud_wedata_resource_folder" "wedata_resource_folder" {
43+
project_id = 2905622749543821312
44+
parent_folder_path = "/"
45+
folder_name = "folder1"
46+
}
47+
`

‎tencentcloud/services/wedata/resource_tc_wedata_task_test.go‎

Lines changed: 83 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,23 @@ func TestAccTencentCloudWedataTaskResource_basic(t *testing.T) {
1515
tcacctest.AccPreCheck(t)
1616
},
1717
Providers: tcacctest.AccProviders,
18-
Steps: []resource.TestStep{{
19-
Config: testAccWedataTask,
20-
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_wedata_task.wedata_task", "id")),
21-
}, {
22-
ResourceName: "tencentcloud_wedata_task.wedata_task",
23-
ImportState: true,
24-
ImportStateVerify: true,
25-
}},
18+
Steps: []resource.TestStep{
19+
{
20+
Config: testAccWedataTask,
21+
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_wedata_task.wedata_task", "id")),
22+
},
23+
{
24+
Config: testAccWedataTaskUpdate,
25+
Check: resource.ComposeTestCheckFunc(
26+
resource.TestCheckResourceAttr("tencentcloud_wedata_task.wedata_task", "task_base_attribute.0.task_name", "tfTask1"),
27+
),
28+
},
29+
{
30+
ResourceName: "tencentcloud_wedata_task.wedata_task",
31+
ImportState: true,
32+
ImportStateVerify: true,
33+
},
34+
},
2635
})
2736
}
2837

@@ -91,3 +100,69 @@ resource "tencentcloud_wedata_task" "wedata_task" {
91100
}
92101
}
93102
`
103+
104+
const testAccWedataTaskUpdate = `
105+
resource "tencentcloud_wedata_workflow_folder" "wedata_workflow_folder" {
106+
project_id = "2905622749543821312"
107+
parent_folder_path = "/"
108+
folder_name = "tftest"
109+
}
110+
111+
resource "tencentcloud_wedata_workflow" "wedata_workflow" {
112+
project_id = 2905622749543821312
113+
workflow_name = "test_workflow1"
114+
parent_folder_path = "${tencentcloud_wedata_workflow_folder.wedata_workflow_folder.parent_folder_path}${tencentcloud_wedata_workflow_folder.wedata_workflow_folder.folder_name}"
115+
workflow_type = "cycle"
116+
}
117+
118+
resource "tencentcloud_wedata_task" "wedata_task" {
119+
project_id = 2905622749543821312
120+
task_base_attribute {
121+
task_name = "tfTask1"
122+
task_type_id = 30
123+
workflow_id = tencentcloud_wedata_workflow.wedata_workflow.workflow_id
124+
}
125+
task_configuration {
126+
code_content = "IyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiMKIyNhdXRob3I6IEFQSV9URVNUCiMjY3JlYXRlIHRpbWU6IDIwMjUtMTAtMTMgMTc6MjY6MTcKIyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiMK"
127+
task_ext_configuration_list {
128+
param_key = "bucket"
129+
param_value = "wedata-fusion-bjjr-1257305158"
130+
}
131+
task_ext_configuration_list {
132+
param_key = "ftp.file.name"
133+
param_value = "/datastudio/project/2905622749543821312/tftest/test_workflow1/tfTask.py"
134+
}
135+
task_ext_configuration_list {
136+
param_key = "tenantId"
137+
param_value = "1257305158"
138+
}
139+
task_ext_configuration_list {
140+
param_key = "region"
141+
param_value = "ap-beijing-fsi"
142+
}
143+
task_ext_configuration_list {
144+
param_key = "extraInfo"
145+
param_value = "{\"fromMapping\":false}"
146+
}
147+
task_ext_configuration_list {
148+
param_key = "ssmDynamicSkSwitch"
149+
param_value = "ON"
150+
}
151+
task_ext_configuration_list {
152+
param_key = "calendar_open"
153+
param_value = "0"
154+
}
155+
task_ext_configuration_list {
156+
param_key = "specLabelConfItems"
157+
param_value = "eyJzcGVjTGFiZWxDb25mSXRlbXMiOltdfQ=="
158+
}
159+
task_ext_configuration_list {
160+
param_key = "waitExecutionTotalTTL"
161+
param_value = "-1"
162+
}
163+
}
164+
task_scheduler_configuration {
165+
cycle_type = "DAY_CYCLE"
166+
}
167+
}
168+
`

‎tencentcloud/services/wedata/resource_tc_wedata_workflow.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -268,16 +268,16 @@ func resourceTencentCloudWedataWorkflowCreate(d *schema.ResourceData, meta inter
268268
if v, ok := workflowSchedulerConfigurationMap["dependency_workflow"]; ok {
269269
workflowSchedulerConfigurationInfo.DependencyWorkflow = helper.String(v.(string))
270270
}
271-
if v, ok := workflowSchedulerConfigurationMap["modify_cycle_value"]; ok {
271+
if v, ok := workflowSchedulerConfigurationMap["modify_cycle_value"]; ok && v.(string) != "" {
272272
workflowSchedulerConfigurationInfo.ModifyCycleValue = helper.String(v.(string))
273273
}
274274
if v, ok := workflowSchedulerConfigurationMap["clear_link"]; ok {
275275
workflowSchedulerConfigurationInfo.ClearLink = helper.Bool(v.(bool))
276276
}
277-
if v, ok := workflowSchedulerConfigurationMap["main_cyclic_config"]; ok {
277+
if v, ok := workflowSchedulerConfigurationMap["main_cyclic_config"]; ok && v.(string) != "" {
278278
workflowSchedulerConfigurationInfo.MainCyclicConfig = helper.String(v.(string))
279279
}
280-
if v, ok := workflowSchedulerConfigurationMap["subordinate_cyclic_config"]; ok {
280+
if v, ok := workflowSchedulerConfigurationMap["subordinate_cyclic_config"]; ok && v.(string) != "" {
281281
workflowSchedulerConfigurationInfo.SubordinateCyclicConfig = helper.String(v.(string))
282282
}
283283
if v, ok := workflowSchedulerConfigurationMap["execution_start_time"]; ok {
@@ -286,7 +286,7 @@ func resourceTencentCloudWedataWorkflowCreate(d *schema.ResourceData, meta inter
286286
if v, ok := workflowSchedulerConfigurationMap["execution_end_time"]; ok {
287287
workflowSchedulerConfigurationInfo.ExecutionEndTime = helper.String(v.(string))
288288
}
289-
if v, ok := workflowSchedulerConfigurationMap["calendar_open"]; ok {
289+
if v, ok := workflowSchedulerConfigurationMap["calendar_open"]; ok && v.(string) != "" {
290290
workflowSchedulerConfigurationInfo.CalendarOpen = helper.String(v.(string))
291291
}
292292
if v, ok := workflowSchedulerConfigurationMap["calendar_id"]; ok {
@@ -555,16 +555,16 @@ func resourceTencentCloudWedataWorkflowUpdate(d *schema.ResourceData, meta inter
555555
if v, ok := workflowSchedulerConfigurationMap["dependency_workflow"]; ok {
556556
workflowSchedulerConfigurationInfo.DependencyWorkflow = helper.String(v.(string))
557557
}
558-
if v, ok := workflowSchedulerConfigurationMap["modify_cycle_value"]; ok {
558+
if v, ok := workflowSchedulerConfigurationMap["modify_cycle_value"]; ok && v.(string) != "" {
559559
workflowSchedulerConfigurationInfo.ModifyCycleValue = helper.String(v.(string))
560560
}
561561
if v, ok := workflowSchedulerConfigurationMap["clear_link"]; ok {
562562
workflowSchedulerConfigurationInfo.ClearLink = helper.Bool(v.(bool))
563563
}
564-
if v, ok := workflowSchedulerConfigurationMap["main_cyclic_config"]; ok {
564+
if v, ok := workflowSchedulerConfigurationMap["main_cyclic_config"]; ok && v.(string) != "" {
565565
workflowSchedulerConfigurationInfo.MainCyclicConfig = helper.String(v.(string))
566566
}
567-
if v, ok := workflowSchedulerConfigurationMap["subordinate_cyclic_config"]; ok {
567+
if v, ok := workflowSchedulerConfigurationMap["subordinate_cyclic_config"]; ok && v.(string) != "" {
568568
workflowSchedulerConfigurationInfo.SubordinateCyclicConfig = helper.String(v.(string))
569569
}
570570
if v, ok := workflowSchedulerConfigurationMap["execution_start_time"]; ok {
@@ -573,7 +573,7 @@ func resourceTencentCloudWedataWorkflowUpdate(d *schema.ResourceData, meta inter
573573
if v, ok := workflowSchedulerConfigurationMap["execution_end_time"]; ok {
574574
workflowSchedulerConfigurationInfo.ExecutionEndTime = helper.String(v.(string))
575575
}
576-
if v, ok := workflowSchedulerConfigurationMap["calendar_open"]; ok {
576+
if v, ok := workflowSchedulerConfigurationMap["calendar_open"]; ok && v.(string) != "" {
577577
workflowSchedulerConfigurationInfo.CalendarOpen = helper.String(v.(string))
578578
}
579579
if v, ok := workflowSchedulerConfigurationMap["calendar_id"]; ok {

‎tencentcloud/services/wedata/resource_tc_wedata_workflow_folder_test.go‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,18 @@ func TestAccTencentCloudWedataWorkflowFolderResource_basic(t *testing.T) {
1515
tcacctest.AccPreCheck(t)
1616
},
1717
Providers: tcacctest.AccProviders,
18-
Steps: []resource.TestStep{{
19-
Config: testAccWedataWorkflowFolder,
20-
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_wedata_workflow_folder.wedata_workflow_folder", "id")),
21-
}},
18+
Steps: []resource.TestStep{
19+
{
20+
Config: testAccWedataWorkflowFolder,
21+
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_wedata_workflow_folder.wedata_workflow_folder", "id")),
22+
},
23+
{
24+
Config: testAccWedataWorkflowFolderUpdate,
25+
Check: resource.ComposeTestCheckFunc(
26+
resource.TestCheckResourceAttr("tencentcloud_wedata_workflow_folder.wedata_workflow_folder", "folder_name", "tftest1"),
27+
),
28+
},
29+
},
2230
})
2331
}
2432

@@ -29,3 +37,11 @@ resource "tencentcloud_wedata_workflow_folder" "wedata_workflow_folder" {
2937
folder_name = "tftest"
3038
}
3139
`
40+
41+
const testAccWedataWorkflowFolderUpdate = `
42+
resource "tencentcloud_wedata_workflow_folder" "wedata_workflow_folder" {
43+
project_id = "2905622749543821312"
44+
parent_folder_path = "/"
45+
folder_name = "tftest1"
46+
}
47+
`

‎tencentcloud/services/wedata/resource_tc_wedata_workflow_test.go‎

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,23 @@ func TestAccTencentCloudWedataWorkflowResource_basic(t *testing.T) {
1515
tcacctest.AccPreCheck(t)
1616
},
1717
Providers: tcacctest.AccProviders,
18-
Steps: []resource.TestStep{{
19-
Config: testAccWedataWorkflow,
20-
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_wedata_workflow.wedata_workflow", "id")),
21-
}, {
22-
ResourceName: "tencentcloud_wedata_workflow.wedata_workflow",
23-
ImportState: true,
24-
ImportStateVerify: true,
25-
ImportStateVerifyIgnore: []string{"workflow_scheduler_configuration.0.start_time"},
26-
}},
18+
Steps: []resource.TestStep{
19+
{
20+
Config: testAccWedataWorkflow,
21+
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_wedata_workflow.wedata_workflow", "id")),
22+
},
23+
{
24+
Config: testAccWedataWorkflowUpdate,
25+
Check: resource.ComposeTestCheckFunc(
26+
resource.TestCheckResourceAttr("tencentcloud_wedata_workflow.wedata_workflow", "workflow_name", "test1"),
27+
),
28+
},
29+
{
30+
ResourceName: "tencentcloud_wedata_workflow.wedata_workflow",
31+
ImportState: true,
32+
ImportStateVerify: true,
33+
ImportStateVerifyIgnore: []string{"workflow_scheduler_configuration.0.start_time"},
34+
}},
2735
})
2836
}
2937

@@ -41,3 +49,18 @@ resource "tencentcloud_wedata_workflow" "wedata_workflow" {
4149
workflow_type = "cycle"
4250
}
4351
`
52+
53+
const testAccWedataWorkflowUpdate = `
54+
resource "tencentcloud_wedata_workflow_folder" "wedata_workflow_folder" {
55+
project_id = "2905622749543821312"
56+
parent_folder_path = "/"
57+
folder_name = "tftest"
58+
}
59+
60+
resource "tencentcloud_wedata_workflow" "wedata_workflow" {
61+
project_id = 2905622749543821312
62+
workflow_name = "test1"
63+
parent_folder_path = "${tencentcloud_wedata_workflow_folder.wedata_workflow_folder.parent_folder_path}${tencentcloud_wedata_workflow_folder.wedata_workflow_folder.folder_name}"
64+
workflow_type = "cycle"
65+
}
66+
`

0 commit comments

Comments
 (0)