Skip to content

Commit e6ddea3

Browse files
deepaksibmdeepaksibm
authored
chore(error-toolchain): Add Error tool chain support for PPSG resources and data sources (IBM-Cloud#6176)
* chore(error-toolchain): Add Error tool chain support for PPSG resources and data sources * additional data source changes
1 parent 84c3f55 commit e6ddea3

10 files changed

+193
-136
lines changed

‎ibm/service/vpc/data_source_ibm_is_private_path_service_gateway.go‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,9 @@ func DataSourceIBMIsPrivatePathServiceGateway() *schema.Resource {
247247
func dataSourceIBMIsPrivatePathServiceGatewayRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
248248
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
249249
if err != nil {
250-
return diag.FromErr(err)
250+
tfErr := flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_private_path_service_gateway", "read", "initialize-client")
251+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
252+
return tfErr.GetDiag()
251253
}
252254

253255
var privatePathServiceGateway *vpcv1.PrivatePathServiceGateway
@@ -259,8 +261,9 @@ func dataSourceIBMIsPrivatePathServiceGatewayRead(context context.Context, d *sc
259261

260262
ppsg, response, err := vpcClient.GetPrivatePathServiceGatewayWithContext(context, getPrivatePathServiceGatewayOptions)
261263
if err != nil {
262-
log.Printf("[DEBUG] GetPrivatePathServiceGatewayWithContext failed %s\n%s", err, response)
263-
return diag.FromErr(fmt.Errorf("GetPrivatePathServiceGatewayWithContext failed %s\n%s", err, response))
264+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error getting PPSG: %s\n%s", err.Error(), response), "(Data) ibm_is_private_path_service_gateway", "read")
265+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
266+
return tfErr.GetDiag()
264267
}
265268
privatePathServiceGateway = ppsg
266269
} else {
@@ -270,8 +273,9 @@ func dataSourceIBMIsPrivatePathServiceGatewayRead(context context.Context, d *sc
270273

271274
privatePathServiceGatewayCollection, response, err := vpcClient.ListPrivatePathServiceGatewaysWithContext(context, listPrivatePathServiceGatewaysOptions)
272275
if err != nil {
273-
log.Printf("[DEBUG] ListPrivatePathServiceGatewaysWithContext failed %s\n%s", err, response)
274-
return diag.FromErr(fmt.Errorf("ListPrivatePathServiceGatewaysWithContext failed %s\n%s", err, response))
276+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error listing PPSGs: %s\n%s", err.Error(), response), "(Data) ibm_is_private_path_service_gateway", "read")
277+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
278+
return tfErr.GetDiag()
275279
}
276280
if privatePathServiceGatewayCollection.PrivatePathServiceGateways != nil {
277281
for _, ppsgItem := range privatePathServiceGatewayCollection.PrivatePathServiceGateways {
@@ -284,64 +288,59 @@ func dataSourceIBMIsPrivatePathServiceGatewayRead(context context.Context, d *sc
284288
d.SetId(*privatePathServiceGateway.ID)
285289

286290
if err = d.Set("created_at", flex.DateTimeToString(privatePathServiceGateway.CreatedAt)); err != nil {
287-
return diag.FromErr(fmt.Errorf("Error setting created_at: %s", err))
291+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting created_at: %s", err), "(Data) ibm_is_private_path_service_gateway", "read", "set-created_at").GetDiag()
288292
}
289293

290294
if err = d.Set("crn", privatePathServiceGateway.CRN); err != nil {
291-
return diag.FromErr(fmt.Errorf("Error setting crn: %s", err))
295+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting crn: %s", err), "(Data) ibm_is_private_path_service_gateway", "read", "set-crn").GetDiag()
292296
}
293297

294298
if err = d.Set("default_access_policy", privatePathServiceGateway.DefaultAccessPolicy); err != nil {
295-
return diag.FromErr(fmt.Errorf("Error setting default_access_policy: %s", err))
299+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting default_access_policy: %s", err), "(Data) ibm_is_private_path_service_gateway", "read", "set-default_access_policy").GetDiag()
296300
}
297301

298302
if err = d.Set("endpoint_gateway_count", flex.IntValue(privatePathServiceGateway.EndpointGatewayCount)); err != nil {
299-
return diag.FromErr(fmt.Errorf("Error setting endpoint_gateway_count: %s", err))
303+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting endpoint_gateway_count: %s", err), "(Data) ibm_is_private_path_service_gateway", "read", "set-endpoint_gateway_count").GetDiag()
300304
}
301305
if err = d.Set("endpoint_gateway_binding_auto_delete", privatePathServiceGateway.EndpointGatewayBindingAutoDelete); err != nil {
302-
return diag.FromErr(fmt.Errorf("Error setting endpoint_gateway_binding_auto_delete: %s", err))
306+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting endpoint_gateway_binding_auto_delete: %s", err), "(Data) ibm_is_private_path_service_gateway", "read", "set-endpoint_gateway_binding_auto_delete").GetDiag()
303307
}
304308
if err = d.Set("endpoint_gateway_binding_auto_delete_timeout", privatePathServiceGateway.EndpointGatewayBindingAutoDeleteTimeout); err != nil {
305-
return diag.FromErr(fmt.Errorf("Error setting endpoint_gateway_binding_auto_delete_timeout: %s", err))
309+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting endpoint_gateway_binding_auto_delete_timeout: %s", err), "(Data) ibm_is_private_path_service_gateway", "read", "set-endpoint_gateway_binding_auto_delete_timeout").GetDiag()
306310
}
307311
if err = d.Set("href", privatePathServiceGateway.Href); err != nil {
308-
return diag.FromErr(fmt.Errorf("Error setting href: %s", err))
312+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting href: %s", err), "(Data) ibm_is_private_path_service_gateway", "read", "set-href").GetDiag()
309313
}
310314

311315
if err = d.Set("lifecycle_state", privatePathServiceGateway.LifecycleState); err != nil {
312-
return diag.FromErr(fmt.Errorf("Error setting lifecycle_state: %s", err))
316+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting lifecycle_state: %s", err), "(Data) ibm_is_private_path_service_gateway", "read", "set-lifecycle_state").GetDiag()
313317
}
314318

315319
loadBalancer := []map[string]interface{}{}
316320
if privatePathServiceGateway.LoadBalancer != nil {
317321
modelMap, err := dataSourceIBMIsPrivatePathServiceGatewayLoadBalancerReferenceToMap(privatePathServiceGateway.LoadBalancer)
318322
if err != nil {
319-
return diag.FromErr(err)
323+
return flex.TerraformErrorf(err, fmt.Sprintf("dataSourceIBMIsPrivatePathServiceGatewayLoadBalancerReferenceToMap failed: %s", err.Error()), "(Data) ibm_is_private_path_service_gateway", "read").GetDiag()
324+
320325
}
321326
loadBalancer = append(loadBalancer, modelMap)
322327
}
323328
if err = d.Set("load_balancer", loadBalancer); err != nil {
324-
return diag.FromErr(fmt.Errorf("Error setting load_balancer %s", err))
329+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting load_balancer: %s", err), "(Data) ibm_is_private_path_service_gateway", "read", "set-load_balancer").GetDiag()
325330
}
326331

327332
if err = d.Set("name", privatePathServiceGateway.Name); err != nil {
328-
return diag.FromErr(fmt.Errorf("Error setting name: %s", err))
333+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting name: %s", err), "(Data) ibm_is_private_path_service_gateway", "read", "set-name").GetDiag()
329334
}
330335

331336
if err = d.Set("published", privatePathServiceGateway.Published); err != nil {
332-
return diag.FromErr(fmt.Errorf("Error setting published: %s", err))
337+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting published: %s", err), "(Data) ibm_is_private_path_service_gateway", "read", "set-published").GetDiag()
333338
}
334339

335340
region := []map[string]interface{}{}
336-
// if privatePathServiceGateway.Remote != nil && privatePathServiceGateway.Remote.Region != nil {
337-
// modelMap, err := dataSourceIBMIsPrivatePathServiceGatewayRegionReferenceToMap(privatePathServiceGateway.Remote.Region)
338-
// if err != nil {
339-
// return diag.FromErr(err)
340-
// }
341-
// region = append(region, modelMap)
342-
// }
341+
343342
if err = d.Set("region", region); err != nil {
344-
return diag.FromErr(fmt.Errorf("Error setting region %s", err))
343+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting region: %s", err), "(Data) ibm_is_private_path_service_gateway", "read", "set-region").GetDiag()
345344
}
346345

347346
resourceGroup := []map[string]interface{}{}
@@ -353,14 +352,14 @@ func dataSourceIBMIsPrivatePathServiceGatewayRead(context context.Context, d *sc
353352
resourceGroup = append(resourceGroup, modelMap)
354353
}
355354
if err = d.Set("resource_group", resourceGroup); err != nil {
356-
return diag.FromErr(fmt.Errorf("Error setting resource_group %s", err))
355+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting resource_group: %s", err), "(Data) ibm_is_private_path_service_gateway", "read", "set-resource_group").GetDiag()
357356
}
358357

359358
if err = d.Set("resource_type", privatePathServiceGateway.ResourceType); err != nil {
360-
return diag.FromErr(fmt.Errorf("Error setting resource_type: %s", err))
359+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting resource_type: %s", err), "(Data) ibm_is_private_path_service_gateway", "read", "set-resource_type").GetDiag()
361360
}
362361
if err = d.Set("service_endpoints", privatePathServiceGateway.ServiceEndpoints); err != nil {
363-
return diag.FromErr(fmt.Errorf("Error setting service_endpoints: %s", err))
362+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting service_endpoints: %s", err), "(Data) ibm_is_private_path_service_gateway", "read", "set-service_endpoints").GetDiag()
364363
}
365364
vpc := []map[string]interface{}{}
366365
if privatePathServiceGateway.VPC != nil {
@@ -371,11 +370,11 @@ func dataSourceIBMIsPrivatePathServiceGatewayRead(context context.Context, d *sc
371370
vpc = append(vpc, modelMap)
372371
}
373372
if err = d.Set("vpc", vpc); err != nil {
374-
return diag.FromErr(fmt.Errorf("Error setting vpc %s", err))
373+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting vpc: %s", err), "(Data) ibm_is_private_path_service_gateway", "read", "set-vpc").GetDiag()
375374
}
376375

377376
if err = d.Set("zonal_affinity", privatePathServiceGateway.ZonalAffinity); err != nil {
378-
return diag.FromErr(fmt.Errorf("Error setting zonal_affinity: %s", err))
377+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting zonal_affinity: %s", err), "(Data) ibm_is_private_path_service_gateway", "read", "set-zonal_affinity").GetDiag()
379378
}
380379

381380
return nil

‎ibm/service/vpc/data_source_ibm_is_private_path_service_gateway_account_policies.go‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ func DataSourceIBMIsPrivatePathServiceGatewayAccountPolicies() *schema.Resource
9595
func dataSourceIBMIsPrivatePathServiceGatewayAccountPoliciesRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
9696
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
9797
if err != nil {
98-
return diag.FromErr(err)
98+
tfErr := flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_private_path_service_gateway_account_policies", "read", "initialize-client")
99+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
100+
return tfErr.GetDiag()
99101
}
100102

101103
ppsgId := d.Get("private_path_service_gateway").(string)
@@ -109,13 +111,16 @@ func dataSourceIBMIsPrivatePathServiceGatewayAccountPoliciesRead(context context
109111
var pager *vpcv1.PrivatePathServiceGatewayAccountPoliciesPager
110112
pager, err = vpcClient.NewPrivatePathServiceGatewayAccountPoliciesPager(listPrivatePathServiceGatewayAccountPoliciesOptions)
111113
if err != nil {
112-
return diag.FromErr(err)
114+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error listing PPSGs: %s", err.Error()), "(Data) ibm_is_private_path_service_gateway_account_policies", "read")
115+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
116+
return tfErr.GetDiag()
113117
}
114118

115119
allItems, err := pager.GetAll()
116120
if err != nil {
117-
log.Printf("[DEBUG] PrivatePathServiceGatewayAccountPoliciesPager.GetAll() failed %s", err)
118-
return diag.FromErr(fmt.Errorf("PrivatePathServiceGatewayAccountPoliciesPager.GetAll() failed %s", err))
121+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error listing PPSGs PrivatePathServiceGatewayAccountPoliciesPager: %s", err.Error()), "(Data) ibm_is_private_path_service_gateway_account_policies", "read")
122+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
123+
return tfErr.GetDiag()
119124
}
120125

121126
d.SetId(ppsgId)
@@ -130,7 +135,7 @@ func dataSourceIBMIsPrivatePathServiceGatewayAccountPoliciesRead(context context
130135
}
131136

132137
if err = d.Set("account_policies", mapSlice); err != nil {
133-
return diag.FromErr(fmt.Errorf("Error setting account_policies %s", err))
138+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting account_policies: %s", err), "(Data) ibm_is_private_path_service_gateway_account_policies", "read", "set-account_policies").GetDiag()
134139
}
135140

136141
return nil

‎ibm/service/vpc/data_source_ibm_is_private_path_service_gateway_account_policy.go‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ func DataSourceIBMIsPrivatePathServiceGatewayAccountPolicy() *schema.Resource {
8181
func dataSourceIBMIsPrivatePathServiceGatewayAccountPolicyRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
8282
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
8383
if err != nil {
84-
return diag.FromErr(err)
84+
tfErr := flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_private_path_service_gateway_account_policy", "read", "initialize-client")
85+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
86+
return tfErr.GetDiag()
8587
}
8688

8789
getPrivatePathServiceGatewayAccountPolicyOptions := &vpcv1.GetPrivatePathServiceGatewayAccountPolicyOptions{}
@@ -91,14 +93,15 @@ func dataSourceIBMIsPrivatePathServiceGatewayAccountPolicyRead(context context.C
9193

9294
privatePathServiceGatewayAccountPolicy, response, err := vpcClient.GetPrivatePathServiceGatewayAccountPolicyWithContext(context, getPrivatePathServiceGatewayAccountPolicyOptions)
9395
if err != nil {
94-
log.Printf("[DEBUG] GetPrivatePathServiceGatewayAccountPolicyWithContext failed %s\n%s", err, response)
95-
return diag.FromErr(fmt.Errorf("GetPrivatePathServiceGatewayAccountPolicyWithContext failed %s\n%s", err, response))
96+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetPrivatePathServiceGatewayAccountPolicyWithContext failed: %s\n%s", err.Error(), response), "(Data) ibm_is_private_path_service_gateway_account_policy", "read")
97+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
98+
return tfErr.GetDiag()
9699
}
97100

98101
d.SetId(fmt.Sprintf("%s/%s", *getPrivatePathServiceGatewayAccountPolicyOptions.PrivatePathServiceGatewayID, *getPrivatePathServiceGatewayAccountPolicyOptions.ID))
99102

100103
if err = d.Set("access_policy", privatePathServiceGatewayAccountPolicy.AccessPolicy); err != nil {
101-
return diag.FromErr(fmt.Errorf("Error setting access_policy: %s", err))
104+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting access_policy: %s", err), "(Data) ibm_is_private_path_service_gateway_account_policy", "read", "set-access_policy").GetDiag()
102105
}
103106

104107
account := []map[string]interface{}{}
@@ -110,19 +113,19 @@ func dataSourceIBMIsPrivatePathServiceGatewayAccountPolicyRead(context context.C
110113
account = append(account, modelMap)
111114
}
112115
if err = d.Set("account", account); err != nil {
113-
return diag.FromErr(fmt.Errorf("Error setting account %s", err))
116+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting account: %s", err), "(Data) ibm_is_private_path_service_gateway_account_policy", "read", "set-account").GetDiag()
114117
}
115118

116119
if err = d.Set("created_at", flex.DateTimeToString(privatePathServiceGatewayAccountPolicy.CreatedAt)); err != nil {
117-
return diag.FromErr(fmt.Errorf("Error setting created_at: %s", err))
120+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting created_at: %s", err), "(Data) ibm_is_private_path_service_gateway_account_policy", "read", "set-created_at").GetDiag()
118121
}
119122

120123
if err = d.Set("href", privatePathServiceGatewayAccountPolicy.Href); err != nil {
121-
return diag.FromErr(fmt.Errorf("Error setting href: %s", err))
124+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting href: %s", err), "(Data) ibm_is_private_path_service_gateway_account_policy", "read", "set-href").GetDiag()
122125
}
123126

124127
if err = d.Set("resource_type", privatePathServiceGatewayAccountPolicy.ResourceType); err != nil {
125-
return diag.FromErr(fmt.Errorf("Error setting resource_type: %s", err))
128+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting resource_type: %s", err), "(Data) ibm_is_private_path_service_gateway_account_policy", "read", "set-resource_type").GetDiag()
126129
}
127130

128131
// if err = d.Set("updated_at", flex.DateTimeToString(privatePathServiceGatewayAccountPolicy.UpdatedAt)); err != nil {

0 commit comments

Comments
 (0)