diff --git a/ibm/service/cis/data_source_ibm_cis.go b/ibm/service/cis/data_source_ibm_cis.go index f96193afef..35e52d4639 100644 --- a/ibm/service/cis/data_source_ibm_cis.go +++ b/ibm/service/cis/data_source_ibm_cis.go @@ -4,7 +4,6 @@ package cis import ( - "fmt" "net/url" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -125,7 +124,7 @@ func dataSourceIBMCISInstanceRead(d *schema.ResourceData, meta interface{}) erro serviceOff, err := rsCatRepo.FindByName(service.(string), true) if err != nil { - return fmt.Errorf("[ERROR] Error retrieving service offering: %s", err) + return flex.FmtErrorf("[ERROR] Error retrieving service offering: %s", err) } rsInstQuery.ServiceID = serviceOff[0].ID @@ -152,13 +151,13 @@ func dataSourceIBMCISInstanceRead(d *schema.ResourceData, meta interface{}) erro } if len(filteredInstances) == 0 { - return fmt.Errorf("[ERROR] No resource instance found with name [%s]\nIf not specified please specify more filters like resource_group_id if instance doesn't exists in default group, location or service", name) + return flex.FmtErrorf("[ERROR] No resource instance found with name [%s]\nIf not specified please specify more filters like resource_group_id if instance doesn't exists in default group, location or service", name) } var instance models.ServiceInstanceV2 if len(filteredInstances) > 1 { - return fmt.Errorf("[ERROR] More than one resource instance found with name matching [%s]\nIf not specified please specify more filters like resource_group_id if instance doesn't exists in default group, location or service", name) + return flex.FmtErrorf("[ERROR] More than one resource instance found with name matching [%s]\nIf not specified please specify more filters like resource_group_id if instance doesn't exists in default group, location or service", name) } instance = filteredInstances[0] @@ -169,14 +168,14 @@ func dataSourceIBMCISInstanceRead(d *schema.ResourceData, meta interface{}) erro d.Set("guid", instance.Guid) serviceOff, err := rsCatRepo.GetServiceName(instance.ServiceID) if err != nil { - return fmt.Errorf("[ERROR] Error retrieving service offering: %s", err) + return flex.FmtErrorf("[ERROR] Error retrieving service offering: %s", err) } d.Set("service", serviceOff) servicePlan, err := rsCatRepo.GetServicePlanName(instance.ResourcePlanID) if err != nil { - return fmt.Errorf("[ERROR] Error retrieving plan: %s", err) + return flex.FmtErrorf("[ERROR] Error retrieving plan: %s", err) } d.Set("plan", servicePlan) diff --git a/ibm/service/cis/data_source_ibm_cis_alert_webhooks.go b/ibm/service/cis/data_source_ibm_cis_alert_webhooks.go index dd731d6c38..1a765933a8 100644 --- a/ibm/service/cis/data_source_ibm_cis_alert_webhooks.go +++ b/ibm/service/cis/data_source_ibm_cis_alert_webhooks.go @@ -4,10 +4,10 @@ package cis import ( - "fmt" "time" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/validate" "github.com/IBM/go-sdk-core/v5/core" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -80,7 +80,7 @@ func DataSourceIBMCISAlertWebhooksValidator() *validate.ResourceValidator { func dataIBMCISWebhookRead(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).CisWebhookSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the cisWebhookession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the cisWebhookession %s", err) } crn := d.Get(cisID).(string) sess.Crn = core.StringPtr(crn) @@ -88,7 +88,7 @@ func dataIBMCISWebhookRead(d *schema.ResourceData, meta interface{}) error { result, resp, err := sess.ListWebhooks(opt) if err != nil || result == nil { - return fmt.Errorf("[ERROR] Error Listing all Webhooks %q: %s %s", d.Id(), err, resp) + return flex.FmtErrorf("[ERROR] Error Listing all Webhooks %q: %s %s", d.Id(), err, resp) } webhooks := make([]map[string]interface{}, 0) diff --git a/ibm/service/cis/data_source_ibm_cis_alerts.go b/ibm/service/cis/data_source_ibm_cis_alerts.go index 58d33b458d..386c1fbc79 100644 --- a/ibm/service/cis/data_source_ibm_cis_alerts.go +++ b/ibm/service/cis/data_source_ibm_cis_alerts.go @@ -5,11 +5,11 @@ package cis import ( "encoding/json" - "fmt" "log" "time" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/validate" "github.com/IBM/go-sdk-core/v5/core" "github.com/IBM/networking-go-sdk/alertsv1" @@ -146,12 +146,12 @@ func dataIBMCISAlertPolicyRead(d *schema.ResourceData, meta interface{}) error { alertOutput[cisAlertType] = *alertObj.AlertType filterOpt, err := json.Marshal(alertObj.Filters) if err != nil { - return fmt.Errorf("[ERROR] Error marshalling the created filters: %s", err) + return flex.FmtErrorf("[ERROR] Error marshalling the created filters: %s", err) } alertOutput[cisAlertFilters] = string(filterOpt) conditionsOpt, err := json.Marshal(alertObj.Conditions) if err != nil { - return fmt.Errorf("[ERROR] Error marshalling the created Conditions: %s", err) + return flex.FmtErrorf("[ERROR] Error marshalling the created Conditions: %s", err) } alertOutput[cisAlertConditions] = string(conditionsOpt) alertOutput[cisAlertMechanisms] = dataflattenCISMechanism(*alertObj.Mechanisms) diff --git a/ibm/service/cis/data_source_ibm_cis_custom_certificates.go b/ibm/service/cis/data_source_ibm_cis_custom_certificates.go index 276921fa89..c1eef5bf08 100644 --- a/ibm/service/cis/data_source_ibm_cis_custom_certificates.go +++ b/ibm/service/cis/data_source_ibm_cis_custom_certificates.go @@ -4,7 +4,6 @@ package cis import ( - "fmt" "time" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" @@ -133,7 +132,7 @@ func dataSourceIBMCISCustomCertificatesRead(d *schema.ResourceData, meta interfa opt := cisClient.NewListCustomCertificatesOptions() result, resp, err := cisClient.ListCustomCertificates(opt) if err != nil { - return fmt.Errorf("[ERROR] Failed to list custom certificates: %v", resp) + return flex.FmtErrorf("[ERROR] Failed to list custom certificates: %v", resp) } certsList := make([]map[string]interface{}, 0) for _, r := range result.Result { diff --git a/ibm/service/cis/data_source_ibm_cis_domain.go b/ibm/service/cis/data_source_ibm_cis_domain.go index ed5804ea57..dfd6a1cb3a 100644 --- a/ibm/service/cis/data_source_ibm_cis_domain.go +++ b/ibm/service/cis/data_source_ibm_cis_domain.go @@ -4,7 +4,6 @@ package cis import ( - "fmt" "log" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" @@ -131,7 +130,7 @@ func dataSourceIBMCISDomainRead(d *schema.ResourceData, meta interface{}) error } if !zoneFound { - return fmt.Errorf("[ERROR] Given zone does not exist. Please specify correct domain") + return flex.FmtErrorf("[ERROR] Given zone does not exist. Please specify correct domain") } return nil diff --git a/ibm/service/cis/data_source_ibm_cis_edge_functions_actions.go b/ibm/service/cis/data_source_ibm_cis_edge_functions_actions.go index 6b79eccf1a..5d860cc988 100644 --- a/ibm/service/cis/data_source_ibm_cis_edge_functions_actions.go +++ b/ibm/service/cis/data_source_ibm_cis_edge_functions_actions.go @@ -4,7 +4,6 @@ package cis import ( - "fmt" "time" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" @@ -139,7 +138,7 @@ func dataSourceIBMCISEdgeFunctionsActionsRead(d *schema.ResourceData, meta inter opt := cisClient.NewListEdgeFunctionsActionsOptions() result, _, err := cisClient.ListEdgeFunctionsActions(opt) if err != nil { - return fmt.Errorf("[ERROR] Error: %v", err) + return flex.FmtErrorf("[ERROR] Error: %v", err) } scriptInfo := make([]map[string]interface{}, 0) for _, script := range result.Result { diff --git a/ibm/service/cis/data_source_ibm_cis_edge_functions_triggers.go b/ibm/service/cis/data_source_ibm_cis_edge_functions_triggers.go index 74f726fc63..37178c2aad 100644 --- a/ibm/service/cis/data_source_ibm_cis_edge_functions_triggers.go +++ b/ibm/service/cis/data_source_ibm_cis_edge_functions_triggers.go @@ -4,7 +4,6 @@ package cis import ( - "fmt" "time" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" @@ -104,7 +103,7 @@ func dataSourceIBMCISEdgeFunctionsTriggerRead(d *schema.ResourceData, meta inter opt := cisClient.NewListEdgeFunctionsTriggersOptions() result, _, err := cisClient.ListEdgeFunctionsTriggers(opt) if err != nil { - return fmt.Errorf("[ERROR] Error listing edge functions triggers: %v", err) + return flex.FmtErrorf("[ERROR] Error listing edge functions triggers: %v", err) } triggerInfo := make([]map[string]interface{}, 0) for _, trigger := range result.Result { diff --git a/ibm/service/cis/data_source_ibm_cis_filters.go b/ibm/service/cis/data_source_ibm_cis_filters.go index 90760f0bd7..1f0a4d5b06 100644 --- a/ibm/service/cis/data_source_ibm_cis_filters.go +++ b/ibm/service/cis/data_source_ibm_cis_filters.go @@ -4,7 +4,6 @@ package cis import ( - "fmt" "time" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" @@ -87,20 +86,20 @@ func dataIBMCISFiltersRead(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).BluemixSession() if err != nil { - return fmt.Errorf("[ERROR] Error while Getting IAM Access Token using BluemixSession %s", err) + return flex.FmtErrorf("[ERROR] Error while Getting IAM Access Token using BluemixSession %s", err) } xAuthtoken := sess.Config.IAMAccessToken cisClient, err := meta.(conns.ClientSession).CisFiltersSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the CisFiltersSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the CisFiltersSession %s", err) } crn := d.Get(cisID).(string) zoneID, _, _ := flex.ConvertTftoCisTwoVar(d.Get(cisDomainID).(string)) result, resp, err := cisClient.ListAllFilters(cisClient.NewListAllFiltersOptions(xAuthtoken, crn, zoneID)) if err != nil || result == nil { - return fmt.Errorf("[ERROR] Error Listing all filters %q: %s %s", d.Id(), err, resp) + return flex.FmtErrorf("[ERROR] Error Listing all filters %q: %s %s", d.Id(), err, resp) } filtersList := make([]map[string]interface{}, 0) diff --git a/ibm/service/cis/data_source_ibm_cis_firewall_rule.go b/ibm/service/cis/data_source_ibm_cis_firewall_rule.go index b5740b34c4..c49d9a1755 100644 --- a/ibm/service/cis/data_source_ibm_cis_firewall_rule.go +++ b/ibm/service/cis/data_source_ibm_cis_firewall_rule.go @@ -91,20 +91,29 @@ func DataSourceIBMCISFirewallRulesValidator() *validate.ResourceValidator { func dataSourceIBMCISFirewallRulesRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { sess, err := meta.(conns.ClientSession).BluemixSession() if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("dataSourceIBMCISFirewallRulesRead BluemixSession initialization failed: %s", err.Error()), + "ibm_cis_firewall_rule", "read") + return tfErr.GetDiag() } xAuthtoken := sess.Config.IAMAccessToken cisClient, err := meta.(conns.ClientSession).CisFirewallRulesSession() if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("dataSourceIBMCISFirewallRulesRead CisFirewallRulesSession initialization failed: %s", err.Error()), + "ibm_cis_firewall_rule", "read") + return tfErr.GetDiag() } crn := d.Get(cisID).(string) zoneID, _, _ := flex.ConvertTftoCisTwoVar(d.Get(cisDomainID).(string)) result, resp, err := cisClient.ListAllFirewallRules(cisClient.NewListAllFirewallRulesOptions(xAuthtoken, crn, zoneID)) if err != nil || result == nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error listing the firewall rules %s:%s", err, resp)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("dataSourceIBMCISFirewallRulesRead ListAllFirewallRules failed with error: %s and response:\n%s", err, resp), + "ibm_cis_firewall_rule", "read") + return tfErr.GetDiag() } fwrList := make([]map[string]interface{}, 0) diff --git a/ibm/service/cis/data_source_ibm_cis_mtls.go b/ibm/service/cis/data_source_ibm_cis_mtls.go index c11033170b..0f80e3d785 100644 --- a/ibm/service/cis/data_source_ibm_cis_mtls.go +++ b/ibm/service/cis/data_source_ibm_cis_mtls.go @@ -118,7 +118,10 @@ func dataIBMCISMtlsRead(context context.Context, d *schema.ResourceData, meta in sess, err := meta.(conns.ClientSession).CisMtlsSession() if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while getting the CisMtlsSession() %s %v", err, sess)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("dataIBMCISMtlsRead CisMtlsSession initialization failed: %s", err.Error()), + "ibm_cis_mtls", "read") + return tfErr.GetDiag() } zoneID, crn, _ := flex.ConvertTftoCisTwoVar(d.Id()) @@ -128,8 +131,11 @@ func dataIBMCISMtlsRead(context context.Context, d *schema.ResourceData, meta in result, resp, err := sess.ListAccessCertificates(opt) if err != nil { - log.Printf("[WARN] List all certificates failed: %v\n", resp) - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("dataIBMCISMtlsRead ListAccessCertificates failed: %s", err.Error()), + "ibm_cis_mtls", "read") + log.Printf("[WARN] List all certificates failed: %v\n%s\n", resp, tfErr.GetDebugMessage()) + return tfErr.GetDiag() } mtlsCertLists := make([]map[string]interface{}, 0) for _, certObj := range result.Result { diff --git a/ibm/service/cis/data_source_ibm_cis_mtls_app.go b/ibm/service/cis/data_source_ibm_cis_mtls_app.go index eaf58149ea..851f38aa22 100644 --- a/ibm/service/cis/data_source_ibm_cis_mtls_app.go +++ b/ibm/service/cis/data_source_ibm_cis_mtls_app.go @@ -170,7 +170,10 @@ func dataIBMCISMtlsAppRead(context context.Context, d *schema.ResourceData, meta sess, err := meta.(conns.ClientSession).CisMtlsSession() if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while getting the CisMtlsSession() %s %v", err, sess)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("dataIBMCISMtlsAppRead CisMtlsSession initialization failed: %s", err.Error()), + "ibm_cis_mtls_app", "read") + return tfErr.GetDiag() } zoneID, crn, _ := flex.ConvertTftoCisTwoVar(d.Id()) @@ -179,8 +182,11 @@ func dataIBMCISMtlsAppRead(context context.Context, d *schema.ResourceData, meta opt := sess.NewListAccessApplicationsOptions(zoneID) result, resp, err := sess.ListAccessApplications(opt) if err != nil { - log.Printf("[WARN] List all Applications failed: %v\n", resp) - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("dataIBMCISMtlsAppRead ListAccessApplications failed: %s", err.Error()), + "ibm_cis_mtls_app", "read") + log.Printf("[WARN] List all Applications failed: %v\n%s\n", resp, tfErr.GetDebugMessage()) + return tfErr.GetDiag() } mtlsAppLists := make([]map[string]interface{}, 0) @@ -201,8 +207,11 @@ func dataIBMCISMtlsAppRead(context context.Context, d *schema.ResourceData, meta PolicyOpt := sess.NewListAccessPoliciesOptions(zoneID, *appObj.ID) PolicyResult, PolicyResp, PolicyErr := sess.ListAccessPolicies(PolicyOpt) if PolicyErr != nil { - log.Printf("[WARN] List all Policies failed: %v\n", PolicyResp) - return diag.FromErr(PolicyErr) + tfErr := flex.TerraformErrorf(PolicyErr, + fmt.Sprintf("dataIBMCISMtlsAppRead ListAccessPolicies failed: %s", PolicyErr.Error()), + "ibm_cis_mtls_app", "read") + log.Printf("[WARN] List all Policies failed: %v\n%s\n", PolicyResp, tfErr.GetDebugMessage()) + return tfErr.GetDiag() } for _, PolicyObj := range PolicyResult.Result { diff --git a/ibm/service/cis/data_source_ibm_cis_origin_auth.go b/ibm/service/cis/data_source_ibm_cis_origin_auth.go index 7e32040b21..a293e0eaed 100644 --- a/ibm/service/cis/data_source_ibm_cis_origin_auth.go +++ b/ibm/service/cis/data_source_ibm_cis_origin_auth.go @@ -133,7 +133,10 @@ func DataSourceIBMCISOriginAuthPullValidator() *validate.ResourceValidator { func dataIBMCISOriginAuthRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { sess, err := meta.(conns.ClientSession).CisOrigAuthSession() if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("dataIBMCISOriginAuthRead CisOrigAuthSession initialization failed: %s", err.Error()), + "ibm_cis_origin_auth", "read") + return tfErr.GetDiag() } crn := d.Get(cisID).(string) @@ -150,7 +153,10 @@ func dataIBMCISOriginAuthRead(context context.Context, d *schema.ResourceData, m zoneSettingsResult, zoneSettingsResponse, zoneSettingsErr := sess.GetZoneOriginPullSettings(zoneSettingsOpt) if zoneSettingsErr != nil || zoneSettingsResponse == nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error Getting Zone Level Origin Pull Settings: %s, Response: %s", zoneSettingsErr, zoneSettingsResponse)) + tfErr := flex.TerraformErrorf(zoneSettingsErr, + fmt.Sprintf("dataIBMCISOriginAuthRead GetZoneOriginPullSettings failed: %s \nResponse: %s", zoneSettingsErr.Error(), zoneSettingsResponse), + "ibm_cis_origin_auth", "read") + return tfErr.GetDiag() } zoneSettings := zoneSettingsResult.Result.Enabled @@ -161,7 +167,10 @@ func dataIBMCISOriginAuthRead(context context.Context, d *schema.ResourceData, m zoneCertListResult, zoneCertListResponse, zoneCertListErr := sess.ListZoneOriginPullCertificates(zoneCertListOpt) if zoneCertListErr != nil || zoneCertListResponse == nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error Getting Zone Level Origin Pull Settings: %s, Response: %s", zoneCertListErr, zoneCertListResponse)) + tfErr := flex.TerraformErrorf(zoneCertListErr, + fmt.Sprintf("dataIBMCISOriginAuthRead ListZoneOriginPullCertificates failed: %s \nResponse: %s", zoneCertListErr.Error(), zoneCertListResponse), + "ibm_cis_origin_auth", "read") + return tfErr.GetDiag() } zoneCertLists := make([]map[string]interface{}, 0) @@ -191,7 +200,10 @@ func dataIBMCISOriginAuthRead(context context.Context, d *schema.ResourceData, m hostnameSettingsResult, hostnameSettingsResponse, hostnameSettingsErr := sess.GetHostnameOriginPullSettings(hostnameSettingsOpt) if hostnameSettingsErr != nil || hostnameSettingsResponse == nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error Getting Zone Level Origin Pull Settings: %s", hostnameSettingsErr)) + tfErr := flex.TerraformErrorf(hostnameSettingsErr, + fmt.Sprintf("dataIBMCISOriginAuthRead GetHostnameOriginPullSettings failed: %s \nResponse: %s", hostnameSettingsErr.Error(), hostnameSettingsResponse), + "ibm_cis_origin_auth", "read") + return tfErr.GetDiag() } hostnameSettings := hostnameSettingsResult.Result.Enabled diff --git a/ibm/service/cis/data_source_ibm_cis_range_apps.go b/ibm/service/cis/data_source_ibm_cis_range_apps.go index aa7d756379..1214e4385b 100644 --- a/ibm/service/cis/data_source_ibm_cis_range_apps.go +++ b/ibm/service/cis/data_source_ibm_cis_range_apps.go @@ -4,7 +4,6 @@ package cis import ( - "fmt" "time" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" @@ -158,7 +157,7 @@ func dataSourceIBMCISRangeAppsRead(d *schema.ResourceData, meta interface{}) err opt := cisClient.NewListRangeAppsOptions() result, resp, err := cisClient.ListRangeApps(opt) if err != nil { - return fmt.Errorf("[ERROR] Failed to list range applications: %v", resp) + return flex.FmtErrorf("[ERROR] Failed to list range applications: %v", resp) } apps := make([]map[string]interface{}, 0) for _, i := range result.Result { diff --git a/ibm/service/cis/data_source_ibm_cis_rate_limit.go b/ibm/service/cis/data_source_ibm_cis_rate_limit.go index 560dbb2bb3..84bf2c1953 100644 --- a/ibm/service/cis/data_source_ibm_cis_rate_limit.go +++ b/ibm/service/cis/data_source_ibm_cis_rate_limit.go @@ -4,7 +4,6 @@ package cis import ( - "fmt" "time" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" @@ -217,7 +216,7 @@ func dataSourceIBMCISRateLimitRead(d *schema.ResourceData, meta interface{}) err opt := cisClient.NewListAllZoneRateLimitsOptions() rateLimitRecord, resp, err := cisClient.ListAllZoneRateLimits(opt) if err != nil { - return fmt.Errorf("[ERROR] Failed to read RateLimit: %v", resp) + return flex.FmtErrorf("[ERROR] Failed to read RateLimit: %v", resp) } rules := make([]map[string]interface{}, 0) for _, r := range rateLimitRecord.Result { diff --git a/ibm/service/cis/resource_ibm_cis.go b/ibm/service/cis/resource_ibm_cis.go index 178f21ff89..461023fb6d 100644 --- a/ibm/service/cis/resource_ibm_cis.go +++ b/ibm/service/cis/resource_ibm_cis.go @@ -5,7 +5,6 @@ package cis import ( "context" - "fmt" "log" "net/url" "os" @@ -189,21 +188,21 @@ func ResourceIBMCISInstanceCreate(d *schema.ResourceData, meta interface{}) erro serviceOff, err := rsCatRepo.FindByName(serviceName, true) if err != nil { - return fmt.Errorf("[ERROR] Error retrieving service offering: %s", err) + return flex.FmtErrorf("[ERROR] Error retrieving service offering: %s", err) } servicePlan, err := rsCatRepo.GetServicePlanID(serviceOff[0], plan) if err != nil { - return fmt.Errorf("[ERROR] Error retrieving plan: %s", err) + return flex.FmtErrorf("[ERROR] Error retrieving plan: %s", err) } rsInst.ResourcePlanID = &servicePlan deployments, err := rsCatRepo.ListDeployments(servicePlan) if err != nil { - return fmt.Errorf("[ERROR] Error retrieving deployment for plan %s : %s", plan, err) + return flex.FmtErrorf("[ERROR] Error retrieving deployment for plan %s : %s", plan, err) } if len(deployments) == 0 { - return fmt.Errorf("[ERROR] No deployment found for service plan : %s", plan) + return flex.FmtErrorf("[ERROR] No deployment found for service plan : %s", plan) } deployments, supportedLocations := filterCISDeployments(deployments, location) @@ -212,7 +211,7 @@ func ResourceIBMCISInstanceCreate(d *schema.ResourceData, meta interface{}) erro for l := range supportedLocations { locationList = append(locationList, l) } - return fmt.Errorf("[ERROR] No deployment found for service plan %s at location %s.\nValid location(s) are: %q", plan, location, locationList) + return flex.FmtErrorf("[ERROR] No deployment found for service plan %s at location %s.\nValid location(s) are: %q", plan, location, locationList) } rsInst.Target = &deployments[0].CatalogCRN @@ -234,7 +233,7 @@ func ResourceIBMCISInstanceCreate(d *schema.ResourceData, meta interface{}) erro instance, response, err := rsConClient.CreateResourceInstance(&rsInst) if err != nil { - return fmt.Errorf("[ERROR] Error creating resource instance: %s %s", err, response) + return flex.FmtErrorf("[ERROR] Error creating resource instance: %s %s", err, response) } v := os.Getenv("IC_ENV_TAGS") if _, ok := d.GetOk("tags"); ok || v != "" { @@ -251,7 +250,7 @@ func ResourceIBMCISInstanceCreate(d *schema.ResourceData, meta interface{}) erro _, err = waitForCISInstanceCreate(d, meta, *instance.ID) if err != nil { - return fmt.Errorf("[ERROR] Error waiting for create resource instance (%s) to be succeeded: %s", d.Id(), err) + return flex.FmtErrorf("[ERROR] Error waiting for create resource instance (%s) to be succeeded: %s", d.Id(), err) } d.SetId(*instance.ID) @@ -278,7 +277,7 @@ func ResourceIBMCISInstanceRead(d *schema.ResourceData, meta interface{}) error d.SetId("") return nil } - return fmt.Errorf("[ERROR] Error retrieving resource instance: %s %s", err, response) + return flex.FmtErrorf("[ERROR] Error retrieving resource instance: %s %s", err, response) } if strings.Contains(*instance.State, "removed") { log.Printf("[WARN] Removing instance from TF state because it's now in removed state") @@ -313,7 +312,7 @@ func ResourceIBMCISInstanceRead(d *schema.ResourceData, meta interface{}) error servicePlan, err := rsCatRepo.GetServicePlanName(*instance.ResourcePlanID) if err != nil { - return fmt.Errorf("[ERROR] Error retrieving plan: %s", err) + return flex.FmtErrorf("[ERROR] Error retrieving plan: %s", err) } d.Set("plan", servicePlan) @@ -359,12 +358,12 @@ func ResourceIBMCISInstanceUpdate(d *schema.ResourceData, meta interface{}) erro serviceOff, err := rsCatRepo.FindByName(service, true) if err != nil { - return fmt.Errorf("[ERROR] Error retrieving service offering: %s", err) + return flex.FmtErrorf("[ERROR] Error retrieving service offering: %s", err) } servicePlan, err := rsCatRepo.GetServicePlanID(serviceOff[0], plan) if err != nil { - return fmt.Errorf("[ERROR] Error retrieving plan: %s", err) + return flex.FmtErrorf("[ERROR] Error retrieving plan: %s", err) } updateReq.ResourcePlanID = &servicePlan @@ -382,12 +381,12 @@ func ResourceIBMCISInstanceUpdate(d *schema.ResourceData, meta interface{}) erro _, response, err := rsConClient.UpdateResourceInstance(&updateReq) if err != nil { - return fmt.Errorf("[ERROR] Error updating resource instance: %s %s", err, response) + return flex.FmtErrorf("[ERROR] Error updating resource instance: %s %s", err, response) } _, err = waitForCISInstanceUpdate(d, meta) if err != nil { - return fmt.Errorf("[ERROR] Error waiting for update resource instance (%s) to be succeeded: %s", d.Id(), err) + return flex.FmtErrorf("[ERROR] Error waiting for update resource instance (%s) to be succeeded: %s", d.Id(), err) } return ResourceIBMCISInstanceRead(d, meta) @@ -414,13 +413,13 @@ func ResourceIBMCISInstanceDelete(d *schema.ResourceData, meta interface{}) erro log.Printf("[WARN] Resource instance already deleted %s\n %s", err, response) err = nil } else { - return fmt.Errorf("[ERROR] Error deleting resource instance: %s %s", err, response) + return flex.FmtErrorf("[ERROR] Error deleting resource instance: %s %s", err, response) } } _, err = waitForCISInstanceDelete(d, meta) if err != nil { - return fmt.Errorf("[ERROR] Error waiting for resource instance (%s) to be deleted: %s", d.Id(), err) + return flex.FmtErrorf("[ERROR] Error waiting for resource instance (%s) to be deleted: %s", d.Id(), err) } d.SetId("") @@ -444,7 +443,7 @@ func ResourceIBMCISInstanceExists(d *schema.ResourceData, meta interface{}) (boo return false, nil } } - return false, fmt.Errorf("[ERROR] Error getting cis instance: %s %s", err, response) + return false, flex.FmtErrorf("[ERROR] Error getting cis instance: %s %s", err, response) } if instance != nil && (strings.Contains(*instance.State, "removed") || strings.Contains(*instance.State, cisInstanceReclamation)) { log.Printf("[WARN] Removing instance from state because it's in removed or pending_reclamation state") @@ -473,12 +472,12 @@ func waitForCISInstanceCreate(d *schema.ResourceData, meta interface{}, instance instance, response, err := rsConClient.GetResourceInstance(&rsInst) if err != nil { if apiErr, ok := err.(bmxerror.RequestFailure); ok && apiErr.StatusCode() == 404 { - return nil, "", fmt.Errorf("[ERROR] The resource instance %s does not exist anymore: %v %s", d.Id(), err, response) + return nil, "", flex.FmtErrorf("[ERROR] The resource instance %s does not exist anymore: %v %s", d.Id(), err, response) } return nil, "", err } if *instance.State == CisInstanceFailStatus { - return instance, *instance.State, fmt.Errorf("[ERROR] The resource instance %s failed: %v %s", d.Id(), err, response) + return instance, *instance.State, flex.FmtErrorf("[ERROR] The resource instance %s failed: %v %s", d.Id(), err, response) } return instance, *instance.State, nil }, @@ -508,12 +507,12 @@ func waitForCISInstanceUpdate(d *schema.ResourceData, meta interface{}) (interfa instance, response, err := rsConClient.GetResourceInstance(&rsInst) if err != nil { if apiErr, ok := err.(bmxerror.RequestFailure); ok && apiErr.StatusCode() == 404 { - return nil, "", fmt.Errorf("[ERROR] The resource instance %s does not exist anymore: %v %s", d.Id(), err, response) + return nil, "", flex.FmtErrorf("[ERROR] The resource instance %s does not exist anymore: %v %s", d.Id(), err, response) } return nil, "", err } if *instance.State == CisInstanceFailStatus { - return instance, *instance.State, fmt.Errorf("[ERROR] The resource instance %s failed: %v %s", d.Id(), err, response) + return instance, *instance.State, flex.FmtErrorf("[ERROR] The resource instance %s failed: %v %s", d.Id(), err, response) } return instance, *instance.State, nil }, @@ -547,7 +546,7 @@ func waitForCISInstanceDelete(d *schema.ResourceData, meta interface{}) (interfa return nil, "", err } if *instance.State == CisInstanceFailStatus { - return instance, *instance.State, fmt.Errorf("[ERROR] The resource instance %s failed to delete: %v %s", d.Id(), err, response) + return instance, *instance.State, flex.FmtErrorf("[ERROR] The resource instance %s failed to delete: %v %s", d.Id(), err, response) } return instance, *instance.State, nil }, diff --git a/ibm/service/cis/resource_ibm_cis_alert.go b/ibm/service/cis/resource_ibm_cis_alert.go index bf7906669d..8386dfc577 100644 --- a/ibm/service/cis/resource_ibm_cis_alert.go +++ b/ibm/service/cis/resource_ibm_cis_alert.go @@ -147,7 +147,7 @@ func ResourceIBMCISAlertValidator() *validate.ResourceValidator { func ResourceIBMCISAlertPolicyCreate(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).CisAlertsSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the CisAlertsSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the CisAlertsSession %s", err) } crn := d.Get(cisID).(string) sess.Crn = core.StringPtr(crn) @@ -206,7 +206,7 @@ func ResourceIBMCISAlertPolicyCreate(d *schema.ResourceData, meta interface{}) e opt.Mechanisms = mechanismsOpt result, resp, err := sess.CreateAlertPolicy(opt) if err != nil || result == nil { - return fmt.Errorf("[ERROR] Error creating Alert Policy %s %s", err, resp) + return flex.FmtErrorf("[ERROR] Error creating Alert Policy %s %s", err, resp) } d.SetId(flex.ConvertCisToTfTwoVar(*result.Result.ID, crn)) d.Set(cisAlertID, *result.Result.ID) @@ -217,12 +217,12 @@ func ResourceIBMCISAlertPolicyCreate(d *schema.ResourceData, meta interface{}) e func ResourceIBMCISAlertPolicyRead(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).CisAlertsSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the CisAlertsSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the CisAlertsSession %s", err) } alertID, crn, err := flex.ConvertTftoCisTwoVar(d.Id()) if err != nil { - return fmt.Errorf("[ERROR] Error while ConvertTftoCisTwoVar %s", err) + return flex.FmtErrorf("[ERROR] Error while ConvertTftoCisTwoVar %s", err) } sess.Crn = core.StringPtr(crn) opt := sess.NewGetAlertPolicyOptions(alertID) @@ -232,7 +232,7 @@ func ResourceIBMCISAlertPolicyRead(d *schema.ResourceData, meta interface{}) err d.SetId("") return nil } - return fmt.Errorf("[ERROR] Error getting alert policy detail %s, %s", err, resp) + return flex.FmtErrorf("[ERROR] Error getting alert policy detail %s, %s", err, resp) } d.Set(cisID, crn) @@ -248,17 +248,17 @@ func ResourceIBMCISAlertPolicyRead(d *schema.ResourceData, meta interface{}) err filterOpt, err := json.Marshal(result.Result.Filters) if err != nil { - return fmt.Errorf("[ERROR] Error marshalling the created filters: %s", err) + return flex.FmtErrorf("[ERROR] Error marshalling the created filters: %s", err) } if err = d.Set(cisAlertFilters, string(filterOpt)); err != nil { - return fmt.Errorf("[ERROR] Error setting the filters: %s", err) + return flex.FmtErrorf("[ERROR] Error setting the filters: %s", err) } conditionsOpt, err := json.Marshal(result.Result.Conditions) if err != nil { - return fmt.Errorf("[ERROR] Error marshalling the created Conditions: %s", err) + return flex.FmtErrorf("[ERROR] Error marshalling the created Conditions: %s", err) } if err = d.Set(cisAlertConditions, string(conditionsOpt)); err != nil { - return fmt.Errorf("[ERROR] Error setting the Conditions: %s", err) + return flex.FmtErrorf("[ERROR] Error setting the Conditions: %s", err) } return nil } @@ -266,13 +266,13 @@ func ResourceIBMCISAlertPolicyRead(d *schema.ResourceData, meta interface{}) err func ResourceIBMCISAlertPolicyUpdate(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).CisAlertsSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the CisAlertsSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the CisAlertsSession %s", err) } alertID, crn, err := flex.ConvertTftoCisTwoVar(d.Id()) if err != nil { - return fmt.Errorf("[ERROR] Error while ConvertTftoCisTwoVar %s", err) + return flex.FmtErrorf("[ERROR] Error while ConvertTftoCisTwoVar %s", err) } sess.Crn = core.StringPtr(crn) @@ -346,7 +346,7 @@ func ResourceIBMCISAlertPolicyUpdate(d *schema.ResourceData, meta interface{}) e result, resp, err := sess.UpdateAlertPolicy(opt) if err != nil || result == nil { - return fmt.Errorf("[ERROR] Error while Update Alert Policy %s %s", err, resp) + return flex.FmtErrorf("[ERROR] Error while Update Alert Policy %s %s", err, resp) } } @@ -356,7 +356,7 @@ func ResourceIBMCISAlertPolicyDelete(d *schema.ResourceData, meta interface{}) e sess, err := meta.(conns.ClientSession).CisAlertsSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the CisAlertsSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the CisAlertsSession %s", err) } alertID, crn, err := flex.ConvertTftoCisTwoVar(d.Id()) if err != nil { @@ -369,7 +369,7 @@ func ResourceIBMCISAlertPolicyDelete(d *schema.ResourceData, meta interface{}) e if response != nil && response.StatusCode == 404 { return nil } - return fmt.Errorf("[ERROR] Error deleting the alert %s:%s", err, response) + return flex.FmtErrorf("[ERROR] Error deleting the alert %s:%s", err, response) } return nil } diff --git a/ibm/service/cis/resource_ibm_cis_alert_webhook.go b/ibm/service/cis/resource_ibm_cis_alert_webhook.go index 163f2aea73..53c5b10f73 100644 --- a/ibm/service/cis/resource_ibm_cis_alert_webhook.go +++ b/ibm/service/cis/resource_ibm_cis_alert_webhook.go @@ -4,8 +4,6 @@ package cis import ( - "fmt" - "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/validate" @@ -84,7 +82,7 @@ func ResourceIBMCISWebhooksValidator() *validate.ResourceValidator { func ResourceIBMCISWebhookCreate(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).CisWebhookSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the cisWebhookSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the cisWebhookSession %s", err) } crn := d.Get(cisID).(string) @@ -103,7 +101,7 @@ func ResourceIBMCISWebhookCreate(d *schema.ResourceData, meta interface{}) error } result, resp, err := sess.CreateAlertWebhook(opt) if err != nil || result == nil { - return fmt.Errorf("[ERROR] Error creating Webhooks %s %s", err, resp) + return flex.FmtErrorf("[ERROR] Error creating Webhooks %s %s", err, resp) } d.SetId(flex.ConvertCisToTfTwoVar(*result.Result.ID, crn)) return ResourceIBMCISWebhookRead(d, meta) @@ -112,7 +110,7 @@ func ResourceIBMCISWebhookCreate(d *schema.ResourceData, meta interface{}) error func ResourceIBMCISWebhookRead(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).CisWebhookSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the cisWebhookSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the cisWebhookSession %s", err) } webhooksID, crn, err := flex.ConvertTftoCisTwoVar(d.Id()) if err != nil { @@ -127,7 +125,7 @@ func ResourceIBMCISWebhookRead(d *schema.ResourceData, meta interface{}) error { d.SetId("") return nil } - return fmt.Errorf("[ERROR] Error getting webhook detail %s, %s", err, response) + return flex.FmtErrorf("[ERROR] Error getting webhook detail %s, %s", err, response) } d.Set(cisID, crn) d.Set(cisWebhookID, result.Result.ID) @@ -139,7 +137,7 @@ func ResourceIBMCISWebhookRead(d *schema.ResourceData, meta interface{}) error { func ResourceIBMCISWebhookUpdate(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).CisWebhookSession() if err != nil { - return fmt.Errorf("[ERROR] Error while updating the webhook %s", err) + return flex.FmtErrorf("[ERROR] Error while updating the webhook %s", err) } webhooksID, crn, err := flex.ConvertTftoCisTwoVar(d.Id()) if err != nil { @@ -163,7 +161,7 @@ func ResourceIBMCISWebhookUpdate(d *schema.ResourceData, meta interface{}) error result, _, err := sess.UpdateAlertWebhook(opt) if err != nil || result == nil { - return fmt.Errorf("[ERROR] Error updating the Webhook %s", err) + return flex.FmtErrorf("[ERROR] Error updating the Webhook %s", err) } } return ResourceIBMCISWebhookRead(d, meta) @@ -171,11 +169,11 @@ func ResourceIBMCISWebhookUpdate(d *schema.ResourceData, meta interface{}) error func ResourceIBMCISWebhookDelete(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).CisWebhookSession() if err != nil { - return fmt.Errorf("[ERROR] Error while Deleting the webhook %s", err) + return flex.FmtErrorf("[ERROR] Error while Deleting the webhook %s", err) } webhooksID, crn, err := flex.ConvertTftoCisTwoVar(d.Id()) if err != nil { - return fmt.Errorf("[ERROR] Error while getting the webhook ID %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the webhook ID %s", err) } sess.Crn = core.StringPtr(crn) @@ -186,7 +184,7 @@ func ResourceIBMCISWebhookDelete(d *schema.ResourceData, meta interface{}) error if response != nil && response.StatusCode == 404 { return nil } - return fmt.Errorf("[ERROR] Error deleting the Webhook %s:%s", err, response) + return flex.FmtErrorf("[ERROR] Error deleting the Webhook %s:%s", err, response) } return nil diff --git a/ibm/service/cis/resource_ibm_cis_bot_management.go b/ibm/service/cis/resource_ibm_cis_bot_management.go index a9f6b2d79d..d6a09a3b60 100644 --- a/ibm/service/cis/resource_ibm_cis_bot_management.go +++ b/ibm/service/cis/resource_ibm_cis_bot_management.go @@ -4,9 +4,8 @@ package cis import ( - "fmt" - "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/validate" "github.com/IBM/go-sdk-core/v5/core" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -70,14 +69,14 @@ func ResourceIBMCISBotManagementCreate(d *schema.ResourceData, meta interface{}) func ResourceIBMCISBotManagementUpdate(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).CisBotManagementSession() if err != nil { - return fmt.Errorf("[ERROR] Error while Getting IAM Access Token using BluemixSession %s", err) + return flex.FmtErrorf("[ERROR] Error while Getting IAM Access Token using BluemixSession %s", err) } crn := d.Get(cisID).(string) sess.Crn = core.StringPtr(crn) cisClient, err := meta.(conns.ClientSession).CisBotManagementSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the CisBotManagementSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the CisBotManagementSession %s", err) } if d.HasChange(cisBotManagementFightMode) || @@ -111,7 +110,7 @@ func ResourceIBMCISBotManagementUpdate(d *schema.ResourceData, meta interface{}) _, resp, err := cisClient.UpdateBotManagement(opt) if err != nil { - return fmt.Errorf("[ERROR] Error updating BotManagement with error: %s %s", err, resp) + return flex.FmtErrorf("[ERROR] Error updating BotManagement with error: %s %s", err, resp) } } return dataSourceIBMCISBotManagementRead(d, meta) diff --git a/ibm/service/cis/resource_ibm_cis_dns_record.go b/ibm/service/cis/resource_ibm_cis_dns_record.go index 8584b814c2..d0aef92310 100644 --- a/ibm/service/cis/resource_ibm_cis_dns_record.go +++ b/ibm/service/cis/resource_ibm_cis_dns_record.go @@ -235,14 +235,14 @@ func ResourceIBMCISDnsRecordCreate(d *schema.ResourceData, meta interface{}) err // altitude v, ok = strconv.ParseFloat(dataMap["altitude"].(string), 64) if ok != nil { - return fmt.Errorf("data input error") + return flex.FmtErrorf("data input error") } recordData["altitude"] = v // lat_degrees v, ok = strconv.Atoi(dataMap["lat_degrees"].(string)) if ok != nil { - return fmt.Errorf("data input error") + return flex.FmtErrorf("data input error") } recordData["lat_degrees"] = v @@ -255,14 +255,14 @@ func ResourceIBMCISDnsRecordCreate(d *schema.ResourceData, meta interface{}) err // lat_minutes v, ok = strconv.Atoi(dataMap["lat_minutes"].(string)) if ok != nil { - return fmt.Errorf("data input error") + return flex.FmtErrorf("data input error") } recordData["lat_minutes"] = v // lat_seconds v, ok = strconv.ParseFloat(dataMap["lat_seconds"].(string), 64) if ok != nil { - return fmt.Errorf("data input error") + return flex.FmtErrorf("data input error") } recordData["lat_seconds"] = v @@ -413,7 +413,7 @@ func ResourceIBMCISDnsRecordCreate(d *schema.ResourceData, meta interface{}) err } if contentOk == dataOk { - return fmt.Errorf( + return flex.FmtErrorf( "either 'content' (present: %t) or 'data' (present: %t) must be provided", contentOk, dataOk) } @@ -769,7 +769,7 @@ func ResourceIBMCISDnsRecordUpdate(d *schema.ResourceData, meta interface{}) err opt.SetTTL(int64(ttl.(int))) } if ttl != 1 && proxied == true { - return fmt.Errorf("[ERROR] To enable proxy TTL should be Automatic %s", + return flex.FmtErrorf("[ERROR] To enable proxy TTL should be Automatic %s", "i.e it should be set to 1. For the the values other than Automatic, proxy should be disabled") } priority, priorityOk := d.GetOk(cisDNSRecordPriority) @@ -793,7 +793,7 @@ func ResourceIBMCISDnsRecordUpdate(d *schema.ResourceData, meta interface{}) err opt.SetData(newDataMap) } if contentOk == dataOk { - return fmt.Errorf( + return flex.FmtErrorf( "either 'content' (present: %t) or 'data' (present: %t) must be provided", contentOk, dataOk) } diff --git a/ibm/service/cis/resource_ibm_cis_edge_functions_action.go b/ibm/service/cis/resource_ibm_cis_edge_functions_action.go index 275ab45abf..e0140c762a 100644 --- a/ibm/service/cis/resource_ibm_cis_edge_functions_action.go +++ b/ibm/service/cis/resource_ibm_cis_edge_functions_action.go @@ -4,7 +4,6 @@ package cis import ( - "fmt" "io" "io/ioutil" "log" @@ -94,7 +93,7 @@ func ResourceIBMCISEdgeFunctionsActionCreate(d *schema.ResourceData, meta interf _, _, err = cisClient.UpdateEdgeFunctionsAction(opt) if err != nil { - return fmt.Errorf("[ERROR] Error: %v", err) + return flex.FmtErrorf("[ERROR] Error: %v", err) } d.SetId(flex.ConvertCisToTfThreeVar(scriptName, zoneID, crn)) return ResourceIBMCISEdgeFunctionsActionRead(d, meta) @@ -121,7 +120,7 @@ func ResourceIBMCISEdgeFunctionsActionRead(d *schema.ResourceData, meta interfac opt := cisClient.NewGetEdgeFunctionsActionOptions(scriptName) result, resp, err := cisClient.GetEdgeFunctionsAction(opt) if err != nil { - return fmt.Errorf("[ERROR] Error: %v", resp) + return flex.FmtErrorf("[ERROR] Error: %v", resp) } // read script content @@ -136,7 +135,7 @@ func ResourceIBMCISEdgeFunctionsActionRead(d *schema.ResourceData, meta interfac } err = result.Close() if err != nil { - return fmt.Errorf("[ERROR] Error in closing reader") + return flex.FmtErrorf("[ERROR] Error in closing reader") } d.Set(cisID, crn) @@ -149,7 +148,7 @@ func ResourceIBMCISEdgeFunctionsActionRead(d *schema.ResourceData, meta interfac func ResourceIBMCISEdgeFunctionsActionExists(d *schema.ResourceData, meta interface{}) (bool, error) { cisClient, err := meta.(conns.ClientSession).CisEdgeFunctionClientSession() if err != nil { - return false, fmt.Errorf("[ERROR] Error in creating CIS object") + return false, flex.FmtErrorf("[ERROR] Error in creating CIS object") } scriptName, zoneID, crn, _ := flex.ConvertTfToCisThreeVar(d.Id()) @@ -163,7 +162,7 @@ func ResourceIBMCISEdgeFunctionsActionExists(d *schema.ResourceData, meta interf log.Printf("Edge functions action script is not found") return false, nil } - return false, fmt.Errorf("[ERROR] Error: %v", response) + return false, flex.FmtErrorf("[ERROR] Error: %v", response) } return true, nil } @@ -171,7 +170,7 @@ func ResourceIBMCISEdgeFunctionsActionExists(d *schema.ResourceData, meta interf func ResourceIBMCISEdgeFunctionsActionDelete(d *schema.ResourceData, meta interface{}) error { cisClient, err := meta.(conns.ClientSession).CisEdgeFunctionClientSession() if err != nil { - return fmt.Errorf("[ERROR] Error in creating CIS object") + return flex.FmtErrorf("[ERROR] Error in creating CIS object") } scriptName, zoneID, crn, _ := flex.ConvertTfToCisThreeVar(d.Id()) @@ -181,7 +180,7 @@ func ResourceIBMCISEdgeFunctionsActionDelete(d *schema.ResourceData, meta interf opt := cisClient.NewDeleteEdgeFunctionsActionOptions(scriptName) _, response, err := cisClient.DeleteEdgeFunctionsAction(opt) if err != nil { - return fmt.Errorf("[ERROR] Error in edge function action script deletion: %v", response) + return flex.FmtErrorf("[ERROR] Error in edge function action script deletion: %v", response) } return nil } diff --git a/ibm/service/cis/resource_ibm_cis_edge_functions_trigger.go b/ibm/service/cis/resource_ibm_cis_edge_functions_trigger.go index 77d4088bbb..bab70c648b 100644 --- a/ibm/service/cis/resource_ibm_cis_edge_functions_trigger.go +++ b/ibm/service/cis/resource_ibm_cis_edge_functions_trigger.go @@ -4,7 +4,6 @@ package cis import ( - "fmt" "log" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" @@ -101,7 +100,7 @@ func ResourceIBMCISEdgeFunctionsTriggerCreate(d *schema.ResourceData, meta inter result, _, err := cisClient.CreateEdgeFunctionsTrigger(opt) if err != nil { - return fmt.Errorf("[ERROR] Error creating edge function trigger route : %v", err) + return flex.FmtErrorf("[ERROR] Error creating edge function trigger route : %v", err) } d.SetId(flex.ConvertCisToTfThreeVar(*result.Result.ID, zoneID, crn)) return ResourceIBMCISEdgeFunctionsTriggerRead(d, meta) @@ -129,7 +128,7 @@ func ResourceIBMCISEdgeFunctionsTriggerUpdate(d *schema.ResourceData, meta inter _, _, err := cisClient.UpdateEdgeFunctionsTrigger(opt) if err != nil { - return fmt.Errorf("[ERROR] Error updating edge function trigger route : %v", err) + return flex.FmtErrorf("[ERROR] Error updating edge function trigger route : %v", err) } } return ResourceIBMCISEdgeFunctionsTriggerRead(d, meta) @@ -148,7 +147,7 @@ func ResourceIBMCISEdgeFunctionsTriggerRead(d *schema.ResourceData, meta interfa opt := cisClient.NewGetEdgeFunctionsTriggerOptions(routeID) result, resp, err := cisClient.GetEdgeFunctionsTrigger(opt) if err != nil { - return fmt.Errorf("[ERROR] Error: %v", resp) + return flex.FmtErrorf("[ERROR] Error: %v", resp) } d.Set(cisID, crn) d.Set(cisDomainID, zoneID) @@ -176,7 +175,7 @@ func ResourceIBMCISEdgeFunctionsTriggerExists(d *schema.ResourceData, meta inter log.Printf("Edge functions trigger route is not found") return false, nil } - return false, fmt.Errorf("[ERROR] Error: %v", response) + return false, flex.FmtErrorf("[ERROR] Error: %v", response) } return true, nil } @@ -184,7 +183,7 @@ func ResourceIBMCISEdgeFunctionsTriggerExists(d *schema.ResourceData, meta inter func ResourceIBMCISEdgeFunctionsTriggerDelete(d *schema.ResourceData, meta interface{}) error { cisClient, err := meta.(conns.ClientSession).CisEdgeFunctionClientSession() if err != nil { - return fmt.Errorf("[ERROR] Error in creating CIS object") + return flex.FmtErrorf("[ERROR] Error in creating CIS object") } routeID, zoneID, crn, _ := flex.ConvertTfToCisThreeVar(d.Id()) @@ -194,7 +193,7 @@ func ResourceIBMCISEdgeFunctionsTriggerDelete(d *schema.ResourceData, meta inter opt := cisClient.NewDeleteEdgeFunctionsTriggerOptions(routeID) _, response, err := cisClient.DeleteEdgeFunctionsTrigger(opt) if err != nil { - return fmt.Errorf("[ERROR] Error in edge function trigger route deletion: %v", response) + return flex.FmtErrorf("[ERROR] Error in edge function trigger route deletion: %v", response) } return nil } diff --git a/ibm/service/cis/resource_ibm_cis_filter.go b/ibm/service/cis/resource_ibm_cis_filter.go index eb22b3ab41..6d1d929df7 100644 --- a/ibm/service/cis/resource_ibm_cis_filter.go +++ b/ibm/service/cis/resource_ibm_cis_filter.go @@ -4,7 +4,6 @@ package cis import ( - "fmt" "log" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" @@ -69,13 +68,13 @@ func ResourceIBMCISFilter() *schema.Resource { func ResourceIBMCISFilterCreate(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).BluemixSession() if err != nil { - return fmt.Errorf("[ERROR] Error while Getting IAM Access Token using BluemixSession %s", err) + return flex.FmtErrorf("[ERROR] Error while Getting IAM Access Token using BluemixSession %s", err) } xAuthtoken := sess.Config.IAMAccessToken cisClient, err := meta.(conns.ClientSession).CisFiltersSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the CisFiltersSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the CisFiltersSession %s", err) } crn := d.Get(cisID).(string) @@ -102,7 +101,7 @@ func ResourceIBMCISFilterCreate(d *schema.ResourceData, meta interface{}) error result, resp, err := cisClient.CreateFilter(opt) if err != nil || result == nil { - return fmt.Errorf("[ERROR] Error creating Filter for zone %q: %s %s", zoneID, err, resp) + return flex.FmtErrorf("[ERROR] Error creating Filter for zone %q: %s %s", zoneID, err, resp) } d.SetId(flex.ConvertCisToTfThreeVar(*result.Result[0].ID, zoneID, crn)) return ResourceIBMCISFilterRead(d, meta) @@ -111,13 +110,13 @@ func ResourceIBMCISFilterCreate(d *schema.ResourceData, meta interface{}) error func ResourceIBMCISFilterRead(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).BluemixSession() if err != nil { - return fmt.Errorf("[ERROR] Error while Getting IAM Access Token using BluemixSession %s", err) + return flex.FmtErrorf("[ERROR] Error while Getting IAM Access Token using BluemixSession %s", err) } xAuthtoken := sess.Config.IAMAccessToken cisClient, err := meta.(conns.ClientSession).CisFiltersSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the CisFiltersSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the CisFiltersSession %s", err) } filterid, zoneID, crn, _ := flex.ConvertTfToCisThreeVar(d.Id()) if err != nil { @@ -132,7 +131,7 @@ func ResourceIBMCISFilterRead(d *schema.ResourceData, meta interface{}) error { d.SetId("") return nil } - return fmt.Errorf("[ERROR] Error finding GetFilter %q: %s %s", d.Id(), err, response) + return flex.FmtErrorf("[ERROR] Error finding GetFilter %q: %s %s", d.Id(), err, response) } if result.Result != nil { d.Set(cisID, crn) @@ -147,13 +146,13 @@ func ResourceIBMCISFilterRead(d *schema.ResourceData, meta interface{}) error { func ResourceIBMCISFilterUpdate(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).BluemixSession() if err != nil { - return fmt.Errorf("[ERROR] Error while Getting IAM Access Token using BluemixSession %s", err) + return flex.FmtErrorf("[ERROR] Error while Getting IAM Access Token using BluemixSession %s", err) } xAuthtoken := sess.Config.IAMAccessToken cisClient, err := meta.(conns.ClientSession).CisFiltersSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the CisFiltersSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the CisFiltersSession %s", err) } filterid, zoneID, crn, _ := flex.ConvertTfToCisThreeVar(d.Id()) @@ -187,11 +186,11 @@ func ResourceIBMCISFilterUpdate(d *schema.ResourceData, meta interface{}) error result, resp, err := cisClient.UpdateFilters(opt) if err != nil { - return fmt.Errorf("[ERROR] Error updating Filter for zone %q: %s %s", zoneID, err, resp) + return flex.FmtErrorf("[ERROR] Error updating Filter for zone %q: %s %s", zoneID, err, resp) } if *result.Result[0].ID == "" { - return fmt.Errorf("[ERROR] Error failed to find id in Update response; resource was empty") + return flex.FmtErrorf("[ERROR] Error failed to find id in Update response; resource was empty") } } return ResourceIBMCISFilterRead(d, meta) @@ -213,7 +212,7 @@ func ResourceIBMCISFilterDelete(d *schema.ResourceData, meta interface{}) error opt := cisClient.NewDeleteFiltersOptions(xAuthtoken, crn, zoneID, filterid) _, _, err = cisClient.DeleteFilters(opt) if err != nil { - return fmt.Errorf("[ERROR] Error deleting Filter: %s", err) + return flex.FmtErrorf("[ERROR] Error deleting Filter: %s", err) } return nil diff --git a/ibm/service/cis/resource_ibm_cis_firewall.go b/ibm/service/cis/resource_ibm_cis_firewall.go index 4e1a6c4b8c..219bc9f467 100644 --- a/ibm/service/cis/resource_ibm_cis_firewall.go +++ b/ibm/service/cis/resource_ibm_cis_firewall.go @@ -4,7 +4,6 @@ package cis import ( - "fmt" "log" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" @@ -417,7 +416,7 @@ func ResourceIBMCISFirewallRecordCreate(d *schema.ResourceData, meta interface{} mode := uaRule[cisFirewallUARuleMode].(string) configList := uaRule[cisFirewallUARuleConfiguration].([]interface{}) if len(configList) > 1 { - return fmt.Errorf("[ERROR] Only one configuration is allowed for %s type", firewallType) + return flex.FmtErrorf("[ERROR] Only one configuration is allowed for %s type", firewallType) } config := configList[0].(map[string]interface{}) target := config[cisFirewallLockdownConfigurationsTarget].(string) diff --git a/ibm/service/cis/resource_ibm_cis_firewall_rules.go b/ibm/service/cis/resource_ibm_cis_firewall_rules.go index 12c7b408a5..378844ac7d 100644 --- a/ibm/service/cis/resource_ibm_cis_firewall_rules.go +++ b/ibm/service/cis/resource_ibm_cis_firewall_rules.go @@ -84,13 +84,19 @@ func ResourceIBMCISFirewallrulesCreate(context context.Context, d *schema.Resour sess, err := meta.(conns.ClientSession).BluemixSession() if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("ResourceIBMCISFirewallrulesCreate BluemixSession initialization failed: %s", err.Error()), + "ibm_cis_firewall_rules", "create") + return tfErr.GetDiag() } xAuthtoken := sess.Config.IAMAccessToken cisClient, err := meta.(conns.ClientSession).CisFirewallRulesSession() if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("ResourceIBMCISFirewallrulesCreate CisFirewallRulesSession initialization failed: %s", err.Error()), + "ibm_cis_firewall_rules", "create") + return tfErr.GetDiag() } crn := d.Get(cisID).(string) @@ -126,7 +132,10 @@ func ResourceIBMCISFirewallrulesCreate(context context.Context, d *schema.Resour result, _, err := cisClient.CreateFirewallRulesWithContext(context, opt) if err != nil || result == nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error reading the %s", err)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("ResourceIBMCISFirewallrulesCreate CreateFirewallRulesWithContext failed: %s", err.Error()), + "ibm_cis_firewall_rules", "create") + return tfErr.GetDiag() } d.SetId(flex.ConvertCisToTfThreeVar(*result.Result[0].ID, zoneID, crn)) @@ -136,17 +145,26 @@ func ResourceIBMCISFirewallrulesCreate(context context.Context, d *schema.Resour func ResourceIBMCISFirewallrulesRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { sess, err := meta.(conns.ClientSession).BluemixSession() if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("ResourceIBMCISFirewallrulesRead BluemixSession initialization failed: %s", err.Error()), + "ibm_cis_firewall_rules", "read") + return tfErr.GetDiag() } xAuthtoken := sess.Config.IAMAccessToken cisClient, err := meta.(conns.ClientSession).CisFirewallRulesSession() if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("ResourceIBMCISFirewallrulesRead CisFirewallRulesSession initialization failed: %s", err.Error()), + "ibm_cis_firewall_rules", "create") + return tfErr.GetDiag() } firwallruleID, zoneID, crn, _ := flex.ConvertTfToCisThreeVar(d.Id()) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("ResourceIBMCISFirewallrulesRead ConvertTfToCisThreeVar failed: %s", err.Error()), + "ibm_cis_firewall_rules", "create") + return tfErr.GetDiag() } opt := cisClient.NewGetFirewallRuleOptions(xAuthtoken, crn, zoneID, firwallruleID) @@ -157,7 +175,10 @@ func ResourceIBMCISFirewallrulesRead(context context.Context, d *schema.Resource d.SetId("") return nil } - return diag.FromErr(fmt.Errorf("[ERROR] Error reading the firewall rules %s:%s", err, response)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("ResourceIBMCISFirewallrulesRead GetFirewallRuleWithContext failed: %s \n Response: %s", err.Error(), response), + "ibm_cis_firewall_rules", "create") + return tfErr.GetDiag() } d.Set(cisID, crn) d.Set(cisDomainID, zoneID) @@ -171,18 +192,27 @@ func ResourceIBMCISFirewallrulesRead(context context.Context, d *schema.Resource func ResourceIBMCISFirewallrulesUpdate(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { sess, err := meta.(conns.ClientSession).BluemixSession() if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("ResourceIBMCISFirewallrulesUpdate BluemixSession initialization failed: %s", err.Error()), + "ibm_cis_firewall_rules", "update") + return tfErr.GetDiag() } xAuthtoken := sess.Config.IAMAccessToken cisClient, err := meta.(conns.ClientSession).CisFirewallRulesSession() if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("ResourceIBMCISFirewallrulesUpdate CisFirewallRulesSession initialization failed: %s", err.Error()), + "ibm_cis_firewall_rules", "update") + return tfErr.GetDiag() } firewallruleID, zoneID, crn, _ := flex.ConvertTfToCisThreeVar(d.Id()) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("ResourceIBMCISFirewallrulesUpdate ConvertTfToCisThreeVar failed: %s", err.Error()), + "ibm_cis_firewall_rules", "update") + return tfErr.GetDiag() } if d.HasChange(cisFilterID) || @@ -221,7 +251,10 @@ func ResourceIBMCISFirewallrulesUpdate(context context.Context, d *schema.Resour result, _, err := cisClient.UpdateFirewllRulesWithContext(context, opt) if err != nil || result == nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error updating the firewall rules %s", err)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("ResourceIBMCISFirewallrulesUpdate UpdateFirewllRulesWithContext failed: %s", err.Error()), + "ibm_cis_firewall_rules", "update") + return tfErr.GetDiag() } } return ResourceIBMCISFirewallrulesRead(context, d, meta) @@ -229,18 +262,27 @@ func ResourceIBMCISFirewallrulesUpdate(context context.Context, d *schema.Resour func ResourceIBMCISFirewallrulesDelete(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { sess, err := meta.(conns.ClientSession).BluemixSession() if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("ResourceIBMCISFirewallrulesDelete BluemixSession initialization failed: %s", err.Error()), + "ibm_cis_firewall_rules", "delete") + return tfErr.GetDiag() } xAuthtoken := sess.Config.IAMAccessToken cisClient, err := meta.(conns.ClientSession).CisFirewallRulesSession() if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("ResourceIBMCISFirewallrulesDelete CisFirewallRulesSession initialization failed: %s", err.Error()), + "ibm_cis_firewall_rules", "delete") + return tfErr.GetDiag() } firewallruleid, zoneID, crn, _ := flex.ConvertTfToCisThreeVar(d.Id()) if err != nil { - return diag.FromErr(err) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("ResourceIBMCISFirewallrulesDelete ConvertTfToCisThreeVar failed: %s", err.Error()), + "ibm_cis_firewall_rules", "delete") + return tfErr.GetDiag() } opt := cisClient.NewDeleteFirewallRulesOptions(xAuthtoken, crn, zoneID, firewallruleid) _, response, err := cisClient.DeleteFirewallRulesWithContext(context, opt) @@ -248,7 +290,10 @@ func ResourceIBMCISFirewallrulesDelete(context context.Context, d *schema.Resour if response != nil && response.StatusCode == 404 { return nil } - return diag.FromErr(fmt.Errorf("[ERROR] Error deleting the custom resolver %s:%s", err, response)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("ResourceIBMCISFirewallrulesDelete DeleteFirewallRulesWithContext failed: %s Response: %s", err.Error(), response), + "ibm_cis_firewall_rules", "delete") + return tfErr.GetDiag() } if id, ok := d.GetOk(cisFilterID); ok { @@ -262,7 +307,10 @@ func ResourceIBMCISFirewallrulesDelete(context context.Context, d *schema.Resour filterOpt := cisFilterClient.NewDeleteFiltersOptions(xAuthtoken, crn, zoneID, filter_id) _, _, err = cisFilterClient.DeleteFilters(filterOpt) if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error deleting Filter: %s", err)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("ResourceIBMCISFirewallrulesDelete DeleteFilters failed: %s", err.Error()), + "ibm_cis_firewall_rules", "delete") + return tfErr.GetDiag() } } diff --git a/ibm/service/cis/resource_ibm_cis_global_load_balancer.go b/ibm/service/cis/resource_ibm_cis_global_load_balancer.go index 1f38ed1e36..2d39f5f60a 100644 --- a/ibm/service/cis/resource_ibm_cis_global_load_balancer.go +++ b/ibm/service/cis/resource_ibm_cis_global_load_balancer.go @@ -4,7 +4,6 @@ package cis import ( - "fmt" "log" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" @@ -417,7 +416,7 @@ func expandGeoPools(pool interface{}, geoType string) (map[string][]string, erro geoPools := flex.ExpandStringList(locationConfig[cisGLBRegionPoolsPoolIDs].([]interface{})) expandPool[location], _, _ = flex.ConvertTfToCisTwoVarSlice(geoPools) } else { - return nil, fmt.Errorf("duplicate entry specified for %s pool in location %q. "+ + return nil, flex.FmtErrorf("duplicate entry specified for %s pool in location %q. "+ "each location must only be specified once", geoType, location) } } diff --git a/ibm/service/cis/resource_ibm_cis_logpush_job.go b/ibm/service/cis/resource_ibm_cis_logpush_job.go index 2307da6d10..c68a27b78b 100644 --- a/ibm/service/cis/resource_ibm_cis_logpush_job.go +++ b/ibm/service/cis/resource_ibm_cis_logpush_job.go @@ -271,7 +271,7 @@ func ResourceIBMCISLogpushJobRead(d *schema.ResourceData, meta interface{}) erro } logpushID, zoneID, crn, err := flex.ConvertTfToCisThreeVar(d.Id()) if err != nil { - return fmt.Errorf("[ERROR] Error Converting ConvertTfToCisThreeVar in Read") + return flex.FmtErrorf("[ERROR] Error Converting ConvertTfToCisThreeVar in Read") } sess.Crn = core.StringPtr(crn) sess.ZoneID = core.StringPtr(zoneID) @@ -283,7 +283,7 @@ func ResourceIBMCISLogpushJobRead(d *schema.ResourceData, meta interface{}) erro d.SetId("") return nil } - return fmt.Errorf("[ERROR] Error While Reading the Logpushjobs for LogDNA %s:%s", err, response) + return flex.FmtErrorf("[ERROR] Error While Reading the Logpushjobs for LogDNA %s:%s", err, response) } d.Set(cisID, crn) d.Set(cisDomainID, zoneID) @@ -319,7 +319,7 @@ func ResourceIBMCISLogpushJobUpdate(d *schema.ResourceData, meta interface{}) er logpushID, _, _, err := flex.ConvertTfToCisThreeVar(d.Id()) if err != nil { - return fmt.Errorf("[ERROR] Error Converting ConvertTfToCisThreeVar in Update") + return flex.FmtErrorf("[ERROR] Error Converting ConvertTfToCisThreeVar in Update") } if d.HasChange(cisLogpushEnabled) || d.HasChange(cisLogpullOpt) || @@ -373,7 +373,7 @@ func ResourceIBMCISLogpushJobUpdate(d *schema.ResourceData, meta interface{}) er } result, resp, err := sess.UpdateLogpushJobV2(options) if err != nil || result == nil { - return fmt.Errorf("[ERROR] Error While Updating the Logpushjobs for LogDNA %v, %v", err, resp) + return flex.FmtErrorf("[ERROR] Error While Updating the Logpushjobs for LogDNA %v, %v", err, resp) } } return ResourceIBMCISLogpushJobRead(d, meta) @@ -390,7 +390,7 @@ func ResourceIBMCISLogpushJobDelete(d *schema.ResourceData, meta interface{}) er logpushID, _, _, err := flex.ConvertTfToCisThreeVar(d.Id()) if err != nil { - return fmt.Errorf("[ERROR] Error Converting ConvertTfToCisThreeVar in Delete") + return flex.FmtErrorf("[ERROR] Error Converting ConvertTfToCisThreeVar in Delete") } opt := sess.NewDeleteLogpushJobV2Options(logpushID) _, response, err := sess.DeleteLogpushJobV2(opt) @@ -398,7 +398,7 @@ func ResourceIBMCISLogpushJobDelete(d *schema.ResourceData, meta interface{}) er if response != nil && response.StatusCode == 404 { return nil } - return fmt.Errorf("[ERROR] Error While Deleting the Logpushjob for LogDNA %s:%s", err, response) + return flex.FmtErrorf("[ERROR] Error While Deleting the Logpushjob for LogDNA %s:%s", err, response) } d.SetId("") return nil diff --git a/ibm/service/cis/resource_ibm_cis_mtls.go b/ibm/service/cis/resource_ibm_cis_mtls.go index 565089bdcf..ab88095df6 100644 --- a/ibm/service/cis/resource_ibm_cis_mtls.go +++ b/ibm/service/cis/resource_ibm_cis_mtls.go @@ -106,7 +106,10 @@ func ResourceIBMCISMtlsValidator() *validate.ResourceValidator { func resourceIBMCISMtlsCreate(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { sess, err := meta.(conns.ClientSession).CisMtlsSession() if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while getting the CisMtlsSession() %s %v", err, sess)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISMtlsCreate CisMtlsSession initialization failed: %s", err.Error()), + "ibm_cis_mtls", "create") + return tfErr.GetDiag() } crn := d.Get(cisID).(string) zoneID := d.Get(cisDomainID).(string) @@ -128,7 +131,10 @@ func resourceIBMCISMtlsCreate(context context.Context, d *schema.ResourceData, m result, resp, err := sess.CreateAccessCertificate(options) if err != nil || result == nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error creating MTLS access certificate %v", resp)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISMtlsCreate CreateAccessCertificate failed: %s \nResponse: %v", err.Error(), resp), + "ibm_cis_mtls", "create") + return tfErr.GetDiag() } d.SetId(flex.ConvertCisToTfThreeVar(*result.Result.ID, zoneID, crn)) @@ -139,7 +145,10 @@ func resourceIBMCISMtlsCreate(context context.Context, d *schema.ResourceData, m func resourceIBMCISMtlsRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { sess, err := meta.(conns.ClientSession).CisMtlsSession() if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while getting the CisMtlsSession() %s %v", err, sess)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISMtlsRead CisMtlsSession initialization failed: %s", err.Error()), + "ibm_cis_mtls", "read") + return tfErr.GetDiag() } //crn := d.Get(cisID).(string) //sess.Crn = core.StringPtr(crn) @@ -154,7 +163,10 @@ func resourceIBMCISMtlsRead(context context.Context, d *schema.ResourceData, met d.SetId("") return nil } - return diag.FromErr(fmt.Errorf("[ERROR] Error While reading MTLS access certificate %v:%v:%v", err, response, result)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISMtlsRead GetAccessCertificate failed: %s \nResponse: %v \nResult: %v", err.Error(), response, result), + "ibm_cis_mtls", "read") + return tfErr.GetDiag() } d.Set(cisID, crn) @@ -171,7 +183,10 @@ func resourceIBMCISMtlsRead(context context.Context, d *schema.ResourceData, met func resourceIBMCISMtlsUpdate(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { sess, err := meta.(conns.ClientSession).CisMtlsSession() if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while getting the CisMtlsSession() %s %v", err, sess)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISMtlsUpdate CisMtlsSession initialization failed: %s", err.Error()), + "ibm_cis_mtls", "update") + return tfErr.GetDiag() } crn := d.Get(cisID).(string) @@ -194,7 +209,10 @@ func resourceIBMCISMtlsUpdate(context context.Context, d *schema.ResourceData, m _, updateResp, updateErr := sess.UpdateAccessCertificate(updateOption) if updateErr != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while updating the MTLS cert options %v", updateResp)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISMtlsUpdate UpdateAccessCertificate failed: %s \nResponse: %v", updateErr.Error(), updateResp), + "ibm_cis_mtls", "update") + return tfErr.GetDiag() } } @@ -204,7 +222,10 @@ func resourceIBMCISMtlsUpdate(context context.Context, d *schema.ResourceData, m func resourceIBMCISMtlsDelete(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { sess, err := meta.(conns.ClientSession).CisMtlsSession() if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while getting the CisMtlsSession() %s %v", err, sess)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISMtlsDelete CisMtlsSession initialization failed: %s", err.Error()), + "ibm_cis_mtls", "delete") + return tfErr.GetDiag() } certID, zoneID, crn, _ := flex.ConvertTfToCisThreeVar(d.Id()) @@ -215,8 +236,10 @@ func resourceIBMCISMtlsDelete(context context.Context, d *schema.ResourceData, m delOpt := sess.NewDeleteAccessCertificateOptions(zoneID, certID) _, delResp, delErr := sess.DeleteAccessCertificate(delOpt) if delErr != nil { - - return diag.FromErr(fmt.Errorf("[ERROR] Error While deleting the MTLS cert : %v", delResp)) + tfErr := flex.TerraformErrorf(delErr, + fmt.Sprintf("resourceIBMCISMtlsDelete CisMtlsSession initialization failed: %s \nResponse: %v", delErr.Error(), delResp), + "ibm_cis_mtls", "delete") + return tfErr.GetDiag() } return nil diff --git a/ibm/service/cis/resource_ibm_cis_mtls_app.go b/ibm/service/cis/resource_ibm_cis_mtls_app.go index 37b5a40768..25c21c8bc8 100644 --- a/ibm/service/cis/resource_ibm_cis_mtls_app.go +++ b/ibm/service/cis/resource_ibm_cis_mtls_app.go @@ -146,7 +146,10 @@ func resourceIBMCISMtlsAppCreate(context context.Context, d *schema.ResourceData var common_rule_set bool sess, err := meta.(conns.ClientSession).CisMtlsSession() if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while getting the CisMtlsSession() %s %v", err, sess)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISMtlsAppCreate CisMtlsSession initialization failed: %s", err.Error()), + "ibm_cis_mtls_app", "create") + return tfErr.GetDiag() } crn := d.Get(cisID).(string) zoneID, _, _ := flex.ConvertTftoCisTwoVar(d.Get(cisDomainID).(string)) @@ -169,7 +172,10 @@ func resourceIBMCISMtlsAppCreate(context context.Context, d *schema.ResourceData resultApp, responseApp, operationErrApp := sess.CreateAccessApplication(OptionsApp) if operationErrApp != nil || resultApp == nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error creating access application %v %v", operationErrApp, responseApp)) + tfErr := flex.TerraformErrorf(operationErrApp, + fmt.Sprintf("resourceIBMCISMtlsAppCreate CreateAccessApplication failed: %s \nResponse: %s", operationErrApp.Error(), responseApp), + "ibm_cis_mtls_app", "create") + return tfErr.GetDiag() } d.SetId(flex.ConvertCisToTfThreeVar(*resultApp.Result.ID, zoneID, crn)) @@ -218,7 +224,10 @@ func resourceIBMCISMtlsAppCreate(context context.Context, d *schema.ResourceData resultPolicy, responsePolicy, operationErrPolicy := sess.CreateAccessPolicy(optionsPolicy) if operationErrPolicy != nil || resultPolicy == nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error creating app policy %v", responsePolicy)) + tfErr := flex.TerraformErrorf(operationErrPolicy, + fmt.Sprintf("resourceIBMCISMtlsAppCreate CreateAccessPolicy failed: %s \nResponse: %s", operationErrPolicy.Error(), responsePolicy), + "ibm_cis_mtls_app", "create") + return tfErr.GetDiag() } d.SetId(flex.ConvertCisToTfFourVar(*resultApp.Result.ID, *resultPolicy.Result.ID, zoneID, crn)) @@ -228,7 +237,10 @@ func resourceIBMCISMtlsAppCreate(context context.Context, d *schema.ResourceData func resourceIBMCISMtlsAppRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { sess, err := meta.(conns.ClientSession).CisMtlsSession() if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while getting the CisMtlsSession() %s %v", err, sess)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISMtlsAppRead CisMtlsSession initialization failed: %s", err.Error()), + "ibm_cis_mtls_app", "read") + return tfErr.GetDiag() } appID, policyID, zoneID, crn, _ := flex.ConvertTfToCisFourVar(d.Id()) @@ -237,14 +249,20 @@ func resourceIBMCISMtlsAppRead(context context.Context, d *schema.ResourceData, getAppResult, getAppResp, getAppErr := sess.GetAccessApplication(getAppOptions) if getAppErr != nil || getAppResult == nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error getting app deatil %v", getAppResp)) + tfErr := flex.TerraformErrorf(getAppErr, + fmt.Sprintf("resourceIBMCISMtlsAppRead GetAccessApplication failed: %s \nResponse: %s", getAppErr.Error(), getAppResp), + "ibm_cis_mtls_app", "read") + return tfErr.GetDiag() } getPolicyOptions := sess.NewGetAccessPolicyOptions(zoneID, appID, policyID) getPolicyResult, getPolicyResp, getPolicyErr := sess.GetAccessPolicy(getPolicyOptions) if getPolicyErr != nil || getPolicyResult == nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error getting Policy detail %v", getPolicyResp)) + tfErr := flex.TerraformErrorf(getPolicyErr, + fmt.Sprintf("resourceIBMCISMtlsAppRead GetAccessPolicy failed: %s \nResponse: %s", getPolicyErr.Error(), getPolicyResp), + "ibm_cis_mtls_app", "read") + return tfErr.GetDiag() } d.Set(cisID, crn) @@ -261,7 +279,10 @@ func resourceIBMCISMtlsAppRead(context context.Context, d *schema.ResourceData, func resourceIBMCISMtlsAppUpdate(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { sess, err := meta.(conns.ClientSession).CisMtlsSession() if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while getting the CisMtlsSession() %s %v", err, sess)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISMtlsAppUpdate CisMtlsSession initialization failed: %s", err.Error()), + "ibm_cis_mtls_app", "update") + return tfErr.GetDiag() } appID, _, zoneID, crn, _ := flex.ConvertTfToCisFourVar(d.Id()) @@ -286,7 +307,10 @@ func resourceIBMCISMtlsAppUpdate(context context.Context, d *schema.ResourceData d.SetId("") return nil } - return diag.FromErr(fmt.Errorf("[ERROR] Error while updating the applicatoin values %v", updateResultApp)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISMtlsAppUpdate UpdateAccessApplication failed: %s \nResponse: %v", updateErrApp.Error(), updateResultApp), + "ibm_cis_mtls_app", "update") + return tfErr.GetDiag() } optionsPolicy := sess.NewCreateAccessPolicyOptions(zoneID, appID) @@ -304,7 +328,10 @@ func resourceIBMCISMtlsAppUpdate(context context.Context, d *schema.ResourceData d.SetId("") return nil } - return diag.FromErr(fmt.Errorf("[ERROR] Error while updating the applicatoin values %v", resultPolicy)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISMtlsAppUpdate CreateAccessPolicy failed: %s \nResponse: %v", operationErrPolicy.Error(), resultPolicy), + "ibm_cis_mtls_app", "update") + return tfErr.GetDiag() } } @@ -314,7 +341,10 @@ func resourceIBMCISMtlsAppUpdate(context context.Context, d *schema.ResourceData func resourceIBMCISMtlsAppDelete(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { sess, err := meta.(conns.ClientSession).CisMtlsSession() if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while getting the CisMtlsSession() %s %v", err, sess)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISMtlsAppDelete CisMtlsSession initialization failed: %s", err.Error()), + "ibm_cis_mtls_app", "delete") + return tfErr.GetDiag() } appID, policyID, zoneID, crn, _ := flex.ConvertTfToCisFourVar(d.Id()) @@ -325,13 +355,19 @@ func resourceIBMCISMtlsAppDelete(context context.Context, d *schema.ResourceData delOptPolicy := sess.NewDeleteAccessPolicyOptions(zoneID, appID, policyID) _, delRespPolicy, delErrPolicy := sess.DeleteAccessPolicy(delOptPolicy) if delErrPolicy != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error While deleting the policy :%v", delRespPolicy)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISMtlsAppDelete DeleteAccessPolicy failed: %s \nResponse: %v", err.Error(), delRespPolicy), + "ibm_cis_mtls_app", "delete") + return tfErr.GetDiag() } delAccOpt := sess.NewDeleteAccessApplicationOptions(zoneID, appID) _, delAccResp, delAccErr := sess.DeleteAccessApplication(delAccOpt) if delAccErr != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error While deleting the app :%v", delAccResp)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISMtlsAppDelete DeleteAccessApplication failed: %s \nResponse: %v", err.Error(), delAccResp), + "ibm_cis_mtls_app", "delete") + return tfErr.GetDiag() } return nil diff --git a/ibm/service/cis/resource_ibm_cis_origin_auth.go b/ibm/service/cis/resource_ibm_cis_origin_auth.go index 0795aa2922..20d0b9bb8f 100644 --- a/ibm/service/cis/resource_ibm_cis_origin_auth.go +++ b/ibm/service/cis/resource_ibm_cis_origin_auth.go @@ -132,7 +132,10 @@ func resourceIBMCISOriginAuthPullCreate(context context.Context, d *schema.Resou sess, err := meta.(conns.ClientSession).CisOrigAuthSession() if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while getting the CisOrigAuthSession %v", err)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISOriginAuthPullCreate CisOrigAuthSession initialization failed: %s", err.Error()), + "ibm_cis_origin_auth", "create") + return tfErr.GetDiag() } crn := d.Get(cisID).(string) @@ -166,7 +169,10 @@ func resourceIBMCISOriginAuthPullCreate(context context.Context, d *schema.Resou result, resp, opErr := sess.UploadZoneOriginPullCertificate(options) if opErr != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while uploading certificate zone level %v", resp)) + tfErr := flex.TerraformErrorf(opErr, + fmt.Sprintf("resourceIBMCISOriginAuthPullCreate UploadZoneOriginPullCertificate failed: %s \nResponse: %v", opErr.Error(), resp), + "ibm_cis_origin_auth", "create") + return tfErr.GetDiag() } d.SetId(flex.ConvertCisToTfFourVar(*result.Result.ID, level_val, zoneID, crn)) @@ -177,7 +183,10 @@ func resourceIBMCISOriginAuthPullCreate(context context.Context, d *schema.Resou options.SetPrivateKey(key_val) result, resp, opErr := sess.UploadHostnameOriginPullCertificate(options) if opErr != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while uploading certificate host level %v", resp)) + tfErr := flex.TerraformErrorf(opErr, + fmt.Sprintf("resourceIBMCISOriginAuthPullCreate UploadHostnameOriginPullCertificate failed: %s \nResponse: %v", opErr.Error(), resp), + "ibm_cis_origin_auth", "create") + return tfErr.GetDiag() } d.SetId(flex.ConvertCisToTfFourVar(*result.Result.ID, level_val, zoneID, crn)) @@ -191,7 +200,10 @@ func resourceIBMCISOriginAuthPullRead(context context.Context, d *schema.Resourc var zone_config bool sess, err := meta.(conns.ClientSession).CisOrigAuthSession() if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while getting the CisOrigAuthSession %v", err)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISOriginAuthPullRead CisOrigAuthSession initialization failed: %s", err.Error()), + "ibm_cis_origin_auth", "read") + return tfErr.GetDiag() } certID, level_val, zoneID, crn, _ := flex.ConvertTfToCisFourVar(d.Id()) @@ -210,7 +222,10 @@ func resourceIBMCISOriginAuthPullRead(context context.Context, d *schema.Resourc result, response, err := sess.GetZoneOriginPullCertificate(getOptions) if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while getting detail of zone origin auth pull %v:%v", err, response)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISOriginAuthPullRead GetZoneOriginPullCertificate failed: %s \nResponse: %v", err.Error(), response), + "ibm_cis_origin_auth", "read") + return tfErr.GetDiag() } d.Set(cisOriginAuthID, *result.Result.ID) d.Set(cisOriginAuthCertContent, *result.Result.Certificate) @@ -226,7 +241,10 @@ func resourceIBMCISOriginAuthPullRead(context context.Context, d *schema.Resourc result, response, err := sess.GetHostnameOriginPullCertificate(getOptions) if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while getting detail of host origin auth pull %v:%v", err, response)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISOriginAuthPullRead GetHostnameOriginPullCertificate failed: %s \nResponse: %v", err.Error(), response), + "ibm_cis_origin_auth", "read") + return tfErr.GetDiag() } d.Set(cisOriginAuthID, *result.Result.ID) d.Set(cisOriginAuthCertContent, *result.Result.Certificate) @@ -247,7 +265,10 @@ func resourceIBMCISOriginAuthPullUpdate(context context.Context, d *schema.Resou var host_name string sess, err := meta.(conns.ClientSession).CisOrigAuthSession() if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while getting the CisOrigAuthSession %v", err)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISOriginAuthPullUpdate CisOrigAuthSession initialization failed: %s", err.Error()), + "ibm_cis_origin_auth", "update") + return tfErr.GetDiag() } certID, level_val, zoneID, crn, _ := flex.ConvertTfToCisFourVar(d.Id()) @@ -267,7 +288,10 @@ func resourceIBMCISOriginAuthPullUpdate(context context.Context, d *schema.Resou _, response, err := sess.SetZoneOriginPullSettings(updateOption) if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while updaing the zone origin auth pull setting %v:%v", err, response)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISOriginAuthPullUpdate SetZoneOriginPullSettings failed: %s \nResponse: %v", err.Error(), response), + "ibm_cis_origin_auth", "update") + return tfErr.GetDiag() } } @@ -288,7 +312,10 @@ func resourceIBMCISOriginAuthPullUpdate(context context.Context, d *schema.Resou setOption.SetConfig([]authenticatedoriginpullapiv1.HostnameOriginPullSettings{*model}) _, setResp, setErr := sess.SetHostnameOriginPullSettings(setOption) if setErr != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while updaing the host origin auth pull setting %v:%v", setErr, setResp)) + tfErr := flex.TerraformErrorf(setErr, + fmt.Sprintf("resourceIBMCISOriginAuthPullUpdate SetZoneOriginPullSettings failed: %s \nResponse: %v", setErr.Error(), setResp), + "ibm_cis_origin_auth", "update") + return tfErr.GetDiag() } } @@ -302,7 +329,10 @@ func resourceIBMCISOriginAuthPullDelete(context context.Context, d *schema.Resou var zone_config bool sess, err := meta.(conns.ClientSession).CisOrigAuthSession() if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while getting the CisOrigAuthSession %v", err)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISOriginAuthPullDelete CisOrigAuthSession initialization failed: %s", err.Error()), + "ibm_cis_origin_auth", "delete") + return tfErr.GetDiag() } certID, level_val, zoneID, crn, _ := flex.ConvertTfToCisFourVar(d.Id()) @@ -319,7 +349,10 @@ func resourceIBMCISOriginAuthPullDelete(context context.Context, d *schema.Resou _, resp, err := sess.DeleteZoneOriginPullCertificate(delOpt) if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while deleting the certificate zone level %v: %v", certID, resp)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISOriginAuthPullDelete DeleteZoneOriginPullCertificate failed: %s \nResponse: %v", err.Error(), resp), + "ibm_cis_origin_auth", "delete") + return tfErr.GetDiag() } } else { @@ -327,7 +360,10 @@ func resourceIBMCISOriginAuthPullDelete(context context.Context, d *schema.Resou _, resp, err := sess.DeleteHostnameOriginPullCertificate(delOpt) if err != nil { - return diag.FromErr(fmt.Errorf("[ERROR] Error while deleting the certificate host level %v: %v", certID, resp)) + tfErr := flex.TerraformErrorf(err, + fmt.Sprintf("resourceIBMCISOriginAuthPullDelete DeleteHostnameOriginPullCertificate failed: %s \nResponse: %v", err.Error(), resp), + "ibm_cis_origin_auth", "delete") + return tfErr.GetDiag() } } diff --git a/ibm/service/cis/resource_ibm_cis_range_app.go b/ibm/service/cis/resource_ibm_cis_range_app.go index 9579b5a420..2fabeed76f 100644 --- a/ibm/service/cis/resource_ibm_cis_range_app.go +++ b/ibm/service/cis/resource_ibm_cis_range_app.go @@ -4,7 +4,6 @@ package cis import ( - "fmt" "log" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" @@ -277,7 +276,7 @@ func ResourceIBMCISRangeAppCreate(d *schema.ResourceData, meta interface{}) erro result, resp, err := cisClient.CreateRangeApp(opt) if err != nil { - return fmt.Errorf("[ERROR] Failed to create range application: %v", resp) + return flex.FmtErrorf("[ERROR] Failed to create range application: %v", resp) } d.SetId(flex.ConvertCisToTfThreeVar(*result.Result.ID, zoneID, crn)) return ResourceIBMCISRangeAppRead(d, meta) @@ -296,7 +295,7 @@ func ResourceIBMCISRangeAppRead(d *schema.ResourceData, meta interface{}) error opt := cisClient.NewGetRangeAppOptions(rangeAppID) result, resp, err := cisClient.GetRangeApp(opt) if err != nil { - return fmt.Errorf("[ERROR] Failed to read range application: %v", resp) + return flex.FmtErrorf("[ERROR] Failed to read range application: %v", resp) } d.Set(cisID, crn) d.Set(cisDomainID, zoneID) @@ -382,7 +381,7 @@ func ResourceIBMCISRangeAppUpdate(d *schema.ResourceData, meta interface{}) erro } _, resp, err := cisClient.UpdateRangeApp(opt) if err != nil { - return fmt.Errorf("[ERROR] Failed to update range application: %v", resp) + return flex.FmtErrorf("[ERROR] Failed to update range application: %v", resp) } } return ResourceIBMCISRangeAppRead(d, meta) @@ -400,7 +399,7 @@ func ResourceIBMCISRangeAppDelete(d *schema.ResourceData, meta interface{}) erro opt := cisClient.NewDeleteRangeAppOptions(rangeAppID) _, resp, err := cisClient.DeleteRangeApp(opt) if err != nil { - return fmt.Errorf("[ERROR] Failed to delete range application: %v", resp) + return flex.FmtErrorf("[ERROR] Failed to delete range application: %v", resp) } return nil } @@ -420,7 +419,7 @@ func ResourceIBMCISRangeAppExists(d *schema.ResourceData, meta interface{}) (boo log.Println("range application is not found") return false, nil } - return false, fmt.Errorf("[ERROR] Failed to getting existing range application: %v", err) + return false, flex.FmtErrorf("[ERROR] Failed to getting existing range application: %v", err) } return true, nil } diff --git a/ibm/service/cis/resource_ibm_cis_rate_limit.go b/ibm/service/cis/resource_ibm_cis_rate_limit.go index 7a021110ef..5aae9e9ad0 100644 --- a/ibm/service/cis/resource_ibm_cis_rate_limit.go +++ b/ibm/service/cis/resource_ibm_cis_rate_limit.go @@ -4,7 +4,6 @@ package cis import ( - "fmt" "log" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" @@ -385,13 +384,13 @@ func ResourceIBMCISRateLimitCreate(d *schema.ResourceData, meta interface{}) err action, err := expandRateLimitAction(d) if err != nil { - return fmt.Errorf("[ERROR] Error in getting action from expandRateLimitAction %s", err) + return flex.FmtErrorf("[ERROR] Error in getting action from expandRateLimitAction %s", err) } opt.SetAction(action) match, err := expandRateLimitMatch(d) if err != nil { - return fmt.Errorf("[ERROR] Error in getting match from expandRateLimitMatch %s", err) + return flex.FmtErrorf("[ERROR] Error in getting match from expandRateLimitMatch %s", err) } opt.SetMatch(match) @@ -402,14 +401,14 @@ func ResourceIBMCISRateLimitCreate(d *schema.ResourceData, meta interface{}) err byPass, err := expandRateLimitBypass(d) if err != nil { - return fmt.Errorf("[ERROR] Error in getting bypass from expandRateLimitBypass %s", err) + return flex.FmtErrorf("[ERROR] Error in getting bypass from expandRateLimitBypass %s", err) } opt.SetBypass(byPass) //creating rate limit rule result, resp, err := cisClient.CreateZoneRateLimits(opt) if err != nil { - return fmt.Errorf("[ERROR] Failed to create RateLimit: %v", resp) + return flex.FmtErrorf("[ERROR] Failed to create RateLimit: %v", resp) } record := result.Result d.SetId(flex.ConvertCisToTfThreeVar(*record.ID, zoneID, cisID)) @@ -430,7 +429,7 @@ func ResourceIBMCISRateLimitRead(d *schema.ResourceData, meta interface{}) error opt := cisClient.NewGetRateLimitOptions(recordID) result, resp, err := cisClient.GetRateLimit(opt) if err != nil { - return fmt.Errorf("[ERROR] Failed to read RateLimit: %v", resp) + return flex.FmtErrorf("[ERROR] Failed to read RateLimit: %v", resp) } rule := result.Result @@ -482,13 +481,13 @@ func ResourceIBMCISRateLimitUpdate(d *schema.ResourceData, meta interface{}) err action, err := expandRateLimitAction(d) if err != nil { - return fmt.Errorf("[ERROR] Error in getting action from expandRateLimitAction %s", err) + return flex.FmtErrorf("[ERROR] Error in getting action from expandRateLimitAction %s", err) } opt.SetAction(action) match, err := expandRateLimitMatch(d) if err != nil { - return fmt.Errorf("[ERROR] Error in getting match from expandRateLimitMatch %s", err) + return flex.FmtErrorf("[ERROR] Error in getting match from expandRateLimitMatch %s", err) } opt.SetMatch(match) @@ -499,12 +498,12 @@ func ResourceIBMCISRateLimitUpdate(d *schema.ResourceData, meta interface{}) err byPass, err := expandRateLimitBypass(d) if err != nil { - return fmt.Errorf("[ERROR] Error in getting bypass from expandRateLimitBypass %s", err) + return flex.FmtErrorf("[ERROR] Error in getting bypass from expandRateLimitBypass %s", err) } opt.SetBypass(byPass) _, resp, err := cisClient.UpdateRateLimit(opt) if err != nil { - return fmt.Errorf("[ERROR] Failed to update RateLimit: %v", resp) + return flex.FmtErrorf("[ERROR] Failed to update RateLimit: %v", resp) } } d.SetId(flex.ConvertCisToTfThreeVar(recordID, zoneID, cisID)) @@ -523,7 +522,7 @@ func ResourceIBMCISRateLimitDelete(d *schema.ResourceData, meta interface{}) err opt := cisClient.NewDeleteZoneRateLimitOptions(recordID) _, resp, err := cisClient.DeleteZoneRateLimit(opt) if err != nil { - return fmt.Errorf("[ERROR] Failed to delete RateLimit: %v", resp) + return flex.FmtErrorf("[ERROR] Failed to delete RateLimit: %v", resp) } return nil } @@ -543,7 +542,7 @@ func ResourceIBMCISRateLimitExists(d *schema.ResourceData, meta interface{}) (bo log.Println("ratelimit is not found") return false, nil } - return false, fmt.Errorf("[ERROR] Failed to getting existing RateLimit: %v", err) + return false, flex.FmtErrorf("[ERROR] Failed to getting existing RateLimit: %v", err) } return true, nil } @@ -556,12 +555,12 @@ func expandRateLimitAction(d *schema.ResourceData) ( timeout := actionRecord["timeout"].(int) if timeout == 0 { if mode == "simulate" || mode == "ban" { - return action, fmt.Errorf("[ERROR] For the mode 'simulate' and 'ban' timeout must be %s %s", + return action, flex.FmtErrorf("[ERROR] For the mode 'simulate' and 'ban' timeout must be %s %s", "set.. valid range for timeout is 10 - 86400", err) } } else { if mode == "challenge" || mode == "js_challenge" { - return action, fmt.Errorf("[ERROR] Timeout field is only valid for 'simulate' and 'ban' modes. %s", err) + return action, flex.FmtErrorf("[ERROR] Timeout field is only valid for 'simulate' and 'ban' modes. %s", err) } } action.Mode = core.StringPtr(mode) @@ -661,7 +660,7 @@ func expandRateLimitCorrelate(d *schema.ResourceData) ( correlate = &zoneratelimitsv1.RatelimitInputCorrelate{} c, ok := d.GetOk("correlate") if !ok { - err = fmt.Errorf("correlate field is empty") + err = flex.FmtErrorf("correlate field is empty") return &zoneratelimitsv1.RatelimitInputCorrelate{}, err } correlateRecord := c.([]interface{})[0].(map[string]interface{}) diff --git a/ibm/service/cis/resource_ibm_cis_ruleset.go b/ibm/service/cis/resource_ibm_cis_ruleset.go index f598a8ed43..b4fcd8af91 100644 --- a/ibm/service/cis/resource_ibm_cis_ruleset.go +++ b/ibm/service/cis/resource_ibm_cis_ruleset.go @@ -343,7 +343,7 @@ func ResourceIBMCISRulesetValidator() *validate.ResourceValidator { func ResourceIBMCISRulesetCreate(d *schema.ResourceData, meta interface{}) error { // check if it is a new resource, if true then return error that user need to import it first if d.IsNewResource() { - return fmt.Errorf("[ERROR] You can not create a new resource. Please import the resource first. Check documentation for import usage") + return flex.FmtErrorf("[ERROR] You can not create a new resource. Please import the resource first. Check documentation for import usage") } return nil } @@ -351,7 +351,7 @@ func ResourceIBMCISRulesetCreate(d *schema.ResourceData, meta interface{}) error func ResourceIBMCISRulesetUpdate(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).CisRulesetsSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the CisRulesetsSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the CisRulesetsSession %s", err) } crn := d.Get(cisID).(string) @@ -375,7 +375,7 @@ func ResourceIBMCISRulesetUpdate(d *schema.ResourceData, meta interface{}) error _, resp, err := sess.UpdateZoneRuleset(opt) if err != nil { - return fmt.Errorf("[ERROR] Error while updating the zone Ruleset %s", resp) + return flex.FmtErrorf("[ERROR] Error while updating the zone Ruleset %s", resp) } d.SetId(dataSourceCISRulesetsCheckID(d)) @@ -394,7 +394,7 @@ func ResourceIBMCISRulesetUpdate(d *schema.ResourceData, meta interface{}) error _, _, err := sess.UpdateInstanceRuleset(opt) if err != nil { - return fmt.Errorf("[ERROR] Error while updating the zone Ruleset %s", err) + return flex.FmtErrorf("[ERROR] Error while updating the zone Ruleset %s", err) } d.SetId(dataSourceCISRulesetsCheckID(d)) @@ -406,7 +406,7 @@ func ResourceIBMCISRulesetUpdate(d *schema.ResourceData, meta interface{}) error func ResourceIBMCISRulesetRead(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).CisRulesetsSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the CisRulesetsSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the CisRulesetsSession %s", err) } rulesetId, zoneId, crn, _ := flex.ConvertTfToCisThreeVar(d.Id()) @@ -421,7 +421,7 @@ func ResourceIBMCISRulesetRead(d *schema.ResourceData, meta interface{}) error { opt := sess.NewGetZoneRulesetOptions(rulesetId) result, resp, err := sess.GetZoneRuleset(opt) if err != nil { - return fmt.Errorf("[WARN] Resource: Get zone ruleset failed: %v \n", resp) + return flex.FmtErrorf("[WARN] Resource: Get zone ruleset failed: %v \n", resp) } rulesetObj := flattenCISRulesets(*result.Result) @@ -435,7 +435,7 @@ func ResourceIBMCISRulesetRead(d *schema.ResourceData, meta interface{}) error { opt := sess.NewGetInstanceRulesetOptions(rulesetId) result, resp, err := sess.GetInstanceRuleset(opt) if err != nil { - return fmt.Errorf("[WARN] Resource: Get Instance ruleset failed: %v \n", resp) + return flex.FmtErrorf("[WARN] Resource: Get Instance ruleset failed: %v \n", resp) } rulesetObj := flattenCISRulesets(*result.Result) @@ -453,7 +453,7 @@ func ResourceIBMCISRulesetDelete(d *schema.ResourceData, meta interface{}) error sess, err := meta.(conns.ClientSession).CisRulesetsSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the CisRulesetsSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the CisRulesetsSession %s", err) } rulesetId, zoneId, crn, _ := flex.ConvertTfToCisThreeVar(d.Id()) @@ -464,13 +464,13 @@ func ResourceIBMCISRulesetDelete(d *schema.ResourceData, meta interface{}) error opt := sess.NewDeleteZoneRulesetOptions(rulesetId) res, err := sess.DeleteZoneRuleset(opt) if err != nil { - return fmt.Errorf("[ERROR] Error deleting the zone ruleset %s:%s", err, res) + return flex.FmtErrorf("[ERROR] Error deleting the zone ruleset %s:%s", err, res) } } else { opt := sess.NewDeleteInstanceRulesetOptions(rulesetId) res, err := sess.DeleteInstanceRuleset(opt) if err != nil { - return fmt.Errorf("[ERROR] Error deleting the Instance ruleset %s:%s", err, res) + return flex.FmtErrorf("[ERROR] Error deleting the Instance ruleset %s:%s", err, res) } } @@ -552,7 +552,7 @@ func expandCISRulesetsRulesPositions(obj interface{}) (rulesetsv1.Position, erro Index: &index, } } else { - return rulesetsv1.Position{}, fmt.Errorf("only one of 'before', 'after', or 'index' can be set") + return rulesetsv1.Position{}, flex.FmtErrorf("only one of 'before', 'after', or 'index' can be set") } } return responseObj, nil diff --git a/ibm/service/cis/resource_ibm_cis_ruleset_entrypoint_version.go b/ibm/service/cis/resource_ibm_cis_ruleset_entrypoint_version.go index 786f041d87..637e3530df 100644 --- a/ibm/service/cis/resource_ibm_cis_ruleset_entrypoint_version.go +++ b/ibm/service/cis/resource_ibm_cis_ruleset_entrypoint_version.go @@ -4,8 +4,6 @@ package cis import ( - "fmt" - "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/validate" @@ -65,12 +63,12 @@ func ResourceIBMCISRulesetEntryPointVersionValidator() *validate.ResourceValidat func ResourceIBMCISRulesetEntryPointVersionRead(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).CisRulesetsSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the CisRulesetsSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the CisRulesetsSession %s", err) } ruleset_phase, zoneId, crn, err := flex.ConvertTfToCisThreeVar(d.Id()) if err != nil { - return fmt.Errorf("[ERROR] Error while ConvertTftoCisThreeVar %s", err) + return flex.FmtErrorf("[ERROR] Error while ConvertTftoCisThreeVar %s", err) } sess.Crn = core.StringPtr(crn) @@ -79,7 +77,7 @@ func ResourceIBMCISRulesetEntryPointVersionRead(d *schema.ResourceData, meta int opt := sess.Clone().NewGetZoneEntrypointRulesetOptions(ruleset_phase) result, resp, err := sess.GetZoneEntrypointRuleset(opt) if err != nil { - return fmt.Errorf("[WARN] Get zone ruleset failed: %v", resp) + return flex.FmtErrorf("[WARN] Get zone ruleset failed: %v", resp) } rulesetObj := flattenCISRulesets(*result.Result) @@ -92,7 +90,7 @@ func ResourceIBMCISRulesetEntryPointVersionRead(d *schema.ResourceData, meta int opt := sess.NewGetInstanceEntrypointRulesetOptions(ruleset_phase) result, resp, err := sess.GetInstanceEntrypointRuleset(opt) if err != nil { - return fmt.Errorf("[WARN] Get zone ruleset failed: %v", resp) + return flex.FmtErrorf("[WARN] Get zone ruleset failed: %v", resp) } rulesetObj := flattenCISRulesets(*result.Result) @@ -109,7 +107,7 @@ func ResourceIBMCISRulesetEntryPointVersionRead(d *schema.ResourceData, meta int func ResourceIBMCISRulesetEntryPointVersionUpdate(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).CisRulesetsSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the CisRulesetsSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the CisRulesetsSession %s", err) } crn := d.Get(cisID).(string) @@ -134,7 +132,7 @@ func ResourceIBMCISRulesetEntryPointVersionUpdate(d *schema.ResourceData, meta i result, resp, err := sess.UpdateZoneEntrypointRuleset(opt) if err != nil || result == nil { - return fmt.Errorf("[ERROR] Error while Update Zone Entrypoint Rulesets %s %s", err, resp) + return flex.FmtErrorf("[ERROR] Error while Update Zone Entrypoint Rulesets %s %s", err, resp) } } else { @@ -149,7 +147,7 @@ func ResourceIBMCISRulesetEntryPointVersionUpdate(d *schema.ResourceData, meta i result, resp, err := sess.UpdateInstanceEntrypointRuleset(opt) if err != nil || result == nil { - return fmt.Errorf("[ERROR] Error while Update Entrypoint Rulesets %s %s", err, resp) + return flex.FmtErrorf("[ERROR] Error while Update Entrypoint Rulesets %s %s", err, resp) } } diff --git a/ibm/service/cis/resource_ibm_cis_ruleset_rule.go b/ibm/service/cis/resource_ibm_cis_ruleset_rule.go index 44dd85c22e..adbaf84c66 100644 --- a/ibm/service/cis/resource_ibm_cis_ruleset_rule.go +++ b/ibm/service/cis/resource_ibm_cis_ruleset_rule.go @@ -4,7 +4,6 @@ package cis import ( - "fmt" "reflect" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" @@ -300,7 +299,7 @@ func ResourceIBMCISRulesetRuleValidator() *validate.ResourceValidator { func ResourceIBMCISRulesetRuleCreate(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).CisRulesetsSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the CisRulesetsSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the CisRulesetsSession %s", err) } crn := d.Get(cisID).(string) zoneId := d.Get(cisDomainID).(string) @@ -325,7 +324,7 @@ func ResourceIBMCISRulesetRuleCreate(d *schema.ResourceData, meta interface{}) e if !reflect.ValueOf(rulesObject[CISRulesetsRulePosition]).IsNil() { position, err = expandCISRulesetsRulesPositions(rulesObject[CISRulesetsRulePosition]) if err != nil { - return fmt.Errorf("[ERROR] Error while creating the zone Rule %s", err) + return flex.FmtErrorf("[ERROR] Error while creating the zone Rule %s", err) } } opt.SetPosition(&position) @@ -339,7 +338,7 @@ func ResourceIBMCISRulesetRuleCreate(d *schema.ResourceData, meta interface{}) e result, resp, err := sess.CreateZoneRulesetRule(opt) if err != nil { - return fmt.Errorf("[ERROR] Error while creating the zone Rule %s", resp) + return flex.FmtErrorf("[ERROR] Error while creating the zone Rule %s", resp) } len_rules := len(result.Result.Rules) @@ -398,7 +397,7 @@ func ResourceIBMCISRulesetRuleCreate(d *schema.ResourceData, meta interface{}) e if reflect.ValueOf(rulesObject[CISRulesetsRulePosition]).IsNil() { position, err = expandCISRulesetsRulesPositions(rulesObject[CISRulesetsRulePosition]) if err != nil { - return fmt.Errorf("[ERROR] Error while creating the instance Rule %s", err) + return flex.FmtErrorf("[ERROR] Error while creating the instance Rule %s", err) } } opt.SetPosition(&position) @@ -412,7 +411,7 @@ func ResourceIBMCISRulesetRuleCreate(d *schema.ResourceData, meta interface{}) e result, resp, err := sess.CreateInstanceRulesetRule(opt) if err != nil { - return fmt.Errorf("[ERROR] Error while creating the instance Rule %s", resp) + return flex.FmtErrorf("[ERROR] Error while creating the instance Rule %s", resp) } len_rules := len(result.Result.Rules) @@ -431,7 +430,7 @@ func ResourceIBMCISRulesetRuleRead(d *schema.ResourceData, meta interface{}) err func ResourceIBMCISRulesetRuleUpdate(d *schema.ResourceData, meta interface{}) error { sess, err := meta.(conns.ClientSession).CisRulesetsSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the CisRulesetsSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the CisRulesetsSession %s", err) } ruleId, rulesetId, zoneId, crn, _ := flex.ConvertTfToCisFourVar(d.Id()) @@ -454,7 +453,7 @@ func ResourceIBMCISRulesetRuleUpdate(d *schema.ResourceData, meta interface{}) e opt.SetRef(rulesetsRuleObject[CISRulesetsRuleRef].(string)) position, positionError := expandCISRulesetsRulesPositions(rulesetsRuleObject[CISRulesetsRulePosition]) if positionError != nil { - return fmt.Errorf("[ERROR] Error while updating the zone Ruleset %s", err) + return flex.FmtErrorf("[ERROR] Error while updating the zone Ruleset %s", err) } opt.SetPosition(&position) @@ -465,7 +464,7 @@ func ResourceIBMCISRulesetRuleUpdate(d *schema.ResourceData, meta interface{}) e _, _, err := sess.UpdateZoneRulesetRule(opt) if err != nil { - return fmt.Errorf("[ERROR] Error while updating the zone Ruleset %s", err) + return flex.FmtErrorf("[ERROR] Error while updating the zone Ruleset %s", err) } d.SetId(dataSourceCISRulesetsRuleCheckID(d, ruleId)) @@ -483,7 +482,7 @@ func ResourceIBMCISRulesetRuleUpdate(d *schema.ResourceData, meta interface{}) e opt.SetRef(rulesetsRuleObject[CISRulesetsRuleAction].(string)) position, err := expandCISRulesetsRulesPositions(rulesetsRuleObject[CISRulesetsRulePosition]) if err != nil { - return fmt.Errorf("[ERROR] Error while updating the instance Ruleset %s", err) + return flex.FmtErrorf("[ERROR] Error while updating the instance Ruleset %s", err) } opt.SetPosition(&position) @@ -494,7 +493,7 @@ func ResourceIBMCISRulesetRuleUpdate(d *schema.ResourceData, meta interface{}) e _, _, err = sess.UpdateInstanceRulesetRule(opt) if err != nil { - return fmt.Errorf("[ERROR] Error while updating the instance Ruleset %s", err) + return flex.FmtErrorf("[ERROR] Error while updating the instance Ruleset %s", err) } d.SetId(dataSourceCISRulesetsRuleCheckID(d, ruleId)) @@ -506,7 +505,7 @@ func ResourceIBMCISRulesetRuleDelete(d *schema.ResourceData, meta interface{}) e sess, err := meta.(conns.ClientSession).CisRulesetsSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the CisRulesetsSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the CisRulesetsSession %s", err) } ruleId, rulesetId, zoneId, crn, _ := flex.ConvertTfToCisFourVar(d.Id()) @@ -517,13 +516,13 @@ func ResourceIBMCISRulesetRuleDelete(d *schema.ResourceData, meta interface{}) e opt := sess.NewDeleteZoneRulesetRuleOptions(rulesetId, ruleId) _, res, err := sess.DeleteZoneRulesetRule(opt) if err != nil { - return fmt.Errorf("[ERROR] Error deleting the zone ruleset rule %s:%s", err, res) + return flex.FmtErrorf("[ERROR] Error deleting the zone ruleset rule %s:%s", err, res) } } else { opt := sess.NewDeleteInstanceRulesetRuleOptions(rulesetId, ruleId) _, res, err := sess.DeleteInstanceRulesetRule(opt) if err != nil { - return fmt.Errorf("[ERROR] Error deleting the Instance ruleset rule %s:%s", err, res) + return flex.FmtErrorf("[ERROR] Error deleting the Instance ruleset rule %s:%s", err, res) } } diff --git a/ibm/service/cis/resource_ibm_cis_ruleset_version_detach.go b/ibm/service/cis/resource_ibm_cis_ruleset_version_detach.go index 76c9e38985..7c7f0b0d63 100644 --- a/ibm/service/cis/resource_ibm_cis_ruleset_version_detach.go +++ b/ibm/service/cis/resource_ibm_cis_ruleset_version_detach.go @@ -4,10 +4,10 @@ package cis import ( - "fmt" "time" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns" + "github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex" "github.com/IBM-Cloud/terraform-provider-ibm/ibm/validate" "github.com/IBM/go-sdk-core/v5/core" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -68,7 +68,7 @@ func ResourceIBMCISRulesetVersionDetachCreate(d *schema.ResourceData, meta inter sess, err := meta.(conns.ClientSession).CisRulesetsSession() if err != nil { - return fmt.Errorf("[ERROR] Error while getting the CisRulesetsSession %s", err) + return flex.FmtErrorf("[ERROR] Error while getting the CisRulesetsSession %s", err) } crn := d.Get(cisID).(string) @@ -83,13 +83,13 @@ func ResourceIBMCISRulesetVersionDetachCreate(d *schema.ResourceData, meta inter opt := sess.NewDeleteZoneRulesetVersionOptions(rulesetId, ruleset_version) res, err := sess.DeleteZoneRulesetVersion(opt) if err != nil { - return fmt.Errorf("[ERROR] Error detaching the zone ruleset version %s:%s", err, res) + return flex.FmtErrorf("[ERROR] Error detaching the zone ruleset version %s:%s", err, res) } } else { opt := sess.NewDeleteInstanceRulesetVersionOptions(rulesetId, ruleset_version) res, err := sess.DeleteInstanceRulesetVersion(opt) if err != nil { - return fmt.Errorf("[ERROR] Error detaching the Instance ruleset version %s:%s", err, res) + return flex.FmtErrorf("[ERROR] Error detaching the Instance ruleset version %s:%s", err, res) } }