diff --git a/androidenterprise/v1/androidenterprise-api.json b/androidenterprise/v1/androidenterprise-api.json index 078548af62a..70f79a3f99c 100644 --- a/androidenterprise/v1/androidenterprise-api.json +++ b/androidenterprise/v1/androidenterprise-api.json @@ -2654,7 +2654,7 @@ } } }, - "revision": "20240820", + "revision": "20241021", "rootUrl": "https://androidenterprise.googleapis.com/", "schemas": { "Administrator": { @@ -4050,6 +4050,10 @@ "$ref": "MaintenanceWindow", "description": "The maintenance window defining when apps running in the foreground should be updated." }, + "policyId": { + "description": "An identifier for the policy that will be passed with the app install feedback sent from the Play Store.", + "type": "string" + }, "productAvailabilityPolicy": { "description": "The availability granted to the device for the specified products. \"all\" gives the device access to all products, regardless of approval status. \"all\" does not enable automatic visibility of \"alpha\" or \"beta\" tracks. \"whitelist\" grants the device access the products specified in productPolicy[]. Only products that are approved or products that were previously approved (products with revoked approval) by the enterprise can be whitelisted. If no value is provided, the availability set at the user level is applied by default.", "enum": [ diff --git a/androidenterprise/v1/androidenterprise-gen.go b/androidenterprise/v1/androidenterprise-gen.go index e8d1effa39a..98b9cad5a4e 100644 --- a/androidenterprise/v1/androidenterprise-gen.go +++ b/androidenterprise/v1/androidenterprise-gen.go @@ -2231,6 +2231,9 @@ type Policy struct { // MaintenanceWindow: The maintenance window defining when apps running in the // foreground should be updated. MaintenanceWindow *MaintenanceWindow `json:"maintenanceWindow,omitempty"` + // PolicyId: An identifier for the policy that will be passed with the app + // install feedback sent from the Play Store. + PolicyId string `json:"policyId,omitempty"` // ProductAvailabilityPolicy: The availability granted to the device for the // specified products. "all" gives the device access to all products, // regardless of approval status. "all" does not enable automatic visibility of diff --git a/androidmanagement/v1/androidmanagement-api.json b/androidmanagement/v1/androidmanagement-api.json index 0009c215384..9a17966144c 100644 --- a/androidmanagement/v1/androidmanagement-api.json +++ b/androidmanagement/v1/androidmanagement-api.json @@ -1168,7 +1168,7 @@ } } }, - "revision": "20240924", + "revision": "20241022", "rootUrl": "https://androidmanagement.googleapis.com/", "schemas": { "AdbShellCommandEvent": { @@ -3087,7 +3087,7 @@ "Personal usage restriction is not specified", "Personal usage is allowed", "Personal usage is disallowed", - "Device is not associated with a single user, and thus both personal usage and corporate identity authentication are not expected." + "Device is not associated with a single user, and thus both personal usage and corporate identity authentication are not expected. Important: This setting is mandatory for dedicated device enrollment and it is a breaking change. This change needs to be implemented before January 2025.For additional details see the dedicated device provisioning guide (https://developers.google.com/android/management/provision-device#company-owned_devices_for_work_use_only). " ], "type": "string" }, @@ -5800,7 +5800,7 @@ "Personal usage restriction is not specified", "Personal usage is allowed", "Personal usage is disallowed", - "Device is not associated with a single user, and thus both personal usage and corporate identity authentication are not expected." + "Device is not associated with a single user, and thus both personal usage and corporate identity authentication are not expected. Important: This setting is mandatory for dedicated device enrollment and it is a breaking change. This change needs to be implemented before January 2025.For additional details see the dedicated device provisioning guide (https://developers.google.com/android/management/provision-device#company-owned_devices_for_work_use_only). " ], "type": "string" }, diff --git a/androidmanagement/v1/androidmanagement-gen.go b/androidmanagement/v1/androidmanagement-gen.go index a8ddc14a020..cc10e44bb22 100644 --- a/androidmanagement/v1/androidmanagement-gen.go +++ b/androidmanagement/v1/androidmanagement-gen.go @@ -2485,7 +2485,11 @@ type EnrollmentToken struct { // "PERSONAL_USAGE_DISALLOWED" - Personal usage is disallowed // "PERSONAL_USAGE_DISALLOWED_USERLESS" - Device is not associated with a // single user, and thus both personal usage and corporate identity - // authentication are not expected. + // authentication are not expected. Important: This setting is mandatory for + // dedicated device enrollment and it is a breaking change. This change needs + // to be implemented before January 2025.For additional details see the + // dedicated device provisioning guide + // (https://developers.google.com/android/management/provision-device#company-owned_devices_for_work_use_only). AllowPersonalUsage string `json:"allowPersonalUsage,omitempty"` // Duration: The length of time the enrollment token is valid, ranging from 1 // minute to Durations.MAX_VALUE @@ -5712,7 +5716,11 @@ type SigninDetail struct { // "PERSONAL_USAGE_DISALLOWED" - Personal usage is disallowed // "PERSONAL_USAGE_DISALLOWED_USERLESS" - Device is not associated with a // single user, and thus both personal usage and corporate identity - // authentication are not expected. + // authentication are not expected. Important: This setting is mandatory for + // dedicated device enrollment and it is a breaking change. This change needs + // to be implemented before January 2025.For additional details see the + // dedicated device provisioning guide + // (https://developers.google.com/android/management/provision-device#company-owned_devices_for_work_use_only). AllowPersonalUsage string `json:"allowPersonalUsage,omitempty"` // DefaultStatus: Optional. Whether the sign-in URL should be used by default // for the enterprise. The SigninDetail with defaultStatus set to diff --git a/apigee/v1/apigee-api.json b/apigee/v1/apigee-api.json index 3527de57ad1..c97aaeff9f3 100644 --- a/apigee/v1/apigee-api.json +++ b/apigee/v1/apigee-api.json @@ -15,6 +15,18 @@ "description": "Use the Apigee API to programmatically develop and manage APIs with a set of RESTful operations. Develop and secure API proxies, deploy and undeploy API proxy revisions, monitor APIs, configure environments, manage users, and more. Note: This product is available as a free trial for a time period of 60 days.", "discoveryVersion": "v1", "documentationLink": "https://cloud.google.com/apigee-api-management/", + "endpoints": [ + { + "description": "Regional Endpoint", + "endpointUrl": "https://apigee.us.rep.googleapis.com/", + "location": "us" + }, + { + "description": "Regional Endpoint", + "endpointUrl": "https://apigee.eu.rep.googleapis.com/", + "location": "eu" + } + ], "fullyEncodeReservedExpansion": true, "icons": { "x16": "http://www.google.com/images/icons/product/search-16.gif", @@ -10373,7 +10385,7 @@ } } }, - "revision": "20241011", + "revision": "20241017", "rootUrl": "https://apigee.googleapis.com/", "schemas": { "EdgeConfigstoreBundleBadBundle": { diff --git a/bigquery/v2/bigquery-api.json b/bigquery/v2/bigquery-api.json index ec4ff938239..aeae21c1a3e 100644 --- a/bigquery/v2/bigquery-api.json +++ b/bigquery/v2/bigquery-api.json @@ -253,6 +253,12 @@ "datasetId" ], "parameters": { + "accessPolicyVersion": { + "description": "Optional. The version of the access policy schema to fetch. Valid values are 0, 1, and 3. Requests specifying an invalid value will be rejected. Requests for conditional access policy binding in datasets must specify version 3. Dataset with no conditional role bindings in access policy may specify any valid value or leave the field unset. This field will be maped to [IAM Policy version] (https://cloud.google.com/iam/docs/policies#versions) and will be used to fetch policy from IAM. If unset or if 0 or 1 value is used for dataset with conditional bindings, access entry with condition will have role string appended by 'withcond' string followed by a hash value. For example : { \"access\": [ { \"role\": \"roles/bigquery.dataViewer_with_conditionalbinding_7a34awqsda\", \"userByEmail\": \"user@example.com\", } ] } Please refer https://cloud.google.com/iam/docs/troubleshooting-withcond for more details.", + "format": "int32", + "location": "query", + "type": "integer" + }, "datasetId": { "description": "Required. Dataset ID of the requested dataset", "location": "path", @@ -304,6 +310,12 @@ "projectId" ], "parameters": { + "accessPolicyVersion": { + "description": "Optional. The version of the provided access policy schema. Valid values are 0, 1, and 3. Requests specifying an invalid value will be rejected. This version refers to the schema version of the access policy and not the version of access policy. This field's value can be equal or more than the access policy schema provided in the request. For example, * Requests with conditional access policy binding in datasets must specify version 3. * But dataset with no conditional role bindings in access policy may specify any valid value or leave the field unset. If unset or if 0 or 1 value is used for dataset with conditional bindings, request will be rejected. This field will be maped to IAM Policy version (https://cloud.google.com/iam/docs/policies#versions) and will be used to set policy in IAM.", + "format": "int32", + "location": "query", + "type": "integer" + }, "projectId": { "description": "Required. Project ID of the new dataset", "location": "path", @@ -382,6 +394,12 @@ "datasetId" ], "parameters": { + "accessPolicyVersion": { + "description": "Optional. The version of the provided access policy schema. Valid values are 0, 1, and 3. Requests specifying an invalid value will be rejected. This version refers to the schema version of the access policy and not the version of access policy. This field's value can be equal or more than the access policy schema provided in the request. For example, * Operations updating conditional access policy binding in datasets must specify version 3. Some of the operations are : - Adding a new access policy entry with condition. - Removing an access policy entry with condition. - Updating an access policy entry with condition. * But dataset with no conditional role bindings in access policy may specify any valid value or leave the field unset. If unset or if 0 or 1 value is used for dataset with conditional bindings, request will be rejected. This field will be maped to IAM Policy version (https://cloud.google.com/iam/docs/policies#versions) and will be used to set policy in IAM.", + "format": "int32", + "location": "query", + "type": "integer" + }, "datasetId": { "description": "Required. Dataset ID of the dataset being updated", "location": "path", @@ -456,6 +474,12 @@ "datasetId" ], "parameters": { + "accessPolicyVersion": { + "description": "Optional. The version of the provided access policy schema. Valid values are 0, 1, and 3. Requests specifying an invalid value will be rejected. This version refers to the schema version of the access policy and not the version of access policy. This field's value can be equal or more than the access policy schema provided in the request. For example, * Operations updating conditional access policy binding in datasets must specify version 3. Some of the operations are : - Adding a new access policy entry with condition. - Removing an access policy entry with condition. - Updating an access policy entry with condition. * But dataset with no conditional role bindings in access policy may specify any valid value or leave the field unset. If unset or if 0 or 1 value is used for dataset with conditional bindings, request will be rejected. This field will be maped to IAM Policy version (https://cloud.google.com/iam/docs/policies#versions) and will be used to set policy in IAM.", + "format": "int32", + "location": "query", + "type": "integer" + }, "datasetId": { "description": "Required. Dataset ID of the dataset being updated", "location": "path", @@ -1985,7 +2009,7 @@ } } }, - "revision": "20240919", + "revision": "20241013", "rootUrl": "https://bigquery.googleapis.com/", "schemas": { "AggregateClassificationMetrics": { @@ -3165,6 +3189,10 @@ "items": { "description": "An object that defines dataset access for an entity.", "properties": { + "condition": { + "$ref": "Expr", + "description": "Optional. condition for the binding. If CEL expression in this field is true, this access binding will be considered" + }, "dataset": { "$ref": "DatasetAccessEntry", "description": "[Pick one] A grant authorizing all resources of a particular type in a particular dataset access to this dataset. Only views are supported for now. The role field is not required when this field is set. If that dataset is deleted and re-created, its access needs to be granted again via an update operation." diff --git a/bigquery/v2/bigquery-gen.go b/bigquery/v2/bigquery-gen.go index 2772173d314..1fd74269037 100644 --- a/bigquery/v2/bigquery-gen.go +++ b/bigquery/v2/bigquery-gen.go @@ -2140,6 +2140,9 @@ func (s Dataset) MarshalJSON() ([]byte, error) { // DatasetAccess: An object that defines dataset access for an entity. type DatasetAccess struct { + // Condition: Optional. condition for the binding. If CEL expression in this + // field is true, this access binding will be considered + Condition *Expr `json:"condition,omitempty"` // Dataset: [Pick one] A grant authorizing all resources of a particular type // in a particular dataset access to this dataset. Only views are supported for // now. The role field is not required when this field is set. If that dataset @@ -2187,13 +2190,13 @@ type DatasetAccess struct { // view is updated by any user, access to the view needs to be granted again // via an update operation. View *TableReference `json:"view,omitempty"` - // ForceSendFields is a list of field names (e.g. "Dataset") to unconditionally - // include in API requests. By default, fields with empty or default values are - // omitted from API requests. See + // ForceSendFields is a list of field names (e.g. "Condition") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more // details. ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "Dataset") to include in API + // NullFields is a list of field names (e.g. "Condition") to include in API // requests with the JSON null value. By default, fields with empty values are // omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. @@ -10468,6 +10471,25 @@ func (r *DatasetsService) Get(projectId string, datasetId string) *DatasetsGetCa return c } +// AccessPolicyVersion sets the optional parameter "accessPolicyVersion": The +// version of the access policy schema to fetch. Valid values are 0, 1, and 3. +// Requests specifying an invalid value will be rejected. Requests for +// conditional access policy binding in datasets must specify version 3. +// Dataset with no conditional role bindings in access policy may specify any +// valid value or leave the field unset. This field will be maped to [IAM +// Policy version] (https://cloud.google.com/iam/docs/policies#versions) and +// will be used to fetch policy from IAM. If unset or if 0 or 1 value is used +// for dataset with conditional bindings, access entry with condition will have +// role string appended by 'withcond' string followed by a hash value. For +// example : { "access": [ { "role": +// "roles/bigquery.dataViewer_with_conditionalbinding_7a34awqsda", +// "userByEmail": "user@example.com", } ] } Please refer +// https://cloud.google.com/iam/docs/troubleshooting-withcond for more details. +func (c *DatasetsGetCall) AccessPolicyVersion(accessPolicyVersion int64) *DatasetsGetCall { + c.urlParams_.Set("accessPolicyVersion", fmt.Sprint(accessPolicyVersion)) + return c +} + // DatasetView sets the optional parameter "datasetView": Specifies the view // that determines which dataset information is returned. By default, metadata // and ACL information are returned. @@ -10598,6 +10620,23 @@ func (r *DatasetsService) Insert(projectId string, dataset *Dataset) *DatasetsIn return c } +// AccessPolicyVersion sets the optional parameter "accessPolicyVersion": The +// version of the provided access policy schema. Valid values are 0, 1, and 3. +// Requests specifying an invalid value will be rejected. This version refers +// to the schema version of the access policy and not the version of access +// policy. This field's value can be equal or more than the access policy +// schema provided in the request. For example, * Requests with conditional +// access policy binding in datasets must specify version 3. * But dataset with +// no conditional role bindings in access policy may specify any valid value or +// leave the field unset. If unset or if 0 or 1 value is used for dataset with +// conditional bindings, request will be rejected. This field will be maped to +// IAM Policy version (https://cloud.google.com/iam/docs/policies#versions) and +// will be used to set policy in IAM. +func (c *DatasetsInsertCall) AccessPolicyVersion(accessPolicyVersion int64) *DatasetsInsertCall { + c.urlParams_.Set("accessPolicyVersion", fmt.Sprint(accessPolicyVersion)) + return c +} + // Fields allows partial responses to be retrieved. See // https://developers.google.com/gdata/docs/2.0/basics#PartialResponse for more // details. @@ -10868,6 +10907,26 @@ func (r *DatasetsService) Patch(projectId string, datasetId string, dataset *Dat return c } +// AccessPolicyVersion sets the optional parameter "accessPolicyVersion": The +// version of the provided access policy schema. Valid values are 0, 1, and 3. +// Requests specifying an invalid value will be rejected. This version refers +// to the schema version of the access policy and not the version of access +// policy. This field's value can be equal or more than the access policy +// schema provided in the request. For example, * Operations updating +// conditional access policy binding in datasets must specify version 3. Some +// of the operations are : - Adding a new access policy entry with condition. - +// Removing an access policy entry with condition. - Updating an access policy +// entry with condition. * But dataset with no conditional role bindings in +// access policy may specify any valid value or leave the field unset. If unset +// or if 0 or 1 value is used for dataset with conditional bindings, request +// will be rejected. This field will be maped to IAM Policy version +// (https://cloud.google.com/iam/docs/policies#versions) and will be used to +// set policy in IAM. +func (c *DatasetsPatchCall) AccessPolicyVersion(accessPolicyVersion int64) *DatasetsPatchCall { + c.urlParams_.Set("accessPolicyVersion", fmt.Sprint(accessPolicyVersion)) + return c +} + // Fields allows partial responses to be retrieved. See // https://developers.google.com/gdata/docs/2.0/basics#PartialResponse for more // details. @@ -11082,6 +11141,26 @@ func (r *DatasetsService) Update(projectId string, datasetId string, dataset *Da return c } +// AccessPolicyVersion sets the optional parameter "accessPolicyVersion": The +// version of the provided access policy schema. Valid values are 0, 1, and 3. +// Requests specifying an invalid value will be rejected. This version refers +// to the schema version of the access policy and not the version of access +// policy. This field's value can be equal or more than the access policy +// schema provided in the request. For example, * Operations updating +// conditional access policy binding in datasets must specify version 3. Some +// of the operations are : - Adding a new access policy entry with condition. - +// Removing an access policy entry with condition. - Updating an access policy +// entry with condition. * But dataset with no conditional role bindings in +// access policy may specify any valid value or leave the field unset. If unset +// or if 0 or 1 value is used for dataset with conditional bindings, request +// will be rejected. This field will be maped to IAM Policy version +// (https://cloud.google.com/iam/docs/policies#versions) and will be used to +// set policy in IAM. +func (c *DatasetsUpdateCall) AccessPolicyVersion(accessPolicyVersion int64) *DatasetsUpdateCall { + c.urlParams_.Set("accessPolicyVersion", fmt.Sprint(accessPolicyVersion)) + return c +} + // Fields allows partial responses to be retrieved. See // https://developers.google.com/gdata/docs/2.0/basics#PartialResponse for more // details. diff --git a/binaryauthorization/v1beta1/binaryauthorization-api.json b/binaryauthorization/v1beta1/binaryauthorization-api.json index 4627085df01..9efd587a7a2 100644 --- a/binaryauthorization/v1beta1/binaryauthorization-api.json +++ b/binaryauthorization/v1beta1/binaryauthorization-api.json @@ -551,7 +551,7 @@ } } }, - "revision": "20240119", + "revision": "20241018", "rootUrl": "https://binaryauthorization.googleapis.com/", "schemas": { "AdmissionRule": { @@ -589,7 +589,6 @@ "type": "string" }, "requireAttestationsBy": { - "description": "Optional. The resource names of the attestors that must attest to a container image, in the format `projects/*/attestors/*`. Each attestor must exist before a policy can reference it. To add an attestor to a policy the principal issuing the policy change request must be able to read the attestor resource. Note: this field must be non-empty when the evaluation_mode field specifies REQUIRE_ATTESTATION, otherwise it must be empty.", "items": { "type": "string" }, diff --git a/binaryauthorization/v1beta1/binaryauthorization-gen.go b/binaryauthorization/v1beta1/binaryauthorization-gen.go index 46dbc3538c5..a359f5add1a 100644 --- a/binaryauthorization/v1beta1/binaryauthorization-gen.go +++ b/binaryauthorization/v1beta1/binaryauthorization-gen.go @@ -224,14 +224,7 @@ type AdmissionRule struct { // attestors listed in `require_attestations_by` have valid attestations for // all of the images in the pod spec. // "ALWAYS_DENY" - This rule denies all pod creations. - EvaluationMode string `json:"evaluationMode,omitempty"` - // RequireAttestationsBy: Optional. The resource names of the attestors that - // must attest to a container image, in the format `projects/*/attestors/*`. - // Each attestor must exist before a policy can reference it. To add an - // attestor to a policy the principal issuing the policy change request must be - // able to read the attestor resource. Note: this field must be non-empty when - // the evaluation_mode field specifies REQUIRE_ATTESTATION, otherwise it must - // be empty. + EvaluationMode string `json:"evaluationMode,omitempty"` RequireAttestationsBy []string `json:"requireAttestationsBy,omitempty"` // ForceSendFields is a list of field names (e.g. "EnforcementMode") to // unconditionally include in API requests. By default, fields with empty or diff --git a/cloudchannel/v1/cloudchannel-api.json b/cloudchannel/v1/cloudchannel-api.json index 380f9e24a7f..a33f1e7156d 100644 --- a/cloudchannel/v1/cloudchannel-api.json +++ b/cloudchannel/v1/cloudchannel-api.json @@ -2183,7 +2183,7 @@ } } }, - "revision": "20240913", + "revision": "20241020", "rootUrl": "https://cloudchannel.googleapis.com/", "schemas": { "GoogleCloudChannelV1ActivateEntitlementRequest": { @@ -5091,6 +5091,10 @@ }, "type": "array" }, + "priceReferenceId": { + "description": "Optional. Price reference ID for the offer. Optional field only for offers that require additional price information. Used to guarantee that the pricing is consistent between quoting the offer and placing the order. Yet to be implemented: this field is currently not evaluated in the API if populated in a request.", + "type": "string" + }, "provisionedService": { "$ref": "GoogleCloudChannelV1alpha1ProvisionedService", "description": "Output only. Service provisioning details for the entitlement.", diff --git a/cloudchannel/v1/cloudchannel-gen.go b/cloudchannel/v1/cloudchannel-gen.go index 2d380633e3c..d75c65b609a 100644 --- a/cloudchannel/v1/cloudchannel-gen.go +++ b/cloudchannel/v1/cloudchannel-gen.go @@ -4162,6 +4162,12 @@ type GoogleCloudChannelV1alpha1Entitlement struct { // Google Cloud billing subaccounts, the following Parameter may be accepted as // input: - display_name: The display name of the billing subaccount. Parameters []*GoogleCloudChannelV1alpha1Parameter `json:"parameters,omitempty"` + // PriceReferenceId: Optional. Price reference ID for the offer. Optional field + // only for offers that require additional price information. Used to guarantee + // that the pricing is consistent between quoting the offer and placing the + // order. Yet to be implemented: this field is currently not evaluated in the + // API if populated in a request. + PriceReferenceId string `json:"priceReferenceId,omitempty"` // ProvisionedService: Output only. Service provisioning details for the // entitlement. ProvisionedService *GoogleCloudChannelV1alpha1ProvisionedService `json:"provisionedService,omitempty"` diff --git a/cloudidentity/v1beta1/cloudidentity-api.json b/cloudidentity/v1beta1/cloudidentity-api.json index 7d1ffd18351..e306a4da936 100644 --- a/cloudidentity/v1beta1/cloudidentity-api.json +++ b/cloudidentity/v1beta1/cloudidentity-api.json @@ -2013,9 +2013,64 @@ } } } + }, + "policies": { + "methods": { + "get": { + "description": "Get a Policy", + "flatPath": "v1beta1/policies/{policiesId}", + "httpMethod": "GET", + "id": "cloudidentity.policies.get", + "parameterOrder": [ + "name" + ], + "parameters": { + "name": { + "description": "Required. The name of the policy to retrieve. Format: \"policies/{policy}\".", + "location": "path", + "pattern": "^policies/[^/]+$", + "required": true, + "type": "string" + } + }, + "path": "v1beta1/{+name}", + "response": { + "$ref": "Policy" + } + }, + "list": { + "description": "List Policies", + "flatPath": "v1beta1/policies", + "httpMethod": "GET", + "id": "cloudidentity.policies.list", + "parameterOrder": [], + "parameters": { + "filter": { + "description": "Optional. A CEL expression for filtering the results. Policies can be filtered by application with this expression: setting.name = 'settings/gmail.*' Policies can be filtered by setting type with this expression: setting.name = '*.service_status' A maximum of one of the above setting.name clauses can be used. Policies can be filtered by customer with this expression: customer = \"customers/{customer}\" Where `customer` is the `id` from the [Admin SDK `Customer` resource](https://developers.google.com/admin-sdk/directory/reference/rest/v1/customers). You may use `customers/my_customer` to specify your own organization. When no customer is mentioned it will be default to customers/my_customer. A maximum of one customer clause can be used. The above clauses can only be combined together in a single filter expression with the AND operator.", + "location": "query", + "type": "string" + }, + "pageSize": { + "description": "Optional. The maximum number of results to return. The service may return fewer than this value. If omitted (or defaulted to zero) the server will default to 50. The maximum allowed value is 100, though requests with page_size greater than that will be interpreted as 100.", + "format": "int32", + "location": "query", + "type": "integer" + }, + "pageToken": { + "description": "Optional. The pagination token received from a prior call to PoliciesService.ListPolicies to retrieve the next page of results. When paginating, all other parameters provided to `ListPoliciesRequest` must match the call that provided the page token.", + "location": "query", + "type": "string" + } + }, + "path": "v1beta1/policies", + "response": { + "$ref": "ListPoliciesResponse" + } + } + } } }, - "revision": "20241001", + "revision": "20241021", "rootUrl": "https://cloudidentity.googleapis.com/", "schemas": { "AddIdpCredentialOperationMetadata": { @@ -4379,6 +4434,24 @@ }, "type": "object" }, + "ListPoliciesResponse": { + "description": "The response message for PoliciesService.ListPolicies.", + "id": "ListPoliciesResponse", + "properties": { + "nextPageToken": { + "description": "The pagination token to retrieve the next page of results. If this field is empty, there are no subsequent pages.", + "type": "string" + }, + "policies": { + "description": "The results", + "items": { + "$ref": "Policy" + }, + "type": "array" + } + }, + "type": "object" + }, "ListUserInvitationsResponse": { "description": "Response message for UserInvitation listing request.", "id": "ListUserInvitationsResponse", @@ -4805,6 +4878,70 @@ }, "type": "object" }, + "Policy": { + "description": "A Policy resource binds an instance of a single Setting with the scope of a PolicyQuery. The Setting instance will be applied to all entities that satisfy the query.", + "id": "Policy", + "properties": { + "customer": { + "description": "Immutable. Customer that the Policy belongs to. The value is in the format 'customers/{customerId}'. The `customerId` must begin with \"C\" To find your customer ID in Admin Console see https://support.google.com/a/answer/10070793.", + "type": "string" + }, + "name": { + "description": "Output only. Identifier. The [resource name](https://cloud.google.com/apis/design/resource_names) of the Policy. Format: policies/{policy}.", + "readOnly": true, + "type": "string" + }, + "policyQuery": { + "$ref": "PolicyQuery", + "description": "Required. The PolicyQuery the Setting applies to." + }, + "setting": { + "$ref": "Setting", + "description": "Required. The Setting configured by this Policy." + }, + "type": { + "description": "Output only. The type of the policy.", + "enum": [ + "POLICY_TYPE_UNSPECIFIED", + "SYSTEM", + "ADMIN" + ], + "enumDescriptions": [ + "Unspecified policy type.", + "Policy type denoting the system-configured policies.", + "Policy type denoting the admin-configurable policies." + ], + "readOnly": true, + "type": "string" + } + }, + "type": "object" + }, + "PolicyQuery": { + "description": "PolicyQuery", + "id": "PolicyQuery", + "properties": { + "group": { + "description": "Immutable. The group that the query applies to. This field is only set if there is a single value for group that satisfies all clauses of the query. If no group applies, this will be the empty string.", + "type": "string" + }, + "orgUnit": { + "description": "Required. Immutable. Non-empty default. The OrgUnit the query applies to. This field is only set if there is a single value for org_unit that satisfies all clauses of the query.", + "type": "string" + }, + "query": { + "description": "Immutable. The CEL query that defines which entities the Policy applies to (ex. a User entity). For details about CEL see https://opensource.google.com/projects/cel. The OrgUnits the Policy applies to are represented by a clause like so: entity.org_units.exists(org_unit, org_unit.org_unit_id == orgUnitId('{orgUnitId}')) The Group the Policy applies to are represented by a clause like so: entity.groups.exists(group, group.group_id == groupId('{groupId}')) The Licenses the Policy applies to are represented by a clause like so: entity.licenses.exists(license, license in ['/product/{productId}/sku/{skuId}']) The above clauses can be present in any combination, and used in conjunction with the \u0026\u0026, || and ! operators. The org_unit and group fields below are helper fields that contain the corresponding value(s) as the query to make the query easier to use.", + "type": "string" + }, + "sortOrder": { + "description": "Output only. The decimal sort order of this PolicyQuery. The value is relative to all other policies with the same setting type within the whole customer. (there are no duplicates within this set).", + "format": "double", + "readOnly": true, + "type": "number" + } + }, + "type": "object" + }, "PosixGroup": { "description": "POSIX Group definition to represent a group in a POSIX compliant system. Caution: POSIX groups are deprecated. As of September 26, 2024, you can no longer create new POSIX groups. For more information, see https://cloud.google.com/identity/docs/deprecations/posix-groups", "id": "PosixGroup", @@ -5019,6 +5156,25 @@ "properties": {}, "type": "object" }, + "Setting": { + "description": "Setting", + "id": "Setting", + "properties": { + "type": { + "description": "Required. Immutable. The type of the Setting. .", + "type": "string" + }, + "value": { + "additionalProperties": { + "description": "Properties of the object.", + "type": "any" + }, + "description": "Required. The value of the Setting.", + "type": "object" + } + }, + "type": "object" + }, "SignInBehavior": { "description": "Controls sign-in behavior.", "id": "SignInBehavior", diff --git a/cloudidentity/v1beta1/cloudidentity-gen.go b/cloudidentity/v1beta1/cloudidentity-gen.go index 689184df9d5..c11a6566296 100644 --- a/cloudidentity/v1beta1/cloudidentity-gen.go +++ b/cloudidentity/v1beta1/cloudidentity-gen.go @@ -169,6 +169,7 @@ func New(client *http.Client) (*Service, error) { s.InboundSamlSsoProfiles = NewInboundSamlSsoProfilesService(s) s.InboundSsoAssignments = NewInboundSsoAssignmentsService(s) s.OrgUnits = NewOrgUnitsService(s) + s.Policies = NewPoliciesService(s) return s, nil } @@ -188,6 +189,8 @@ type Service struct { InboundSsoAssignments *InboundSsoAssignmentsService OrgUnits *OrgUnitsService + + Policies *PoliciesService } func (s *Service) userAgent() string { @@ -323,6 +326,15 @@ type OrgUnitsMembershipsService struct { s *Service } +func NewPoliciesService(s *Service) *PoliciesService { + rs := &PoliciesService{s: s} + return rs +} + +type PoliciesService struct { + s *Service +} + // AddIdpCredentialOperationMetadata: LRO response metadata for // InboundSamlSsoProfilesService.AddIdpCredential. type AddIdpCredentialOperationMetadata struct { @@ -2898,6 +2910,34 @@ func (s ListOrgMembershipsResponse) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// ListPoliciesResponse: The response message for PoliciesService.ListPolicies. +type ListPoliciesResponse struct { + // NextPageToken: The pagination token to retrieve the next page of results. If + // this field is empty, there are no subsequent pages. + NextPageToken string `json:"nextPageToken,omitempty"` + // Policies: The results + Policies []*Policy `json:"policies,omitempty"` + + // ServerResponse contains the HTTP response code and headers from the server. + googleapi.ServerResponse `json:"-"` + // ForceSendFields is a list of field names (e.g. "NextPageToken") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "NextPageToken") to include in API + // requests with the JSON null value. By default, fields with empty values are + // omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s ListPoliciesResponse) MarshalJSON() ([]byte, error) { + type NoMethod ListPoliciesResponse + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // ListUserInvitationsResponse: Response message for UserInvitation listing // request. type ListUserInvitationsResponse struct { @@ -3484,6 +3524,110 @@ func (s OrgMembership) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// Policy: A Policy resource binds an instance of a single Setting with the +// scope of a PolicyQuery. The Setting instance will be applied to all entities +// that satisfy the query. +type Policy struct { + // Customer: Immutable. Customer that the Policy belongs to. The value is in + // the format 'customers/{customerId}'. The `customerId` must begin with "C" To + // find your customer ID in Admin Console see + // https://support.google.com/a/answer/10070793. + Customer string `json:"customer,omitempty"` + // Name: Output only. Identifier. The resource name + // (https://cloud.google.com/apis/design/resource_names) of the Policy. Format: + // policies/{policy}. + Name string `json:"name,omitempty"` + // PolicyQuery: Required. The PolicyQuery the Setting applies to. + PolicyQuery *PolicyQuery `json:"policyQuery,omitempty"` + // Setting: Required. The Setting configured by this Policy. + Setting *Setting `json:"setting,omitempty"` + // Type: Output only. The type of the policy. + // + // Possible values: + // "POLICY_TYPE_UNSPECIFIED" - Unspecified policy type. + // "SYSTEM" - Policy type denoting the system-configured policies. + // "ADMIN" - Policy type denoting the admin-configurable policies. + Type string `json:"type,omitempty"` + + // ServerResponse contains the HTTP response code and headers from the server. + googleapi.ServerResponse `json:"-"` + // ForceSendFields is a list of field names (e.g. "Customer") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "Customer") to include in API + // requests with the JSON null value. By default, fields with empty values are + // omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s Policy) MarshalJSON() ([]byte, error) { + type NoMethod Policy + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + +// PolicyQuery: PolicyQuery +type PolicyQuery struct { + // Group: Immutable. The group that the query applies to. This field is only + // set if there is a single value for group that satisfies all clauses of the + // query. If no group applies, this will be the empty string. + Group string `json:"group,omitempty"` + // OrgUnit: Required. Immutable. Non-empty default. The OrgUnit the query + // applies to. This field is only set if there is a single value for org_unit + // that satisfies all clauses of the query. + OrgUnit string `json:"orgUnit,omitempty"` + // Query: Immutable. The CEL query that defines which entities the Policy + // applies to (ex. a User entity). For details about CEL see + // https://opensource.google.com/projects/cel. The OrgUnits the Policy applies + // to are represented by a clause like so: entity.org_units.exists(org_unit, + // org_unit.org_unit_id == orgUnitId('{orgUnitId}')) The Group the Policy + // applies to are represented by a clause like so: entity.groups.exists(group, + // group.group_id == groupId('{groupId}')) The Licenses the Policy applies to + // are represented by a clause like so: entity.licenses.exists(license, license + // in ['/product/{productId}/sku/{skuId}']) The above clauses can be present in + // any combination, and used in conjunction with the &&, || and ! operators. + // The org_unit and group fields below are helper fields that contain the + // corresponding value(s) as the query to make the query easier to use. + Query string `json:"query,omitempty"` + // SortOrder: Output only. The decimal sort order of this PolicyQuery. The + // value is relative to all other policies with the same setting type within + // the whole customer. (there are no duplicates within this set). + SortOrder float64 `json:"sortOrder,omitempty"` + // ForceSendFields is a list of field names (e.g. "Group") to unconditionally + // include in API requests. By default, fields with empty or default values are + // omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "Group") to include in API + // requests with the JSON null value. By default, fields with empty values are + // omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s PolicyQuery) MarshalJSON() ([]byte, error) { + type NoMethod PolicyQuery + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + +func (s *PolicyQuery) UnmarshalJSON(data []byte) error { + type NoMethod PolicyQuery + var s1 struct { + SortOrder gensupport.JSONFloat64 `json:"sortOrder"` + *NoMethod + } + s1.NoMethod = (*NoMethod)(s) + if err := json.Unmarshal(data, &s1); err != nil { + return err + } + s.SortOrder = float64(s1.SortOrder) + return nil +} + // PosixGroup: POSIX Group definition to represent a group in a POSIX compliant // system. Caution: POSIX groups are deprecated. As of September 26, 2024, you // can no longer create new POSIX groups. For more information, see @@ -3828,6 +3972,30 @@ func (s SecuritySettings) MarshalJSON() ([]byte, error) { type SendUserInvitationRequest struct { } +// Setting: Setting +type Setting struct { + // Type: Required. Immutable. The type of the Setting. . + Type string `json:"type,omitempty"` + // Value: Required. The value of the Setting. + Value googleapi.RawMessage `json:"value,omitempty"` + // ForceSendFields is a list of field names (e.g. "Type") to unconditionally + // include in API requests. By default, fields with empty or default values are + // omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "Type") to include in API requests + // with the JSON null value. By default, fields with empty values are omitted + // from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s Setting) MarshalJSON() ([]byte, error) { + type NoMethod Setting + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // SignInBehavior: Controls sign-in behavior. type SignInBehavior struct { // RedirectCondition: When to redirect sign-ins to the IdP. @@ -11221,3 +11389,268 @@ func (c *OrgUnitsMembershipsMoveCall) Do(opts ...googleapi.CallOption) (*Operati } return ret, nil } + +type PoliciesGetCall struct { + s *Service + name string + urlParams_ gensupport.URLParams + ifNoneMatch_ string + ctx_ context.Context + header_ http.Header +} + +// Get: Get a Policy +// +// - name: The name of the policy to retrieve. Format: "policies/{policy}". +func (r *PoliciesService) Get(name string) *PoliciesGetCall { + c := &PoliciesGetCall{s: r.s, urlParams_: make(gensupport.URLParams)} + c.name = name + return c +} + +// Fields allows partial responses to be retrieved. See +// https://developers.google.com/gdata/docs/2.0/basics#PartialResponse for more +// details. +func (c *PoliciesGetCall) Fields(s ...googleapi.Field) *PoliciesGetCall { + c.urlParams_.Set("fields", googleapi.CombineFields(s)) + return c +} + +// IfNoneMatch sets an optional parameter which makes the operation fail if the +// object's ETag matches the given value. This is useful for getting updates +// only after the object has changed since the last request. +func (c *PoliciesGetCall) IfNoneMatch(entityTag string) *PoliciesGetCall { + c.ifNoneMatch_ = entityTag + return c +} + +// Context sets the context to be used in this call's Do method. +func (c *PoliciesGetCall) Context(ctx context.Context) *PoliciesGetCall { + c.ctx_ = ctx + return c +} + +// Header returns a http.Header that can be modified by the caller to add +// headers to the request. +func (c *PoliciesGetCall) Header() http.Header { + if c.header_ == nil { + c.header_ = make(http.Header) + } + return c.header_ +} + +func (c *PoliciesGetCall) doRequest(alt string) (*http.Response, error) { + reqHeaders := gensupport.SetHeaders(c.s.userAgent(), "", c.header_) + if c.ifNoneMatch_ != "" { + reqHeaders.Set("If-None-Match", c.ifNoneMatch_) + } + var body io.Reader = nil + c.urlParams_.Set("alt", alt) + c.urlParams_.Set("prettyPrint", "false") + urls := googleapi.ResolveRelative(c.s.BasePath, "v1beta1/{+name}") + urls += "?" + c.urlParams_.Encode() + req, err := http.NewRequest("GET", urls, body) + if err != nil { + return nil, err + } + req.Header = reqHeaders + googleapi.Expand(req.URL, map[string]string{ + "name": c.name, + }) + return gensupport.SendRequest(c.ctx_, c.s.client, req) +} + +// Do executes the "cloudidentity.policies.get" call. +// Any non-2xx status code is an error. Response headers are in either +// *Policy.ServerResponse.Header or (if a response was returned at all) in +// error.(*googleapi.Error).Header. Use googleapi.IsNotModified to check +// whether the returned error was because http.StatusNotModified was returned. +func (c *PoliciesGetCall) Do(opts ...googleapi.CallOption) (*Policy, error) { + gensupport.SetOptions(c.urlParams_, opts...) + res, err := c.doRequest("json") + if res != nil && res.StatusCode == http.StatusNotModified { + if res.Body != nil { + res.Body.Close() + } + return nil, gensupport.WrapError(&googleapi.Error{ + Code: res.StatusCode, + Header: res.Header, + }) + } + if err != nil { + return nil, err + } + defer googleapi.CloseBody(res) + if err := googleapi.CheckResponse(res); err != nil { + return nil, gensupport.WrapError(err) + } + ret := &Policy{ + ServerResponse: googleapi.ServerResponse{ + Header: res.Header, + HTTPStatusCode: res.StatusCode, + }, + } + target := &ret + if err := gensupport.DecodeResponse(target, res); err != nil { + return nil, err + } + return ret, nil +} + +type PoliciesListCall struct { + s *Service + urlParams_ gensupport.URLParams + ifNoneMatch_ string + ctx_ context.Context + header_ http.Header +} + +// List: List Policies +func (r *PoliciesService) List() *PoliciesListCall { + c := &PoliciesListCall{s: r.s, urlParams_: make(gensupport.URLParams)} + return c +} + +// Filter sets the optional parameter "filter": A CEL expression for filtering +// the results. Policies can be filtered by application with this expression: +// setting.name = 'settings/gmail.*' Policies can be filtered by setting type +// with this expression: setting.name = '*.service_status' A maximum of one of +// the above setting.name clauses can be used. Policies can be filtered by +// customer with this expression: customer = "customers/{customer}" Where +// `customer` is the `id` from the Admin SDK `Customer` resource +// (https://developers.google.com/admin-sdk/directory/reference/rest/v1/customers). +// You may use `customers/my_customer` to specify your own organization. When +// no customer is mentioned it will be default to customers/my_customer. A +// maximum of one customer clause can be used. The above clauses can only be +// combined together in a single filter expression with the AND operator. +func (c *PoliciesListCall) Filter(filter string) *PoliciesListCall { + c.urlParams_.Set("filter", filter) + return c +} + +// PageSize sets the optional parameter "pageSize": The maximum number of +// results to return. The service may return fewer than this value. If omitted +// (or defaulted to zero) the server will default to 50. The maximum allowed +// value is 100, though requests with page_size greater than that will be +// interpreted as 100. +func (c *PoliciesListCall) PageSize(pageSize int64) *PoliciesListCall { + c.urlParams_.Set("pageSize", fmt.Sprint(pageSize)) + return c +} + +// PageToken sets the optional parameter "pageToken": The pagination token +// received from a prior call to PoliciesService.ListPolicies to retrieve the +// next page of results. When paginating, all other parameters provided to +// `ListPoliciesRequest` must match the call that provided the page token. +func (c *PoliciesListCall) PageToken(pageToken string) *PoliciesListCall { + c.urlParams_.Set("pageToken", pageToken) + return c +} + +// Fields allows partial responses to be retrieved. See +// https://developers.google.com/gdata/docs/2.0/basics#PartialResponse for more +// details. +func (c *PoliciesListCall) Fields(s ...googleapi.Field) *PoliciesListCall { + c.urlParams_.Set("fields", googleapi.CombineFields(s)) + return c +} + +// IfNoneMatch sets an optional parameter which makes the operation fail if the +// object's ETag matches the given value. This is useful for getting updates +// only after the object has changed since the last request. +func (c *PoliciesListCall) IfNoneMatch(entityTag string) *PoliciesListCall { + c.ifNoneMatch_ = entityTag + return c +} + +// Context sets the context to be used in this call's Do method. +func (c *PoliciesListCall) Context(ctx context.Context) *PoliciesListCall { + c.ctx_ = ctx + return c +} + +// Header returns a http.Header that can be modified by the caller to add +// headers to the request. +func (c *PoliciesListCall) Header() http.Header { + if c.header_ == nil { + c.header_ = make(http.Header) + } + return c.header_ +} + +func (c *PoliciesListCall) doRequest(alt string) (*http.Response, error) { + reqHeaders := gensupport.SetHeaders(c.s.userAgent(), "", c.header_) + if c.ifNoneMatch_ != "" { + reqHeaders.Set("If-None-Match", c.ifNoneMatch_) + } + var body io.Reader = nil + c.urlParams_.Set("alt", alt) + c.urlParams_.Set("prettyPrint", "false") + urls := googleapi.ResolveRelative(c.s.BasePath, "v1beta1/policies") + urls += "?" + c.urlParams_.Encode() + req, err := http.NewRequest("GET", urls, body) + if err != nil { + return nil, err + } + req.Header = reqHeaders + return gensupport.SendRequest(c.ctx_, c.s.client, req) +} + +// Do executes the "cloudidentity.policies.list" call. +// Any non-2xx status code is an error. Response headers are in either +// *ListPoliciesResponse.ServerResponse.Header or (if a response was returned +// at all) in error.(*googleapi.Error).Header. Use googleapi.IsNotModified to +// check whether the returned error was because http.StatusNotModified was +// returned. +func (c *PoliciesListCall) Do(opts ...googleapi.CallOption) (*ListPoliciesResponse, error) { + gensupport.SetOptions(c.urlParams_, opts...) + res, err := c.doRequest("json") + if res != nil && res.StatusCode == http.StatusNotModified { + if res.Body != nil { + res.Body.Close() + } + return nil, gensupport.WrapError(&googleapi.Error{ + Code: res.StatusCode, + Header: res.Header, + }) + } + if err != nil { + return nil, err + } + defer googleapi.CloseBody(res) + if err := googleapi.CheckResponse(res); err != nil { + return nil, gensupport.WrapError(err) + } + ret := &ListPoliciesResponse{ + ServerResponse: googleapi.ServerResponse{ + Header: res.Header, + HTTPStatusCode: res.StatusCode, + }, + } + target := &ret + if err := gensupport.DecodeResponse(target, res); err != nil { + return nil, err + } + return ret, nil +} + +// Pages invokes f for each page of results. +// A non-nil error returned from f will halt the iteration. +// The provided context supersedes any context provided to the Context method. +func (c *PoliciesListCall) Pages(ctx context.Context, f func(*ListPoliciesResponse) error) error { + c.ctx_ = ctx + defer c.PageToken(c.urlParams_.Get("pageToken")) + for { + x, err := c.Do() + if err != nil { + return err + } + if err := f(x); err != nil { + return err + } + if x.NextPageToken == "" { + return nil + } + c.PageToken(x.NextPageToken) + } +} diff --git a/cloudsearch/v1/cloudsearch-api.json b/cloudsearch/v1/cloudsearch-api.json index 48291b2e25f..ceb0fe52e81 100644 --- a/cloudsearch/v1/cloudsearch-api.json +++ b/cloudsearch/v1/cloudsearch-api.json @@ -2115,7 +2115,7 @@ } } }, - "revision": "20240529", + "revision": "20241016", "rootUrl": "https://cloudsearch.googleapis.com/", "schemas": { "Action": { @@ -7330,7 +7330,7 @@ "type": "object" }, "SearchRequest": { - "description": "The search API request.", + "description": "The search API request. NEXT ID: 17", "id": "SearchRequest", "properties": { "contextAttributes": { @@ -7383,7 +7383,7 @@ "type": "object" }, "SearchResponse": { - "description": "The search API response.", + "description": "The search API response. NEXT ID: 17", "id": "SearchResponse", "properties": { "debugInfo": { diff --git a/cloudsearch/v1/cloudsearch-gen.go b/cloudsearch/v1/cloudsearch-gen.go index 817eb39df55..cd3a1b2f0e8 100644 --- a/cloudsearch/v1/cloudsearch-gen.go +++ b/cloudsearch/v1/cloudsearch-gen.go @@ -6937,7 +6937,7 @@ func (s *SearchQualityMetadata) UnmarshalJSON(data []byte) error { return nil } -// SearchRequest: The search API request. +// SearchRequest: The search API request. NEXT ID: 17 type SearchRequest struct { // ContextAttributes: Context attributes for the request which will be used to // adjust ranking of search results. The maximum number of elements is 10. @@ -6981,7 +6981,7 @@ func (s SearchRequest) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// SearchResponse: The search API response. +// SearchResponse: The search API response. NEXT ID: 17 type SearchResponse struct { // DebugInfo: Debugging information about the response. DebugInfo *ResponseDebugInfo `json:"debugInfo,omitempty"` diff --git a/container/v1/container-api.json b/container/v1/container-api.json index 4d0b2c28d29..7ee6dded1d1 100644 --- a/container/v1/container-api.json +++ b/container/v1/container-api.json @@ -2540,7 +2540,7 @@ } } }, - "revision": "20240923", + "revision": "20241008", "rootUrl": "https://container.googleapis.com/", "schemas": { "AcceleratorConfig": { @@ -2680,6 +2680,10 @@ "$ref": "NetworkPolicyConfig", "description": "Configuration for NetworkPolicy. This only tracks whether the addon is enabled or not on the Master, it does not track whether network policy is enabled for the nodes." }, + "parallelstoreCsiDriverConfig": { + "$ref": "ParallelstoreCsiDriverConfig", + "description": "Configuration for the Cloud Storage Parallelstore CSI driver." + }, "rayOperatorConfig": { "$ref": "RayOperatorConfig", "description": "Optional. Configuration for Ray Operator addon." @@ -6337,6 +6341,17 @@ }, "type": "object" }, + "ParallelstoreCsiDriverConfig": { + "description": "Configuration for the Cloud Storage Parallelstore CSI driver.", + "id": "ParallelstoreCsiDriverConfig", + "properties": { + "enabled": { + "description": "Whether the Cloud Storage Parallelstore CSI driver is enabled for this cluster.", + "type": "boolean" + } + }, + "type": "object" + }, "ParentProductConfig": { "description": "ParentProductConfig is the configuration of the parent product of the cluster. This field is used by Google internal products that are built on top of a GKE cluster and take the ownership of the cluster.", "id": "ParentProductConfig", @@ -6640,6 +6655,10 @@ "description": "The default version for newly created clusters on the channel.", "type": "string" }, + "upgradeTargetVersion": { + "description": "The auto upgrade target version for clusters on the channel.", + "type": "string" + }, "validVersions": { "description": "List of valid versions for the channel.", "items": { diff --git a/container/v1/container-gen.go b/container/v1/container-gen.go index bc8d5bbd66b..511ccae9424 100644 --- a/container/v1/container-gen.go +++ b/container/v1/container-gen.go @@ -456,6 +456,9 @@ type AddonsConfig struct { // whether the addon is enabled or not on the Master, it does not track whether // network policy is enabled for the nodes. NetworkPolicyConfig *NetworkPolicyConfig `json:"networkPolicyConfig,omitempty"` + // ParallelstoreCsiDriverConfig: Configuration for the Cloud Storage + // Parallelstore CSI driver. + ParallelstoreCsiDriverConfig *ParallelstoreCsiDriverConfig `json:"parallelstoreCsiDriverConfig,omitempty"` // RayOperatorConfig: Optional. Configuration for Ray Operator addon. RayOperatorConfig *RayOperatorConfig `json:"rayOperatorConfig,omitempty"` // StatefulHaConfig: Optional. Configuration for the StatefulHA add-on. @@ -4991,6 +4994,30 @@ func (s OperationProgress) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// ParallelstoreCsiDriverConfig: Configuration for the Cloud Storage +// Parallelstore CSI driver. +type ParallelstoreCsiDriverConfig struct { + // Enabled: Whether the Cloud Storage Parallelstore CSI driver is enabled for + // this cluster. + Enabled bool `json:"enabled,omitempty"` + // ForceSendFields is a list of field names (e.g. "Enabled") to unconditionally + // include in API requests. By default, fields with empty or default values are + // omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "Enabled") to include in API + // requests with the JSON null value. By default, fields with empty values are + // omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s ParallelstoreCsiDriverConfig) MarshalJSON() ([]byte, error) { + type NoMethod ParallelstoreCsiDriverConfig + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // ParentProductConfig: ParentProductConfig is the configuration of the parent // product of the cluster. This field is used by Google internal products that // are built on top of a GKE cluster and take the ownership of the cluster. @@ -5484,6 +5511,9 @@ type ReleaseChannelConfig struct { // DefaultVersion: The default version for newly created clusters on the // channel. DefaultVersion string `json:"defaultVersion,omitempty"` + // UpgradeTargetVersion: The auto upgrade target version for clusters on the + // channel. + UpgradeTargetVersion string `json:"upgradeTargetVersion,omitempty"` // ValidVersions: List of valid versions for the channel. ValidVersions []string `json:"validVersions,omitempty"` // ForceSendFields is a list of field names (e.g. "Channel") to unconditionally diff --git a/container/v1beta1/container-api.json b/container/v1beta1/container-api.json index cd70d344635..779272a8c3b 100644 --- a/container/v1beta1/container-api.json +++ b/container/v1beta1/container-api.json @@ -348,6 +348,36 @@ "https://www.googleapis.com/auth/cloud-platform" ] }, + "fetchClusterUpgradeInfo": { + "description": "Fetch upgrade information of a specific cluster.", + "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:fetchClusterUpgradeInfo", + "httpMethod": "GET", + "id": "container.projects.locations.clusters.fetchClusterUpgradeInfo", + "parameterOrder": [ + "name" + ], + "parameters": { + "name": { + "description": "Required. The name (project, location, cluster) of the cluster to get. Specified in the format `projects/*/locations/*/clusters/*` or `projects/*/zones/*/clusters/*`.", + "location": "path", + "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+$", + "required": true, + "type": "string" + }, + "version": { + "description": "API request version that initiates this operation.", + "location": "query", + "type": "string" + } + }, + "path": "v1beta1/{+name}:fetchClusterUpgradeInfo", + "response": { + "$ref": "ClusterUpgradeInfo" + }, + "scopes": [ + "https://www.googleapis.com/auth/cloud-platform" + ] + }, "get": { "description": "Gets the details for a specific cluster.", "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}", @@ -896,6 +926,36 @@ "https://www.googleapis.com/auth/cloud-platform" ] }, + "fetchNodePoolUpgradeInfo": { + "description": "Fetch upgrade information of a specific nodepool.", + "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}/nodePools/{nodePoolsId}:fetchNodePoolUpgradeInfo", + "httpMethod": "GET", + "id": "container.projects.locations.clusters.nodePools.fetchNodePoolUpgradeInfo", + "parameterOrder": [ + "name" + ], + "parameters": { + "name": { + "description": "Required. The name (project, location, cluster, nodepool) of the nodepool to get. Specified in the format `projects/*/locations/*/clusters/*/nodePools/*` or `projects/*/zones/*/clusters/*/nodePools/*`.", + "location": "path", + "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+/nodePools/[^/]+$", + "required": true, + "type": "string" + }, + "version": { + "description": "API request version that initiates this operation.", + "location": "query", + "type": "string" + } + }, + "path": "v1beta1/{+name}:fetchNodePoolUpgradeInfo", + "response": { + "$ref": "NodePoolUpgradeInfo" + }, + "scopes": [ + "https://www.googleapis.com/auth/cloud-platform" + ] + }, "get": { "description": "Retrieves the requested node pool.", "flatPath": "v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}/nodePools/{nodePoolsId}", @@ -1473,6 +1533,36 @@ "https://www.googleapis.com/auth/cloud-platform" ] }, + "fetchClusterUpgradeInfo": { + "description": "Fetch upgrade information of a specific cluster.", + "flatPath": "v1beta1/projects/{projectsId}/zones/{zonesId}/clusters/{clustersId}:fetchClusterUpgradeInfo", + "httpMethod": "GET", + "id": "container.projects.zones.clusters.fetchClusterUpgradeInfo", + "parameterOrder": [ + "name" + ], + "parameters": { + "name": { + "description": "Required. The name (project, location, cluster) of the cluster to get. Specified in the format `projects/*/locations/*/clusters/*` or `projects/*/zones/*/clusters/*`.", + "location": "path", + "pattern": "^projects/[^/]+/zones/[^/]+/clusters/[^/]+$", + "required": true, + "type": "string" + }, + "version": { + "description": "API request version that initiates this operation.", + "location": "query", + "type": "string" + } + }, + "path": "v1beta1/{+name}:fetchClusterUpgradeInfo", + "response": { + "$ref": "ClusterUpgradeInfo" + }, + "scopes": [ + "https://www.googleapis.com/auth/cloud-platform" + ] + }, "get": { "description": "Gets the details for a specific cluster.", "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}", @@ -2147,6 +2237,36 @@ "https://www.googleapis.com/auth/cloud-platform" ] }, + "fetchNodePoolUpgradeInfo": { + "description": "Fetch upgrade information of a specific nodepool.", + "flatPath": "v1beta1/projects/{projectsId}/zones/{zonesId}/clusters/{clustersId}/nodePools/{nodePoolsId}:fetchNodePoolUpgradeInfo", + "httpMethod": "GET", + "id": "container.projects.zones.clusters.nodePools.fetchNodePoolUpgradeInfo", + "parameterOrder": [ + "name" + ], + "parameters": { + "name": { + "description": "Required. The name (project, location, cluster, nodepool) of the nodepool to get. Specified in the format `projects/*/locations/*/clusters/*/nodePools/*` or `projects/*/zones/*/clusters/*/nodePools/*`.", + "location": "path", + "pattern": "^projects/[^/]+/zones/[^/]+/clusters/[^/]+/nodePools/[^/]+$", + "required": true, + "type": "string" + }, + "version": { + "description": "API request version that initiates this operation.", + "location": "query", + "type": "string" + } + }, + "path": "v1beta1/{+name}:fetchNodePoolUpgradeInfo", + "response": { + "$ref": "NodePoolUpgradeInfo" + }, + "scopes": [ + "https://www.googleapis.com/auth/cloud-platform" + ] + }, "get": { "description": "Retrieves the requested node pool.", "flatPath": "v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/nodePools/{nodePoolId}", @@ -2565,7 +2685,7 @@ } } }, - "revision": "20240923", + "revision": "20241008", "rootUrl": "https://container.googleapis.com/", "schemas": { "AcceleratorConfig": { @@ -2721,6 +2841,10 @@ "$ref": "NetworkPolicyConfig", "description": "Configuration for NetworkPolicy. This only tracks whether the addon is enabled or not on the Master, it does not track whether network policy is enabled for the nodes." }, + "parallelstoreCsiDriverConfig": { + "$ref": "ParallelstoreCsiDriverConfig", + "description": "Configuration for the Cloud Storage Parallelstore CSI driver." + }, "rayOperatorConfig": { "$ref": "RayOperatorConfig", "description": "Optional. Configuration for Ray Operator addon." @@ -2794,6 +2918,27 @@ }, "type": "object" }, + "AutoMonitoringConfig": { + "description": "AutoMonitoringConfig defines the configuration for GKE Workload Auto-Monitoring.", + "id": "AutoMonitoringConfig", + "properties": { + "scope": { + "description": "Scope for GKE Workload Auto-Monitoring.", + "enum": [ + "SCOPE_UNSPECIFIED", + "ALL", + "NONE" + ], + "enumDescriptions": [ + "Not set.", + "Auto-Monitoring is enabled for all supported applications.", + "Disable Auto-Monitoring." + ], + "type": "string" + } + }, + "type": "object" + }, "AutoUpgradeOptions": { "description": "AutoUpgradeOptions defines the set of options for the user to control how the Auto Upgrades will proceed.", "id": "AutoUpgradeOptions", @@ -4066,6 +4211,80 @@ }, "type": "object" }, + "ClusterUpgradeInfo": { + "description": "ClusterUpgradeInfo contains the upgrade information of a cluster.", + "id": "ClusterUpgradeInfo", + "properties": { + "autoUpgradeStatus": { + "description": "The auto upgrade status.", + "items": { + "enum": [ + "UNKNOWN", + "ACTIVE", + "MINOR_UPGRADE_PAUSED", + "UPGRADE_PAUSED" + ], + "enumDescriptions": [ + "UNKNOWN indicates an unknown status.", + "ACTIVE indicates an active status.", + "MINOR_UPGRADE_PAUSED indicates the minor version upgrade is paused.", + "UPGRADE_PAUSED indicates the upgrade is paused." + ], + "type": "string" + }, + "type": "array" + }, + "endOfExtendedSupportTimestamp": { + "description": "The cluster's current minor version's end of extended support timestamp.", + "type": "string" + }, + "endOfStandardSupportTimestamp": { + "description": "The cluster's current minor version's end of standard support timestamp.", + "type": "string" + }, + "minorTargetVersion": { + "description": "minor_target_version indicates the target version for minor upgrade.", + "type": "string" + }, + "patchTargetVersion": { + "description": "patch_target_version indicates the target version for patch upgrade.", + "type": "string" + }, + "pausedReason": { + "description": "The auto upgrade paused reason.", + "items": { + "enum": [ + "AUTO_UPGRADE_PAUSED_REASON_UNSPECIFIED", + "MAINTENANCE_WINDOW", + "MAINTENANCE_EXCLUSION_NO_UPGRADES", + "MAINTENANCE_EXCLUSION_NO_MINOR_UPGRADES", + "CLUSTER_DISRUPTION_BUDGET", + "CLUSTER_DISRUPTION_BUDGET_MINOR_UPGRADE", + "SYSTEM_CONFIG" + ], + "enumDescriptions": [ + "AUTO_UPGRADE_PAUSED_REASON_UNSPECIFIED indicates an unspecified reason.", + "MAINTENANCE_WINDOW indicates the cluster is outside customer maintenance window.", + "MAINTENANCE_EXCLUSION_NO_UPGRADES indicates the cluster is in a maintenance exclusion with scope NO_UPGRADES.", + "MAINTENANCE_EXCLUSION_NO_MINOR_UPGRADES indicates the cluster is in a maintenance exclusion with scope NO_MINOR_UPGRADES.", + "CLUSTER_DISRUPTION_BUDGET indicates the cluster is outside the cluster disruption budget.", + "CLUSTER_DISRUPTION_BUDGET_MINOR_UPGRADE indicates the cluster is outside the cluster disruption budget for minor version upgrade.", + "SYSTEM_CONFIG indicates the cluster upgrade is paused by system config." + ], + "type": "string" + }, + "type": "array" + }, + "upgradeDetails": { + "description": "The list of past auto upgrades.", + "items": { + "$ref": "UpgradeDetails" + }, + "type": "array" + } + }, + "type": "object" + }, "CompleteIPRotationRequest": { "description": "CompleteIPRotationRequest moves the cluster master back into single-IP mode.", "id": "CompleteIPRotationRequest", @@ -5455,6 +5674,10 @@ "description": "ManagedPrometheusConfig defines the configuration for Google Cloud Managed Service for Prometheus.", "id": "ManagedPrometheusConfig", "properties": { + "autoMonitoringConfig": { + "$ref": "AutoMonitoringConfig", + "description": "GKE Workload Auto-Monitoring Configuration." + }, "enabled": { "description": "Enable Managed Collection.", "type": "boolean" @@ -6453,6 +6676,76 @@ }, "type": "object" }, + "NodePoolUpgradeInfo": { + "description": "NodePoolUpgradeInfo contains the upgrade information of a nodepool.", + "id": "NodePoolUpgradeInfo", + "properties": { + "autoUpgradeStatus": { + "description": "The auto upgrade status.", + "items": { + "enum": [ + "UNKNOWN", + "ACTIVE", + "MINOR_UPGRADE_PAUSED", + "UPGRADE_PAUSED" + ], + "enumDescriptions": [ + "UNKNOWN indicates an unknown status.", + "ACTIVE indicates an active status.", + "MINOR_UPGRADE_PAUSED indicates the minor version upgrade is paused.", + "UPGRADE_PAUSED indicates the upgrade is paused." + ], + "type": "string" + }, + "type": "array" + }, + "endOfExtendedSupportTimestamp": { + "description": "The nodepool's current minor version's end of extended support timestamp.", + "type": "string" + }, + "endOfStandardSupportTimestamp": { + "description": "The nodepool's current minor version's end of standard support timestamp.", + "type": "string" + }, + "minorTargetVersion": { + "description": "minor_target_version indicates the target version for minor upgrade.", + "type": "string" + }, + "patchTargetVersion": { + "description": "patch_target_version indicates the target version for patch upgrade.", + "type": "string" + }, + "pausedReason": { + "description": "The auto upgrade paused reason.", + "items": { + "enum": [ + "AUTO_UPGRADE_PAUSED_REASON_UNSPECIFIED", + "MAINTENANCE_WINDOW", + "MAINTENANCE_EXCLUSION_NO_UPGRADES", + "MAINTENANCE_EXCLUSION_NO_MINOR_UPGRADES", + "SYSTEM_CONFIG" + ], + "enumDescriptions": [ + "AUTO_UPGRADE_PAUSED_REASON_UNSPECIFIED indicates an unspecified reason.", + "MAINTENANCE_WINDOW indicates the cluster is outside customer maintenance window.", + "MAINTENANCE_EXCLUSION_NO_UPGRADES indicates the cluster is in a maintenance exclusion with scope NO_UPGRADES.", + "MAINTENANCE_EXCLUSION_NO_MINOR_UPGRADES indicates the cluster is in a maintenance exclusion with scope NO_MINOR_UPGRADES.", + "SYSTEM_CONFIG indicates the cluster upgrade is paused by system config." + ], + "type": "string" + }, + "type": "array" + }, + "upgradeDetails": { + "description": "The list of past auto upgrades.", + "items": { + "$ref": "UpgradeDetails" + }, + "type": "array" + } + }, + "type": "object" + }, "NodeTaint": { "description": "Kubernetes taint is composed of three fields: key, value, and effect. Effect can only be one of three types: NoSchedule, PreferNoSchedule or NoExecute. See [here](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration) for more information, including usage and the valid values.", "id": "NodeTaint", @@ -6760,6 +7053,17 @@ }, "type": "object" }, + "ParallelstoreCsiDriverConfig": { + "description": "Configuration for the Cloud Storage Parallelstore CSI driver.", + "id": "ParallelstoreCsiDriverConfig", + "properties": { + "enabled": { + "description": "Whether the Cloud Storage Parallelstore CSI driver is enabled for this cluster.", + "type": "boolean" + } + }, + "type": "object" + }, "ParentProductConfig": { "description": "ParentProductConfig is the configuration of the parent product of the cluster. This field is used by Google internal products that are built on top of a GKE cluster and take the ownership of the cluster.", "id": "ParentProductConfig", @@ -7118,6 +7422,10 @@ "description": "The default version for newly created clusters on the channel.", "type": "string" }, + "upgradeTargetVersion": { + "description": "The auto upgrade target version for clusters on the channel.", + "type": "string" + }, "validVersions": { "description": "List of valid versions for the channel.", "items": { @@ -8387,6 +8695,48 @@ }, "type": "object" }, + "UpgradeDetails": { + "description": "UpgradeDetails contains detailed information of each individual upgrade operation.", + "id": "UpgradeDetails", + "properties": { + "endTime": { + "description": "The end timestamp of the upgrade.", + "format": "google-datetime", + "type": "string" + }, + "initialVersion": { + "description": "The version before the upgrade.", + "type": "string" + }, + "startTime": { + "description": "The start timestamp of the upgrade.", + "format": "google-datetime", + "type": "string" + }, + "state": { + "description": "Output only. The state of the upgrade.", + "enum": [ + "UNKNOWN", + "FAILED", + "SUCCEEDED", + "CANCELED" + ], + "enumDescriptions": [ + "Upgrade state is unknown.", + "Upgrade has failed with an error.", + "Upgrade has succeeded.", + "Upgrade has been canceled." + ], + "readOnly": true, + "type": "string" + }, + "targetVersion": { + "description": "The version after the upgrade.", + "type": "string" + } + }, + "type": "object" + }, "UpgradeEvent": { "description": "UpgradeEvent is a notification sent to customers by the cluster server when a resource is upgrading.", "id": "UpgradeEvent", diff --git a/container/v1beta1/container-gen.go b/container/v1beta1/container-gen.go index 3d32b2dae86..08172c1611c 100644 --- a/container/v1beta1/container-gen.go +++ b/container/v1beta1/container-gen.go @@ -466,6 +466,9 @@ type AddonsConfig struct { // whether the addon is enabled or not on the Master, it does not track whether // network policy is enabled for the nodes. NetworkPolicyConfig *NetworkPolicyConfig `json:"networkPolicyConfig,omitempty"` + // ParallelstoreCsiDriverConfig: Configuration for the Cloud Storage + // Parallelstore CSI driver. + ParallelstoreCsiDriverConfig *ParallelstoreCsiDriverConfig `json:"parallelstoreCsiDriverConfig,omitempty"` // RayOperatorConfig: Optional. Configuration for Ray Operator addon. RayOperatorConfig *RayOperatorConfig `json:"rayOperatorConfig,omitempty"` // StatefulHaConfig: Optional. Configuration for the StatefulHA add-on. @@ -576,6 +579,34 @@ func (s AuthenticatorGroupsConfig) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// AutoMonitoringConfig: AutoMonitoringConfig defines the configuration for GKE +// Workload Auto-Monitoring. +type AutoMonitoringConfig struct { + // Scope: Scope for GKE Workload Auto-Monitoring. + // + // Possible values: + // "SCOPE_UNSPECIFIED" - Not set. + // "ALL" - Auto-Monitoring is enabled for all supported applications. + // "NONE" - Disable Auto-Monitoring. + Scope string `json:"scope,omitempty"` + // ForceSendFields is a list of field names (e.g. "Scope") to unconditionally + // include in API requests. By default, fields with empty or default values are + // omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "Scope") to include in API + // requests with the JSON null value. By default, fields with empty values are + // omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s AutoMonitoringConfig) MarshalJSON() ([]byte, error) { + type NoMethod AutoMonitoringConfig + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // AutoUpgradeOptions: AutoUpgradeOptions defines the set of options for the // user to control how the Auto Upgrades will proceed. type AutoUpgradeOptions struct { @@ -1879,6 +1910,73 @@ func (s ClusterUpdate) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// ClusterUpgradeInfo: ClusterUpgradeInfo contains the upgrade information of a +// cluster. +type ClusterUpgradeInfo struct { + // AutoUpgradeStatus: The auto upgrade status. + // + // Possible values: + // "UNKNOWN" - UNKNOWN indicates an unknown status. + // "ACTIVE" - ACTIVE indicates an active status. + // "MINOR_UPGRADE_PAUSED" - MINOR_UPGRADE_PAUSED indicates the minor version + // upgrade is paused. + // "UPGRADE_PAUSED" - UPGRADE_PAUSED indicates the upgrade is paused. + AutoUpgradeStatus []string `json:"autoUpgradeStatus,omitempty"` + // EndOfExtendedSupportTimestamp: The cluster's current minor version's end of + // extended support timestamp. + EndOfExtendedSupportTimestamp string `json:"endOfExtendedSupportTimestamp,omitempty"` + // EndOfStandardSupportTimestamp: The cluster's current minor version's end of + // standard support timestamp. + EndOfStandardSupportTimestamp string `json:"endOfStandardSupportTimestamp,omitempty"` + // MinorTargetVersion: minor_target_version indicates the target version for + // minor upgrade. + MinorTargetVersion string `json:"minorTargetVersion,omitempty"` + // PatchTargetVersion: patch_target_version indicates the target version for + // patch upgrade. + PatchTargetVersion string `json:"patchTargetVersion,omitempty"` + // PausedReason: The auto upgrade paused reason. + // + // Possible values: + // "AUTO_UPGRADE_PAUSED_REASON_UNSPECIFIED" - + // AUTO_UPGRADE_PAUSED_REASON_UNSPECIFIED indicates an unspecified reason. + // "MAINTENANCE_WINDOW" - MAINTENANCE_WINDOW indicates the cluster is outside + // customer maintenance window. + // "MAINTENANCE_EXCLUSION_NO_UPGRADES" - MAINTENANCE_EXCLUSION_NO_UPGRADES + // indicates the cluster is in a maintenance exclusion with scope NO_UPGRADES. + // "MAINTENANCE_EXCLUSION_NO_MINOR_UPGRADES" - + // MAINTENANCE_EXCLUSION_NO_MINOR_UPGRADES indicates the cluster is in a + // maintenance exclusion with scope NO_MINOR_UPGRADES. + // "CLUSTER_DISRUPTION_BUDGET" - CLUSTER_DISRUPTION_BUDGET indicates the + // cluster is outside the cluster disruption budget. + // "CLUSTER_DISRUPTION_BUDGET_MINOR_UPGRADE" - + // CLUSTER_DISRUPTION_BUDGET_MINOR_UPGRADE indicates the cluster is outside the + // cluster disruption budget for minor version upgrade. + // "SYSTEM_CONFIG" - SYSTEM_CONFIG indicates the cluster upgrade is paused by + // system config. + PausedReason []string `json:"pausedReason,omitempty"` + // UpgradeDetails: The list of past auto upgrades. + UpgradeDetails []*UpgradeDetails `json:"upgradeDetails,omitempty"` + + // ServerResponse contains the HTTP response code and headers from the server. + googleapi.ServerResponse `json:"-"` + // ForceSendFields is a list of field names (e.g. "AutoUpgradeStatus") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "AutoUpgradeStatus") to include in + // API requests with the JSON null value. By default, fields with empty values + // are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s ClusterUpgradeInfo) MarshalJSON() ([]byte, error) { + type NoMethod ClusterUpgradeInfo + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // CompleteIPRotationRequest: CompleteIPRotationRequest moves the cluster // master back into single-IP mode. type CompleteIPRotationRequest struct { @@ -3942,17 +4040,19 @@ func (s MaintenanceWindow) MarshalJSON() ([]byte, error) { // ManagedPrometheusConfig: ManagedPrometheusConfig defines the configuration // for Google Cloud Managed Service for Prometheus. type ManagedPrometheusConfig struct { + // AutoMonitoringConfig: GKE Workload Auto-Monitoring Configuration. + AutoMonitoringConfig *AutoMonitoringConfig `json:"autoMonitoringConfig,omitempty"` // Enabled: Enable Managed Collection. Enabled bool `json:"enabled,omitempty"` - // ForceSendFields is a list of field names (e.g. "Enabled") to unconditionally - // include in API requests. By default, fields with empty or default values are - // omitted from API requests. See + // ForceSendFields is a list of field names (e.g. "AutoMonitoringConfig") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more // details. ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "Enabled") to include in API - // requests with the JSON null value. By default, fields with empty values are - // omitted from API requests. See + // NullFields is a list of field names (e.g. "AutoMonitoringConfig") to include + // in API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. NullFields []string `json:"-"` } @@ -5110,6 +5210,68 @@ func (s NodePoolLoggingConfig) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// NodePoolUpgradeInfo: NodePoolUpgradeInfo contains the upgrade information of +// a nodepool. +type NodePoolUpgradeInfo struct { + // AutoUpgradeStatus: The auto upgrade status. + // + // Possible values: + // "UNKNOWN" - UNKNOWN indicates an unknown status. + // "ACTIVE" - ACTIVE indicates an active status. + // "MINOR_UPGRADE_PAUSED" - MINOR_UPGRADE_PAUSED indicates the minor version + // upgrade is paused. + // "UPGRADE_PAUSED" - UPGRADE_PAUSED indicates the upgrade is paused. + AutoUpgradeStatus []string `json:"autoUpgradeStatus,omitempty"` + // EndOfExtendedSupportTimestamp: The nodepool's current minor version's end of + // extended support timestamp. + EndOfExtendedSupportTimestamp string `json:"endOfExtendedSupportTimestamp,omitempty"` + // EndOfStandardSupportTimestamp: The nodepool's current minor version's end of + // standard support timestamp. + EndOfStandardSupportTimestamp string `json:"endOfStandardSupportTimestamp,omitempty"` + // MinorTargetVersion: minor_target_version indicates the target version for + // minor upgrade. + MinorTargetVersion string `json:"minorTargetVersion,omitempty"` + // PatchTargetVersion: patch_target_version indicates the target version for + // patch upgrade. + PatchTargetVersion string `json:"patchTargetVersion,omitempty"` + // PausedReason: The auto upgrade paused reason. + // + // Possible values: + // "AUTO_UPGRADE_PAUSED_REASON_UNSPECIFIED" - + // AUTO_UPGRADE_PAUSED_REASON_UNSPECIFIED indicates an unspecified reason. + // "MAINTENANCE_WINDOW" - MAINTENANCE_WINDOW indicates the cluster is outside + // customer maintenance window. + // "MAINTENANCE_EXCLUSION_NO_UPGRADES" - MAINTENANCE_EXCLUSION_NO_UPGRADES + // indicates the cluster is in a maintenance exclusion with scope NO_UPGRADES. + // "MAINTENANCE_EXCLUSION_NO_MINOR_UPGRADES" - + // MAINTENANCE_EXCLUSION_NO_MINOR_UPGRADES indicates the cluster is in a + // maintenance exclusion with scope NO_MINOR_UPGRADES. + // "SYSTEM_CONFIG" - SYSTEM_CONFIG indicates the cluster upgrade is paused by + // system config. + PausedReason []string `json:"pausedReason,omitempty"` + // UpgradeDetails: The list of past auto upgrades. + UpgradeDetails []*UpgradeDetails `json:"upgradeDetails,omitempty"` + + // ServerResponse contains the HTTP response code and headers from the server. + googleapi.ServerResponse `json:"-"` + // ForceSendFields is a list of field names (e.g. "AutoUpgradeStatus") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "AutoUpgradeStatus") to include in + // API requests with the JSON null value. By default, fields with empty values + // are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s NodePoolUpgradeInfo) MarshalJSON() ([]byte, error) { + type NoMethod NodePoolUpgradeInfo + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // NodeTaint: Kubernetes taint is composed of three fields: key, value, and // effect. Effect can only be one of three types: NoSchedule, PreferNoSchedule // or NoExecute. See here @@ -5456,6 +5618,30 @@ func (s OpportunisticMaintenanceStrategy) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// ParallelstoreCsiDriverConfig: Configuration for the Cloud Storage +// Parallelstore CSI driver. +type ParallelstoreCsiDriverConfig struct { + // Enabled: Whether the Cloud Storage Parallelstore CSI driver is enabled for + // this cluster. + Enabled bool `json:"enabled,omitempty"` + // ForceSendFields is a list of field names (e.g. "Enabled") to unconditionally + // include in API requests. By default, fields with empty or default values are + // omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "Enabled") to include in API + // requests with the JSON null value. By default, fields with empty values are + // omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s ParallelstoreCsiDriverConfig) MarshalJSON() ([]byte, error) { + type NoMethod ParallelstoreCsiDriverConfig + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // ParentProductConfig: ParentProductConfig is the configuration of the parent // product of the cluster. This field is used by Google internal products that // are built on top of a GKE cluster and take the ownership of the cluster. @@ -6033,6 +6219,9 @@ type ReleaseChannelConfig struct { // DefaultVersion: The default version for newly created clusters on the // channel. DefaultVersion string `json:"defaultVersion,omitempty"` + // UpgradeTargetVersion: The auto upgrade target version for clusters on the + // channel. + UpgradeTargetVersion string `json:"upgradeTargetVersion,omitempty"` // ValidVersions: List of valid versions for the channel. ValidVersions []string `json:"validVersions,omitempty"` // ForceSendFields is a list of field names (e.g. "AvailableVersions") to @@ -7661,6 +7850,43 @@ func (s UpgradeAvailableEvent) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// UpgradeDetails: UpgradeDetails contains detailed information of each +// individual upgrade operation. +type UpgradeDetails struct { + // EndTime: The end timestamp of the upgrade. + EndTime string `json:"endTime,omitempty"` + // InitialVersion: The version before the upgrade. + InitialVersion string `json:"initialVersion,omitempty"` + // StartTime: The start timestamp of the upgrade. + StartTime string `json:"startTime,omitempty"` + // State: Output only. The state of the upgrade. + // + // Possible values: + // "UNKNOWN" - Upgrade state is unknown. + // "FAILED" - Upgrade has failed with an error. + // "SUCCEEDED" - Upgrade has succeeded. + // "CANCELED" - Upgrade has been canceled. + State string `json:"state,omitempty"` + // TargetVersion: The version after the upgrade. + TargetVersion string `json:"targetVersion,omitempty"` + // ForceSendFields is a list of field names (e.g. "EndTime") to unconditionally + // include in API requests. By default, fields with empty or default values are + // omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "EndTime") to include in API + // requests with the JSON null value. By default, fields with empty values are + // omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s UpgradeDetails) MarshalJSON() ([]byte, error) { + type NoMethod UpgradeDetails + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // UpgradeEvent: UpgradeEvent is a notification sent to customers by the // cluster server when a resource is upgrading. type UpgradeEvent struct { @@ -9057,6 +9283,123 @@ func (c *ProjectsLocationsClustersDeleteCall) Do(opts ...googleapi.CallOption) ( return ret, nil } +type ProjectsLocationsClustersFetchClusterUpgradeInfoCall struct { + s *Service + name string + urlParams_ gensupport.URLParams + ifNoneMatch_ string + ctx_ context.Context + header_ http.Header +} + +// FetchClusterUpgradeInfo: Fetch upgrade information of a specific cluster. +// +// - name: The name (project, location, cluster) of the cluster to get. +// Specified in the format `projects/*/locations/*/clusters/*` or +// `projects/*/zones/*/clusters/*`. +func (r *ProjectsLocationsClustersService) FetchClusterUpgradeInfo(name string) *ProjectsLocationsClustersFetchClusterUpgradeInfoCall { + c := &ProjectsLocationsClustersFetchClusterUpgradeInfoCall{s: r.s, urlParams_: make(gensupport.URLParams)} + c.name = name + return c +} + +// Version sets the optional parameter "version": API request version that +// initiates this operation. +func (c *ProjectsLocationsClustersFetchClusterUpgradeInfoCall) Version(version string) *ProjectsLocationsClustersFetchClusterUpgradeInfoCall { + c.urlParams_.Set("version", version) + return c +} + +// Fields allows partial responses to be retrieved. See +// https://developers.google.com/gdata/docs/2.0/basics#PartialResponse for more +// details. +func (c *ProjectsLocationsClustersFetchClusterUpgradeInfoCall) Fields(s ...googleapi.Field) *ProjectsLocationsClustersFetchClusterUpgradeInfoCall { + c.urlParams_.Set("fields", googleapi.CombineFields(s)) + return c +} + +// IfNoneMatch sets an optional parameter which makes the operation fail if the +// object's ETag matches the given value. This is useful for getting updates +// only after the object has changed since the last request. +func (c *ProjectsLocationsClustersFetchClusterUpgradeInfoCall) IfNoneMatch(entityTag string) *ProjectsLocationsClustersFetchClusterUpgradeInfoCall { + c.ifNoneMatch_ = entityTag + return c +} + +// Context sets the context to be used in this call's Do method. +func (c *ProjectsLocationsClustersFetchClusterUpgradeInfoCall) Context(ctx context.Context) *ProjectsLocationsClustersFetchClusterUpgradeInfoCall { + c.ctx_ = ctx + return c +} + +// Header returns a http.Header that can be modified by the caller to add +// headers to the request. +func (c *ProjectsLocationsClustersFetchClusterUpgradeInfoCall) Header() http.Header { + if c.header_ == nil { + c.header_ = make(http.Header) + } + return c.header_ +} + +func (c *ProjectsLocationsClustersFetchClusterUpgradeInfoCall) doRequest(alt string) (*http.Response, error) { + reqHeaders := gensupport.SetHeaders(c.s.userAgent(), "", c.header_) + if c.ifNoneMatch_ != "" { + reqHeaders.Set("If-None-Match", c.ifNoneMatch_) + } + var body io.Reader = nil + c.urlParams_.Set("alt", alt) + c.urlParams_.Set("prettyPrint", "false") + urls := googleapi.ResolveRelative(c.s.BasePath, "v1beta1/{+name}:fetchClusterUpgradeInfo") + urls += "?" + c.urlParams_.Encode() + req, err := http.NewRequest("GET", urls, body) + if err != nil { + return nil, err + } + req.Header = reqHeaders + googleapi.Expand(req.URL, map[string]string{ + "name": c.name, + }) + return gensupport.SendRequest(c.ctx_, c.s.client, req) +} + +// Do executes the "container.projects.locations.clusters.fetchClusterUpgradeInfo" call. +// Any non-2xx status code is an error. Response headers are in either +// *ClusterUpgradeInfo.ServerResponse.Header or (if a response was returned at +// all) in error.(*googleapi.Error).Header. Use googleapi.IsNotModified to +// check whether the returned error was because http.StatusNotModified was +// returned. +func (c *ProjectsLocationsClustersFetchClusterUpgradeInfoCall) Do(opts ...googleapi.CallOption) (*ClusterUpgradeInfo, error) { + gensupport.SetOptions(c.urlParams_, opts...) + res, err := c.doRequest("json") + if res != nil && res.StatusCode == http.StatusNotModified { + if res.Body != nil { + res.Body.Close() + } + return nil, gensupport.WrapError(&googleapi.Error{ + Code: res.StatusCode, + Header: res.Header, + }) + } + if err != nil { + return nil, err + } + defer googleapi.CloseBody(res) + if err := googleapi.CheckResponse(res); err != nil { + return nil, gensupport.WrapError(err) + } + ret := &ClusterUpgradeInfo{ + ServerResponse: googleapi.ServerResponse{ + Header: res.Header, + HTTPStatusCode: res.StatusCode, + }, + } + target := &ret + if err := gensupport.DecodeResponse(target, res); err != nil { + return nil, err + } + return ret, nil +} + type ProjectsLocationsClustersGetCall struct { s *Service name string @@ -11001,6 +11344,124 @@ func (c *ProjectsLocationsClustersNodePoolsDeleteCall) Do(opts ...googleapi.Call return ret, nil } +type ProjectsLocationsClustersNodePoolsFetchNodePoolUpgradeInfoCall struct { + s *Service + name string + urlParams_ gensupport.URLParams + ifNoneMatch_ string + ctx_ context.Context + header_ http.Header +} + +// FetchNodePoolUpgradeInfo: Fetch upgrade information of a specific nodepool. +// +// - name: The name (project, location, cluster, nodepool) of the nodepool to +// get. Specified in the format +// `projects/*/locations/*/clusters/*/nodePools/*` or +// `projects/*/zones/*/clusters/*/nodePools/*`. +func (r *ProjectsLocationsClustersNodePoolsService) FetchNodePoolUpgradeInfo(name string) *ProjectsLocationsClustersNodePoolsFetchNodePoolUpgradeInfoCall { + c := &ProjectsLocationsClustersNodePoolsFetchNodePoolUpgradeInfoCall{s: r.s, urlParams_: make(gensupport.URLParams)} + c.name = name + return c +} + +// Version sets the optional parameter "version": API request version that +// initiates this operation. +func (c *ProjectsLocationsClustersNodePoolsFetchNodePoolUpgradeInfoCall) Version(version string) *ProjectsLocationsClustersNodePoolsFetchNodePoolUpgradeInfoCall { + c.urlParams_.Set("version", version) + return c +} + +// Fields allows partial responses to be retrieved. See +// https://developers.google.com/gdata/docs/2.0/basics#PartialResponse for more +// details. +func (c *ProjectsLocationsClustersNodePoolsFetchNodePoolUpgradeInfoCall) Fields(s ...googleapi.Field) *ProjectsLocationsClustersNodePoolsFetchNodePoolUpgradeInfoCall { + c.urlParams_.Set("fields", googleapi.CombineFields(s)) + return c +} + +// IfNoneMatch sets an optional parameter which makes the operation fail if the +// object's ETag matches the given value. This is useful for getting updates +// only after the object has changed since the last request. +func (c *ProjectsLocationsClustersNodePoolsFetchNodePoolUpgradeInfoCall) IfNoneMatch(entityTag string) *ProjectsLocationsClustersNodePoolsFetchNodePoolUpgradeInfoCall { + c.ifNoneMatch_ = entityTag + return c +} + +// Context sets the context to be used in this call's Do method. +func (c *ProjectsLocationsClustersNodePoolsFetchNodePoolUpgradeInfoCall) Context(ctx context.Context) *ProjectsLocationsClustersNodePoolsFetchNodePoolUpgradeInfoCall { + c.ctx_ = ctx + return c +} + +// Header returns a http.Header that can be modified by the caller to add +// headers to the request. +func (c *ProjectsLocationsClustersNodePoolsFetchNodePoolUpgradeInfoCall) Header() http.Header { + if c.header_ == nil { + c.header_ = make(http.Header) + } + return c.header_ +} + +func (c *ProjectsLocationsClustersNodePoolsFetchNodePoolUpgradeInfoCall) doRequest(alt string) (*http.Response, error) { + reqHeaders := gensupport.SetHeaders(c.s.userAgent(), "", c.header_) + if c.ifNoneMatch_ != "" { + reqHeaders.Set("If-None-Match", c.ifNoneMatch_) + } + var body io.Reader = nil + c.urlParams_.Set("alt", alt) + c.urlParams_.Set("prettyPrint", "false") + urls := googleapi.ResolveRelative(c.s.BasePath, "v1beta1/{+name}:fetchNodePoolUpgradeInfo") + urls += "?" + c.urlParams_.Encode() + req, err := http.NewRequest("GET", urls, body) + if err != nil { + return nil, err + } + req.Header = reqHeaders + googleapi.Expand(req.URL, map[string]string{ + "name": c.name, + }) + return gensupport.SendRequest(c.ctx_, c.s.client, req) +} + +// Do executes the "container.projects.locations.clusters.nodePools.fetchNodePoolUpgradeInfo" call. +// Any non-2xx status code is an error. Response headers are in either +// *NodePoolUpgradeInfo.ServerResponse.Header or (if a response was returned at +// all) in error.(*googleapi.Error).Header. Use googleapi.IsNotModified to +// check whether the returned error was because http.StatusNotModified was +// returned. +func (c *ProjectsLocationsClustersNodePoolsFetchNodePoolUpgradeInfoCall) Do(opts ...googleapi.CallOption) (*NodePoolUpgradeInfo, error) { + gensupport.SetOptions(c.urlParams_, opts...) + res, err := c.doRequest("json") + if res != nil && res.StatusCode == http.StatusNotModified { + if res.Body != nil { + res.Body.Close() + } + return nil, gensupport.WrapError(&googleapi.Error{ + Code: res.StatusCode, + Header: res.Header, + }) + } + if err != nil { + return nil, err + } + defer googleapi.CloseBody(res) + if err := googleapi.CheckResponse(res); err != nil { + return nil, gensupport.WrapError(err) + } + ret := &NodePoolUpgradeInfo{ + ServerResponse: googleapi.ServerResponse{ + Header: res.Header, + HTTPStatusCode: res.StatusCode, + }, + } + target := &ret + if err := gensupport.DecodeResponse(target, res); err != nil { + return nil, err + } + return ret, nil +} + type ProjectsLocationsClustersNodePoolsGetCall struct { s *Service name string @@ -12872,6 +13333,123 @@ func (c *ProjectsZonesClustersDeleteCall) Do(opts ...googleapi.CallOption) (*Ope return ret, nil } +type ProjectsZonesClustersFetchClusterUpgradeInfoCall struct { + s *Service + name string + urlParams_ gensupport.URLParams + ifNoneMatch_ string + ctx_ context.Context + header_ http.Header +} + +// FetchClusterUpgradeInfo: Fetch upgrade information of a specific cluster. +// +// - name: The name (project, location, cluster) of the cluster to get. +// Specified in the format `projects/*/locations/*/clusters/*` or +// `projects/*/zones/*/clusters/*`. +func (r *ProjectsZonesClustersService) FetchClusterUpgradeInfo(name string) *ProjectsZonesClustersFetchClusterUpgradeInfoCall { + c := &ProjectsZonesClustersFetchClusterUpgradeInfoCall{s: r.s, urlParams_: make(gensupport.URLParams)} + c.name = name + return c +} + +// Version sets the optional parameter "version": API request version that +// initiates this operation. +func (c *ProjectsZonesClustersFetchClusterUpgradeInfoCall) Version(version string) *ProjectsZonesClustersFetchClusterUpgradeInfoCall { + c.urlParams_.Set("version", version) + return c +} + +// Fields allows partial responses to be retrieved. See +// https://developers.google.com/gdata/docs/2.0/basics#PartialResponse for more +// details. +func (c *ProjectsZonesClustersFetchClusterUpgradeInfoCall) Fields(s ...googleapi.Field) *ProjectsZonesClustersFetchClusterUpgradeInfoCall { + c.urlParams_.Set("fields", googleapi.CombineFields(s)) + return c +} + +// IfNoneMatch sets an optional parameter which makes the operation fail if the +// object's ETag matches the given value. This is useful for getting updates +// only after the object has changed since the last request. +func (c *ProjectsZonesClustersFetchClusterUpgradeInfoCall) IfNoneMatch(entityTag string) *ProjectsZonesClustersFetchClusterUpgradeInfoCall { + c.ifNoneMatch_ = entityTag + return c +} + +// Context sets the context to be used in this call's Do method. +func (c *ProjectsZonesClustersFetchClusterUpgradeInfoCall) Context(ctx context.Context) *ProjectsZonesClustersFetchClusterUpgradeInfoCall { + c.ctx_ = ctx + return c +} + +// Header returns a http.Header that can be modified by the caller to add +// headers to the request. +func (c *ProjectsZonesClustersFetchClusterUpgradeInfoCall) Header() http.Header { + if c.header_ == nil { + c.header_ = make(http.Header) + } + return c.header_ +} + +func (c *ProjectsZonesClustersFetchClusterUpgradeInfoCall) doRequest(alt string) (*http.Response, error) { + reqHeaders := gensupport.SetHeaders(c.s.userAgent(), "", c.header_) + if c.ifNoneMatch_ != "" { + reqHeaders.Set("If-None-Match", c.ifNoneMatch_) + } + var body io.Reader = nil + c.urlParams_.Set("alt", alt) + c.urlParams_.Set("prettyPrint", "false") + urls := googleapi.ResolveRelative(c.s.BasePath, "v1beta1/{+name}:fetchClusterUpgradeInfo") + urls += "?" + c.urlParams_.Encode() + req, err := http.NewRequest("GET", urls, body) + if err != nil { + return nil, err + } + req.Header = reqHeaders + googleapi.Expand(req.URL, map[string]string{ + "name": c.name, + }) + return gensupport.SendRequest(c.ctx_, c.s.client, req) +} + +// Do executes the "container.projects.zones.clusters.fetchClusterUpgradeInfo" call. +// Any non-2xx status code is an error. Response headers are in either +// *ClusterUpgradeInfo.ServerResponse.Header or (if a response was returned at +// all) in error.(*googleapi.Error).Header. Use googleapi.IsNotModified to +// check whether the returned error was because http.StatusNotModified was +// returned. +func (c *ProjectsZonesClustersFetchClusterUpgradeInfoCall) Do(opts ...googleapi.CallOption) (*ClusterUpgradeInfo, error) { + gensupport.SetOptions(c.urlParams_, opts...) + res, err := c.doRequest("json") + if res != nil && res.StatusCode == http.StatusNotModified { + if res.Body != nil { + res.Body.Close() + } + return nil, gensupport.WrapError(&googleapi.Error{ + Code: res.StatusCode, + Header: res.Header, + }) + } + if err != nil { + return nil, err + } + defer googleapi.CloseBody(res) + if err := googleapi.CheckResponse(res); err != nil { + return nil, gensupport.WrapError(err) + } + ret := &ClusterUpgradeInfo{ + ServerResponse: googleapi.ServerResponse{ + Header: res.Header, + HTTPStatusCode: res.StatusCode, + }, + } + target := &ret + if err := gensupport.DecodeResponse(target, res); err != nil { + return nil, err + } + return ret, nil +} + type ProjectsZonesClustersGetCall struct { s *Service projectId string @@ -14767,6 +15345,124 @@ func (c *ProjectsZonesClustersNodePoolsDeleteCall) Do(opts ...googleapi.CallOpti return ret, nil } +type ProjectsZonesClustersNodePoolsFetchNodePoolUpgradeInfoCall struct { + s *Service + name string + urlParams_ gensupport.URLParams + ifNoneMatch_ string + ctx_ context.Context + header_ http.Header +} + +// FetchNodePoolUpgradeInfo: Fetch upgrade information of a specific nodepool. +// +// - name: The name (project, location, cluster, nodepool) of the nodepool to +// get. Specified in the format +// `projects/*/locations/*/clusters/*/nodePools/*` or +// `projects/*/zones/*/clusters/*/nodePools/*`. +func (r *ProjectsZonesClustersNodePoolsService) FetchNodePoolUpgradeInfo(name string) *ProjectsZonesClustersNodePoolsFetchNodePoolUpgradeInfoCall { + c := &ProjectsZonesClustersNodePoolsFetchNodePoolUpgradeInfoCall{s: r.s, urlParams_: make(gensupport.URLParams)} + c.name = name + return c +} + +// Version sets the optional parameter "version": API request version that +// initiates this operation. +func (c *ProjectsZonesClustersNodePoolsFetchNodePoolUpgradeInfoCall) Version(version string) *ProjectsZonesClustersNodePoolsFetchNodePoolUpgradeInfoCall { + c.urlParams_.Set("version", version) + return c +} + +// Fields allows partial responses to be retrieved. See +// https://developers.google.com/gdata/docs/2.0/basics#PartialResponse for more +// details. +func (c *ProjectsZonesClustersNodePoolsFetchNodePoolUpgradeInfoCall) Fields(s ...googleapi.Field) *ProjectsZonesClustersNodePoolsFetchNodePoolUpgradeInfoCall { + c.urlParams_.Set("fields", googleapi.CombineFields(s)) + return c +} + +// IfNoneMatch sets an optional parameter which makes the operation fail if the +// object's ETag matches the given value. This is useful for getting updates +// only after the object has changed since the last request. +func (c *ProjectsZonesClustersNodePoolsFetchNodePoolUpgradeInfoCall) IfNoneMatch(entityTag string) *ProjectsZonesClustersNodePoolsFetchNodePoolUpgradeInfoCall { + c.ifNoneMatch_ = entityTag + return c +} + +// Context sets the context to be used in this call's Do method. +func (c *ProjectsZonesClustersNodePoolsFetchNodePoolUpgradeInfoCall) Context(ctx context.Context) *ProjectsZonesClustersNodePoolsFetchNodePoolUpgradeInfoCall { + c.ctx_ = ctx + return c +} + +// Header returns a http.Header that can be modified by the caller to add +// headers to the request. +func (c *ProjectsZonesClustersNodePoolsFetchNodePoolUpgradeInfoCall) Header() http.Header { + if c.header_ == nil { + c.header_ = make(http.Header) + } + return c.header_ +} + +func (c *ProjectsZonesClustersNodePoolsFetchNodePoolUpgradeInfoCall) doRequest(alt string) (*http.Response, error) { + reqHeaders := gensupport.SetHeaders(c.s.userAgent(), "", c.header_) + if c.ifNoneMatch_ != "" { + reqHeaders.Set("If-None-Match", c.ifNoneMatch_) + } + var body io.Reader = nil + c.urlParams_.Set("alt", alt) + c.urlParams_.Set("prettyPrint", "false") + urls := googleapi.ResolveRelative(c.s.BasePath, "v1beta1/{+name}:fetchNodePoolUpgradeInfo") + urls += "?" + c.urlParams_.Encode() + req, err := http.NewRequest("GET", urls, body) + if err != nil { + return nil, err + } + req.Header = reqHeaders + googleapi.Expand(req.URL, map[string]string{ + "name": c.name, + }) + return gensupport.SendRequest(c.ctx_, c.s.client, req) +} + +// Do executes the "container.projects.zones.clusters.nodePools.fetchNodePoolUpgradeInfo" call. +// Any non-2xx status code is an error. Response headers are in either +// *NodePoolUpgradeInfo.ServerResponse.Header or (if a response was returned at +// all) in error.(*googleapi.Error).Header. Use googleapi.IsNotModified to +// check whether the returned error was because http.StatusNotModified was +// returned. +func (c *ProjectsZonesClustersNodePoolsFetchNodePoolUpgradeInfoCall) Do(opts ...googleapi.CallOption) (*NodePoolUpgradeInfo, error) { + gensupport.SetOptions(c.urlParams_, opts...) + res, err := c.doRequest("json") + if res != nil && res.StatusCode == http.StatusNotModified { + if res.Body != nil { + res.Body.Close() + } + return nil, gensupport.WrapError(&googleapi.Error{ + Code: res.StatusCode, + Header: res.Header, + }) + } + if err != nil { + return nil, err + } + defer googleapi.CloseBody(res) + if err := googleapi.CheckResponse(res); err != nil { + return nil, gensupport.WrapError(err) + } + ret := &NodePoolUpgradeInfo{ + ServerResponse: googleapi.ServerResponse{ + Header: res.Header, + HTTPStatusCode: res.StatusCode, + }, + } + target := &ret + if err := gensupport.DecodeResponse(target, res); err != nil { + return nil, err + } + return ret, nil +} + type ProjectsZonesClustersNodePoolsGetCall struct { s *Service projectId string diff --git a/developerconnect/v1/developerconnect-api.json b/developerconnect/v1/developerconnect-api.json index a694839106e..d3931a9330f 100644 --- a/developerconnect/v1/developerconnect-api.json +++ b/developerconnect/v1/developerconnect-api.json @@ -473,7 +473,7 @@ "type": "string" }, "updateMask": { - "description": "Optional. Required. Field mask is used to specify the fields to be overwritten in the Connection resource by the update. The fields specified in the update_mask are relative to the resource, not the full request. A field will be overwritten if it is in the mask. If the user does not provide a mask then all fields will be overwritten.", + "description": "Required. Field mask is used to specify the fields to be overwritten in the Connection resource by the update. The fields specified in the update_mask are relative to the resource, not the full request. A field will be overwritten if it is in the mask. If the user does not provide a mask then all fields will be overwritten.", "format": "google-fieldmask", "location": "query", "type": "string" @@ -970,7 +970,7 @@ } } }, - "revision": "20241014", + "revision": "20241017", "rootUrl": "https://developerconnect.googleapis.com/", "schemas": { "CancelOperationRequest": { diff --git a/discoveryengine/v1/discoveryengine-api.json b/discoveryengine/v1/discoveryengine-api.json index 457c5bc4169..500912c3677 100644 --- a/discoveryengine/v1/discoveryengine-api.json +++ b/discoveryengine/v1/discoveryengine-api.json @@ -6006,7 +6006,7 @@ } } }, - "revision": "20241010", + "revision": "20241020", "rootUrl": "https://discoveryengine.googleapis.com/", "schemas": { "GoogleApiHttpBody": { @@ -6155,6 +6155,12 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1AdvancedSiteSearchConfig": { + "description": "Configuration data for advance site search.", + "id": "GoogleCloudDiscoveryengineV1AdvancedSiteSearchConfig", + "properties": {}, + "type": "object" + }, "GoogleCloudDiscoveryengineV1AlloyDbSource": { "description": "AlloyDB source import data from.", "id": "GoogleCloudDiscoveryengineV1AlloyDbSource", @@ -7031,7 +7037,7 @@ "description": "Properties of the object.", "type": "any" }, - "description": "Data representation. The structured JSON data for the document. It's populated from the struct data from the Document, or the Chunk in search result. .", + "description": "Data representation. The structured JSON data for the document. It's populated from the struct data from the Document, or the Chunk in search result.", "type": "object" }, "title": { @@ -7191,7 +7197,7 @@ "id": "GoogleCloudDiscoveryengineV1BatchGetDocumentsMetadataResponseDocumentMetadataMatcherValue", "properties": { "fhirResource": { - "description": "Required. Format: projects/{project}/locations/{location}/datasets/{dataset}/fhirStores/{fhir_store}/fhir/{resource_type}/{fhir_resource_id}", + "description": "Format: projects/{project}/locations/{location}/datasets/{dataset}/fhirStores/{fhir_store}/fhir/{resource_type}/{fhir_resource_id}", "type": "string" }, "uri": { @@ -7394,7 +7400,7 @@ "id": "GoogleCloudDiscoveryengineV1CheckGroundingRequest", "properties": { "answerCandidate": { - "description": "Answer candidate to check. Can have a maximum length of 1024 characters.", + "description": "Answer candidate to check. It can have a maximum length of 4096 tokens.", "type": "string" }, "facts": { @@ -7425,7 +7431,7 @@ "citedChunks": { "description": "List of facts cited across all claims in the answer candidate. These are derived from the facts supplied in the request.", "items": { - "$ref": "GoogleCloudDiscoveryengineV1FactChunk" + "$ref": "GoogleCloudDiscoveryengineV1CheckGroundingResponseFactChunk" }, "type": "array" }, @@ -7477,6 +7483,21 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1CheckGroundingResponseFactChunk": { + "description": "Fact chunk for grounding check.", + "id": "GoogleCloudDiscoveryengineV1CheckGroundingResponseFactChunk", + "properties": { + "chunkText": { + "description": "Text content of the fact chunk. Can be at most 10K characters long.", + "type": "string" + }, + "source": { + "description": "Source from which this fact chunk was retrieved. For a fact chunk retrieved from inline facts, this field will contain the index of the specific fact from which this chunk was retrieved.", + "type": "string" + } + }, + "type": "object" + }, "GoogleCloudDiscoveryengineV1CheckGroundingSpec": { "description": "Specification for the grounding check.", "id": "GoogleCloudDiscoveryengineV1CheckGroundingSpec", @@ -7785,8 +7806,12 @@ }, "type": "array" }, + "queryRegex": { + "description": "Optional. Query regex to match the whole search query. Cannot be set when Condition.query_terms is set. This is currently supporting promotion use case.", + "type": "string" + }, "queryTerms": { - "description": "Search only A list of terms to match the query on. Maximum of 10 query terms.", + "description": "Search only A list of terms to match the query on. Cannot be set when Condition.query_regex is set. Maximum of 10 query terms.", "items": { "$ref": "GoogleCloudDiscoveryengineV1ConditionQueryTerm" }, @@ -8230,7 +8255,7 @@ "properties": { "createTime": { "deprecated": true, - "description": "Timestamp the Model was created at.", + "description": "Deprecated: Timestamp the Model was created at.", "format": "google-datetime", "type": "string" }, @@ -8295,6 +8320,10 @@ "description": "DataStore captures global settings and configs at the DataStore level.", "id": "GoogleCloudDiscoveryengineV1DataStore", "properties": { + "advancedSiteSearchConfig": { + "$ref": "GoogleCloudDiscoveryengineV1AdvancedSiteSearchConfig", + "description": "Optional. Configuration for advanced site search." + }, "billingEstimation": { "$ref": "GoogleCloudDiscoveryengineV1DataStoreBillingEstimation", "description": "Output only. Data size estimation for billing.", @@ -8367,7 +8396,7 @@ "type": "string" }, "servingConfigDataStore": { - "$ref": "GoogleCloudDiscoveryengineV1ServingConfigDataStore", + "$ref": "GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore", "description": "Optional. Stores serving config at DataStore level." }, "solutionTypes": { @@ -8439,6 +8468,17 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore": { + "description": "Stores information regarding the serving configurations at DataStore level.", + "id": "GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore", + "properties": { + "disabledForServing": { + "description": "If set true, the DataStore will not be available for serving search requests.", + "type": "boolean" + } + }, + "type": "object" + }, "GoogleCloudDiscoveryengineV1DeleteDataStoreMetadata": { "description": "Metadata related to the progress of the DataStoreService.DeleteDataStore operation. This will be returned by the google.longrunning.Operation.metadata field.", "id": "GoogleCloudDiscoveryengineV1DeleteDataStoreMetadata", @@ -8987,33 +9027,6 @@ }, "type": "object" }, - "GoogleCloudDiscoveryengineV1FactChunk": { - "description": "Fact Chunk.", - "id": "GoogleCloudDiscoveryengineV1FactChunk", - "properties": { - "chunkText": { - "description": "Text content of the fact chunk. Can be at most 10K characters long.", - "type": "string" - }, - "index": { - "description": "The index of this chunk. Currently, only used for the streaming mode.", - "format": "int32", - "type": "integer" - }, - "source": { - "description": "Source from which this fact chunk was retrieved. If it was retrieved from the GroundingFacts provided in the request then this field will contain the index of the specific fact from which this chunk was retrieved.", - "type": "string" - }, - "sourceMetadata": { - "additionalProperties": { - "type": "string" - }, - "description": "More fine-grained information for the source reference.", - "type": "object" - } - }, - "type": "object" - }, "GoogleCloudDiscoveryengineV1FetchDomainVerificationStatusResponse": { "description": "Response message for SiteSearchEngineService.FetchDomainVerificationStatus method.", "id": "GoogleCloudDiscoveryengineV1FetchDomainVerificationStatusResponse", @@ -11220,17 +11233,6 @@ }, "type": "object" }, - "GoogleCloudDiscoveryengineV1ServingConfigDataStore": { - "description": "Stores information regarding the serving configurations at DataStore level.", - "id": "GoogleCloudDiscoveryengineV1ServingConfigDataStore", - "properties": { - "disabledForServing": { - "description": "If set true, the DataStore will not be available for serving search requests.", - "type": "boolean" - } - }, - "type": "object" - }, "GoogleCloudDiscoveryengineV1Session": { "description": "External session proto definition.", "id": "GoogleCloudDiscoveryengineV1Session", @@ -11856,6 +11858,21 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig": { + "description": "Configuration data for advance site search.", + "id": "GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig", + "properties": { + "disableAutomaticRefresh": { + "description": "If set true, automatic refresh is disabled for the DataStore.", + "type": "boolean" + }, + "disableInitialIndex": { + "description": "If set true, initial indexing is disabled for the DataStore.", + "type": "boolean" + } + }, + "type": "object" + }, "GoogleCloudDiscoveryengineV1alphaAnswer": { "description": "Defines an answer.", "id": "GoogleCloudDiscoveryengineV1alphaAnswer", @@ -12280,7 +12297,7 @@ "description": "Properties of the object.", "type": "any" }, - "description": "Data representation. The structured JSON data for the document. It's populated from the struct data from the Document, or the Chunk in search result. .", + "description": "Data representation. The structured JSON data for the document. It's populated from the struct data from the Document, or the Chunk in search result.", "type": "object" }, "title": { @@ -12435,8 +12452,12 @@ }, "type": "array" }, + "queryRegex": { + "description": "Optional. Query regex to match the whole search query. Cannot be set when Condition.query_terms is set. This is currently supporting promotion use case.", + "type": "string" + }, "queryTerms": { - "description": "Search only A list of terms to match the query on. Maximum of 10 query terms.", + "description": "Search only A list of terms to match the query on. Cannot be set when Condition.query_regex is set. Maximum of 10 query terms.", "items": { "$ref": "GoogleCloudDiscoveryengineV1alphaConditionQueryTerm" }, @@ -12709,7 +12730,7 @@ "properties": { "createTime": { "deprecated": true, - "description": "Timestamp the Model was created at.", + "description": "Deprecated: Timestamp the Model was created at.", "format": "google-datetime", "type": "string" }, @@ -12778,6 +12799,10 @@ "description": "Immutable. Whether data in the DataStore has ACL information. If set to `true`, the source data must have ACL. ACL will be ingested when data is ingested by DocumentService.ImportDocuments methods. When ACL is enabled for the DataStore, Document can't be accessed by calling DocumentService.GetDocument or DocumentService.ListDocuments. Currently ACL is only supported in `GENERIC` industry vertical with non-`PUBLIC_WEBSITE` content config.", "type": "boolean" }, + "advancedSiteSearchConfig": { + "$ref": "GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig", + "description": "Optional. Configuration for advanced site search." + }, "billingEstimation": { "$ref": "GoogleCloudDiscoveryengineV1alphaDataStoreBillingEstimation", "description": "Output only. Data size estimation for billing.", @@ -12863,7 +12888,7 @@ "description": "Optional. Configuration for Natural Language Query Understanding." }, "servingConfigDataStore": { - "$ref": "GoogleCloudDiscoveryengineV1alphaServingConfigDataStore", + "$ref": "GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore", "description": "Optional. Stores serving config at DataStore level." }, "solutionTypes": { @@ -12935,6 +12960,17 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore": { + "description": "Stores information regarding the serving configurations at DataStore level.", + "id": "GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore", + "properties": { + "disabledForServing": { + "description": "If set true, the DataStore will not be available for serving search requests.", + "type": "boolean" + } + }, + "type": "object" + }, "GoogleCloudDiscoveryengineV1alphaDeleteDataStoreMetadata": { "description": "Metadata related to the progress of the DataStoreService.DeleteDataStore operation. This will be returned by the google.longrunning.Operation.metadata field.", "id": "GoogleCloudDiscoveryengineV1alphaDeleteDataStoreMetadata", @@ -14444,12 +14480,17 @@ "type": "string" }, "invalidUris": { - "description": "Unique URIs in the request that don't match any TargetSite in the DataStore, only match TargetSites that haven't been fully indexed, or match a TargetSite with type EXCLUDE.", + "description": "Unique URIs in the request that have invalid format. Sample limited to 1000.", "items": { "type": "string" }, "type": "array" }, + "invalidUrisCount": { + "description": "Total number of unique URIs in the request that have invalid format.", + "format": "int32", + "type": "integer" + }, "pendingCount": { "description": "Total number of URIs that have yet to be crawled.", "format": "int32", @@ -14470,6 +14511,18 @@ "format": "google-datetime", "type": "string" }, + "urisNotMatchingTargetSites": { + "description": "Unique URIs in the request that don't match any TargetSite in the DataStore, only match TargetSites that haven't been fully indexed, or match a TargetSite with type EXCLUDE. Sample limited to 1000.", + "items": { + "type": "string" + }, + "type": "array" + }, + "urisNotMatchingTargetSitesCount": { + "description": "Total number of URIs that don't match any TargetSites.", + "format": "int32", + "type": "integer" + }, "validUrisCount": { "description": "Total number of unique URIs in the request that are not in invalid_uris.", "format": "int32", @@ -15277,17 +15330,6 @@ }, "type": "object" }, - "GoogleCloudDiscoveryengineV1alphaServingConfigDataStore": { - "description": "Stores information regarding the serving configurations at DataStore level.", - "id": "GoogleCloudDiscoveryengineV1alphaServingConfigDataStore", - "properties": { - "disabledForServing": { - "description": "If set true, the DataStore will not be available for serving search requests.", - "type": "boolean" - } - }, - "type": "object" - }, "GoogleCloudDiscoveryengineV1alphaSession": { "description": "External session proto definition.", "id": "GoogleCloudDiscoveryengineV1alphaSession", @@ -15679,6 +15721,12 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1betaAdvancedSiteSearchConfig": { + "description": "Configuration data for advance site search.", + "id": "GoogleCloudDiscoveryengineV1betaAdvancedSiteSearchConfig", + "properties": {}, + "type": "object" + }, "GoogleCloudDiscoveryengineV1betaBatchCreateTargetSiteMetadata": { "description": "Metadata related to the progress of the SiteSearchEngineService.BatchCreateTargetSites operation. This will be returned by the google.longrunning.Operation.metadata field.", "id": "GoogleCloudDiscoveryengineV1betaBatchCreateTargetSiteMetadata", @@ -15774,8 +15822,12 @@ }, "type": "array" }, + "queryRegex": { + "description": "Optional. Query regex to match the whole search query. Cannot be set when Condition.query_terms is set. This is currently supporting promotion use case.", + "type": "string" + }, "queryTerms": { - "description": "Search only A list of terms to match the query on. Maximum of 10 query terms.", + "description": "Search only A list of terms to match the query on. Cannot be set when Condition.query_regex is set. Maximum of 10 query terms.", "items": { "$ref": "GoogleCloudDiscoveryengineV1betaConditionQueryTerm" }, @@ -16037,7 +16089,7 @@ "properties": { "createTime": { "deprecated": true, - "description": "Timestamp the Model was created at.", + "description": "Deprecated: Timestamp the Model was created at.", "format": "google-datetime", "type": "string" }, @@ -16102,6 +16154,10 @@ "description": "DataStore captures global settings and configs at the DataStore level.", "id": "GoogleCloudDiscoveryengineV1betaDataStore", "properties": { + "advancedSiteSearchConfig": { + "$ref": "GoogleCloudDiscoveryengineV1betaAdvancedSiteSearchConfig", + "description": "Optional. Configuration for advanced site search." + }, "billingEstimation": { "$ref": "GoogleCloudDiscoveryengineV1betaDataStoreBillingEstimation", "description": "Output only. Data size estimation for billing.", @@ -16182,7 +16238,7 @@ "description": "Optional. Configuration for Natural Language Query Understanding." }, "servingConfigDataStore": { - "$ref": "GoogleCloudDiscoveryengineV1betaServingConfigDataStore", + "$ref": "GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore", "description": "Optional. Stores serving config at DataStore level." }, "solutionTypes": { @@ -16254,6 +16310,17 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore": { + "description": "Stores information regarding the serving configurations at DataStore level.", + "id": "GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore", + "properties": { + "disabledForServing": { + "description": "If set true, the DataStore will not be available for serving search requests.", + "type": "boolean" + } + }, + "type": "object" + }, "GoogleCloudDiscoveryengineV1betaDeleteDataStoreMetadata": { "description": "Metadata related to the progress of the DataStoreService.DeleteDataStore operation. This will be returned by the google.longrunning.Operation.metadata field.", "id": "GoogleCloudDiscoveryengineV1betaDeleteDataStoreMetadata", @@ -18029,17 +18096,6 @@ }, "type": "object" }, - "GoogleCloudDiscoveryengineV1betaServingConfigDataStore": { - "description": "Stores information regarding the serving configurations at DataStore level.", - "id": "GoogleCloudDiscoveryengineV1betaServingConfigDataStore", - "properties": { - "disabledForServing": { - "description": "If set true, the DataStore will not be available for serving search requests.", - "type": "boolean" - } - }, - "type": "object" - }, "GoogleCloudDiscoveryengineV1betaSiteVerificationInfo": { "description": "Verification information for target sites in advanced site search.", "id": "GoogleCloudDiscoveryengineV1betaSiteVerificationInfo", diff --git a/discoveryengine/v1/discoveryengine-gen.go b/discoveryengine/v1/discoveryengine-gen.go index 6be2510ad4d..c9d2b55108c 100644 --- a/discoveryengine/v1/discoveryengine-gen.go +++ b/discoveryengine/v1/discoveryengine-gen.go @@ -1099,6 +1099,11 @@ func (s GoogleCloudDiscoveryengineLoggingSourceLocation) MarshalJSON() ([]byte, return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1AdvancedSiteSearchConfig: Configuration data for +// advance site search. +type GoogleCloudDiscoveryengineV1AdvancedSiteSearchConfig struct { +} + // GoogleCloudDiscoveryengineV1AlloyDbSource: AlloyDB source import data from. type GoogleCloudDiscoveryengineV1AlloyDbSource struct { // ClusterId: Required. The AlloyDB cluster to copy the data from with a length @@ -2267,7 +2272,7 @@ type GoogleCloudDiscoveryengineV1AnswerStepActionObservationSearchResult struct SnippetInfo []*GoogleCloudDiscoveryengineV1AnswerStepActionObservationSearchResultSnippetInfo `json:"snippetInfo,omitempty"` // StructData: Data representation. The structured JSON data for the document. // It's populated from the struct data from the Document, or the Chunk in - // search result. . + // search result. StructData googleapi.RawMessage `json:"structData,omitempty"` // Title: Title. Title string `json:"title,omitempty"` @@ -2526,7 +2531,7 @@ func (s GoogleCloudDiscoveryengineV1BatchGetDocumentsMetadataResponseDocumentMet // GoogleCloudDiscoveryengineV1BatchGetDocumentsMetadataResponseDocumentMetadata // MatcherValue: The value of the matcher that was used to match the Document. type GoogleCloudDiscoveryengineV1BatchGetDocumentsMetadataResponseDocumentMetadataMatcherValue struct { - // FhirResource: Required. Format: + // FhirResource: Format: // projects/{project}/locations/{location}/datasets/{dataset}/fhirStores/{fhir_s // tore}/fhir/{resource_type}/{fhir_resource_id} FhirResource string `json:"fhirResource,omitempty"` @@ -2778,8 +2783,8 @@ func (s GoogleCloudDiscoveryengineV1BigtableSource) MarshalJSON() ([]byte, error // GoogleCloudDiscoveryengineV1CheckGroundingRequest: Request message for // GroundedGenerationService.CheckGrounding method. type GoogleCloudDiscoveryengineV1CheckGroundingRequest struct { - // AnswerCandidate: Answer candidate to check. Can have a maximum length of - // 1024 characters. + // AnswerCandidate: Answer candidate to check. It can have a maximum length of + // 4096 tokens. AnswerCandidate string `json:"answerCandidate,omitempty"` // Facts: List of facts for the grounding check. We support up to 200 facts. Facts []*GoogleCloudDiscoveryengineV1GroundingFact `json:"facts,omitempty"` @@ -2821,7 +2826,7 @@ func (s GoogleCloudDiscoveryengineV1CheckGroundingRequest) MarshalJSON() ([]byte type GoogleCloudDiscoveryengineV1CheckGroundingResponse struct { // CitedChunks: List of facts cited across all claims in the answer candidate. // These are derived from the facts supplied in the request. - CitedChunks []*GoogleCloudDiscoveryengineV1FactChunk `json:"citedChunks,omitempty"` + CitedChunks []*GoogleCloudDiscoveryengineV1CheckGroundingResponseFactChunk `json:"citedChunks,omitempty"` // Claims: Claim texts and citation info across all claims in the answer // candidate. Claims []*GoogleCloudDiscoveryengineV1CheckGroundingResponseClaim `json:"claims,omitempty"` @@ -2906,6 +2911,34 @@ func (s GoogleCloudDiscoveryengineV1CheckGroundingResponseClaim) MarshalJSON() ( return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1CheckGroundingResponseFactChunk: Fact chunk for +// grounding check. +type GoogleCloudDiscoveryengineV1CheckGroundingResponseFactChunk struct { + // ChunkText: Text content of the fact chunk. Can be at most 10K characters + // long. + ChunkText string `json:"chunkText,omitempty"` + // Source: Source from which this fact chunk was retrieved. For a fact chunk + // retrieved from inline facts, this field will contain the index of the + // specific fact from which this chunk was retrieved. + Source string `json:"source,omitempty"` + // ForceSendFields is a list of field names (e.g. "ChunkText") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "ChunkText") to include in API + // requests with the JSON null value. By default, fields with empty values are + // omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s GoogleCloudDiscoveryengineV1CheckGroundingResponseFactChunk) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1CheckGroundingResponseFactChunk + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1CheckGroundingSpec: Specification for the // grounding check. type GoogleCloudDiscoveryengineV1CheckGroundingSpec struct { @@ -3328,8 +3361,12 @@ type GoogleCloudDiscoveryengineV1Condition struct { // ActiveTimeRange: Range of time(s) specifying when condition is active. // Maximum of 10 time ranges. ActiveTimeRange []*GoogleCloudDiscoveryengineV1ConditionTimeRange `json:"activeTimeRange,omitempty"` - // QueryTerms: Search only A list of terms to match the query on. Maximum of 10 - // query terms. + // QueryRegex: Optional. Query regex to match the whole search query. Cannot be + // set when Condition.query_terms is set. This is currently supporting + // promotion use case. + QueryRegex string `json:"queryRegex,omitempty"` + // QueryTerms: Search only A list of terms to match the query on. Cannot be set + // when Condition.query_regex is set. Maximum of 10 query terms. QueryTerms []*GoogleCloudDiscoveryengineV1ConditionQueryTerm `json:"queryTerms,omitempty"` // ForceSendFields is a list of field names (e.g. "ActiveTimeRange") to // unconditionally include in API requests. By default, fields with empty or @@ -3987,7 +4024,7 @@ func (s *GoogleCloudDiscoveryengineV1CustomAttribute) UnmarshalJSON(data []byte) // GoogleCloudDiscoveryengineV1CustomTuningModel: Metadata that describes a // custom tuned model. type GoogleCloudDiscoveryengineV1CustomTuningModel struct { - // CreateTime: Timestamp the Model was created at. + // CreateTime: Deprecated: Timestamp the Model was created at. CreateTime string `json:"createTime,omitempty"` // DisplayName: The display name of the model. DisplayName string `json:"displayName,omitempty"` @@ -4041,6 +4078,8 @@ func (s GoogleCloudDiscoveryengineV1CustomTuningModel) MarshalJSON() ([]byte, er // GoogleCloudDiscoveryengineV1DataStore: DataStore captures global settings // and configs at the DataStore level. type GoogleCloudDiscoveryengineV1DataStore struct { + // AdvancedSiteSearchConfig: Optional. Configuration for advanced site search. + AdvancedSiteSearchConfig *GoogleCloudDiscoveryengineV1AdvancedSiteSearchConfig `json:"advancedSiteSearchConfig,omitempty"` // BillingEstimation: Output only. Data size estimation for billing. BillingEstimation *GoogleCloudDiscoveryengineV1DataStoreBillingEstimation `json:"billingEstimation,omitempty"` // CmekConfig: Output only. CMEK-related information for the DataStore. @@ -4090,7 +4129,7 @@ type GoogleCloudDiscoveryengineV1DataStore struct { // limit of 1024 characters. Name string `json:"name,omitempty"` // ServingConfigDataStore: Optional. Stores serving config at DataStore level. - ServingConfigDataStore *GoogleCloudDiscoveryengineV1ServingConfigDataStore `json:"servingConfigDataStore,omitempty"` + ServingConfigDataStore *GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore `json:"servingConfigDataStore,omitempty"` // SolutionTypes: The solutions that the data store enrolls. Available // solutions for each industry_vertical: * `MEDIA`: // `SOLUTION_TYPE_RECOMMENDATION` and `SOLUTION_TYPE_SEARCH`. * `SITE_SEARCH`: @@ -4123,15 +4162,15 @@ type GoogleCloudDiscoveryengineV1DataStore struct { // ServerResponse contains the HTTP response code and headers from the server. googleapi.ServerResponse `json:"-"` - // ForceSendFields is a list of field names (e.g. "BillingEstimation") to - // unconditionally include in API requests. By default, fields with empty or + // ForceSendFields is a list of field names (e.g. "AdvancedSiteSearchConfig") + // to unconditionally include in API requests. By default, fields with empty or // default values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more // details. ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "BillingEstimation") to include in - // API requests with the JSON null value. By default, fields with empty values - // are omitted from API requests. See + // NullFields is a list of field names (e.g. "AdvancedSiteSearchConfig") to + // include in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. NullFields []string `json:"-"` } @@ -4174,6 +4213,30 @@ func (s GoogleCloudDiscoveryengineV1DataStoreBillingEstimation) MarshalJSON() ([ return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore: Stores +// information regarding the serving configurations at DataStore level. +type GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore struct { + // DisabledForServing: If set true, the DataStore will not be available for + // serving search requests. + DisabledForServing bool `json:"disabledForServing,omitempty"` + // ForceSendFields is a list of field names (e.g. "DisabledForServing") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "DisabledForServing") to include + // in API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1DeleteDataStoreMetadata: Metadata related to the // progress of the DataStoreService.DeleteDataStore operation. This will be // returned by the google.longrunning.Operation.metadata field. @@ -4935,37 +4998,6 @@ func (s GoogleCloudDiscoveryengineV1EngineSearchEngineConfig) MarshalJSON() ([]b return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// GoogleCloudDiscoveryengineV1FactChunk: Fact Chunk. -type GoogleCloudDiscoveryengineV1FactChunk struct { - // ChunkText: Text content of the fact chunk. Can be at most 10K characters - // long. - ChunkText string `json:"chunkText,omitempty"` - // Index: The index of this chunk. Currently, only used for the streaming mode. - Index int64 `json:"index,omitempty"` - // Source: Source from which this fact chunk was retrieved. If it was retrieved - // from the GroundingFacts provided in the request then this field will contain - // the index of the specific fact from which this chunk was retrieved. - Source string `json:"source,omitempty"` - // SourceMetadata: More fine-grained information for the source reference. - SourceMetadata map[string]string `json:"sourceMetadata,omitempty"` - // ForceSendFields is a list of field names (e.g. "ChunkText") to - // unconditionally include in API requests. By default, fields with empty or - // default values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more - // details. - ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "ChunkText") to include in API - // requests with the JSON null value. By default, fields with empty values are - // omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. - NullFields []string `json:"-"` -} - -func (s GoogleCloudDiscoveryengineV1FactChunk) MarshalJSON() ([]byte, error) { - type NoMethod GoogleCloudDiscoveryengineV1FactChunk - return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) -} - // GoogleCloudDiscoveryengineV1FetchDomainVerificationStatusResponse: Response // message for SiteSearchEngineService.FetchDomainVerificationStatus method. type GoogleCloudDiscoveryengineV1FetchDomainVerificationStatusResponse struct { @@ -8386,30 +8418,6 @@ func (s GoogleCloudDiscoveryengineV1SearchResponseSummarySummaryWithMetadata) Ma return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// GoogleCloudDiscoveryengineV1ServingConfigDataStore: Stores information -// regarding the serving configurations at DataStore level. -type GoogleCloudDiscoveryengineV1ServingConfigDataStore struct { - // DisabledForServing: If set true, the DataStore will not be available for - // serving search requests. - DisabledForServing bool `json:"disabledForServing,omitempty"` - // ForceSendFields is a list of field names (e.g. "DisabledForServing") to - // unconditionally include in API requests. By default, fields with empty or - // default values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more - // details. - ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "DisabledForServing") to include - // in API requests with the JSON null value. By default, fields with empty - // values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. - NullFields []string `json:"-"` -} - -func (s GoogleCloudDiscoveryengineV1ServingConfigDataStore) MarshalJSON() ([]byte, error) { - type NoMethod GoogleCloudDiscoveryengineV1ServingConfigDataStore - return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) -} - // GoogleCloudDiscoveryengineV1Session: External session proto definition. type GoogleCloudDiscoveryengineV1Session struct { // EndTime: Output only. The time the session finished. @@ -9297,6 +9305,33 @@ func (s GoogleCloudDiscoveryengineV1alphaAclConfig) MarshalJSON() ([]byte, error return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig: Configuration +// data for advance site search. +type GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig struct { + // DisableAutomaticRefresh: If set true, automatic refresh is disabled for the + // DataStore. + DisableAutomaticRefresh bool `json:"disableAutomaticRefresh,omitempty"` + // DisableInitialIndex: If set true, initial indexing is disabled for the + // DataStore. + DisableInitialIndex bool `json:"disableInitialIndex,omitempty"` + // ForceSendFields is a list of field names (e.g. "DisableAutomaticRefresh") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "DisableAutomaticRefresh") to + // include in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1alphaAnswer: Defines an answer. type GoogleCloudDiscoveryengineV1alphaAnswer struct { // AnswerSkippedReasons: Additional answer-skipped reasons. This provides the @@ -9777,7 +9812,7 @@ type GoogleCloudDiscoveryengineV1alphaAnswerStepActionObservationSearchResult st SnippetInfo []*GoogleCloudDiscoveryengineV1alphaAnswerStepActionObservationSearchResultSnippetInfo `json:"snippetInfo,omitempty"` // StructData: Data representation. The structured JSON data for the document. // It's populated from the struct data from the Document, or the Chunk in - // search result. . + // search result. StructData googleapi.RawMessage `json:"structData,omitempty"` // Title: Title. Title string `json:"title,omitempty"` @@ -10000,8 +10035,12 @@ type GoogleCloudDiscoveryengineV1alphaCondition struct { // ActiveTimeRange: Range of time(s) specifying when condition is active. // Maximum of 10 time ranges. ActiveTimeRange []*GoogleCloudDiscoveryengineV1alphaConditionTimeRange `json:"activeTimeRange,omitempty"` - // QueryTerms: Search only A list of terms to match the query on. Maximum of 10 - // query terms. + // QueryRegex: Optional. Query regex to match the whole search query. Cannot be + // set when Condition.query_terms is set. This is currently supporting + // promotion use case. + QueryRegex string `json:"queryRegex,omitempty"` + // QueryTerms: Search only A list of terms to match the query on. Cannot be set + // when Condition.query_regex is set. Maximum of 10 query terms. QueryTerms []*GoogleCloudDiscoveryengineV1alphaConditionQueryTerm `json:"queryTerms,omitempty"` // ForceSendFields is a list of field names (e.g. "ActiveTimeRange") to // unconditionally include in API requests. By default, fields with empty or @@ -10413,7 +10452,7 @@ func (s GoogleCloudDiscoveryengineV1alphaCustomFineTuningSpec) MarshalJSON() ([] // GoogleCloudDiscoveryengineV1alphaCustomTuningModel: Metadata that describes // a custom tuned model. type GoogleCloudDiscoveryengineV1alphaCustomTuningModel struct { - // CreateTime: Timestamp the Model was created at. + // CreateTime: Deprecated: Timestamp the Model was created at. CreateTime string `json:"createTime,omitempty"` // DisplayName: The display name of the model. DisplayName string `json:"displayName,omitempty"` @@ -10475,6 +10514,8 @@ type GoogleCloudDiscoveryengineV1alphaDataStore struct { // is only supported in `GENERIC` industry vertical with non-`PUBLIC_WEBSITE` // content config. AclEnabled bool `json:"aclEnabled,omitempty"` + // AdvancedSiteSearchConfig: Optional. Configuration for advanced site search. + AdvancedSiteSearchConfig *GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig `json:"advancedSiteSearchConfig,omitempty"` // BillingEstimation: Output only. Data size estimation for billing. BillingEstimation *GoogleCloudDiscoveryengineV1alphaDataStoreBillingEstimation `json:"billingEstimation,omitempty"` // CmekConfig: Output only. CMEK-related information for the DataStore. @@ -10531,7 +10572,7 @@ type GoogleCloudDiscoveryengineV1alphaDataStore struct { // Language Query Understanding. NaturalLanguageQueryUnderstandingConfig *GoogleCloudDiscoveryengineV1alphaNaturalLanguageQueryUnderstandingConfig `json:"naturalLanguageQueryUnderstandingConfig,omitempty"` // ServingConfigDataStore: Optional. Stores serving config at DataStore level. - ServingConfigDataStore *GoogleCloudDiscoveryengineV1alphaServingConfigDataStore `json:"servingConfigDataStore,omitempty"` + ServingConfigDataStore *GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore `json:"servingConfigDataStore,omitempty"` // SolutionTypes: The solutions that the data store enrolls. Available // solutions for each industry_vertical: * `MEDIA`: // `SOLUTION_TYPE_RECOMMENDATION` and `SOLUTION_TYPE_SEARCH`. * `SITE_SEARCH`: @@ -10612,6 +10653,30 @@ func (s GoogleCloudDiscoveryengineV1alphaDataStoreBillingEstimation) MarshalJSON return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore: Stores +// information regarding the serving configurations at DataStore level. +type GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore struct { + // DisabledForServing: If set true, the DataStore will not be available for + // serving search requests. + DisabledForServing bool `json:"disabledForServing,omitempty"` + // ForceSendFields is a list of field names (e.g. "DisabledForServing") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "DisabledForServing") to include + // in API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1alphaDeleteDataStoreMetadata: Metadata related // to the progress of the DataStoreService.DeleteDataStore operation. This will // be returned by the google.longrunning.Operation.metadata field. @@ -12670,10 +12735,12 @@ func (s GoogleCloudDiscoveryengineV1alphaQuery) MarshalJSON() ([]byte, error) { type GoogleCloudDiscoveryengineV1alphaRecrawlUrisMetadata struct { // CreateTime: Operation create time. CreateTime string `json:"createTime,omitempty"` - // InvalidUris: Unique URIs in the request that don't match any TargetSite in - // the DataStore, only match TargetSites that haven't been fully indexed, or - // match a TargetSite with type EXCLUDE. + // InvalidUris: Unique URIs in the request that have invalid format. Sample + // limited to 1000. InvalidUris []string `json:"invalidUris,omitempty"` + // InvalidUrisCount: Total number of unique URIs in the request that have + // invalid format. + InvalidUrisCount int64 `json:"invalidUrisCount,omitempty"` // PendingCount: Total number of URIs that have yet to be crawled. PendingCount int64 `json:"pendingCount,omitempty"` // QuotaExceededCount: Total number of URIs that were rejected due to @@ -12684,6 +12751,13 @@ type GoogleCloudDiscoveryengineV1alphaRecrawlUrisMetadata struct { // UpdateTime: Operation last update time. If the operation is done, this is // also the finish time. UpdateTime string `json:"updateTime,omitempty"` + // UrisNotMatchingTargetSites: Unique URIs in the request that don't match any + // TargetSite in the DataStore, only match TargetSites that haven't been fully + // indexed, or match a TargetSite with type EXCLUDE. Sample limited to 1000. + UrisNotMatchingTargetSites []string `json:"urisNotMatchingTargetSites,omitempty"` + // UrisNotMatchingTargetSitesCount: Total number of URIs that don't match any + // TargetSites. + UrisNotMatchingTargetSitesCount int64 `json:"urisNotMatchingTargetSitesCount,omitempty"` // ValidUrisCount: Total number of unique URIs in the request that are not in // invalid_uris. ValidUrisCount int64 `json:"validUrisCount,omitempty"` @@ -13994,30 +14068,6 @@ func (s GoogleCloudDiscoveryengineV1alphaSearchRequestSpellCorrectionSpec) Marsh return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// GoogleCloudDiscoveryengineV1alphaServingConfigDataStore: Stores information -// regarding the serving configurations at DataStore level. -type GoogleCloudDiscoveryengineV1alphaServingConfigDataStore struct { - // DisabledForServing: If set true, the DataStore will not be available for - // serving search requests. - DisabledForServing bool `json:"disabledForServing,omitempty"` - // ForceSendFields is a list of field names (e.g. "DisabledForServing") to - // unconditionally include in API requests. By default, fields with empty or - // default values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more - // details. - ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "DisabledForServing") to include - // in API requests with the JSON null value. By default, fields with empty - // values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. - NullFields []string `json:"-"` -} - -func (s GoogleCloudDiscoveryengineV1alphaServingConfigDataStore) MarshalJSON() ([]byte, error) { - type NoMethod GoogleCloudDiscoveryengineV1alphaServingConfigDataStore - return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) -} - // GoogleCloudDiscoveryengineV1alphaSession: External session proto definition. type GoogleCloudDiscoveryengineV1alphaSession struct { // EndTime: Output only. The time the session finished. @@ -14520,6 +14570,11 @@ func (s GoogleCloudDiscoveryengineV1alphaWorkspaceConfig) MarshalJSON() ([]byte, return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1betaAdvancedSiteSearchConfig: Configuration data +// for advance site search. +type GoogleCloudDiscoveryengineV1betaAdvancedSiteSearchConfig struct { +} + // GoogleCloudDiscoveryengineV1betaBatchCreateTargetSiteMetadata: Metadata // related to the progress of the // SiteSearchEngineService.BatchCreateTargetSites operation. This will be @@ -14627,8 +14682,12 @@ type GoogleCloudDiscoveryengineV1betaCondition struct { // ActiveTimeRange: Range of time(s) specifying when condition is active. // Maximum of 10 time ranges. ActiveTimeRange []*GoogleCloudDiscoveryengineV1betaConditionTimeRange `json:"activeTimeRange,omitempty"` - // QueryTerms: Search only A list of terms to match the query on. Maximum of 10 - // query terms. + // QueryRegex: Optional. Query regex to match the whole search query. Cannot be + // set when Condition.query_terms is set. This is currently supporting + // promotion use case. + QueryRegex string `json:"queryRegex,omitempty"` + // QueryTerms: Search only A list of terms to match the query on. Cannot be set + // when Condition.query_regex is set. Maximum of 10 query terms. QueryTerms []*GoogleCloudDiscoveryengineV1betaConditionQueryTerm `json:"queryTerms,omitempty"` // ForceSendFields is a list of field names (e.g. "ActiveTimeRange") to // unconditionally include in API requests. By default, fields with empty or @@ -15016,7 +15075,7 @@ func (s GoogleCloudDiscoveryengineV1betaCreateTargetSiteMetadata) MarshalJSON() // GoogleCloudDiscoveryengineV1betaCustomTuningModel: Metadata that describes a // custom tuned model. type GoogleCloudDiscoveryengineV1betaCustomTuningModel struct { - // CreateTime: Timestamp the Model was created at. + // CreateTime: Deprecated: Timestamp the Model was created at. CreateTime string `json:"createTime,omitempty"` // DisplayName: The display name of the model. DisplayName string `json:"displayName,omitempty"` @@ -15070,6 +15129,8 @@ func (s GoogleCloudDiscoveryengineV1betaCustomTuningModel) MarshalJSON() ([]byte // GoogleCloudDiscoveryengineV1betaDataStore: DataStore captures global // settings and configs at the DataStore level. type GoogleCloudDiscoveryengineV1betaDataStore struct { + // AdvancedSiteSearchConfig: Optional. Configuration for advanced site search. + AdvancedSiteSearchConfig *GoogleCloudDiscoveryengineV1betaAdvancedSiteSearchConfig `json:"advancedSiteSearchConfig,omitempty"` // BillingEstimation: Output only. Data size estimation for billing. BillingEstimation *GoogleCloudDiscoveryengineV1betaDataStoreBillingEstimation `json:"billingEstimation,omitempty"` // CmekConfig: Output only. CMEK-related information for the DataStore. @@ -15124,7 +15185,7 @@ type GoogleCloudDiscoveryengineV1betaDataStore struct { // Language Query Understanding. NaturalLanguageQueryUnderstandingConfig *GoogleCloudDiscoveryengineV1betaNaturalLanguageQueryUnderstandingConfig `json:"naturalLanguageQueryUnderstandingConfig,omitempty"` // ServingConfigDataStore: Optional. Stores serving config at DataStore level. - ServingConfigDataStore *GoogleCloudDiscoveryengineV1betaServingConfigDataStore `json:"servingConfigDataStore,omitempty"` + ServingConfigDataStore *GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore `json:"servingConfigDataStore,omitempty"` // SolutionTypes: The solutions that the data store enrolls. Available // solutions for each industry_vertical: * `MEDIA`: // `SOLUTION_TYPE_RECOMMENDATION` and `SOLUTION_TYPE_SEARCH`. * `SITE_SEARCH`: @@ -15154,15 +15215,15 @@ type GoogleCloudDiscoveryengineV1betaDataStore struct { // data. This must be set when DataStore.content_config is set as // DataStore.ContentConfig.GOOGLE_WORKSPACE. WorkspaceConfig *GoogleCloudDiscoveryengineV1betaWorkspaceConfig `json:"workspaceConfig,omitempty"` - // ForceSendFields is a list of field names (e.g. "BillingEstimation") to - // unconditionally include in API requests. By default, fields with empty or + // ForceSendFields is a list of field names (e.g. "AdvancedSiteSearchConfig") + // to unconditionally include in API requests. By default, fields with empty or // default values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more // details. ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "BillingEstimation") to include in - // API requests with the JSON null value. By default, fields with empty values - // are omitted from API requests. See + // NullFields is a list of field names (e.g. "AdvancedSiteSearchConfig") to + // include in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. NullFields []string `json:"-"` } @@ -15205,6 +15266,30 @@ func (s GoogleCloudDiscoveryengineV1betaDataStoreBillingEstimation) MarshalJSON( return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore: Stores +// information regarding the serving configurations at DataStore level. +type GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore struct { + // DisabledForServing: If set true, the DataStore will not be available for + // serving search requests. + DisabledForServing bool `json:"disabledForServing,omitempty"` + // ForceSendFields is a list of field names (e.g. "DisabledForServing") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "DisabledForServing") to include + // in API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1betaDeleteDataStoreMetadata: Metadata related to // the progress of the DataStoreService.DeleteDataStore operation. This will be // returned by the google.longrunning.Operation.metadata field. @@ -17856,30 +17941,6 @@ func (s GoogleCloudDiscoveryengineV1betaSearchRequestSpellCorrectionSpec) Marsha return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// GoogleCloudDiscoveryengineV1betaServingConfigDataStore: Stores information -// regarding the serving configurations at DataStore level. -type GoogleCloudDiscoveryengineV1betaServingConfigDataStore struct { - // DisabledForServing: If set true, the DataStore will not be available for - // serving search requests. - DisabledForServing bool `json:"disabledForServing,omitempty"` - // ForceSendFields is a list of field names (e.g. "DisabledForServing") to - // unconditionally include in API requests. By default, fields with empty or - // default values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more - // details. - ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "DisabledForServing") to include - // in API requests with the JSON null value. By default, fields with empty - // values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. - NullFields []string `json:"-"` -} - -func (s GoogleCloudDiscoveryengineV1betaServingConfigDataStore) MarshalJSON() ([]byte, error) { - type NoMethod GoogleCloudDiscoveryengineV1betaServingConfigDataStore - return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) -} - // GoogleCloudDiscoveryengineV1betaSiteVerificationInfo: Verification // information for target sites in advanced site search. type GoogleCloudDiscoveryengineV1betaSiteVerificationInfo struct { diff --git a/discoveryengine/v1alpha/discoveryengine-api.json b/discoveryengine/v1alpha/discoveryengine-api.json index 723542c7d3e..7b1bf6134fe 100644 --- a/discoveryengine/v1alpha/discoveryengine-api.json +++ b/discoveryengine/v1alpha/discoveryengine-api.json @@ -7682,7 +7682,7 @@ } } }, - "revision": "20241010", + "revision": "20241020", "rootUrl": "https://discoveryengine.googleapis.com/", "schemas": { "GoogleApiDistribution": { @@ -8017,6 +8017,12 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1AdvancedSiteSearchConfig": { + "description": "Configuration data for advance site search.", + "id": "GoogleCloudDiscoveryengineV1AdvancedSiteSearchConfig", + "properties": {}, + "type": "object" + }, "GoogleCloudDiscoveryengineV1BatchCreateTargetSiteMetadata": { "description": "Metadata related to the progress of the SiteSearchEngineService.BatchCreateTargetSites operation. This will be returned by the google.longrunning.Operation.metadata field.", "id": "GoogleCloudDiscoveryengineV1BatchCreateTargetSiteMetadata", @@ -8112,8 +8118,12 @@ }, "type": "array" }, + "queryRegex": { + "description": "Optional. Query regex to match the whole search query. Cannot be set when Condition.query_terms is set. This is currently supporting promotion use case.", + "type": "string" + }, "queryTerms": { - "description": "Search only A list of terms to match the query on. Maximum of 10 query terms.", + "description": "Search only A list of terms to match the query on. Cannot be set when Condition.query_regex is set. Maximum of 10 query terms.", "items": { "$ref": "GoogleCloudDiscoveryengineV1ConditionQueryTerm" }, @@ -8367,6 +8377,10 @@ "description": "DataStore captures global settings and configs at the DataStore level.", "id": "GoogleCloudDiscoveryengineV1DataStore", "properties": { + "advancedSiteSearchConfig": { + "$ref": "GoogleCloudDiscoveryengineV1AdvancedSiteSearchConfig", + "description": "Optional. Configuration for advanced site search." + }, "billingEstimation": { "$ref": "GoogleCloudDiscoveryengineV1DataStoreBillingEstimation", "description": "Output only. Data size estimation for billing.", @@ -8439,7 +8453,7 @@ "type": "string" }, "servingConfigDataStore": { - "$ref": "GoogleCloudDiscoveryengineV1ServingConfigDataStore", + "$ref": "GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore", "description": "Optional. Stores serving config at DataStore level." }, "solutionTypes": { @@ -8511,6 +8525,17 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore": { + "description": "Stores information regarding the serving configurations at DataStore level.", + "id": "GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore", + "properties": { + "disabledForServing": { + "description": "If set true, the DataStore will not be available for serving search requests.", + "type": "boolean" + } + }, + "type": "object" + }, "GoogleCloudDiscoveryengineV1DeleteDataStoreMetadata": { "description": "Metadata related to the progress of the DataStoreService.DeleteDataStore operation. This will be returned by the google.longrunning.Operation.metadata field.", "id": "GoogleCloudDiscoveryengineV1DeleteDataStoreMetadata", @@ -9339,17 +9364,6 @@ }, "type": "object" }, - "GoogleCloudDiscoveryengineV1ServingConfigDataStore": { - "description": "Stores information regarding the serving configurations at DataStore level.", - "id": "GoogleCloudDiscoveryengineV1ServingConfigDataStore", - "properties": { - "disabledForServing": { - "description": "If set true, the DataStore will not be available for serving search requests.", - "type": "boolean" - } - }, - "type": "object" - }, "GoogleCloudDiscoveryengineV1SiteVerificationInfo": { "description": "Verification information for target sites in advanced site search.", "id": "GoogleCloudDiscoveryengineV1SiteVerificationInfo", @@ -9640,6 +9654,21 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig": { + "description": "Configuration data for advance site search.", + "id": "GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig", + "properties": { + "disableAutomaticRefresh": { + "description": "If set true, automatic refresh is disabled for the DataStore.", + "type": "boolean" + }, + "disableInitialIndex": { + "description": "If set true, initial indexing is disabled for the DataStore.", + "type": "boolean" + } + }, + "type": "object" + }, "GoogleCloudDiscoveryengineV1alphaAlloyDbSource": { "description": "AlloyDB source import data from.", "id": "GoogleCloudDiscoveryengineV1alphaAlloyDbSource", @@ -10524,7 +10553,7 @@ "description": "Properties of the object.", "type": "any" }, - "description": "Data representation. The structured JSON data for the document. It's populated from the struct data from the Document, or the Chunk in search result. .", + "description": "Data representation. The structured JSON data for the document. It's populated from the struct data from the Document, or the Chunk in search result.", "type": "object" }, "title": { @@ -10684,7 +10713,7 @@ "id": "GoogleCloudDiscoveryengineV1alphaBatchGetDocumentsMetadataResponseDocumentMetadataMatcherValue", "properties": { "fhirResource": { - "description": "Required. Format: projects/{project}/locations/{location}/datasets/{dataset}/fhirStores/{fhir_store}/fhir/{resource_type}/{fhir_resource_id}", + "description": "Format: projects/{project}/locations/{location}/datasets/{dataset}/fhirStores/{fhir_store}/fhir/{resource_type}/{fhir_resource_id}", "type": "string" }, "uri": { @@ -10887,7 +10916,7 @@ "id": "GoogleCloudDiscoveryengineV1alphaCheckGroundingRequest", "properties": { "answerCandidate": { - "description": "Answer candidate to check. Can have a maximum length of 1024 characters.", + "description": "Answer candidate to check. It can have a maximum length of 4096 tokens.", "type": "string" }, "facts": { @@ -10918,7 +10947,7 @@ "citedChunks": { "description": "List of facts cited across all claims in the answer candidate. These are derived from the facts supplied in the request.", "items": { - "$ref": "GoogleCloudDiscoveryengineV1alphaFactChunk" + "$ref": "GoogleCloudDiscoveryengineV1alphaCheckGroundingResponseFactChunk" }, "type": "array" }, @@ -10970,6 +10999,21 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1alphaCheckGroundingResponseFactChunk": { + "description": "Fact chunk for grounding check.", + "id": "GoogleCloudDiscoveryengineV1alphaCheckGroundingResponseFactChunk", + "properties": { + "chunkText": { + "description": "Text content of the fact chunk. Can be at most 10K characters long.", + "type": "string" + }, + "source": { + "description": "Source from which this fact chunk was retrieved. For a fact chunk retrieved from inline facts, this field will contain the index of the specific fact from which this chunk was retrieved.", + "type": "string" + } + }, + "type": "object" + }, "GoogleCloudDiscoveryengineV1alphaCheckGroundingSpec": { "description": "Specification for the grounding check.", "id": "GoogleCloudDiscoveryengineV1alphaCheckGroundingSpec", @@ -11367,8 +11411,12 @@ }, "type": "array" }, + "queryRegex": { + "description": "Optional. Query regex to match the whole search query. Cannot be set when Condition.query_terms is set. This is currently supporting promotion use case.", + "type": "string" + }, "queryTerms": { - "description": "Search only A list of terms to match the query on. Maximum of 10 query terms.", + "description": "Search only A list of terms to match the query on. Cannot be set when Condition.query_regex is set. Maximum of 10 query terms.", "items": { "$ref": "GoogleCloudDiscoveryengineV1alphaConditionQueryTerm" }, @@ -11836,7 +11884,7 @@ "properties": { "createTime": { "deprecated": true, - "description": "Timestamp the Model was created at.", + "description": "Deprecated: Timestamp the Model was created at.", "format": "google-datetime", "type": "string" }, @@ -11905,6 +11953,10 @@ "description": "Immutable. Whether data in the DataStore has ACL information. If set to `true`, the source data must have ACL. ACL will be ingested when data is ingested by DocumentService.ImportDocuments methods. When ACL is enabled for the DataStore, Document can't be accessed by calling DocumentService.GetDocument or DocumentService.ListDocuments. Currently ACL is only supported in `GENERIC` industry vertical with non-`PUBLIC_WEBSITE` content config.", "type": "boolean" }, + "advancedSiteSearchConfig": { + "$ref": "GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig", + "description": "Optional. Configuration for advanced site search." + }, "billingEstimation": { "$ref": "GoogleCloudDiscoveryengineV1alphaDataStoreBillingEstimation", "description": "Output only. Data size estimation for billing.", @@ -11990,7 +12042,7 @@ "description": "Optional. Configuration for Natural Language Query Understanding." }, "servingConfigDataStore": { - "$ref": "GoogleCloudDiscoveryengineV1alphaServingConfigDataStore", + "$ref": "GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore", "description": "Optional. Stores serving config at DataStore level." }, "solutionTypes": { @@ -12062,6 +12114,17 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore": { + "description": "Stores information regarding the serving configurations at DataStore level.", + "id": "GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore", + "properties": { + "disabledForServing": { + "description": "If set true, the DataStore will not be available for serving search requests.", + "type": "boolean" + } + }, + "type": "object" + }, "GoogleCloudDiscoveryengineV1alphaDeleteDataStoreMetadata": { "description": "Metadata related to the progress of the DataStoreService.DeleteDataStore operation. This will be returned by the google.longrunning.Operation.metadata field.", "id": "GoogleCloudDiscoveryengineV1alphaDeleteDataStoreMetadata", @@ -12972,33 +13035,6 @@ }, "type": "object" }, - "GoogleCloudDiscoveryengineV1alphaFactChunk": { - "description": "Fact Chunk.", - "id": "GoogleCloudDiscoveryengineV1alphaFactChunk", - "properties": { - "chunkText": { - "description": "Text content of the fact chunk. Can be at most 10K characters long.", - "type": "string" - }, - "index": { - "description": "The index of this chunk. Currently, only used for the streaming mode.", - "format": "int32", - "type": "integer" - }, - "source": { - "description": "Source from which this fact chunk was retrieved. If it was retrieved from the GroundingFacts provided in the request then this field will contain the index of the specific fact from which this chunk was retrieved.", - "type": "string" - }, - "sourceMetadata": { - "additionalProperties": { - "type": "string" - }, - "description": "More fine-grained information for the source reference.", - "type": "object" - } - }, - "type": "object" - }, "GoogleCloudDiscoveryengineV1alphaFetchDomainVerificationStatusResponse": { "description": "Response message for SiteSearchEngineService.FetchDomainVerificationStatus method.", "id": "GoogleCloudDiscoveryengineV1alphaFetchDomainVerificationStatusResponse", @@ -14869,12 +14905,17 @@ "type": "string" }, "invalidUris": { - "description": "Unique URIs in the request that don't match any TargetSite in the DataStore, only match TargetSites that haven't been fully indexed, or match a TargetSite with type EXCLUDE.", + "description": "Unique URIs in the request that have invalid format. Sample limited to 1000.", "items": { "type": "string" }, "type": "array" }, + "invalidUrisCount": { + "description": "Total number of unique URIs in the request that have invalid format.", + "format": "int32", + "type": "integer" + }, "pendingCount": { "description": "Total number of URIs that have yet to be crawled.", "format": "int32", @@ -14895,6 +14936,18 @@ "format": "google-datetime", "type": "string" }, + "urisNotMatchingTargetSites": { + "description": "Unique URIs in the request that don't match any TargetSite in the DataStore, only match TargetSites that haven't been fully indexed, or match a TargetSite with type EXCLUDE. Sample limited to 1000.", + "items": { + "type": "string" + }, + "type": "array" + }, + "urisNotMatchingTargetSitesCount": { + "description": "Total number of URIs that don't match any TargetSites.", + "format": "int32", + "type": "integer" + }, "validUrisCount": { "description": "Total number of unique URIs in the request that are not in invalid_uris.", "format": "int32", @@ -16789,17 +16842,6 @@ }, "type": "object" }, - "GoogleCloudDiscoveryengineV1alphaServingConfigDataStore": { - "description": "Stores information regarding the serving configurations at DataStore level.", - "id": "GoogleCloudDiscoveryengineV1alphaServingConfigDataStore", - "properties": { - "disabledForServing": { - "description": "If set true, the DataStore will not be available for serving search requests.", - "type": "boolean" - } - }, - "type": "object" - }, "GoogleCloudDiscoveryengineV1alphaServingConfigGenericConfig": { "description": "Specifies the configurations needed for Generic Discovery.Currently we support: * `content_search_spec`: configuration for generic content search.", "id": "GoogleCloudDiscoveryengineV1alphaServingConfigGenericConfig", @@ -16830,6 +16872,11 @@ "format": "float", "type": "number" }, + "demoteContentWatchedPastDays": { + "description": "Optional. Specifies the number of days to look back for demoting watched content. If set to zero or unset, defaults to the maximum of 365 days.", + "format": "int32", + "type": "integer" + }, "demotionEventType": { "description": "Specifies the event type used for demoting recommendation result. Currently supported values: * `view-item`: Item viewed. * `media-play`: Start/resume watching a video, playing a song, etc. * `media-complete`: Finished or stopped midway through a video, song, etc. If unset, watch history demotion will not be applied. Content freshness demotion will still be applied.", "type": "string" @@ -17523,6 +17570,12 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1betaAdvancedSiteSearchConfig": { + "description": "Configuration data for advance site search.", + "id": "GoogleCloudDiscoveryengineV1betaAdvancedSiteSearchConfig", + "properties": {}, + "type": "object" + }, "GoogleCloudDiscoveryengineV1betaBatchCreateTargetSiteMetadata": { "description": "Metadata related to the progress of the SiteSearchEngineService.BatchCreateTargetSites operation. This will be returned by the google.longrunning.Operation.metadata field.", "id": "GoogleCloudDiscoveryengineV1betaBatchCreateTargetSiteMetadata", @@ -17618,8 +17671,12 @@ }, "type": "array" }, + "queryRegex": { + "description": "Optional. Query regex to match the whole search query. Cannot be set when Condition.query_terms is set. This is currently supporting promotion use case.", + "type": "string" + }, "queryTerms": { - "description": "Search only A list of terms to match the query on. Maximum of 10 query terms.", + "description": "Search only A list of terms to match the query on. Cannot be set when Condition.query_regex is set. Maximum of 10 query terms.", "items": { "$ref": "GoogleCloudDiscoveryengineV1betaConditionQueryTerm" }, @@ -17881,7 +17938,7 @@ "properties": { "createTime": { "deprecated": true, - "description": "Timestamp the Model was created at.", + "description": "Deprecated: Timestamp the Model was created at.", "format": "google-datetime", "type": "string" }, @@ -17946,6 +18003,10 @@ "description": "DataStore captures global settings and configs at the DataStore level.", "id": "GoogleCloudDiscoveryengineV1betaDataStore", "properties": { + "advancedSiteSearchConfig": { + "$ref": "GoogleCloudDiscoveryengineV1betaAdvancedSiteSearchConfig", + "description": "Optional. Configuration for advanced site search." + }, "billingEstimation": { "$ref": "GoogleCloudDiscoveryengineV1betaDataStoreBillingEstimation", "description": "Output only. Data size estimation for billing.", @@ -18026,7 +18087,7 @@ "description": "Optional. Configuration for Natural Language Query Understanding." }, "servingConfigDataStore": { - "$ref": "GoogleCloudDiscoveryengineV1betaServingConfigDataStore", + "$ref": "GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore", "description": "Optional. Stores serving config at DataStore level." }, "solutionTypes": { @@ -18098,6 +18159,17 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore": { + "description": "Stores information regarding the serving configurations at DataStore level.", + "id": "GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore", + "properties": { + "disabledForServing": { + "description": "If set true, the DataStore will not be available for serving search requests.", + "type": "boolean" + } + }, + "type": "object" + }, "GoogleCloudDiscoveryengineV1betaDeleteDataStoreMetadata": { "description": "Metadata related to the progress of the DataStoreService.DeleteDataStore operation. This will be returned by the google.longrunning.Operation.metadata field.", "id": "GoogleCloudDiscoveryengineV1betaDeleteDataStoreMetadata", @@ -19873,17 +19945,6 @@ }, "type": "object" }, - "GoogleCloudDiscoveryengineV1betaServingConfigDataStore": { - "description": "Stores information regarding the serving configurations at DataStore level.", - "id": "GoogleCloudDiscoveryengineV1betaServingConfigDataStore", - "properties": { - "disabledForServing": { - "description": "If set true, the DataStore will not be available for serving search requests.", - "type": "boolean" - } - }, - "type": "object" - }, "GoogleCloudDiscoveryengineV1betaSiteVerificationInfo": { "description": "Verification information for target sites in advanced site search.", "id": "GoogleCloudDiscoveryengineV1betaSiteVerificationInfo", diff --git a/discoveryengine/v1alpha/discoveryengine-gen.go b/discoveryengine/v1alpha/discoveryengine-gen.go index 43fb5961628..c74d8890be9 100644 --- a/discoveryengine/v1alpha/discoveryengine-gen.go +++ b/discoveryengine/v1alpha/discoveryengine-gen.go @@ -1620,6 +1620,11 @@ func (s GoogleCloudDiscoveryengineLoggingSourceLocation) MarshalJSON() ([]byte, return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1AdvancedSiteSearchConfig: Configuration data for +// advance site search. +type GoogleCloudDiscoveryengineV1AdvancedSiteSearchConfig struct { +} + // GoogleCloudDiscoveryengineV1BatchCreateTargetSiteMetadata: Metadata related // to the progress of the SiteSearchEngineService.BatchCreateTargetSites // operation. This will be returned by the @@ -1727,8 +1732,12 @@ type GoogleCloudDiscoveryengineV1Condition struct { // ActiveTimeRange: Range of time(s) specifying when condition is active. // Maximum of 10 time ranges. ActiveTimeRange []*GoogleCloudDiscoveryengineV1ConditionTimeRange `json:"activeTimeRange,omitempty"` - // QueryTerms: Search only A list of terms to match the query on. Maximum of 10 - // query terms. + // QueryRegex: Optional. Query regex to match the whole search query. Cannot be + // set when Condition.query_terms is set. This is currently supporting + // promotion use case. + QueryRegex string `json:"queryRegex,omitempty"` + // QueryTerms: Search only A list of terms to match the query on. Cannot be set + // when Condition.query_regex is set. Maximum of 10 query terms. QueryTerms []*GoogleCloudDiscoveryengineV1ConditionQueryTerm `json:"queryTerms,omitempty"` // ForceSendFields is a list of field names (e.g. "ActiveTimeRange") to // unconditionally include in API requests. By default, fields with empty or @@ -2111,6 +2120,8 @@ func (s GoogleCloudDiscoveryengineV1CreateTargetSiteMetadata) MarshalJSON() ([]b // GoogleCloudDiscoveryengineV1DataStore: DataStore captures global settings // and configs at the DataStore level. type GoogleCloudDiscoveryengineV1DataStore struct { + // AdvancedSiteSearchConfig: Optional. Configuration for advanced site search. + AdvancedSiteSearchConfig *GoogleCloudDiscoveryengineV1AdvancedSiteSearchConfig `json:"advancedSiteSearchConfig,omitempty"` // BillingEstimation: Output only. Data size estimation for billing. BillingEstimation *GoogleCloudDiscoveryengineV1DataStoreBillingEstimation `json:"billingEstimation,omitempty"` // CmekConfig: Output only. CMEK-related information for the DataStore. @@ -2160,7 +2171,7 @@ type GoogleCloudDiscoveryengineV1DataStore struct { // limit of 1024 characters. Name string `json:"name,omitempty"` // ServingConfigDataStore: Optional. Stores serving config at DataStore level. - ServingConfigDataStore *GoogleCloudDiscoveryengineV1ServingConfigDataStore `json:"servingConfigDataStore,omitempty"` + ServingConfigDataStore *GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore `json:"servingConfigDataStore,omitempty"` // SolutionTypes: The solutions that the data store enrolls. Available // solutions for each industry_vertical: * `MEDIA`: // `SOLUTION_TYPE_RECOMMENDATION` and `SOLUTION_TYPE_SEARCH`. * `SITE_SEARCH`: @@ -2190,15 +2201,15 @@ type GoogleCloudDiscoveryengineV1DataStore struct { // data. This must be set when DataStore.content_config is set as // DataStore.ContentConfig.GOOGLE_WORKSPACE. WorkspaceConfig *GoogleCloudDiscoveryengineV1WorkspaceConfig `json:"workspaceConfig,omitempty"` - // ForceSendFields is a list of field names (e.g. "BillingEstimation") to - // unconditionally include in API requests. By default, fields with empty or + // ForceSendFields is a list of field names (e.g. "AdvancedSiteSearchConfig") + // to unconditionally include in API requests. By default, fields with empty or // default values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more // details. ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "BillingEstimation") to include in - // API requests with the JSON null value. By default, fields with empty values - // are omitted from API requests. See + // NullFields is a list of field names (e.g. "AdvancedSiteSearchConfig") to + // include in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. NullFields []string `json:"-"` } @@ -2241,6 +2252,30 @@ func (s GoogleCloudDiscoveryengineV1DataStoreBillingEstimation) MarshalJSON() ([ return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore: Stores +// information regarding the serving configurations at DataStore level. +type GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore struct { + // DisabledForServing: If set true, the DataStore will not be available for + // serving search requests. + DisabledForServing bool `json:"disabledForServing,omitempty"` + // ForceSendFields is a list of field names (e.g. "DisabledForServing") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "DisabledForServing") to include + // in API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1DeleteDataStoreMetadata: Metadata related to the // progress of the DataStoreService.DeleteDataStore operation. This will be // returned by the google.longrunning.Operation.metadata field. @@ -3369,30 +3404,6 @@ func (s GoogleCloudDiscoveryengineV1Schema) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// GoogleCloudDiscoveryengineV1ServingConfigDataStore: Stores information -// regarding the serving configurations at DataStore level. -type GoogleCloudDiscoveryengineV1ServingConfigDataStore struct { - // DisabledForServing: If set true, the DataStore will not be available for - // serving search requests. - DisabledForServing bool `json:"disabledForServing,omitempty"` - // ForceSendFields is a list of field names (e.g. "DisabledForServing") to - // unconditionally include in API requests. By default, fields with empty or - // default values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more - // details. - ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "DisabledForServing") to include - // in API requests with the JSON null value. By default, fields with empty - // values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. - NullFields []string `json:"-"` -} - -func (s GoogleCloudDiscoveryengineV1ServingConfigDataStore) MarshalJSON() ([]byte, error) { - type NoMethod GoogleCloudDiscoveryengineV1ServingConfigDataStore - return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) -} - // GoogleCloudDiscoveryengineV1SiteVerificationInfo: Verification information // for target sites in advanced site search. type GoogleCloudDiscoveryengineV1SiteVerificationInfo struct { @@ -3761,6 +3772,33 @@ func (s GoogleCloudDiscoveryengineV1alphaAclConfig) MarshalJSON() ([]byte, error return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig: Configuration +// data for advance site search. +type GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig struct { + // DisableAutomaticRefresh: If set true, automatic refresh is disabled for the + // DataStore. + DisableAutomaticRefresh bool `json:"disableAutomaticRefresh,omitempty"` + // DisableInitialIndex: If set true, initial indexing is disabled for the + // DataStore. + DisableInitialIndex bool `json:"disableInitialIndex,omitempty"` + // ForceSendFields is a list of field names (e.g. "DisableAutomaticRefresh") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "DisableAutomaticRefresh") to + // include in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1alphaAlloyDbSource: AlloyDB source import data // from. type GoogleCloudDiscoveryengineV1alphaAlloyDbSource struct { @@ -4938,7 +4976,7 @@ type GoogleCloudDiscoveryengineV1alphaAnswerStepActionObservationSearchResult st SnippetInfo []*GoogleCloudDiscoveryengineV1alphaAnswerStepActionObservationSearchResultSnippetInfo `json:"snippetInfo,omitempty"` // StructData: Data representation. The structured JSON data for the document. // It's populated from the struct data from the Document, or the Chunk in - // search result. . + // search result. StructData googleapi.RawMessage `json:"structData,omitempty"` // Title: Title. Title string `json:"title,omitempty"` @@ -5198,7 +5236,7 @@ func (s GoogleCloudDiscoveryengineV1alphaBatchGetDocumentsMetadataResponseDocume // adataMatcherValue: The value of the matcher that was used to match the // Document. type GoogleCloudDiscoveryengineV1alphaBatchGetDocumentsMetadataResponseDocumentMetadataMatcherValue struct { - // FhirResource: Required. Format: + // FhirResource: Format: // projects/{project}/locations/{location}/datasets/{dataset}/fhirStores/{fhir_s // tore}/fhir/{resource_type}/{fhir_resource_id} FhirResource string `json:"fhirResource,omitempty"` @@ -5450,8 +5488,8 @@ func (s GoogleCloudDiscoveryengineV1alphaBigtableSource) MarshalJSON() ([]byte, // GoogleCloudDiscoveryengineV1alphaCheckGroundingRequest: Request message for // GroundedGenerationService.CheckGrounding method. type GoogleCloudDiscoveryengineV1alphaCheckGroundingRequest struct { - // AnswerCandidate: Answer candidate to check. Can have a maximum length of - // 1024 characters. + // AnswerCandidate: Answer candidate to check. It can have a maximum length of + // 4096 tokens. AnswerCandidate string `json:"answerCandidate,omitempty"` // Facts: List of facts for the grounding check. We support up to 200 facts. Facts []*GoogleCloudDiscoveryengineV1alphaGroundingFact `json:"facts,omitempty"` @@ -5493,7 +5531,7 @@ func (s GoogleCloudDiscoveryengineV1alphaCheckGroundingRequest) MarshalJSON() ([ type GoogleCloudDiscoveryengineV1alphaCheckGroundingResponse struct { // CitedChunks: List of facts cited across all claims in the answer candidate. // These are derived from the facts supplied in the request. - CitedChunks []*GoogleCloudDiscoveryengineV1alphaFactChunk `json:"citedChunks,omitempty"` + CitedChunks []*GoogleCloudDiscoveryengineV1alphaCheckGroundingResponseFactChunk `json:"citedChunks,omitempty"` // Claims: Claim texts and citation info across all claims in the answer // candidate. Claims []*GoogleCloudDiscoveryengineV1alphaCheckGroundingResponseClaim `json:"claims,omitempty"` @@ -5578,6 +5616,34 @@ func (s GoogleCloudDiscoveryengineV1alphaCheckGroundingResponseClaim) MarshalJSO return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1alphaCheckGroundingResponseFactChunk: Fact chunk +// for grounding check. +type GoogleCloudDiscoveryengineV1alphaCheckGroundingResponseFactChunk struct { + // ChunkText: Text content of the fact chunk. Can be at most 10K characters + // long. + ChunkText string `json:"chunkText,omitempty"` + // Source: Source from which this fact chunk was retrieved. For a fact chunk + // retrieved from inline facts, this field will contain the index of the + // specific fact from which this chunk was retrieved. + Source string `json:"source,omitempty"` + // ForceSendFields is a list of field names (e.g. "ChunkText") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "ChunkText") to include in API + // requests with the JSON null value. By default, fields with empty values are + // omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s GoogleCloudDiscoveryengineV1alphaCheckGroundingResponseFactChunk) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1alphaCheckGroundingResponseFactChunk + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1alphaCheckGroundingSpec: Specification for the // grounding check. type GoogleCloudDiscoveryengineV1alphaCheckGroundingSpec struct { @@ -6125,8 +6191,12 @@ type GoogleCloudDiscoveryengineV1alphaCondition struct { // ActiveTimeRange: Range of time(s) specifying when condition is active. // Maximum of 10 time ranges. ActiveTimeRange []*GoogleCloudDiscoveryengineV1alphaConditionTimeRange `json:"activeTimeRange,omitempty"` - // QueryTerms: Search only A list of terms to match the query on. Maximum of 10 - // query terms. + // QueryRegex: Optional. Query regex to match the whole search query. Cannot be + // set when Condition.query_terms is set. This is currently supporting + // promotion use case. + QueryRegex string `json:"queryRegex,omitempty"` + // QueryTerms: Search only A list of terms to match the query on. Cannot be set + // when Condition.query_regex is set. Maximum of 10 query terms. QueryTerms []*GoogleCloudDiscoveryengineV1alphaConditionQueryTerm `json:"queryTerms,omitempty"` // ForceSendFields is a list of field names (e.g. "ActiveTimeRange") to // unconditionally include in API requests. By default, fields with empty or @@ -6815,7 +6885,7 @@ func (s GoogleCloudDiscoveryengineV1alphaCustomFineTuningSpec) MarshalJSON() ([] // GoogleCloudDiscoveryengineV1alphaCustomTuningModel: Metadata that describes // a custom tuned model. type GoogleCloudDiscoveryengineV1alphaCustomTuningModel struct { - // CreateTime: Timestamp the Model was created at. + // CreateTime: Deprecated: Timestamp the Model was created at. CreateTime string `json:"createTime,omitempty"` // DisplayName: The display name of the model. DisplayName string `json:"displayName,omitempty"` @@ -6877,6 +6947,8 @@ type GoogleCloudDiscoveryengineV1alphaDataStore struct { // is only supported in `GENERIC` industry vertical with non-`PUBLIC_WEBSITE` // content config. AclEnabled bool `json:"aclEnabled,omitempty"` + // AdvancedSiteSearchConfig: Optional. Configuration for advanced site search. + AdvancedSiteSearchConfig *GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig `json:"advancedSiteSearchConfig,omitempty"` // BillingEstimation: Output only. Data size estimation for billing. BillingEstimation *GoogleCloudDiscoveryengineV1alphaDataStoreBillingEstimation `json:"billingEstimation,omitempty"` // CmekConfig: Output only. CMEK-related information for the DataStore. @@ -6933,7 +7005,7 @@ type GoogleCloudDiscoveryengineV1alphaDataStore struct { // Language Query Understanding. NaturalLanguageQueryUnderstandingConfig *GoogleCloudDiscoveryengineV1alphaNaturalLanguageQueryUnderstandingConfig `json:"naturalLanguageQueryUnderstandingConfig,omitempty"` // ServingConfigDataStore: Optional. Stores serving config at DataStore level. - ServingConfigDataStore *GoogleCloudDiscoveryengineV1alphaServingConfigDataStore `json:"servingConfigDataStore,omitempty"` + ServingConfigDataStore *GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore `json:"servingConfigDataStore,omitempty"` // SolutionTypes: The solutions that the data store enrolls. Available // solutions for each industry_vertical: * `MEDIA`: // `SOLUTION_TYPE_RECOMMENDATION` and `SOLUTION_TYPE_SEARCH`. * `SITE_SEARCH`: @@ -7017,6 +7089,30 @@ func (s GoogleCloudDiscoveryengineV1alphaDataStoreBillingEstimation) MarshalJSON return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore: Stores +// information regarding the serving configurations at DataStore level. +type GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore struct { + // DisabledForServing: If set true, the DataStore will not be available for + // serving search requests. + DisabledForServing bool `json:"disabledForServing,omitempty"` + // ForceSendFields is a list of field names (e.g. "DisabledForServing") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "DisabledForServing") to include + // in API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1alphaDeleteDataStoreMetadata: Metadata related // to the progress of the DataStoreService.DeleteDataStore operation. This will // be returned by the google.longrunning.Operation.metadata field. @@ -8334,37 +8430,6 @@ func (s GoogleCloudDiscoveryengineV1alphaEvaluationEvaluationSpecQuerySetSpec) M return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// GoogleCloudDiscoveryengineV1alphaFactChunk: Fact Chunk. -type GoogleCloudDiscoveryengineV1alphaFactChunk struct { - // ChunkText: Text content of the fact chunk. Can be at most 10K characters - // long. - ChunkText string `json:"chunkText,omitempty"` - // Index: The index of this chunk. Currently, only used for the streaming mode. - Index int64 `json:"index,omitempty"` - // Source: Source from which this fact chunk was retrieved. If it was retrieved - // from the GroundingFacts provided in the request then this field will contain - // the index of the specific fact from which this chunk was retrieved. - Source string `json:"source,omitempty"` - // SourceMetadata: More fine-grained information for the source reference. - SourceMetadata map[string]string `json:"sourceMetadata,omitempty"` - // ForceSendFields is a list of field names (e.g. "ChunkText") to - // unconditionally include in API requests. By default, fields with empty or - // default values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more - // details. - ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "ChunkText") to include in API - // requests with the JSON null value. By default, fields with empty values are - // omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. - NullFields []string `json:"-"` -} - -func (s GoogleCloudDiscoveryengineV1alphaFactChunk) MarshalJSON() ([]byte, error) { - type NoMethod GoogleCloudDiscoveryengineV1alphaFactChunk - return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) -} - // GoogleCloudDiscoveryengineV1alphaFetchDomainVerificationStatusResponse: // Response message for SiteSearchEngineService.FetchDomainVerificationStatus // method. @@ -11148,10 +11213,12 @@ func (s GoogleCloudDiscoveryengineV1alphaRecommendResponseRecommendationResult) type GoogleCloudDiscoveryengineV1alphaRecrawlUrisMetadata struct { // CreateTime: Operation create time. CreateTime string `json:"createTime,omitempty"` - // InvalidUris: Unique URIs in the request that don't match any TargetSite in - // the DataStore, only match TargetSites that haven't been fully indexed, or - // match a TargetSite with type EXCLUDE. + // InvalidUris: Unique URIs in the request that have invalid format. Sample + // limited to 1000. InvalidUris []string `json:"invalidUris,omitempty"` + // InvalidUrisCount: Total number of unique URIs in the request that have + // invalid format. + InvalidUrisCount int64 `json:"invalidUrisCount,omitempty"` // PendingCount: Total number of URIs that have yet to be crawled. PendingCount int64 `json:"pendingCount,omitempty"` // QuotaExceededCount: Total number of URIs that were rejected due to @@ -11162,6 +11229,13 @@ type GoogleCloudDiscoveryengineV1alphaRecrawlUrisMetadata struct { // UpdateTime: Operation last update time. If the operation is done, this is // also the finish time. UpdateTime string `json:"updateTime,omitempty"` + // UrisNotMatchingTargetSites: Unique URIs in the request that don't match any + // TargetSite in the DataStore, only match TargetSites that haven't been fully + // indexed, or match a TargetSite with type EXCLUDE. Sample limited to 1000. + UrisNotMatchingTargetSites []string `json:"urisNotMatchingTargetSites,omitempty"` + // UrisNotMatchingTargetSitesCount: Total number of URIs that don't match any + // TargetSites. + UrisNotMatchingTargetSitesCount int64 `json:"urisNotMatchingTargetSitesCount,omitempty"` // ValidUrisCount: Total number of unique URIs in the request that are not in // invalid_uris. ValidUrisCount int64 `json:"validUrisCount,omitempty"` @@ -13946,30 +14020,6 @@ func (s GoogleCloudDiscoveryengineV1alphaServingConfig) MarshalJSON() ([]byte, e return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// GoogleCloudDiscoveryengineV1alphaServingConfigDataStore: Stores information -// regarding the serving configurations at DataStore level. -type GoogleCloudDiscoveryengineV1alphaServingConfigDataStore struct { - // DisabledForServing: If set true, the DataStore will not be available for - // serving search requests. - DisabledForServing bool `json:"disabledForServing,omitempty"` - // ForceSendFields is a list of field names (e.g. "DisabledForServing") to - // unconditionally include in API requests. By default, fields with empty or - // default values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more - // details. - ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "DisabledForServing") to include - // in API requests with the JSON null value. By default, fields with empty - // values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. - NullFields []string `json:"-"` -} - -func (s GoogleCloudDiscoveryengineV1alphaServingConfigDataStore) MarshalJSON() ([]byte, error) { - type NoMethod GoogleCloudDiscoveryengineV1alphaServingConfigDataStore - return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) -} - // GoogleCloudDiscoveryengineV1alphaServingConfigGenericConfig: Specifies the // configurations needed for Generic Discovery.Currently we support: * // `content_search_spec`: configuration for generic content search. @@ -14017,6 +14067,10 @@ type GoogleCloudDiscoveryengineV1alphaServingConfigMediaConfig struct { // ContentWatchedSecondsThreshold: Specifies the content watched minutes // threshold for demotion. ContentWatchedSecondsThreshold float64 `json:"contentWatchedSecondsThreshold,omitempty"` + // DemoteContentWatchedPastDays: Optional. Specifies the number of days to look + // back for demoting watched content. If set to zero or unset, defaults to the + // maximum of 365 days. + DemoteContentWatchedPastDays int64 `json:"demoteContentWatchedPastDays,omitempty"` // DemotionEventType: Specifies the event type used for demoting recommendation // result. Currently supported values: * `view-item`: Item viewed. * // `media-play`: Start/resume watching a video, playing a song, etc. * @@ -15023,6 +15077,11 @@ func (s GoogleCloudDiscoveryengineV1alphaWorkspaceConfig) MarshalJSON() ([]byte, return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1betaAdvancedSiteSearchConfig: Configuration data +// for advance site search. +type GoogleCloudDiscoveryengineV1betaAdvancedSiteSearchConfig struct { +} + // GoogleCloudDiscoveryengineV1betaBatchCreateTargetSiteMetadata: Metadata // related to the progress of the // SiteSearchEngineService.BatchCreateTargetSites operation. This will be @@ -15130,8 +15189,12 @@ type GoogleCloudDiscoveryengineV1betaCondition struct { // ActiveTimeRange: Range of time(s) specifying when condition is active. // Maximum of 10 time ranges. ActiveTimeRange []*GoogleCloudDiscoveryengineV1betaConditionTimeRange `json:"activeTimeRange,omitempty"` - // QueryTerms: Search only A list of terms to match the query on. Maximum of 10 - // query terms. + // QueryRegex: Optional. Query regex to match the whole search query. Cannot be + // set when Condition.query_terms is set. This is currently supporting + // promotion use case. + QueryRegex string `json:"queryRegex,omitempty"` + // QueryTerms: Search only A list of terms to match the query on. Cannot be set + // when Condition.query_regex is set. Maximum of 10 query terms. QueryTerms []*GoogleCloudDiscoveryengineV1betaConditionQueryTerm `json:"queryTerms,omitempty"` // ForceSendFields is a list of field names (e.g. "ActiveTimeRange") to // unconditionally include in API requests. By default, fields with empty or @@ -15519,7 +15582,7 @@ func (s GoogleCloudDiscoveryengineV1betaCreateTargetSiteMetadata) MarshalJSON() // GoogleCloudDiscoveryengineV1betaCustomTuningModel: Metadata that describes a // custom tuned model. type GoogleCloudDiscoveryengineV1betaCustomTuningModel struct { - // CreateTime: Timestamp the Model was created at. + // CreateTime: Deprecated: Timestamp the Model was created at. CreateTime string `json:"createTime,omitempty"` // DisplayName: The display name of the model. DisplayName string `json:"displayName,omitempty"` @@ -15573,6 +15636,8 @@ func (s GoogleCloudDiscoveryengineV1betaCustomTuningModel) MarshalJSON() ([]byte // GoogleCloudDiscoveryengineV1betaDataStore: DataStore captures global // settings and configs at the DataStore level. type GoogleCloudDiscoveryengineV1betaDataStore struct { + // AdvancedSiteSearchConfig: Optional. Configuration for advanced site search. + AdvancedSiteSearchConfig *GoogleCloudDiscoveryengineV1betaAdvancedSiteSearchConfig `json:"advancedSiteSearchConfig,omitempty"` // BillingEstimation: Output only. Data size estimation for billing. BillingEstimation *GoogleCloudDiscoveryengineV1betaDataStoreBillingEstimation `json:"billingEstimation,omitempty"` // CmekConfig: Output only. CMEK-related information for the DataStore. @@ -15627,7 +15692,7 @@ type GoogleCloudDiscoveryengineV1betaDataStore struct { // Language Query Understanding. NaturalLanguageQueryUnderstandingConfig *GoogleCloudDiscoveryengineV1betaNaturalLanguageQueryUnderstandingConfig `json:"naturalLanguageQueryUnderstandingConfig,omitempty"` // ServingConfigDataStore: Optional. Stores serving config at DataStore level. - ServingConfigDataStore *GoogleCloudDiscoveryengineV1betaServingConfigDataStore `json:"servingConfigDataStore,omitempty"` + ServingConfigDataStore *GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore `json:"servingConfigDataStore,omitempty"` // SolutionTypes: The solutions that the data store enrolls. Available // solutions for each industry_vertical: * `MEDIA`: // `SOLUTION_TYPE_RECOMMENDATION` and `SOLUTION_TYPE_SEARCH`. * `SITE_SEARCH`: @@ -15657,15 +15722,15 @@ type GoogleCloudDiscoveryengineV1betaDataStore struct { // data. This must be set when DataStore.content_config is set as // DataStore.ContentConfig.GOOGLE_WORKSPACE. WorkspaceConfig *GoogleCloudDiscoveryengineV1betaWorkspaceConfig `json:"workspaceConfig,omitempty"` - // ForceSendFields is a list of field names (e.g. "BillingEstimation") to - // unconditionally include in API requests. By default, fields with empty or + // ForceSendFields is a list of field names (e.g. "AdvancedSiteSearchConfig") + // to unconditionally include in API requests. By default, fields with empty or // default values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more // details. ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "BillingEstimation") to include in - // API requests with the JSON null value. By default, fields with empty values - // are omitted from API requests. See + // NullFields is a list of field names (e.g. "AdvancedSiteSearchConfig") to + // include in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. NullFields []string `json:"-"` } @@ -15708,6 +15773,30 @@ func (s GoogleCloudDiscoveryengineV1betaDataStoreBillingEstimation) MarshalJSON( return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore: Stores +// information regarding the serving configurations at DataStore level. +type GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore struct { + // DisabledForServing: If set true, the DataStore will not be available for + // serving search requests. + DisabledForServing bool `json:"disabledForServing,omitempty"` + // ForceSendFields is a list of field names (e.g. "DisabledForServing") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "DisabledForServing") to include + // in API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1betaDeleteDataStoreMetadata: Metadata related to // the progress of the DataStoreService.DeleteDataStore operation. This will be // returned by the google.longrunning.Operation.metadata field. @@ -18359,30 +18448,6 @@ func (s GoogleCloudDiscoveryengineV1betaSearchRequestSpellCorrectionSpec) Marsha return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// GoogleCloudDiscoveryengineV1betaServingConfigDataStore: Stores information -// regarding the serving configurations at DataStore level. -type GoogleCloudDiscoveryengineV1betaServingConfigDataStore struct { - // DisabledForServing: If set true, the DataStore will not be available for - // serving search requests. - DisabledForServing bool `json:"disabledForServing,omitempty"` - // ForceSendFields is a list of field names (e.g. "DisabledForServing") to - // unconditionally include in API requests. By default, fields with empty or - // default values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more - // details. - ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "DisabledForServing") to include - // in API requests with the JSON null value. By default, fields with empty - // values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. - NullFields []string `json:"-"` -} - -func (s GoogleCloudDiscoveryengineV1betaServingConfigDataStore) MarshalJSON() ([]byte, error) { - type NoMethod GoogleCloudDiscoveryengineV1betaServingConfigDataStore - return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) -} - // GoogleCloudDiscoveryengineV1betaSiteVerificationInfo: Verification // information for target sites in advanced site search. type GoogleCloudDiscoveryengineV1betaSiteVerificationInfo struct { diff --git a/discoveryengine/v1beta/discoveryengine-api.json b/discoveryengine/v1beta/discoveryengine-api.json index 7b9e3df0cbe..ed86018fef0 100644 --- a/discoveryengine/v1beta/discoveryengine-api.json +++ b/discoveryengine/v1beta/discoveryengine-api.json @@ -6880,7 +6880,7 @@ } } }, - "revision": "20241010", + "revision": "20241020", "rootUrl": "https://discoveryengine.googleapis.com/", "schemas": { "GoogleApiHttpBody": { @@ -7029,6 +7029,12 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1AdvancedSiteSearchConfig": { + "description": "Configuration data for advance site search.", + "id": "GoogleCloudDiscoveryengineV1AdvancedSiteSearchConfig", + "properties": {}, + "type": "object" + }, "GoogleCloudDiscoveryengineV1BatchCreateTargetSiteMetadata": { "description": "Metadata related to the progress of the SiteSearchEngineService.BatchCreateTargetSites operation. This will be returned by the google.longrunning.Operation.metadata field.", "id": "GoogleCloudDiscoveryengineV1BatchCreateTargetSiteMetadata", @@ -7124,8 +7130,12 @@ }, "type": "array" }, + "queryRegex": { + "description": "Optional. Query regex to match the whole search query. Cannot be set when Condition.query_terms is set. This is currently supporting promotion use case.", + "type": "string" + }, "queryTerms": { - "description": "Search only A list of terms to match the query on. Maximum of 10 query terms.", + "description": "Search only A list of terms to match the query on. Cannot be set when Condition.query_regex is set. Maximum of 10 query terms.", "items": { "$ref": "GoogleCloudDiscoveryengineV1ConditionQueryTerm" }, @@ -7379,6 +7389,10 @@ "description": "DataStore captures global settings and configs at the DataStore level.", "id": "GoogleCloudDiscoveryengineV1DataStore", "properties": { + "advancedSiteSearchConfig": { + "$ref": "GoogleCloudDiscoveryengineV1AdvancedSiteSearchConfig", + "description": "Optional. Configuration for advanced site search." + }, "billingEstimation": { "$ref": "GoogleCloudDiscoveryengineV1DataStoreBillingEstimation", "description": "Output only. Data size estimation for billing.", @@ -7451,7 +7465,7 @@ "type": "string" }, "servingConfigDataStore": { - "$ref": "GoogleCloudDiscoveryengineV1ServingConfigDataStore", + "$ref": "GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore", "description": "Optional. Stores serving config at DataStore level." }, "solutionTypes": { @@ -7523,6 +7537,17 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore": { + "description": "Stores information regarding the serving configurations at DataStore level.", + "id": "GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore", + "properties": { + "disabledForServing": { + "description": "If set true, the DataStore will not be available for serving search requests.", + "type": "boolean" + } + }, + "type": "object" + }, "GoogleCloudDiscoveryengineV1DeleteDataStoreMetadata": { "description": "Metadata related to the progress of the DataStoreService.DeleteDataStore operation. This will be returned by the google.longrunning.Operation.metadata field.", "id": "GoogleCloudDiscoveryengineV1DeleteDataStoreMetadata", @@ -8351,17 +8376,6 @@ }, "type": "object" }, - "GoogleCloudDiscoveryengineV1ServingConfigDataStore": { - "description": "Stores information regarding the serving configurations at DataStore level.", - "id": "GoogleCloudDiscoveryengineV1ServingConfigDataStore", - "properties": { - "disabledForServing": { - "description": "If set true, the DataStore will not be available for serving search requests.", - "type": "boolean" - } - }, - "type": "object" - }, "GoogleCloudDiscoveryengineV1SiteVerificationInfo": { "description": "Verification information for target sites in advanced site search.", "id": "GoogleCloudDiscoveryengineV1SiteVerificationInfo", @@ -8652,6 +8666,21 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig": { + "description": "Configuration data for advance site search.", + "id": "GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig", + "properties": { + "disableAutomaticRefresh": { + "description": "If set true, automatic refresh is disabled for the DataStore.", + "type": "boolean" + }, + "disableInitialIndex": { + "description": "If set true, initial indexing is disabled for the DataStore.", + "type": "boolean" + } + }, + "type": "object" + }, "GoogleCloudDiscoveryengineV1alphaAnswer": { "description": "Defines an answer.", "id": "GoogleCloudDiscoveryengineV1alphaAnswer", @@ -9076,7 +9105,7 @@ "description": "Properties of the object.", "type": "any" }, - "description": "Data representation. The structured JSON data for the document. It's populated from the struct data from the Document, or the Chunk in search result. .", + "description": "Data representation. The structured JSON data for the document. It's populated from the struct data from the Document, or the Chunk in search result.", "type": "object" }, "title": { @@ -9231,8 +9260,12 @@ }, "type": "array" }, + "queryRegex": { + "description": "Optional. Query regex to match the whole search query. Cannot be set when Condition.query_terms is set. This is currently supporting promotion use case.", + "type": "string" + }, "queryTerms": { - "description": "Search only A list of terms to match the query on. Maximum of 10 query terms.", + "description": "Search only A list of terms to match the query on. Cannot be set when Condition.query_regex is set. Maximum of 10 query terms.", "items": { "$ref": "GoogleCloudDiscoveryengineV1alphaConditionQueryTerm" }, @@ -9505,7 +9538,7 @@ "properties": { "createTime": { "deprecated": true, - "description": "Timestamp the Model was created at.", + "description": "Deprecated: Timestamp the Model was created at.", "format": "google-datetime", "type": "string" }, @@ -9574,6 +9607,10 @@ "description": "Immutable. Whether data in the DataStore has ACL information. If set to `true`, the source data must have ACL. ACL will be ingested when data is ingested by DocumentService.ImportDocuments methods. When ACL is enabled for the DataStore, Document can't be accessed by calling DocumentService.GetDocument or DocumentService.ListDocuments. Currently ACL is only supported in `GENERIC` industry vertical with non-`PUBLIC_WEBSITE` content config.", "type": "boolean" }, + "advancedSiteSearchConfig": { + "$ref": "GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig", + "description": "Optional. Configuration for advanced site search." + }, "billingEstimation": { "$ref": "GoogleCloudDiscoveryengineV1alphaDataStoreBillingEstimation", "description": "Output only. Data size estimation for billing.", @@ -9659,7 +9696,7 @@ "description": "Optional. Configuration for Natural Language Query Understanding." }, "servingConfigDataStore": { - "$ref": "GoogleCloudDiscoveryengineV1alphaServingConfigDataStore", + "$ref": "GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore", "description": "Optional. Stores serving config at DataStore level." }, "solutionTypes": { @@ -9731,6 +9768,17 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore": { + "description": "Stores information regarding the serving configurations at DataStore level.", + "id": "GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore", + "properties": { + "disabledForServing": { + "description": "If set true, the DataStore will not be available for serving search requests.", + "type": "boolean" + } + }, + "type": "object" + }, "GoogleCloudDiscoveryengineV1alphaDeleteDataStoreMetadata": { "description": "Metadata related to the progress of the DataStoreService.DeleteDataStore operation. This will be returned by the google.longrunning.Operation.metadata field.", "id": "GoogleCloudDiscoveryengineV1alphaDeleteDataStoreMetadata", @@ -11240,12 +11288,17 @@ "type": "string" }, "invalidUris": { - "description": "Unique URIs in the request that don't match any TargetSite in the DataStore, only match TargetSites that haven't been fully indexed, or match a TargetSite with type EXCLUDE.", + "description": "Unique URIs in the request that have invalid format. Sample limited to 1000.", "items": { "type": "string" }, "type": "array" }, + "invalidUrisCount": { + "description": "Total number of unique URIs in the request that have invalid format.", + "format": "int32", + "type": "integer" + }, "pendingCount": { "description": "Total number of URIs that have yet to be crawled.", "format": "int32", @@ -11266,6 +11319,18 @@ "format": "google-datetime", "type": "string" }, + "urisNotMatchingTargetSites": { + "description": "Unique URIs in the request that don't match any TargetSite in the DataStore, only match TargetSites that haven't been fully indexed, or match a TargetSite with type EXCLUDE. Sample limited to 1000.", + "items": { + "type": "string" + }, + "type": "array" + }, + "urisNotMatchingTargetSitesCount": { + "description": "Total number of URIs that don't match any TargetSites.", + "format": "int32", + "type": "integer" + }, "validUrisCount": { "description": "Total number of unique URIs in the request that are not in invalid_uris.", "format": "int32", @@ -12073,17 +12138,6 @@ }, "type": "object" }, - "GoogleCloudDiscoveryengineV1alphaServingConfigDataStore": { - "description": "Stores information regarding the serving configurations at DataStore level.", - "id": "GoogleCloudDiscoveryengineV1alphaServingConfigDataStore", - "properties": { - "disabledForServing": { - "description": "If set true, the DataStore will not be available for serving search requests.", - "type": "boolean" - } - }, - "type": "object" - }, "GoogleCloudDiscoveryengineV1alphaSession": { "description": "External session proto definition.", "id": "GoogleCloudDiscoveryengineV1alphaSession", @@ -12475,6 +12529,12 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1betaAdvancedSiteSearchConfig": { + "description": "Configuration data for advance site search.", + "id": "GoogleCloudDiscoveryengineV1betaAdvancedSiteSearchConfig", + "properties": {}, + "type": "object" + }, "GoogleCloudDiscoveryengineV1betaAlloyDbSource": { "description": "AlloyDB source import data from.", "id": "GoogleCloudDiscoveryengineV1betaAlloyDbSource", @@ -13355,7 +13415,7 @@ "description": "Properties of the object.", "type": "any" }, - "description": "Data representation. The structured JSON data for the document. It's populated from the struct data from the Document, or the Chunk in search result. .", + "description": "Data representation. The structured JSON data for the document. It's populated from the struct data from the Document, or the Chunk in search result.", "type": "object" }, "title": { @@ -13515,7 +13575,7 @@ "id": "GoogleCloudDiscoveryengineV1betaBatchGetDocumentsMetadataResponseDocumentMetadataMatcherValue", "properties": { "fhirResource": { - "description": "Required. Format: projects/{project}/locations/{location}/datasets/{dataset}/fhirStores/{fhir_store}/fhir/{resource_type}/{fhir_resource_id}", + "description": "Format: projects/{project}/locations/{location}/datasets/{dataset}/fhirStores/{fhir_store}/fhir/{resource_type}/{fhir_resource_id}", "type": "string" }, "uri": { @@ -13718,7 +13778,7 @@ "id": "GoogleCloudDiscoveryengineV1betaCheckGroundingRequest", "properties": { "answerCandidate": { - "description": "Answer candidate to check. Can have a maximum length of 1024 characters.", + "description": "Answer candidate to check. It can have a maximum length of 4096 tokens.", "type": "string" }, "facts": { @@ -13749,7 +13809,7 @@ "citedChunks": { "description": "List of facts cited across all claims in the answer candidate. These are derived from the facts supplied in the request.", "items": { - "$ref": "GoogleCloudDiscoveryengineV1betaFactChunk" + "$ref": "GoogleCloudDiscoveryengineV1betaCheckGroundingResponseFactChunk" }, "type": "array" }, @@ -13801,6 +13861,21 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1betaCheckGroundingResponseFactChunk": { + "description": "Fact chunk for grounding check.", + "id": "GoogleCloudDiscoveryengineV1betaCheckGroundingResponseFactChunk", + "properties": { + "chunkText": { + "description": "Text content of the fact chunk. Can be at most 10K characters long.", + "type": "string" + }, + "source": { + "description": "Source from which this fact chunk was retrieved. For a fact chunk retrieved from inline facts, this field will contain the index of the specific fact from which this chunk was retrieved.", + "type": "string" + } + }, + "type": "object" + }, "GoogleCloudDiscoveryengineV1betaCheckGroundingSpec": { "description": "Specification for the grounding check.", "id": "GoogleCloudDiscoveryengineV1betaCheckGroundingSpec", @@ -14109,8 +14184,12 @@ }, "type": "array" }, + "queryRegex": { + "description": "Optional. Query regex to match the whole search query. Cannot be set when Condition.query_terms is set. This is currently supporting promotion use case.", + "type": "string" + }, "queryTerms": { - "description": "Search only A list of terms to match the query on. Maximum of 10 query terms.", + "description": "Search only A list of terms to match the query on. Cannot be set when Condition.query_regex is set. Maximum of 10 query terms.", "items": { "$ref": "GoogleCloudDiscoveryengineV1betaConditionQueryTerm" }, @@ -14567,7 +14646,7 @@ "properties": { "createTime": { "deprecated": true, - "description": "Timestamp the Model was created at.", + "description": "Deprecated: Timestamp the Model was created at.", "format": "google-datetime", "type": "string" }, @@ -14632,6 +14711,10 @@ "description": "DataStore captures global settings and configs at the DataStore level.", "id": "GoogleCloudDiscoveryengineV1betaDataStore", "properties": { + "advancedSiteSearchConfig": { + "$ref": "GoogleCloudDiscoveryengineV1betaAdvancedSiteSearchConfig", + "description": "Optional. Configuration for advanced site search." + }, "billingEstimation": { "$ref": "GoogleCloudDiscoveryengineV1betaDataStoreBillingEstimation", "description": "Output only. Data size estimation for billing.", @@ -14712,7 +14795,7 @@ "description": "Optional. Configuration for Natural Language Query Understanding." }, "servingConfigDataStore": { - "$ref": "GoogleCloudDiscoveryengineV1betaServingConfigDataStore", + "$ref": "GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore", "description": "Optional. Stores serving config at DataStore level." }, "solutionTypes": { @@ -14784,6 +14867,17 @@ }, "type": "object" }, + "GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore": { + "description": "Stores information regarding the serving configurations at DataStore level.", + "id": "GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore", + "properties": { + "disabledForServing": { + "description": "If set true, the DataStore will not be available for serving search requests.", + "type": "boolean" + } + }, + "type": "object" + }, "GoogleCloudDiscoveryengineV1betaDeleteDataStoreMetadata": { "description": "Metadata related to the progress of the DataStoreService.DeleteDataStore operation. This will be returned by the google.longrunning.Operation.metadata field.", "id": "GoogleCloudDiscoveryengineV1betaDeleteDataStoreMetadata", @@ -15448,33 +15542,6 @@ }, "type": "object" }, - "GoogleCloudDiscoveryengineV1betaFactChunk": { - "description": "Fact Chunk.", - "id": "GoogleCloudDiscoveryengineV1betaFactChunk", - "properties": { - "chunkText": { - "description": "Text content of the fact chunk. Can be at most 10K characters long.", - "type": "string" - }, - "index": { - "description": "The index of this chunk. Currently, only used for the streaming mode.", - "format": "int32", - "type": "integer" - }, - "source": { - "description": "Source from which this fact chunk was retrieved. If it was retrieved from the GroundingFacts provided in the request then this field will contain the index of the specific fact from which this chunk was retrieved.", - "type": "string" - }, - "sourceMetadata": { - "additionalProperties": { - "type": "string" - }, - "description": "More fine-grained information for the source reference.", - "type": "object" - } - }, - "type": "object" - }, "GoogleCloudDiscoveryengineV1betaFetchDomainVerificationStatusResponse": { "description": "Response message for SiteSearchEngineService.FetchDomainVerificationStatus method.", "id": "GoogleCloudDiscoveryengineV1betaFetchDomainVerificationStatusResponse", @@ -18628,17 +18695,6 @@ }, "type": "object" }, - "GoogleCloudDiscoveryengineV1betaServingConfigDataStore": { - "description": "Stores information regarding the serving configurations at DataStore level.", - "id": "GoogleCloudDiscoveryengineV1betaServingConfigDataStore", - "properties": { - "disabledForServing": { - "description": "If set true, the DataStore will not be available for serving search requests.", - "type": "boolean" - } - }, - "type": "object" - }, "GoogleCloudDiscoveryengineV1betaServingConfigGenericConfig": { "description": "Specifies the configurations needed for Generic Discovery.Currently we support: * `content_search_spec`: configuration for generic content search.", "id": "GoogleCloudDiscoveryengineV1betaServingConfigGenericConfig", @@ -18669,6 +18725,11 @@ "format": "float", "type": "number" }, + "demoteContentWatchedPastDays": { + "description": "Optional. Specifies the number of days to look back for demoting watched content. If set to zero or unset, defaults to the maximum of 365 days.", + "format": "int32", + "type": "integer" + }, "demotionEventType": { "description": "Specifies the event type used for demoting recommendation result. Currently supported values: * `view-item`: Item viewed. * `media-play`: Start/resume watching a video, playing a song, etc. * `media-complete`: Finished or stopped midway through a video, song, etc. If unset, watch history demotion will not be applied. Content freshness demotion will still be applied.", "type": "string" diff --git a/discoveryengine/v1beta/discoveryengine-gen.go b/discoveryengine/v1beta/discoveryengine-gen.go index 27cc9b064a3..c2c17693a11 100644 --- a/discoveryengine/v1beta/discoveryengine-gen.go +++ b/discoveryengine/v1beta/discoveryengine-gen.go @@ -1159,6 +1159,11 @@ func (s GoogleCloudDiscoveryengineLoggingSourceLocation) MarshalJSON() ([]byte, return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1AdvancedSiteSearchConfig: Configuration data for +// advance site search. +type GoogleCloudDiscoveryengineV1AdvancedSiteSearchConfig struct { +} + // GoogleCloudDiscoveryengineV1BatchCreateTargetSiteMetadata: Metadata related // to the progress of the SiteSearchEngineService.BatchCreateTargetSites // operation. This will be returned by the @@ -1266,8 +1271,12 @@ type GoogleCloudDiscoveryengineV1Condition struct { // ActiveTimeRange: Range of time(s) specifying when condition is active. // Maximum of 10 time ranges. ActiveTimeRange []*GoogleCloudDiscoveryengineV1ConditionTimeRange `json:"activeTimeRange,omitempty"` - // QueryTerms: Search only A list of terms to match the query on. Maximum of 10 - // query terms. + // QueryRegex: Optional. Query regex to match the whole search query. Cannot be + // set when Condition.query_terms is set. This is currently supporting + // promotion use case. + QueryRegex string `json:"queryRegex,omitempty"` + // QueryTerms: Search only A list of terms to match the query on. Cannot be set + // when Condition.query_regex is set. Maximum of 10 query terms. QueryTerms []*GoogleCloudDiscoveryengineV1ConditionQueryTerm `json:"queryTerms,omitempty"` // ForceSendFields is a list of field names (e.g. "ActiveTimeRange") to // unconditionally include in API requests. By default, fields with empty or @@ -1650,6 +1659,8 @@ func (s GoogleCloudDiscoveryengineV1CreateTargetSiteMetadata) MarshalJSON() ([]b // GoogleCloudDiscoveryengineV1DataStore: DataStore captures global settings // and configs at the DataStore level. type GoogleCloudDiscoveryengineV1DataStore struct { + // AdvancedSiteSearchConfig: Optional. Configuration for advanced site search. + AdvancedSiteSearchConfig *GoogleCloudDiscoveryengineV1AdvancedSiteSearchConfig `json:"advancedSiteSearchConfig,omitempty"` // BillingEstimation: Output only. Data size estimation for billing. BillingEstimation *GoogleCloudDiscoveryengineV1DataStoreBillingEstimation `json:"billingEstimation,omitempty"` // CmekConfig: Output only. CMEK-related information for the DataStore. @@ -1699,7 +1710,7 @@ type GoogleCloudDiscoveryengineV1DataStore struct { // limit of 1024 characters. Name string `json:"name,omitempty"` // ServingConfigDataStore: Optional. Stores serving config at DataStore level. - ServingConfigDataStore *GoogleCloudDiscoveryengineV1ServingConfigDataStore `json:"servingConfigDataStore,omitempty"` + ServingConfigDataStore *GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore `json:"servingConfigDataStore,omitempty"` // SolutionTypes: The solutions that the data store enrolls. Available // solutions for each industry_vertical: * `MEDIA`: // `SOLUTION_TYPE_RECOMMENDATION` and `SOLUTION_TYPE_SEARCH`. * `SITE_SEARCH`: @@ -1729,15 +1740,15 @@ type GoogleCloudDiscoveryengineV1DataStore struct { // data. This must be set when DataStore.content_config is set as // DataStore.ContentConfig.GOOGLE_WORKSPACE. WorkspaceConfig *GoogleCloudDiscoveryengineV1WorkspaceConfig `json:"workspaceConfig,omitempty"` - // ForceSendFields is a list of field names (e.g. "BillingEstimation") to - // unconditionally include in API requests. By default, fields with empty or + // ForceSendFields is a list of field names (e.g. "AdvancedSiteSearchConfig") + // to unconditionally include in API requests. By default, fields with empty or // default values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more // details. ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "BillingEstimation") to include in - // API requests with the JSON null value. By default, fields with empty values - // are omitted from API requests. See + // NullFields is a list of field names (e.g. "AdvancedSiteSearchConfig") to + // include in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. NullFields []string `json:"-"` } @@ -1780,6 +1791,30 @@ func (s GoogleCloudDiscoveryengineV1DataStoreBillingEstimation) MarshalJSON() ([ return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore: Stores +// information regarding the serving configurations at DataStore level. +type GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore struct { + // DisabledForServing: If set true, the DataStore will not be available for + // serving search requests. + DisabledForServing bool `json:"disabledForServing,omitempty"` + // ForceSendFields is a list of field names (e.g. "DisabledForServing") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "DisabledForServing") to include + // in API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1DataStoreServingConfigDataStore + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1DeleteDataStoreMetadata: Metadata related to the // progress of the DataStoreService.DeleteDataStore operation. This will be // returned by the google.longrunning.Operation.metadata field. @@ -2908,30 +2943,6 @@ func (s GoogleCloudDiscoveryengineV1Schema) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// GoogleCloudDiscoveryengineV1ServingConfigDataStore: Stores information -// regarding the serving configurations at DataStore level. -type GoogleCloudDiscoveryengineV1ServingConfigDataStore struct { - // DisabledForServing: If set true, the DataStore will not be available for - // serving search requests. - DisabledForServing bool `json:"disabledForServing,omitempty"` - // ForceSendFields is a list of field names (e.g. "DisabledForServing") to - // unconditionally include in API requests. By default, fields with empty or - // default values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more - // details. - ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "DisabledForServing") to include - // in API requests with the JSON null value. By default, fields with empty - // values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. - NullFields []string `json:"-"` -} - -func (s GoogleCloudDiscoveryengineV1ServingConfigDataStore) MarshalJSON() ([]byte, error) { - type NoMethod GoogleCloudDiscoveryengineV1ServingConfigDataStore - return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) -} - // GoogleCloudDiscoveryengineV1SiteVerificationInfo: Verification information // for target sites in advanced site search. type GoogleCloudDiscoveryengineV1SiteVerificationInfo struct { @@ -3297,6 +3308,33 @@ func (s GoogleCloudDiscoveryengineV1alphaAclConfig) MarshalJSON() ([]byte, error return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig: Configuration +// data for advance site search. +type GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig struct { + // DisableAutomaticRefresh: If set true, automatic refresh is disabled for the + // DataStore. + DisableAutomaticRefresh bool `json:"disableAutomaticRefresh,omitempty"` + // DisableInitialIndex: If set true, initial indexing is disabled for the + // DataStore. + DisableInitialIndex bool `json:"disableInitialIndex,omitempty"` + // ForceSendFields is a list of field names (e.g. "DisableAutomaticRefresh") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "DisableAutomaticRefresh") to + // include in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1alphaAnswer: Defines an answer. type GoogleCloudDiscoveryengineV1alphaAnswer struct { // AnswerSkippedReasons: Additional answer-skipped reasons. This provides the @@ -3777,7 +3815,7 @@ type GoogleCloudDiscoveryengineV1alphaAnswerStepActionObservationSearchResult st SnippetInfo []*GoogleCloudDiscoveryengineV1alphaAnswerStepActionObservationSearchResultSnippetInfo `json:"snippetInfo,omitempty"` // StructData: Data representation. The structured JSON data for the document. // It's populated from the struct data from the Document, or the Chunk in - // search result. . + // search result. StructData googleapi.RawMessage `json:"structData,omitempty"` // Title: Title. Title string `json:"title,omitempty"` @@ -4000,8 +4038,12 @@ type GoogleCloudDiscoveryengineV1alphaCondition struct { // ActiveTimeRange: Range of time(s) specifying when condition is active. // Maximum of 10 time ranges. ActiveTimeRange []*GoogleCloudDiscoveryengineV1alphaConditionTimeRange `json:"activeTimeRange,omitempty"` - // QueryTerms: Search only A list of terms to match the query on. Maximum of 10 - // query terms. + // QueryRegex: Optional. Query regex to match the whole search query. Cannot be + // set when Condition.query_terms is set. This is currently supporting + // promotion use case. + QueryRegex string `json:"queryRegex,omitempty"` + // QueryTerms: Search only A list of terms to match the query on. Cannot be set + // when Condition.query_regex is set. Maximum of 10 query terms. QueryTerms []*GoogleCloudDiscoveryengineV1alphaConditionQueryTerm `json:"queryTerms,omitempty"` // ForceSendFields is a list of field names (e.g. "ActiveTimeRange") to // unconditionally include in API requests. By default, fields with empty or @@ -4413,7 +4455,7 @@ func (s GoogleCloudDiscoveryengineV1alphaCustomFineTuningSpec) MarshalJSON() ([] // GoogleCloudDiscoveryengineV1alphaCustomTuningModel: Metadata that describes // a custom tuned model. type GoogleCloudDiscoveryengineV1alphaCustomTuningModel struct { - // CreateTime: Timestamp the Model was created at. + // CreateTime: Deprecated: Timestamp the Model was created at. CreateTime string `json:"createTime,omitempty"` // DisplayName: The display name of the model. DisplayName string `json:"displayName,omitempty"` @@ -4475,6 +4517,8 @@ type GoogleCloudDiscoveryengineV1alphaDataStore struct { // is only supported in `GENERIC` industry vertical with non-`PUBLIC_WEBSITE` // content config. AclEnabled bool `json:"aclEnabled,omitempty"` + // AdvancedSiteSearchConfig: Optional. Configuration for advanced site search. + AdvancedSiteSearchConfig *GoogleCloudDiscoveryengineV1alphaAdvancedSiteSearchConfig `json:"advancedSiteSearchConfig,omitempty"` // BillingEstimation: Output only. Data size estimation for billing. BillingEstimation *GoogleCloudDiscoveryengineV1alphaDataStoreBillingEstimation `json:"billingEstimation,omitempty"` // CmekConfig: Output only. CMEK-related information for the DataStore. @@ -4531,7 +4575,7 @@ type GoogleCloudDiscoveryengineV1alphaDataStore struct { // Language Query Understanding. NaturalLanguageQueryUnderstandingConfig *GoogleCloudDiscoveryengineV1alphaNaturalLanguageQueryUnderstandingConfig `json:"naturalLanguageQueryUnderstandingConfig,omitempty"` // ServingConfigDataStore: Optional. Stores serving config at DataStore level. - ServingConfigDataStore *GoogleCloudDiscoveryengineV1alphaServingConfigDataStore `json:"servingConfigDataStore,omitempty"` + ServingConfigDataStore *GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore `json:"servingConfigDataStore,omitempty"` // SolutionTypes: The solutions that the data store enrolls. Available // solutions for each industry_vertical: * `MEDIA`: // `SOLUTION_TYPE_RECOMMENDATION` and `SOLUTION_TYPE_SEARCH`. * `SITE_SEARCH`: @@ -4612,6 +4656,30 @@ func (s GoogleCloudDiscoveryengineV1alphaDataStoreBillingEstimation) MarshalJSON return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore: Stores +// information regarding the serving configurations at DataStore level. +type GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore struct { + // DisabledForServing: If set true, the DataStore will not be available for + // serving search requests. + DisabledForServing bool `json:"disabledForServing,omitempty"` + // ForceSendFields is a list of field names (e.g. "DisabledForServing") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "DisabledForServing") to include + // in API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1alphaDataStoreServingConfigDataStore + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1alphaDeleteDataStoreMetadata: Metadata related // to the progress of the DataStoreService.DeleteDataStore operation. This will // be returned by the google.longrunning.Operation.metadata field. @@ -6670,10 +6738,12 @@ func (s GoogleCloudDiscoveryengineV1alphaQuery) MarshalJSON() ([]byte, error) { type GoogleCloudDiscoveryengineV1alphaRecrawlUrisMetadata struct { // CreateTime: Operation create time. CreateTime string `json:"createTime,omitempty"` - // InvalidUris: Unique URIs in the request that don't match any TargetSite in - // the DataStore, only match TargetSites that haven't been fully indexed, or - // match a TargetSite with type EXCLUDE. + // InvalidUris: Unique URIs in the request that have invalid format. Sample + // limited to 1000. InvalidUris []string `json:"invalidUris,omitempty"` + // InvalidUrisCount: Total number of unique URIs in the request that have + // invalid format. + InvalidUrisCount int64 `json:"invalidUrisCount,omitempty"` // PendingCount: Total number of URIs that have yet to be crawled. PendingCount int64 `json:"pendingCount,omitempty"` // QuotaExceededCount: Total number of URIs that were rejected due to @@ -6684,6 +6754,13 @@ type GoogleCloudDiscoveryengineV1alphaRecrawlUrisMetadata struct { // UpdateTime: Operation last update time. If the operation is done, this is // also the finish time. UpdateTime string `json:"updateTime,omitempty"` + // UrisNotMatchingTargetSites: Unique URIs in the request that don't match any + // TargetSite in the DataStore, only match TargetSites that haven't been fully + // indexed, or match a TargetSite with type EXCLUDE. Sample limited to 1000. + UrisNotMatchingTargetSites []string `json:"urisNotMatchingTargetSites,omitempty"` + // UrisNotMatchingTargetSitesCount: Total number of URIs that don't match any + // TargetSites. + UrisNotMatchingTargetSitesCount int64 `json:"urisNotMatchingTargetSitesCount,omitempty"` // ValidUrisCount: Total number of unique URIs in the request that are not in // invalid_uris. ValidUrisCount int64 `json:"validUrisCount,omitempty"` @@ -7994,30 +8071,6 @@ func (s GoogleCloudDiscoveryengineV1alphaSearchRequestSpellCorrectionSpec) Marsh return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// GoogleCloudDiscoveryengineV1alphaServingConfigDataStore: Stores information -// regarding the serving configurations at DataStore level. -type GoogleCloudDiscoveryengineV1alphaServingConfigDataStore struct { - // DisabledForServing: If set true, the DataStore will not be available for - // serving search requests. - DisabledForServing bool `json:"disabledForServing,omitempty"` - // ForceSendFields is a list of field names (e.g. "DisabledForServing") to - // unconditionally include in API requests. By default, fields with empty or - // default values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more - // details. - ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "DisabledForServing") to include - // in API requests with the JSON null value. By default, fields with empty - // values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. - NullFields []string `json:"-"` -} - -func (s GoogleCloudDiscoveryengineV1alphaServingConfigDataStore) MarshalJSON() ([]byte, error) { - type NoMethod GoogleCloudDiscoveryengineV1alphaServingConfigDataStore - return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) -} - // GoogleCloudDiscoveryengineV1alphaSession: External session proto definition. type GoogleCloudDiscoveryengineV1alphaSession struct { // EndTime: Output only. The time the session finished. @@ -8520,6 +8573,11 @@ func (s GoogleCloudDiscoveryengineV1alphaWorkspaceConfig) MarshalJSON() ([]byte, return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1betaAdvancedSiteSearchConfig: Configuration data +// for advance site search. +type GoogleCloudDiscoveryengineV1betaAdvancedSiteSearchConfig struct { +} + // GoogleCloudDiscoveryengineV1betaAlloyDbSource: AlloyDB source import data // from. type GoogleCloudDiscoveryengineV1betaAlloyDbSource struct { @@ -9694,7 +9752,7 @@ type GoogleCloudDiscoveryengineV1betaAnswerStepActionObservationSearchResult str SnippetInfo []*GoogleCloudDiscoveryengineV1betaAnswerStepActionObservationSearchResultSnippetInfo `json:"snippetInfo,omitempty"` // StructData: Data representation. The structured JSON data for the document. // It's populated from the struct data from the Document, or the Chunk in - // search result. . + // search result. StructData googleapi.RawMessage `json:"structData,omitempty"` // Title: Title. Title string `json:"title,omitempty"` @@ -9953,7 +10011,7 @@ func (s GoogleCloudDiscoveryengineV1betaBatchGetDocumentsMetadataResponseDocumen // dataMatcherValue: The value of the matcher that was used to match the // Document. type GoogleCloudDiscoveryengineV1betaBatchGetDocumentsMetadataResponseDocumentMetadataMatcherValue struct { - // FhirResource: Required. Format: + // FhirResource: Format: // projects/{project}/locations/{location}/datasets/{dataset}/fhirStores/{fhir_s // tore}/fhir/{resource_type}/{fhir_resource_id} FhirResource string `json:"fhirResource,omitempty"` @@ -10205,8 +10263,8 @@ func (s GoogleCloudDiscoveryengineV1betaBigtableSource) MarshalJSON() ([]byte, e // GoogleCloudDiscoveryengineV1betaCheckGroundingRequest: Request message for // GroundedGenerationService.CheckGrounding method. type GoogleCloudDiscoveryengineV1betaCheckGroundingRequest struct { - // AnswerCandidate: Answer candidate to check. Can have a maximum length of - // 1024 characters. + // AnswerCandidate: Answer candidate to check. It can have a maximum length of + // 4096 tokens. AnswerCandidate string `json:"answerCandidate,omitempty"` // Facts: List of facts for the grounding check. We support up to 200 facts. Facts []*GoogleCloudDiscoveryengineV1betaGroundingFact `json:"facts,omitempty"` @@ -10248,7 +10306,7 @@ func (s GoogleCloudDiscoveryengineV1betaCheckGroundingRequest) MarshalJSON() ([] type GoogleCloudDiscoveryengineV1betaCheckGroundingResponse struct { // CitedChunks: List of facts cited across all claims in the answer candidate. // These are derived from the facts supplied in the request. - CitedChunks []*GoogleCloudDiscoveryengineV1betaFactChunk `json:"citedChunks,omitempty"` + CitedChunks []*GoogleCloudDiscoveryengineV1betaCheckGroundingResponseFactChunk `json:"citedChunks,omitempty"` // Claims: Claim texts and citation info across all claims in the answer // candidate. Claims []*GoogleCloudDiscoveryengineV1betaCheckGroundingResponseClaim `json:"claims,omitempty"` @@ -10333,6 +10391,34 @@ func (s GoogleCloudDiscoveryengineV1betaCheckGroundingResponseClaim) MarshalJSON return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1betaCheckGroundingResponseFactChunk: Fact chunk +// for grounding check. +type GoogleCloudDiscoveryengineV1betaCheckGroundingResponseFactChunk struct { + // ChunkText: Text content of the fact chunk. Can be at most 10K characters + // long. + ChunkText string `json:"chunkText,omitempty"` + // Source: Source from which this fact chunk was retrieved. For a fact chunk + // retrieved from inline facts, this field will contain the index of the + // specific fact from which this chunk was retrieved. + Source string `json:"source,omitempty"` + // ForceSendFields is a list of field names (e.g. "ChunkText") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "ChunkText") to include in API + // requests with the JSON null value. By default, fields with empty values are + // omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s GoogleCloudDiscoveryengineV1betaCheckGroundingResponseFactChunk) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1betaCheckGroundingResponseFactChunk + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1betaCheckGroundingSpec: Specification for the // grounding check. type GoogleCloudDiscoveryengineV1betaCheckGroundingSpec struct { @@ -10756,8 +10842,12 @@ type GoogleCloudDiscoveryengineV1betaCondition struct { // ActiveTimeRange: Range of time(s) specifying when condition is active. // Maximum of 10 time ranges. ActiveTimeRange []*GoogleCloudDiscoveryengineV1betaConditionTimeRange `json:"activeTimeRange,omitempty"` - // QueryTerms: Search only A list of terms to match the query on. Maximum of 10 - // query terms. + // QueryRegex: Optional. Query regex to match the whole search query. Cannot be + // set when Condition.query_terms is set. This is currently supporting + // promotion use case. + QueryRegex string `json:"queryRegex,omitempty"` + // QueryTerms: Search only A list of terms to match the query on. Cannot be set + // when Condition.query_regex is set. Maximum of 10 query terms. QueryTerms []*GoogleCloudDiscoveryengineV1betaConditionQueryTerm `json:"queryTerms,omitempty"` // ForceSendFields is a list of field names (e.g. "ActiveTimeRange") to // unconditionally include in API requests. By default, fields with empty or @@ -11422,7 +11512,7 @@ func (s *GoogleCloudDiscoveryengineV1betaCustomAttribute) UnmarshalJSON(data []b // GoogleCloudDiscoveryengineV1betaCustomTuningModel: Metadata that describes a // custom tuned model. type GoogleCloudDiscoveryengineV1betaCustomTuningModel struct { - // CreateTime: Timestamp the Model was created at. + // CreateTime: Deprecated: Timestamp the Model was created at. CreateTime string `json:"createTime,omitempty"` // DisplayName: The display name of the model. DisplayName string `json:"displayName,omitempty"` @@ -11476,6 +11566,8 @@ func (s GoogleCloudDiscoveryengineV1betaCustomTuningModel) MarshalJSON() ([]byte // GoogleCloudDiscoveryengineV1betaDataStore: DataStore captures global // settings and configs at the DataStore level. type GoogleCloudDiscoveryengineV1betaDataStore struct { + // AdvancedSiteSearchConfig: Optional. Configuration for advanced site search. + AdvancedSiteSearchConfig *GoogleCloudDiscoveryengineV1betaAdvancedSiteSearchConfig `json:"advancedSiteSearchConfig,omitempty"` // BillingEstimation: Output only. Data size estimation for billing. BillingEstimation *GoogleCloudDiscoveryengineV1betaDataStoreBillingEstimation `json:"billingEstimation,omitempty"` // CmekConfig: Output only. CMEK-related information for the DataStore. @@ -11530,7 +11622,7 @@ type GoogleCloudDiscoveryengineV1betaDataStore struct { // Language Query Understanding. NaturalLanguageQueryUnderstandingConfig *GoogleCloudDiscoveryengineV1betaNaturalLanguageQueryUnderstandingConfig `json:"naturalLanguageQueryUnderstandingConfig,omitempty"` // ServingConfigDataStore: Optional. Stores serving config at DataStore level. - ServingConfigDataStore *GoogleCloudDiscoveryengineV1betaServingConfigDataStore `json:"servingConfigDataStore,omitempty"` + ServingConfigDataStore *GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore `json:"servingConfigDataStore,omitempty"` // SolutionTypes: The solutions that the data store enrolls. Available // solutions for each industry_vertical: * `MEDIA`: // `SOLUTION_TYPE_RECOMMENDATION` and `SOLUTION_TYPE_SEARCH`. * `SITE_SEARCH`: @@ -11563,15 +11655,15 @@ type GoogleCloudDiscoveryengineV1betaDataStore struct { // ServerResponse contains the HTTP response code and headers from the server. googleapi.ServerResponse `json:"-"` - // ForceSendFields is a list of field names (e.g. "BillingEstimation") to - // unconditionally include in API requests. By default, fields with empty or + // ForceSendFields is a list of field names (e.g. "AdvancedSiteSearchConfig") + // to unconditionally include in API requests. By default, fields with empty or // default values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more // details. ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "BillingEstimation") to include in - // API requests with the JSON null value. By default, fields with empty values - // are omitted from API requests. See + // NullFields is a list of field names (e.g. "AdvancedSiteSearchConfig") to + // include in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. NullFields []string `json:"-"` } @@ -11614,6 +11706,30 @@ func (s GoogleCloudDiscoveryengineV1betaDataStoreBillingEstimation) MarshalJSON( return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } +// GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore: Stores +// information regarding the serving configurations at DataStore level. +type GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore struct { + // DisabledForServing: If set true, the DataStore will not be available for + // serving search requests. + DisabledForServing bool `json:"disabledForServing,omitempty"` + // ForceSendFields is a list of field names (e.g. "DisabledForServing") to + // unconditionally include in API requests. By default, fields with empty or + // default values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "DisabledForServing") to include + // in API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudDiscoveryengineV1betaDataStoreServingConfigDataStore + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + // GoogleCloudDiscoveryengineV1betaDeleteDataStoreMetadata: Metadata related to // the progress of the DataStoreService.DeleteDataStore operation. This will be // returned by the google.longrunning.Operation.metadata field. @@ -12547,37 +12663,6 @@ func (s GoogleCloudDiscoveryengineV1betaEvaluationEvaluationSpecQuerySetSpec) Ma return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// GoogleCloudDiscoveryengineV1betaFactChunk: Fact Chunk. -type GoogleCloudDiscoveryengineV1betaFactChunk struct { - // ChunkText: Text content of the fact chunk. Can be at most 10K characters - // long. - ChunkText string `json:"chunkText,omitempty"` - // Index: The index of this chunk. Currently, only used for the streaming mode. - Index int64 `json:"index,omitempty"` - // Source: Source from which this fact chunk was retrieved. If it was retrieved - // from the GroundingFacts provided in the request then this field will contain - // the index of the specific fact from which this chunk was retrieved. - Source string `json:"source,omitempty"` - // SourceMetadata: More fine-grained information for the source reference. - SourceMetadata map[string]string `json:"sourceMetadata,omitempty"` - // ForceSendFields is a list of field names (e.g. "ChunkText") to - // unconditionally include in API requests. By default, fields with empty or - // default values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more - // details. - ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "ChunkText") to include in API - // requests with the JSON null value. By default, fields with empty values are - // omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. - NullFields []string `json:"-"` -} - -func (s GoogleCloudDiscoveryengineV1betaFactChunk) MarshalJSON() ([]byte, error) { - type NoMethod GoogleCloudDiscoveryengineV1betaFactChunk - return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) -} - // GoogleCloudDiscoveryengineV1betaFetchDomainVerificationStatusResponse: // Response message for SiteSearchEngineService.FetchDomainVerificationStatus // method. @@ -17311,30 +17396,6 @@ func (s GoogleCloudDiscoveryengineV1betaServingConfig) MarshalJSON() ([]byte, er return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// GoogleCloudDiscoveryengineV1betaServingConfigDataStore: Stores information -// regarding the serving configurations at DataStore level. -type GoogleCloudDiscoveryengineV1betaServingConfigDataStore struct { - // DisabledForServing: If set true, the DataStore will not be available for - // serving search requests. - DisabledForServing bool `json:"disabledForServing,omitempty"` - // ForceSendFields is a list of field names (e.g. "DisabledForServing") to - // unconditionally include in API requests. By default, fields with empty or - // default values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more - // details. - ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "DisabledForServing") to include - // in API requests with the JSON null value. By default, fields with empty - // values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. - NullFields []string `json:"-"` -} - -func (s GoogleCloudDiscoveryengineV1betaServingConfigDataStore) MarshalJSON() ([]byte, error) { - type NoMethod GoogleCloudDiscoveryengineV1betaServingConfigDataStore - return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) -} - // GoogleCloudDiscoveryengineV1betaServingConfigGenericConfig: Specifies the // configurations needed for Generic Discovery.Currently we support: * // `content_search_spec`: configuration for generic content search. @@ -17382,6 +17443,10 @@ type GoogleCloudDiscoveryengineV1betaServingConfigMediaConfig struct { // ContentWatchedSecondsThreshold: Specifies the content watched minutes // threshold for demotion. ContentWatchedSecondsThreshold float64 `json:"contentWatchedSecondsThreshold,omitempty"` + // DemoteContentWatchedPastDays: Optional. Specifies the number of days to look + // back for demoting watched content. If set to zero or unset, defaults to the + // maximum of 365 days. + DemoteContentWatchedPastDays int64 `json:"demoteContentWatchedPastDays,omitempty"` // DemotionEventType: Specifies the event type used for demoting recommendation // result. Currently supported values: * `view-item`: Item viewed. * // `media-play`: Start/resume watching a video, playing a song, etc. * diff --git a/file/v1/file-api.json b/file/v1/file-api.json index 901838e93d4..f5ce834cbd8 100644 --- a/file/v1/file-api.json +++ b/file/v1/file-api.json @@ -902,7 +902,7 @@ } } }, - "revision": "20241008", + "revision": "20241015", "rootUrl": "https://file.googleapis.com/", "schemas": { "Backup": { @@ -1144,8 +1144,14 @@ "description": "Fixed IOPS (input/output operations per second) parameters.", "id": "FixedIOPS", "properties": { + "maxIops": { + "description": "Required. Maximum IOPS.", + "format": "int64", + "type": "string" + }, "maxReadIops": { - "description": "Required. Maximum raw read IOPS.", + "deprecated": true, + "description": "Optional. Deprecated: `max_iops` should be used instead of this parameter. Maximum raw read IOPS.", "format": "int64", "type": "string" } @@ -1431,8 +1437,14 @@ "description": "IOPS per TB. Filestore defines TB as 1024^4 bytes (TiB).", "id": "IOPSPerTB", "properties": { + "maxIopsPerTb": { + "description": "Required. Maximum IOPS per TiB.", + "format": "int64", + "type": "string" + }, "maxReadIopsPerTb": { - "description": "Required. Maximum read IOPS per TiB.", + "deprecated": true, + "description": "Optional. Deprecated: `max_iops_per_tb` should be used instead of this parameter. Maximum read IOPS per TiB.", "format": "int64", "type": "string" } diff --git a/file/v1/file-gen.go b/file/v1/file-gen.go index 255a1bd5d6b..bccf38a61d3 100644 --- a/file/v1/file-gen.go +++ b/file/v1/file-gen.go @@ -476,15 +476,18 @@ func (s FileShareConfig) MarshalJSON() ([]byte, error) { // FixedIOPS: Fixed IOPS (input/output operations per second) parameters. type FixedIOPS struct { - // MaxReadIops: Required. Maximum raw read IOPS. + // MaxIops: Required. Maximum IOPS. + MaxIops int64 `json:"maxIops,omitempty,string"` + // MaxReadIops: Optional. Deprecated: `max_iops` should be used instead of this + // parameter. Maximum raw read IOPS. MaxReadIops int64 `json:"maxReadIops,omitempty,string"` - // ForceSendFields is a list of field names (e.g. "MaxReadIops") to - // unconditionally include in API requests. By default, fields with empty or - // default values are omitted from API requests. See + // ForceSendFields is a list of field names (e.g. "MaxIops") to unconditionally + // include in API requests. By default, fields with empty or default values are + // omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more // details. ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "MaxReadIops") to include in API + // NullFields is a list of field names (e.g. "MaxIops") to include in API // requests with the JSON null value. By default, fields with empty values are // omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. @@ -876,17 +879,20 @@ func (s GoogleCloudSaasacceleratorManagementProvidersV1SloMetadata) MarshalJSON( // IOPSPerTB: IOPS per TB. Filestore defines TB as 1024^4 bytes (TiB). type IOPSPerTB struct { - // MaxReadIopsPerTb: Required. Maximum read IOPS per TiB. + // MaxIopsPerTb: Required. Maximum IOPS per TiB. + MaxIopsPerTb int64 `json:"maxIopsPerTb,omitempty,string"` + // MaxReadIopsPerTb: Optional. Deprecated: `max_iops_per_tb` should be used + // instead of this parameter. Maximum read IOPS per TiB. MaxReadIopsPerTb int64 `json:"maxReadIopsPerTb,omitempty,string"` - // ForceSendFields is a list of field names (e.g. "MaxReadIopsPerTb") to + // ForceSendFields is a list of field names (e.g. "MaxIopsPerTb") to // unconditionally include in API requests. By default, fields with empty or // default values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more // details. ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "MaxReadIopsPerTb") to include in - // API requests with the JSON null value. By default, fields with empty values - // are omitted from API requests. See + // NullFields is a list of field names (e.g. "MaxIopsPerTb") to include in API + // requests with the JSON null value. By default, fields with empty values are + // omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. NullFields []string `json:"-"` } diff --git a/firebaseml/v2beta/firebaseml-api.json b/firebaseml/v2beta/firebaseml-api.json index 9681bf8165d..7513fefcd42 100644 --- a/firebaseml/v2beta/firebaseml-api.json +++ b/firebaseml/v2beta/firebaseml-api.json @@ -206,7 +206,7 @@ } } }, - "revision": "20241010", + "revision": "20241021", "rootUrl": "https://firebaseml.googleapis.com/", "schemas": { "Date": { @@ -1570,6 +1570,7 @@ "type": "array" }, "similarityTopK": { + "deprecated": true, "description": "Optional. Number of top k results to return from the selected corpora.", "format": "int32", "type": "integer" diff --git a/iam/v1/iam-api.json b/iam/v1/iam-api.json index 2dd20fbd4d1..8a80e09af27 100644 --- a/iam/v1/iam-api.json +++ b/iam/v1/iam-api.json @@ -3188,7 +3188,7 @@ } } }, - "revision": "20240918", + "revision": "20241017", "rootUrl": "https://iam.googleapis.com/", "schemas": { "AccessRestrictions": { @@ -4280,7 +4280,7 @@ "type": "string" }, "description": { - "description": "A brief description of what this Permission is used for. This permission can ONLY be used in predefined roles.", + "description": "A brief description of what this Permission is used for.", "type": "string" }, "name": { diff --git a/iam/v1/iam-gen.go b/iam/v1/iam-gen.go index a769cfefba7..afea0abe414 100644 --- a/iam/v1/iam-gen.go +++ b/iam/v1/iam-gen.go @@ -2194,8 +2194,7 @@ type Permission struct { // "TESTING" - Permission is being tested to check custom role compatibility. // "NOT_SUPPORTED" - Permission is not supported for custom role use. CustomRolesSupportLevel string `json:"customRolesSupportLevel,omitempty"` - // Description: A brief description of what this Permission is used for. This - // permission can ONLY be used in predefined roles. + // Description: A brief description of what this Permission is used for. Description string `json:"description,omitempty"` // Name: The name of this Permission. Name string `json:"name,omitempty"` diff --git a/identitytoolkit/v1/identitytoolkit-api.json b/identitytoolkit/v1/identitytoolkit-api.json index 87b2ecb8bff..4a96b8c8e67 100644 --- a/identitytoolkit/v1/identitytoolkit-api.json +++ b/identitytoolkit/v1/identitytoolkit-api.json @@ -1239,7 +1239,7 @@ } } }, - "revision": "20240417", + "revision": "20241017", "rootUrl": "https://identitytoolkit.googleapis.com/", "schemas": { "GoogleCloudIdentitytoolkitV1Argon2Parameters": { @@ -2448,6 +2448,26 @@ "$ref": "GoogleCloudIdentitytoolkitV1AutoRetrievalInfo", "description": "Android only. Used by Google Play Services to identify the app for auto-retrieval." }, + "captchaResponse": { + "description": "Optional. The reCAPTCHA Enterprise token provided by the reCAPTCHA client-side integration. Required when reCAPTCHA enterprise is enabled.", + "type": "string" + }, + "clientType": { + "description": "Optional. The client type, web, android or ios. Required when reCAPTCHA Enterprise is enabled.", + "enum": [ + "CLIENT_TYPE_UNSPECIFIED", + "CLIENT_TYPE_WEB", + "CLIENT_TYPE_ANDROID", + "CLIENT_TYPE_IOS" + ], + "enumDescriptions": [ + "Client type is not specified.", + "Client type is web.", + "Client type is android.", + "Client type is ios." + ], + "type": "string" + }, "iosReceipt": { "description": "Receipt of successful iOS app token validation. At least one of (`ios_receipt` and `ios_secret`), `recaptcha_token`, or `safety_net_token` must be specified to verify the verification code is being sent on behalf of a real app and not an emulator. This should come from the response of verifyIosClient. If present, the caller should also provide the `ios_secret`, as well as a bundle ID in the `x-ios-bundle-identifier` header, which must match the bundle ID from the verifyIosClient request.", "type": "string" @@ -2468,6 +2488,18 @@ "description": "Recaptcha token for app verification. At least one of (`ios_receipt` and `ios_secret`), `recaptcha_token`, or `safety_net_token` must be specified to verify the verification code is being sent on behalf of a real app and not an emulator. The recaptcha should be generated by calling getRecaptchaParams and the recaptcha token will be generated on user completion of the recaptcha challenge.", "type": "string" }, + "recaptchaVersion": { + "description": "Optional. The reCAPTCHA version of the reCAPTCHA token in the captcha_response.", + "enum": [ + "RECAPTCHA_VERSION_UNSPECIFIED", + "RECAPTCHA_ENTERPRISE" + ], + "enumDescriptions": [ + "The reCAPTCHA version is not specified.", + "The reCAPTCHA enterprise." + ], + "type": "string" + }, "safetyNetToken": { "description": "Android only. Used to assert application identity in place of a recaptcha token. At least one of (`ios_receipt` and `ios_secret`), `recaptcha_token`, or `safety_net_token` must be specified to verify the verification code is being sent on behalf of a real app and not an emulator. A SafetyNet Token can be generated via the [SafetyNet Android Attestation API](https://developer.android.com/training/safetynet/attestation.html), with the Base64 encoding of the `phone_number` field as the nonce.", "type": "string" diff --git a/identitytoolkit/v1/identitytoolkit-gen.go b/identitytoolkit/v1/identitytoolkit-gen.go index 26167164e79..57eb1e626de 100644 --- a/identitytoolkit/v1/identitytoolkit-gen.go +++ b/identitytoolkit/v1/identitytoolkit-gen.go @@ -1627,6 +1627,19 @@ type GoogleCloudIdentitytoolkitV1SendVerificationCodeRequest struct { // AutoRetrievalInfo: Android only. Used by Google Play Services to identify // the app for auto-retrieval. AutoRetrievalInfo *GoogleCloudIdentitytoolkitV1AutoRetrievalInfo `json:"autoRetrievalInfo,omitempty"` + // CaptchaResponse: Optional. The reCAPTCHA Enterprise token provided by the + // reCAPTCHA client-side integration. Required when reCAPTCHA enterprise is + // enabled. + CaptchaResponse string `json:"captchaResponse,omitempty"` + // ClientType: Optional. The client type, web, android or ios. Required when + // reCAPTCHA Enterprise is enabled. + // + // Possible values: + // "CLIENT_TYPE_UNSPECIFIED" - Client type is not specified. + // "CLIENT_TYPE_WEB" - Client type is web. + // "CLIENT_TYPE_ANDROID" - Client type is android. + // "CLIENT_TYPE_IOS" - Client type is ios. + ClientType string `json:"clientType,omitempty"` // IosReceipt: Receipt of successful iOS app token validation. At least one of // (`ios_receipt` and `ios_secret`), `recaptcha_token`, or `safety_net_token` // must be specified to verify the verification code is being sent on behalf of @@ -1658,6 +1671,13 @@ type GoogleCloudIdentitytoolkitV1SendVerificationCodeRequest struct { // getRecaptchaParams and the recaptcha token will be generated on user // completion of the recaptcha challenge. RecaptchaToken string `json:"recaptchaToken,omitempty"` + // RecaptchaVersion: Optional. The reCAPTCHA version of the reCAPTCHA token in + // the captcha_response. + // + // Possible values: + // "RECAPTCHA_VERSION_UNSPECIFIED" - The reCAPTCHA version is not specified. + // "RECAPTCHA_ENTERPRISE" - The reCAPTCHA enterprise. + RecaptchaVersion string `json:"recaptchaVersion,omitempty"` // SafetyNetToken: Android only. Used to assert application identity in place // of a recaptcha token. At least one of (`ios_receipt` and `ios_secret`), // `recaptcha_token`, or `safety_net_token` must be specified to verify the diff --git a/identitytoolkit/v2/identitytoolkit-api.json b/identitytoolkit/v2/identitytoolkit-api.json index f0451ed02d8..733d80081f1 100644 --- a/identitytoolkit/v2/identitytoolkit-api.json +++ b/identitytoolkit/v2/identitytoolkit-api.json @@ -1655,7 +1655,7 @@ } } }, - "revision": "20240522", + "revision": "20241017", "rootUrl": "https://identitytoolkit.googleapis.com/", "schemas": { "GoogleCloudIdentitytoolkitAdminV2AllowByDefault": { @@ -2638,6 +2638,22 @@ }, "type": "array" }, + "phoneEnforcementState": { + "description": "The reCAPTCHA config for phone provider, containing the enforcement status. The phone provider contains all related user flows protected by reCAPTCHA.", + "enum": [ + "RECAPTCHA_PROVIDER_ENFORCEMENT_STATE_UNSPECIFIED", + "OFF", + "AUDIT", + "ENFORCE" + ], + "enumDescriptions": [ + "Enforcement state has not been set.", + "Unenforced.", + "reCAPTCHA assessment is created, result is not used to enforce.", + "reCAPTCHA assessment is created, result is used to enforce." + ], + "type": "string" + }, "recaptchaKeys": { "description": "The reCAPTCHA keys.", "items": { @@ -2645,6 +2661,13 @@ }, "type": "array" }, + "tollFraudManagedRules": { + "description": "The managed rules for toll fraud provider, containing the enforcement status. The toll fraud provider contains all SMS related user flows.", + "items": { + "$ref": "GoogleCloudIdentitytoolkitAdminV2RecaptchaTollFraudManagedRule" + }, + "type": "array" + }, "useAccountDefender": { "description": "Whether to use the account defender for reCAPTCHA assessment. Defaults to `false`.", "type": "boolean" @@ -2703,6 +2726,30 @@ }, "type": "object" }, + "GoogleCloudIdentitytoolkitAdminV2RecaptchaTollFraudManagedRule": { + "description": "The config for a reCAPTCHA toll fraud assessment managed rule. Models a single interval [start_score, end_score]. The start_score is maximum_allowed_score. End score is 1.0.", + "id": "GoogleCloudIdentitytoolkitAdminV2RecaptchaTollFraudManagedRule", + "properties": { + "action": { + "description": "The action taken if the reCAPTCHA score of a request is within the interval [start_score, end_score].", + "enum": [ + "RECAPTCHA_ACTION_UNSPECIFIED", + "BLOCK" + ], + "enumDescriptions": [ + "The reCAPTCHA action is not specified.", + "The reCAPTCHA-protected request will be blocked." + ], + "type": "string" + }, + "startScore": { + "description": "The start score (inclusive) for an action. A score of 0.0 indicates the safest request (likely legitimate), whereas 1.0 indicates the riskiest request (likely toll fraud). See https://cloud.google.com/recaptcha-enterprise/docs/sms-fraud-detection#create-assessment-sms.", + "format": "float", + "type": "number" + } + }, + "type": "object" + }, "GoogleCloudIdentitytoolkitAdminV2RequestLogging": { "description": "Configuration for logging requests made to this project to Stackdriver Logging", "id": "GoogleCloudIdentitytoolkitAdminV2RequestLogging", @@ -3350,11 +3397,13 @@ "description": "The provider that has reCAPTCHA protection.", "enum": [ "RECAPTCHA_PROVIDER_UNSPECIFIED", - "EMAIL_PASSWORD_PROVIDER" + "EMAIL_PASSWORD_PROVIDER", + "PHONE_PROVIDER" ], "enumDescriptions": [ "reCAPTCHA provider not specified", - "Email password provider" + "Email password provider", + "Phone auth provider" ], "type": "string" } @@ -3456,6 +3505,26 @@ "$ref": "GoogleCloudIdentitytoolkitV2AutoRetrievalInfo", "description": "Android only. Used by Google Play Services to identify the app for auto-retrieval." }, + "captchaResponse": { + "description": "The reCAPTCHA Enterprise token provided by the reCAPTCHA client-side integration. Required when reCAPTCHA enterprise is enabled.", + "type": "string" + }, + "clientType": { + "description": "The client type, web, android or ios. Required when reCAPTCHA Enterprise is enabled.", + "enum": [ + "CLIENT_TYPE_UNSPECIFIED", + "CLIENT_TYPE_WEB", + "CLIENT_TYPE_ANDROID", + "CLIENT_TYPE_IOS" + ], + "enumDescriptions": [ + "Client type is not specified.", + "Client type is web.", + "Client type is android.", + "Client type is ios." + ], + "type": "string" + }, "iosReceipt": { "description": "iOS only. Receipt of successful app token validation with APNS.", "type": "string" @@ -3476,6 +3545,18 @@ "description": "Web only. Recaptcha solution.", "type": "string" }, + "recaptchaVersion": { + "description": "The reCAPTCHA version of the reCAPTCHA token in the captcha_response.", + "enum": [ + "RECAPTCHA_VERSION_UNSPECIFIED", + "RECAPTCHA_ENTERPRISE" + ], + "enumDescriptions": [ + "The reCAPTCHA version is not specified.", + "The reCAPTCHA enterprise." + ], + "type": "string" + }, "safetyNetToken": { "description": "Android only. Used to assert application identity in place of a recaptcha token. A SafetyNet Token can be generated via the [SafetyNet Android Attestation API](https://developer.android.com/training/safetynet/attestation.html), with the Base64 encoding of the `phone_number` field as the nonce.", "type": "string" diff --git a/identitytoolkit/v2/identitytoolkit-gen.go b/identitytoolkit/v2/identitytoolkit-gen.go index f551fecdbf3..d6a754a8e98 100644 --- a/identitytoolkit/v2/identitytoolkit-gen.go +++ b/identitytoolkit/v2/identitytoolkit-gen.go @@ -1615,8 +1615,23 @@ type GoogleCloudIdentitytoolkitAdminV2RecaptchaConfig struct { // ManagedRules: The managed rules for authentication action based on reCAPTCHA // scores. The rules are shared across providers for a given tenant project. ManagedRules []*GoogleCloudIdentitytoolkitAdminV2RecaptchaManagedRule `json:"managedRules,omitempty"` + // PhoneEnforcementState: The reCAPTCHA config for phone provider, containing + // the enforcement status. The phone provider contains all related user flows + // protected by reCAPTCHA. + // + // Possible values: + // "RECAPTCHA_PROVIDER_ENFORCEMENT_STATE_UNSPECIFIED" - Enforcement state has + // not been set. + // "OFF" - Unenforced. + // "AUDIT" - reCAPTCHA assessment is created, result is not used to enforce. + // "ENFORCE" - reCAPTCHA assessment is created, result is used to enforce. + PhoneEnforcementState string `json:"phoneEnforcementState,omitempty"` // RecaptchaKeys: The reCAPTCHA keys. RecaptchaKeys []*GoogleCloudIdentitytoolkitAdminV2RecaptchaKey `json:"recaptchaKeys,omitempty"` + // TollFraudManagedRules: The managed rules for toll fraud provider, containing + // the enforcement status. The toll fraud provider contains all SMS related + // user flows. + TollFraudManagedRules []*GoogleCloudIdentitytoolkitAdminV2RecaptchaTollFraudManagedRule `json:"tollFraudManagedRules,omitempty"` // UseAccountDefender: Whether to use the account defender for reCAPTCHA // assessment. Defaults to `false`. UseAccountDefender bool `json:"useAccountDefender,omitempty"` @@ -1721,6 +1736,55 @@ func (s *GoogleCloudIdentitytoolkitAdminV2RecaptchaManagedRule) UnmarshalJSON(da return nil } +// GoogleCloudIdentitytoolkitAdminV2RecaptchaTollFraudManagedRule: The config +// for a reCAPTCHA toll fraud assessment managed rule. Models a single interval +// [start_score, end_score]. The start_score is maximum_allowed_score. End +// score is 1.0. +type GoogleCloudIdentitytoolkitAdminV2RecaptchaTollFraudManagedRule struct { + // Action: The action taken if the reCAPTCHA score of a request is within the + // interval [start_score, end_score]. + // + // Possible values: + // "RECAPTCHA_ACTION_UNSPECIFIED" - The reCAPTCHA action is not specified. + // "BLOCK" - The reCAPTCHA-protected request will be blocked. + Action string `json:"action,omitempty"` + // StartScore: The start score (inclusive) for an action. A score of 0.0 + // indicates the safest request (likely legitimate), whereas 1.0 indicates the + // riskiest request (likely toll fraud). See + // https://cloud.google.com/recaptcha-enterprise/docs/sms-fraud-detection#create-assessment-sms. + StartScore float64 `json:"startScore,omitempty"` + // ForceSendFields is a list of field names (e.g. "Action") to unconditionally + // include in API requests. By default, fields with empty or default values are + // omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more + // details. + ForceSendFields []string `json:"-"` + // NullFields is a list of field names (e.g. "Action") to include in API + // requests with the JSON null value. By default, fields with empty values are + // omitted from API requests. See + // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. + NullFields []string `json:"-"` +} + +func (s GoogleCloudIdentitytoolkitAdminV2RecaptchaTollFraudManagedRule) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudIdentitytoolkitAdminV2RecaptchaTollFraudManagedRule + return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) +} + +func (s *GoogleCloudIdentitytoolkitAdminV2RecaptchaTollFraudManagedRule) UnmarshalJSON(data []byte) error { + type NoMethod GoogleCloudIdentitytoolkitAdminV2RecaptchaTollFraudManagedRule + var s1 struct { + StartScore gensupport.JSONFloat64 `json:"startScore"` + *NoMethod + } + s1.NoMethod = (*NoMethod)(s) + if err := json.Unmarshal(data, &s1); err != nil { + return err + } + s.StartScore = float64(s1.StartScore) + return nil +} + // GoogleCloudIdentitytoolkitAdminV2RequestLogging: Configuration for logging // requests made to this project to Stackdriver Logging type GoogleCloudIdentitytoolkitAdminV2RequestLogging struct { @@ -2538,6 +2602,7 @@ type GoogleCloudIdentitytoolkitV2RecaptchaEnforcementState struct { // Possible values: // "RECAPTCHA_PROVIDER_UNSPECIFIED" - reCAPTCHA provider not specified // "EMAIL_PASSWORD_PROVIDER" - Email password provider + // "PHONE_PROVIDER" - Phone auth provider Provider string `json:"provider,omitempty"` // ForceSendFields is a list of field names (e.g. "EnforcementState") to // unconditionally include in API requests. By default, fields with empty or @@ -2680,6 +2745,18 @@ type GoogleCloudIdentitytoolkitV2StartMfaPhoneRequestInfo struct { // AutoRetrievalInfo: Android only. Used by Google Play Services to identify // the app for auto-retrieval. AutoRetrievalInfo *GoogleCloudIdentitytoolkitV2AutoRetrievalInfo `json:"autoRetrievalInfo,omitempty"` + // CaptchaResponse: The reCAPTCHA Enterprise token provided by the reCAPTCHA + // client-side integration. Required when reCAPTCHA enterprise is enabled. + CaptchaResponse string `json:"captchaResponse,omitempty"` + // ClientType: The client type, web, android or ios. Required when reCAPTCHA + // Enterprise is enabled. + // + // Possible values: + // "CLIENT_TYPE_UNSPECIFIED" - Client type is not specified. + // "CLIENT_TYPE_WEB" - Client type is web. + // "CLIENT_TYPE_ANDROID" - Client type is android. + // "CLIENT_TYPE_IOS" - Client type is ios. + ClientType string `json:"clientType,omitempty"` // IosReceipt: iOS only. Receipt of successful app token validation with APNS. IosReceipt string `json:"iosReceipt,omitempty"` // IosSecret: iOS only. Secret delivered to iOS app via APNS. @@ -2694,6 +2771,13 @@ type GoogleCloudIdentitytoolkitV2StartMfaPhoneRequestInfo struct { PlayIntegrityToken string `json:"playIntegrityToken,omitempty"` // RecaptchaToken: Web only. Recaptcha solution. RecaptchaToken string `json:"recaptchaToken,omitempty"` + // RecaptchaVersion: The reCAPTCHA version of the reCAPTCHA token in the + // captcha_response. + // + // Possible values: + // "RECAPTCHA_VERSION_UNSPECIFIED" - The reCAPTCHA version is not specified. + // "RECAPTCHA_ENTERPRISE" - The reCAPTCHA enterprise. + RecaptchaVersion string `json:"recaptchaVersion,omitempty"` // SafetyNetToken: Android only. Used to assert application identity in place // of a recaptcha token. A SafetyNet Token can be generated via the SafetyNet // Android Attestation API diff --git a/monitoring/v3/monitoring-api.json b/monitoring/v3/monitoring-api.json index 5990a5dce89..f099d51186e 100644 --- a/monitoring/v3/monitoring-api.json +++ b/monitoring/v3/monitoring-api.json @@ -1427,7 +1427,7 @@ ], "parameters": { "force": { - "description": "If true, the notification channel will be deleted regardless of its use in alert policies (the policies will be updated to remove the channel). If false, channels that are still referenced by an existing alerting policy will fail to be deleted in a delete operation.", + "description": "If true, the notification channel will be deleted regardless of its use in alert policies (the policies will be updated to remove the channel). If false, this operation will fail if the notification channel is referenced by existing alerting policies.", "location": "query", "type": "boolean" }, @@ -2715,7 +2715,7 @@ } } }, - "revision": "20241003", + "revision": "20241017", "rootUrl": "https://monitoring.googleapis.com/", "schemas": { "Aggregation": { diff --git a/monitoring/v3/monitoring-gen.go b/monitoring/v3/monitoring-gen.go index 6d095a9c3a9..7ac84fbb33e 100644 --- a/monitoring/v3/monitoring-gen.go +++ b/monitoring/v3/monitoring-gen.go @@ -10054,9 +10054,8 @@ func (r *ProjectsNotificationChannelsService) Delete(name string) *ProjectsNotif // Force sets the optional parameter "force": If true, the notification channel // will be deleted regardless of its use in alert policies (the policies will -// be updated to remove the channel). If false, channels that are still -// referenced by an existing alerting policy will fail to be deleted in a -// delete operation. +// be updated to remove the channel). If false, this operation will fail if the +// notification channel is referenced by existing alerting policies. func (c *ProjectsNotificationChannelsDeleteCall) Force(force bool) *ProjectsNotificationChannelsDeleteCall { c.urlParams_.Set("force", fmt.Sprint(force)) return c diff --git a/retail/v2/retail-api.json b/retail/v2/retail-api.json index eb4bbbe9997..c1b0ae6138c 100644 --- a/retail/v2/retail-api.json +++ b/retail/v2/retail-api.json @@ -2246,7 +2246,7 @@ } } }, - "revision": "20241003", + "revision": "20241017", "rootUrl": "https://retail.googleapis.com/", "schemas": { "GoogleApiHttpBody": { @@ -6697,21 +6697,6 @@ "frequentlyBoughtTogetherConfig": { "$ref": "GoogleCloudRetailV2alphaModelFrequentlyBoughtTogetherFeaturesConfig", "description": "Additional configs for frequently-bought-together models." - }, - "llmEmbeddingConfig": { - "$ref": "GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig", - "description": "Optional. LLM embedding config to use for this model." - } - }, - "type": "object" - }, - "GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig": { - "description": "Config that turns on usage of llm embeddings as features to the model. Embeddings leverage unstructured text fields like description and title.", - "id": "GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig", - "properties": { - "llmEmbeddingVersion": { - "description": "Optional. The LLM embedding version to use. Currently only `v0` is supported. If not specified, feature will not be turned on.", - "type": "string" } }, "type": "object" diff --git a/retail/v2/retail-gen.go b/retail/v2/retail-gen.go index 9efb6f6a301..8d42e4b9544 100644 --- a/retail/v2/retail-gen.go +++ b/retail/v2/retail-gen.go @@ -7235,8 +7235,6 @@ type GoogleCloudRetailV2alphaModelModelFeaturesConfig struct { // FrequentlyBoughtTogetherConfig: Additional configs for // frequently-bought-together models. FrequentlyBoughtTogetherConfig *GoogleCloudRetailV2alphaModelFrequentlyBoughtTogetherFeaturesConfig `json:"frequentlyBoughtTogetherConfig,omitempty"` - // LlmEmbeddingConfig: Optional. LLM embedding config to use for this model. - LlmEmbeddingConfig *GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig `json:"llmEmbeddingConfig,omitempty"` // ForceSendFields is a list of field names (e.g. // "FrequentlyBoughtTogetherConfig") to unconditionally include in API // requests. By default, fields with empty or default values are omitted from @@ -7256,31 +7254,6 @@ func (s GoogleCloudRetailV2alphaModelModelFeaturesConfig) MarshalJSON() ([]byte, return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig: Config -// that turns on usage of llm embeddings as features to the model. Embeddings -// leverage unstructured text fields like description and title. -type GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig struct { - // LlmEmbeddingVersion: Optional. The LLM embedding version to use. Currently - // only `v0` is supported. If not specified, feature will not be turned on. - LlmEmbeddingVersion string `json:"llmEmbeddingVersion,omitempty"` - // ForceSendFields is a list of field names (e.g. "LlmEmbeddingVersion") to - // unconditionally include in API requests. By default, fields with empty or - // default values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more - // details. - ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "LlmEmbeddingVersion") to include - // in API requests with the JSON null value. By default, fields with empty - // values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. - NullFields []string `json:"-"` -} - -func (s GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig) MarshalJSON() ([]byte, error) { - type NoMethod GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig - return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) -} - // GoogleCloudRetailV2alphaModelPageOptimizationConfig: The // PageOptimizationConfig for model training. This determines how many panels // to optimize for, and which serving configs to consider for each panel. The diff --git a/retail/v2alpha/retail-api.json b/retail/v2alpha/retail-api.json index 7e0cd7549f5..c982bea8b2f 100644 --- a/retail/v2alpha/retail-api.json +++ b/retail/v2alpha/retail-api.json @@ -2767,7 +2767,7 @@ } } }, - "revision": "20241003", + "revision": "20241017", "rootUrl": "https://retail.googleapis.com/", "schemas": { "GoogleApiHttpBody": { @@ -5705,21 +5705,6 @@ "frequentlyBoughtTogetherConfig": { "$ref": "GoogleCloudRetailV2alphaModelFrequentlyBoughtTogetherFeaturesConfig", "description": "Additional configs for frequently-bought-together models." - }, - "llmEmbeddingConfig": { - "$ref": "GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig", - "description": "Optional. LLM embedding config to use for this model." - } - }, - "type": "object" - }, - "GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig": { - "description": "Config that turns on usage of llm embeddings as features to the model. Embeddings leverage unstructured text fields like description and title.", - "id": "GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig", - "properties": { - "llmEmbeddingVersion": { - "description": "Optional. The LLM embedding version to use. Currently only `v0` is supported. If not specified, feature will not be turned on.", - "type": "string" } }, "type": "object" diff --git a/retail/v2alpha/retail-gen.go b/retail/v2alpha/retail-gen.go index 69e322324c0..bb56ace93d0 100644 --- a/retail/v2alpha/retail-gen.go +++ b/retail/v2alpha/retail-gen.go @@ -4804,8 +4804,6 @@ type GoogleCloudRetailV2alphaModelModelFeaturesConfig struct { // FrequentlyBoughtTogetherConfig: Additional configs for // frequently-bought-together models. FrequentlyBoughtTogetherConfig *GoogleCloudRetailV2alphaModelFrequentlyBoughtTogetherFeaturesConfig `json:"frequentlyBoughtTogetherConfig,omitempty"` - // LlmEmbeddingConfig: Optional. LLM embedding config to use for this model. - LlmEmbeddingConfig *GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig `json:"llmEmbeddingConfig,omitempty"` // ForceSendFields is a list of field names (e.g. // "FrequentlyBoughtTogetherConfig") to unconditionally include in API // requests. By default, fields with empty or default values are omitted from @@ -4825,31 +4823,6 @@ func (s GoogleCloudRetailV2alphaModelModelFeaturesConfig) MarshalJSON() ([]byte, return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig: Config -// that turns on usage of llm embeddings as features to the model. Embeddings -// leverage unstructured text fields like description and title. -type GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig struct { - // LlmEmbeddingVersion: Optional. The LLM embedding version to use. Currently - // only `v0` is supported. If not specified, feature will not be turned on. - LlmEmbeddingVersion string `json:"llmEmbeddingVersion,omitempty"` - // ForceSendFields is a list of field names (e.g. "LlmEmbeddingVersion") to - // unconditionally include in API requests. By default, fields with empty or - // default values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more - // details. - ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "LlmEmbeddingVersion") to include - // in API requests with the JSON null value. By default, fields with empty - // values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. - NullFields []string `json:"-"` -} - -func (s GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig) MarshalJSON() ([]byte, error) { - type NoMethod GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig - return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) -} - // GoogleCloudRetailV2alphaModelPageOptimizationConfig: The // PageOptimizationConfig for model training. This determines how many panels // to optimize for, and which serving configs to consider for each panel. The diff --git a/retail/v2beta/retail-api.json b/retail/v2beta/retail-api.json index 823511759be..dcac19d00b6 100644 --- a/retail/v2beta/retail-api.json +++ b/retail/v2beta/retail-api.json @@ -2391,7 +2391,7 @@ } } }, - "revision": "20241003", + "revision": "20241017", "rootUrl": "https://retail.googleapis.com/", "schemas": { "GoogleApiHttpBody": { @@ -3662,21 +3662,6 @@ "frequentlyBoughtTogetherConfig": { "$ref": "GoogleCloudRetailV2alphaModelFrequentlyBoughtTogetherFeaturesConfig", "description": "Additional configs for frequently-bought-together models." - }, - "llmEmbeddingConfig": { - "$ref": "GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig", - "description": "Optional. LLM embedding config to use for this model." - } - }, - "type": "object" - }, - "GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig": { - "description": "Config that turns on usage of llm embeddings as features to the model. Embeddings leverage unstructured text fields like description and title.", - "id": "GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig", - "properties": { - "llmEmbeddingVersion": { - "description": "Optional. The LLM embedding version to use. Currently only `v0` is supported. If not specified, feature will not be turned on.", - "type": "string" } }, "type": "object" diff --git a/retail/v2beta/retail-gen.go b/retail/v2beta/retail-gen.go index 8e20e3dd62c..4a905bccbde 100644 --- a/retail/v2beta/retail-gen.go +++ b/retail/v2beta/retail-gen.go @@ -2111,8 +2111,6 @@ type GoogleCloudRetailV2alphaModelModelFeaturesConfig struct { // FrequentlyBoughtTogetherConfig: Additional configs for // frequently-bought-together models. FrequentlyBoughtTogetherConfig *GoogleCloudRetailV2alphaModelFrequentlyBoughtTogetherFeaturesConfig `json:"frequentlyBoughtTogetherConfig,omitempty"` - // LlmEmbeddingConfig: Optional. LLM embedding config to use for this model. - LlmEmbeddingConfig *GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig `json:"llmEmbeddingConfig,omitempty"` // ForceSendFields is a list of field names (e.g. // "FrequentlyBoughtTogetherConfig") to unconditionally include in API // requests. By default, fields with empty or default values are omitted from @@ -2132,31 +2130,6 @@ func (s GoogleCloudRetailV2alphaModelModelFeaturesConfig) MarshalJSON() ([]byte, return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig: Config -// that turns on usage of llm embeddings as features to the model. Embeddings -// leverage unstructured text fields like description and title. -type GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig struct { - // LlmEmbeddingVersion: Optional. The LLM embedding version to use. Currently - // only `v0` is supported. If not specified, feature will not be turned on. - LlmEmbeddingVersion string `json:"llmEmbeddingVersion,omitempty"` - // ForceSendFields is a list of field names (e.g. "LlmEmbeddingVersion") to - // unconditionally include in API requests. By default, fields with empty or - // default values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more - // details. - ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "LlmEmbeddingVersion") to include - // in API requests with the JSON null value. By default, fields with empty - // values are omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. - NullFields []string `json:"-"` -} - -func (s GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig) MarshalJSON() ([]byte, error) { - type NoMethod GoogleCloudRetailV2alphaModelModelFeaturesConfigLlmEmbeddingConfig - return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) -} - // GoogleCloudRetailV2alphaModelPageOptimizationConfig: The // PageOptimizationConfig for model training. This determines how many panels // to optimize for, and which serving configs to consider for each panel. The diff --git a/securitycenter/v1/securitycenter-api.json b/securitycenter/v1/securitycenter-api.json index 4d2ac8091a0..0137d412293 100644 --- a/securitycenter/v1/securitycenter-api.json +++ b/securitycenter/v1/securitycenter-api.json @@ -20,6 +20,16 @@ "description": "Regional Endpoint", "endpointUrl": "https://securitycenter.me-central2.rep.googleapis.com/", "location": "me-central2" + }, + { + "description": "Regional Endpoint", + "endpointUrl": "https://securitycenter.us.rep.googleapis.com/", + "location": "us" + }, + { + "description": "Regional Endpoint", + "endpointUrl": "https://securitycenter.eu.rep.googleapis.com/", + "location": "eu" } ], "fullyEncodeReservedExpansion": true, @@ -5877,7 +5887,7 @@ } } }, - "revision": "20240926", + "revision": "20241018", "rootUrl": "https://securitycenter.googleapis.com/", "schemas": { "Access": { @@ -6601,17 +6611,6 @@ }, "type": "object" }, - "CelPolicySpec": { - "description": "YAML-based rule that uses CEL, which supports the declaration of variables and a filtering predicate. A vulnerable resource is emitted if the evaluation is false. Given: 1) the resource types as: - resource_types: \"compute.googleapis.com/Instance\" - resource_types: \"compute.googleapis.com/Firewall\" 2) the CEL policy spec as: name: bad_instance resource_filters: - name: instance resource_type: compute.googleapis.com/Instance filter: \u003e instance.status == 'RUNNING' \u0026\u0026 'public' in instance.tags.items - name: firewall resource_type: compute.googleapis.com/Firewall filter: \u003e firewall.direction == 'INGRESS' \u0026\u0026 !firewall.disabled \u0026\u0026 firewall.allowed.exists(rule, rule.IPProtocol.upperAscii() in ['TCP', 'ALL'] \u0026\u0026 rule.ports.exists(port, network.portsInRange(port, '11-256'))) rule: match: - predicate: \u003e instance.networkInterfaces.exists(net, firewall.network == net.network) output: \u003e {'message': 'Compute instance with publicly accessible ports', 'instance': instance.name} Users are able to join resource types together using the exact format as Kubernetes Validating Admission policies.", - "id": "CelPolicySpec", - "properties": { - "spec": { - "description": "The CEL policy to evaluate to produce findings. A finding is generated when the policy validation evaluates to false.", - "type": "string" - } - }, - "type": "object" - }, "CloudArmor": { "description": "Fields related to Google Cloud Armor findings.", "id": "CloudArmor", @@ -8050,10 +8049,6 @@ "description": "Defines the properties in a custom module configuration for Security Health Analytics. Use the custom module configuration to create custom detectors that generate custom findings for resources that you specify.", "id": "GoogleCloudSecuritycenterV1CustomConfig", "properties": { - "celPolicy": { - "$ref": "CelPolicySpec", - "description": "The CEL policy spec attached to the custom module." - }, "customOutput": { "$ref": "GoogleCloudSecuritycenterV1CustomOutputSpec", "description": "Custom output properties." @@ -10760,6 +10755,7 @@ "ACCOUNT_ACCESS_REMOVAL", "STEAL_WEB_SESSION_COOKIE", "CREATE_OR_MODIFY_SYSTEM_PROCESS", + "EVENT_TRIGGERED_EXECUTION", "ABUSE_ELEVATION_CONTROL_MECHANISM", "UNSECURED_CREDENTIALS", "MODIFY_AUTHENTICATION_PROCESS", @@ -10776,6 +10772,7 @@ "ACTIVE_SCANNING", "SCANNING_IP_BLOCKS", "CONTAINER_ADMINISTRATION_COMMAND", + "DEPLOY_CONTAINER", "ESCAPE_TO_HOST", "CONTAINER_AND_RESOURCE_DISCOVERY", "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" @@ -10827,6 +10824,7 @@ "T1531", "T1539", "T1543", + "T1546", "T1548", "T1552", "T1556", @@ -10843,6 +10841,7 @@ "T1595", "T1595.001", "T1609", + "T1610", "T1611", "T1613", "T1649" @@ -10939,6 +10938,7 @@ "ACCOUNT_ACCESS_REMOVAL", "STEAL_WEB_SESSION_COOKIE", "CREATE_OR_MODIFY_SYSTEM_PROCESS", + "EVENT_TRIGGERED_EXECUTION", "ABUSE_ELEVATION_CONTROL_MECHANISM", "UNSECURED_CREDENTIALS", "MODIFY_AUTHENTICATION_PROCESS", @@ -10955,6 +10955,7 @@ "ACTIVE_SCANNING", "SCANNING_IP_BLOCKS", "CONTAINER_ADMINISTRATION_COMMAND", + "DEPLOY_CONTAINER", "ESCAPE_TO_HOST", "CONTAINER_AND_RESOURCE_DISCOVERY", "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" @@ -11006,6 +11007,7 @@ "T1531", "T1539", "T1543", + "T1546", "T1548", "T1552", "T1556", @@ -11022,6 +11024,7 @@ "T1595", "T1595.001", "T1609", + "T1610", "T1611", "T1613", "T1649" @@ -12828,6 +12831,7 @@ "ACCOUNT_ACCESS_REMOVAL", "STEAL_WEB_SESSION_COOKIE", "CREATE_OR_MODIFY_SYSTEM_PROCESS", + "EVENT_TRIGGERED_EXECUTION", "ABUSE_ELEVATION_CONTROL_MECHANISM", "UNSECURED_CREDENTIALS", "MODIFY_AUTHENTICATION_PROCESS", @@ -12844,6 +12848,7 @@ "ACTIVE_SCANNING", "SCANNING_IP_BLOCKS", "CONTAINER_ADMINISTRATION_COMMAND", + "DEPLOY_CONTAINER", "ESCAPE_TO_HOST", "CONTAINER_AND_RESOURCE_DISCOVERY", "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" @@ -12895,6 +12900,7 @@ "T1531", "T1539", "T1543", + "T1546", "T1548", "T1552", "T1556", @@ -12911,6 +12917,7 @@ "T1595", "T1595.001", "T1609", + "T1610", "T1611", "T1613", "T1649" @@ -13007,6 +13014,7 @@ "ACCOUNT_ACCESS_REMOVAL", "STEAL_WEB_SESSION_COOKIE", "CREATE_OR_MODIFY_SYSTEM_PROCESS", + "EVENT_TRIGGERED_EXECUTION", "ABUSE_ELEVATION_CONTROL_MECHANISM", "UNSECURED_CREDENTIALS", "MODIFY_AUTHENTICATION_PROCESS", @@ -13023,6 +13031,7 @@ "ACTIVE_SCANNING", "SCANNING_IP_BLOCKS", "CONTAINER_ADMINISTRATION_COMMAND", + "DEPLOY_CONTAINER", "ESCAPE_TO_HOST", "CONTAINER_AND_RESOURCE_DISCOVERY", "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" @@ -13074,6 +13083,7 @@ "T1531", "T1539", "T1543", + "T1546", "T1548", "T1552", "T1556", @@ -13090,6 +13100,7 @@ "T1595", "T1595.001", "T1609", + "T1610", "T1611", "T1613", "T1649" @@ -13925,7 +13936,7 @@ "id": "SetFindingStateRequest", "properties": { "startTime": { - "description": "Required. The time at which the updated state takes effect.", + "description": "Optional. The time at which the updated state takes effect. If unset, defaults to the request time.", "format": "google-datetime", "type": "string" }, diff --git a/securitycenter/v1/securitycenter-gen.go b/securitycenter/v1/securitycenter-gen.go index 00acb263c07..a34671fd3e5 100644 --- a/securitycenter/v1/securitycenter-gen.go +++ b/securitycenter/v1/securitycenter-gen.go @@ -1953,44 +1953,6 @@ func (s BulkMuteFindingsRequest) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// CelPolicySpec: YAML-based rule that uses CEL, which supports the declaration -// of variables and a filtering predicate. A vulnerable resource is emitted if -// the evaluation is false. Given: 1) the resource types as: - resource_types: -// "compute.googleapis.com/Instance" - resource_types: -// "compute.googleapis.com/Firewall" 2) the CEL policy spec as: name: -// bad_instance resource_filters: - name: instance resource_type: -// compute.googleapis.com/Instance filter: > instance.status == 'RUNNING' && -// 'public' in instance.tags.items - name: firewall resource_type: -// compute.googleapis.com/Firewall filter: > firewall.direction == 'INGRESS' && -// !firewall.disabled && firewall.allowed.exists(rule, -// rule.IPProtocol.upperAscii() in ['TCP', 'ALL'] && rule.ports.exists(port, -// network.portsInRange(port, '11-256'))) rule: match: - predicate: > -// instance.networkInterfaces.exists(net, firewall.network == net.network) -// output: > {'message': 'Compute instance with publicly accessible ports', -// 'instance': instance.name} Users are able to join resource types together -// using the exact format as Kubernetes Validating Admission policies. -type CelPolicySpec struct { - // Spec: The CEL policy to evaluate to produce findings. A finding is generated - // when the policy validation evaluates to false. - Spec string `json:"spec,omitempty"` - // ForceSendFields is a list of field names (e.g. "Spec") to unconditionally - // include in API requests. By default, fields with empty or default values are - // omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more - // details. - ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "Spec") to include in API requests - // with the JSON null value. By default, fields with empty values are omitted - // from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. - NullFields []string `json:"-"` -} - -func (s CelPolicySpec) MarshalJSON() ([]byte, error) { - type NoMethod CelPolicySpec - return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) -} - // CloudArmor: Fields related to Google Cloud Armor findings. type CloudArmor struct { // AdaptiveProtection: Information about potential Layer 7 DDoS attacks @@ -3650,8 +3612,6 @@ type GoogleCloudSecuritycenterV1BulkMuteFindingsResponse struct { // configuration to create custom detectors that generate custom findings for // resources that you specify. type GoogleCloudSecuritycenterV1CustomConfig struct { - // CelPolicy: The CEL policy spec attached to the custom module. - CelPolicy *CelPolicySpec `json:"celPolicy,omitempty"` // CustomOutput: Custom output properties. CustomOutput *GoogleCloudSecuritycenterV1CustomOutputSpec `json:"customOutput,omitempty"` // Description: Text that describes the vulnerability or misconfiguration that @@ -3679,13 +3639,13 @@ type GoogleCloudSecuritycenterV1CustomConfig struct { // "MEDIUM" - Medium severity. // "LOW" - Low severity. Severity string `json:"severity,omitempty"` - // ForceSendFields is a list of field names (e.g. "CelPolicy") to + // ForceSendFields is a list of field names (e.g. "CustomOutput") to // unconditionally include in API requests. By default, fields with empty or // default values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more // details. ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "CelPolicy") to include in API + // NullFields is a list of field names (e.g. "CustomOutput") to include in API // requests with the JSON null value. By default, fields with empty values are // omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. @@ -6881,6 +6841,7 @@ type GoogleCloudSecuritycenterV2MitreAttack struct { // "ACCOUNT_ACCESS_REMOVAL" - T1531 // "STEAL_WEB_SESSION_COOKIE" - T1539 // "CREATE_OR_MODIFY_SYSTEM_PROCESS" - T1543 + // "EVENT_TRIGGERED_EXECUTION" - T1546 // "ABUSE_ELEVATION_CONTROL_MECHANISM" - T1548 // "UNSECURED_CREDENTIALS" - T1552 // "MODIFY_AUTHENTICATION_PROCESS" - T1556 @@ -6897,6 +6858,7 @@ type GoogleCloudSecuritycenterV2MitreAttack struct { // "ACTIVE_SCANNING" - T1595 // "SCANNING_IP_BLOCKS" - T1595.001 // "CONTAINER_ADMINISTRATION_COMMAND" - T1609 + // "DEPLOY_CONTAINER" - T1610 // "ESCAPE_TO_HOST" - T1611 // "CONTAINER_AND_RESOURCE_DISCOVERY" - T1613 // "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" - T1649 @@ -6975,6 +6937,7 @@ type GoogleCloudSecuritycenterV2MitreAttack struct { // "ACCOUNT_ACCESS_REMOVAL" - T1531 // "STEAL_WEB_SESSION_COOKIE" - T1539 // "CREATE_OR_MODIFY_SYSTEM_PROCESS" - T1543 + // "EVENT_TRIGGERED_EXECUTION" - T1546 // "ABUSE_ELEVATION_CONTROL_MECHANISM" - T1548 // "UNSECURED_CREDENTIALS" - T1552 // "MODIFY_AUTHENTICATION_PROCESS" - T1556 @@ -6991,6 +6954,7 @@ type GoogleCloudSecuritycenterV2MitreAttack struct { // "ACTIVE_SCANNING" - T1595 // "SCANNING_IP_BLOCKS" - T1595.001 // "CONTAINER_ADMINISTRATION_COMMAND" - T1609 + // "DEPLOY_CONTAINER" - T1610 // "ESCAPE_TO_HOST" - T1611 // "CONTAINER_AND_RESOURCE_DISCOVERY" - T1613 // "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" - T1649 @@ -9408,6 +9372,7 @@ type MitreAttack struct { // "ACCOUNT_ACCESS_REMOVAL" - T1531 // "STEAL_WEB_SESSION_COOKIE" - T1539 // "CREATE_OR_MODIFY_SYSTEM_PROCESS" - T1543 + // "EVENT_TRIGGERED_EXECUTION" - T1546 // "ABUSE_ELEVATION_CONTROL_MECHANISM" - T1548 // "UNSECURED_CREDENTIALS" - T1552 // "MODIFY_AUTHENTICATION_PROCESS" - T1556 @@ -9424,6 +9389,7 @@ type MitreAttack struct { // "ACTIVE_SCANNING" - T1595 // "SCANNING_IP_BLOCKS" - T1595.001 // "CONTAINER_ADMINISTRATION_COMMAND" - T1609 + // "DEPLOY_CONTAINER" - T1610 // "ESCAPE_TO_HOST" - T1611 // "CONTAINER_AND_RESOURCE_DISCOVERY" - T1613 // "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" - T1649 @@ -9502,6 +9468,7 @@ type MitreAttack struct { // "ACCOUNT_ACCESS_REMOVAL" - T1531 // "STEAL_WEB_SESSION_COOKIE" - T1539 // "CREATE_OR_MODIFY_SYSTEM_PROCESS" - T1543 + // "EVENT_TRIGGERED_EXECUTION" - T1546 // "ABUSE_ELEVATION_CONTROL_MECHANISM" - T1548 // "UNSECURED_CREDENTIALS" - T1552 // "MODIFY_AUTHENTICATION_PROCESS" - T1556 @@ -9518,6 +9485,7 @@ type MitreAttack struct { // "ACTIVE_SCANNING" - T1595 // "SCANNING_IP_BLOCKS" - T1595.001 // "CONTAINER_ADMINISTRATION_COMMAND" - T1609 + // "DEPLOY_CONTAINER" - T1610 // "ESCAPE_TO_HOST" - T1611 // "CONTAINER_AND_RESOURCE_DISCOVERY" - T1613 // "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" - T1649 @@ -10642,7 +10610,8 @@ func (s ServiceAccountDelegationInfo) MarshalJSON() ([]byte, error) { // SetFindingStateRequest: Request message for updating a finding's state. type SetFindingStateRequest struct { - // StartTime: Required. The time at which the updated state takes effect. + // StartTime: Optional. The time at which the updated state takes effect. If + // unset, defaults to the request time. StartTime string `json:"startTime,omitempty"` // State: Required. The desired State of the finding. // diff --git a/securitycenter/v1beta1/securitycenter-api.json b/securitycenter/v1beta1/securitycenter-api.json index 875d06e6f0b..e35e6b8d59d 100644 --- a/securitycenter/v1beta1/securitycenter-api.json +++ b/securitycenter/v1beta1/securitycenter-api.json @@ -20,6 +20,16 @@ "description": "Regional Endpoint", "endpointUrl": "https://securitycenter.me-central2.rep.googleapis.com/", "location": "me-central2" + }, + { + "description": "Regional Endpoint", + "endpointUrl": "https://securitycenter.us.rep.googleapis.com/", + "location": "us" + }, + { + "description": "Regional Endpoint", + "endpointUrl": "https://securitycenter.eu.rep.googleapis.com/", + "location": "eu" } ], "fullyEncodeReservedExpansion": true, @@ -903,7 +913,7 @@ } } }, - "revision": "20240926", + "revision": "20241018", "rootUrl": "https://securitycenter.googleapis.com/", "schemas": { "Access": { @@ -1439,17 +1449,6 @@ "properties": {}, "type": "object" }, - "CelPolicySpec": { - "description": "YAML-based rule that uses CEL, which supports the declaration of variables and a filtering predicate. A vulnerable resource is emitted if the evaluation is false. Given: 1) the resource types as: - resource_types: \"compute.googleapis.com/Instance\" - resource_types: \"compute.googleapis.com/Firewall\" 2) the CEL policy spec as: name: bad_instance resource_filters: - name: instance resource_type: compute.googleapis.com/Instance filter: \u003e instance.status == 'RUNNING' \u0026\u0026 'public' in instance.tags.items - name: firewall resource_type: compute.googleapis.com/Firewall filter: \u003e firewall.direction == 'INGRESS' \u0026\u0026 !firewall.disabled \u0026\u0026 firewall.allowed.exists(rule, rule.IPProtocol.upperAscii() in ['TCP', 'ALL'] \u0026\u0026 rule.ports.exists(port, network.portsInRange(port, '11-256'))) rule: match: - predicate: \u003e instance.networkInterfaces.exists(net, firewall.network == net.network) output: \u003e {'message': 'Compute instance with publicly accessible ports', 'instance': instance.name} Users are able to join resource types together using the exact format as Kubernetes Validating Admission policies.", - "id": "CelPolicySpec", - "properties": { - "spec": { - "description": "The CEL policy to evaluate to produce findings. A finding is generated when the policy validation evaluates to false.", - "type": "string" - } - }, - "type": "object" - }, "CloudArmor": { "description": "Fields related to Google Cloud Armor findings.", "id": "CloudArmor", @@ -2723,10 +2722,6 @@ "description": "Defines the properties in a custom module configuration for Security Health Analytics. Use the custom module configuration to create custom detectors that generate custom findings for resources that you specify.", "id": "GoogleCloudSecuritycenterV1CustomConfig", "properties": { - "celPolicy": { - "$ref": "CelPolicySpec", - "description": "The CEL policy spec attached to the custom module." - }, "customOutput": { "$ref": "GoogleCloudSecuritycenterV1CustomOutputSpec", "description": "Custom output properties." @@ -5514,6 +5509,7 @@ "ACCOUNT_ACCESS_REMOVAL", "STEAL_WEB_SESSION_COOKIE", "CREATE_OR_MODIFY_SYSTEM_PROCESS", + "EVENT_TRIGGERED_EXECUTION", "ABUSE_ELEVATION_CONTROL_MECHANISM", "UNSECURED_CREDENTIALS", "MODIFY_AUTHENTICATION_PROCESS", @@ -5530,6 +5526,7 @@ "ACTIVE_SCANNING", "SCANNING_IP_BLOCKS", "CONTAINER_ADMINISTRATION_COMMAND", + "DEPLOY_CONTAINER", "ESCAPE_TO_HOST", "CONTAINER_AND_RESOURCE_DISCOVERY", "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" @@ -5581,6 +5578,7 @@ "T1531", "T1539", "T1543", + "T1546", "T1548", "T1552", "T1556", @@ -5597,6 +5595,7 @@ "T1595", "T1595.001", "T1609", + "T1610", "T1611", "T1613", "T1649" @@ -5693,6 +5692,7 @@ "ACCOUNT_ACCESS_REMOVAL", "STEAL_WEB_SESSION_COOKIE", "CREATE_OR_MODIFY_SYSTEM_PROCESS", + "EVENT_TRIGGERED_EXECUTION", "ABUSE_ELEVATION_CONTROL_MECHANISM", "UNSECURED_CREDENTIALS", "MODIFY_AUTHENTICATION_PROCESS", @@ -5709,6 +5709,7 @@ "ACTIVE_SCANNING", "SCANNING_IP_BLOCKS", "CONTAINER_ADMINISTRATION_COMMAND", + "DEPLOY_CONTAINER", "ESCAPE_TO_HOST", "CONTAINER_AND_RESOURCE_DISCOVERY", "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" @@ -5760,6 +5761,7 @@ "T1531", "T1539", "T1543", + "T1546", "T1548", "T1552", "T1556", @@ -5776,6 +5778,7 @@ "T1595", "T1595.001", "T1609", + "T1610", "T1611", "T1613", "T1649" @@ -7303,6 +7306,7 @@ "ACCOUNT_ACCESS_REMOVAL", "STEAL_WEB_SESSION_COOKIE", "CREATE_OR_MODIFY_SYSTEM_PROCESS", + "EVENT_TRIGGERED_EXECUTION", "ABUSE_ELEVATION_CONTROL_MECHANISM", "UNSECURED_CREDENTIALS", "MODIFY_AUTHENTICATION_PROCESS", @@ -7319,6 +7323,7 @@ "ACTIVE_SCANNING", "SCANNING_IP_BLOCKS", "CONTAINER_ADMINISTRATION_COMMAND", + "DEPLOY_CONTAINER", "ESCAPE_TO_HOST", "CONTAINER_AND_RESOURCE_DISCOVERY", "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" @@ -7370,6 +7375,7 @@ "T1531", "T1539", "T1543", + "T1546", "T1548", "T1552", "T1556", @@ -7386,6 +7392,7 @@ "T1595", "T1595.001", "T1609", + "T1610", "T1611", "T1613", "T1649" @@ -7482,6 +7489,7 @@ "ACCOUNT_ACCESS_REMOVAL", "STEAL_WEB_SESSION_COOKIE", "CREATE_OR_MODIFY_SYSTEM_PROCESS", + "EVENT_TRIGGERED_EXECUTION", "ABUSE_ELEVATION_CONTROL_MECHANISM", "UNSECURED_CREDENTIALS", "MODIFY_AUTHENTICATION_PROCESS", @@ -7498,6 +7506,7 @@ "ACTIVE_SCANNING", "SCANNING_IP_BLOCKS", "CONTAINER_ADMINISTRATION_COMMAND", + "DEPLOY_CONTAINER", "ESCAPE_TO_HOST", "CONTAINER_AND_RESOURCE_DISCOVERY", "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" @@ -7549,6 +7558,7 @@ "T1531", "T1539", "T1543", + "T1546", "T1548", "T1552", "T1556", @@ -7565,6 +7575,7 @@ "T1595", "T1595.001", "T1609", + "T1610", "T1611", "T1613", "T1649" diff --git a/securitycenter/v1beta1/securitycenter-gen.go b/securitycenter/v1beta1/securitycenter-gen.go index 3c8d386f1a2..da211911c70 100644 --- a/securitycenter/v1beta1/securitycenter-gen.go +++ b/securitycenter/v1beta1/securitycenter-gen.go @@ -1049,44 +1049,6 @@ func (s Binding) MarshalJSON() ([]byte, error) { type CancelOperationRequest struct { } -// CelPolicySpec: YAML-based rule that uses CEL, which supports the declaration -// of variables and a filtering predicate. A vulnerable resource is emitted if -// the evaluation is false. Given: 1) the resource types as: - resource_types: -// "compute.googleapis.com/Instance" - resource_types: -// "compute.googleapis.com/Firewall" 2) the CEL policy spec as: name: -// bad_instance resource_filters: - name: instance resource_type: -// compute.googleapis.com/Instance filter: > instance.status == 'RUNNING' && -// 'public' in instance.tags.items - name: firewall resource_type: -// compute.googleapis.com/Firewall filter: > firewall.direction == 'INGRESS' && -// !firewall.disabled && firewall.allowed.exists(rule, -// rule.IPProtocol.upperAscii() in ['TCP', 'ALL'] && rule.ports.exists(port, -// network.portsInRange(port, '11-256'))) rule: match: - predicate: > -// instance.networkInterfaces.exists(net, firewall.network == net.network) -// output: > {'message': 'Compute instance with publicly accessible ports', -// 'instance': instance.name} Users are able to join resource types together -// using the exact format as Kubernetes Validating Admission policies. -type CelPolicySpec struct { - // Spec: The CEL policy to evaluate to produce findings. A finding is generated - // when the policy validation evaluates to false. - Spec string `json:"spec,omitempty"` - // ForceSendFields is a list of field names (e.g. "Spec") to unconditionally - // include in API requests. By default, fields with empty or default values are - // omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more - // details. - ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "Spec") to include in API requests - // with the JSON null value. By default, fields with empty values are omitted - // from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. - NullFields []string `json:"-"` -} - -func (s CelPolicySpec) MarshalJSON() ([]byte, error) { - type NoMethod CelPolicySpec - return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) -} - // CloudArmor: Fields related to Google Cloud Armor findings. type CloudArmor struct { // AdaptiveProtection: Information about potential Layer 7 DDoS attacks @@ -2537,8 +2499,6 @@ type GoogleCloudSecuritycenterV1BulkMuteFindingsResponse struct { // configuration to create custom detectors that generate custom findings for // resources that you specify. type GoogleCloudSecuritycenterV1CustomConfig struct { - // CelPolicy: The CEL policy spec attached to the custom module. - CelPolicy *CelPolicySpec `json:"celPolicy,omitempty"` // CustomOutput: Custom output properties. CustomOutput *GoogleCloudSecuritycenterV1CustomOutputSpec `json:"customOutput,omitempty"` // Description: Text that describes the vulnerability or misconfiguration that @@ -2566,13 +2526,13 @@ type GoogleCloudSecuritycenterV1CustomConfig struct { // "MEDIUM" - Medium severity. // "LOW" - Low severity. Severity string `json:"severity,omitempty"` - // ForceSendFields is a list of field names (e.g. "CelPolicy") to + // ForceSendFields is a list of field names (e.g. "CustomOutput") to // unconditionally include in API requests. By default, fields with empty or // default values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more // details. ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "CelPolicy") to include in API + // NullFields is a list of field names (e.g. "CustomOutput") to include in API // requests with the JSON null value. By default, fields with empty values are // omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. @@ -5871,6 +5831,7 @@ type GoogleCloudSecuritycenterV2MitreAttack struct { // "ACCOUNT_ACCESS_REMOVAL" - T1531 // "STEAL_WEB_SESSION_COOKIE" - T1539 // "CREATE_OR_MODIFY_SYSTEM_PROCESS" - T1543 + // "EVENT_TRIGGERED_EXECUTION" - T1546 // "ABUSE_ELEVATION_CONTROL_MECHANISM" - T1548 // "UNSECURED_CREDENTIALS" - T1552 // "MODIFY_AUTHENTICATION_PROCESS" - T1556 @@ -5887,6 +5848,7 @@ type GoogleCloudSecuritycenterV2MitreAttack struct { // "ACTIVE_SCANNING" - T1595 // "SCANNING_IP_BLOCKS" - T1595.001 // "CONTAINER_ADMINISTRATION_COMMAND" - T1609 + // "DEPLOY_CONTAINER" - T1610 // "ESCAPE_TO_HOST" - T1611 // "CONTAINER_AND_RESOURCE_DISCOVERY" - T1613 // "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" - T1649 @@ -5965,6 +5927,7 @@ type GoogleCloudSecuritycenterV2MitreAttack struct { // "ACCOUNT_ACCESS_REMOVAL" - T1531 // "STEAL_WEB_SESSION_COOKIE" - T1539 // "CREATE_OR_MODIFY_SYSTEM_PROCESS" - T1543 + // "EVENT_TRIGGERED_EXECUTION" - T1546 // "ABUSE_ELEVATION_CONTROL_MECHANISM" - T1548 // "UNSECURED_CREDENTIALS" - T1552 // "MODIFY_AUTHENTICATION_PROCESS" - T1556 @@ -5981,6 +5944,7 @@ type GoogleCloudSecuritycenterV2MitreAttack struct { // "ACTIVE_SCANNING" - T1595 // "SCANNING_IP_BLOCKS" - T1595.001 // "CONTAINER_ADMINISTRATION_COMMAND" - T1609 + // "DEPLOY_CONTAINER" - T1610 // "ESCAPE_TO_HOST" - T1611 // "CONTAINER_AND_RESOURCE_DISCOVERY" - T1613 // "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" - T1649 @@ -7901,6 +7865,7 @@ type MitreAttack struct { // "ACCOUNT_ACCESS_REMOVAL" - T1531 // "STEAL_WEB_SESSION_COOKIE" - T1539 // "CREATE_OR_MODIFY_SYSTEM_PROCESS" - T1543 + // "EVENT_TRIGGERED_EXECUTION" - T1546 // "ABUSE_ELEVATION_CONTROL_MECHANISM" - T1548 // "UNSECURED_CREDENTIALS" - T1552 // "MODIFY_AUTHENTICATION_PROCESS" - T1556 @@ -7917,6 +7882,7 @@ type MitreAttack struct { // "ACTIVE_SCANNING" - T1595 // "SCANNING_IP_BLOCKS" - T1595.001 // "CONTAINER_ADMINISTRATION_COMMAND" - T1609 + // "DEPLOY_CONTAINER" - T1610 // "ESCAPE_TO_HOST" - T1611 // "CONTAINER_AND_RESOURCE_DISCOVERY" - T1613 // "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" - T1649 @@ -7995,6 +7961,7 @@ type MitreAttack struct { // "ACCOUNT_ACCESS_REMOVAL" - T1531 // "STEAL_WEB_SESSION_COOKIE" - T1539 // "CREATE_OR_MODIFY_SYSTEM_PROCESS" - T1543 + // "EVENT_TRIGGERED_EXECUTION" - T1546 // "ABUSE_ELEVATION_CONTROL_MECHANISM" - T1548 // "UNSECURED_CREDENTIALS" - T1552 // "MODIFY_AUTHENTICATION_PROCESS" - T1556 @@ -8011,6 +7978,7 @@ type MitreAttack struct { // "ACTIVE_SCANNING" - T1595 // "SCANNING_IP_BLOCKS" - T1595.001 // "CONTAINER_ADMINISTRATION_COMMAND" - T1609 + // "DEPLOY_CONTAINER" - T1610 // "ESCAPE_TO_HOST" - T1611 // "CONTAINER_AND_RESOURCE_DISCOVERY" - T1613 // "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" - T1649 diff --git a/securitycenter/v1beta2/securitycenter-api.json b/securitycenter/v1beta2/securitycenter-api.json index c52df1a4d79..4512d8a400e 100644 --- a/securitycenter/v1beta2/securitycenter-api.json +++ b/securitycenter/v1beta2/securitycenter-api.json @@ -20,6 +20,16 @@ "description": "Regional Endpoint", "endpointUrl": "https://securitycenter.me-central2.rep.googleapis.com/", "location": "me-central2" + }, + { + "description": "Regional Endpoint", + "endpointUrl": "https://securitycenter.us.rep.googleapis.com/", + "location": "us" + }, + { + "description": "Regional Endpoint", + "endpointUrl": "https://securitycenter.eu.rep.googleapis.com/", + "location": "eu" } ], "fullyEncodeReservedExpansion": true, @@ -1993,7 +2003,7 @@ } } }, - "revision": "20241004", + "revision": "20241018", "rootUrl": "https://securitycenter.googleapis.com/", "schemas": { "Access": { @@ -2389,17 +2399,6 @@ }, "type": "object" }, - "CelPolicySpec": { - "description": "YAML-based rule that uses CEL, which supports the declaration of variables and a filtering predicate. A vulnerable resource is emitted if the evaluation is false. Given: 1) the resource types as: - resource_types: \"compute.googleapis.com/Instance\" - resource_types: \"compute.googleapis.com/Firewall\" 2) the CEL policy spec as: name: bad_instance resource_filters: - name: instance resource_type: compute.googleapis.com/Instance filter: \u003e instance.status == 'RUNNING' \u0026\u0026 'public' in instance.tags.items - name: firewall resource_type: compute.googleapis.com/Firewall filter: \u003e firewall.direction == 'INGRESS' \u0026\u0026 !firewall.disabled \u0026\u0026 firewall.allowed.exists(rule, rule.IPProtocol.upperAscii() in ['TCP', 'ALL'] \u0026\u0026 rule.ports.exists(port, network.portsInRange(port, '11-256'))) rule: match: - predicate: \u003e instance.networkInterfaces.exists(net, firewall.network == net.network) output: \u003e {'message': 'Compute instance with publicly accessible ports', 'instance': instance.name} Users are able to join resource types together using the exact format as Kubernetes Validating Admission policies.", - "id": "CelPolicySpec", - "properties": { - "spec": { - "description": "The CEL policy to evaluate to produce findings. A finding is generated when the policy validation evaluates to false.", - "type": "string" - } - }, - "type": "object" - }, "CloudArmor": { "description": "Fields related to Google Cloud Armor findings.", "id": "CloudArmor", @@ -3797,10 +3796,6 @@ "description": "Defines the properties in a custom module configuration for Security Health Analytics. Use the custom module configuration to create custom detectors that generate custom findings for resources that you specify.", "id": "GoogleCloudSecuritycenterV1CustomConfig", "properties": { - "celPolicy": { - "$ref": "CelPolicySpec", - "description": "The CEL policy spec attached to the custom module." - }, "customOutput": { "$ref": "GoogleCloudSecuritycenterV1CustomOutputSpec", "description": "Custom output properties." @@ -6507,6 +6502,7 @@ "ACCOUNT_ACCESS_REMOVAL", "STEAL_WEB_SESSION_COOKIE", "CREATE_OR_MODIFY_SYSTEM_PROCESS", + "EVENT_TRIGGERED_EXECUTION", "ABUSE_ELEVATION_CONTROL_MECHANISM", "UNSECURED_CREDENTIALS", "MODIFY_AUTHENTICATION_PROCESS", @@ -6523,6 +6519,7 @@ "ACTIVE_SCANNING", "SCANNING_IP_BLOCKS", "CONTAINER_ADMINISTRATION_COMMAND", + "DEPLOY_CONTAINER", "ESCAPE_TO_HOST", "CONTAINER_AND_RESOURCE_DISCOVERY", "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" @@ -6574,6 +6571,7 @@ "T1531", "T1539", "T1543", + "T1546", "T1548", "T1552", "T1556", @@ -6590,6 +6588,7 @@ "T1595", "T1595.001", "T1609", + "T1610", "T1611", "T1613", "T1649" @@ -6686,6 +6685,7 @@ "ACCOUNT_ACCESS_REMOVAL", "STEAL_WEB_SESSION_COOKIE", "CREATE_OR_MODIFY_SYSTEM_PROCESS", + "EVENT_TRIGGERED_EXECUTION", "ABUSE_ELEVATION_CONTROL_MECHANISM", "UNSECURED_CREDENTIALS", "MODIFY_AUTHENTICATION_PROCESS", @@ -6702,6 +6702,7 @@ "ACTIVE_SCANNING", "SCANNING_IP_BLOCKS", "CONTAINER_ADMINISTRATION_COMMAND", + "DEPLOY_CONTAINER", "ESCAPE_TO_HOST", "CONTAINER_AND_RESOURCE_DISCOVERY", "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" @@ -6753,6 +6754,7 @@ "T1531", "T1539", "T1543", + "T1546", "T1548", "T1552", "T1556", @@ -6769,6 +6771,7 @@ "T1595", "T1595.001", "T1609", + "T1610", "T1611", "T1613", "T1649" @@ -8047,6 +8050,7 @@ "ACCOUNT_ACCESS_REMOVAL", "STEAL_WEB_SESSION_COOKIE", "CREATE_OR_MODIFY_SYSTEM_PROCESS", + "EVENT_TRIGGERED_EXECUTION", "ABUSE_ELEVATION_CONTROL_MECHANISM", "UNSECURED_CREDENTIALS", "MODIFY_AUTHENTICATION_PROCESS", @@ -8063,6 +8067,7 @@ "ACTIVE_SCANNING", "SCANNING_IP_BLOCKS", "CONTAINER_ADMINISTRATION_COMMAND", + "DEPLOY_CONTAINER", "ESCAPE_TO_HOST", "CONTAINER_AND_RESOURCE_DISCOVERY", "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" @@ -8114,6 +8119,7 @@ "T1531", "T1539", "T1543", + "T1546", "T1548", "T1552", "T1556", @@ -8130,6 +8136,7 @@ "T1595", "T1595.001", "T1609", + "T1610", "T1611", "T1613", "T1649" @@ -8226,6 +8233,7 @@ "ACCOUNT_ACCESS_REMOVAL", "STEAL_WEB_SESSION_COOKIE", "CREATE_OR_MODIFY_SYSTEM_PROCESS", + "EVENT_TRIGGERED_EXECUTION", "ABUSE_ELEVATION_CONTROL_MECHANISM", "UNSECURED_CREDENTIALS", "MODIFY_AUTHENTICATION_PROCESS", @@ -8242,6 +8250,7 @@ "ACTIVE_SCANNING", "SCANNING_IP_BLOCKS", "CONTAINER_ADMINISTRATION_COMMAND", + "DEPLOY_CONTAINER", "ESCAPE_TO_HOST", "CONTAINER_AND_RESOURCE_DISCOVERY", "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" @@ -8293,6 +8302,7 @@ "T1531", "T1539", "T1543", + "T1546", "T1548", "T1552", "T1556", @@ -8309,6 +8319,7 @@ "T1595", "T1595.001", "T1609", + "T1610", "T1611", "T1613", "T1649" diff --git a/securitycenter/v1beta2/securitycenter-gen.go b/securitycenter/v1beta2/securitycenter-gen.go index 87a1973bff8..172a4120eba 100644 --- a/securitycenter/v1beta2/securitycenter-gen.go +++ b/securitycenter/v1beta2/securitycenter-gen.go @@ -1020,44 +1020,6 @@ func (s BackupDisasterRecovery) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// CelPolicySpec: YAML-based rule that uses CEL, which supports the declaration -// of variables and a filtering predicate. A vulnerable resource is emitted if -// the evaluation is false. Given: 1) the resource types as: - resource_types: -// "compute.googleapis.com/Instance" - resource_types: -// "compute.googleapis.com/Firewall" 2) the CEL policy spec as: name: -// bad_instance resource_filters: - name: instance resource_type: -// compute.googleapis.com/Instance filter: > instance.status == 'RUNNING' && -// 'public' in instance.tags.items - name: firewall resource_type: -// compute.googleapis.com/Firewall filter: > firewall.direction == 'INGRESS' && -// !firewall.disabled && firewall.allowed.exists(rule, -// rule.IPProtocol.upperAscii() in ['TCP', 'ALL'] && rule.ports.exists(port, -// network.portsInRange(port, '11-256'))) rule: match: - predicate: > -// instance.networkInterfaces.exists(net, firewall.network == net.network) -// output: > {'message': 'Compute instance with publicly accessible ports', -// 'instance': instance.name} Users are able to join resource types together -// using the exact format as Kubernetes Validating Admission policies. -type CelPolicySpec struct { - // Spec: The CEL policy to evaluate to produce findings. A finding is generated - // when the policy validation evaluates to false. - Spec string `json:"spec,omitempty"` - // ForceSendFields is a list of field names (e.g. "Spec") to unconditionally - // include in API requests. By default, fields with empty or default values are - // omitted from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more - // details. - ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "Spec") to include in API requests - // with the JSON null value. By default, fields with empty values are omitted - // from API requests. See - // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. - NullFields []string `json:"-"` -} - -func (s CelPolicySpec) MarshalJSON() ([]byte, error) { - type NoMethod CelPolicySpec - return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) -} - // CloudArmor: Fields related to Google Cloud Armor findings. type CloudArmor struct { // AdaptiveProtection: Information about potential Layer 7 DDoS attacks @@ -2606,8 +2568,6 @@ type GoogleCloudSecuritycenterV1BulkMuteFindingsResponse struct { // configuration to create custom detectors that generate custom findings for // resources that you specify. type GoogleCloudSecuritycenterV1CustomConfig struct { - // CelPolicy: The CEL policy spec attached to the custom module. - CelPolicy *CelPolicySpec `json:"celPolicy,omitempty"` // CustomOutput: Custom output properties. CustomOutput *GoogleCloudSecuritycenterV1CustomOutputSpec `json:"customOutput,omitempty"` // Description: Text that describes the vulnerability or misconfiguration that @@ -2635,13 +2595,13 @@ type GoogleCloudSecuritycenterV1CustomConfig struct { // "MEDIUM" - Medium severity. // "LOW" - Low severity. Severity string `json:"severity,omitempty"` - // ForceSendFields is a list of field names (e.g. "CelPolicy") to + // ForceSendFields is a list of field names (e.g. "CustomOutput") to // unconditionally include in API requests. By default, fields with empty or // default values are omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more // details. ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "CelPolicy") to include in API + // NullFields is a list of field names (e.g. "CustomOutput") to include in API // requests with the JSON null value. By default, fields with empty values are // omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. @@ -5822,6 +5782,7 @@ type GoogleCloudSecuritycenterV2MitreAttack struct { // "ACCOUNT_ACCESS_REMOVAL" - T1531 // "STEAL_WEB_SESSION_COOKIE" - T1539 // "CREATE_OR_MODIFY_SYSTEM_PROCESS" - T1543 + // "EVENT_TRIGGERED_EXECUTION" - T1546 // "ABUSE_ELEVATION_CONTROL_MECHANISM" - T1548 // "UNSECURED_CREDENTIALS" - T1552 // "MODIFY_AUTHENTICATION_PROCESS" - T1556 @@ -5838,6 +5799,7 @@ type GoogleCloudSecuritycenterV2MitreAttack struct { // "ACTIVE_SCANNING" - T1595 // "SCANNING_IP_BLOCKS" - T1595.001 // "CONTAINER_ADMINISTRATION_COMMAND" - T1609 + // "DEPLOY_CONTAINER" - T1610 // "ESCAPE_TO_HOST" - T1611 // "CONTAINER_AND_RESOURCE_DISCOVERY" - T1613 // "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" - T1649 @@ -5916,6 +5878,7 @@ type GoogleCloudSecuritycenterV2MitreAttack struct { // "ACCOUNT_ACCESS_REMOVAL" - T1531 // "STEAL_WEB_SESSION_COOKIE" - T1539 // "CREATE_OR_MODIFY_SYSTEM_PROCESS" - T1543 + // "EVENT_TRIGGERED_EXECUTION" - T1546 // "ABUSE_ELEVATION_CONTROL_MECHANISM" - T1548 // "UNSECURED_CREDENTIALS" - T1552 // "MODIFY_AUTHENTICATION_PROCESS" - T1556 @@ -5932,6 +5895,7 @@ type GoogleCloudSecuritycenterV2MitreAttack struct { // "ACTIVE_SCANNING" - T1595 // "SCANNING_IP_BLOCKS" - T1595.001 // "CONTAINER_ADMINISTRATION_COMMAND" - T1609 + // "DEPLOY_CONTAINER" - T1610 // "ESCAPE_TO_HOST" - T1611 // "CONTAINER_AND_RESOURCE_DISCOVERY" - T1613 // "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" - T1649 @@ -7490,6 +7454,7 @@ type MitreAttack struct { // "ACCOUNT_ACCESS_REMOVAL" - T1531 // "STEAL_WEB_SESSION_COOKIE" - T1539 // "CREATE_OR_MODIFY_SYSTEM_PROCESS" - T1543 + // "EVENT_TRIGGERED_EXECUTION" - T1546 // "ABUSE_ELEVATION_CONTROL_MECHANISM" - T1548 // "UNSECURED_CREDENTIALS" - T1552 // "MODIFY_AUTHENTICATION_PROCESS" - T1556 @@ -7506,6 +7471,7 @@ type MitreAttack struct { // "ACTIVE_SCANNING" - T1595 // "SCANNING_IP_BLOCKS" - T1595.001 // "CONTAINER_ADMINISTRATION_COMMAND" - T1609 + // "DEPLOY_CONTAINER" - T1610 // "ESCAPE_TO_HOST" - T1611 // "CONTAINER_AND_RESOURCE_DISCOVERY" - T1613 // "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" - T1649 @@ -7584,6 +7550,7 @@ type MitreAttack struct { // "ACCOUNT_ACCESS_REMOVAL" - T1531 // "STEAL_WEB_SESSION_COOKIE" - T1539 // "CREATE_OR_MODIFY_SYSTEM_PROCESS" - T1543 + // "EVENT_TRIGGERED_EXECUTION" - T1546 // "ABUSE_ELEVATION_CONTROL_MECHANISM" - T1548 // "UNSECURED_CREDENTIALS" - T1552 // "MODIFY_AUTHENTICATION_PROCESS" - T1556 @@ -7600,6 +7567,7 @@ type MitreAttack struct { // "ACTIVE_SCANNING" - T1595 // "SCANNING_IP_BLOCKS" - T1595.001 // "CONTAINER_ADMINISTRATION_COMMAND" - T1609 + // "DEPLOY_CONTAINER" - T1610 // "ESCAPE_TO_HOST" - T1611 // "CONTAINER_AND_RESOURCE_DISCOVERY" - T1613 // "STEAL_OR_FORGE_AUTHENTICATION_CERTIFICATES" - T1649 diff --git a/sqladmin/v1/sqladmin-api.json b/sqladmin/v1/sqladmin-api.json index b94f6845a70..077d69b2afa 100644 --- a/sqladmin/v1/sqladmin-api.json +++ b/sqladmin/v1/sqladmin-api.json @@ -609,7 +609,7 @@ "instances": { "methods": { "ListServerCertificates": { - "description": "Lists all versions of server certificates and certificate authorities (CAs) for the specified instance. There can be up to three sets of certs listed: the certificate that is currently in use, a future that has been added but not yet used to sign a certificate, and a certificate that has been rotated out.", + "description": "Lists all versions of server certificates and certificate authorities (CAs) for the specified instance. There can be up to three sets of certs listed: the certificate that is currently in use, a future that has been added but not yet used to sign a certificate, and a certificate that has been rotated out. For instances not using Certificate Authority Service (CAS) server CA, use ListServerCas instead.", "flatPath": "v1/projects/{project}/instances/{instance}/listServerCertificates", "httpMethod": "GET", "id": "sql.instances.ListServerCertificates", @@ -2366,7 +2366,7 @@ } } }, - "revision": "20241004", + "revision": "20241011", "rootUrl": "https://sqladmin.googleapis.com/", "schemas": { "AclEntry": { @@ -5831,7 +5831,8 @@ "UNSUPPORTED_COLUMNS", "USERS_NOT_CREATED_IN_REPLICA", "UNSUPPORTED_SYSTEM_OBJECTS", - "UNSUPPORTED_TABLES_WITH_REPLICA_IDENTITY" + "UNSUPPORTED_TABLES_WITH_REPLICA_IDENTITY", + "SELECTED_OBJECTS_NOT_EXIST_ON_SOURCE" ], "enumDescriptions": [ "", @@ -5886,7 +5887,8 @@ "The source database has generated columns that can't be migrated. Please change them to regular columns before migration.", "The source database has users that aren't created in the replica. First, create all users, which are in the pg_user_mappings table of the source database, in the destination instance. Then, perform the migration.", "The selected objects include system objects that aren't supported for migration.", - "The source database has tables with the FULL or NOTHING replica identity. Before starting your migration, either remove the identity or change it to DEFAULT. Note that this is an error and will block the migration." + "The source database has tables with the FULL or NOTHING replica identity. Before starting your migration, either remove the identity or change it to DEFAULT. Note that this is an error and will block the migration.", + "The selected objects don't exist on the source instance." ], "type": "string" } diff --git a/sqladmin/v1/sqladmin-gen.go b/sqladmin/v1/sqladmin-gen.go index 01889e5cac2..6a20b2df55e 100644 --- a/sqladmin/v1/sqladmin-gen.go +++ b/sqladmin/v1/sqladmin-gen.go @@ -4044,6 +4044,8 @@ type SqlExternalSyncSettingError struct { // tables with the FULL or NOTHING replica identity. Before starting your // migration, either remove the identity or change it to DEFAULT. Note that // this is an error and will block the migration. + // "SELECTED_OBJECTS_NOT_EXIST_ON_SOURCE" - The selected objects don't exist + // on the source instance. Type string `json:"type,omitempty"` // ForceSendFields is a list of field names (e.g. "Detail") to unconditionally // include in API requests. By default, fields with empty or default values are @@ -6398,7 +6400,8 @@ type InstancesListServerCertificatesCall struct { // certificate authorities (CAs) for the specified instance. There can be up to // three sets of certs listed: the certificate that is currently in use, a // future that has been added but not yet used to sign a certificate, and a -// certificate that has been rotated out. +// certificate that has been rotated out. For instances not using Certificate +// Authority Service (CAS) server CA, use ListServerCas instead. // // - instance: Cloud SQL instance ID. This does not include the project ID. // - project: Project ID of the project that contains the instance. diff --git a/sqladmin/v1beta4/sqladmin-api.json b/sqladmin/v1beta4/sqladmin-api.json index 61ed8ad2d21..2b401668740 100644 --- a/sqladmin/v1beta4/sqladmin-api.json +++ b/sqladmin/v1beta4/sqladmin-api.json @@ -609,7 +609,7 @@ "instances": { "methods": { "ListServerCertificates": { - "description": "Lists all versions of server certificates and certificate authorities (CAs) for the specified instance. There can be up to three sets of certs listed: the certificate that is currently in use, a future that has been added but not yet used to sign a certificate, and a certificate that has been rotated out.", + "description": "Lists all versions of server certificates and certificate authorities (CAs) for the specified instance. There can be up to three sets of certs listed: the certificate that is currently in use, a future that has been added but not yet used to sign a certificate, and a certificate that has been rotated out. For instances not using Certificate Authority Service (CAS) server CA, use ListServerCas instead.", "flatPath": "sql/v1beta4/projects/{project}/instances/{instance}/listServerCertificates", "httpMethod": "GET", "id": "sql.instances.ListServerCertificates", @@ -2378,7 +2378,7 @@ } } }, - "revision": "20241004", + "revision": "20241011", "rootUrl": "https://sqladmin.googleapis.com/", "schemas": { "AclEntry": { @@ -5844,7 +5844,8 @@ "UNSUPPORTED_COLUMNS", "USERS_NOT_CREATED_IN_REPLICA", "UNSUPPORTED_SYSTEM_OBJECTS", - "UNSUPPORTED_TABLES_WITH_REPLICA_IDENTITY" + "UNSUPPORTED_TABLES_WITH_REPLICA_IDENTITY", + "SELECTED_OBJECTS_NOT_EXIST_ON_SOURCE" ], "enumDescriptions": [ "", @@ -5899,7 +5900,8 @@ "The source database has generated columns that can't be migrated. Please change them to regular columns before migration.", "The source database has users that aren't created in the replica. First, create all users, which are in the pg_user_mappings table of the source database, in the destination instance. Then, perform the migration.", "The selected objects include system objects that aren't supported for migration.", - "The source database has tables with the FULL or NOTHING replica identity. Before starting your migration, either remove the identity or change it to DEFAULT. Note that this is an error and will block the migration." + "The source database has tables with the FULL or NOTHING replica identity. Before starting your migration, either remove the identity or change it to DEFAULT. Note that this is an error and will block the migration.", + "The selected objects don't exist on the source instance." ], "type": "string" } diff --git a/sqladmin/v1beta4/sqladmin-gen.go b/sqladmin/v1beta4/sqladmin-gen.go index 34a3bec27d7..24870891fd0 100644 --- a/sqladmin/v1beta4/sqladmin-gen.go +++ b/sqladmin/v1beta4/sqladmin-gen.go @@ -4050,6 +4050,8 @@ type SqlExternalSyncSettingError struct { // tables with the FULL or NOTHING replica identity. Before starting your // migration, either remove the identity or change it to DEFAULT. Note that // this is an error and will block the migration. + // "SELECTED_OBJECTS_NOT_EXIST_ON_SOURCE" - The selected objects don't exist + // on the source instance. Type string `json:"type,omitempty"` // ForceSendFields is a list of field names (e.g. "Detail") to unconditionally // include in API requests. By default, fields with empty or default values are @@ -6400,7 +6402,8 @@ type InstancesListServerCertificatesCall struct { // certificate authorities (CAs) for the specified instance. There can be up to // three sets of certs listed: the certificate that is currently in use, a // future that has been added but not yet used to sign a certificate, and a -// certificate that has been rotated out. +// certificate that has been rotated out. For instances not using Certificate +// Authority Service (CAS) server CA, use ListServerCas instead. // // - instance: Cloud SQL instance ID. This does not include the project ID. // - project: Project ID of the project that contains the instance. diff --git a/youtube/v3/youtube-api.json b/youtube/v3/youtube-api.json index 4ac22cceb6a..0d831eec0f3 100644 --- a/youtube/v3/youtube-api.json +++ b/youtube/v3/youtube-api.json @@ -4133,7 +4133,7 @@ } } }, - "revision": "20241010", + "revision": "20241022", "rootUrl": "https://youtube.googleapis.com/", "schemas": { "AbuseReport": { @@ -8118,7 +8118,7 @@ "type": "object" }, "InvideoBranding": { - "description": "LINT.IfChange Describes an invideo branding.", + "description": "Describes an invideo branding.", "id": "InvideoBranding", "properties": { "imageBytes": { @@ -8132,6 +8132,7 @@ }, "position": { "$ref": "InvideoPosition", + "deprecated": true, "description": "The spatial position within the video where the branding watermark will be displayed." }, "targetChannelId": { @@ -10823,6 +10824,10 @@ "TestItem": { "id": "TestItem", "properties": { + "etag": { + "description": "Etag for the resource. See https://en.wikipedia.org/wiki/HTTP_ETag.", + "type": "string" + }, "featuredPart": { "type": "boolean" }, diff --git a/youtube/v3/youtube-gen.go b/youtube/v3/youtube-gen.go index 6a0f3b285f7..9151a955663 100644 --- a/youtube/v3/youtube-gen.go +++ b/youtube/v3/youtube-gen.go @@ -3944,7 +3944,7 @@ func (s IngestionInfo) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields) } -// InvideoBranding: LINT.IfChange Describes an invideo branding. +// InvideoBranding: Describes an invideo branding. type InvideoBranding struct { // ImageBytes: The bytes the uploaded image. Only used in api to youtube // communication. @@ -6968,6 +6968,8 @@ func (s SuperStickerMetadata) MarshalJSON() ([]byte, error) { } type TestItem struct { + // Etag: Etag for the resource. See https://en.wikipedia.org/wiki/HTTP_ETag. + Etag string `json:"etag,omitempty"` FeaturedPart bool `json:"featuredPart,omitempty"` Gaia int64 `json:"gaia,omitempty,string"` Id string `json:"id,omitempty"` @@ -6975,15 +6977,15 @@ type TestItem struct { // ServerResponse contains the HTTP response code and headers from the server. googleapi.ServerResponse `json:"-"` - // ForceSendFields is a list of field names (e.g. "FeaturedPart") to - // unconditionally include in API requests. By default, fields with empty or - // default values are omitted from API requests. See + // ForceSendFields is a list of field names (e.g. "Etag") to unconditionally + // include in API requests. By default, fields with empty or default values are + // omitted from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-ForceSendFields for more // details. ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "FeaturedPart") to include in API - // requests with the JSON null value. By default, fields with empty values are - // omitted from API requests. See + // NullFields is a list of field names (e.g. "Etag") to include in API requests + // with the JSON null value. By default, fields with empty values are omitted + // from API requests. See // https://pkg.go.dev/google.golang.org/api#hdr-NullFields for more details. NullFields []string `json:"-"` }