Skip to content

Commit 3868782

Browse files
SevenEarthSevenEarth
committed
add
1 parent 28fe809 commit 3868782

File tree

5 files changed

+72
-12
lines changed

5 files changed

+72
-12
lines changed

‎tencentcloud/services/wedata/resource_tc_wedata_data_source.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ func resourceTencentCloudWedataDataSourceCreate(d *schema.ResourceData, meta int
341341
}
342342

343343
if result == nil || result.Response == nil || result.Response.Data == nil {
344-
return tccommon.RetryError(fmt.Errorf("Create wedata data source failed, Response is nil."))
344+
return resource.NonRetryableError(fmt.Errorf("Create wedata data source failed, Response is nil."))
345345
}
346346

347347
response = result
@@ -353,6 +353,10 @@ func resourceTencentCloudWedataDataSourceCreate(d *schema.ResourceData, meta int
353353
return reqErr
354354
}
355355

356+
if response.Response.Data.Status == nil || !*response.Response.Data.Status {
357+
return fmt.Errorf("Create wedata data source failed, Status is false")
358+
}
359+
356360
if response.Response.Data.DataSourceId == nil {
357361
return fmt.Errorf("DataSourceId is nil.")
358362
}

‎tencentcloud/services/wedata/resource_tc_wedata_project.go‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ func resourceTencentCloudWedataProjectCreate(d *schema.ResourceData, meta interf
195195
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
196196
}
197197

198-
if result == nil || result.Response == nil {
199-
return tccommon.RetryError(fmt.Errorf("Create wedata project failed, Response is nil."))
198+
if result == nil || result.Response == nil || result.Response.Data == nil {
199+
return resource.NonRetryableError(fmt.Errorf("Create wedata project failed, Response is nil."))
200200
}
201201

202202
response = result
@@ -208,7 +208,7 @@ func resourceTencentCloudWedataProjectCreate(d *schema.ResourceData, meta interf
208208
return reqErr
209209
}
210210

211-
if response.Response.Data == nil && response.Response.Data.ProjectId == nil {
211+
if response.Response.Data.ProjectId == nil {
212212
return fmt.Errorf("ProjectId is nil.")
213213
}
214214

@@ -227,7 +227,15 @@ func resourceTencentCloudWedataProjectCreate(d *schema.ResourceData, meta interf
227227
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, disableReq.GetAction(), disableReq.ToJsonString(), result.ToJsonString())
228228
}
229229

230-
return nil
230+
if result == nil || result.Response == nil || result.Response.Data == nil {
231+
return resource.NonRetryableError(fmt.Errorf("Disable wedata project failed, Response is nil."))
232+
}
233+
234+
if result.Response.Data.Status != nil && *result.Response.Data.Status {
235+
return nil
236+
}
237+
238+
return resource.NonRetryableError(fmt.Errorf("Disable wedata project failed, Status is false."))
231239
})
232240

233241
if reqErr != nil {
@@ -342,7 +350,15 @@ func resourceTencentCloudWedataProjectUpdate(d *schema.ResourceData, meta interf
342350
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, enableReq.GetAction(), enableReq.ToJsonString(), result.ToJsonString())
343351
}
344352

345-
return nil
353+
if result == nil || result.Response == nil || result.Response.Data == nil {
354+
return resource.NonRetryableError(fmt.Errorf("Enable wedata project failed, Response is nil."))
355+
}
356+
357+
if result.Response.Data.Status != nil && *result.Response.Data.Status {
358+
return nil
359+
}
360+
361+
return resource.NonRetryableError(fmt.Errorf("Enable wedata project failed, Status is false."))
346362
})
347363

348364
if reqErr != nil {
@@ -360,7 +376,15 @@ func resourceTencentCloudWedataProjectUpdate(d *schema.ResourceData, meta interf
360376
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, disableReq.GetAction(), disableReq.ToJsonString(), result.ToJsonString())
361377
}
362378

363-
return nil
379+
if result == nil || result.Response == nil || result.Response.Data == nil {
380+
return resource.NonRetryableError(fmt.Errorf("Disable wedata project failed, Response is nil."))
381+
}
382+
383+
if result.Response.Data.Status != nil && *result.Response.Data.Status {
384+
return nil
385+
}
386+
387+
return resource.NonRetryableError(fmt.Errorf("Disable wedata project failed, Status is false."))
364388
})
365389

366390
if reqErr != nil {

‎tencentcloud/services/wedata/resource_tc_wedata_project_member.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,14 @@ func resourceTencentCloudWedataProjectMemberCreate(d *schema.ResourceData, meta
8888
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
8989
}
9090

91-
if result == nil || result.Response == nil {
91+
if result == nil || result.Response == nil || result.Response.Data == nil || result.Response.Data.Status == nil {
9292
return resource.NonRetryableError(fmt.Errorf("Create wedata project member failed, Response is nil."))
9393
}
9494

95+
if !*result.Response.Data.Status {
96+
return resource.NonRetryableError(fmt.Errorf("Create wedata project member failed, Status is false"))
97+
}
98+
9599
return nil
96100
})
97101

‎tencentcloud/services/wedata/resource_tc_wedata_resource_group.go‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,8 @@ func resourceTencentCloudWedataResourceGroupCreate(d *schema.ResourceData, meta
309309
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
310310
}
311311

312-
if result == nil || result.Response == nil || result.Response.Data == nil {
313-
return tccommon.RetryError(fmt.Errorf("Create wedata resource group failed, Response is nil."))
312+
if result == nil || result.Response == nil || result.Response.Data == nil || result.Response.Data.Status == nil {
313+
return resource.NonRetryableError(fmt.Errorf("Create wedata resource group failed, Response is nil."))
314314
}
315315

316316
response = result
@@ -322,7 +322,11 @@ func resourceTencentCloudWedataResourceGroupCreate(d *schema.ResourceData, meta
322322
return reqErr
323323
}
324324

325-
if response.Response.Data.ResourceGroupId == nil {
325+
if !*response.Response.Data.Status {
326+
return fmt.Errorf("Create wedata resource group failed, Status is false.")
327+
}
328+
329+
if response.Response.Data.ResourceGroupId == nil || *response.Response.Data.ResourceGroupId == "" {
326330
return fmt.Errorf("ResourceGroupId is nil.")
327331
}
328332

@@ -412,6 +416,14 @@ func resourceTencentCloudWedataResourceGroupUpdate(d *schema.ResourceData, meta
412416
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
413417
}
414418

419+
if result == nil || result.Response == nil || result.Response.Data == nil || result.Response.Data.Status == nil {
420+
return resource.NonRetryableError(fmt.Errorf("Update wedata resource group failed, Response is nil."))
421+
}
422+
423+
if !*result.Response.Data.Status {
424+
return resource.NonRetryableError(fmt.Errorf("Update wedata resource group failed, Status is false."))
425+
}
426+
415427
return nil
416428
})
417429

@@ -446,7 +458,7 @@ func resourceTencentCloudWedataResourceGroupDelete(d *schema.ResourceData, meta
446458
}
447459

448460
if result == nil || result.Response == nil || result.Response.Data == nil {
449-
return tccommon.RetryError(fmt.Errorf("Delete wedata resource group failed, Response is nil."))
461+
return resource.NonRetryableError(fmt.Errorf("Delete wedata resource group failed, Response is nil."))
450462
}
451463

452464
response = result

‎tencentcloud/services/wedata/resource_tc_wedata_resource_group_to_project_attachment.go‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,14 @@ func resourceTencentCloudWedataResourceGroupToProjectAttachmentCreate(d *schema.
7070
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
7171
}
7272

73+
if result == nil || result.Response == nil || result.Response.Data == nil || result.Response.Data.Status == nil {
74+
return resource.NonRetryableError(fmt.Errorf("Create wedata resource group to project attachment failed, Response is nil."))
75+
}
76+
77+
if !*result.Response.Data.Status {
78+
return resource.NonRetryableError(fmt.Errorf("Create wedata resource group to project attachment failed, Status is false."))
79+
}
80+
7381
return nil
7482
})
7583

@@ -149,6 +157,14 @@ func resourceTencentCloudWedataResourceGroupToProjectAttachmentDelete(d *schema.
149157
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
150158
}
151159

160+
if result == nil || result.Response == nil || result.Response.Data == nil || result.Response.Data.Status == nil {
161+
return resource.NonRetryableError(fmt.Errorf("Delete wedata resource group to project attachment failed, Response is nil."))
162+
}
163+
164+
if !*result.Response.Data.Status {
165+
return resource.NonRetryableError(fmt.Errorf("Delete wedata resource group to project attachment failed, Status is false."))
166+
}
167+
152168
return nil
153169
})
154170

0 commit comments

Comments
 (0)