Skip to content

Commit 55012c3

Browse files
sridhargksridhargk
authored
fix(transitgateway): update error toolchain changes for transit gateway (IBM-Cloud#6274)
1 parent c2bbded commit 55012c3

14 files changed

+57
-58
lines changed

‎ibm/service/transitgateway/data_source_ibm_tg_connection_prefix_filter.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package transitgateway
55

66
import (
7-
"fmt"
7+
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
88
"github.com/IBM/networking-go-sdk/transitgatewayapisv1"
99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1010
)
@@ -88,7 +88,7 @@ func dataSourceIBMTransitGatewayConnectionPrefixFilterRead(d *schema.ResourceDat
8888
getTransitGatewayConnectionPrefixFilterOptionsModel.SetFilterID(filterId)
8989
prefixFilter, response, err := client.GetTransitGatewayConnectionPrefixFilter(getTransitGatewayConnectionPrefixFilterOptionsModel)
9090
if err != nil {
91-
return fmt.Errorf("Error retrieving transit gateway connection prefix filter (%s): %s\n%s", filterId, err, response)
91+
return flex.FmtErrorf("Error retrieving transit gateway connection prefix filter (%s): %s\n%s", filterId, err, response)
9292
}
9393

9494
d.SetId(*prefixFilter.ID)

‎ibm/service/transitgateway/data_source_ibm_tg_connection_prefix_filters.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
package transitgateway
55

66
import (
7-
"fmt"
7+
"time"
8+
9+
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
810
"github.com/IBM/networking-go-sdk/transitgatewayapisv1"
911
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
10-
"time"
1112
)
1213

1314
const (
@@ -100,7 +101,7 @@ func dataSourceIBMTransitGatewayConnectionPrefixFiltersRead(d *schema.ResourceDa
100101
listTransitGatewayConnectionPrefixFiltersOptionsModel.SetID(connectionId)
101102
listPrefixFilters, response, err := client.ListTransitGatewayConnectionPrefixFilters(listTransitGatewayConnectionPrefixFiltersOptionsModel)
102103
if err != nil {
103-
return fmt.Errorf("Error while listing transit gateway connection prefix filters %s\n%s", err, response)
104+
return flex.FmtErrorf("Error while listing transit gateway connection prefix filters %s\n%s", err, response)
104105
}
105106

106107
prefixFiltersCollection := make([]map[string]interface{}, 0)

‎ibm/service/transitgateway/data_source_ibm_tg_gateway.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package transitgateway
55

66
import (
7-
"fmt"
87
"log"
98

109
"github.com/IBM/networking-go-sdk/transitgatewayapisv1"
@@ -236,7 +235,7 @@ func dataSourceIBMTransitGatewayRead(d *schema.ResourceData, meta interface{}) e
236235
listTransitGatewaysOptionsModel := &transitgatewayapisv1.ListTransitGatewaysOptions{}
237236
listTransitGateways, response, err := client.ListTransitGateways(listTransitGatewaysOptionsModel)
238237
if err != nil {
239-
return fmt.Errorf("[ERROR] Error while listing transit gateways %s\n%s", err, response)
238+
return flex.FmtErrorf("[ERROR] Error while listing transit gateways %s\n%s", err, response)
240239
}
241240

242241
gwName := d.Get(tgName).(string)
@@ -265,7 +264,7 @@ func dataSourceIBMTransitGatewayRead(d *schema.ResourceData, meta interface{}) e
265264
}
266265

267266
if !foundGateway {
268-
return fmt.Errorf("[ERROR] Couldn't find any gateway with the specified name: (%s)", gwName)
267+
return flex.FmtErrorf("[ERROR] Couldn't find any gateway with the specified name: (%s)", gwName)
269268
}
270269

271270
return dataSourceIBMTransitGatewayConnectionsRead(d, meta)
@@ -291,7 +290,7 @@ func dataSourceIBMTransitGatewayConnectionsRead(d *schema.ResourceData, meta int
291290
}
292291
listTGConnections, response, err := client.ListTransitGatewayConnections(listTransitGatewayConnectionsOptions)
293292
if err != nil {
294-
return fmt.Errorf("[ERROR] Error while listing transit gateway connections %s\n%s", err, response)
293+
return flex.FmtErrorf("[ERROR] Error while listing transit gateway connections %s\n%s", err, response)
295294
}
296295
for _, instance := range listTGConnections.Connections {
297296
tgConn := map[string]interface{}{}

‎ibm/service/transitgateway/data_source_ibm_tg_gateways.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
package transitgateway
55

66
import (
7-
"fmt"
87
"time"
98

9+
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
1010
"github.com/IBM/networking-go-sdk/transitgatewayapisv1"
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1212
)
@@ -75,7 +75,7 @@ func dataSourceIBMTransitGatewaysRead(d *schema.ResourceData, meta interface{})
7575
listTransitGatewaysOptionsModel := &transitgatewayapisv1.ListTransitGatewaysOptions{}
7676
listTransitGateways, response, err := client.ListTransitGateways(listTransitGatewaysOptionsModel)
7777
if err != nil {
78-
return fmt.Errorf("[ERROR] Error while listing transit gateways %s\n%s", err, response)
78+
return flex.FmtErrorf("[ERROR] Error while listing transit gateways %s\n%s", err, response)
7979
}
8080

8181
tgws := make([]map[string]interface{}, 0)

‎ibm/service/transitgateway/data_source_ibm_tg_location.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
package transitgateway
55

66
import (
7-
"fmt"
87
"time"
98

9+
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
1010
"github.com/IBM/networking-go-sdk/transitgatewayapisv1"
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1212
)
@@ -76,7 +76,7 @@ func dataSourceIBMTransitGatewaysLocationRead(d *schema.ResourceData, meta inter
7676
detailGatewayLocationOptionsModel.Name = &locName
7777
detailTransitGatewayLocation, response, err := client.GetGatewayLocation(detailGatewayLocationOptionsModel)
7878
if err != nil {
79-
return fmt.Errorf("[ERROR] Error while fetching transit gateway detailed location: %s\n%s", err, response)
79+
return flex.FmtErrorf("[ERROR] Error while fetching transit gateway detailed location: %s\n%s", err, response)
8080
}
8181

8282
if detailTransitGatewayLocation != nil {

‎ibm/service/transitgateway/data_source_ibm_tg_locations.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
package transitgateway
55

66
import (
7-
"fmt"
87
"time"
98

9+
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
1010
"github.com/IBM/networking-go-sdk/transitgatewayapisv1"
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1212
)
@@ -61,7 +61,7 @@ func dataSourceIBMTransitGatewaysLocationsRead(d *schema.ResourceData, meta inte
6161
listTransitGatewayLocationsOptionsModel := &transitgatewayapisv1.ListGatewayLocationsOptions{}
6262
listTransitGatewayLocations, response, err := client.ListGatewayLocations(listTransitGatewayLocationsOptionsModel)
6363
if err != nil {
64-
return fmt.Errorf("[ERROR] Error while fetching transit gateways locations: %s\n%s", err, response)
64+
return flex.FmtErrorf("[ERROR] Error while fetching transit gateways locations: %s\n%s", err, response)
6565
}
6666

6767
tgLocationsCol := make([]map[string]interface{}, 0)

‎ibm/service/transitgateway/data_source_ibm_tg_route_report.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package transitgateway
55

66
import (
7-
"fmt"
7+
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
88
"github.com/IBM/networking-go-sdk/transitgatewayapisv1"
99
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1010
)
@@ -144,7 +144,7 @@ func dataSourceIBMTransitGatewayRouteReportRead(d *schema.ResourceData, meta int
144144
getTransitGatewayRouteReportOptionsModel.SetID(routeReportId)
145145
routeReport, response, err := client.GetTransitGatewayRouteReport(getTransitGatewayRouteReportOptionsModel)
146146
if err != nil {
147-
return fmt.Errorf("Error while retrieving transit gateway route report %s\n%s", err, response)
147+
return flex.FmtErrorf("Error while retrieving transit gateway route report %s\n%s", err, response)
148148
}
149149

150150
d.Set(tgRouteReport, routeReport.ID)

‎ibm/service/transitgateway/data_source_ibm_tg_route_reports.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
package transitgateway
55

66
import (
7-
"fmt"
87
"time"
98

9+
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
1010
"github.com/IBM/networking-go-sdk/transitgatewayapisv1"
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1212
)
@@ -168,7 +168,7 @@ func dataSourceIBMTransitGatewayRouteReportsRead(d *schema.ResourceData, meta in
168168
listTransitGatewayRouteReportsOptionsModel.SetTransitGatewayID(gatewayId)
169169
listTransitGatewayRouteReports, response, err := client.ListTransitGatewayRouteReports(listTransitGatewayRouteReportsOptionsModel)
170170
if err != nil {
171-
return fmt.Errorf("Error while listing transit gateway route reports %s\n%s", err, response)
171+
return flex.FmtErrorf("Error while listing transit gateway route reports %s\n%s", err, response)
172172
}
173173

174174
reports := make([]map[string]interface{}, 0)

‎ibm/service/transitgateway/resource_ibm_tg_gateway.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package transitgateway
55

66
import (
77
"context"
8-
"fmt"
98
"log"
109
"os"
1110
"time"
@@ -255,7 +254,7 @@ func isTransitGatewayRefreshFunc(client *transitgatewayapisv1.TransitGatewayApis
255254
}
256255
transitGateway, response, err := client.GetTransitGateway(gettgwoptions)
257256
if err != nil {
258-
return nil, "", fmt.Errorf("[ERROR] Error Getting Transit Gateway: %s\n%s", err, response)
257+
return nil, "", flex.FmtErrorf("[ERROR] Error Getting Transit Gateway: %s\n%s", err, response)
259258
}
260259

261260
if *transitGateway.Status == "available" || *transitGateway.Status == "failed" {
@@ -387,7 +386,7 @@ func resourceIBMTransitGatewayDelete(d *schema.ResourceData, meta interface{}) e
387386
if response != nil && response.StatusCode == 404 {
388387
return nil
389388
}
390-
return fmt.Errorf("[ERROR] Error deleting Transit Gateway (%s): %s\n%s", ID, err, response)
389+
return flex.FmtErrorf("[ERROR] Error deleting Transit Gateway (%s): %s\n%s", ID, err, response)
391390
}
392391
_, err = isWaitForTransitGatewayDeleted(client, ID, d.Timeout(schema.TimeoutDelete))
393392
if err != nil {
@@ -423,7 +422,7 @@ func isTransitGatewayDeleteRefreshFunc(client *transitgatewayapisv1.TransitGatew
423422
if response != nil && response.StatusCode == 404 {
424423
return transitGateway, isTransitGatewayDeleted, nil
425424
}
426-
return nil, "", fmt.Errorf("[ERROR] Error Getting Transit Gateway: %s\n%s", err, response)
425+
return nil, "", flex.FmtErrorf("[ERROR] Error Getting Transit Gateway: %s\n%s", err, response)
427426
}
428427
return transitGateway, isTransitGatewayDeleting, err
429428
}
@@ -448,7 +447,7 @@ func resourceIBMTransitGatewayExists(d *schema.ResourceData, meta interface{}) (
448447
d.SetId("")
449448
return false, nil
450449
}
451-
return false, fmt.Errorf("[ERROR] Error Getting Transit Gateway: %s\n%s", err, response)
450+
return false, flex.FmtErrorf("[ERROR] Error Getting Transit Gateway: %s\n%s", err, response)
452451
}
453452

454453
return true, nil

‎ibm/service/transitgateway/resource_ibm_tg_gateway_connection.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ func resourceIBMTransitGatewayConnectionCreate(d *schema.ResourceData, meta inte
360360

361361
if _, ok := d.GetOk(tgDefaultPrefixFilter); ok {
362362
if "redundant_gre" == networkType {
363-
err = fmt.Errorf("[ERROR] Error default_prefix_filter is not allowed for connection type %s,", networkType)
363+
err = flex.FmtErrorf("[ERROR] Error default_prefix_filter is not allowed for connection type %s,", networkType)
364364
log.Printf("[ERROR] Error default_prefix_filter is not allowed for connection type %s ", networkType)
365365
return err
366366
}
@@ -411,7 +411,7 @@ func resourceIBMTransitGatewayConnectionCreate(d *schema.ResourceData, meta inte
411411

412412
tgConnections, response, err := client.CreateTransitGatewayConnection(createTransitGatewayConnectionOptions)
413413
if err != nil {
414-
return fmt.Errorf("[ERROR] Create Transit Gateway connection err %s\n%s", err, response)
414+
return flex.FmtErrorf("[ERROR] Create Transit Gateway connection err %s\n%s", err, response)
415415
}
416416

417417
d.SetId(fmt.Sprintf("%s/%s", gatewayId, *tgConnections.ID))
@@ -447,7 +447,7 @@ func isTransitGatewayConnectionRefreshFunc(client *transitgatewayapisv1.TransitG
447447

448448
parts, err := flex.IdParts(id)
449449
if err != nil {
450-
return nil, "", fmt.Errorf("[ERROR] Error Getting Transit Gateway connection: %s", err)
450+
return nil, "", flex.FmtErrorf("[ERROR] Error Getting Transit Gateway connection: %s", err)
451451
}
452452

453453
gatewayId := parts[0]
@@ -457,7 +457,7 @@ func isTransitGatewayConnectionRefreshFunc(client *transitgatewayapisv1.TransitG
457457
getTransitGatewayConnectionOptions.SetID(ID)
458458
tgConnection, response, err := client.GetTransitGatewayConnection(getTransitGatewayConnectionOptions)
459459
if err != nil {
460-
return nil, "", fmt.Errorf("[ERROR] Error Getting Transit Gateway Connection (%s): %s\n%s", ID, err, response)
460+
return nil, "", flex.FmtErrorf("[ERROR] Error Getting Transit Gateway Connection (%s): %s\n%s", ID, err, response)
461461
}
462462
if *tgConnection.Status == "attached" || *tgConnection.Status == "failed" {
463463
return tgConnection, isTransitGatewayConnectionAttached, nil
@@ -489,7 +489,7 @@ func resourceIBMTransitGatewayConnectionRead(d *schema.ResourceData, meta interf
489489
d.SetId("")
490490
return nil
491491
}
492-
return fmt.Errorf("[ERROR] Error Getting Transit Gateway Connection (%s): %s\n%s", ID, err, response)
492+
return flex.FmtErrorf("[ERROR] Error Getting Transit Gateway Connection (%s): %s\n%s", ID, err, response)
493493
}
494494

495495
if instance.Name != nil {
@@ -528,7 +528,7 @@ func resourceIBMTransitGatewayConnectionRead(d *schema.ResourceData, meta interf
528528
}
529529
tgw, response, err := client.GetTransitGateway(getTransitGatewayOptions)
530530
if err != nil {
531-
return fmt.Errorf("[ERROR] Error Getting Transit Gateway : %s\n%s", err, response)
531+
return flex.FmtErrorf("[ERROR] Error Getting Transit Gateway : %s\n%s", err, response)
532532
}
533533
d.Set(flex.RelatedCRN, *tgw.Crn)
534534

@@ -603,7 +603,7 @@ func resourceIBMTransitGatewayConnectionUpdate(d *schema.ResourceData, meta inte
603603

604604
_, response, err := client.GetTransitGatewayConnection(getTransitGatewayConnectionOptions)
605605
if err != nil {
606-
return fmt.Errorf("[ERROR] Error Getting Transit Gateway Connection: %s\n%s", err, response)
606+
return flex.FmtErrorf("[ERROR] Error Getting Transit Gateway Connection: %s\n%s", err, response)
607607
}
608608

609609
updateTransitGatewayConnectionOptions := &transitgatewayapisv1.UpdateTransitGatewayConnectionOptions{}
@@ -624,7 +624,7 @@ func resourceIBMTransitGatewayConnectionUpdate(d *schema.ResourceData, meta inte
624624

625625
_, response, err = client.UpdateTransitGatewayConnection(updateTransitGatewayConnectionOptions)
626626
if err != nil {
627-
return fmt.Errorf("[ERROR] Error in Update Transit Gateway Connection : %s\n%s", err, response)
627+
return flex.FmtErrorf("[ERROR] Error in Update Transit Gateway Connection : %s\n%s", err, response)
628628
}
629629

630630
return resourceIBMTransitGatewayConnectionRead(d, meta)
@@ -653,7 +653,7 @@ func resourceIBMTransitGatewayConnectionDelete(d *schema.ResourceData, meta inte
653653
if response != nil && response.StatusCode == 404 {
654654
return nil
655655
}
656-
return fmt.Errorf("[ERROR] Error deleting Transit Gateway Connection(%s): %s\n%s", ID, err, response)
656+
return flex.FmtErrorf("[ERROR] Error deleting Transit Gateway Connection(%s): %s\n%s", ID, err, response)
657657
}
658658
_, err = isWaitForTransitGatewayConnectionDeleted(client, d.Id(), d.Timeout(schema.TimeoutCreate))
659659

@@ -685,7 +685,7 @@ func isTransitGatewayConnectionDeleteRefreshFunc(client *transitgatewayapisv1.Tr
685685
log.Printf("[DEBUG] tg gateway connection delete function here")
686686
parts, err := flex.IdParts(id)
687687
if err != nil {
688-
return nil, "", fmt.Errorf("[ERROR] Error Getting Transit Gateway connection: %s", err)
688+
return nil, "", flex.FmtErrorf("[ERROR] Error Getting Transit Gateway connection: %s", err)
689689

690690
}
691691

@@ -702,7 +702,7 @@ func isTransitGatewayConnectionDeleteRefreshFunc(client *transitgatewayapisv1.Tr
702702
return tgConnection, isTransitGatewayConnectionDeleted, nil
703703
}
704704

705-
return nil, "", fmt.Errorf("[ERROR] Error Getting Transit Gateway Connection (%s): %s\n%s", ID, err, response)
705+
return nil, "", flex.FmtErrorf("[ERROR] Error Getting Transit Gateway Connection (%s): %s\n%s", ID, err, response)
706706
}
707707
return tgConnection, isTransitGatewayConnectionDeleting, err
708708
}
@@ -717,7 +717,7 @@ func resourceIBMTransitGatewayConnectionExists(d *schema.ResourceData, meta inte
717717
return false, err
718718
}
719719
if len(parts) < 2 {
720-
return false, fmt.Errorf("[ERROR] Incorrect ID %s: Id should be a combination of gatewayID/ConnectionID", d.Id())
720+
return false, flex.FmtErrorf("[ERROR] Incorrect ID %s: Id should be a combination of gatewayID/ConnectionID", d.Id())
721721
}
722722
gatewayId := parts[0]
723723
ID := parts[1]
@@ -732,7 +732,7 @@ func resourceIBMTransitGatewayConnectionExists(d *schema.ResourceData, meta inte
732732
d.SetId("")
733733
return false, nil
734734
}
735-
return false, fmt.Errorf("[ERROR] Error Getting Transit Gateway Connection: %s\n%s", err, response)
735+
return false, flex.FmtErrorf("[ERROR] Error Getting Transit Gateway Connection: %s\n%s", err, response)
736736
}
737737

738738
return true, nil

0 commit comments

Comments
 (0)