Add dataproc autoscaling policy resource

Author: megan07

google/config.go

@@ -78,6 +78,7 @@ type Config struct {
 	CloudBuildBasePath           string
 	CloudSchedulerBasePath       string
 	ComputeBasePath              string
+	DataprocBasePath             string
 	DnsBasePath                  string
 	FilestoreBasePath            string
 	FirestoreBasePath            string
@@ -114,8 +115,7 @@ type Config struct {
 	ContainerBetaBasePath string
 	clientContainerBeta   *containerBeta.Service
 
-	DataprocBasePath string
-	clientDataproc   *dataproc.Service
+	clientDataproc *dataproc.Service
 
 	DataprocBetaBasePath string
 	clientDataprocBeta   *dataprocBeta.Service
@@ -203,6 +203,7 @@ var BinaryAuthorizationDefaultBasePath = "https://binaryauthorization.googleapis
 var CloudBuildDefaultBasePath = "https://cloudbuild.googleapis.com/v1/"
 var CloudSchedulerDefaultBasePath = "https://cloudscheduler.googleapis.com/v1/"
 var ComputeDefaultBasePath = "https://www.googleapis.com/compute/v1/"
+var DataprocDefaultBasePath = "https://dataproc.googleapis.com/v1/"
 var DnsDefaultBasePath = "https://www.googleapis.com/dns/v1/"
 var FilestoreDefaultBasePath = "https://file.googleapis.com/v1/"
 var FirestoreDefaultBasePath = "https://firestore.googleapis.com/v1/"
@@ -664,6 +665,7 @@ func ConfigureBasePaths(c *Config) {
 	c.CloudBuildBasePath = CloudBuildDefaultBasePath
 	c.CloudSchedulerBasePath = CloudSchedulerDefaultBasePath
 	c.ComputeBasePath = ComputeDefaultBasePath
+	c.DataprocBasePath = DataprocDefaultBasePath
 	c.DnsBasePath = DnsDefaultBasePath
 	c.FilestoreBasePath = FilestoreDefaultBasePath
 	c.FirestoreBasePath = FirestoreDefaultBasePath

google/provider.go

@@ -175,6 +175,14 @@ func Provider() terraform.ResourceProvider {
 					"GOOGLE_COMPUTE_CUSTOM_ENDPOINT",
 				}, ComputeDefaultBasePath),
 			},
+			"dataproc_custom_endpoint": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validateCustomEndpoint,
+				DefaultFunc: schema.MultiEnvDefaultFunc([]string{
+					"GOOGLE_DATAPROC_CUSTOM_ENDPOINT",
+				}, DataprocDefaultBasePath),
+			},
 			"dns_custom_endpoint": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -310,7 +318,6 @@ func Provider() terraform.ResourceProvider {
 			ComputeBetaCustomEndpointEntryKey:            ComputeBetaCustomEndpointEntry,
 			ContainerCustomEndpointEntryKey:              ContainerCustomEndpointEntry,
 			ContainerBetaCustomEndpointEntryKey:          ContainerBetaCustomEndpointEntry,
-			DataprocCustomEndpointEntryKey:               DataprocCustomEndpointEntry,
 			DataprocBetaCustomEndpointEntryKey:           DataprocBetaCustomEndpointEntry,
 			DataflowCustomEndpointEntryKey:               DataflowCustomEndpointEntry,
 			DnsBetaCustomEndpointEntryKey:                DnsBetaCustomEndpointEntry,
@@ -639,6 +646,7 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	config.CloudBuildBasePath = d.Get("cloud_build_custom_endpoint").(string)
 	config.CloudSchedulerBasePath = d.Get("cloud_scheduler_custom_endpoint").(string)
 	config.ComputeBasePath = d.Get("compute_custom_endpoint").(string)
+	config.DataprocBasePath = d.Get("dataproc_custom_endpoint").(string)
 	config.DnsBasePath = d.Get("dns_custom_endpoint").(string)
 	config.FilestoreBasePath = d.Get("filestore_custom_endpoint").(string)
 	config.FirestoreBasePath = d.Get("firestore_custom_endpoint").(string)
@@ -663,7 +671,6 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	config.ComputeBetaBasePath = d.Get(ComputeBetaCustomEndpointEntryKey).(string)
 	config.ContainerBasePath = d.Get(ContainerCustomEndpointEntryKey).(string)
 	config.ContainerBetaBasePath = d.Get(ContainerBetaCustomEndpointEntryKey).(string)
-	config.DataprocBasePath = d.Get(DataprocCustomEndpointEntryKey).(string)
 	config.DataprocBetaBasePath = d.Get(DataprocBetaCustomEndpointEntryKey).(string)
 	config.DataflowBasePath = d.Get(DataflowCustomEndpointEntryKey).(string)
 	config.DnsBetaBasePath = d.Get(DnsBetaCustomEndpointEntryKey).(string)

google/provider_handwritten_endpoint.go

@@ -85,17 +85,6 @@ var ContainerBetaCustomEndpointEntry = &schema.Schema{
 	}, ContainerBetaDefaultBasePath),
 }
 
-var DataprocDefaultBasePath = "https://dataproc.googleapis.com/v1/"
-var DataprocCustomEndpointEntryKey = "dataproc_custom_endpoint"
-var DataprocCustomEndpointEntry = &schema.Schema{
-	Type:         schema.TypeString,
-	Optional:     true,
-	ValidateFunc: validateCustomEndpoint,
-	DefaultFunc: schema.MultiEnvDefaultFunc([]string{
-		"GOOGLE_DATAPROC_CUSTOM_ENDPOINT",
-	}, DataprocDefaultBasePath),
-}
-
 var DataprocBetaDefaultBasePath = "https://dataproc.googleapis.com/v1beta2/"
 var DataprocBetaCustomEndpointEntryKey = "dataproc_beta_custom_endpoint"
 var DataprocBetaCustomEndpointEntry = &schema.Schema{