Skip to content

Commit e3f0354

Browse files
SevenEarthSevenEarth
committed
add
1 parent 0a9ac85 commit e3f0354

File tree

5 files changed

+17
-32
lines changed

5 files changed

+17
-32
lines changed

‎tencentcloud/services/wedata/resource_tc_wedata_code_file.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ func resourceTencentCloudWedataCodeFileCreate(d *schema.ResourceData, meta inter
170170
}
171171

172172
if result == nil || result.Response == nil || result.Response.Data == nil {
173-
return tccommon.RetryError(fmt.Errorf("create wedata code file failed, Response is nil."))
173+
return resource.NonRetryableError(fmt.Errorf("create wedata code file failed, Response is nil."))
174174
}
175175

176176
response = result
@@ -381,14 +381,10 @@ func resourceTencentCloudWedataCodeFileDelete(d *schema.ResourceData, meta inter
381381
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
382382
}
383383

384-
if result == nil || result.Response == nil || result.Response.Data == nil {
384+
if result == nil || result.Response == nil || result.Response.Data == nil || result.Response.Data.Status == nil {
385385
return resource.NonRetryableError(fmt.Errorf("Delete wedata code file failed, Response is nil."))
386386
}
387387

388-
if result.Response.Data.Status == nil {
389-
return resource.NonRetryableError(fmt.Errorf("Delete wedata code file failed, Status is nil."))
390-
}
391-
392388
if !*result.Response.Data.Status {
393389
return resource.NonRetryableError(fmt.Errorf("Delete wedata code file failed, Status is false."))
394390
}

‎tencentcloud/services/wedata/resource_tc_wedata_code_folder.go‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func resourceTencentCloudWedataCodeFolderCreate(d *schema.ResourceData, meta int
107107
}
108108

109109
if result == nil || result.Response == nil || result.Response.Data == nil {
110-
return tccommon.RetryError(fmt.Errorf("create wedata code folder failed, Response is nil."))
110+
return resource.NonRetryableError(fmt.Errorf("create wedata code folder failed, Response is nil."))
111111
}
112112

113113
response = result
@@ -223,14 +223,10 @@ func resourceTencentCloudWedataCodeFolderUpdate(d *schema.ResourceData, meta int
223223
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
224224
}
225225

226-
if result == nil || result.Response == nil || result.Response.Data == nil {
226+
if result == nil || result.Response == nil || result.Response.Data == nil || result.Response.Data.Status == nil {
227227
return resource.NonRetryableError(fmt.Errorf("Update wedata code folder failed, Response is nil."))
228228
}
229229

230-
if result.Response.Data.Status == nil {
231-
return resource.NonRetryableError(fmt.Errorf("Update wedata code folder failed, Status is nil."))
232-
}
233-
234230
if !*result.Response.Data.Status {
235231
return resource.NonRetryableError(fmt.Errorf("Update wedata code folder failed, Status is false."))
236232
}
@@ -275,14 +271,10 @@ func resourceTencentCloudWedataCodeFolderDelete(d *schema.ResourceData, meta int
275271
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
276272
}
277273

278-
if result == nil || result.Response == nil || result.Response.Data == nil {
274+
if result == nil || result.Response == nil || result.Response.Data == nil || result.Response.Data.Status == nil {
279275
return resource.NonRetryableError(fmt.Errorf("Delete wedata code folder failed, Response is nil."))
280276
}
281277

282-
if result.Response.Data.Status == nil {
283-
return resource.NonRetryableError(fmt.Errorf("Delete wedata code folder failed, Status is nil."))
284-
}
285-
286278
if !*result.Response.Data.Status {
287279
return resource.NonRetryableError(fmt.Errorf("Delete wedata code folder failed, Status is false."))
288280
}

‎tencentcloud/services/wedata/resource_tc_wedata_sql_folder.go‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -230,14 +230,10 @@ func resourceTencentCloudWedataSqlFolderUpdate(d *schema.ResourceData, meta inte
230230
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
231231
}
232232

233-
if result == nil || result.Response == nil || result.Response.Data == nil {
233+
if result == nil || result.Response == nil || result.Response.Data == nil || result.Response.Data.Status == nil {
234234
return resource.NonRetryableError(fmt.Errorf("Update wedata sql folder failed, Response is nil."))
235235
}
236236

237-
if result.Response.Data.Status == nil {
238-
return resource.NonRetryableError(fmt.Errorf("Update wedata sql folder failed, Status is nil."))
239-
}
240-
241237
if !*result.Response.Data.Status {
242238
return resource.NonRetryableError(fmt.Errorf("Update wedata sql folder failed, Status is false."))
243239
}
@@ -282,14 +278,10 @@ func resourceTencentCloudWedataSqlFolderDelete(d *schema.ResourceData, meta inte
282278
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
283279
}
284280

285-
if result == nil || result.Response == nil || result.Response.Data == nil {
281+
if result == nil || result.Response == nil || result.Response.Data == nil || result.Response.Data.Status == nil {
286282
return resource.NonRetryableError(fmt.Errorf("Delete wedata sql folder failed, Response is nil."))
287283
}
288284

289-
if result.Response.Data.Status == nil {
290-
return resource.NonRetryableError(fmt.Errorf("Delete wedata sql folder failed, Status is nil."))
291-
}
292-
293285
if !*result.Response.Data.Status {
294286
return resource.NonRetryableError(fmt.Errorf("Delete wedata sql folder failed, Status is false."))
295287
}

‎tencentcloud/services/wedata/resource_tc_wedata_sql_script.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -416,14 +416,10 @@ func resourceTencentCloudWedataSqlScriptDelete(d *schema.ResourceData, meta inte
416416
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
417417
}
418418

419-
if result == nil || result.Response == nil || result.Response.Data == nil {
419+
if result == nil || result.Response == nil || result.Response.Data == nil || result.Response.Data.Status == nil {
420420
return resource.NonRetryableError(fmt.Errorf("Delete wedata sql script failed, Response is nil."))
421421
}
422422

423-
if result.Response.Data.Status == nil {
424-
return resource.NonRetryableError(fmt.Errorf("Delete wedata sql script failed, Status is nil."))
425-
}
426-
427423
if !*result.Response.Data.Status {
428424
return resource.NonRetryableError(fmt.Errorf("Delete wedata sql script failed, Status is false."))
429425
}

‎tencentcloud/services/wedata/resource_tc_wedata_stop_sql_script_run_operation.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package wedata
22

33
import (
44
"context"
5+
"fmt"
56
"log"
67
"strings"
78

@@ -66,6 +67,14 @@ func resourceTencentCloudWedataStopSqlScriptRunOperationCreate(d *schema.Resourc
6667
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
6768
}
6869

70+
if result == nil || result.Response == nil || result.Response.Data == nil || result.Response.Data.Status == nil {
71+
return resource.NonRetryableError(fmt.Errorf("Create wedata stop sql script run operation failed, Response is nil."))
72+
}
73+
74+
if !*result.Response.Data.Status {
75+
return resource.NonRetryableError(fmt.Errorf("Create wedata stop sql script run operation failed, Status is false."))
76+
}
77+
6978
return nil
7079
})
7180

0 commit comments

Comments
 (0)