Remove duplication of Error in fmt.Errorf messages

Since these messages are already prefixed with `Error:`.
hashicorp · Oct 1, 2020 · 8eee6e8 · 8eee6e8
1 parent 5eb820d
commit 8eee6e8
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/azurerm/internal/services/securitycenter/advanced_threat_protection.go b/azurerm/internal/services/securitycenter/advanced_threat_protection.go
@@ -21,7 +21,7 @@ func ParseAdvancedThreatProtectionID(input string) (*AdvancedThreatProtectionRes
 
 	parts := strings.Split(input, "/providers/Microsoft.Security/advancedThreatProtectionSettings/")
 	if len(parts) != 2 {
-		return nil, fmt.Errorf("Error determining target resource ID, resource ID in unexpected format: %q", id)
+		return nil, fmt.Errorf("Determining target resource ID, resource ID in unexpected format: %q", id)
 	}
 
 	return &AdvancedThreatProtectionResourceID{

diff --git a/azurerm/internal/services/securitycenter/resource_arm_advanced_threat_protection.go b/azurerm/internal/services/securitycenter/resource_arm_advanced_threat_protection.go
@@ -59,7 +59,7 @@ func resourceArmAdvancedThreatProtectionCreateUpdate(d *schema.ResourceData, met
 		server, err := client.Get(ctx, resourceID)
 		if err != nil {
 			if !utils.ResponseWasNotFound(server.Response) {
-				return fmt.Errorf("Error checking for presence of existing Advanced Threat Protection for resource %q: %+v", resourceID, err)
+				return fmt.Errorf("Checking for presence of existing Advanced Threat Protection for resource %q: %+v", resourceID, err)
 			}
 		}
 
@@ -76,7 +76,7 @@ func resourceArmAdvancedThreatProtectionCreateUpdate(d *schema.ResourceData, met
 
 	resp, err := client.Create(ctx, resourceID, setting)
 	if err != nil {
-		return fmt.Errorf("Error updating Advanced Threat protection for resource %q: %+v", resourceID, err)
+		return fmt.Errorf("Updating Advanced Threat protection for resource %q: %+v", resourceID, err)
 	}
 
 	if resp.ID == nil {
@@ -105,7 +105,7 @@ func resourceArmAdvancedThreatProtectionRead(d *schema.ResourceData, meta interf
 			return nil
 		}
 
-		return fmt.Errorf("Error reading Advanced Threat protection for resource %q: %+v", id.TargetResourceID, err)
+		return fmt.Errorf("Reading Advanced Threat protection for resource %q: %+v", id.TargetResourceID, err)
 	}
 
 	d.Set("target_resource_id", id.TargetResourceID)
@@ -134,7 +134,7 @@ func resourceArmAdvancedThreatProtectionDelete(d *schema.ResourceData, meta inte
 	}
 
 	if _, err := client.Create(ctx, id.TargetResourceID, setting); err != nil {
-		return fmt.Errorf("Error resetting Advanced Threat protection to false for resource %q: %+v", id.TargetResourceID, err)
+		return fmt.Errorf("Resetting Advanced Threat protection to false for resource %q: %+v", id.TargetResourceID, err)
 	}
 
 	return nil

diff --git a/azurerm/internal/services/securitycenter/resource_arm_security_center_contact.go b/azurerm/internal/services/securitycenter/resource_arm_security_center_contact.go
@@ -75,7 +75,7 @@ func resourceArmSecurityCenterContactCreateUpdate(d *schema.ResourceData, meta i
 		existing, err := client.Get(ctx, name)
 		if err != nil {
 			if !utils.ResponseWasNotFound(existing.Response) {
-				return fmt.Errorf("Error checking for presence of existing Security Center Contact: %+v", err)
+				return fmt.Errorf("Checking for presence of existing Security Center Contact: %+v", err)
 			}
 		}
 
@@ -105,20 +105,20 @@ func resourceArmSecurityCenterContactCreateUpdate(d *schema.ResourceData, meta i
 
 	if d.IsNewResource() {
 		if _, err := client.Create(ctx, name, contact); err != nil {
-			return fmt.Errorf("Error creating Security Center Contact: %+v", err)
+			return fmt.Errorf("Creating Security Center Contact: %+v", err)
 		}
 
 		resp, err := client.Get(ctx, name)
 		if err != nil {
-			return fmt.Errorf("Error reading Security Center Contact: %+v", err)
+			return fmt.Errorf("Reading Security Center Contact: %+v", err)
 		}
 		if resp.ID == nil {
 			return fmt.Errorf("Security Center Contact ID is nil")
 		}
 
 		d.SetId(*resp.ID)
 	} else if _, err := client.Update(ctx, name, contact); err != nil {
-		return fmt.Errorf("Error updating Security Center Contact: %+v", err)
+		return fmt.Errorf("Updating Security Center Contact: %+v", err)
 	}
 
 	return resourceArmSecurityCenterContactRead(d, meta)
@@ -139,7 +139,7 @@ func resourceArmSecurityCenterContactRead(d *schema.ResourceData, meta interface
 			return nil
 		}
 
-		return fmt.Errorf("Error reading Security Center Contact: %+v", err)
+		return fmt.Errorf("Reading Security Center Contact: %+v", err)
 	}
 
 	if properties := resp.ContactProperties; properties != nil {
@@ -166,7 +166,7 @@ func resourceArmSecurityCenterContactDelete(d *schema.ResourceData, meta interfa
 			return nil
 		}
 
-		return fmt.Errorf("Error deleting Security Center Contact: %+v", err)
+		return fmt.Errorf("Deleting Security Center Contact: %+v", err)
 	}
 
 	return nil

diff --git a/...erm/internal/services/securitycenter/resource_arm_security_center_subscription_pricing.go b/...erm/internal/services/securitycenter/resource_arm_security_center_subscription_pricing.go
@@ -88,12 +88,12 @@ func resourceArmSecurityCenterSubscriptionPricingUpdate(d *schema.ResourceData,
 	resource_type := d.Get("resource_type").(string)
 
 	if _, err := client.Update(ctx, resource_type, pricing); err != nil {
-		return fmt.Errorf("Error creating/updating Security Center Subscription pricing: %+v", err)
+		return fmt.Errorf("Creating/updating Security Center Subscription pricing: %+v", err)
 	}
 
 	resp, err := client.Get(ctx, resource_type)
 	if err != nil {
-		return fmt.Errorf("Error reading Security Center Subscription pricing: %+v", err)
+		return fmt.Errorf("Reading Security Center Subscription pricing: %+v", err)
 	}
 	if resp.ID == nil {
 		return fmt.Errorf("Security Center Subscription pricing ID is nil")
@@ -122,7 +122,7 @@ func resourceArmSecurityCenterSubscriptionPricingRead(d *schema.ResourceData, me
 			return nil
 		}
 
-		return fmt.Errorf("Error reading %q Security Center Subscription pricing: %+v", id.ResourceType, err)
+		return fmt.Errorf("Reading %q Security Center Subscription pricing: %+v", id.ResourceType, err)
 	}
 
 	if properties := resp.PricingProperties; properties != nil {

diff --git a/azurerm/internal/services/securitycenter/resource_arm_security_center_workspace.go b/azurerm/internal/services/securitycenter/resource_arm_security_center_workspace.go
@@ -67,7 +67,7 @@ func resourceArmSecurityCenterWorkspaceCreateUpdate(d *schema.ResourceData, meta
 		existing, err := client.Get(ctx, name)
 		if err != nil {
 			if !utils.ResponseWasNotFound(existing.Response) {
-				return fmt.Errorf("Error checking for presence of existing Security Center Workspace: %+v", err)
+				return fmt.Errorf("Checking for presence of existing Security Center Workspace: %+v", err)
 			}
 		}
 
@@ -81,7 +81,7 @@ func resourceArmSecurityCenterWorkspaceCreateUpdate(d *schema.ResourceData, meta
 	isPricingStandard, err := isPricingStandard(ctx, priceClient)
 
 	if err != nil {
-		return fmt.Errorf("Error checking Security Center Subscription pricing tier %v", err)
+		return fmt.Errorf("Checking Security Center Subscription pricing tier %v", err)
 	}
 
 	if !isPricingStandard {
@@ -97,10 +97,10 @@ func resourceArmSecurityCenterWorkspaceCreateUpdate(d *schema.ResourceData, meta
 
 	if d.IsNewResource() {
 		if _, err = client.Create(ctx, name, contact); err != nil {
-			return fmt.Errorf("Error creating Security Center Workspace: %+v", err)
+			return fmt.Errorf("Creating Security Center Workspace: %+v", err)
 		}
 	} else if _, err = client.Update(ctx, name, contact); err != nil {
-		return fmt.Errorf("Error updating Security Center Workspace: %+v", err)
+		return fmt.Errorf("Updating Security Center Workspace: %+v", err)
 	}
 
 	// api returns "" for workspace id after an create/update and eventually the new value
@@ -111,7 +111,7 @@ func resourceArmSecurityCenterWorkspaceCreateUpdate(d *schema.ResourceData, meta
 		Refresh: func() (interface{}, string, error) {
 			resp, err2 := client.Get(ctx, name)
 			if err2 != nil {
-				return resp, "Error", fmt.Errorf("Error reading Security Center Workspace: %+v", err2)
+				return resp, "Error", fmt.Errorf("Reading Security Center Workspace: %+v", err2)
 			}
 
 			if properties := resp.WorkspaceSettingProperties; properties != nil {
@@ -132,7 +132,7 @@ func resourceArmSecurityCenterWorkspaceCreateUpdate(d *schema.ResourceData, meta
 
 	resp, err := stateConf.WaitForState()
 	if err != nil {
-		return fmt.Errorf("Error waiting: %+v", err)
+		return fmt.Errorf("Waiting: %+v", err)
 	}
 
 	if d.IsNewResource() {
@@ -145,7 +145,7 @@ func resourceArmSecurityCenterWorkspaceCreateUpdate(d *schema.ResourceData, meta
 func isPricingStandard(ctx context.Context, priceClient *security.PricingsClient) (bool, error) {
 	prices, err := priceClient.List(ctx)
 	if err != nil {
-		return false, fmt.Errorf("Error listing Security Center Subscription pricing: %+v", err)
+		return false, fmt.Errorf("Listing Security Center Subscription pricing: %+v", err)
 	}
 
 	if prices.Value != nil {
@@ -176,7 +176,7 @@ func resourceArmSecurityCenterWorkspaceRead(d *schema.ResourceData, meta interfa
 			return nil
 		}
 
-		return fmt.Errorf("Error reading Security Center Workspace: %+v", err)
+		return fmt.Errorf("Reading Security Center Workspace: %+v", err)
 	}
 
 	if properties := resp.WorkspaceSettingProperties; properties != nil {
@@ -199,7 +199,7 @@ func resourceArmSecurityCenterWorkspaceDelete(d *schema.ResourceData, meta inter
 			return nil
 		}
 
-		return fmt.Errorf("Error deleting Security Center Workspace: %+v", err)
+		return fmt.Errorf("Deleting Security Center Workspace: %+v", err)
 	}
 
 	return nil