diff --git a/google/batcher.go b/google/batcher.go index 12a3ac8860..f017c35f1f 100644 --- a/google/batcher.go +++ b/google/batcher.go @@ -123,7 +123,7 @@ func (b *RequestBatcher) stop() { // may choose to use a key with method if needed to diff GET/read and // POST/create) // -// As an example, for google_project_service and google_project_services, the +// As an example, for google_project_service, the // batcher is called to batch services.batchEnable() calls for a project // $PROJECT. The calling code uses the template // "serviceusage:projects/$PROJECT/services:batchEnable", which mirrors the HTTP request: diff --git a/google/compute_forwarding_rule.go b/google/compute_forwarding_rule.go index 73c160eeee..fe4b74b874 100644 --- a/google/compute_forwarding_rule.go +++ b/google/compute_forwarding_rule.go @@ -69,12 +69,6 @@ func GetComputeForwardingRuleApiObject(d TerraformResourceData, config *Config) } else if v, ok := d.GetOkExists("backend_service"); !isEmptyValue(reflect.ValueOf(backendServiceProp)) && (ok || !reflect.DeepEqual(v, backendServiceProp)) { obj["backendService"] = backendServiceProp } - ipVersionProp, err := expandComputeForwardingRuleIpVersion(d.Get("ip_version"), d, config) - if err != nil { - return nil, err - } else if v, ok := d.GetOkExists("ip_version"); !isEmptyValue(reflect.ValueOf(ipVersionProp)) && (ok || !reflect.DeepEqual(v, ipVersionProp)) { - obj["ipVersion"] = ipVersionProp - } loadBalancingSchemeProp, err := expandComputeForwardingRuleLoadBalancingScheme(d.Get("load_balancing_scheme"), d, config) if err != nil { return nil, err @@ -190,10 +184,6 @@ func expandComputeForwardingRuleBackendService(v interface{}, d TerraformResourc return url + v.(string), nil } -func expandComputeForwardingRuleIpVersion(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) { - return v, nil -} - func expandComputeForwardingRuleLoadBalancingScheme(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) { return v, nil } diff --git a/google/compute_network.go b/google/compute_network.go index 69b8340965..24fd7c4e92 100644 --- a/google/compute_network.go +++ b/google/compute_network.go @@ -45,12 +45,6 @@ func GetComputeNetworkApiObject(d TerraformResourceData, config *Config) (map[st } else if v, ok := d.GetOkExists("description"); !isEmptyValue(reflect.ValueOf(descriptionProp)) && (ok || !reflect.DeepEqual(v, descriptionProp)) { obj["description"] = descriptionProp } - IPv4RangeProp, err := expandComputeNetworkIpv4Range(d.Get("ipv4_range"), d, config) - if err != nil { - return nil, err - } else if v, ok := d.GetOkExists("ipv4_range"); !isEmptyValue(reflect.ValueOf(IPv4RangeProp)) && (ok || !reflect.DeepEqual(v, IPv4RangeProp)) { - obj["IPv4Range"] = IPv4RangeProp - } nameProp, err := expandComputeNetworkName(d.Get("name"), d, config) if err != nil { return nil, err @@ -85,10 +79,6 @@ func expandComputeNetworkDescription(v interface{}, d TerraformResourceData, con return v, nil } -func expandComputeNetworkIpv4Range(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) { - return v, nil -} - func expandComputeNetworkName(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) { return v, nil } diff --git a/google/config.go b/google/config.go index 56056182ea..17fb097679 100644 --- a/google/config.go +++ b/google/config.go @@ -233,6 +233,7 @@ var defaultClientScopes = []string{ "https://www.googleapis.com/auth/cloud-platform", "https://www.googleapis.com/auth/ndev.clouddns.readwrite", "https://www.googleapis.com/auth/devstorage.full_control", + "https://www.googleapis.com/auth/userinfo.email", } func (c *Config) LoadAndValidate() error {