Remove stray beta clients in GA (#5379) (#10456)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Oct 29, 2021 · fb557be · fb557be
1 parent 6a9ff13
commit fb557be
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 58 deletions.
diff --git a/.changelog/5379.txt b/.changelog/5379.txt
@@ -0,0 +1,2 @@
+```release-note:none
+```
diff --git a/go.mod b/go.mod
@@ -22,9 +22,8 @@ require (
 	github.com/zclconf/go-cty v1.5.1 // indirect
 	golang.org/x/mod v0.5.0 // indirect
 	golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420
-	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f
-	golang.org/x/sys v0.0.0-20210915083310-ed5796bab164 // indirect
-	google.golang.org/api v0.56.0
+	golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1
+	google.golang.org/api v0.59.0
 	google.golang.org/grpc v1.40.0
 )
 

diff --git a/go.sum b/go.sum
diff --git a/google/composer_operation.go b/google/composer_operation.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	composer "google.golang.org/api/composer/v1beta1"
+	"google.golang.org/api/composer/v1"
 )
 
 type ComposerOperationWaiter struct {

diff --git a/google/config.go b/google/config.go
@@ -26,7 +26,7 @@ import (
 	"google.golang.org/api/cloudkms/v1"
 	"google.golang.org/api/cloudresourcemanager/v1"
 	resourceManagerV2 "google.golang.org/api/cloudresourcemanager/v2"
-	composer "google.golang.org/api/composer/v1beta1"
+	"google.golang.org/api/composer/v1"
 	"google.golang.org/api/compute/v1"
 	"google.golang.org/api/container/v1"
 	dataflow "google.golang.org/api/dataflow/v1b3"
@@ -147,7 +147,6 @@ type Config struct {
 	CloudBillingBasePath      string
 	ComposerBasePath          string
 	ContainerBasePath         string
-	DataprocBetaBasePath      string
 	DataflowBasePath          string
 	IamCredentialsBasePath    string
 	ResourceManagerV2BasePath string
@@ -237,7 +236,6 @@ const WorkflowsBasePathKey = "Workflows"
 const CloudBillingBasePathKey = "CloudBilling"
 const ComposerBasePathKey = "Composer"
 const ContainerBasePathKey = "Container"
-const DataprocBetaBasePathKey = "DataprocBeta"
 const DataflowBasePathKey = "Dataflow"
 const IAMBasePathKey = "IAM"
 const IamCredentialsBasePathKey = "IamCredentials"
@@ -317,7 +315,6 @@ var DefaultBasePaths = map[string]string{
 	CloudBillingBasePathKey:         "https://cloudbilling.googleapis.com/v1/",
 	ComposerBasePathKey:             "https://composer.googleapis.com/v1/",
 	ContainerBasePathKey:            "https://container.googleapis.com/v1/",
-	DataprocBetaBasePathKey:         "https://dataproc.googleapis.com/v1beta2/",
 	DataflowBasePathKey:             "https://dataflow.googleapis.com/v1b3/",
 	IAMBasePathKey:                  "https://iam.googleapis.com/v1/",
 	IamCredentialsBasePathKey:       "https://iamcredentials.googleapis.com/v1/",

diff --git a/google/provider.go b/google/provider.go
@@ -674,7 +674,6 @@ func Provider() *schema.Provider {
 			CloudBillingCustomEndpointEntryKey:      CloudBillingCustomEndpointEntry,
 			ComposerCustomEndpointEntryKey:          ComposerCustomEndpointEntry,
 			ContainerCustomEndpointEntryKey:         ContainerCustomEndpointEntry,
-			DataprocBetaCustomEndpointEntryKey:      DataprocBetaCustomEndpointEntry,
 			DataflowCustomEndpointEntryKey:          DataflowCustomEndpointEntry,
 			IamCredentialsCustomEndpointEntryKey:    IamCredentialsCustomEndpointEntry,
 			ResourceManagerV2CustomEndpointEntryKey: ResourceManagerV2CustomEndpointEntry,
@@ -1413,11 +1412,9 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
 	config.WorkflowsBasePath = d.Get("workflows_custom_endpoint").(string)
 
 	// Handwritten Products / Versioned / Atypical Entries
-
 	config.CloudBillingBasePath = d.Get(CloudBillingCustomEndpointEntryKey).(string)
 	config.ComposerBasePath = d.Get(ComposerCustomEndpointEntryKey).(string)
 	config.ContainerBasePath = d.Get(ContainerCustomEndpointEntryKey).(string)
-	config.DataprocBetaBasePath = d.Get(DataprocBetaCustomEndpointEntryKey).(string)
 	config.DataflowBasePath = d.Get(DataflowCustomEndpointEntryKey).(string)
 	config.IamCredentialsBasePath = d.Get(IamCredentialsCustomEndpointEntryKey).(string)
 	config.ResourceManagerV2BasePath = d.Get(ResourceManagerV2CustomEndpointEntryKey).(string)

diff --git a/google/provider_handwritten_endpoint.go b/google/provider_handwritten_endpoint.go
@@ -38,16 +38,6 @@ var ContainerCustomEndpointEntry = &schema.Schema{
 	}, DefaultBasePaths[ContainerBasePathKey]),
 }
 
-var DataprocBetaCustomEndpointEntryKey = "dataproc_beta_custom_endpoint"
-var DataprocBetaCustomEndpointEntry = &schema.Schema{
-	Type:         schema.TypeString,
-	Optional:     true,
-	ValidateFunc: validateCustomEndpoint,
-	DefaultFunc: schema.MultiEnvDefaultFunc([]string{
-		"GOOGLE_DATAPROC_BETA_CUSTOM_ENDPOINT",
-	}, DefaultBasePaths[DataprocBetaBasePathKey]),
-}
-
 var DataflowCustomEndpointEntryKey = "dataflow_custom_endpoint"
 var DataflowCustomEndpointEntry = &schema.Schema{
 	Type:         schema.TypeString,

diff --git a/google/resource_composer_environment.go b/google/resource_composer_environment.go
@@ -10,7 +10,8 @@ import (
 	"github.com/hashicorp/go-version"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	composer "google.golang.org/api/composer/v1beta1"
+
+	"google.golang.org/api/composer/v1"
 )
 
 const (