Revert "Discovery Engine Data Store" (hashicorp#9839) (hashicorp#17043)

[upstream:ebc991bb98c1a5fae88d695b3be64de3efc26cd4] Signed-off-by: Modular Magician <[email protected]>
opentofu · Jan 19, 2024 · 9e8ccb1 · 9e8ccb1
1 parent fa12057
commit 9e8ccb1
Show file tree

Hide file tree

Showing 15 changed files with 5 additions and 1,092 deletions.
diff --git a/.changelog/9839.txt b/.changelog/9839.txt
@@ -0,0 +1,3 @@
+```release-note:new-resource
+google_discovery_engine_data_store (revert)
+```
diff --git a/.teamcity/components/generated/services.kt b/.teamcity/components/generated/services.kt
@@ -301,11 +301,6 @@ var services = mapOf(
         "displayName" to "Dialogflowcx",
         "path" to "./google/services/dialogflowcx"
     ),
-    "discoveryengine" to mapOf(
-        "name" to "discoveryengine",
-        "displayName" to "Discoveryengine",
-        "path" to "./google/services/discoveryengine"
-    ),
     "dns" to mapOf(
         "name" to "dns",
         "displayName" to "Dns",

diff --git a/google/fwmodels/provider_model.go b/google/fwmodels/provider_model.go
@@ -75,7 +75,6 @@ type ProviderModel struct {
 	DeploymentManagerCustomEndpoint        types.String `tfsdk:"deployment_manager_custom_endpoint"`
 	DialogflowCustomEndpoint               types.String `tfsdk:"dialogflow_custom_endpoint"`
 	DialogflowCXCustomEndpoint             types.String `tfsdk:"dialogflow_cx_custom_endpoint"`
-	DiscoveryEngineCustomEndpoint          types.String `tfsdk:"discovery_engine_custom_endpoint"`
 	DNSCustomEndpoint                      types.String `tfsdk:"dns_custom_endpoint"`
 	DocumentAICustomEndpoint               types.String `tfsdk:"document_ai_custom_endpoint"`
 	DocumentAIWarehouseCustomEndpoint      types.String `tfsdk:"document_ai_warehouse_custom_endpoint"`

diff --git a/google/fwprovider/framework_provider.go b/google/fwprovider/framework_provider.go
@@ -430,12 +430,6 @@ func (p *FrameworkProvider) Schema(_ context.Context, _ provider.SchemaRequest,
 					transport_tpg.CustomEndpointValidator(),
 				},
 			},
-			"discovery_engine_custom_endpoint": &schema.StringAttribute{
-				Optional: true,
-				Validators: []validator.String{
-					transport_tpg.CustomEndpointValidator(),
-				},
-			},
 			"dns_custom_endpoint": &schema.StringAttribute{
 				Optional: true,
 				Validators: []validator.String{

diff --git a/google/fwtransport/framework_config.go b/google/fwtransport/framework_config.go
@@ -100,7 +100,6 @@ type FrameworkProviderConfig struct {
 	DeploymentManagerBasePath        string
 	DialogflowBasePath               string
 	DialogflowCXBasePath             string
-	DiscoveryEngineBasePath          string
 	DNSBasePath                      string
 	DocumentAIBasePath               string
 	DocumentAIWarehouseBasePath      string
@@ -248,7 +247,6 @@ func (p *FrameworkProviderConfig) LoadAndValidateFramework(ctx context.Context,
 	p.DeploymentManagerBasePath = data.DeploymentManagerCustomEndpoint.ValueString()
 	p.DialogflowBasePath = data.DialogflowCustomEndpoint.ValueString()
 	p.DialogflowCXBasePath = data.DialogflowCXCustomEndpoint.ValueString()
-	p.DiscoveryEngineBasePath = data.DiscoveryEngineCustomEndpoint.ValueString()
 	p.DNSBasePath = data.DNSCustomEndpoint.ValueString()
 	p.DocumentAIBasePath = data.DocumentAICustomEndpoint.ValueString()
 	p.DocumentAIWarehouseBasePath = data.DocumentAIWarehouseCustomEndpoint.ValueString()
@@ -827,14 +825,6 @@ func (p *FrameworkProviderConfig) HandleDefaults(ctx context.Context, data *fwmo
 			data.DialogflowCXCustomEndpoint = types.StringValue(customEndpoint.(string))
 		}
 	}
-	if data.DiscoveryEngineCustomEndpoint.IsNull() {
-		customEndpoint := transport_tpg.MultiEnvDefault([]string{
-			"GOOGLE_DISCOVERY_ENGINE_CUSTOM_ENDPOINT",
-		}, transport_tpg.DefaultBasePaths[transport_tpg.DiscoveryEngineBasePathKey])
-		if customEndpoint != nil {
-			data.DiscoveryEngineCustomEndpoint = types.StringValue(customEndpoint.(string))
-		}
-	}
 	if data.DNSCustomEndpoint.IsNull() {
 		customEndpoint := transport_tpg.MultiEnvDefault([]string{
 			"GOOGLE_DNS_CUSTOM_ENDPOINT",

diff --git a/google/provider/provider.go b/google/provider/provider.go
@@ -380,11 +380,6 @@ func Provider() *schema.Provider {
 				Optional:     true,
 				ValidateFunc: transport_tpg.ValidateCustomEndpoint,
 			},
-			"discovery_engine_custom_endpoint": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ValidateFunc: transport_tpg.ValidateCustomEndpoint,
-			},
 			"dns_custom_endpoint": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -929,7 +924,6 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
 	config.DeploymentManagerBasePath = d.Get("deployment_manager_custom_endpoint").(string)
 	config.DialogflowBasePath = d.Get("dialogflow_custom_endpoint").(string)
 	config.DialogflowCXBasePath = d.Get("dialogflow_cx_custom_endpoint").(string)
-	config.DiscoveryEngineBasePath = d.Get("discovery_engine_custom_endpoint").(string)
 	config.DNSBasePath = d.Get("dns_custom_endpoint").(string)
 	config.DocumentAIBasePath = d.Get("document_ai_custom_endpoint").(string)
 	config.DocumentAIWarehouseBasePath = d.Get("document_ai_warehouse_custom_endpoint").(string)

diff --git a/google/provider/provider_mmv1_resources.go b/google/provider/provider_mmv1_resources.go
@@ -53,7 +53,6 @@ import (
 	"github.com/hashicorp/terraform-provider-google/google/services/deploymentmanager"
 	"github.com/hashicorp/terraform-provider-google/google/services/dialogflow"
 	"github.com/hashicorp/terraform-provider-google/google/services/dialogflowcx"
-	"github.com/hashicorp/terraform-provider-google/google/services/discoveryengine"
 	"github.com/hashicorp/terraform-provider-google/google/services/dns"
 	"github.com/hashicorp/terraform-provider-google/google/services/documentai"
 	"github.com/hashicorp/terraform-provider-google/google/services/documentaiwarehouse"
@@ -379,9 +378,9 @@ var handwrittenIAMDatasources = map[string]*schema.Resource{
 }
 
 // Resources
-// Generated resources: 368
+// Generated resources: 367
 // Generated IAM resources: 222
-// Total generated resources: 590
+// Total generated resources: 589
 var generatedResources = map[string]*schema.Resource{
 	"google_folder_access_approval_settings":                         accessapproval.ResourceAccessApprovalFolderSettings(),
 	"google_organization_access_approval_settings":                   accessapproval.ResourceAccessApprovalOrganizationSettings(),
@@ -687,7 +686,6 @@ var generatedResources = map[string]*schema.Resource{
 	"google_dialogflow_cx_test_case":                                 dialogflowcx.ResourceDialogflowCXTestCase(),
 	"google_dialogflow_cx_version":                                   dialogflowcx.ResourceDialogflowCXVersion(),
 	"google_dialogflow_cx_webhook":                                   dialogflowcx.ResourceDialogflowCXWebhook(),
-	"google_discovery_engine_data_store":                             discoveryengine.ResourceDiscoveryEngineDataStore(),
 	"google_dns_managed_zone":                                        dns.ResourceDNSManagedZone(),
 	"google_dns_managed_zone_iam_binding":                            tpgiamresource.ResourceIamBinding(dns.DNSManagedZoneIamSchema, dns.DNSManagedZoneIamUpdaterProducer, dns.DNSManagedZoneIdParseFunc),
 	"google_dns_managed_zone_iam_member":                             tpgiamresource.ResourceIamMember(dns.DNSManagedZoneIamSchema, dns.DNSManagedZoneIamUpdaterProducer, dns.DNSManagedZoneIdParseFunc),

diff --git a/google/services/discoveryengine/discovery_engine_operation.go b/google/services/discoveryengine/discovery_engine_operation.go