Fix golangci-lint errors (#441)

Signed-off-by: Modular Magician <[email protected]>

google-beta/convert_test.go

@@ -66,7 +66,9 @@ func TestSetOmittedFields(t *testing.T) {
 		},
 	}
 	output := &OutputOuter{}
-	Convert(input, output)
+	if err := Convert(input, output); err != nil {
+		t.Errorf("Error converting: %v", err)
+	}
 	if input.NotOmitted != output.NotOmitted ||
 		!reflect.DeepEqual(input.Omitted, output.Omitted) ||
 		!reflect.DeepEqual(input.Struct, output.Struct) ||

google-beta/data_source_google_compute_address_test.go

@@ -141,6 +141,9 @@ func testAccCheckDataSourceComputeAddressDestroy(resource_name string) resource.
 		}
 
 		addressId, err := parseComputeAddressId(rs.Primary.ID, nil)
+		if err != nil {
+			return err
+		}
 
 		_, err = config.clientCompute.Addresses.Get(
 			config.Project, addressId.Region, addressId.Name).Do()

google-beta/data_source_storage_object_signed_url.go

@@ -348,7 +348,9 @@ func SignString(toSign []byte, cfg *jwt.Config) ([]byte, error) {
 
 	// Hash string
 	hasher := sha256.New()
-	hasher.Write(toSign)
+	if _, err := hasher.Write(toSign); err != nil {
+		return nil, errwrap.Wrapf("failed to calculate sha256: {{err}}", err)
+	}
 
 	// Sign string
 	signed, err := rsa.SignPKCS1v15(rand.Reader, pk, crypto.SHA256, hasher.Sum(nil))

google-beta/resource_access_context_manager_access_level.go

@@ -291,6 +291,9 @@ func resourceAccessContextManagerAccessLevelUpdate(d *schema.ResourceData, meta
 	}
 
 	obj, err = resourceAccessContextManagerAccessLevelEncoder(d, meta, obj)
+	if err != nil {
+		return err
+	}
 
 	url, err := replaceVars(d, config, "https://accesscontextmanager.googleapis.com/v1beta/{{name}}")
 	if err != nil {
@@ -377,7 +380,9 @@ func resourceAccessContextManagerAccessLevelImport(d *schema.ResourceData, meta
 	config := meta.(*Config)
 
 	// current import_formats can't import ids with forward slashes in them.
-	parseImportId([]string{"(?P<name>.+)"}, d, config)
+	if err := parseImportId([]string{"(?P<name>.+)"}, d, config); err != nil {
+		return nil, err
+	}
 	stringParts := strings.Split(d.Get("name").(string), "/")
 	d.Set("parent", fmt.Sprintf("%s/%s", stringParts[0], stringParts[1]))
 	return []*schema.ResourceData{d}, nil

google-beta/resource_access_context_manager_service_perimeter.go

@@ -265,6 +265,9 @@ func resourceAccessContextManagerServicePerimeterUpdate(d *schema.ResourceData,
 	}
 
 	obj, err = resourceAccessContextManagerServicePerimeterEncoder(d, meta, obj)
+	if err != nil {
+		return err
+	}
 
 	url, err := replaceVars(d, config, "https://accesscontextmanager.googleapis.com/v1beta/{{name}}")
 	if err != nil {
@@ -351,7 +354,9 @@ func resourceAccessContextManagerServicePerimeterImport(d *schema.ResourceData,
 	config := meta.(*Config)
 
 	// current import_formats can't import ids with forward slashes in them.
-	parseImportId([]string{"(?P<name>.+)"}, d, config)
+	if err := parseImportId([]string{"(?P<name>.+)"}, d, config); err != nil {
+		return nil, err
+	}
 	stringParts := strings.Split(d.Get("name").(string), "/")
 	d.Set("parent", fmt.Sprintf("%s/%s", stringParts[0], stringParts[1]))
 	return []*schema.ResourceData{d}, nil

google-beta/resource_composer_environment.go

@@ -488,7 +488,9 @@ func resourceComposerEnvironmentDelete(d *schema.ResourceData, meta interface{})
 
 func resourceComposerEnvironmentImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*Config)
-	parseImportId([]string{"projects/(?P<project>[^/]+)/locations/(?P<region>[^/]+)/environments/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)", "(?P<name>[^/]+)"}, d, config)
+	if err := parseImportId([]string{"projects/(?P<project>[^/]+)/locations/(?P<region>[^/]+)/environments/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)", "(?P<name>[^/]+)"}, d, config); err != nil {
+		return nil, err
+	}
 
 	// Replace import id for the resource id
 	id, err := replaceVars(d, config, "{{project}}/{{region}}/{{name}}")

google-beta/resource_compute_address.go

@@ -231,6 +231,9 @@ func resourceComputeAddressCreate(d *schema.ResourceData, meta interface{}) erro
 		obj := make(map[string]interface{})
 		// d.Get("labels") will have been overridden by the Read call.
 		labelsProp, err := expandComputeAddressLabels(v, d, config)
+		if err != nil {
+			return err
+		}
 		obj["labels"] = labelsProp
 		labelFingerprintProp := d.Get("label_fingerprint")
 		obj["labelFingerprint"] = labelFingerprintProp

google-beta/resource_compute_backend_service.go

@@ -277,6 +277,9 @@ func resourceComputeBackendServiceCreate(d *schema.ResourceData, meta interface{
 
 	if v, ok := d.GetOk("security_policy"); ok {
 		pol, err := ParseSecurityPolicyFieldValue(v.(string), d, config)
+		if err != nil {
+			return errwrap.Wrapf("Error parsing Backend Service security policy: {{err}}", err)
+		}
 		op, err := config.clientComputeBeta.BackendServices.SetSecurityPolicy(
 			project, service.Name, &computeBeta.SecurityPolicyReference{
 				SecurityPolicy: pol.RelativeLink(),

google-beta/resource_compute_firewall_migrate_test.go

@@ -73,7 +73,7 @@ func TestComputeFirewallMigrateState_empty(t *testing.T) {
 
 	// should handle non-nil but empty
 	is = &terraform.InstanceState{}
-	is, err = resourceComputeFirewallMigrateState(0, is, meta)
+	_, err = resourceComputeFirewallMigrateState(0, is, meta)
 
 	if err != nil {
 		t.Fatalf("err: %#v", err)

google-beta/resource_compute_forwarding_rule.go

@@ -341,6 +341,9 @@ func resourceComputeForwardingRuleCreate(d *schema.ResourceData, meta interface{
 		obj := make(map[string]interface{})
 		// d.Get("labels") will have been overridden by the Read call.
 		labelsProp, err := expandComputeForwardingRuleLabels(v, d, config)
+		if err != nil {
+			return err
+		}
 		obj["labels"] = labelsProp
 		labelFingerprintProp := d.Get("label_fingerprint")
 		obj["labelFingerprint"] = labelFingerprintProp

google-beta/resource_compute_global_address.go

@@ -234,6 +234,9 @@ func resourceComputeGlobalAddressCreate(d *schema.ResourceData, meta interface{}
 		obj := make(map[string]interface{})
 		// d.Get("labels") will have been overridden by the Read call.
 		labelsProp, err := expandComputeGlobalAddressLabels(v, d, config)
+		if err != nil {
+			return err
+		}
 		obj["labels"] = labelsProp
 		labelFingerprintProp := d.Get("label_fingerprint")
 		obj["labelFingerprint"] = labelFingerprintProp

google-beta/resource_compute_health_check.go

@@ -464,6 +464,9 @@ func resourceComputeHealthCheckUpdate(d *schema.ResourceData, meta interface{})
 	}
 
 	obj, err = resourceComputeHealthCheckEncoder(d, meta, obj)
+	if err != nil {
+		return err
+	}
 
 	url, err := replaceVars(d, config, "https://www.googleapis.com/compute/beta/projects/{{project}}/global/healthChecks/{{name}}")
 	if err != nil {

google-beta/resource_compute_instance.go

@@ -1024,8 +1024,6 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
 		instNetworkInterface := instance.NetworkInterfaces[i]
 		networkName := d.Get(prefix + ".name").(string)
 
-		// TODO: This sanity check is broken by #929, disabled for now (by forcing the equality)
-		networkName = instNetworkInterface.Name
 		// Sanity check
 		if networkName != instNetworkInterface.Name {
 			return fmt.Errorf("Instance networkInterface had unexpected name: %s", instNetworkInterface.Name)

google-beta/resource_compute_instance_group_manager.go

@@ -566,9 +566,9 @@ func resourceComputeInstanceGroupManagerDelete(d *schema.ResourceData, meta inte
 			return err
 		}
 
-		instanceGroup, err := config.clientComputeBeta.InstanceGroups.Get(
+		instanceGroup, igErr := config.clientComputeBeta.InstanceGroups.Get(
 			project, zone, name).Do()
-		if err != nil {
+		if igErr != nil {
 			return fmt.Errorf("Error getting instance group size: %s", err)
 		}
 

google-beta/resource_compute_instance_migrate_test.go

@@ -132,7 +132,7 @@ func TestComputeInstanceMigrateState_empty(t *testing.T) {
 
 	// should handle non-nil but empty
 	is = &terraform.InstanceState{}
-	is, err = resourceComputeInstanceMigrateState(0, is, meta)
+	_, err = resourceComputeInstanceMigrateState(0, is, meta)
 
 	if err != nil {
 		t.Fatalf("err: %#v", err)
@@ -841,7 +841,7 @@ func runInstanceMigrateTest(t *testing.T, id, testName string, version int, attr
 		ID:         id,
 		Attributes: attributes,
 	}
-	is, err := resourceComputeInstanceMigrateState(version, is, meta)
+	_, err := resourceComputeInstanceMigrateState(version, is, meta)
 	if err != nil {
 		t.Fatal(err)
 	}

google-beta/resource_compute_instance_template_migrate_test.go

@@ -129,7 +129,7 @@ func TestComputeInstanceTemplateMigrateState_empty(t *testing.T) {
 
 	// should handle non-nil but empty
 	is = &terraform.InstanceState{}
-	is, err = resourceComputeInstanceTemplateMigrateState(0, is, meta)
+	_, err = resourceComputeInstanceTemplateMigrateState(0, is, meta)
 
 	if err != nil {
 		t.Fatalf("err: %#v", err)

google-beta/resource_compute_region_instance_group_manager.go

@@ -534,6 +534,9 @@ func resourceComputeRegionInstanceGroupManagerDelete(d *schema.ResourceData, met
 
 	// Wait for the operation to complete
 	err = computeSharedOperationWaitTime(config.clientCompute, op, regionalID.Project, int(d.Timeout(schema.TimeoutDelete).Minutes()), "Deleting RegionInstanceGroupManager")
+	if err != nil {
+		return fmt.Errorf("Error waiting for delete to complete: %s", err)
+	}
 
 	d.SetId("")
 	return nil

google-beta/resource_compute_ssl_policy.go

@@ -280,6 +280,9 @@ func resourceComputeSslPolicyUpdate(d *schema.ResourceData, meta interface{}) er
 	}
 
 	obj, err = resourceComputeSslPolicyUpdateEncoder(d, meta, obj)
+	if err != nil {
+		return err
+	}
 
 	url, err := replaceVars(d, config, "https://www.googleapis.com/compute/beta/projects/{{project}}/global/sslPolicies/{{name}}")
 	if err != nil {

google-beta/resource_container_cluster_migrate_test.go

@@ -67,7 +67,7 @@ func TestContainerClusterMigrateState_empty(t *testing.T) {
 
 	// should handle non-nil but empty
 	is = &terraform.InstanceState{}
-	is, err = resourceContainerClusterMigrateState(0, is, meta)
+	_, err = resourceContainerClusterMigrateState(0, is, meta)
 
 	if err != nil {
 		t.Fatalf("err: %#v", err)

google-beta/resource_container_node_pool_migrate_test.go

@@ -1,8 +1,9 @@
 package google
 
 import (
-	"github.com/hashicorp/terraform/terraform"
 	"testing"
+
+	"github.com/hashicorp/terraform/terraform"
 )
 
 func TestContainerNodePoolMigrateState(t *testing.T) {
@@ -57,7 +58,7 @@ func TestContainerNodePoolMigrateState_empty(t *testing.T) {
 
 	// should handle non-nil but empty
 	is = &terraform.InstanceState{}
-	is, err = resourceContainerNodePoolMigrateState(0, is, meta)
+	_, err = resourceContainerNodePoolMigrateState(0, is, meta)
 
 	if err != nil {
 		t.Fatalf("err: %#v", err)

google-beta/resource_dataproc_job.go

@@ -323,8 +323,10 @@ func resourceDataprocJobDelete(d *schema.ResourceData, meta interface{}) error {
 	if forceDelete {
 		log.Printf("[DEBUG] Attempting to first cancel Dataproc job %s if it's still running ...", d.Id())
 
-		config.clientDataproc.Projects.Regions.Jobs.Cancel(
-			project, region, d.Id(), &dataproc.CancelJobRequest{}).Do()
+		if _, err := config.clientDataproc.Projects.Regions.Jobs.Cancel(
+			project, region, d.Id(), &dataproc.CancelJobRequest{}).Do(); err != nil {
+			return fmt.Errorf("Error canceling job: %v", err)
+		}
 		// ignore error if we get one - job may be finished already and not need to
 		// be cancelled. We do however wait for the state to be one that is
 		// at least not active

google-beta/resource_endpoints_service.go

@@ -4,6 +4,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"errors"
+
 	"github.com/hashicorp/terraform/helper/schema"
 	"google.golang.org/api/servicemanagement/v1"
 )
@@ -228,7 +229,9 @@ func resourceEndpointsServiceUpdate(d *schema.ResourceData, meta interface{}) er
 		return err
 	}
 	var serviceConfig servicemanagement.SubmitConfigSourceResponse
-	json.Unmarshal(s, &serviceConfig)
+	if err := json.Unmarshal(s, &serviceConfig); err != nil {
+		return err
+	}
 
 	// Next, we create a new rollout with the new config value, and wait for it to complete.
 	rolloutService := servicemanagement.NewServicesRolloutsService(config.clientServiceMan)

google-beta/resource_google_project_migrate_test.go

@@ -62,7 +62,7 @@ func TestGoogleProjectMigrateState_empty(t *testing.T) {
 
 	// should handle non-nil but empty
 	is = &terraform.InstanceState{}
-	is, err = resourceGoogleProjectMigrateState(0, is, meta)
+	_, err = resourceGoogleProjectMigrateState(0, is, meta)
 
 	if err != nil {
 		t.Fatalf("err: %#v", err)

google-beta/resource_google_project_services.go

@@ -130,7 +130,9 @@ func resourceGoogleProjectServicesDelete(d *schema.ResourceData, meta interface{
 	config := meta.(*Config)
 	services := resourceServices(d)
 	for _, s := range services {
-		disableService(s, d.Id(), config, true)
+		if err := disableService(s, d.Id(), config, true); err != nil {
+			return err
+		}
 	}
 	d.SetId("")
 	return nil

google-beta/resource_google_project_services_test.go

@@ -44,7 +44,9 @@ func TestAccProjectServices_basic(t *testing.T) {
 			{
 				PreConfig: func() {
 					config := testAccProvider.Meta().(*Config)
-					enableService(oobService, pid, config)
+					if err := enableService(oobService, pid, config); err != nil {
+						t.Fatalf("Error enabling %q: %v", oobService, err)
+					}
 				},
 				Config: testAccProjectAssociateServicesBasic(services2, pid, pname, org),
 				Check: resource.ComposeTestCheckFunc(
@@ -87,7 +89,9 @@ func TestAccProjectServices_authoritative(t *testing.T) {
 			{
 				PreConfig: func() {
 					config := testAccProvider.Meta().(*Config)
-					enableService(oobService, pid, config)
+					if err := enableService(oobService, pid, config); err != nil {
+						t.Fatalf("Error enabling %q: %v", oobService, err)
+					}
 				},
 				Config: testAccProjectAssociateServicesBasic(services, pid, pname, org),
 				Check: resource.ComposeTestCheckFunc(
@@ -126,7 +130,9 @@ func TestAccProjectServices_authoritative2(t *testing.T) {
 				PreConfig: func() {
 					config := testAccProvider.Meta().(*Config)
 					for _, s := range oobServices {
-						enableService(s, pid, config)
+						if err := enableService(s, pid, config); err != nil {
+							t.Fatalf("Error enabling %q: %v", s, err)
+						}
 					}
 				},
 				Config: testAccProjectAssociateServicesBasic(services, pid, pname, org),

google-beta/resource_google_service_account.go

@@ -134,10 +134,12 @@ func resourceGoogleServiceAccountUpdate(d *schema.ResourceData, meta interface{}
 
 func resourceGoogleServiceAccountImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*Config)
-	parseImportId([]string{
+	if err := parseImportId([]string{
 		"projects/(?P<project>[^/]+)/serviceAccounts/(?P<email>[^/]+)",
 		"(?P<project>[^/]+)/(?P<email>[^/]+)",
-		"(?P<email>[^/]+)"}, d, config)
+		"(?P<email>[^/]+)"}, d, config); err != nil {
+		return nil, err
+	}
 
 	// Replace import id for the resource id
 	id, err := replaceVars(d, config, "projects/{{project}}/serviceAccounts/{{email}}")

google-beta/resource_monitoring_alert_policy.go

@@ -541,7 +541,9 @@ func resourceMonitoringAlertPolicyImport(d *schema.ResourceData, meta interface{
 	config := meta.(*Config)
 
 	// current import_formats can't import id's with forward slashes in them.
-	parseImportId([]string{"(?P<name>.+)"}, d, config)
+	if err := parseImportId([]string{"(?P<name>.+)"}, d, config); err != nil {
+		return nil, err
+	}
 
 	return []*schema.ResourceData{d}, nil
 }

google-beta/resource_monitoring_group.go

@@ -261,7 +261,9 @@ func resourceMonitoringGroupImport(d *schema.ResourceData, meta interface{}) ([]
 	config := meta.(*Config)
 
 	// current import_formats can't import id's with forward slashes in them.
-	parseImportId([]string{"(?P<name>.+)"}, d, config)
+	if err := parseImportId([]string{"(?P<name>.+)"}, d, config); err != nil {
+		return nil, err
+	}
 
 	return []*schema.ResourceData{d}, nil
 }

google-beta/resource_monitoring_notification_channel.go

@@ -308,7 +308,9 @@ func resourceMonitoringNotificationChannelImport(d *schema.ResourceData, meta in
 	config := meta.(*Config)
 
 	// current import_formats can't import id's with forward slashes in them.
-	parseImportId([]string{"(?P<name>.+)"}, d, config)
+	if err := parseImportId([]string{"(?P<name>.+)"}, d, config); err != nil {
+		return nil, err
+	}
 
 	return []*schema.ResourceData{d}, nil
 }