Skip to content

Commit cfb55cd

Browse files
c2thornc2thorn
committed
Revert "Add support for module attribution (#3995) (#7320)"
This reverts commit 1bd325d.
1 parent 7cac8e7 commit cfb55cd

File tree

270 files changed

+15
-5631
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

270 files changed

+15
-5631
lines changed

‎.changelog/3995.txt

-3
This file was deleted.

‎google/config.go

-4
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ import (
5252
"google.golang.org/api/storagetransfer/v1"
5353
)
5454

55-
type providerMeta struct {
56-
ModuleName string `cty:"module_name"`
57-
}
58-
5955
// Config is the configuration structure used to instantiate the Google
6056
// provider.
6157
type Config struct {

‎google/data_source_dns_keys.go

-7
Original file line numberDiff line numberDiff line change
@@ -189,14 +189,7 @@ func flattenDigests(dnsKeyDigests []*dns.DnsKeyDigest) []map[string]interface{}
189189
}
190190

191191
func dataSourceDNSKeysRead(d *schema.ResourceData, meta interface{}) error {
192-
var m providerMeta
193-
194-
err := d.GetProviderMeta(&m)
195-
if err != nil {
196-
return err
197-
}
198192
config := meta.(*Config)
199-
config.clientDns.UserAgent = fmt.Sprintf("%s %s", config.clientDns.UserAgent, m.ModuleName)
200193

201194
fv, err := parseProjectFieldValue("managedZones", d.Get("managed_zone").(string), "project", d, config, false)
202195
if err != nil {

‎google/data_source_dns_managed_zone.go

-7
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,7 @@ func dataSourceDnsManagedZone() *schema.Resource {
4949
}
5050

5151
func dataSourceDnsManagedZoneRead(d *schema.ResourceData, meta interface{}) error {
52-
var m providerMeta
53-
54-
err := d.GetProviderMeta(&m)
55-
if err != nil {
56-
return err
57-
}
5852
config := meta.(*Config)
59-
config.clientDns.UserAgent = fmt.Sprintf("%s %s", config.clientDns.UserAgent, m.ModuleName)
6053

6154
project, err := getProject(d, config)
6255
if err != nil {

‎google/data_source_google_active_folder.go

-7
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,7 @@ func dataSourceGoogleActiveFolder() *schema.Resource {
3030
}
3131

3232
func dataSourceGoogleActiveFolderRead(d *schema.ResourceData, meta interface{}) error {
33-
var m providerMeta
34-
35-
err := d.GetProviderMeta(&m)
36-
if err != nil {
37-
return err
38-
}
3933
config := meta.(*Config)
40-
config.clientResourceManagerV2Beta1.UserAgent = fmt.Sprintf("%s %s", config.clientResourceManagerV2Beta1.UserAgent, m.ModuleName)
4134

4235
parent := d.Get("parent").(string)
4336
displayName := d.Get("display_name").(string)

‎google/data_source_google_bigquery_default_service_account.go

-7
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,7 @@ func dataSourceGoogleBigqueryDefaultServiceAccount() *schema.Resource {
2323
}
2424

2525
func dataSourceGoogleBigqueryDefaultServiceAccountRead(d *schema.ResourceData, meta interface{}) error {
26-
var m providerMeta
27-
28-
err := d.GetProviderMeta(&m)
29-
if err != nil {
30-
return err
31-
}
3226
config := meta.(*Config)
33-
config.clientBigQuery.UserAgent = fmt.Sprintf("%s %s", config.clientBigQuery.UserAgent, m.ModuleName)
3427

3528
project, err := getProject(d, config)
3629
if err != nil {

‎google/data_source_google_billing_account.go

-7
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,7 @@ func dataSourceGoogleBillingAccount() *schema.Resource {
4545
}
4646

4747
func dataSourceBillingAccountRead(d *schema.ResourceData, meta interface{}) error {
48-
var m providerMeta
49-
50-
err := d.GetProviderMeta(&m)
51-
if err != nil {
52-
return err
53-
}
5448
config := meta.(*Config)
55-
config.clientBilling.UserAgent = fmt.Sprintf("%s %s", config.clientBilling.UserAgent, m.ModuleName)
5649

5750
open, openOk := d.GetOkExists("open")
5851

‎google/data_source_google_client_openid_userinfo.go

-7
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,7 @@ func dataSourceGoogleClientOpenIDUserinfo() *schema.Resource {
2020
}
2121

2222
func dataSourceGoogleClientOpenIDUserinfoRead(d *schema.ResourceData, meta interface{}) error {
23-
var m providerMeta
24-
25-
err := d.GetProviderMeta(&m)
26-
if err != nil {
27-
return err
28-
}
2923
config := meta.(*Config)
30-
config.userAgent = fmt.Sprintf("%s %s", config.userAgent, m.ModuleName)
3124

3225
email, err := GetCurrentUserEmail(config)
3326
if err != nil {

‎google/data_source_google_composer_image_versions.go

-7
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,7 @@ func dataSourceGoogleComposerImageVersions() *schema.Resource {
4444
}
4545

4646
func dataSourceGoogleComposerImageVersionsRead(d *schema.ResourceData, meta interface{}) error {
47-
var m providerMeta
48-
49-
err := d.GetProviderMeta(&m)
50-
if err != nil {
51-
return err
52-
}
5347
config := meta.(*Config)
54-
config.userAgent = fmt.Sprintf("%s %s", config.userAgent, m.ModuleName)
5548

5649
project, err := getProject(d, config)
5750
if err != nil {

‎google/data_source_google_compute_address.go

-7
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,7 @@ func dataSourceGoogleComputeAddress() *schema.Resource {
5454
}
5555

5656
func dataSourceGoogleComputeAddressRead(d *schema.ResourceData, meta interface{}) error {
57-
var m providerMeta
58-
59-
err := d.GetProviderMeta(&m)
60-
if err != nil {
61-
return err
62-
}
6357
config := meta.(*Config)
64-
config.clientCompute.UserAgent = fmt.Sprintf("%s %s", config.clientCompute.UserAgent, m.ModuleName)
6558

6659
project, err := getProject(d, config)
6760
if err != nil {

‎google/data_source_google_compute_default_service_account.go

-7
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,7 @@ func dataSourceGoogleComputeDefaultServiceAccount() *schema.Resource {
3535
}
3636

3737
func dataSourceGoogleComputeDefaultServiceAccountRead(d *schema.ResourceData, meta interface{}) error {
38-
var m providerMeta
39-
40-
err := d.GetProviderMeta(&m)
41-
if err != nil {
42-
return err
43-
}
4438
config := meta.(*Config)
45-
config.clientCompute.UserAgent = fmt.Sprintf("%s %s", config.clientCompute.UserAgent, m.ModuleName)
4639

4740
project, err := getProject(d, config)
4841
if err != nil {

‎google/data_source_google_compute_forwarding_rule.go

-7
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,7 @@ func dataSourceGoogleComputeForwardingRule() *schema.Resource {
8888
}
8989

9090
func dataSourceGoogleComputeForwardingRuleRead(d *schema.ResourceData, meta interface{}) error {
91-
var m providerMeta
92-
93-
err := d.GetProviderMeta(&m)
94-
if err != nil {
95-
return err
96-
}
9791
config := meta.(*Config)
98-
config.clientCompute.UserAgent = fmt.Sprintf("%s %s", config.clientCompute.UserAgent, m.ModuleName)
9992

10093
region, err := getRegion(d, config)
10194
if err != nil {

‎google/data_source_google_compute_global_address.go

-7
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,7 @@ func dataSourceGoogleComputeGlobalAddress() *schema.Resource {
4141
}
4242

4343
func dataSourceGoogleComputeGlobalAddressRead(d *schema.ResourceData, meta interface{}) error {
44-
var m providerMeta
45-
46-
err := d.GetProviderMeta(&m)
47-
if err != nil {
48-
return err
49-
}
5044
config := meta.(*Config)
51-
config.clientCompute.UserAgent = fmt.Sprintf("%s %s", config.clientCompute.UserAgent, m.ModuleName)
5245

5346
project, err := getProject(d, config)
5447
if err != nil {

‎google/data_source_google_compute_image.go

-7
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,7 @@ func dataSourceGoogleComputeImage() *schema.Resource {
105105
}
106106

107107
func dataSourceGoogleComputeImageRead(d *schema.ResourceData, meta interface{}) error {
108-
var m providerMeta
109-
110-
err := d.GetProviderMeta(&m)
111-
if err != nil {
112-
return err
113-
}
114108
config := meta.(*Config)
115-
config.clientCompute.UserAgent = fmt.Sprintf("%s %s", config.clientCompute.UserAgent, m.ModuleName)
116109

117110
project, err := getProject(d, config)
118111
if err != nil {

‎google/data_source_google_compute_instance.go

-7
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,7 @@ func dataSourceGoogleComputeInstance() *schema.Resource {
2020
}
2121

2222
func dataSourceGoogleComputeInstanceRead(d *schema.ResourceData, meta interface{}) error {
23-
var m providerMeta
24-
25-
err := d.GetProviderMeta(&m)
26-
if err != nil {
27-
return err
28-
}
2923
config := meta.(*Config)
30-
config.clientComputeBeta.UserAgent = fmt.Sprintf("%s %s", config.clientComputeBeta.UserAgent, m.ModuleName)
3124

3225
project, zone, name, err := GetZonalResourcePropertiesFromSelfLinkOrSchema(d, config)
3326
if err != nil {

‎google/data_source_google_compute_instance_serial_port.go

-8
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,7 @@ func dataSourceGoogleComputeInstanceSerialPort() *schema.Resource {
3636
}
3737

3838
func computeInstanceSerialPortRead(d *schema.ResourceData, meta interface{}) error {
39-
var m providerMeta
40-
41-
err := d.GetProviderMeta(&m)
42-
if err != nil {
43-
return err
44-
}
4539
config := meta.(*Config)
46-
config.clientCompute.UserAgent = fmt.Sprintf("%s %s", config.clientCompute.UserAgent, m.ModuleName)
47-
4840
project, err := getProject(d, config)
4941
if err != nil {
5042
return err

‎google/data_source_google_compute_network.go

-7
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,7 @@ func dataSourceGoogleComputeNetwork() *schema.Resource {
4646
}
4747

4848
func dataSourceGoogleComputeNetworkRead(d *schema.ResourceData, meta interface{}) error {
49-
var m providerMeta
50-
51-
err := d.GetProviderMeta(&m)
52-
if err != nil {
53-
return err
54-
}
5549
config := meta.(*Config)
56-
config.clientCompute.UserAgent = fmt.Sprintf("%s %s", config.clientCompute.UserAgent, m.ModuleName)
5750

5851
project, err := getProject(d, config)
5952
if err != nil {

‎google/data_source_google_compute_node_types.go

-7
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,7 @@ func dataSourceGoogleComputeNodeTypes() *schema.Resource {
3434
}
3535

3636
func dataSourceGoogleComputeNodeTypesRead(d *schema.ResourceData, meta interface{}) error {
37-
var m providerMeta
38-
39-
err := d.GetProviderMeta(&m)
40-
if err != nil {
41-
return err
42-
}
4337
config := meta.(*Config)
44-
config.clientCompute.UserAgent = fmt.Sprintf("%s %s", config.clientCompute.UserAgent, m.ModuleName)
4538

4639
project, err := getProject(d, config)
4740
if err != nil {

‎google/data_source_google_compute_region_instance_group.go

-8
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,7 @@ func dataSourceGoogleComputeRegionInstanceGroup() *schema.Resource {
8686
}
8787

8888
func dataSourceComputeRegionInstanceGroupRead(d *schema.ResourceData, meta interface{}) error {
89-
var m providerMeta
90-
91-
err := d.GetProviderMeta(&m)
92-
if err != nil {
93-
return err
94-
}
9589
config := meta.(*Config)
96-
config.clientCompute.UserAgent = fmt.Sprintf("%s %s", config.clientCompute.UserAgent, m.ModuleName)
97-
9890
project, region, name, err := GetRegionalResourcePropertiesFromSelfLinkOrSchema(d, config)
9991
if err != nil {
10092
return err

‎google/data_source_google_compute_regions.go

-7
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,7 @@ func dataSourceGoogleComputeRegions() *schema.Resource {
3535
}
3636

3737
func dataSourceGoogleComputeRegionsRead(d *schema.ResourceData, meta interface{}) error {
38-
var m providerMeta
39-
40-
err := d.GetProviderMeta(&m)
41-
if err != nil {
42-
return err
43-
}
4438
config := meta.(*Config)
45-
config.clientCompute.UserAgent = fmt.Sprintf("%s %s", config.clientCompute.UserAgent, m.ModuleName)
4639

4740
project, err := getProject(d, config)
4841
if err != nil {

‎google/data_source_google_compute_subnetwork.go

-7
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,7 @@ func dataSourceGoogleComputeSubnetwork() *schema.Resource {
7373
}
7474

7575
func dataSourceGoogleComputeSubnetworkRead(d *schema.ResourceData, meta interface{}) error {
76-
var m providerMeta
77-
78-
err := d.GetProviderMeta(&m)
79-
if err != nil {
80-
return err
81-
}
8276
config := meta.(*Config)
83-
config.clientCompute.UserAgent = fmt.Sprintf("%s %s", config.clientCompute.UserAgent, m.ModuleName)
8477

8578
project, region, name, err := GetRegionalResourcePropertiesFromSelfLinkOrSchema(d, config)
8679
if err != nil {

‎google/data_source_google_compute_vpn_gateway.go

-7
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,7 @@ func dataSourceGoogleComputeVpnGateway() *schema.Resource {
4848
}
4949

5050
func dataSourceGoogleComputeVpnGatewayRead(d *schema.ResourceData, meta interface{}) error {
51-
var m providerMeta
52-
53-
err := d.GetProviderMeta(&m)
54-
if err != nil {
55-
return err
56-
}
5751
config := meta.(*Config)
58-
config.clientCompute.UserAgent = fmt.Sprintf("%s %s", config.clientCompute.UserAgent, m.ModuleName)
5952

6053
region, err := getRegion(d, config)
6154
if err != nil {

‎google/data_source_google_compute_zones.go

-7
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,7 @@ func dataSourceGoogleComputeZones() *schema.Resource {
4040
}
4141

4242
func dataSourceGoogleComputeZonesRead(d *schema.ResourceData, meta interface{}) error {
43-
var m providerMeta
44-
45-
err := d.GetProviderMeta(&m)
46-
if err != nil {
47-
return err
48-
}
4943
config := meta.(*Config)
50-
config.clientCompute.UserAgent = fmt.Sprintf("%s %s", config.clientCompute.UserAgent, m.ModuleName)
5144

5245
region := config.Region
5346
if r, ok := d.GetOk("region"); ok {

‎google/data_source_google_container_engine_versions.go

+3-10
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,7 @@ func dataSourceGoogleContainerEngineVersions() *schema.Resource {
5656
}
5757

5858
func dataSourceGoogleContainerEngineVersionsRead(d *schema.ResourceData, meta interface{}) error {
59-
var m providerMeta
60-
61-
err := d.GetProviderMeta(&m)
62-
if err != nil {
63-
return err
64-
}
6559
config := meta.(*Config)
66-
config.clientContainerBeta.UserAgent = fmt.Sprintf("%s %s", config.clientContainerBeta.UserAgent, m.ModuleName)
6760

6861
project, err := getProject(d, config)
6962
if err != nil {
@@ -120,11 +113,11 @@ func dataSourceGoogleContainerEngineVersionsRead(d *schema.ResourceData, meta in
120113
return fmt.Errorf("Error setting default_cluster_version: %s", err)
121114
}
122115

123-
channels := map[string]string{}
116+
m := map[string]string{}
124117
for _, v := range resp.Channels {
125-
channels[v.Channel] = v.DefaultVersion
118+
m[v.Channel] = v.DefaultVersion
126119
}
127-
if err := d.Set("release_channel_default_version", channels); err != nil {
120+
if err := d.Set("release_channel_default_version", m); err != nil {
128121
return fmt.Errorf("Error setting release_channel_default_version: %s", err)
129122
}
130123

‎google/data_source_google_iam_role.go

-8
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,7 @@ func dataSourceGoogleIamRole() *schema.Resource {
3232
}
3333

3434
func dataSourceGoogleIamRoleRead(d *schema.ResourceData, meta interface{}) error {
35-
var m providerMeta
36-
37-
err := d.GetProviderMeta(&m)
38-
if err != nil {
39-
return err
40-
}
4135
config := meta.(*Config)
42-
config.clientIAM.UserAgent = fmt.Sprintf("%s %s", config.clientIAM.UserAgent, m.ModuleName)
43-
4436
roleName := d.Get("name").(string)
4537
role, err := config.clientIAM.Roles.Get(roleName).Do()
4638
if err != nil {

0 commit comments

Comments
 (0)