Revert "A new datasource for fetching the list of alloydb supported database flags in a location. (#7377)" (#7628) (#14222)

This reverts commit 4ed506a.

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/7628.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

go.mod

@@ -2,7 +2,6 @@ module github.com/hashicorp/terraform-provider-google
 go 1.18
 
 require (
-	cloud.google.com/go/alloydb v0.2.0
 	cloud.google.com/go/bigtable v1.17.0
 	github.com/GoogleCloudPlatform/declarative-resource-client-library v1.34.0
 	github.com/apparentlymart/go-cidr v1.1.0

go.sum

@@ -61,8 +61,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/GoogleCloudPlatform/declarative-resource-client-library v1.34.0 h1:o7t+hPFv+Ax5O2vxzIH7dEtvlWA7JJOlOd7mWFvMa6s=
 github.com/GoogleCloudPlatform/declarative-resource-client-library v1.34.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
-cloud.google.com/go/alloydb v0.2.0 h1:bAFRzwC4q/+eiz5FpckFbT0IZozJMTjVcrDdRCpIdJI=
-cloud.google.com/go/alloydb v0.2.0/go.mod h1:wZv2QDg2+hJ/V4lXsUdnSm8ygdMKBVWeioAsERSBLbE=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk=
 github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=

google/config.go

@@ -19,7 +19,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"google.golang.org/api/option"
 
-	alloydb "cloud.google.com/go/alloydb/apiv1"
 	"golang.org/x/oauth2"
 	googleoauth "golang.org/x/oauth2/google"
 	appengine "google.golang.org/api/appengine/v1"
@@ -1347,17 +1346,6 @@ func (c *Config) NewSqlAdminClient(userAgent string) *sqladmin.Service {
 	return clientSqlAdmin
 }
 
-func (c *Config) NewAlloydbClient(userAgent string) *alloydb.AlloyDBAdminClient {
-	alloydbBasePath := RemoveBasePathVersion(RemoveBasePathVersion(c.AlloydbBasePath))
-	log.Printf("[INFO] Instantiating Alloydb client for path %s", alloydbBasePath)
-	clientAlloydb, err := alloydb.NewAlloyDBAdminRESTClient(c.context, option.WithHTTPClient(c.Client), option.WithUserAgent(userAgent), option.WithEndpoint(alloydbBasePath))
-	if err != nil {
-		log.Printf("[WARN] Error creating client storage: %s", err)
-		return nil
-	}
-	return clientAlloydb
-}
-
 func (c *Config) NewPubsubClient(userAgent string) *pubsub.Service {
 	pubsubClientBasePath := RemoveBasePathVersion(c.PubsubBasePath)
 	log.Printf("[INFO] Instantiating Google Pubsub client for path %s", pubsubClientBasePath)

google/data_source_alloydb_supported_database_flags.go

@@ -120,7 +120,7 @@ func checkDatabaseFieldsMatchForDataSourceStateAndResourceState(dsAttr, rsAttr m
 	}
 
 	if index == "-1" {
-		return errors.New("The newly created instance is not found in the data source")
+		return errors.New("The newly created intance is not found in the data source")
 	}
 
 	errMsg := ""

google/data_source_alloydb_supported_database_flags_test.go

@@ -579,7 +579,6 @@ func Provider() *schema.Provider {
 			"google_access_approval_organization_service_account": DataSourceAccessApprovalOrganizationServiceAccount(),
 			"google_access_approval_project_service_account":      DataSourceAccessApprovalProjectServiceAccount(),
 			"google_active_folder":                                DataSourceGoogleActiveFolder(),
-			"google_alloydb_supported_database_flags":             DataSourceAlloydbSupportedDatabaseFlags(),
 			"google_artifact_registry_repository":                 DataSourceArtifactRegistryRepository(),
 			"google_app_engine_default_service_account":           DataSourceGoogleAppEngineDefaultServiceAccount(),
 			"google_beyondcorp_app_connection":                    DataSourceGoogleBeyondcorpAppConnection(),