Skip to content

add required_subscription_tier to search engine #16573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kefang2 wants to merge 3 commits into
base: main
Choose a base branch
from
+42 −3
Open

add required_subscription_tier to search engine #16573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85b450c
add required_subscription_tier to search engine
kefang2 Feb 28, 2026
c55284c
fix lint
kefang2 Feb 28, 2026
5690217
fix test
kefang2 Feb 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mmv1/products/discoveryengine/DataStore.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ properties:
type: Enum
description: |
The content config of the data store.
required: true
required: false
immutable: true
enum_values:
- 'NO_CONTENT'
Expand Down
22 changes: 22 additions & 0 deletions mmv1/products/discoveryengine/SearchEngine.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,28 @@ properties:
enum_values:
- 'SEARCH_TIER_STANDARD'
- 'SEARCH_TIER_ENTERPRISE'
- name: 'requiredSubscriptionTier'
type: Enum
description: |
The required subscription tier of this engine.

They cannot be modified after engine creation. If the required subscription tier is search, user with higher license tier like assist can still access the standalone app associated with this engine.
default_from_api: true
required: false
enum_values:
- 'SUBSCRIPTION_TIER_UNSPECIFIED'
- 'SUBSCRIPTION_TIER_SEARCH'
- 'SUBSCRIPTION_TIER_SEARCH_AND_ASSISTANT'
- 'SUBSCRIPTION_TIER_FRONTLINE_WORKER'
- 'SUBSCRIPTION_TIER_AGENTSPACE_STARTER'
- 'SUBSCRIPTION_TIER_AGENTSPACE_BUSINESS'
- 'SUBSCRIPTION_TIER_ENTERPRISE'
- 'SUBSCRIPTION_TIER_ENTERPRISE_EMERGING'
- 'SUBSCRIPTION_TIER_EDU'
- 'SUBSCRIPTION_TIER_EDU_PRO'
- 'SUBSCRIPTION_TIER_EDU_EMERGING'
- 'SUBSCRIPTION_TIER_EDU_PRO_EMERGING'
- 'SUBSCRIPTION_TIER_FRONTLINE_STARTER'
- name: 'searchAddOns'
type: Array
description: |
Expand Down
7 changes: 7 additions & 0 deletions mmv1/templates/terraform/examples/discoveryengine_searchengine_agentspace_basic.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ resource "google_discovery_engine_search_engine" "agentspace_basic" {
industry_vertical = "GENERIC"
app_type = "APP_TYPE_INTRANET"
search_engine_config {
search_tier = "SEARCH_TIER_STANDARD"
required_subscription_tier = "SUBSCRIPTION_TIER_ENTERPRISE"
search_add_ons = ["SEARCH_ADD_ON_LLM"]
}
features = {
"agent-sharing-without-admin-approval" = "FEATURE_STATE_ON"
"disable-agent-sharing" = "FEATURE_STATE_OFF"
}
knowledge_graph_config {
}
Expand Down
14 changes: 12 additions & 2 deletions ..._party/terraform/services/discoveryengine/resource_discovery_engine_search_engine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,18 @@ resource "google_discovery_engine_search_engine" "basic" {
common_config {
company_name = "Example Company Name"
}
app_type = "APP_TYPE_INTRANET"
search_engine_config {
search_tier = "SEARCH_TIER_ENTERPRISE"
required_subscription_tier = "SUBSCRIPTION_TIER_ENTERPRISE"
search_add_ons = ["SEARCH_ADD_ON_LLM"]
}
features = {
"agent-sharing-without-admin-approval" = "FEATURE_STATE_ON"
"disable-agent-sharing" = "FEATURE_STATE_OFF"
}
knowledge_graph_config {
enable_cloud_knowledge_graph = true
enable_cloud_knowledge_graph = false
enable_private_knowledge_graph = true
}
}
Expand Down Expand Up @@ -116,17 +122,21 @@ resource "google_discovery_engine_search_engine" "basic" {
common_config {
company_name = "Updated Example Company Name"
}
app_type = "APP_TYPE_INTRANET"
search_engine_config {
search_tier = "SEARCH_TIER_STANDARD"
required_subscription_tier = "SUBSCRIPTION_TIER_ENTERPRISE"
search_add_ons = ["SEARCH_ADD_ON_LLM"]
}
features = {
feedback = "FEATURE_STATE_OFF"
"agent-sharing-without-admin-approval" = "FEATURE_STATE_ON"
"disable-agent-sharing" = "FEATURE_STATE_OFF"
}
knowledge_graph_config {
enable_cloud_knowledge_graph = false
cloud_knowledge_graph_types = ["foobar"]
enable_private_knowledge_graph = false
enable_private_knowledge_graph = true
feature_config {
disable_private_kg_query_understanding = true
disable_private_kg_enrichment = true
Expand Down
Loading