Revert "Add support for module attribution (#3995) (#2508)"

This reverts commit 6cf6c51.

Author: c2thorn

.changelog/3995.txt

@@ -53,10 +53,6 @@ import (
 	"google.golang.org/api/storagetransfer/v1"
 )
 
-type providerMeta struct {
-	ModuleName string `cty:"module_name"`
-}
-
 // Config is the configuration structure used to instantiate the Google
 // provider.
 type Config struct {

google-beta/config.go

@@ -36,17 +36,10 @@ func dataSourceGoogleCloudIdentityGroupMemberships() *schema.Resource {
 }
 
 func dataSourceGoogleCloudIdentityGroupMembershipsRead(d *schema.ResourceData, meta interface{}) error {
-	var m providerMeta
-
-	err := d.GetProviderMeta(&m)
-	if err != nil {
-		return err
-	}
 	config := meta.(*Config)
-	config.clientCloudIdentity.UserAgent = fmt.Sprintf("%s %s", config.clientCloudIdentity.UserAgent, m.ModuleName)
 
 	result := []map[string]interface{}{}
-	err = config.clientCloudIdentity.Groups.Memberships.List(d.Get("group").(string)).View("FULL").Pages(config.context, func(resp *cloudidentity.ListMembershipsResponse) error {
+	err := config.clientCloudIdentity.Groups.Memberships.List(d.Get("group").(string)).View("FULL").Pages(config.context, func(resp *cloudidentity.ListMembershipsResponse) error {
 
 		for _, member := range resp.Memberships {
 			result = append(result, map[string]interface{}{

google-beta/data_source_cloud_identity_group_memberships.go

@@ -39,17 +39,10 @@ groups or customers/{customer_id} for Google Groups.`,
 }
 
 func dataSourceGoogleCloudIdentityGroupsRead(d *schema.ResourceData, meta interface{}) error {
-	var m providerMeta
-
-	err := d.GetProviderMeta(&m)
-	if err != nil {
-		return err
-	}
 	config := meta.(*Config)
-	config.clientCloudIdentity.UserAgent = fmt.Sprintf("%s %s", config.clientCloudIdentity.UserAgent, m.ModuleName)
 
 	result := []map[string]interface{}{}
-	err = config.clientCloudIdentity.Groups.List().Parent(d.Get("parent").(string)).View("FULL").Pages(config.context, func(resp *cloudidentity.ListGroupsResponse) error {
+	err := config.clientCloudIdentity.Groups.List().Parent(d.Get("parent").(string)).View("FULL").Pages(config.context, func(resp *cloudidentity.ListGroupsResponse) error {
 		for _, group := range resp.Groups {
 			result = append(result, map[string]interface{}{
 				"name":         group.Name,

google-beta/data_source_cloud_identity_groups.go

@@ -189,14 +189,7 @@ func flattenDigests(dnsKeyDigests []*dns.DnsKeyDigest) []map[string]interface{}
 }
 
 func dataSourceDNSKeysRead(d *schema.ResourceData, meta interface{}) error {
-	var m providerMeta
-
-	err := d.GetProviderMeta(&m)
-	if err != nil {
-		return err
-	}
 	config := meta.(*Config)
-	config.clientDns.UserAgent = fmt.Sprintf("%s %s", config.clientDns.UserAgent, m.ModuleName)
 
 	fv, err := parseProjectFieldValue("managedZones", d.Get("managed_zone").(string), "project", d, config, false)
 	if err != nil {

google-beta/data_source_dns_keys.go

@@ -49,14 +49,7 @@ func dataSourceDnsManagedZone() *schema.Resource {
 }
 
 func dataSourceDnsManagedZoneRead(d *schema.ResourceData, meta interface{}) error {
-	var m providerMeta
-
-	err := d.GetProviderMeta(&m)
-	if err != nil {
-		return err
-	}
 	config := meta.(*Config)
-	config.clientDns.UserAgent = fmt.Sprintf("%s %s", config.clientDns.UserAgent, m.ModuleName)
 
 	project, err := getProject(d, config)
 	if err != nil {

google-beta/data_source_dns_managed_zone.go

@@ -30,14 +30,7 @@ func dataSourceGoogleActiveFolder() *schema.Resource {
 }
 
 func dataSourceGoogleActiveFolderRead(d *schema.ResourceData, meta interface{}) error {
-	var m providerMeta
-
-	err := d.GetProviderMeta(&m)
-	if err != nil {
-		return err
-	}
 	config := meta.(*Config)
-	config.clientResourceManagerV2Beta1.UserAgent = fmt.Sprintf("%s %s", config.clientResourceManagerV2Beta1.UserAgent, m.ModuleName)
 
 	parent := d.Get("parent").(string)
 	displayName := d.Get("display_name").(string)

google-beta/data_source_google_active_folder.go

@@ -23,14 +23,7 @@ func dataSourceGoogleBigqueryDefaultServiceAccount() *schema.Resource {
 }
 
 func dataSourceGoogleBigqueryDefaultServiceAccountRead(d *schema.ResourceData, meta interface{}) error {
-	var m providerMeta
-
-	err := d.GetProviderMeta(&m)
-	if err != nil {
-		return err
-	}
 	config := meta.(*Config)
-	config.clientBigQuery.UserAgent = fmt.Sprintf("%s %s", config.clientBigQuery.UserAgent, m.ModuleName)
 
 	project, err := getProject(d, config)
 	if err != nil {

google-beta/data_source_google_bigquery_default_service_account.go

@@ -45,14 +45,7 @@ func dataSourceGoogleBillingAccount() *schema.Resource {
 }
 
 func dataSourceBillingAccountRead(d *schema.ResourceData, meta interface{}) error {
-	var m providerMeta
-
-	err := d.GetProviderMeta(&m)
-	if err != nil {
-		return err
-	}
 	config := meta.(*Config)
-	config.clientBilling.UserAgent = fmt.Sprintf("%s %s", config.clientBilling.UserAgent, m.ModuleName)
 
 	open, openOk := d.GetOkExists("open")
 

google-beta/data_source_google_billing_account.go

@@ -20,14 +20,7 @@ func dataSourceGoogleClientOpenIDUserinfo() *schema.Resource {
 }
 
 func dataSourceGoogleClientOpenIDUserinfoRead(d *schema.ResourceData, meta interface{}) error {
-	var m providerMeta
-
-	err := d.GetProviderMeta(&m)
-	if err != nil {
-		return err
-	}
 	config := meta.(*Config)
-	config.userAgent = fmt.Sprintf("%s %s", config.userAgent, m.ModuleName)
 
 	email, err := GetCurrentUserEmail(config)
 	if err != nil {