Revert "Implement low-touch tpgtools integration." (#6121) (#4384)

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

Author: modular-magician

.changelog/6121.txt

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

google-beta/config.go

@@ -137,7 +137,6 @@ func (f *Formatter) Format(entry *logrus.Entry) ([]byte, error) {
 // Config is the configuration structure used to instantiate the Google
 // provider.
 type Config struct {
-	DCLConfig
 	AccessToken                        string
 	Credentials                        string
 	ImpersonateServiceAccount          string
@@ -253,12 +252,26 @@ type Config struct {
 	StorageTransferBasePath   string
 	BigtableAdminBasePath     string
 
-	// dcl
-	ContainerAwsBasePath   string
-	ContainerAzureBasePath string
-
 	requestBatcherServiceUsage *RequestBatcher
 	requestBatcherIam          *RequestBatcher
+
+	// start DCLBasePaths
+	// dataprocBasePath is implemented in mm
+	AssuredWorkloadsBasePath     string
+	ClouddeployBasePath          string
+	CloudResourceManagerBasePath string
+	ContainerAwsBasePath         string
+	ContainerAzureBasePath       string
+	DataplexBasePath             string
+	EventarcBasePath             string
+	FirebaserulesBasePath        string
+	GkeHubBasePath               string
+	NetworkConnectivityBasePath  string
+	OrgPolicyBasePath            string
+	RecaptchaEnterpriseBasePath  string
+	ApikeysBasePath              string
+	// CloudBuild WorkerPool uses a different endpoint (v1beta1) than any other CloudBuild resources
+	CloudBuildWorkerPoolBasePath string
 }
 
 const AccessApprovalBasePathKey = "AccessApproval"

google-beta/provider.go

@@ -789,8 +789,22 @@ func Provider() *schema.Provider {
 			BigtableAdminCustomEndpointEntryKey:     BigtableAdminCustomEndpointEntry,
 
 			// dcl
-			ContainerAwsCustomEndpointEntryKey:   ContainerAwsCustomEndpointEntry,
-			ContainerAzureCustomEndpointEntryKey: ContainerAzureCustomEndpointEntry,
+			AssuredWorkloadsEndpointEntryKey:             AssuredWorkloadsEndpointEntry,
+			ClouddeployEndpointEntryKey:                  ClouddeployEndpointEntry,
+			CloudResourceManagerEndpointEntryKey:         CloudResourceManagerEndpointEntry,
+			DataplexEndpointEntryKey:                     DataplexEndpointEntry,
+			EventarcEndpointEntryKey:                     EventarcEndpointEntry,
+			FirebaserulesEndpointEntryKey:                FirebaserulesEndpointEntry,
+			GkeHubFeatureCustomEndpointEntryKey:          GkeHubFeatureCustomEndpointEntry,
+			NetworkConnectivityEndpointEntryKey:          NetworkConnectivityEndpointEntry,
+			OrgPolicyEndpointEntryKey:                    OrgPolicyEndpointEntry,
+			PrivatecaCertificateTemplateEndpointEntryKey: PrivatecaCertificateTemplateCustomEndpointEntry,
+			RecaptchaEnterpriseEndpointEntryKey:          RecaptchaEnterpriseEndpointEntry,
+			ContainerAwsCustomEndpointEntryKey:           ContainerAwsCustomEndpointEntry,
+			ContainerAzureCustomEndpointEntryKey:         ContainerAzureCustomEndpointEntry,
+			ApikeysEndpointEntryKey:                      ApikeysEndpointEntry,
+
+			CloudBuildWorkerPoolEndpointEntryKey: CloudBuildWorkerPoolEndpointEntry,
 		},
 
 		ProviderMetaSchema: map[string]*schema.Schema{
@@ -922,8 +936,6 @@ func Provider() *schema.Provider {
 		return providerConfigure(ctx, d, provider)
 	}
 
-	configureDCLProvider(provider)
-
 	return provider
 }
 
@@ -1679,8 +1691,20 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
 	config.BigtableAdminBasePath = d.Get(BigtableAdminCustomEndpointEntryKey).(string)
 
 	// dcl
+	config.ApikeysBasePath = d.Get(ApikeysEndpointEntryKey).(string)
+	config.AssuredWorkloadsBasePath = d.Get(AssuredWorkloadsEndpointEntryKey).(string)
+	config.ClouddeployBasePath = d.Get(ClouddeployEndpointEntryKey).(string)
+	config.CloudResourceManagerBasePath = d.Get(CloudResourceManagerEndpointEntryKey).(string)
+	config.DataplexBasePath = d.Get(DataplexEndpointEntryKey).(string)
+	config.EventarcBasePath = d.Get(EventarcEndpointEntryKey).(string)
+	config.FirebaserulesBasePath = d.Get(FirebaserulesEndpointEntryKey).(string)
+	config.GkeHubBasePath = d.Get(GkeHubFeatureCustomEndpointEntryKey).(string)
+	config.NetworkConnectivityBasePath = d.Get(NetworkConnectivityEndpointEntryKey).(string)
+	config.OrgPolicyBasePath = d.Get(OrgPolicyEndpointEntryKey).(string)
+	config.PrivatecaBasePath = d.Get(PrivatecaCertificateTemplateEndpointEntryKey).(string)
 	config.ContainerAwsBasePath = d.Get(ContainerAwsCustomEndpointEntryKey).(string)
 	config.ContainerAzureBasePath = d.Get(ContainerAzureCustomEndpointEntryKey).(string)
+	config.CloudBuildWorkerPoolBasePath = d.Get(CloudBuildWorkerPoolEndpointEntryKey).(string)
 
 	stopCtx, ok := schema.StopContext(ctx)
 	if !ok {
@@ -1690,7 +1714,7 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
 		return nil, diag.FromErr(err)
 	}
 
-	return providerDCLConfigure(d, &config), nil
+	return &config, nil
 }
 
 func validateCredentials(v interface{}, k string) (warnings []string, errors []error) {

google-beta/provider_dcl_client_creation.go

@@ -346,7 +346,7 @@ func NewDCLGkeHubClient(config *Config, userAgent, billingProject string, timeou
 		dcl.WithHTTPClient(config.client),
 		dcl.WithUserAgent(userAgent),
 		dcl.WithLogger(dclLogger{}),
-		dcl.WithBasePath(config.GKEHubBasePath),
+		dcl.WithBasePath(config.GkeHubBasePath),
 	}
 
 	if timeout != 0 {

google-beta/provider_dcl_endpoints.go

@@ -67,6 +67,33 @@ var CloudResourceManagerEndpointEntry = &schema.Schema{
 	}, ""),
 }
 
+var ComputeEndpointEntryKey = "compute_custom_endpoint"
+var ComputeEndpointEntry = &schema.Schema{
+	Type:     schema.TypeString,
+	Optional: true,
+	DefaultFunc: schema.MultiEnvDefaultFunc([]string{
+		"GOOGLE_COMPUTE_CUSTOM_ENDPOINT",
+	}, ""),
+}
+
+var ContainerAwsEndpointEntryKey = "container_aws_custom_endpoint"
+var ContainerAwsEndpointEntry = &schema.Schema{
+	Type:     schema.TypeString,
+	Optional: true,
+	DefaultFunc: schema.MultiEnvDefaultFunc([]string{
+		"GOOGLE_CONTAINER_AWS_CUSTOM_ENDPOINT",
+	}, ""),
+}
+
+var ContainerAzureEndpointEntryKey = "container_azure_custom_endpoint"
+var ContainerAzureEndpointEntry = &schema.Schema{
+	Type:     schema.TypeString,
+	Optional: true,
+	DefaultFunc: schema.MultiEnvDefaultFunc([]string{
+		"GOOGLE_CONTAINER_AZURE_CUSTOM_ENDPOINT",
+	}, ""),
+}
+
 var DataplexEndpointEntryKey = "dataplex_custom_endpoint"
 var DataplexEndpointEntry = &schema.Schema{
 	Type:     schema.TypeString,
@@ -94,6 +121,24 @@ var FirebaserulesEndpointEntry = &schema.Schema{
 	}, ""),
 }
 
+var LoggingEndpointEntryKey = "logging_custom_endpoint"
+var LoggingEndpointEntry = &schema.Schema{
+	Type:     schema.TypeString,
+	Optional: true,
+	DefaultFunc: schema.MultiEnvDefaultFunc([]string{
+		"GOOGLE_LOGGING_CUSTOM_ENDPOINT",
+	}, ""),
+}
+
+var MonitoringEndpointEntryKey = "monitoring_custom_endpoint"
+var MonitoringEndpointEntry = &schema.Schema{
+	Type:     schema.TypeString,
+	Optional: true,
+	DefaultFunc: schema.MultiEnvDefaultFunc([]string{
+		"GOOGLE_MONITORING_CUSTOM_ENDPOINT",
+	}, ""),
+}
+
 var NetworkConnectivityEndpointEntryKey = "network_connectivity_custom_endpoint"
 var NetworkConnectivityEndpointEntry = &schema.Schema{
 	Type:     schema.TypeString,
@@ -112,6 +157,24 @@ var OrgPolicyEndpointEntry = &schema.Schema{
 	}, ""),
 }
 
+var OSConfigEndpointEntryKey = "os_config_custom_endpoint"
+var OSConfigEndpointEntry = &schema.Schema{
+	Type:     schema.TypeString,
+	Optional: true,
+	DefaultFunc: schema.MultiEnvDefaultFunc([]string{
+		"GOOGLE_OS_CONFIG_CUSTOM_ENDPOINT",
+	}, ""),
+}
+
+var PrivatecaEndpointEntryKey = "privateca_custom_endpoint"
+var PrivatecaEndpointEntry = &schema.Schema{
+	Type:     schema.TypeString,
+	Optional: true,
+	DefaultFunc: schema.MultiEnvDefaultFunc([]string{
+		"GOOGLE_PRIVATECA_CUSTOM_ENDPOINT",
+	}, ""),
+}
+
 var RecaptchaEnterpriseEndpointEntryKey = "recaptcha_enterprise_custom_endpoint"
 var RecaptchaEnterpriseEndpointEntry = &schema.Schema{
 	Type:     schema.TypeString,
@@ -121,46 +184,62 @@ var RecaptchaEnterpriseEndpointEntry = &schema.Schema{
 	}, ""),
 }
 
-type DCLConfig struct {
-	ApikeysBasePath              string
-	AssuredWorkloadsBasePath     string
-	CloudBuildWorkerPoolBasePath string
-	ClouddeployBasePath          string
-	CloudResourceManagerBasePath string
-	DataplexBasePath             string
-	EventarcBasePath             string
-	FirebaserulesBasePath        string
-	NetworkConnectivityBasePath  string
-	OrgPolicyBasePath            string
-	RecaptchaEnterpriseBasePath  string
-}
-
-func configureDCLProvider(provider *schema.Provider) {
-	provider.Schema[ApikeysEndpointEntryKey] = ApikeysEndpointEntry
-	provider.Schema[AssuredWorkloadsEndpointEntryKey] = AssuredWorkloadsEndpointEntry
-	provider.Schema[CloudBuildWorkerPoolEndpointEntryKey] = CloudBuildWorkerPoolEndpointEntry
-	provider.Schema[ClouddeployEndpointEntryKey] = ClouddeployEndpointEntry
-	provider.Schema[CloudResourceManagerEndpointEntryKey] = CloudResourceManagerEndpointEntry
-	provider.Schema[DataplexEndpointEntryKey] = DataplexEndpointEntry
-	provider.Schema[EventarcEndpointEntryKey] = EventarcEndpointEntry
-	provider.Schema[FirebaserulesEndpointEntryKey] = FirebaserulesEndpointEntry
-	provider.Schema[NetworkConnectivityEndpointEntryKey] = NetworkConnectivityEndpointEntry
-	provider.Schema[OrgPolicyEndpointEntryKey] = OrgPolicyEndpointEntry
-	provider.Schema[RecaptchaEnterpriseEndpointEntryKey] = RecaptchaEnterpriseEndpointEntry
-}
-
-func providerDCLConfigure(d *schema.ResourceData, config *Config) interface{} {
-	config.ApikeysBasePath = d.Get(ApikeysEndpointEntryKey).(string)
-	config.AssuredWorkloadsBasePath = d.Get(AssuredWorkloadsEndpointEntryKey).(string)
-	config.CloudBuildWorkerPoolBasePath = d.Get(CloudBuildWorkerPoolEndpointEntryKey).(string)
-	config.ClouddeployBasePath = d.Get(ClouddeployEndpointEntryKey).(string)
-	config.CloudResourceManagerBasePath = d.Get(CloudResourceManagerEndpointEntryKey).(string)
-	config.DataplexBasePath = d.Get(DataplexEndpointEntryKey).(string)
-	config.EventarcBasePath = d.Get(EventarcEndpointEntryKey).(string)
-	config.FirebaserulesBasePath = d.Get(FirebaserulesEndpointEntryKey).(string)
-	config.NetworkConnectivityBasePath = d.Get(NetworkConnectivityEndpointEntryKey).(string)
-	config.OrgPolicyBasePath = d.Get(OrgPolicyEndpointEntryKey).(string)
-	config.RecaptchaEnterpriseBasePath = d.Get(RecaptchaEnterpriseEndpointEntryKey).(string)
-	config.CloudBuildWorkerPoolBasePath = d.Get(CloudBuildWorkerPoolEndpointEntryKey).(string)
-	return config
-}
+//Add new values to config.go.erb config object declaration
+//ApikeysBasePath string
+//AssuredWorkloadsBasePath string
+//CloudBuildWorkerPoolBasePath string
+//ClouddeployBasePath string
+//CloudResourceManagerBasePath string
+//ComputeBasePath string
+//ContainerAwsBasePath string
+//ContainerAzureBasePath string
+//DataplexBasePath string
+//EventarcBasePath string
+//FirebaserulesBasePath string
+//LoggingBasePath string
+//MonitoringBasePath string
+//NetworkConnectivityBasePath string
+//OrgPolicyBasePath string
+//OSConfigBasePath string
+//PrivatecaBasePath string
+//RecaptchaEnterpriseBasePath string
+
+//Add new values to provider.go.erb schema initialization
+// ApikeysEndpointEntryKey:               ApikeysEndpointEntry,
+// AssuredWorkloadsEndpointEntryKey:               AssuredWorkloadsEndpointEntry,
+// CloudBuildWorkerPoolEndpointEntryKey:               CloudBuildWorkerPoolEndpointEntry,
+// ClouddeployEndpointEntryKey:               ClouddeployEndpointEntry,
+// CloudResourceManagerEndpointEntryKey:               CloudResourceManagerEndpointEntry,
+// ComputeEndpointEntryKey:               ComputeEndpointEntry,
+// ContainerAwsEndpointEntryKey:               ContainerAwsEndpointEntry,
+// ContainerAzureEndpointEntryKey:               ContainerAzureEndpointEntry,
+// DataplexEndpointEntryKey:               DataplexEndpointEntry,
+// EventarcEndpointEntryKey:               EventarcEndpointEntry,
+// FirebaserulesEndpointEntryKey:               FirebaserulesEndpointEntry,
+// LoggingEndpointEntryKey:               LoggingEndpointEntry,
+// MonitoringEndpointEntryKey:               MonitoringEndpointEntry,
+// NetworkConnectivityEndpointEntryKey:               NetworkConnectivityEndpointEntry,
+// OrgPolicyEndpointEntryKey:               OrgPolicyEndpointEntry,
+// OSConfigEndpointEntryKey:               OSConfigEndpointEntry,
+// PrivatecaEndpointEntryKey:               PrivatecaEndpointEntry,
+// RecaptchaEnterpriseEndpointEntryKey:               RecaptchaEnterpriseEndpointEntry,
+
+//Add new values to provider.go.erb - provider block read
+// config.ApikeysBasePath = d.Get(ApikeysEndpointEntryKey).(string)
+// config.AssuredWorkloadsBasePath = d.Get(AssuredWorkloadsEndpointEntryKey).(string)
+// config.CloudBuildWorkerPoolBasePath = d.Get(CloudBuildWorkerPoolEndpointEntryKey).(string)
+// config.ClouddeployBasePath = d.Get(ClouddeployEndpointEntryKey).(string)
+// config.CloudResourceManagerBasePath = d.Get(CloudResourceManagerEndpointEntryKey).(string)
+// config.ComputeBasePath = d.Get(ComputeEndpointEntryKey).(string)
+// config.ContainerAwsBasePath = d.Get(ContainerAwsEndpointEntryKey).(string)
+// config.ContainerAzureBasePath = d.Get(ContainerAzureEndpointEntryKey).(string)
+// config.DataplexBasePath = d.Get(DataplexEndpointEntryKey).(string)
+// config.EventarcBasePath = d.Get(EventarcEndpointEntryKey).(string)
+// config.FirebaserulesBasePath = d.Get(FirebaserulesEndpointEntryKey).(string)
+// config.LoggingBasePath = d.Get(LoggingEndpointEntryKey).(string)
+// config.MonitoringBasePath = d.Get(MonitoringEndpointEntryKey).(string)
+// config.NetworkConnectivityBasePath = d.Get(NetworkConnectivityEndpointEntryKey).(string)
+// config.OrgPolicyBasePath = d.Get(OrgPolicyEndpointEntryKey).(string)
+// config.OSConfigBasePath = d.Get(OSConfigEndpointEntryKey).(string)
+// config.PrivatecaBasePath = d.Get(PrivatecaEndpointEntryKey).(string)
+// config.RecaptchaEnterpriseBasePath = d.Get(RecaptchaEnterpriseEndpointEntryKey).(string)