Revert "add assured workloads base implementation (#4936) (#3410)"

This reverts commit 4cd9fc2.

Author: rileykarson

.changelog/4936.txt

@@ -175,9 +175,8 @@ type Config struct {
 
 	// start DCLBasePaths
 	// dataprocBasePath is implemented in mm
-	AssuredWorkloadsBasePath string
-	EventarcBasePath         string
-	GkeHubBasePath           string
+	EventarcBasePath string
+	GkeHubBasePath   string
 	// CloudBuild WorkerPool uses a different endpoint (v1beta1) than any other CloudBuild resources
 	CloudBuildWorkerPoolBasePath string
 }

google-beta/config.go

@@ -750,7 +750,6 @@ func Provider() *schema.Provider {
 			BigtableAdminCustomEndpointEntryKey:     BigtableAdminCustomEndpointEntry,
 
 			// dcl
-			AssuredWorkloadsEndpointEntryKey:     AssuredWorkloadsEndpointEntry,
 			EventarcEndpointEntryKey:             EventarcEndpointEntry,
 			GkeHubFeatureCustomEndpointEntryKey:  GkeHubFeatureCustomEndpointEntry,
 			CloudBuildWorkerPoolEndpointEntryKey: CloudBuildWorkerPoolEndpointEntry,
@@ -1228,7 +1227,6 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
 			"google_workflows_workflow":                                    resourceWorkflowsWorkflow(),
 		},
 		map[string]*schema.Resource{
-			"google_assured_workloads_workload":            resourceAssuredWorkloadsWorkload(),
 			"google_app_engine_application":                resourceAppEngineApplication(),
 			"google_bigquery_table":                        resourceBigQueryTable(),
 			"google_bigtable_gc_policy":                    resourceBigtableGCPolicy(),
@@ -1534,7 +1532,6 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
 	config.BigtableAdminBasePath = d.Get(BigtableAdminCustomEndpointEntryKey).(string)
 
 	// dcl
-	config.AssuredWorkloadsBasePath = d.Get(AssuredWorkloadsEndpointEntryKey).(string)
 	config.EventarcBasePath = d.Get(EventarcEndpointEntryKey).(string)
 	config.GkeHubBasePath = d.Get(GkeHubFeatureCustomEndpointEntryKey).(string)
 	config.CloudBuildWorkerPoolBasePath = d.Get(CloudBuildWorkerPoolEndpointEntryKey).(string)

google-beta/provider.go

@@ -17,39 +17,12 @@ package google
 import (
 	dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
 
-	assuredworkloads "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/assuredworkloads/beta"
 	cloudbuild "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/cloudbuild/beta"
 	dataproc "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/dataproc/beta"
 	eventarc "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/eventarc/beta"
 	gke_hub "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/gkehub/beta"
 )
 
-func NewDCLAssuredWorkloadsClient(config *Config, userAgent, billingProject string) *assuredworkloads.Client {
-	dclClientOptions := dcl.WithHTTPClient(config.client)
-	dclUserAgentOptions := dcl.WithUserAgent(userAgent)
-	dclLoggerOptions := dcl.WithLogger(dclLogger{})
-	var dclConfig *dcl.Config
-	if config.UserProjectOverride && billingProject != "" {
-		dclBillingProjectHeader := dcl.WithHeader("X-Goog-User-Project", billingProject)
-		dclConfig = dcl.NewConfig(
-			dclClientOptions,
-			dclUserAgentOptions,
-			dclLoggerOptions,
-			dcl.WithBasePath(config.AssuredWorkloadsBasePath),
-			dclBillingProjectHeader,
-		)
-	} else {
-		dclConfig = dcl.NewConfig(
-			dclClientOptions,
-			dclUserAgentOptions,
-			dclLoggerOptions,
-			dcl.WithBasePath(config.AssuredWorkloadsBasePath),
-		)
-	}
-
-	return assuredworkloads.NewClient(dclConfig)
-}
-
 func NewDCLCloudbuildClient(config *Config, userAgent, billingProject string) *cloudbuild.Client {
 	dclClientOptions := dcl.WithHTTPClient(config.client)
 	dclUserAgentOptions := dcl.WithUserAgent(userAgent)

google-beta/provider_dcl_client_creation.go

@@ -21,15 +21,6 @@ import (
 // empty string is passed for dcl default since dcl
 // [hardcodes the values](https://github.com/GoogleCloudPlatform/declarative-resource-client-library/blob/main/services/google/eventarc/beta/trigger_internal.go#L96-L103)
 
-var AssuredWorkloadsEndpointEntryKey = "assured_workloads_custom_endpoint"
-var AssuredWorkloadsEndpointEntry = &schema.Schema{
-	Type:     schema.TypeString,
-	Optional: true,
-	DefaultFunc: schema.MultiEnvDefaultFunc([]string{
-		"GOOGLE_ASSURED_WORKLOADS_CUSTOM_ENDPOINT",
-	}, ""),
-}
-
 var CloudBuildWorkerPoolEndpointEntryKey = "cloud_build_worker_pool_custom_endpoint"
 var CloudBuildWorkerPoolEndpointEntry = &schema.Schema{
 	Type:     schema.TypeString,
@@ -49,16 +40,13 @@ var EventarcEndpointEntry = &schema.Schema{
 }
 
 //Add new values to config.go.erb config object declaration
-//AssuredWorkloadsBasePath string
 //CloudBuildWorkerPoolBasePath string
 //EventarcBasePath string
 
 //Add new values to provider.go.erb schema initialization
-// AssuredWorkloadsEndpointEntryKey:               AssuredWorkloadsEndpointEntry,
 // CloudBuildWorkerPoolEndpointEntryKey:               CloudBuildWorkerPoolEndpointEntry,
 // EventarcEndpointEntryKey:               EventarcEndpointEntry,
 
 //Add new values to provider.go.erb - provider block read
-// config.AssuredWorkloadsBasePath = d.Get(AssuredWorkloadsEndpointEntryKey).(string)
 // config.CloudBuildWorkerPoolBasePath = d.Get(CloudBuildWorkerPoolEndpointEntryKey).(string)
 // config.EventarcBasePath = d.Get(EventarcEndpointEntryKey).(string)