Merge branch 'master' into it-template-source

uibm · uibm · commit 90f7c69bcf53 · 2025-07-17T12:32:05.000+05:30
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/IBM/configuration-aggregator-go-sdk v0.0.2
 	github.com/IBM/container-registry-go-sdk v1.1.0
 	github.com/IBM/continuous-delivery-go-sdk/v2 v2.0.2
-	github.com/IBM/event-notifications-go-admin-sdk v0.14.0
+	github.com/IBM/event-notifications-go-admin-sdk v0.15.0
 	github.com/IBM/eventstreams-go-sdk v1.4.0
 	github.com/IBM/go-sdk-core/v5 v5.20.1
 	github.com/IBM/ibm-backup-recovery-sdk-go v1.0.3
diff --git a/go.sum b/go.sum
@@ -116,8 +116,8 @@ github.com/IBM/container-registry-go-sdk v1.1.0 h1:sYyknIod8R4RJZQqAheiduP6wbSTp
 github.com/IBM/container-registry-go-sdk v1.1.0/go.mod h1:4TwsCnQtVfZ4Vkapy/KPvQBKFc3VOyUZYkwRU4FTPrs=
 github.com/IBM/continuous-delivery-go-sdk/v2 v2.0.2 h1:yCJJnSLNYkpF7v9n0tw8CpQbSy43E/NbFOopRf1PgoM=
 github.com/IBM/continuous-delivery-go-sdk/v2 v2.0.2/go.mod h1:2MajFr6C5H2jyj7qtjBxAPnZAjbPiK4CAJNk3fKNnPo=
-github.com/IBM/event-notifications-go-admin-sdk v0.14.0 h1:J6sUsEqZ5FVSLxaqrXOVGmqdPxCaHN9ujoRjXN2rdFQ=
-github.com/IBM/event-notifications-go-admin-sdk v0.14.0/go.mod h1:jhDfWFpQ7NhVWhgr2KSCIoWz32k0jur6Lde7LvvLODc=
+github.com/IBM/event-notifications-go-admin-sdk v0.15.0 h1:5rmEbZmGhJiS+WZOK+ABp83nXmlIG5nLL0b1dCswO1Y=
+github.com/IBM/event-notifications-go-admin-sdk v0.15.0/go.mod h1:9fG6k1gYRqiChZvmn1iRIjaKCXuDBCOlPH6xPJN+mMU=
 github.com/IBM/eventstreams-go-sdk v1.4.0 h1:yS/Ns29sBOe8W2tynQmz9HTKqQZ0ckse4Py5Oy/F2rM=
 github.com/IBM/eventstreams-go-sdk v1.4.0/go.mod h1:2tuAxaYLctfqfr5jvyqSrxxEQGMwYPm3yJGWSj85YVQ=
 github.com/IBM/go-sdk-core/v5 v5.0.0/go.mod h1:vyNdbFujJtdTj9HbihtvKwwS3k/GKSKpOx9ZIQ6MWDY=
diff --git a/ibm/service/eventnotification/data_source_ibm_en_destination_pagerduty_test.go b/ibm/service/eventnotification/data_source_ibm_en_destination_pagerduty_test.go
@@ -55,7 +55,6 @@ func testAccCheckIBMEnPagerDutyDestinationDataSourceConfigBasic(instanceName, na
 		config {
 			params {
 				routing_key  = "33220320pgdpgpewwp"
-                api_key = "dwvdouqufqwojji"
 			}
 		}
 	}
diff --git a/ibm/service/eventnotification/resource_ibm_en_destination_pagerduty.go b/ibm/service/eventnotification/resource_ibm_en_destination_pagerduty.go
@@ -68,7 +68,6 @@ func ResourceIBMEnPagerDutyDestination() *schema.Resource {
 										Type:        schema.TypeString,
 										Sensitive:   true,
 										Optional:    true,
-										Default:     "",
 										Description: "API Key for the PagerDuty account.",
 										Deprecated:  "The api_key parameter under config has  been deprecated and will be removed in future",
 									},
diff --git a/ibm/service/eventnotification/resource_ibm_en_destination_pagerduty_test.go b/ibm/service/eventnotification/resource_ibm_en_destination_pagerduty_test.go
@@ -76,7 +76,6 @@ func testAccCheckIBMEnPagerDutyDestinationConfig(instanceName, name, description
 		config {
 			params {
 				routing_key  = "33220320pgdpgpewwp"
-                api_key = "dwvdouqufqwojji"
 			}
 		}
 	}
diff --git a/ibm/service/eventnotification/resource_ibm_en_topic.go b/ibm/service/eventnotification/resource_ibm_en_topic.go
@@ -90,7 +90,7 @@ func ResourceIBMEnTopic() *schema.Resource {
 												},
 												"ends_at": {
 													Type:        schema.TypeString,
-													Required:    true,
+													Optional:    true,
 													Description: "event schedule end time.",
 												},
 												"expression": {
diff --git a/ibm/service/transitgateway/data_source_ibm_tg_connection_prefix_filter.go b/ibm/service/transitgateway/data_source_ibm_tg_connection_prefix_filter.go
@@ -4,7 +4,7 @@
 package transitgateway
 
 import (
-	"fmt"
+	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
 	"github.com/IBM/networking-go-sdk/transitgatewayapisv1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -88,7 +88,7 @@ func dataSourceIBMTransitGatewayConnectionPrefixFilterRead(d *schema.ResourceDat
 	getTransitGatewayConnectionPrefixFilterOptionsModel.SetFilterID(filterId)
 	prefixFilter, response, err := client.GetTransitGatewayConnectionPrefixFilter(getTransitGatewayConnectionPrefixFilterOptionsModel)
 	if err != nil {
-		return fmt.Errorf("Error retrieving transit gateway connection prefix filter (%s): %s\n%s", filterId, err, response)
+		return flex.FmtErrorf("Error retrieving transit gateway connection prefix filter (%s): %s\n%s", filterId, err, response)
 	}
 
 	d.SetId(*prefixFilter.ID)
diff --git a/ibm/service/transitgateway/data_source_ibm_tg_connection_prefix_filters.go b/ibm/service/transitgateway/data_source_ibm_tg_connection_prefix_filters.go
@@ -4,10 +4,11 @@
 package transitgateway
 
 import (
-	"fmt"
+	"time"
+
+	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
 	"github.com/IBM/networking-go-sdk/transitgatewayapisv1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"time"
 )
 
 const (
@@ -100,7 +101,7 @@ func dataSourceIBMTransitGatewayConnectionPrefixFiltersRead(d *schema.ResourceDa
 	listTransitGatewayConnectionPrefixFiltersOptionsModel.SetID(connectionId)
 	listPrefixFilters, response, err := client.ListTransitGatewayConnectionPrefixFilters(listTransitGatewayConnectionPrefixFiltersOptionsModel)
 	if err != nil {
-		return fmt.Errorf("Error while listing transit gateway connection prefix filters %s\n%s", err, response)
+		return flex.FmtErrorf("Error while listing transit gateway connection prefix filters %s\n%s", err, response)
 	}
 
 	prefixFiltersCollection := make([]map[string]interface{}, 0)
diff --git a/ibm/service/transitgateway/data_source_ibm_tg_gateway.go b/ibm/service/transitgateway/data_source_ibm_tg_gateway.go
@@ -4,7 +4,6 @@
 package transitgateway
 
 import (
-	"fmt"
 	"log"
 
 	"github.com/IBM/networking-go-sdk/transitgatewayapisv1"
@@ -236,7 +235,7 @@ func dataSourceIBMTransitGatewayRead(d *schema.ResourceData, meta interface{}) e
 	listTransitGatewaysOptionsModel := &transitgatewayapisv1.ListTransitGatewaysOptions{}
 	listTransitGateways, response, err := client.ListTransitGateways(listTransitGatewaysOptionsModel)
 	if err != nil {
-		return fmt.Errorf("[ERROR] Error while listing transit gateways %s\n%s", err, response)
+		return flex.FmtErrorf("[ERROR] Error while listing transit gateways %s\n%s", err, response)
 	}
 
 	gwName := d.Get(tgName).(string)
@@ -265,7 +264,7 @@ func dataSourceIBMTransitGatewayRead(d *schema.ResourceData, meta interface{}) e
 	}
 
 	if !foundGateway {
-		return fmt.Errorf("[ERROR] Couldn't find any gateway with the specified name: (%s)", gwName)
+		return flex.FmtErrorf("[ERROR] Couldn't find any gateway with the specified name: (%s)", gwName)
 	}
 
 	return dataSourceIBMTransitGatewayConnectionsRead(d, meta)
@@ -291,7 +290,7 @@ func dataSourceIBMTransitGatewayConnectionsRead(d *schema.ResourceData, meta int
 		}
 		listTGConnections, response, err := client.ListTransitGatewayConnections(listTransitGatewayConnectionsOptions)
 		if err != nil {
-			return fmt.Errorf("[ERROR] Error while listing transit gateway connections %s\n%s", err, response)
+			return flex.FmtErrorf("[ERROR] Error while listing transit gateway connections %s\n%s", err, response)
 		}
 		for _, instance := range listTGConnections.Connections {
 			tgConn := map[string]interface{}{}
diff --git a/ibm/service/transitgateway/data_source_ibm_tg_gateways.go b/ibm/service/transitgateway/data_source_ibm_tg_gateways.go
@@ -4,9 +4,9 @@
 package transitgateway
 
 import (
-	"fmt"
 	"time"
 
+	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
 	"github.com/IBM/networking-go-sdk/transitgatewayapisv1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -75,7 +75,7 @@ func dataSourceIBMTransitGatewaysRead(d *schema.ResourceData, meta interface{})
 	listTransitGatewaysOptionsModel := &transitgatewayapisv1.ListTransitGatewaysOptions{}
 	listTransitGateways, response, err := client.ListTransitGateways(listTransitGatewaysOptionsModel)
 	if err != nil {
-		return fmt.Errorf("[ERROR] Error while listing transit gateways %s\n%s", err, response)
+		return flex.FmtErrorf("[ERROR] Error while listing transit gateways %s\n%s", err, response)
 	}
 
 	tgws := make([]map[string]interface{}, 0)
diff --git a/ibm/service/transitgateway/data_source_ibm_tg_location.go b/ibm/service/transitgateway/data_source_ibm_tg_location.go
@@ -4,9 +4,9 @@
 package transitgateway
 
 import (
-	"fmt"
 	"time"
 
+	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
 	"github.com/IBM/networking-go-sdk/transitgatewayapisv1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -76,7 +76,7 @@ func dataSourceIBMTransitGatewaysLocationRead(d *schema.ResourceData, meta inter
 	detailGatewayLocationOptionsModel.Name = &locName
 	detailTransitGatewayLocation, response, err := client.GetGatewayLocation(detailGatewayLocationOptionsModel)
 	if err != nil {
-		return fmt.Errorf("[ERROR] Error while fetching transit gateway detailed location: %s\n%s", err, response)
+		return flex.FmtErrorf("[ERROR] Error while fetching transit gateway detailed location: %s\n%s", err, response)
 	}
 
 	if detailTransitGatewayLocation != nil {
diff --git a/ibm/service/transitgateway/data_source_ibm_tg_locations.go b/ibm/service/transitgateway/data_source_ibm_tg_locations.go
@@ -4,9 +4,9 @@
 package transitgateway
 
 import (
-	"fmt"
 	"time"
 
+	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
 	"github.com/IBM/networking-go-sdk/transitgatewayapisv1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -61,7 +61,7 @@ func dataSourceIBMTransitGatewaysLocationsRead(d *schema.ResourceData, meta inte
 	listTransitGatewayLocationsOptionsModel := &transitgatewayapisv1.ListGatewayLocationsOptions{}
 	listTransitGatewayLocations, response, err := client.ListGatewayLocations(listTransitGatewayLocationsOptionsModel)
 	if err != nil {
-		return fmt.Errorf("[ERROR] Error while fetching transit gateways locations: %s\n%s", err, response)
+		return flex.FmtErrorf("[ERROR] Error while fetching transit gateways locations: %s\n%s", err, response)
 	}
 
 	tgLocationsCol := make([]map[string]interface{}, 0)
diff --git a/ibm/service/transitgateway/data_source_ibm_tg_route_report.go b/ibm/service/transitgateway/data_source_ibm_tg_route_report.go
@@ -4,7 +4,7 @@
 package transitgateway
 
 import (
-	"fmt"
+	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
 	"github.com/IBM/networking-go-sdk/transitgatewayapisv1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -144,7 +144,7 @@ func dataSourceIBMTransitGatewayRouteReportRead(d *schema.ResourceData, meta int
 	getTransitGatewayRouteReportOptionsModel.SetID(routeReportId)
 	routeReport, response, err := client.GetTransitGatewayRouteReport(getTransitGatewayRouteReportOptionsModel)
 	if err != nil {
-		return fmt.Errorf("Error while retrieving transit gateway route report %s\n%s", err, response)
+		return flex.FmtErrorf("Error while retrieving transit gateway route report %s\n%s", err, response)
 	}
 
 	d.Set(tgRouteReport, routeReport.ID)
diff --git a/ibm/service/transitgateway/data_source_ibm_tg_route_reports.go b/ibm/service/transitgateway/data_source_ibm_tg_route_reports.go
@@ -4,9 +4,9 @@
 package transitgateway
 
 import (
-	"fmt"
 	"time"
 
+	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
 	"github.com/IBM/networking-go-sdk/transitgatewayapisv1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -168,7 +168,7 @@ func dataSourceIBMTransitGatewayRouteReportsRead(d *schema.ResourceData, meta in
 	listTransitGatewayRouteReportsOptionsModel.SetTransitGatewayID(gatewayId)
 	listTransitGatewayRouteReports, response, err := client.ListTransitGatewayRouteReports(listTransitGatewayRouteReportsOptionsModel)
 	if err != nil {
-		return fmt.Errorf("Error while listing transit gateway route reports %s\n%s", err, response)
+		return flex.FmtErrorf("Error while listing transit gateway route reports %s\n%s", err, response)
 	}
 
 	reports := make([]map[string]interface{}, 0)
diff --git a/ibm/service/transitgateway/resource_ibm_tg_gateway.go b/ibm/service/transitgateway/resource_ibm_tg_gateway.go
@@ -5,7 +5,6 @@ package transitgateway
 
 import (
 	"context"
-	"fmt"
 	"log"
 	"os"
 	"time"
@@ -255,7 +254,7 @@ func isTransitGatewayRefreshFunc(client *transitgatewayapisv1.TransitGatewayApis
 		}
 		transitGateway, response, err := client.GetTransitGateway(gettgwoptions)
 		if err != nil {
-			return nil, "", fmt.Errorf("[ERROR] Error Getting Transit Gateway: %s\n%s", err, response)
+			return nil, "", flex.FmtErrorf("[ERROR] Error Getting Transit Gateway: %s\n%s", err, response)
 		}
 
 		if *transitGateway.Status == "available" || *transitGateway.Status == "failed" {
@@ -387,7 +386,7 @@ func resourceIBMTransitGatewayDelete(d *schema.ResourceData, meta interface{}) e
 		if response != nil && response.StatusCode == 404 {
 			return nil
 		}
-		return fmt.Errorf("[ERROR] Error deleting Transit Gateway (%s): %s\n%s", ID, err, response)
+		return flex.FmtErrorf("[ERROR] Error deleting Transit Gateway (%s): %s\n%s", ID, err, response)
 	}
 	_, err = isWaitForTransitGatewayDeleted(client, ID, d.Timeout(schema.TimeoutDelete))
 	if err != nil {
@@ -423,7 +422,7 @@ func isTransitGatewayDeleteRefreshFunc(client *transitgatewayapisv1.TransitGatew
 			if response != nil && response.StatusCode == 404 {
 				return transitGateway, isTransitGatewayDeleted, nil
 			}
-			return nil, "", fmt.Errorf("[ERROR] Error Getting Transit Gateway: %s\n%s", err, response)
+			return nil, "", flex.FmtErrorf("[ERROR] Error Getting Transit Gateway: %s\n%s", err, response)
 		}
 		return transitGateway, isTransitGatewayDeleting, err
 	}
@@ -448,7 +447,7 @@ func resourceIBMTransitGatewayExists(d *schema.ResourceData, meta interface{}) (
 			d.SetId("")
 			return false, nil
 		}
-		return false, fmt.Errorf("[ERROR] Error Getting Transit Gateway: %s\n%s", err, response)
+		return false, flex.FmtErrorf("[ERROR] Error Getting Transit Gateway: %s\n%s", err, response)
 	}
 
 	return true, nil
diff --git a/ibm/service/transitgateway/resource_ibm_tg_gateway_connection.go b/ibm/service/transitgateway/resource_ibm_tg_gateway_connection.go
@@ -360,7 +360,7 @@ func resourceIBMTransitGatewayConnectionCreate(d *schema.ResourceData, meta inte
 
 	if _, ok := d.GetOk(tgDefaultPrefixFilter); ok {
 		if "redundant_gre" == networkType {
-			err = fmt.Errorf("[ERROR] Error default_prefix_filter is not allowed for connection type %s,", networkType)
+			err = flex.FmtErrorf("[ERROR] Error default_prefix_filter is not allowed for connection type %s,", networkType)
 			log.Printf("[ERROR] Error default_prefix_filter is not allowed for connection type %s ", networkType)
 			return err
 		}
@@ -411,7 +411,7 @@ func resourceIBMTransitGatewayConnectionCreate(d *schema.ResourceData, meta inte
 
 	tgConnections, response, err := client.CreateTransitGatewayConnection(createTransitGatewayConnectionOptions)
 	if err != nil {
-		return fmt.Errorf("[ERROR] Create Transit Gateway connection err %s\n%s", err, response)
+		return flex.FmtErrorf("[ERROR] Create Transit Gateway connection err %s\n%s", err, response)
 	}
 
 	d.SetId(fmt.Sprintf("%s/%s", gatewayId, *tgConnections.ID))
@@ -447,7 +447,7 @@ func isTransitGatewayConnectionRefreshFunc(client *transitgatewayapisv1.TransitG
 
 		parts, err := flex.IdParts(id)
 		if err != nil {
-			return nil, "", fmt.Errorf("[ERROR] Error Getting Transit Gateway connection: %s", err)
+			return nil, "", flex.FmtErrorf("[ERROR] Error Getting Transit Gateway connection: %s", err)
 		}
 
 		gatewayId := parts[0]
@@ -457,7 +457,7 @@ func isTransitGatewayConnectionRefreshFunc(client *transitgatewayapisv1.TransitG
 		getTransitGatewayConnectionOptions.SetID(ID)
 		tgConnection, response, err := client.GetTransitGatewayConnection(getTransitGatewayConnectionOptions)
 		if err != nil {
-			return nil, "", fmt.Errorf("[ERROR] Error Getting Transit Gateway Connection (%s): %s\n%s", ID, err, response)
+			return nil, "", flex.FmtErrorf("[ERROR] Error Getting Transit Gateway Connection (%s): %s\n%s", ID, err, response)
 		}
 		if *tgConnection.Status == "attached" || *tgConnection.Status == "failed" {
 			return tgConnection, isTransitGatewayConnectionAttached, nil
@@ -489,7 +489,7 @@ func resourceIBMTransitGatewayConnectionRead(d *schema.ResourceData, meta interf
 			d.SetId("")
 			return nil
 		}
-		return fmt.Errorf("[ERROR] Error Getting Transit Gateway Connection (%s): %s\n%s", ID, err, response)
+		return flex.FmtErrorf("[ERROR] Error Getting Transit Gateway Connection (%s): %s\n%s", ID, err, response)
 	}
 
 	if instance.Name != nil {
@@ -528,7 +528,7 @@ func resourceIBMTransitGatewayConnectionRead(d *schema.ResourceData, meta interf
 	}
 	tgw, response, err := client.GetTransitGateway(getTransitGatewayOptions)
 	if err != nil {
-		return fmt.Errorf("[ERROR] Error Getting Transit Gateway : %s\n%s", err, response)
+		return flex.FmtErrorf("[ERROR] Error Getting Transit Gateway : %s\n%s", err, response)
 	}
 	d.Set(flex.RelatedCRN, *tgw.Crn)
 
@@ -603,7 +603,7 @@ func resourceIBMTransitGatewayConnectionUpdate(d *schema.ResourceData, meta inte
 
 	_, response, err := client.GetTransitGatewayConnection(getTransitGatewayConnectionOptions)
 	if err != nil {
-		return fmt.Errorf("[ERROR] Error Getting Transit Gateway Connection: %s\n%s", err, response)
+		return flex.FmtErrorf("[ERROR] Error Getting Transit Gateway Connection: %s\n%s", err, response)
 	}
 
 	updateTransitGatewayConnectionOptions := &transitgatewayapisv1.UpdateTransitGatewayConnectionOptions{}
@@ -624,7 +624,7 @@ func resourceIBMTransitGatewayConnectionUpdate(d *schema.ResourceData, meta inte
 
 	_, response, err = client.UpdateTransitGatewayConnection(updateTransitGatewayConnectionOptions)
 	if err != nil {
-		return fmt.Errorf("[ERROR] Error in Update Transit Gateway Connection : %s\n%s", err, response)
+		return flex.FmtErrorf("[ERROR] Error in Update Transit Gateway Connection : %s\n%s", err, response)
 	}
 
 	return resourceIBMTransitGatewayConnectionRead(d, meta)
@@ -653,7 +653,7 @@ func resourceIBMTransitGatewayConnectionDelete(d *schema.ResourceData, meta inte
 		if response != nil && response.StatusCode == 404 {
 			return nil
 		}
-		return fmt.Errorf("[ERROR] Error deleting Transit Gateway Connection(%s): %s\n%s", ID, err, response)
+		return flex.FmtErrorf("[ERROR] Error deleting Transit Gateway Connection(%s): %s\n%s", ID, err, response)
 	}
 	_, err = isWaitForTransitGatewayConnectionDeleted(client, d.Id(), d.Timeout(schema.TimeoutCreate))
 
@@ -685,7 +685,7 @@ func isTransitGatewayConnectionDeleteRefreshFunc(client *transitgatewayapisv1.Tr
 		log.Printf("[DEBUG] tg gateway connection delete function here")
 		parts, err := flex.IdParts(id)
 		if err != nil {
-			return nil, "", fmt.Errorf("[ERROR] Error Getting Transit Gateway connection: %s", err)
+			return nil, "", flex.FmtErrorf("[ERROR] Error Getting Transit Gateway connection: %s", err)
 
 		}
 
@@ -702,7 +702,7 @@ func isTransitGatewayConnectionDeleteRefreshFunc(client *transitgatewayapisv1.Tr
 				return tgConnection, isTransitGatewayConnectionDeleted, nil
 			}
 
-			return nil, "", fmt.Errorf("[ERROR] Error Getting Transit Gateway Connection (%s): %s\n%s", ID, err, response)
+			return nil, "", flex.FmtErrorf("[ERROR] Error Getting Transit Gateway Connection (%s): %s\n%s", ID, err, response)
 		}
 		return tgConnection, isTransitGatewayConnectionDeleting, err
 	}
@@ -717,7 +717,7 @@ func resourceIBMTransitGatewayConnectionExists(d *schema.ResourceData, meta inte
 		return false, err
 	}
 	if len(parts) < 2 {
-		return false, fmt.Errorf("[ERROR] Incorrect ID %s: Id should be a combination of gatewayID/ConnectionID", d.Id())
+		return false, flex.FmtErrorf("[ERROR] Incorrect ID %s: Id should be a combination of gatewayID/ConnectionID", d.Id())
 	}
 	gatewayId := parts[0]
 	ID := parts[1]
@@ -732,7 +732,7 @@ func resourceIBMTransitGatewayConnectionExists(d *schema.ResourceData, meta inte
 			d.SetId("")
 			return false, nil
 		}
-		return false, fmt.Errorf("[ERROR] Error Getting Transit Gateway Connection: %s\n%s", err, response)
+		return false, flex.FmtErrorf("[ERROR] Error Getting Transit Gateway Connection: %s\n%s", err, response)
 	}
 
 	return true, nil
diff --git a/ibm/service/transitgateway/resource_ibm_tg_gateway_connection_action.go b/ibm/service/transitgateway/resource_ibm_tg_gateway_connection_action.go
diff --git a/ibm/service/transitgateway/resource_ibm_tg_gateway_connection_prefix_filter.go b/ibm/service/transitgateway/resource_ibm_tg_gateway_connection_prefix_filter.go
diff --git a/ibm/service/transitgateway/resource_ibm_tg_gateway_connection_tunnel.go b/ibm/service/transitgateway/resource_ibm_tg_gateway_connection_tunnel.go
diff --git a/ibm/service/transitgateway/resource_ibm_tg_gateway_route_report.go b/ibm/service/transitgateway/resource_ibm_tg_gateway_route_report.go
diff --git a/website/docs/d/en_event_streams_template.html.markdown b/website/docs/d/en_event_streams_template.html.markdown
diff --git a/website/docs/d/en_subscription_event_streams.html.markdown b/website/docs/d/en_subscription_event_streams.html.markdown

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ func testAccCheckIBMEnPagerDutyDestinationDataSourceConfigBasic(instanceName, na`
`55`	`55`	`config {`
`56`	`56`	`params {`
`57`	`57`	`routing_key = "33220320pgdpgpewwp"`
`58`		`- api_key = "dwvdouqufqwojji"`
`59`	`58`	`}`
`60`	`59`	`}`
`61`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ func testAccCheckIBMEnPagerDutyDestinationConfig(instanceName, name, description`
`76`	`76`	`config {`
`77`	`77`	`params {`
`78`	`78`	`routing_key = "33220320pgdpgpewwp"`
`79`		`- api_key = "dwvdouqufqwojji"`
`80`	`79`	`}`
`81`	`80`	`}`
`82`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`package transitgateway`
`5`	`5`
`6`	`6`	`import (`
`7`		`- "fmt"`
`8`	`7`	`"log"`
`9`	`8`
`10`	`9`	`"github.com/IBM/networking-go-sdk/transitgatewayapisv1"`
`@@ -236,7 +235,7 @@ func dataSourceIBMTransitGatewayRead(d *schema.ResourceData, meta interface{}) e`
`236`	`235`	`listTransitGatewaysOptionsModel := &transitgatewayapisv1.ListTransitGatewaysOptions{}`
`237`	`236`	`listTransitGateways, response, err := client.ListTransitGateways(listTransitGatewaysOptionsModel)`
`238`	`237`	`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)`
`240`	`239`	`}`
`241`	`240`
`242`	`241`	`gwName := d.Get(tgName).(string)`
`@@ -265,7 +264,7 @@ func dataSourceIBMTransitGatewayRead(d *schema.ResourceData, meta interface{}) e`
`265`	`264`	`}`
`266`	`265`
`267`	`266`	`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)`
`269`	`268`	`}`
`270`	`269`
`271`	`270`	`return dataSourceIBMTransitGatewayConnectionsRead(d, meta)`
`@@ -291,7 +290,7 @@ func dataSourceIBMTransitGatewayConnectionsRead(d *schema.ResourceData, meta int`
`291`	`290`	`}`
`292`	`291`	`listTGConnections, response, err := client.ListTransitGatewayConnections(listTransitGatewayConnectionsOptions)`
`293`	`292`	`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)`
`295`	`294`	`}`
`296`	`295`	`for _, instance := range listTGConnections.Connections {`
`297`	`296`	`tgConn := map[string]interface{}{}`