Clean up lint errors (#3990) (#2502)

* fix lint errors

* fix lint errors

* lint fixes after sdkv2 update

* change 'reading' to 'setting'

* change 'reading' to 'setting'

* change 'reading' to 'setting'

Signed-off-by: Modular Magician <magic-modules@google.com>

.changelog/3990.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

google-beta/data_source_cloud_identity_group_memberships.go

@@ -56,7 +56,9 @@ func dataSourceGoogleCloudIdentityGroupMembershipsRead(d *schema.ResourceData, m
 		return handleNotFoundError(err, d, fmt.Sprintf("CloudIdentityGroupMemberships %q", d.Id()))
 	}
 
-	d.Set("memberships", result)
+	if err := d.Set("memberships", result); err != nil {
+		return fmt.Errorf("Error setting memberships: %s", err)
+	}
 	d.SetId(time.Now().UTC().String())
 	return nil
 }

google-beta/data_source_cloud_identity_groups.go

@@ -59,7 +59,9 @@ func dataSourceGoogleCloudIdentityGroupsRead(d *schema.ResourceData, meta interf
 		return handleNotFoundError(err, d, fmt.Sprintf("CloudIdentityGroups %q", d.Id()))
 	}
 
-	d.Set("groups", result)
+	if err := d.Set("groups", result); err != nil {
+		return fmt.Errorf("Error setting groups: %s", err)
+	}
 	d.SetId(time.Now().UTC().String())
 	return nil
 }

google-beta/data_source_compute_lb_ip_ranges.go

@@ -1,6 +1,8 @@
 package google
 
 import (
+	"fmt"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -33,13 +35,17 @@ func dataSourceGoogleComputeLbIpRangesRead(d *schema.ResourceData, meta interfac
 		"209.85.204.0/22",
 		"35.191.0.0/16",
 	}
-	d.Set("network", networkIpRanges)
+	if err := d.Set("network", networkIpRanges); err != nil {
+		return fmt.Errorf("Error setting network: %s", err)
+	}
 
 	httpSslTcpInternalRanges := []string{
 		"130.211.0.0/22",
 		"35.191.0.0/16",
 	}
-	d.Set("http_ssl_tcp_internal", httpSslTcpInternalRanges)
+	if err := d.Set("http_ssl_tcp_internal", httpSslTcpInternalRanges); err != nil {
+		return fmt.Errorf("Error setting http_ssl_tcp_internal: %s", err)
+	}
 
 	return nil
 }

google-beta/data_source_compute_network_endpoint_group.go

@@ -40,9 +40,15 @@ func dataSourceComputeNetworkEndpointGroupRead(d *schema.ResourceData, meta inte
 		if err != nil {
 			return err
 		}
-		d.Set("name", parsed.Name)
-		d.Set("zone", parsed.Zone)
-		d.Set("project", parsed.Project)
+		if err := d.Set("name", parsed.Name); err != nil {
+			return fmt.Errorf("Error setting name: %s", err)
+		}
+		if err := d.Set("zone", parsed.Zone); err != nil {
+			return fmt.Errorf("Error setting zone: %s", err)
+		}
+		if err := d.Set("project", parsed.Project); err != nil {
+			return fmt.Errorf("Error setting project: %s", err)
+		}
 		d.SetId(fmt.Sprintf("projects/%s/zones/%s/networkEndpointGroups/%s", parsed.Project, parsed.Zone, parsed.Name))
 	} else {
 		return errors.New("Must provide either `self_link` or `zone/name`")

google-beta/data_source_container_registry_image.go

@@ -46,7 +46,9 @@ func containerRegistryImageRead(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
-	d.Set("project", project)
+	if err := d.Set("project", project); err != nil {
+		return fmt.Errorf("Error setting project: %s", err)
+	}
 	region, ok := d.GetOk("region")
 	var url_base string
 	escapedProject := strings.Replace(project, ":", "/", -1)
@@ -58,11 +60,17 @@ func containerRegistryImageRead(d *schema.ResourceData, meta interface{}) error
 	tag, t_ok := d.GetOk("tag")
 	digest, d_ok := d.GetOk("digest")
 	if t_ok && tag != nil && tag != "" {
-		d.Set("image_url", fmt.Sprintf("%s/%s:%s", url_base, d.Get("name").(string), tag))
+		if err := d.Set("image_url", fmt.Sprintf("%s/%s:%s", url_base, d.Get("name").(string), tag)); err != nil {
+			return fmt.Errorf("Error setting image_url: %s", err)
+		}
 	} else if d_ok && digest != nil && digest != "" {
-		d.Set("image_url", fmt.Sprintf("%s/%s@%s", url_base, d.Get("name").(string), digest))
+		if err := d.Set("image_url", fmt.Sprintf("%s/%s@%s", url_base, d.Get("name").(string), digest)); err != nil {
+			return fmt.Errorf("Error setting image_url: %s", err)
+		}
 	} else {
-		d.Set("image_url", fmt.Sprintf("%s/%s", url_base, d.Get("name").(string)))
+		if err := d.Set("image_url", fmt.Sprintf("%s/%s", url_base, d.Get("name").(string))); err != nil {
+			return fmt.Errorf("Error setting image_url: %s", err)
+		}
 	}
 	d.SetId(d.Get("image_url").(string))
 	return nil

google-beta/data_source_container_registry_repository.go

@@ -34,13 +34,19 @@ func containerRegistryRepoRead(d *schema.ResourceData, meta interface{}) error {
 	if err != nil {
 		return err
 	}
-	d.Set("project", project)
+	if err := d.Set("project", project); err != nil {
+		return fmt.Errorf("Error setting project: %s", err)
+	}
 	region, ok := d.GetOk("region")
 	escapedProject := strings.Replace(project, ":", "/", -1)
 	if ok && region != nil && region != "" {
-		d.Set("repository_url", fmt.Sprintf("%s.gcr.io/%s", region, escapedProject))
+		if err := d.Set("repository_url", fmt.Sprintf("%s.gcr.io/%s", region, escapedProject)); err != nil {
+			return fmt.Errorf("Error setting repository_url: %s", err)
+		}
 	} else {
-		d.Set("repository_url", fmt.Sprintf("gcr.io/%s", escapedProject))
+		if err := d.Set("repository_url", fmt.Sprintf("gcr.io/%s", escapedProject)); err != nil {
+			return fmt.Errorf("Error setting repository_url: %s", err)
+		}
 	}
 	d.SetId(d.Get("repository_url").(string))
 	return nil

google-beta/data_source_dns_keys.go

@@ -198,7 +198,9 @@ func dataSourceDNSKeysRead(d *schema.ResourceData, meta interface{}) error {
 	project := fv.Project
 	managedZone := fv.Name
 
-	d.Set("project", project)
+	if err := d.Set("project", project); err != nil {
+		return fmt.Errorf("Error setting project: %s", err)
+	}
 	d.SetId(fmt.Sprintf("projects/%s/managedZones/%s", project, managedZone))
 
 	log.Printf("[DEBUG] Fetching DNS keys from managed zone %s", managedZone)
@@ -212,8 +214,12 @@ func dataSourceDNSKeysRead(d *schema.ResourceData, meta interface{}) error {
 
 	log.Printf("[DEBUG] Fetched DNS keys from managed zone %s", managedZone)
 
-	d.Set("key_signing_keys", flattenSigningKeys(response.DnsKeys, "keySigning"))
-	d.Set("zone_signing_keys", flattenSigningKeys(response.DnsKeys, "zoneSigning"))
+	if err := d.Set("key_signing_keys", flattenSigningKeys(response.DnsKeys, "keySigning")); err != nil {
+		return fmt.Errorf("Error setting key_signing_keys: %s", err)
+	}
+	if err := d.Set("zone_signing_keys", flattenSigningKeys(response.DnsKeys, "zoneSigning")); err != nil {
+		return fmt.Errorf("Error setting zone_signing_keys: %s", err)
+	}
 
 	return nil
 }

google-beta/data_source_dns_managed_zone.go

@@ -65,12 +65,24 @@ func dataSourceDnsManagedZoneRead(d *schema.ResourceData, meta interface{}) erro
 		return err
 	}
 
-	d.Set("name_servers", zone.NameServers)
-	d.Set("name", zone.Name)
-	d.Set("dns_name", zone.DnsName)
-	d.Set("description", zone.Description)
-	d.Set("visibility", zone.Visibility)
-	d.Set("project", project)
+	if err := d.Set("name_servers", zone.NameServers); err != nil {
+		return fmt.Errorf("Error setting name_servers: %s", err)
+	}
+	if err := d.Set("name", zone.Name); err != nil {
+		return fmt.Errorf("Error setting name: %s", err)
+	}
+	if err := d.Set("dns_name", zone.DnsName); err != nil {
+		return fmt.Errorf("Error setting dns_name: %s", err)
+	}
+	if err := d.Set("description", zone.Description); err != nil {
+		return fmt.Errorf("Error setting description: %s", err)
+	}
+	if err := d.Set("visibility", zone.Visibility); err != nil {
+		return fmt.Errorf("Error setting visibility: %s", err)
+	}
+	if err := d.Set("project", project); err != nil {
+		return fmt.Errorf("Error setting project: %s", err)
+	}
 
 	return nil
 }

google-beta/data_source_google_active_folder.go

@@ -47,7 +47,9 @@ func dataSourceGoogleActiveFolderRead(d *schema.ResourceData, meta interface{})
 	for _, folder := range searchResponse.Folders {
 		if folder.DisplayName == displayName {
 			d.SetId(folder.Name)
-			d.Set("name", folder.Name)
+			if err := d.Set("name", folder.Name); err != nil {
+				return fmt.Errorf("Error setting folder name: %s", err)
+			}
 			return nil
 		}
 	}

google-beta/data_source_google_bigquery_default_service_account.go

@@ -1,6 +1,7 @@
 package google
 
 import (
+	"fmt"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -35,7 +36,11 @@ func dataSourceGoogleBigqueryDefaultServiceAccountRead(d *schema.ResourceData, m
 	}
 
 	d.SetId(projectResource.Email)
-	d.Set("email", projectResource.Email)
-	d.Set("project", project)
+	if err := d.Set("email", projectResource.Email); err != nil {
+		return fmt.Errorf("Error setting email: %s", err)
+	}
+	if err := d.Set("project", project); err != nil {
+		return fmt.Errorf("Error setting project: %s", err)
+	}
 	return nil
 }

google-beta/data_source_google_billing_account.go

@@ -99,10 +99,18 @@ func dataSourceBillingAccountRead(d *schema.ResourceData, meta interface{}) erro
 	projectIds := flattenBillingProjects(resp.ProjectBillingInfo)
 
 	d.SetId(GetResourceNameFromSelfLink(billingAccount.Name))
-	d.Set("name", billingAccount.Name)
-	d.Set("display_name", billingAccount.DisplayName)
-	d.Set("open", billingAccount.Open)
-	d.Set("project_ids", projectIds)
+	if err := d.Set("name", billingAccount.Name); err != nil {
+		return fmt.Errorf("Error setting name: %s", err)
+	}
+	if err := d.Set("display_name", billingAccount.DisplayName); err != nil {
+		return fmt.Errorf("Error setting display_name: %s", err)
+	}
+	if err := d.Set("open", billingAccount.Open); err != nil {
+		return fmt.Errorf("Error setting open: %s", err)
+	}
+	if err := d.Set("project_ids", projectIds); err != nil {
+		return fmt.Errorf("Error setting project_ids: %s", err)
+	}
 
 	return nil
 }

google-beta/data_source_google_client_config.go

@@ -1,6 +1,7 @@
 package google
 
 import (
+	"fmt"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -38,15 +39,23 @@ func dataSourceClientConfigRead(d *schema.ResourceData, meta interface{}) error
 	config := meta.(*Config)
 
 	d.SetId(time.Now().UTC().String())
-	d.Set("project", config.Project)
-	d.Set("region", config.Region)
-	d.Set("zone", config.Zone)
+	if err := d.Set("project", config.Project); err != nil {
+		return fmt.Errorf("Error setting project: %s", err)
+	}
+	if err := d.Set("region", config.Region); err != nil {
+		return fmt.Errorf("Error setting region: %s", err)
+	}
+	if err := d.Set("zone", config.Zone); err != nil {
+		return fmt.Errorf("Error setting zone: %s", err)
+	}
 
 	token, err := config.tokenSource.Token()
 	if err != nil {
 		return err
 	}
-	d.Set("access_token", token.AccessToken)
+	if err := d.Set("access_token", token.AccessToken); err != nil {
+		return fmt.Errorf("Error setting access_token: %s", err)
+	}
 
 	return nil
 }

google-beta/data_source_google_client_openid_userinfo.go

@@ -1,6 +1,7 @@
 package google
 
 import (
+	"fmt"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -26,6 +27,8 @@ func dataSourceGoogleClientOpenIDUserinfoRead(d *schema.ResourceData, meta inter
 		return err
 	}
 	d.SetId(time.Now().UTC().String())
-	d.Set("email", email)
+	if err := d.Set("email", email); err != nil {
+		return fmt.Errorf("Error setting email: %s", err)
+	}
 	return nil
 }

google-beta/data_source_google_composer_image_versions.go

@@ -68,9 +68,15 @@ func dataSourceGoogleComposerImageVersionsRead(d *schema.ResourceData, meta inte
 
 	log.Printf("[DEBUG] Received Composer Image Versions: %q", versions)
 
-	d.Set("image_versions", versions)
-	d.Set("region", region)
-	d.Set("project", project)
+	if err := d.Set("image_versions", versions); err != nil {
+		return fmt.Errorf("Error setting image_versions: %s", err)
+	}
+	if err := d.Set("region", region); err != nil {
+		return fmt.Errorf("Error setting region: %s", err)
+	}
+	if err := d.Set("project", project); err != nil {
+		return fmt.Errorf("Error setting project: %s", err)
+	}
 	d.SetId(time.Now().UTC().String())
 
 	return nil

google-beta/data_source_google_compute_address.go

@@ -71,11 +71,21 @@ func dataSourceGoogleComputeAddressRead(d *schema.ResourceData, meta interface{}
 		return handleNotFoundError(err, d, fmt.Sprintf("Address Not Found : %s", name))
 	}
 
-	d.Set("address", address.Address)
-	d.Set("status", address.Status)
-	d.Set("self_link", address.SelfLink)
-	d.Set("project", project)
-	d.Set("region", region)
+	if err := d.Set("address", address.Address); err != nil {
+		return fmt.Errorf("Error setting address: %s", err)
+	}
+	if err := d.Set("status", address.Status); err != nil {
+		return fmt.Errorf("Error setting status: %s", err)
+	}
+	if err := d.Set("self_link", address.SelfLink); err != nil {
+		return fmt.Errorf("Error setting self_link: %s", err)
+	}
+	if err := d.Set("project", project); err != nil {
+		return fmt.Errorf("Error setting project: %s", err)
+	}
+	if err := d.Set("region", region); err != nil {
+		return fmt.Errorf("Error setting region: %s", err)
+	}
 
 	d.SetId(fmt.Sprintf("projects/%s/regions/%s/addresses/%s", project, region, name))
 	return nil

google-beta/data_source_google_compute_default_service_account.go

@@ -58,11 +58,21 @@ func dataSourceGoogleComputeDefaultServiceAccountRead(d *schema.ResourceData, me
 	}
 
 	d.SetId(sa.Name)
-	d.Set("email", sa.Email)
-	d.Set("unique_id", sa.UniqueId)
-	d.Set("project", sa.ProjectId)
-	d.Set("name", sa.Name)
-	d.Set("display_name", sa.DisplayName)
+	if err := d.Set("email", sa.Email); err != nil {
+		return fmt.Errorf("Error setting email: %s", err)
+	}
+	if err := d.Set("unique_id", sa.UniqueId); err != nil {
+		return fmt.Errorf("Error setting unique_id: %s", err)
+	}
+	if err := d.Set("project", sa.ProjectId); err != nil {
+		return fmt.Errorf("Error setting project: %s", err)
+	}
+	if err := d.Set("name", sa.Name); err != nil {
+		return fmt.Errorf("Error setting name: %s", err)
+	}
+	if err := d.Set("display_name", sa.DisplayName); err != nil {
+		return fmt.Errorf("Error setting display_name: %s", err)
+	}
 
 	return nil
 }