Merge branch 'main' of https://github.com/GoogleCloudPlatform/magic-modules

actions-user · actions-user · commit efda9e087dd6 · 2026-02-03T17:45:29.000Z
diff --git a/mmv1/api/async.go b/mmv1/api/async.go
@@ -14,7 +14,6 @@
 package api
 
 import (
-	"log"
 	"reflect"
 	"strings"
 
@@ -80,9 +79,6 @@ type OpAsync struct {
 
 type OpAsyncOperation struct {
 	BaseUrl string `yaml:"base_url,omitempty"`
-
-	// Use this if the resource includes the full operation url.
-	FullUrl string `yaml:"full_url,omitempty"`
 }
 
 // Represents the results of an Operation request
@@ -161,15 +157,3 @@ func (a *Async) MarshalYAML() (interface{}, error) {
 
 	return (*asyncAlias)(clonePtr), nil
 }
-
-func (a *Async) Validate() {
-	if a.Type == "OpAsync" {
-		if a.Operation == nil {
-			log.Fatalf("Missing `Operation` for OpAsync")
-		} else {
-			if a.Operation.BaseUrl != "" && a.Operation.FullUrl != "" {
-				log.Fatalf("`base_url` and `full_url` cannot be set at the same time in OpAsync operation.")
-			}
-		}
-	}
-}
diff --git a/mmv1/api/product.go b/mmv1/api/product.go
@@ -122,10 +122,6 @@ func (p *Product) Validate() {
 	for _, v := range p.Versions {
 		v.Validate(p.Name)
 	}
-
-	if p.Async != nil {
-		p.Async.Validate()
-	}
 }
 
 // ====================
diff --git a/mmv1/api/resource.go b/mmv1/api/resource.go
@@ -568,10 +568,6 @@ func (r *Resource) Validate() {
 	for _, sample := range r.Samples {
 		sample.Validate(r.Name)
 	}
-
-	if r.Async != nil {
-		r.Async.Validate()
-	}
 }
 
 // ====================
diff --git a/mmv1/products/chronicle/Retrohunt.yaml b/mmv1/products/chronicle/Retrohunt.yaml
@@ -48,7 +48,6 @@ async:
   actions: [create]
   type: OpAsync
   operation:
-    full_url: 'https://{{location}}-chronicle.googleapis.com/v1/{{op_id}}'
     timeouts:
       insert_minutes: 20
       update_minutes: 20
diff --git a/mmv1/products/colab/NotebookExecution.yaml b/mmv1/products/colab/NotebookExecution.yaml
@@ -29,7 +29,6 @@ create_url: 'projects/{{project}}/locations/{{location}}/notebookExecutionJobs?n
 async:
   type: 'OpAsync'
   operation:
-    full_url: 'https://{{location}}-aiplatform.googleapis.com/v1/{{op_id}}'
 import_format:
   - 'projects/{{project}}/locations/{{location}}/notebookExecutionJobs/{{notebook_execution_job_id}}'
 custom_code:
diff --git a/mmv1/products/colab/Runtime.yaml b/mmv1/products/colab/Runtime.yaml
@@ -27,8 +27,6 @@ self_link: 'projects/{{project}}/locations/{{location}}/notebookRuntimes/{{name}
 create_url: 'projects/{{project}}/locations/{{location}}/notebookRuntimes:assign?notebook_runtime_id={{name}}'
 async:
   type: 'OpAsync'
-  operation:
-    full_url: 'https://{{location}}-aiplatform.googleapis.com/v1/{{op_id}}'
 custom_code:
   encoder: 'templates/terraform/encoders/colab_runtime.go.tmpl'
   post_create: 'templates/terraform/post_create/colab_runtime.go.tmpl'
diff --git a/mmv1/products/colab/RuntimeTemplate.yaml b/mmv1/products/colab/RuntimeTemplate.yaml
@@ -30,8 +30,6 @@ immutable: true
 create_url: 'projects/{{project}}/locations/{{location}}/notebookRuntimeTemplates?notebook_runtime_template_id={{name}}'
 async:
   type: 'OpAsync'
-  operation:
-    full_url: 'https://{{location}}-aiplatform.googleapis.com/v1/{{op_id}}'
   result:
     resource_inside_response: true
 iam_policy:
diff --git a/mmv1/products/colab/Schedule.yaml b/mmv1/products/colab/Schedule.yaml
@@ -29,8 +29,6 @@ update_verb: 'PATCH'
 async:
   type: 'OpAsync'
   actions: ['delete']
-  operation:
-    full_url: 'https://{{location}}-aiplatform.googleapis.com/v1/{{op_id}}'
 custom_code:
   encoder: 'templates/terraform/encoders/colab_schedule.go.tmpl'
   post_create: 'templates/terraform/post_create/colab_schedule.go.tmpl'
diff --git a/mmv1/products/compute/InstantSnapshot.yaml b/mmv1/products/compute/InstantSnapshot.yaml
@@ -39,8 +39,6 @@ timeouts:
 async:
   actions: ['create', 'delete', 'update']
   type: 'OpAsync'
-  operation:
-    full_url: 'selfLink'
   result:
     resource_inside_response: false
 collection_url_key: 'items'
diff --git a/mmv1/products/compute/Snapshot.yaml b/mmv1/products/compute/Snapshot.yaml
@@ -46,8 +46,6 @@ timeouts:
 async:
   actions: ['create', 'delete', 'update']
   type: 'OpAsync'
-  operation:
-    full_url: 'selfLink'
   result:
     resource_inside_response: false
 collection_url_key: 'items'
diff --git a/mmv1/products/containerattached/Cluster.yaml b/mmv1/products/containerattached/Cluster.yaml
@@ -39,8 +39,6 @@ timeouts:
 async:
   actions: ['create', 'delete', 'update']
   type: 'OpAsync'
-  operation:
-    full_url: 'https://{{location}}-gkemulticloud.googleapis.com/v1/{{op_id}}'
   result:
     resource_inside_response: true
 custom_code:
diff --git a/mmv1/products/deploymentmanager/Deployment.yaml b/mmv1/products/deploymentmanager/Deployment.yaml
@@ -50,8 +50,6 @@ timeouts:
 async:
   actions: ['create', 'delete', 'update']
   type: 'OpAsync'
-  operation:
-    full_url: 'selfLink'
   result:
     resource_inside_response: false
 custom_code:
diff --git a/mmv1/products/dialogflowcx/Environment.yaml b/mmv1/products/dialogflowcx/Environment.yaml
@@ -36,7 +36,6 @@ async:
   actions: ['create', 'update']
   type: 'OpAsync'
   operation:
-    full_url: 'https://{{location}}-dialogflow.googleapis.com/v3/{{op_id}}'
     timeouts:
       insert_minutes: 60
       update_minutes: 60
diff --git a/mmv1/products/dialogflowcx/Version.yaml b/mmv1/products/dialogflowcx/Version.yaml
@@ -35,7 +35,6 @@ async:
   actions: ['create']
   type: 'OpAsync'
   operation:
-    full_url: 'https://{{location}}-dialogflow.googleapis.com/v3/{{op_id}}'
     timeouts:
       insert_minutes: 60
       update_minutes: 20
diff --git a/mmv1/products/discoveryengine/SearchEngine.yaml b/mmv1/products/discoveryengine/SearchEngine.yaml
@@ -173,3 +173,47 @@ properties:
 
       If this field is set and processed successfully, the Engine will be
       protected by the KMS key, as indicated in the cmek_config field.
+  - name: 'knowledgeGraphConfig'
+    type: NestedObject
+    description: |
+      Configurations for the Knowledge Graph.
+    properties:
+      - name: 'enableCloudKnowledgeGraph'
+        type: Boolean
+        default_from_api: true
+        description: |
+          Whether to enable the Cloud Knowledge Graph for the engine.
+      - name: 'cloudKnowledgeGraphTypes'
+        type: Array
+        description: |
+          Specify entity types to support.
+        item_type:
+          type: String
+          description: |
+            Specify entity types to support.
+      - name: 'enablePrivateKnowledgeGraph'
+        type: Boolean
+        default_from_api: true
+        description: |
+          Whether to enable the Private Knowledge Graph for the engine.
+      - name: 'featureConfig'
+        type: NestedObject
+        description: |
+          Feature config for the Knowledge Graph.
+        properties:
+          - name: 'disablePrivateKgQueryUnderstanding'
+            type: Boolean
+            description: |
+              Whether to disable the private KG query understanding for the engine.
+          - name: 'disablePrivateKgEnrichment'
+            type: Boolean
+            description: |
+              Whether to disable the private KG enrichment for the engine.
+          - name: 'disablePrivateKgAutoComplete'
+            type: Boolean
+            description: |
+              Whether to disable the private KG auto complete for the engine.
+          - name: 'disablePrivateKgQueryUiChips'
+            type: Boolean
+            description: |
+              Whether to disable the private KG for query UI chips.
diff --git a/mmv1/products/storage/AnywhereCache.yaml b/mmv1/products/storage/AnywhereCache.yaml
@@ -51,8 +51,6 @@ async:
   actions:
     - create
     - update
-  operation:
-    full_url: 'selfLink'
   result:
     resource_inside_response: true
 parameters:
diff --git a/mmv1/templates/terraform/examples/discoveryengine_searchengine_agentspace_basic.tf.tmpl b/mmv1/templates/terraform/examples/discoveryengine_searchengine_agentspace_basic.tf.tmpl
@@ -17,4 +17,6 @@ resource "google_discovery_engine_search_engine" "agentspace_basic" {
   app_type                    = "APP_TYPE_INTRANET"
   search_engine_config {
   }
+  knowledge_graph_config {
+  }
 }
diff --git a/mmv1/templates/terraform/operation.go.tmpl b/mmv1/templates/terraform/operation.go.tmpl
@@ -61,11 +61,7 @@ func (w *{{ $.ProductMetadata.Name }}OperationWaiter) QueryOp() (interface{}, er
     return nil, fmt.Errorf("Cannot query operation, it's unset or nil.")
   }
   // Returns the proper get.
-  {{- if $.GetAsync.Operation.FullUrl }}
-  url := fmt.Sprintf("{{ replaceAll $.GetAsync.Operation.FullUrl "{{op_id}}" "%s" }}", w.CommonOperationWaiter.Op.Name)
-  {{- else }}
   url := fmt.Sprintf("%s{{ replaceAll $.GetAsync.Operation.BaseUrl "{{op_id}}" "%s" }}", w.Config.{{ $.ProductMetadata.Name }}BasePath, w.CommonOperationWaiter.Op.Name)
-  {{- end }}
 
   return transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
     Config: w.Config,
diff --git a/mmv1/third_party/terraform/services/discoveryengine/resource_discovery_engine_search_engine_test.go b/mmv1/third_party/terraform/services/discoveryengine/resource_discovery_engine_search_engine_test.go
@@ -12,7 +12,6 @@ func TestAccDiscoveryEngineSearchEngine_discoveryengineSearchengineBasicExample_
 
 	context := map[string]interface{}{
 		"random_suffix": acctest.RandString(t, 10),
-		"kms_key_name":  acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us", "tftest-shared-key-6").CryptoKey.Name,
 	}
 
 	acctest.VcrTest(t, resource.TestCase{
@@ -78,7 +77,10 @@ resource "google_discovery_engine_search_engine" "basic" {
     search_tier = "SEARCH_TIER_ENTERPRISE"
     search_add_ons = ["SEARCH_ADD_ON_LLM"]
   }
-  kms_key_name = "%{kms_key_name}"
+  knowledge_graph_config {
+    enable_cloud_knowledge_graph = true
+    enable_private_knowledge_graph = true
+  }
 }
 `, context)
 }
@@ -120,7 +122,17 @@ resource "google_discovery_engine_search_engine" "basic" {
   features = {
     feedback = "FEATURE_STATE_OFF"
   }
-  kms_key_name = "%{kms_key_name}"
+  knowledge_graph_config {
+    enable_cloud_knowledge_graph = false
+    cloud_knowledge_graph_types = ["foobar"]
+    enable_private_knowledge_graph = false
+    feature_config {
+      disable_private_kg_query_understanding = true
+      disable_private_kg_enrichment = true
+      disable_private_kg_auto_complete = true
+      disable_private_kg_query_ui_chips = true
+    }
+  }
 }
 `, context)
 }

Original file line number	Diff line number	Diff line change
`@@ -122,10 +122,6 @@ func (p *Product) Validate() {`
`122`	`122`	`for _, v := range p.Versions {`
`123`	`123`	`v.Validate(p.Name)`
`124`	`124`	`}`
`125`		`-`
`126`		`- if p.Async != nil {`
`127`		`- p.Async.Validate()`
`128`		`- }`
`129`	`125`	`}`
`130`	`126`
`131`	`127`	`// ====================`
Original file line number	Diff line number	Diff line change
`@@ -568,10 +568,6 @@ func (r *Resource) Validate() {`
`568`	`568`	`for _, sample := range r.Samples {`
`569`	`569`	`sample.Validate(r.Name)`
`570`	`570`	`}`
`571`		`-`
`572`		`- if r.Async != nil {`
`573`		`- r.Async.Validate()`
`574`		`- }`
`575`	`571`	`}`
`576`	`572`
`577`	`573`	`// ====================`