From f73ea2333675cf26b1fb5d1daccbca134fcce8b2 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 11 Aug 2022 14:13:51 -0700 Subject: [PATCH] feat(all): auto-regenerate discovery clients (#1652) --- .../v1/accesscontextmanager-api.json | 4 +- .../v1/accesscontextmanager-gen.go | 22 +- admin/directory/v1/admin-api.json | 60 +- admin/directory/v1/admin-gen.go | 90 +- adsense/v2/adsense-api.json | 8 +- adsense/v2/adsense-gen.go | 18 +- api-list.json | 15 - apigee/v1/apigee-api.json | 361 +++++- apigee/v1/apigee-gen.go | 863 ++++++++++++- chat/v1/chat-api.json | 6 +- chat/v1/chat-gen.go | 11 +- chromepolicy/v1/chromepolicy-api.json | 6 +- chromepolicy/v1/chromepolicy-gen.go | 7 +- cloudidentity/v1beta1/cloudidentity-api.json | 9 +- cloudidentity/v1beta1/cloudidentity-gen.go | 20 +- container/v1/container-api.json | 10 +- container/v1/container-gen.go | 20 +- container/v1beta1/container-api.json | 12 +- container/v1beta1/container-gen.go | 22 +- .../v1/containeranalysis-api.json | 8 +- containeranalysis/v1/containeranalysis-gen.go | 24 +- .../v1alpha1/containeranalysis-api.json | 4 +- .../v1alpha1/containeranalysis-gen.go | 22 +- .../v1beta1/containeranalysis-api.json | 8 +- .../v1beta1/containeranalysis-gen.go | 24 +- content/v2.1/content-api.json | 12 +- content/v2.1/content-gen.go | 12 +- datacatalog/v1/datacatalog-api.json | 8 +- datacatalog/v1/datacatalog-gen.go | 28 +- datacatalog/v1beta1/datacatalog-api.json | 4 +- datacatalog/v1beta1/datacatalog-gen.go | 22 +- dataproc/v1/dataproc-api.json | 4 +- dataproc/v1/dataproc-gen.go | 16 +- dlp/v2/dlp-api.json | 4 +- dlp/v2/dlp-gen.go | 24 +- dns/v1/dns-api.json | 4 +- dns/v1/dns-gen.go | 22 +- dns/v1beta2/dns-api.json | 4 +- dns/v1beta2/dns-gen.go | 22 +- documentai/v1/documentai-api.json | 10 +- documentai/v1/documentai-gen.go | 12 +- documentai/v1beta2/documentai-api.json | 6 +- documentai/v1beta2/documentai-gen.go | 6 +- documentai/v1beta3/documentai-api.json | 10 +- documentai/v1beta3/documentai-gen.go | 12 +- firebase/v1beta1/firebase-api.json | 12 +- firebase/v1beta1/firebase-gen.go | 97 +- iap/v1/iap-api.json | 4 +- iap/v1/iap-gen.go | 22 +- iap/v1beta1/iap-api.json | 4 +- iap/v1beta1/iap-gen.go | 22 +- manufacturers/v1/manufacturers-api.json | 292 ++++- manufacturers/v1/manufacturers-gen.go | 366 ++++++ ondemandscanning/v1/ondemandscanning-api.json | 6 +- ondemandscanning/v1/ondemandscanning-gen.go | 2 +- .../v1beta1/ondemandscanning-api.json | 6 +- .../v1beta1/ondemandscanning-gen.go | 2 +- policysimulator/v1/policysimulator-api.json | 4 +- policysimulator/v1/policysimulator-gen.go | 22 +- .../v1beta1/policysimulator-api.json | 4 +- .../v1beta1/policysimulator-gen.go | 22 +- run/v1/run-api.json | 46 +- run/v1/run-gen.go | 185 ++- run/v2/run-api.json | 4 +- run/v2/run-gen.go | 22 +- runtimeconfig/v1beta1/runtimeconfig-api.json | 4 +- runtimeconfig/v1beta1/runtimeconfig-gen.go | 22 +- securitycenter/v1/securitycenter-api.json | 38 +- securitycenter/v1/securitycenter-gen.go | 76 +- .../v1beta1/securitycenter-api.json | 38 +- securitycenter/v1beta1/securitycenter-gen.go | 76 +- .../v1beta2/securitycenter-api.json | 36 +- securitycenter/v1beta2/securitycenter-gen.go | 54 + testing/v1/testing-api.json | 8 +- testing/v1/testing-gen.go | 29 +- toolresults/v1beta3/toolresults-api.json | 14 +- toolresults/v1beta3/toolresults-gen.go | 7 + translate/v3/translate-api.json | 284 ++++- translate/v3/translate-gen.go | 1130 ++++++++++++++++- translate/v3beta1/translate-api.json | 10 +- translate/v3beta1/translate-gen.go | 10 +- vision/v1/vision-api.json | 9 +- vision/v1/vision-gen.go | 35 +- vision/v1p1beta1/vision-api.json | 9 +- vision/v1p1beta1/vision-gen.go | 35 +- vision/v1p2beta1/vision-api.json | 9 +- vision/v1p2beta1/vision-gen.go | 35 +- webrisk/v1/webrisk-api.json | 8 +- webrisk/v1/webrisk-gen.go | 1 + 89 files changed, 4520 insertions(+), 497 deletions(-) diff --git a/accesscontextmanager/v1/accesscontextmanager-api.json b/accesscontextmanager/v1/accesscontextmanager-api.json index b79f8270695..3044f42266f 100644 --- a/accesscontextmanager/v1/accesscontextmanager-api.json +++ b/accesscontextmanager/v1/accesscontextmanager-api.json @@ -1083,7 +1083,7 @@ } } }, - "revision": "20220620", + "revision": "20220806", "rootUrl": "https://accesscontextmanager.googleapis.com/", "schemas": { "AccessContextManagerOperationMetadata": { @@ -1250,7 +1250,7 @@ "description": "The condition that is associated with this binding. If the condition evaluates to `true`, then this binding applies to the current request. If the condition evaluates to `false`, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. To learn which resources support conditions in their IAM policies, see the [IAM documentation](https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", + "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a Google service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: An identifier for a [Kubernetes service account](https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", "items": { "type": "string" }, diff --git a/accesscontextmanager/v1/accesscontextmanager-gen.go b/accesscontextmanager/v1/accesscontextmanager-gen.go index ccdaf63cfba..35fd9cdd46d 100644 --- a/accesscontextmanager/v1/accesscontextmanager-gen.go +++ b/accesscontextmanager/v1/accesscontextmanager-gen.go @@ -531,16 +531,20 @@ type Binding struct { // who is authenticated with a Google account or a service account. * // `user:{emailid}`: An email address that represents a specific Google // account. For example, `alice@example.com` . * - // `serviceAccount:{emailid}`: An email address that represents a + // `serviceAccount:{emailid}`: An email address that represents a Google // service account. For example, - // `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An - // email address that represents a Google group. For example, - // `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An - // email address (plus unique identifier) representing a user that has - // been recently deleted. For example, - // `alice@example.com?uid=123456789012345678901`. If the user is - // recovered, this value reverts to `user:{emailid}` and the recovered - // user retains the role in the binding. * + // `my-other-app@appspot.gserviceaccount.com`. * + // `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. * + // `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus + // unique identifier) representing a user that has been recently + // deleted. For example, `alice@example.com?uid=123456789012345678901`. + // If the user is recovered, this value reverts to `user:{emailid}` and + // the recovered user retains the role in the binding. * // `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address // (plus unique identifier) representing a service account that has been // recently deleted. For example, diff --git a/admin/directory/v1/admin-api.json b/admin/directory/v1/admin-api.json index b39c6572695..33442a54dbc 100644 --- a/admin/directory/v1/admin-api.json +++ b/admin/directory/v1/admin-api.json @@ -4407,7 +4407,7 @@ } } }, - "revision": "20220802", + "revision": "20220809", "rootUrl": "https://admin.googleapis.com/", "schemas": { "Alias": { @@ -4873,7 +4873,7 @@ "additionalProperties": { "type": "string" }, - "description": "Additional parameters controlling delivery channel behavior. Optional.", + "description": "Additional parameters controlling delivery channel behavior. Optional. For example, `params.ttl` specifies the time-to-live in seconds for the notification channel, where the default is 2 hours and the maximum TTL is 2 days.", "type": "object" }, "payload": { @@ -5973,6 +5973,33 @@ }, "type": "object" }, + "GroupAlias": { + "description": "The Directory API manages aliases, which are alternative email addresses.", + "id": "GroupAlias", + "properties": { + "alias": { + "description": "The alias email address.", + "type": "string" + }, + "etag": { + "description": "ETag of the resource.", + "type": "string" + }, + "id": { + "description": "The unique ID of the group.", + "type": "string" + }, + "kind": { + "description": "The type of the API resource. For Alias resources, the value is `admin#directory#alias`.", + "type": "string" + }, + "primaryEmail": { + "description": "The primary email address of the group.", + "type": "string" + } + }, + "type": "object" + }, "Groups": { "id": "Groups", "properties": { @@ -7050,7 +7077,7 @@ "type": "any" }, "hashFunction": { - "description": "Stores the hash format of the `password` property. The following `hashFunction` values are allowed: * `MD5` - Accepts simple hex-encoded values. * `SHA1` - Accepts simple hex-encoded values. * `crypt` - Compliant with the [C crypt library](https://en.wikipedia.org/wiki/Crypt_%28C%29). Supports the DES, MD5 (hash prefix `$1$`), SHA-256 (hash prefix `$5$`), and SHA-512 (hash prefix `$6$`) hash algorithms. If rounds are specified as part of the prefix, they must be 10,000 or fewer.", + "description": "Stores the hash format of the `password` property. The following `hashFunction` values are allowed: * `MD5` - Accepts simple hex-encoded values. * `SHA-1` - Accepts simple hex-encoded values. * `crypt` - Compliant with the [C crypt library](https://en.wikipedia.org/wiki/Crypt_%28C%29). Supports the DES, MD5 (hash prefix `$1$`), SHA-256 (hash prefix `$5$`), and SHA-512 (hash prefix `$6$`) hash algorithms. If rounds are specified as part of the prefix, they must be 10,000 or fewer.", "type": "string" }, "id": { @@ -7289,6 +7316,33 @@ }, "type": "object" }, + "UserAlias": { + "description": "The Directory API manages aliases, which are alternative email addresses.", + "id": "UserAlias", + "properties": { + "alias": { + "description": "The alias email address.", + "type": "string" + }, + "etag": { + "description": "ETag of the resource.", + "type": "string" + }, + "id": { + "description": "The unique ID for the user.", + "type": "string" + }, + "kind": { + "description": "The type of the API resource. For Alias resources, the value is `admin#directory#alias`.", + "type": "string" + }, + "primaryEmail": { + "description": "The user's primary email address.", + "type": "string" + } + }, + "type": "object" + }, "UserCustomProperties": { "additionalProperties": { "type": "any" diff --git a/admin/directory/v1/admin-gen.go b/admin/directory/v1/admin-gen.go index efe3be53e81..79797bf305c 100644 --- a/admin/directory/v1/admin-gen.go +++ b/admin/directory/v1/admin-gen.go @@ -1326,7 +1326,9 @@ type Channel struct { Kind string `json:"kind,omitempty"` // Params: Additional parameters controlling delivery channel behavior. - // Optional. + // Optional. For example, `params.ttl` specifies the time-to-live in + // seconds for the notification channel, where the default is 2 hours + // and the maximum TTL is 2 days. Params map[string]string `json:"params,omitempty"` // Payload: A Boolean value to indicate whether payload is wanted. @@ -3076,6 +3078,48 @@ func (s *Group) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// GroupAlias: The Directory API manages aliases, which are alternative +// email addresses. +type GroupAlias struct { + // Alias: The alias email address. + Alias string `json:"alias,omitempty"` + + // Etag: ETag of the resource. + Etag string `json:"etag,omitempty"` + + // Id: The unique ID of the group. + Id string `json:"id,omitempty"` + + // Kind: The type of the API resource. For Alias resources, the value is + // `admin#directory#alias`. + Kind string `json:"kind,omitempty"` + + // PrimaryEmail: The primary email address of the group. + PrimaryEmail string `json:"primaryEmail,omitempty"` + + // ForceSendFields is a list of field names (e.g. "Alias") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "Alias") to include in API + // requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. However, any field with an + // empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *GroupAlias) MarshalJSON() ([]byte, error) { + type NoMethod GroupAlias + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + type Groups struct { // Etag: ETag of the resource. Etag string `json:"etag,omitempty"` @@ -4624,7 +4668,7 @@ type User struct { // HashFunction: Stores the hash format of the `password` property. The // following `hashFunction` values are allowed: * `MD5` - Accepts simple - // hex-encoded values. * `SHA1` - Accepts simple hex-encoded values. * + // hex-encoded values. * `SHA-1` - Accepts simple hex-encoded values. * // `crypt` - Compliant with the C crypt library // (https://en.wikipedia.org/wiki/Crypt_%28C%29). Supports the DES, MD5 // (hash prefix `$1$`), SHA-256 (hash prefix `$5$`), and SHA-512 (hash @@ -4916,6 +4960,48 @@ func (s *UserAddress) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// UserAlias: The Directory API manages aliases, which are alternative +// email addresses. +type UserAlias struct { + // Alias: The alias email address. + Alias string `json:"alias,omitempty"` + + // Etag: ETag of the resource. + Etag string `json:"etag,omitempty"` + + // Id: The unique ID for the user. + Id string `json:"id,omitempty"` + + // Kind: The type of the API resource. For Alias resources, the value is + // `admin#directory#alias`. + Kind string `json:"kind,omitempty"` + + // PrimaryEmail: The user's primary email address. + PrimaryEmail string `json:"primaryEmail,omitempty"` + + // ForceSendFields is a list of field names (e.g. "Alias") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "Alias") to include in API + // requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. However, any field with an + // empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *UserAlias) MarshalJSON() ([]byte, error) { + type NoMethod UserAlias + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // UserEmail: JSON template for an email. type UserEmail struct { // Address: Email id of the user. diff --git a/adsense/v2/adsense-api.json b/adsense/v2/adsense-api.json index 524a1920bb7..e21bfb44a8c 100644 --- a/adsense/v2/adsense-api.json +++ b/adsense/v2/adsense-api.json @@ -323,7 +323,7 @@ ] }, "getAdcode": { - "description": "Gets the AdSense code for a given ad unit.", + "description": "Gets the ad unit code for a given ad unit. For more information, see [About the AdSense code](https://support.google.com/adsense/answer/9274634) and [Where to place the ad code in your HTML](https://support.google.com/adsense/answer/9190028).", "flatPath": "v2/accounts/{accountsId}/adclients/{adclientsId}/adunits/{adunitsId}/adcode", "httpMethod": "GET", "id": "adsense.accounts.adclients.adunits.getAdcode", @@ -1645,7 +1645,7 @@ } } }, - "revision": "20220727", + "revision": "20220810", "rootUrl": "https://adsense.googleapis.com/", "schemas": { "Account": { @@ -1806,11 +1806,11 @@ "type": "object" }, "AdUnitAdCode": { - "description": "Representation of the AdSense code for a given ad unit.", + "description": "Representation of the ad unit code for a given ad unit. For more information, see [About the AdSense code](https://support.google.com/adsense/answer/9274634) and [Where to place the ad code in your HTML](https://support.google.com/adsense/answer/9190028).", "id": "AdUnitAdCode", "properties": { "adCode": { - "description": "Output only. The AdSense code snippet to add to the body of an HTML page.", + "description": "Output only. The code snippet to add to the body of an HTML page.", "readOnly": true, "type": "string" } diff --git a/adsense/v2/adsense-gen.go b/adsense/v2/adsense-gen.go index ee45f469190..b73b4d72863 100644 --- a/adsense/v2/adsense-gen.go +++ b/adsense/v2/adsense-gen.go @@ -479,10 +479,14 @@ func (s *AdUnit) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } -// AdUnitAdCode: Representation of the AdSense code for a given ad unit. +// AdUnitAdCode: Representation of the ad unit code for a given ad unit. +// For more information, see About the AdSense code +// (https://support.google.com/adsense/answer/9274634) and Where to +// place the ad code in your HTML +// (https://support.google.com/adsense/answer/9190028). type AdUnitAdCode struct { - // AdCode: Output only. The AdSense code snippet to add to the body of - // an HTML page. + // AdCode: Output only. The code snippet to add to the body of an HTML + // page. AdCode string `json:"adCode,omitempty"` // ServerResponse contains the HTTP response code and headers from the @@ -2759,7 +2763,11 @@ type AccountsAdclientsAdunitsGetAdcodeCall struct { header_ http.Header } -// GetAdcode: Gets the AdSense code for a given ad unit. +// GetAdcode: Gets the ad unit code for a given ad unit. For more +// information, see About the AdSense code +// (https://support.google.com/adsense/answer/9274634) and Where to +// place the ad code in your HTML +// (https://support.google.com/adsense/answer/9190028). // // - name: Name of the adunit for which to get the adcode. Format: // accounts/{account}/adclients/{adclient}/adunits/{adunit}. @@ -2868,7 +2876,7 @@ func (c *AccountsAdclientsAdunitsGetAdcodeCall) Do(opts ...googleapi.CallOption) } return ret, nil // { - // "description": "Gets the AdSense code for a given ad unit.", + // "description": "Gets the ad unit code for a given ad unit. For more information, see [About the AdSense code](https://support.google.com/adsense/answer/9274634) and [Where to place the ad code in your HTML](https://support.google.com/adsense/answer/9190028).", // "flatPath": "v2/accounts/{accountsId}/adclients/{adclientsId}/adunits/{adunitsId}/adcode", // "httpMethod": "GET", // "id": "adsense.accounts.adclients.adunits.getAdcode", diff --git a/api-list.json b/api-list.json index 7b13a7d1f6c..b13cb25ed20 100644 --- a/api-list.json +++ b/api-list.json @@ -5092,21 +5092,6 @@ "documentationLink": "https://cloud.google.com/speech-to-text/docs/quickstart-protocol", "preferred": false }, - { - "kind": "discovery#directoryItem", - "id": "speech:v2beta1", - "name": "speech", - "version": "v2beta1", - "title": "Cloud Speech-to-Text API", - "description": "Converts audio to text by applying powerful neural network models.", - "discoveryRestUrl": "https://speech.googleapis.com/$discovery/rest?version=v2beta1", - "icons": { - "x16": "https://www.gstatic.com/images/branding/product/1x/googleg_16dp.png", - "x32": "https://www.gstatic.com/images/branding/product/1x/googleg_32dp.png" - }, - "documentationLink": "https://cloud.google.com/speech-to-text/docs/quickstart-protocol", - "preferred": false - }, { "kind": "discovery#directoryItem", "id": "speech:v1", diff --git a/apigee/v1/apigee-api.json b/apigee/v1/apigee-api.json index 36665ade7ef..43b43ac8164 100644 --- a/apigee/v1/apigee-api.json +++ b/apigee/v1/apigee-api.json @@ -3645,6 +3645,40 @@ "https://www.googleapis.com/auth/cloud-platform" ] }, + "modifyEnvironment": { + "description": "Updates properties for an Apigee environment with patch semantics using a field mask. **Note:** Not supported for Apigee hybrid.", + "flatPath": "v1/organizations/{organizationsId}/environments/{environmentsId}", + "httpMethod": "PATCH", + "id": "apigee.organizations.environments.modifyEnvironment", + "parameterOrder": [ + "name" + ], + "parameters": { + "name": { + "description": "Required. Name of the environment. Use the following structure in your request: `organizations/{org}/environments/{environment}`.", + "location": "path", + "pattern": "^organizations/[^/]+/environments/[^/]+$", + "required": true, + "type": "string" + }, + "updateMask": { + "description": "List of fields to be updated. Fields that can be updated: node_config.", + "format": "google-fieldmask", + "location": "query", + "type": "string" + } + }, + "path": "v1/{+name}", + "request": { + "$ref": "GoogleCloudApigeeV1Environment" + }, + "response": { + "$ref": "GoogleLongrunningOperation" + }, + "scopes": [ + "https://www.googleapis.com/auth/cloud-platform" + ] + }, "setIamPolicy": { "description": "Sets the IAM policy on an environment, if the policy already exists it will be replaced. For more information, see [Manage users, roles, and permissions using the API](https://cloud.google.com/apigee/docs/api-platform/system-administration/manage-users-roles). You must have the `apigee.environments.setIamPolicy` permission to call this API.", "flatPath": "v1/organizations/{organizationsId}/environments/{environmentsId}:setIamPolicy", @@ -5945,6 +5979,66 @@ } } }, + "securityStats": { + "methods": { + "queryTabularStats": { + "description": "Retrieve security statistics as tabular rows.", + "flatPath": "v1/organizations/{organizationsId}/environments/{environmentsId}/securityStats:queryTabularStats", + "httpMethod": "POST", + "id": "apigee.organizations.environments.securityStats.queryTabularStats", + "parameterOrder": [ + "orgenv" + ], + "parameters": { + "orgenv": { + "description": "Required. Should be of the form organizations//environments/.", + "location": "path", + "pattern": "^organizations/[^/]+/environments/[^/]+$", + "required": true, + "type": "string" + } + }, + "path": "v1/{+orgenv}/securityStats:queryTabularStats", + "request": { + "$ref": "GoogleCloudApigeeV1QueryTabularStatsRequest" + }, + "response": { + "$ref": "GoogleCloudApigeeV1QueryTabularStatsResponse" + }, + "scopes": [ + "https://www.googleapis.com/auth/cloud-platform" + ] + }, + "queryTimeSeriesStats": { + "description": "Retrieve security statistics as a collection of time series.", + "flatPath": "v1/organizations/{organizationsId}/environments/{environmentsId}/securityStats:queryTimeSeriesStats", + "httpMethod": "POST", + "id": "apigee.organizations.environments.securityStats.queryTimeSeriesStats", + "parameterOrder": [ + "orgenv" + ], + "parameters": { + "orgenv": { + "description": "Required. Should be of the form organizations//environments/.", + "location": "path", + "pattern": "^organizations/[^/]+/environments/[^/]+$", + "required": true, + "type": "string" + } + }, + "path": "v1/{+orgenv}/securityStats:queryTimeSeriesStats", + "request": { + "$ref": "GoogleCloudApigeeV1QueryTimeSeriesStatsRequest" + }, + "response": { + "$ref": "GoogleCloudApigeeV1QueryTimeSeriesStatsResponse" + }, + "scopes": [ + "https://www.googleapis.com/auth/cloud-platform" + ] + } + } + }, "sharedflows": { "resources": { "deployments": { @@ -8515,7 +8609,7 @@ } } }, - "revision": "20220728", + "revision": "20220804", "rootUrl": "https://apigee.googleapis.com/", "schemas": { "EdgeConfigstoreBundleBadBundle": { @@ -10777,6 +10871,10 @@ "description": "Required. Name of the environment. Values must match the regular expression `^[.\\\\p{Alnum}-_]{1,255}$`", "type": "string" }, + "nodeConfig": { + "$ref": "GoogleCloudApigeeV1NodeConfig", + "description": "Optional. NodeConfig of the environment." + }, "properties": { "$ref": "GoogleCloudApigeeV1Properties", "description": "Optional. Key-value pairs that may be used for customizing the environment." @@ -12154,6 +12252,51 @@ }, "type": "object" }, + "GoogleCloudApigeeV1MetricAggregation": { + "description": "The optionally aggregated metric to query with its ordering.", + "id": "GoogleCloudApigeeV1MetricAggregation", + "properties": { + "aggregation": { + "description": "Aggregation function associated with the metric.", + "enum": [ + "AGGREGATION_FUNCTION_UNSPECIFIED", + "AVG", + "SUM", + "MIN", + "MAX", + "COUNT_DISTINCT" + ], + "enumDescriptions": [ + "Unspecified Aggregation function.", + "Average.", + "Summation.", + "Min.", + "Max.", + "Count distinct" + ], + "type": "string" + }, + "name": { + "description": "Name of the metric", + "type": "string" + }, + "order": { + "description": "Ordering for this aggregation in the result. For time series this is ignored since the ordering of points depends only on the timestamp, not the values.", + "enum": [ + "ORDER_UNSPECIFIED", + "ASCENDING", + "DESCENDING" + ], + "enumDescriptions": [ + "Unspecified order. Default is Descending.", + "Ascending sort order.", + "Descending sort order." + ], + "type": "string" + } + }, + "type": "object" + }, "GoogleCloudApigeeV1MonetizationConfig": { "description": "Configuration for the Monetization add-on.", "id": "GoogleCloudApigeeV1MonetizationConfig", @@ -12200,6 +12343,29 @@ }, "type": "object" }, + "GoogleCloudApigeeV1NodeConfig": { + "description": "NodeConfig for setting the min/max number of nodes associated with the environment.", + "id": "GoogleCloudApigeeV1NodeConfig", + "properties": { + "currentAggregateNodeCount": { + "description": "Output only. The current total number of gateway nodes that each environment currently has across all instances.", + "format": "int64", + "readOnly": true, + "type": "string" + }, + "maxNodeCount": { + "description": "Optional. The maximum total number of gateway nodes that the is reserved for all instances that has the specified environment. If not specified, the default is determined by the recommended maximum number of nodes for that gateway.", + "format": "int64", + "type": "string" + }, + "minNodeCount": { + "description": "Optional. The minimum total number of gateway nodes that the is reserved for all instances that has the specified environment. If not specified, the default is determined by the recommended minimum number of nodes for that gateway.", + "format": "int64", + "type": "string" + } + }, + "type": "object" + }, "GoogleCloudApigeeV1Operation": { "description": "Represents the pairing of REST resource path and the actions (verbs) allowed on the resource path.", "id": "GoogleCloudApigeeV1Operation", @@ -12439,12 +12605,14 @@ "enum": [ "BILLING_TYPE_UNSPECIFIED", "SUBSCRIPTION", - "EVALUATION" + "EVALUATION", + "PAYG" ], "enumDescriptions": [ "Billing type not specified.", "A pre-paid subscription to Apigee.", - "Free and limited access to Apigee for evaluation purposes only. only." + "Free and limited access to Apigee for evaluation purposes only. only.", + "Access to Apigee using a Pay-As-You-Go plan." ], "type": "string" }, @@ -12838,6 +13006,191 @@ }, "type": "object" }, + "GoogleCloudApigeeV1QueryTabularStatsRequest": { + "description": "Request payload representing the query to be run for fetching security statistics as rows.", + "id": "GoogleCloudApigeeV1QueryTabularStatsRequest", + "properties": { + "dimensions": { + "description": "Required. List of dimension names to group the aggregations by.", + "items": { + "type": "string" + }, + "type": "array" + }, + "filter": { + "description": "Filter further on specific dimension values. Follows the same grammar as custom report's filter expressions. Example, apiproxy eq 'foobar'. https://cloud.google.com/apigee/docs/api-platform/analytics/analytics-reference#filters", + "type": "string" + }, + "metrics": { + "description": "Required. List of metrics and their aggregations.", + "items": { + "$ref": "GoogleCloudApigeeV1MetricAggregation" + }, + "type": "array" + }, + "pageSize": { + "description": "Page size represents the number of rows.", + "format": "int32", + "type": "integer" + }, + "pageToken": { + "description": "Identifies a sequence of rows.", + "type": "string" + }, + "timeRange": { + "$ref": "GoogleTypeInterval", + "description": "Time range for the stats." + } + }, + "type": "object" + }, + "GoogleCloudApigeeV1QueryTabularStatsResponse": { + "description": "Encapsulates two kinds of stats that are results of the dimensions and aggregations requested. - Tabular rows. - Time series data. Example of tabular rows, Represents security stats results as a row of flat values.", + "id": "GoogleCloudApigeeV1QueryTabularStatsResponse", + "properties": { + "columns": { + "description": "Column names corresponding to the same order as the inner values in the stats field.", + "items": { + "type": "string" + }, + "type": "array" + }, + "nextPageToken": { + "description": "Next page token.", + "type": "string" + }, + "values": { + "description": "Resultant rows from the executed query.", + "items": { + "items": { + "type": "any" + }, + "type": "array" + }, + "type": "array" + } + }, + "type": "object" + }, + "GoogleCloudApigeeV1QueryTimeSeriesStatsRequest": { + "description": "QueryTimeSeriesStatsRequest represents a query that returns a collection of time series sequences grouped by their values.", + "id": "GoogleCloudApigeeV1QueryTimeSeriesStatsRequest", + "properties": { + "dimensions": { + "description": "List of dimension names to group the aggregations by. If no dimensions are passed, a single trend line representing the requested metric aggregations grouped by environment is returned.", + "items": { + "type": "string" + }, + "type": "array" + }, + "filter": { + "description": "Filter further on specific dimension values. Follows the same grammar as custom report's filter expressions. Example, apiproxy eq 'foobar'. https://cloud.google.com/apigee/docs/api-platform/analytics/analytics-reference#filters", + "type": "string" + }, + "metrics": { + "description": "Required. List of metrics and their aggregations.", + "items": { + "$ref": "GoogleCloudApigeeV1MetricAggregation" + }, + "type": "array" + }, + "pageSize": { + "description": "Page size represents the number of time series sequences, one per unique set of dimensions and their values.", + "format": "int32", + "type": "integer" + }, + "pageToken": { + "description": "Page token stands for a specific collection of time series sequences.", + "type": "string" + }, + "timeRange": { + "$ref": "GoogleTypeInterval", + "description": "Required. Time range for the stats." + }, + "timestampOrder": { + "description": "Order the sequences in increasing or decreasing order of timestamps. Default is descending order of timestamps (latest first).", + "enum": [ + "ORDER_UNSPECIFIED", + "ASCENDING", + "DESCENDING" + ], + "enumDescriptions": [ + "Unspecified order. Default is Descending.", + "Ascending sort order.", + "Descending sort order." + ], + "type": "string" + }, + "windowSize": { + "description": "Time buckets to group the stats by.", + "enum": [ + "WINDOW_SIZE_UNSPECIFIED", + "MINUTE", + "HOUR", + "DAY", + "MONTH" + ], + "enumDescriptions": [ + "Unspecified window size. Default is 1 hour.", + "1 Minute window", + "1 Hour window", + "1 Day window", + "1 Month window" + ], + "type": "string" + } + }, + "type": "object" + }, + "GoogleCloudApigeeV1QueryTimeSeriesStatsResponse": { + "description": "Represents security stats result as a collection of time series sequences.", + "id": "GoogleCloudApigeeV1QueryTimeSeriesStatsResponse", + "properties": { + "columns": { + "description": "Column names corresponding to the same order as the inner values in the stats field.", + "items": { + "type": "string" + }, + "type": "array" + }, + "nextPageToken": { + "description": "Next page token.", + "type": "string" + }, + "values": { + "description": "Results of the query returned as a JSON array.", + "items": { + "$ref": "GoogleCloudApigeeV1QueryTimeSeriesStatsResponseSequence" + }, + "type": "array" + } + }, + "type": "object" + }, + "GoogleCloudApigeeV1QueryTimeSeriesStatsResponseSequence": { + "description": "A sequence of time series.", + "id": "GoogleCloudApigeeV1QueryTimeSeriesStatsResponseSequence", + "properties": { + "dimensions": { + "additionalProperties": { + "type": "string" + }, + "description": "Map of dimensions and their values that uniquely identifies a time series sequence.", + "type": "object" + }, + "points": { + "description": "List of points. First value of each inner list is a timestamp.", + "items": { + "items": { + "type": "any" + }, + "type": "array" + }, + "type": "array" + } + }, + "type": "object" + }, "GoogleCloudApigeeV1Quota": { "description": "Quota contains the essential parameters needed that can be applied on the resources, methods, API source combination associated with this API product. While Quota is optional, setting it prevents requests from exceeding the provisioned parameters.", "id": "GoogleCloudApigeeV1Quota", @@ -14634,7 +14987,7 @@ "description": "The condition that is associated with this binding. If the condition evaluates to `true`, then this binding applies to the current request. If the condition evaluates to `false`, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. To learn which resources support conditions in their IAM policies, see the [IAM documentation](https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", + "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a Google service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: An identifier for a [Kubernetes service account](https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", "items": { "type": "string" }, diff --git a/apigee/v1/apigee-gen.go b/apigee/v1/apigee-gen.go index 125b5bf62ca..0ae27ad7564 100644 --- a/apigee/v1/apigee-gen.go +++ b/apigee/v1/apigee-gen.go @@ -536,6 +536,7 @@ func NewOrganizationsEnvironmentsService(s *Service) *OrganizationsEnvironmentsS rs.References = NewOrganizationsEnvironmentsReferencesService(s) rs.Resourcefiles = NewOrganizationsEnvironmentsResourcefilesService(s) rs.SecurityReports = NewOrganizationsEnvironmentsSecurityReportsService(s) + rs.SecurityStats = NewOrganizationsEnvironmentsSecurityStatsService(s) rs.Sharedflows = NewOrganizationsEnvironmentsSharedflowsService(s) rs.Stats = NewOrganizationsEnvironmentsStatsService(s) rs.Targetservers = NewOrganizationsEnvironmentsTargetserversService(s) @@ -572,6 +573,8 @@ type OrganizationsEnvironmentsService struct { SecurityReports *OrganizationsEnvironmentsSecurityReportsService + SecurityStats *OrganizationsEnvironmentsSecurityStatsService + Sharedflows *OrganizationsEnvironmentsSharedflowsService Stats *OrganizationsEnvironmentsStatsService @@ -806,6 +809,15 @@ type OrganizationsEnvironmentsSecurityReportsService struct { s *Service } +func NewOrganizationsEnvironmentsSecurityStatsService(s *Service) *OrganizationsEnvironmentsSecurityStatsService { + rs := &OrganizationsEnvironmentsSecurityStatsService{s: s} + return rs +} + +type OrganizationsEnvironmentsSecurityStatsService struct { + s *Service +} + func NewOrganizationsEnvironmentsSharedflowsService(s *Service) *OrganizationsEnvironmentsSharedflowsService { rs := &OrganizationsEnvironmentsSharedflowsService{s: s} rs.Deployments = NewOrganizationsEnvironmentsSharedflowsDeploymentsService(s) @@ -4390,6 +4402,9 @@ type GoogleCloudApigeeV1Environment struct { // regular expression `^[.\\p{Alnum}-_]{1,255}$` Name string `json:"name,omitempty"` + // NodeConfig: Optional. NodeConfig of the environment. + NodeConfig *GoogleCloudApigeeV1NodeConfig `json:"nodeConfig,omitempty"` + // Properties: Optional. Key-value pairs that may be used for // customizing the environment. Properties *GoogleCloudApigeeV1Properties `json:"properties,omitempty"` @@ -6898,6 +6913,57 @@ func (s *GoogleCloudApigeeV1Metric) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// GoogleCloudApigeeV1MetricAggregation: The optionally aggregated +// metric to query with its ordering. +type GoogleCloudApigeeV1MetricAggregation struct { + // Aggregation: Aggregation function associated with the metric. + // + // Possible values: + // "AGGREGATION_FUNCTION_UNSPECIFIED" - Unspecified Aggregation + // function. + // "AVG" - Average. + // "SUM" - Summation. + // "MIN" - Min. + // "MAX" - Max. + // "COUNT_DISTINCT" - Count distinct + Aggregation string `json:"aggregation,omitempty"` + + // Name: Name of the metric + Name string `json:"name,omitempty"` + + // Order: Ordering for this aggregation in the result. For time series + // this is ignored since the ordering of points depends only on the + // timestamp, not the values. + // + // Possible values: + // "ORDER_UNSPECIFIED" - Unspecified order. Default is Descending. + // "ASCENDING" - Ascending sort order. + // "DESCENDING" - Descending sort order. + Order string `json:"order,omitempty"` + + // ForceSendFields is a list of field names (e.g. "Aggregation") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "Aggregation") to include + // in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. However, any field with + // an empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *GoogleCloudApigeeV1MetricAggregation) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudApigeeV1MetricAggregation + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // GoogleCloudApigeeV1MonetizationConfig: Configuration for the // Monetization add-on. type GoogleCloudApigeeV1MonetizationConfig struct { @@ -6976,6 +7042,51 @@ func (s *GoogleCloudApigeeV1NatAddress) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// GoogleCloudApigeeV1NodeConfig: NodeConfig for setting the min/max +// number of nodes associated with the environment. +type GoogleCloudApigeeV1NodeConfig struct { + // CurrentAggregateNodeCount: Output only. The current total number of + // gateway nodes that each environment currently has across all + // instances. + CurrentAggregateNodeCount int64 `json:"currentAggregateNodeCount,omitempty,string"` + + // MaxNodeCount: Optional. The maximum total number of gateway nodes + // that the is reserved for all instances that has the specified + // environment. If not specified, the default is determined by the + // recommended maximum number of nodes for that gateway. + MaxNodeCount int64 `json:"maxNodeCount,omitempty,string"` + + // MinNodeCount: Optional. The minimum total number of gateway nodes + // that the is reserved for all instances that has the specified + // environment. If not specified, the default is determined by the + // recommended minimum number of nodes for that gateway. + MinNodeCount int64 `json:"minNodeCount,omitempty,string"` + + // ForceSendFields is a list of field names (e.g. + // "CurrentAggregateNodeCount") to unconditionally include in API + // requests. By default, fields with empty or default values are omitted + // from API requests. However, any non-pointer, non-interface field + // appearing in ForceSendFields will be sent to the server regardless of + // whether the field is empty or not. This may be used to include empty + // fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. + // "CurrentAggregateNodeCount") to include in API requests with the JSON + // null value. By default, fields with empty values are omitted from API + // requests. However, any field with an empty value appearing in + // NullFields will be sent to the server as null. It is an error if a + // field in this list has a non-empty value. This may be used to include + // null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *GoogleCloudApigeeV1NodeConfig) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudApigeeV1NodeConfig + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // GoogleCloudApigeeV1Operation: Represents the pairing of REST resource // path and the actions (verbs) allowed on the resource path. type GoogleCloudApigeeV1Operation struct { @@ -7347,6 +7458,7 @@ type GoogleCloudApigeeV1Organization struct { // "SUBSCRIPTION" - A pre-paid subscription to Apigee. // "EVALUATION" - Free and limited access to Apigee for evaluation // purposes only. only. + // "PAYG" - Access to Apigee using a Pay-As-You-Go plan. BillingType string `json:"billingType,omitempty"` // CaCertificate: Output only. Base64-encoded public certificate for the @@ -7893,6 +8005,244 @@ func (s *GoogleCloudApigeeV1QueryMetric) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// GoogleCloudApigeeV1QueryTabularStatsRequest: Request payload +// representing the query to be run for fetching security statistics as +// rows. +type GoogleCloudApigeeV1QueryTabularStatsRequest struct { + // Dimensions: Required. List of dimension names to group the + // aggregations by. + Dimensions []string `json:"dimensions,omitempty"` + + // Filter: Filter further on specific dimension values. Follows the same + // grammar as custom report's filter expressions. Example, apiproxy eq + // 'foobar'. + // https://cloud.google.com/apigee/docs/api-platform/analytics/analytics-reference#filters + Filter string `json:"filter,omitempty"` + + // Metrics: Required. List of metrics and their aggregations. + Metrics []*GoogleCloudApigeeV1MetricAggregation `json:"metrics,omitempty"` + + // PageSize: Page size represents the number of rows. + PageSize int64 `json:"pageSize,omitempty"` + + // PageToken: Identifies a sequence of rows. + PageToken string `json:"pageToken,omitempty"` + + // TimeRange: Time range for the stats. + TimeRange *GoogleTypeInterval `json:"timeRange,omitempty"` + + // ForceSendFields is a list of field names (e.g. "Dimensions") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "Dimensions") to include in + // API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. However, any field with an + // empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *GoogleCloudApigeeV1QueryTabularStatsRequest) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudApigeeV1QueryTabularStatsRequest + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + +// GoogleCloudApigeeV1QueryTabularStatsResponse: Encapsulates two kinds +// of stats that are results of the dimensions and aggregations +// requested. - Tabular rows. - Time series data. Example of tabular +// rows, Represents security stats results as a row of flat values. +type GoogleCloudApigeeV1QueryTabularStatsResponse struct { + // Columns: Column names corresponding to the same order as the inner + // values in the stats field. + Columns []string `json:"columns,omitempty"` + + // NextPageToken: Next page token. + NextPageToken string `json:"nextPageToken,omitempty"` + + // Values: Resultant rows from the executed query. + Values [][]interface{} `json:"values,omitempty"` + + // ServerResponse contains the HTTP response code and headers from the + // server. + googleapi.ServerResponse `json:"-"` + + // ForceSendFields is a list of field names (e.g. "Columns") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "Columns") to include in + // API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. However, any field with an + // empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *GoogleCloudApigeeV1QueryTabularStatsResponse) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudApigeeV1QueryTabularStatsResponse + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + +// GoogleCloudApigeeV1QueryTimeSeriesStatsRequest: +// QueryTimeSeriesStatsRequest represents a query that returns a +// collection of time series sequences grouped by their values. +type GoogleCloudApigeeV1QueryTimeSeriesStatsRequest struct { + // Dimensions: List of dimension names to group the aggregations by. If + // no dimensions are passed, a single trend line representing the + // requested metric aggregations grouped by environment is returned. + Dimensions []string `json:"dimensions,omitempty"` + + // Filter: Filter further on specific dimension values. Follows the same + // grammar as custom report's filter expressions. Example, apiproxy eq + // 'foobar'. + // https://cloud.google.com/apigee/docs/api-platform/analytics/analytics-reference#filters + Filter string `json:"filter,omitempty"` + + // Metrics: Required. List of metrics and their aggregations. + Metrics []*GoogleCloudApigeeV1MetricAggregation `json:"metrics,omitempty"` + + // PageSize: Page size represents the number of time series sequences, + // one per unique set of dimensions and their values. + PageSize int64 `json:"pageSize,omitempty"` + + // PageToken: Page token stands for a specific collection of time series + // sequences. + PageToken string `json:"pageToken,omitempty"` + + // TimeRange: Required. Time range for the stats. + TimeRange *GoogleTypeInterval `json:"timeRange,omitempty"` + + // TimestampOrder: Order the sequences in increasing or decreasing order + // of timestamps. Default is descending order of timestamps (latest + // first). + // + // Possible values: + // "ORDER_UNSPECIFIED" - Unspecified order. Default is Descending. + // "ASCENDING" - Ascending sort order. + // "DESCENDING" - Descending sort order. + TimestampOrder string `json:"timestampOrder,omitempty"` + + // WindowSize: Time buckets to group the stats by. + // + // Possible values: + // "WINDOW_SIZE_UNSPECIFIED" - Unspecified window size. Default is 1 + // hour. + // "MINUTE" - 1 Minute window + // "HOUR" - 1 Hour window + // "DAY" - 1 Day window + // "MONTH" - 1 Month window + WindowSize string `json:"windowSize,omitempty"` + + // ForceSendFields is a list of field names (e.g. "Dimensions") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "Dimensions") to include in + // API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. However, any field with an + // empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *GoogleCloudApigeeV1QueryTimeSeriesStatsRequest) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudApigeeV1QueryTimeSeriesStatsRequest + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + +// GoogleCloudApigeeV1QueryTimeSeriesStatsResponse: Represents security +// stats result as a collection of time series sequences. +type GoogleCloudApigeeV1QueryTimeSeriesStatsResponse struct { + // Columns: Column names corresponding to the same order as the inner + // values in the stats field. + Columns []string `json:"columns,omitempty"` + + // NextPageToken: Next page token. + NextPageToken string `json:"nextPageToken,omitempty"` + + // Values: Results of the query returned as a JSON array. + Values []*GoogleCloudApigeeV1QueryTimeSeriesStatsResponseSequence `json:"values,omitempty"` + + // ServerResponse contains the HTTP response code and headers from the + // server. + googleapi.ServerResponse `json:"-"` + + // ForceSendFields is a list of field names (e.g. "Columns") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "Columns") to include in + // API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. However, any field with an + // empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *GoogleCloudApigeeV1QueryTimeSeriesStatsResponse) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudApigeeV1QueryTimeSeriesStatsResponse + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + +// GoogleCloudApigeeV1QueryTimeSeriesStatsResponseSequence: A sequence +// of time series. +type GoogleCloudApigeeV1QueryTimeSeriesStatsResponseSequence struct { + // Dimensions: Map of dimensions and their values that uniquely + // identifies a time series sequence. + Dimensions map[string]string `json:"dimensions,omitempty"` + + // Points: List of points. First value of each inner list is a + // timestamp. + Points [][]interface{} `json:"points,omitempty"` + + // ForceSendFields is a list of field names (e.g. "Dimensions") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "Dimensions") to include in + // API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. However, any field with an + // empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *GoogleCloudApigeeV1QueryTimeSeriesStatsResponseSequence) MarshalJSON() ([]byte, error) { + type NoMethod GoogleCloudApigeeV1QueryTimeSeriesStatsResponseSequence + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // GoogleCloudApigeeV1Quota: Quota contains the essential parameters // needed that can be applied on the resources, methods, API source // combination associated with this API product. While Quota is @@ -10841,16 +11191,20 @@ type GoogleIamV1Binding struct { // who is authenticated with a Google account or a service account. * // `user:{emailid}`: An email address that represents a specific Google // account. For example, `alice@example.com` . * - // `serviceAccount:{emailid}`: An email address that represents a + // `serviceAccount:{emailid}`: An email address that represents a Google // service account. For example, - // `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An - // email address that represents a Google group. For example, - // `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An - // email address (plus unique identifier) representing a user that has - // been recently deleted. For example, - // `alice@example.com?uid=123456789012345678901`. If the user is - // recovered, this value reverts to `user:{emailid}` and the recovered - // user retains the role in the binding. * + // `my-other-app@appspot.gserviceaccount.com`. * + // `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. * + // `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus + // unique identifier) representing a user that has been recently + // deleted. For example, `alice@example.com?uid=123456789012345678901`. + // If the user is recovered, this value reverts to `user:{emailid}` and + // the recovered user retains the role in the binding. * // `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address // (plus unique identifier) representing a service account that has been // recently deleted. For example, @@ -29600,6 +29954,164 @@ func (c *OrganizationsEnvironmentsGetTraceConfigCall) Do(opts ...googleapi.CallO } +// method id "apigee.organizations.environments.modifyEnvironment": + +type OrganizationsEnvironmentsModifyEnvironmentCall struct { + s *Service + name string + googlecloudapigeev1environment *GoogleCloudApigeeV1Environment + urlParams_ gensupport.URLParams + ctx_ context.Context + header_ http.Header +} + +// ModifyEnvironment: Updates properties for an Apigee environment with +// patch semantics using a field mask. **Note:** Not supported for +// Apigee hybrid. +// +// - name: Name of the environment. Use the following structure in your +// request: `organizations/{org}/environments/{environment}`. +func (r *OrganizationsEnvironmentsService) ModifyEnvironment(name string, googlecloudapigeev1environment *GoogleCloudApigeeV1Environment) *OrganizationsEnvironmentsModifyEnvironmentCall { + c := &OrganizationsEnvironmentsModifyEnvironmentCall{s: r.s, urlParams_: make(gensupport.URLParams)} + c.name = name + c.googlecloudapigeev1environment = googlecloudapigeev1environment + return c +} + +// UpdateMask sets the optional parameter "updateMask": List of fields +// to be updated. Fields that can be updated: node_config. +func (c *OrganizationsEnvironmentsModifyEnvironmentCall) UpdateMask(updateMask string) *OrganizationsEnvironmentsModifyEnvironmentCall { + c.urlParams_.Set("updateMask", updateMask) + return c +} + +// Fields allows partial responses to be retrieved. See +// https://developers.google.com/gdata/docs/2.0/basics#PartialResponse +// for more information. +func (c *OrganizationsEnvironmentsModifyEnvironmentCall) Fields(s ...googleapi.Field) *OrganizationsEnvironmentsModifyEnvironmentCall { + c.urlParams_.Set("fields", googleapi.CombineFields(s)) + return c +} + +// Context sets the context to be used in this call's Do method. Any +// pending HTTP request will be aborted if the provided context is +// canceled. +func (c *OrganizationsEnvironmentsModifyEnvironmentCall) Context(ctx context.Context) *OrganizationsEnvironmentsModifyEnvironmentCall { + c.ctx_ = ctx + return c +} + +// Header returns an http.Header that can be modified by the caller to +// add HTTP headers to the request. +func (c *OrganizationsEnvironmentsModifyEnvironmentCall) Header() http.Header { + if c.header_ == nil { + c.header_ = make(http.Header) + } + return c.header_ +} + +func (c *OrganizationsEnvironmentsModifyEnvironmentCall) doRequest(alt string) (*http.Response, error) { + reqHeaders := make(http.Header) + reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/"+internal.Version) + for k, v := range c.header_ { + reqHeaders[k] = v + } + reqHeaders.Set("User-Agent", c.s.userAgent()) + var body io.Reader = nil + body, err := googleapi.WithoutDataWrapper.JSONReader(c.googlecloudapigeev1environment) + if err != nil { + return nil, err + } + reqHeaders.Set("Content-Type", "application/json") + c.urlParams_.Set("alt", alt) + c.urlParams_.Set("prettyPrint", "false") + urls := googleapi.ResolveRelative(c.s.BasePath, "v1/{+name}") + urls += "?" + c.urlParams_.Encode() + req, err := http.NewRequest("PATCH", 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 "apigee.organizations.environments.modifyEnvironment" call. +// Exactly one of *GoogleLongrunningOperation or error will be non-nil. +// Any non-2xx status code is an error. Response headers are in either +// *GoogleLongrunningOperation.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 *OrganizationsEnvironmentsModifyEnvironmentCall) Do(opts ...googleapi.CallOption) (*GoogleLongrunningOperation, 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, &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, err + } + ret := &GoogleLongrunningOperation{ + 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 + // { + // "description": "Updates properties for an Apigee environment with patch semantics using a field mask. **Note:** Not supported for Apigee hybrid.", + // "flatPath": "v1/organizations/{organizationsId}/environments/{environmentsId}", + // "httpMethod": "PATCH", + // "id": "apigee.organizations.environments.modifyEnvironment", + // "parameterOrder": [ + // "name" + // ], + // "parameters": { + // "name": { + // "description": "Required. Name of the environment. Use the following structure in your request: `organizations/{org}/environments/{environment}`.", + // "location": "path", + // "pattern": "^organizations/[^/]+/environments/[^/]+$", + // "required": true, + // "type": "string" + // }, + // "updateMask": { + // "description": "List of fields to be updated. Fields that can be updated: node_config.", + // "format": "google-fieldmask", + // "location": "query", + // "type": "string" + // } + // }, + // "path": "v1/{+name}", + // "request": { + // "$ref": "GoogleCloudApigeeV1Environment" + // }, + // "response": { + // "$ref": "GoogleLongrunningOperation" + // }, + // "scopes": [ + // "https://www.googleapis.com/auth/cloud-platform" + // ] + // } + +} + // method id "apigee.organizations.environments.setIamPolicy": type OrganizationsEnvironmentsSetIamPolicyCall struct { @@ -40968,6 +41480,339 @@ func (c *OrganizationsEnvironmentsSecurityReportsListCall) Pages(ctx context.Con } } +// method id "apigee.organizations.environments.securityStats.queryTabularStats": + +type OrganizationsEnvironmentsSecurityStatsQueryTabularStatsCall struct { + s *Service + orgenv string + googlecloudapigeev1querytabularstatsrequest *GoogleCloudApigeeV1QueryTabularStatsRequest + urlParams_ gensupport.URLParams + ctx_ context.Context + header_ http.Header +} + +// QueryTabularStats: Retrieve security statistics as tabular rows. +// +// - orgenv: Should be of the form organizations//environments/. +func (r *OrganizationsEnvironmentsSecurityStatsService) QueryTabularStats(orgenv string, googlecloudapigeev1querytabularstatsrequest *GoogleCloudApigeeV1QueryTabularStatsRequest) *OrganizationsEnvironmentsSecurityStatsQueryTabularStatsCall { + c := &OrganizationsEnvironmentsSecurityStatsQueryTabularStatsCall{s: r.s, urlParams_: make(gensupport.URLParams)} + c.orgenv = orgenv + c.googlecloudapigeev1querytabularstatsrequest = googlecloudapigeev1querytabularstatsrequest + return c +} + +// Fields allows partial responses to be retrieved. See +// https://developers.google.com/gdata/docs/2.0/basics#PartialResponse +// for more information. +func (c *OrganizationsEnvironmentsSecurityStatsQueryTabularStatsCall) Fields(s ...googleapi.Field) *OrganizationsEnvironmentsSecurityStatsQueryTabularStatsCall { + c.urlParams_.Set("fields", googleapi.CombineFields(s)) + return c +} + +// Context sets the context to be used in this call's Do method. Any +// pending HTTP request will be aborted if the provided context is +// canceled. +func (c *OrganizationsEnvironmentsSecurityStatsQueryTabularStatsCall) Context(ctx context.Context) *OrganizationsEnvironmentsSecurityStatsQueryTabularStatsCall { + c.ctx_ = ctx + return c +} + +// Header returns an http.Header that can be modified by the caller to +// add HTTP headers to the request. +func (c *OrganizationsEnvironmentsSecurityStatsQueryTabularStatsCall) Header() http.Header { + if c.header_ == nil { + c.header_ = make(http.Header) + } + return c.header_ +} + +func (c *OrganizationsEnvironmentsSecurityStatsQueryTabularStatsCall) doRequest(alt string) (*http.Response, error) { + reqHeaders := make(http.Header) + reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/"+internal.Version) + for k, v := range c.header_ { + reqHeaders[k] = v + } + reqHeaders.Set("User-Agent", c.s.userAgent()) + var body io.Reader = nil + body, err := googleapi.WithoutDataWrapper.JSONReader(c.googlecloudapigeev1querytabularstatsrequest) + if err != nil { + return nil, err + } + reqHeaders.Set("Content-Type", "application/json") + c.urlParams_.Set("alt", alt) + c.urlParams_.Set("prettyPrint", "false") + urls := googleapi.ResolveRelative(c.s.BasePath, "v1/{+orgenv}/securityStats:queryTabularStats") + urls += "?" + c.urlParams_.Encode() + req, err := http.NewRequest("POST", urls, body) + if err != nil { + return nil, err + } + req.Header = reqHeaders + googleapi.Expand(req.URL, map[string]string{ + "orgenv": c.orgenv, + }) + return gensupport.SendRequest(c.ctx_, c.s.client, req) +} + +// Do executes the "apigee.organizations.environments.securityStats.queryTabularStats" call. +// Exactly one of *GoogleCloudApigeeV1QueryTabularStatsResponse or error +// will be non-nil. Any non-2xx status code is an error. Response +// headers are in either +// *GoogleCloudApigeeV1QueryTabularStatsResponse.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 *OrganizationsEnvironmentsSecurityStatsQueryTabularStatsCall) Do(opts ...googleapi.CallOption) (*GoogleCloudApigeeV1QueryTabularStatsResponse, 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, &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, err + } + ret := &GoogleCloudApigeeV1QueryTabularStatsResponse{ + 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 + // { + // "description": "Retrieve security statistics as tabular rows.", + // "flatPath": "v1/organizations/{organizationsId}/environments/{environmentsId}/securityStats:queryTabularStats", + // "httpMethod": "POST", + // "id": "apigee.organizations.environments.securityStats.queryTabularStats", + // "parameterOrder": [ + // "orgenv" + // ], + // "parameters": { + // "orgenv": { + // "description": "Required. Should be of the form organizations//environments/.", + // "location": "path", + // "pattern": "^organizations/[^/]+/environments/[^/]+$", + // "required": true, + // "type": "string" + // } + // }, + // "path": "v1/{+orgenv}/securityStats:queryTabularStats", + // "request": { + // "$ref": "GoogleCloudApigeeV1QueryTabularStatsRequest" + // }, + // "response": { + // "$ref": "GoogleCloudApigeeV1QueryTabularStatsResponse" + // }, + // "scopes": [ + // "https://www.googleapis.com/auth/cloud-platform" + // ] + // } + +} + +// 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 *OrganizationsEnvironmentsSecurityStatsQueryTabularStatsCall) Pages(ctx context.Context, f func(*GoogleCloudApigeeV1QueryTabularStatsResponse) error) error { + c.ctx_ = ctx + defer func(pt string) { c.googlecloudapigeev1querytabularstatsrequest.PageToken = pt }(c.googlecloudapigeev1querytabularstatsrequest.PageToken) // reset paging to original point + for { + x, err := c.Do() + if err != nil { + return err + } + if err := f(x); err != nil { + return err + } + if x.NextPageToken == "" { + return nil + } + c.googlecloudapigeev1querytabularstatsrequest.PageToken = x.NextPageToken + } +} + +// method id "apigee.organizations.environments.securityStats.queryTimeSeriesStats": + +type OrganizationsEnvironmentsSecurityStatsQueryTimeSeriesStatsCall struct { + s *Service + orgenv string + googlecloudapigeev1querytimeseriesstatsrequest *GoogleCloudApigeeV1QueryTimeSeriesStatsRequest + urlParams_ gensupport.URLParams + ctx_ context.Context + header_ http.Header +} + +// QueryTimeSeriesStats: Retrieve security statistics as a collection of +// time series. +// +// - orgenv: Should be of the form organizations//environments/. +func (r *OrganizationsEnvironmentsSecurityStatsService) QueryTimeSeriesStats(orgenv string, googlecloudapigeev1querytimeseriesstatsrequest *GoogleCloudApigeeV1QueryTimeSeriesStatsRequest) *OrganizationsEnvironmentsSecurityStatsQueryTimeSeriesStatsCall { + c := &OrganizationsEnvironmentsSecurityStatsQueryTimeSeriesStatsCall{s: r.s, urlParams_: make(gensupport.URLParams)} + c.orgenv = orgenv + c.googlecloudapigeev1querytimeseriesstatsrequest = googlecloudapigeev1querytimeseriesstatsrequest + return c +} + +// Fields allows partial responses to be retrieved. See +// https://developers.google.com/gdata/docs/2.0/basics#PartialResponse +// for more information. +func (c *OrganizationsEnvironmentsSecurityStatsQueryTimeSeriesStatsCall) Fields(s ...googleapi.Field) *OrganizationsEnvironmentsSecurityStatsQueryTimeSeriesStatsCall { + c.urlParams_.Set("fields", googleapi.CombineFields(s)) + return c +} + +// Context sets the context to be used in this call's Do method. Any +// pending HTTP request will be aborted if the provided context is +// canceled. +func (c *OrganizationsEnvironmentsSecurityStatsQueryTimeSeriesStatsCall) Context(ctx context.Context) *OrganizationsEnvironmentsSecurityStatsQueryTimeSeriesStatsCall { + c.ctx_ = ctx + return c +} + +// Header returns an http.Header that can be modified by the caller to +// add HTTP headers to the request. +func (c *OrganizationsEnvironmentsSecurityStatsQueryTimeSeriesStatsCall) Header() http.Header { + if c.header_ == nil { + c.header_ = make(http.Header) + } + return c.header_ +} + +func (c *OrganizationsEnvironmentsSecurityStatsQueryTimeSeriesStatsCall) doRequest(alt string) (*http.Response, error) { + reqHeaders := make(http.Header) + reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/"+internal.Version) + for k, v := range c.header_ { + reqHeaders[k] = v + } + reqHeaders.Set("User-Agent", c.s.userAgent()) + var body io.Reader = nil + body, err := googleapi.WithoutDataWrapper.JSONReader(c.googlecloudapigeev1querytimeseriesstatsrequest) + if err != nil { + return nil, err + } + reqHeaders.Set("Content-Type", "application/json") + c.urlParams_.Set("alt", alt) + c.urlParams_.Set("prettyPrint", "false") + urls := googleapi.ResolveRelative(c.s.BasePath, "v1/{+orgenv}/securityStats:queryTimeSeriesStats") + urls += "?" + c.urlParams_.Encode() + req, err := http.NewRequest("POST", urls, body) + if err != nil { + return nil, err + } + req.Header = reqHeaders + googleapi.Expand(req.URL, map[string]string{ + "orgenv": c.orgenv, + }) + return gensupport.SendRequest(c.ctx_, c.s.client, req) +} + +// Do executes the "apigee.organizations.environments.securityStats.queryTimeSeriesStats" call. +// Exactly one of *GoogleCloudApigeeV1QueryTimeSeriesStatsResponse or +// error will be non-nil. Any non-2xx status code is an error. Response +// headers are in either +// *GoogleCloudApigeeV1QueryTimeSeriesStatsResponse.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 *OrganizationsEnvironmentsSecurityStatsQueryTimeSeriesStatsCall) Do(opts ...googleapi.CallOption) (*GoogleCloudApigeeV1QueryTimeSeriesStatsResponse, 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, &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, err + } + ret := &GoogleCloudApigeeV1QueryTimeSeriesStatsResponse{ + 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 + // { + // "description": "Retrieve security statistics as a collection of time series.", + // "flatPath": "v1/organizations/{organizationsId}/environments/{environmentsId}/securityStats:queryTimeSeriesStats", + // "httpMethod": "POST", + // "id": "apigee.organizations.environments.securityStats.queryTimeSeriesStats", + // "parameterOrder": [ + // "orgenv" + // ], + // "parameters": { + // "orgenv": { + // "description": "Required. Should be of the form organizations//environments/.", + // "location": "path", + // "pattern": "^organizations/[^/]+/environments/[^/]+$", + // "required": true, + // "type": "string" + // } + // }, + // "path": "v1/{+orgenv}/securityStats:queryTimeSeriesStats", + // "request": { + // "$ref": "GoogleCloudApigeeV1QueryTimeSeriesStatsRequest" + // }, + // "response": { + // "$ref": "GoogleCloudApigeeV1QueryTimeSeriesStatsResponse" + // }, + // "scopes": [ + // "https://www.googleapis.com/auth/cloud-platform" + // ] + // } + +} + +// 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 *OrganizationsEnvironmentsSecurityStatsQueryTimeSeriesStatsCall) Pages(ctx context.Context, f func(*GoogleCloudApigeeV1QueryTimeSeriesStatsResponse) error) error { + c.ctx_ = ctx + defer func(pt string) { c.googlecloudapigeev1querytimeseriesstatsrequest.PageToken = pt }(c.googlecloudapigeev1querytimeseriesstatsrequest.PageToken) // reset paging to original point + for { + x, err := c.Do() + if err != nil { + return err + } + if err := f(x); err != nil { + return err + } + if x.NextPageToken == "" { + return nil + } + c.googlecloudapigeev1querytimeseriesstatsrequest.PageToken = x.NextPageToken + } +} + // method id "apigee.organizations.environments.sharedflows.deployments.list": type OrganizationsEnvironmentsSharedflowsDeploymentsListCall struct { diff --git a/chat/v1/chat-api.json b/chat/v1/chat-api.json index 1e30a69fd05..1ccb1f8b468 100644 --- a/chat/v1/chat-api.json +++ b/chat/v1/chat-api.json @@ -642,7 +642,7 @@ } } }, - "revision": "20220722", + "revision": "20220805", "rootUrl": "https://chat.googleapis.com/", "schemas": { "ActionParameter": { @@ -1809,8 +1809,8 @@ "RELOAD" ], "enumDescriptions": [ - "Doesn’t reload the card after the child window closes.", - "Reloads the card after the child window closes. If used in conjunction with [OpenAs.OVERLAY](/workspace/add-ons/reference/rpc/google.apps.card.v1#openas), the child window acts as a modal dialog and the main card is blocked until the child window closes." + "Default value. The card does not reload; nothing happens.", + "Reloads the card after the child window closes. If used in conjunction with [OpenAs.OVERLAY](https://developers.google.com/workspace/add-ons/reference/rpc/google.apps.card.v1#openas), the child window acts as a modal dialog and the parent card is blocked until the child window closes." ], "type": "string" }, diff --git a/chat/v1/chat-gen.go b/chat/v1/chat-gen.go index 9863f7af9d4..d0b59aa4dd0 100644 --- a/chat/v1/chat-gen.go +++ b/chat/v1/chat-gen.go @@ -2183,13 +2183,14 @@ type GoogleAppsCardV1OpenLink struct { // observes it until the window closes. Not supported by Chat apps. // // Possible values: - // "NOTHING" - Doesn’t reload the card after the child window - // closes. + // "NOTHING" - Default value. The card does not reload; nothing + // happens. // "RELOAD" - Reloads the card after the child window closes. If used // in conjunction with - // [OpenAs.OVERLAY](/workspace/add-ons/reference/rpc/google.apps.card.v1# - // openas), the child window acts as a modal dialog and the main card is - // blocked until the child window closes. + // [OpenAs.OVERLAY](https://developers.google.com/workspace/add-ons/refer + // ence/rpc/google.apps.card.v1#openas), the child window acts as a + // modal dialog and the parent card is blocked until the child window + // closes. OnClose string `json:"onClose,omitempty"` // OpenAs: How to open a link. Not supported by Chat apps. diff --git a/chromepolicy/v1/chromepolicy-api.json b/chromepolicy/v1/chromepolicy-api.json index 636e7bc76ae..5e8bdd6ae22 100644 --- a/chromepolicy/v1/chromepolicy-api.json +++ b/chromepolicy/v1/chromepolicy-api.json @@ -441,7 +441,7 @@ } } }, - "revision": "20220806", + "revision": "20220809", "rootUrl": "https://chromepolicy.googleapis.com/", "schemas": { "ChromeCrosDpanelAutosettingsProtoPolicyApiLifecycle": { @@ -730,7 +730,7 @@ "type": "string" }, "schemaName": { - "description": "Output only. The fully qualified name of the policy schema. This value is used to fill the field `policy_schema` in PolicyValue when calling BatchInheritOrgUnitPolicies or BatchModifyOrgUnitPolicies", + "description": "Output only. The fully qualified name of the policy schema. This value is used to fill the field `policy_schema` in PolicyValue when calling BatchInheritOrgUnitPolicies BatchModifyOrgUnitPolicies BatchModifyGroupPolicies or BatchDeleteGroupPolicies.", "readOnly": true, "type": "string" }, @@ -906,7 +906,7 @@ "type": "object" }, "targetResource": { - "description": "The target resource on which this policy is applied. The following resources are supported: * Organizational Unit (\"orgunits/{orgunit_id}\")", + "description": "The target resource on which this policy is applied. The following resources are supported: * Organizational Unit (\"orgunits/{orgunit_id}\") * Group (\"groups/{group_id}\")", "type": "string" } }, diff --git a/chromepolicy/v1/chromepolicy-gen.go b/chromepolicy/v1/chromepolicy-gen.go index 4c189f3aaac..8198ddb4f47 100644 --- a/chromepolicy/v1/chromepolicy-gen.go +++ b/chromepolicy/v1/chromepolicy-gen.go @@ -750,8 +750,9 @@ type GoogleChromePolicyV1PolicySchema struct { // SchemaName: Output only. The fully qualified name of the policy // schema. This value is used to fill the field `policy_schema` in - // PolicyValue when calling BatchInheritOrgUnitPolicies or - // BatchModifyOrgUnitPolicies + // PolicyValue when calling BatchInheritOrgUnitPolicies + // BatchModifyOrgUnitPolicies BatchModifyGroupPolicies or + // BatchDeleteGroupPolicies. SchemaName string `json:"schemaName,omitempty"` // SupportUri: Output only. URI to related support article for this @@ -1007,7 +1008,7 @@ type GoogleChromePolicyV1PolicyTargetKey struct { // TargetResource: The target resource on which this policy is applied. // The following resources are supported: * Organizational Unit - // ("orgunits/{orgunit_id}") + // ("orgunits/{orgunit_id}") * Group ("groups/{group_id}") TargetResource string `json:"targetResource,omitempty"` // ForceSendFields is a list of field names (e.g. diff --git a/cloudidentity/v1beta1/cloudidentity-api.json b/cloudidentity/v1beta1/cloudidentity-api.json index 934feaced8b..b77db2998c9 100644 --- a/cloudidentity/v1beta1/cloudidentity-api.json +++ b/cloudidentity/v1beta1/cloudidentity-api.json @@ -1597,7 +1597,7 @@ } } }, - "revision": "20220729", + "revision": "20220808", "rootUrl": "https://cloudidentity.googleapis.com/", "schemas": { "AndroidAttributes": { @@ -3032,13 +3032,6 @@ "description": "A group within the Cloud Identity Groups API. A `Group` is a collection of entities, where each entity is either a user, another group, or a service account.", "id": "Group", "properties": { - "additionalGroupKeys": { - "description": "Additional entity key aliases for a Group.", - "items": { - "$ref": "EntityKey" - }, - "type": "array" - }, "createTime": { "description": "Output only. The time when the `Group` was created.", "format": "google-datetime", diff --git a/cloudidentity/v1beta1/cloudidentity-gen.go b/cloudidentity/v1beta1/cloudidentity-gen.go index 06702e68ae2..4ec53c4c1f0 100644 --- a/cloudidentity/v1beta1/cloudidentity-gen.go +++ b/cloudidentity/v1beta1/cloudidentity-gen.go @@ -2066,9 +2066,6 @@ func (s *GoogleAppsCloudidentityDevicesV1WipeDeviceUserResponse) MarshalJSON() ( // collection of entities, where each entity is either a user, another // group, or a service account. type Group struct { - // AdditionalGroupKeys: Additional entity key aliases for a Group. - AdditionalGroupKeys []*EntityKey `json:"additionalGroupKeys,omitempty"` - // CreateTime: Output only. The time when the `Group` was created. CreateTime string `json:"createTime,omitempty"` @@ -2122,21 +2119,20 @@ type Group struct { // server. googleapi.ServerResponse `json:"-"` - // ForceSendFields is a list of field names (e.g. "AdditionalGroupKeys") - // to unconditionally include in API requests. By default, fields with + // ForceSendFields is a list of field names (e.g. "CreateTime") to + // unconditionally include in API requests. By default, fields with // empty or default values are omitted from API requests. However, any // non-pointer, non-interface field appearing in ForceSendFields will be // sent to the server regardless of whether the field is empty or not. // This may be used to include empty fields in Patch requests. ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "AdditionalGroupKeys") to - // include in API requests with the JSON null value. By default, fields - // with empty values are omitted from API requests. However, any field - // with an empty value appearing in NullFields will be sent to the - // server as null. It is an error if a field in this list has a - // non-empty value. This may be used to include null fields in Patch - // requests. + // NullFields is a list of field names (e.g. "CreateTime") to include in + // API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. However, any field with an + // empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. NullFields []string `json:"-"` } diff --git a/container/v1/container-api.json b/container/v1/container-api.json index 0e007a69e27..0697a1a8089 100644 --- a/container/v1/container-api.json +++ b/container/v1/container-api.json @@ -740,7 +740,7 @@ ], "parameters": { "name": { - "description": "The name (project, location, cluster, node pool id) of the node pool to complete upgrade. Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.", + "description": "The name (project, location, cluster, node pool id) of the node pool to complete upgrade. Specified in the format `projects/*/locations/*/clusters/*/nodePools/*`.", "location": "path", "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+/nodePools/[^/]+$", "required": true, @@ -2487,7 +2487,7 @@ } } }, - "revision": "20220615", + "revision": "20220727", "rootUrl": "https://container.googleapis.com/", "schemas": { "AcceleratorConfig": { @@ -2636,7 +2636,7 @@ "description": "Specifies the node management options for NAP created node-pools." }, "minCpuPlatform": { - "description": "Deprecated. Minimum CPU platform to be used for NAP created node pools. The instance may be scheduled on the specified or newer CPU platform. Applicable values are the friendly names of CPU platforms, such as minCpuPlatform: Intel Haswell or minCpuPlatform: Intel Sandy Bridge. For more information, read [how to specify min CPU platform](https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform) This field is deprecated, min_cpu_platform should be specified using cloud.google.com/requested-min-cpu-platform label selector on the pod. To unset the min cpu platform field pass \"automatic\" as field value.", + "description": "Deprecated. Minimum CPU platform to be used for NAP created node pools. The instance may be scheduled on the specified or newer CPU platform. Applicable values are the friendly names of CPU platforms, such as minCpuPlatform: Intel Haswell or minCpuPlatform: Intel Sandy Bridge. For more information, read [how to specify min CPU platform](https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform) This field is deprecated, min_cpu_platform should be specified using https://cloud.google.com/requested-min-cpu-platform label selector on the pod. To unset the min cpu platform field pass \"automatic\" as field value.", "type": "string" }, "oauthScopes": { @@ -2677,7 +2677,7 @@ "id": "BinaryAuthorization", "properties": { "enabled": { - "description": "Enable Binary Authorization for this cluster. If enabled, all container images will be validated by Binary Authorization.", + "description": "This field is deprecated. Leave this unset and instead configure BinaryAuthorization using evaluation_mode. If evaluation_mode is set to anything other than EVALUATION_MODE_UNSPECIFIED, this field is ignored.", "type": "boolean" }, "evaluationMode": { @@ -4515,7 +4515,7 @@ "properties": { "gcfsConfig": { "$ref": "GcfsConfig", - "description": "GCFS (Google Container File System, a.k.a. Riptide) options." + "description": "GCFS (Google Container File System, also known as Riptide) options." } }, "type": "object" diff --git a/container/v1/container-gen.go b/container/v1/container-gen.go index 4d3d8947d56..93d89e1362b 100644 --- a/container/v1/container-gen.go +++ b/container/v1/container-gen.go @@ -564,9 +564,9 @@ type AutoprovisioningNodePoolDefaults struct { // platform // (https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform) // This field is deprecated, min_cpu_platform should be specified using - // cloud.google.com/requested-min-cpu-platform label selector on the - // pod. To unset the min cpu platform field pass "automatic" as field - // value. + // https://cloud.google.com/requested-min-cpu-platform label selector on + // the pod. To unset the min cpu platform field pass "automatic" as + // field value. MinCpuPlatform string `json:"minCpuPlatform,omitempty"` // OauthScopes: Scopes that are used by NAP when creating node pools. @@ -638,8 +638,10 @@ func (s *BigQueryDestination) MarshalJSON() ([]byte, error) { // BinaryAuthorization: Configuration for Binary Authorization. type BinaryAuthorization struct { - // Enabled: Enable Binary Authorization for this cluster. If enabled, - // all container images will be validated by Binary Authorization. + // Enabled: This field is deprecated. Leave this unset and instead + // configure BinaryAuthorization using evaluation_mode. If + // evaluation_mode is set to anything other than + // EVALUATION_MODE_UNSPECIFIED, this field is ignored. Enabled bool `json:"enabled,omitempty"` // EvaluationMode: Mode of operation for binauthz policy evaluation. @@ -3748,8 +3750,8 @@ func (s *NodeConfig) MarshalJSON() ([]byte, error) { // NodeConfigDefaults: Subset of NodeConfig message that has defaults. type NodeConfigDefaults struct { - // GcfsConfig: GCFS (Google Container File System, a.k.a. Riptide) - // options. + // GcfsConfig: GCFS (Google Container File System, also known as + // Riptide) options. GcfsConfig *GcfsConfig `json:"gcfsConfig,omitempty"` // ForceSendFields is a list of field names (e.g. "GcfsConfig") to @@ -9946,7 +9948,7 @@ type ProjectsLocationsClustersNodePoolsCompleteUpgradeCall struct { // // - name: The name (project, location, cluster, node pool id) of the // node pool to complete upgrade. Specified in the format -// 'projects/*/locations/*/clusters/*/nodePools/*'. +// `projects/*/locations/*/clusters/*/nodePools/*`. func (r *ProjectsLocationsClustersNodePoolsService) CompleteUpgrade(name string, completenodepoolupgraderequest *CompleteNodePoolUpgradeRequest) *ProjectsLocationsClustersNodePoolsCompleteUpgradeCall { c := &ProjectsLocationsClustersNodePoolsCompleteUpgradeCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.name = name @@ -10054,7 +10056,7 @@ func (c *ProjectsLocationsClustersNodePoolsCompleteUpgradeCall) Do(opts ...googl // ], // "parameters": { // "name": { - // "description": "The name (project, location, cluster, node pool id) of the node pool to complete upgrade. Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.", + // "description": "The name (project, location, cluster, node pool id) of the node pool to complete upgrade. Specified in the format `projects/*/locations/*/clusters/*/nodePools/*`.", // "location": "path", // "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+/nodePools/[^/]+$", // "required": true, diff --git a/container/v1beta1/container-api.json b/container/v1beta1/container-api.json index 9d425f9ec31..c1c8f2e0180 100644 --- a/container/v1beta1/container-api.json +++ b/container/v1beta1/container-api.json @@ -765,7 +765,7 @@ ], "parameters": { "name": { - "description": "The name (project, location, cluster, node pool id) of the node pool to complete upgrade. Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.", + "description": "The name (project, location, cluster, node pool id) of the node pool to complete upgrade. Specified in the format `projects/*/locations/*/clusters/*/nodePools/*`.", "location": "path", "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+/nodePools/[^/]+$", "required": true, @@ -2512,7 +2512,7 @@ } } }, - "revision": "20220615", + "revision": "20220727", "rootUrl": "https://container.googleapis.com/", "schemas": { "AcceleratorConfig": { @@ -2678,7 +2678,7 @@ "description": "NodeManagement configuration for this NodePool." }, "minCpuPlatform": { - "description": "Deprecated. Minimum CPU platform to be used for NAP created node pools. The instance may be scheduled on the specified or newer CPU platform. Applicable values are the friendly names of CPU platforms, such as minCpuPlatform: Intel Haswell or minCpuPlatform: Intel Sandy Bridge. For more information, read [how to specify min CPU platform](https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform) This field is deprecated, min_cpu_platform should be specified using cloud.google.com/requested-min-cpu-platform label selector on the pod. To unset the min cpu platform field pass \"automatic\" as field value.", + "description": "Deprecated. Minimum CPU platform to be used for NAP created node pools. The instance may be scheduled on the specified or newer CPU platform. Applicable values are the friendly names of CPU platforms, such as minCpuPlatform: Intel Haswell or minCpuPlatform: Intel Sandy Bridge. For more information, read [how to specify min CPU platform](https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform) This field is deprecated, min_cpu_platform should be specified using https://cloud.google.com/requested-min-cpu-platform label selector on the pod. To unset the min cpu platform field pass \"automatic\" as field value.", "type": "string" }, "oauthScopes": { @@ -2734,7 +2734,7 @@ "id": "BinaryAuthorization", "properties": { "enabled": { - "description": "Enable Binary Authorization for this cluster. If enabled, all container images will be validated by Binary Authorization.", + "description": "This field is deprecated. Leave this unset and instead configure BinaryAuthorization using evaluation_mode. If evaluation_mode is set to anything other than EVALUATION_MODE_UNSPECIFIED, this field is ignored.", "type": "boolean" }, "evaluationMode": { @@ -4325,7 +4325,7 @@ "type": "string" }, "recommended": { - "description": "Whether the location is recomended for GKE cluster scheduling.", + "description": "Whether the location is recommended for GKE cluster scheduling.", "type": "boolean" }, "type": { @@ -4885,7 +4885,7 @@ "properties": { "gcfsConfig": { "$ref": "GcfsConfig", - "description": "GCFS (Google Container File System, a.k.a. Riptide) options." + "description": "GCFS (Google Container File System, also known as Riptide) options." } }, "type": "object" diff --git a/container/v1beta1/container-gen.go b/container/v1beta1/container-gen.go index f6c86c05bf4..164d90f62cf 100644 --- a/container/v1beta1/container-gen.go +++ b/container/v1beta1/container-gen.go @@ -580,9 +580,9 @@ type AutoprovisioningNodePoolDefaults struct { // platform // (https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform) // This field is deprecated, min_cpu_platform should be specified using - // cloud.google.com/requested-min-cpu-platform label selector on the - // pod. To unset the min cpu platform field pass "automatic" as field - // value. + // https://cloud.google.com/requested-min-cpu-platform label selector on + // the pod. To unset the min cpu platform field pass "automatic" as + // field value. MinCpuPlatform string `json:"minCpuPlatform,omitempty"` // OauthScopes: The set of Google API scopes to be made available on all @@ -696,8 +696,10 @@ func (s *BigQueryDestination) MarshalJSON() ([]byte, error) { // BinaryAuthorization: Configuration for Binary Authorization. type BinaryAuthorization struct { - // Enabled: Enable Binary Authorization for this cluster. If enabled, - // all container images will be validated by Binary Authorization. + // Enabled: This field is deprecated. Leave this unset and instead + // configure BinaryAuthorization using evaluation_mode. If + // evaluation_mode is set to anything other than + // EVALUATION_MODE_UNSPECIFIED, this field is ignored. Enabled bool `json:"enabled,omitempty"` // EvaluationMode: Mode of operation for binauthz policy evaluation. @@ -3309,7 +3311,7 @@ type Location struct { // format `projects/*/locations/*`. Name string `json:"name,omitempty"` - // Recommended: Whether the location is recomended for GKE cluster + // Recommended: Whether the location is recommended for GKE cluster // scheduling. Recommended bool `json:"recommended,omitempty"` @@ -4273,8 +4275,8 @@ func (s *NodeConfig) MarshalJSON() ([]byte, error) { // NodeConfigDefaults: Subset of NodeConfig message that has defaults. type NodeConfigDefaults struct { - // GcfsConfig: GCFS (Google Container File System, a.k.a. Riptide) - // options. + // GcfsConfig: GCFS (Google Container File System, also known as + // Riptide) options. GcfsConfig *GcfsConfig `json:"gcfsConfig,omitempty"` // ForceSendFields is a list of field names (e.g. "GcfsConfig") to @@ -10970,7 +10972,7 @@ type ProjectsLocationsClustersNodePoolsCompleteUpgradeCall struct { // // - name: The name (project, location, cluster, node pool id) of the // node pool to complete upgrade. Specified in the format -// 'projects/*/locations/*/clusters/*/nodePools/*'. +// `projects/*/locations/*/clusters/*/nodePools/*`. func (r *ProjectsLocationsClustersNodePoolsService) CompleteUpgrade(name string, completenodepoolupgraderequest *CompleteNodePoolUpgradeRequest) *ProjectsLocationsClustersNodePoolsCompleteUpgradeCall { c := &ProjectsLocationsClustersNodePoolsCompleteUpgradeCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.name = name @@ -11078,7 +11080,7 @@ func (c *ProjectsLocationsClustersNodePoolsCompleteUpgradeCall) Do(opts ...googl // ], // "parameters": { // "name": { - // "description": "The name (project, location, cluster, node pool id) of the node pool to complete upgrade. Specified in the format 'projects/*/locations/*/clusters/*/nodePools/*'.", + // "description": "The name (project, location, cluster, node pool id) of the node pool to complete upgrade. Specified in the format `projects/*/locations/*/clusters/*/nodePools/*`.", // "location": "path", // "pattern": "^projects/[^/]+/locations/[^/]+/clusters/[^/]+/nodePools/[^/]+$", // "required": true, diff --git a/containeranalysis/v1/containeranalysis-api.json b/containeranalysis/v1/containeranalysis-api.json index 3609a6ed5b3..a6762abf91c 100644 --- a/containeranalysis/v1/containeranalysis-api.json +++ b/containeranalysis/v1/containeranalysis-api.json @@ -755,7 +755,7 @@ } } }, - "revision": "20220727", + "revision": "20220805", "rootUrl": "https://containeranalysis.googleapis.com/", "schemas": { "AliasContext": { @@ -922,7 +922,7 @@ "description": "The condition that is associated with this binding. If the condition evaluates to `true`, then this binding applies to the current request. If the condition evaluates to `false`, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. To learn which resources support conditions in their IAM policies, see the [IAM documentation](https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", + "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a Google service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: An identifier for a [Kubernetes service account](https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", "items": { "type": "string" }, @@ -2739,8 +2739,8 @@ "ANALYSIS_STATUS_UNSPECIFIED", "PENDING", "SCANNING", - "COMPLETE", "FINISHED_SUCCESS", + "COMPLETE", "FINISHED_FAILED", "FINISHED_UNSUPPORTED" ], @@ -2748,8 +2748,8 @@ "Unknown.", "Resource is known but no action has been taken yet.", "Resource is being analyzed.", - "Analysis has completed", "Analysis has finished successfully.", + "Analysis has completed", "Analysis has finished unsuccessfully, the analysis itself is in a bad state.", "The resource is known not to be supported." ], diff --git a/containeranalysis/v1/containeranalysis-gen.go b/containeranalysis/v1/containeranalysis-gen.go index 66914977cb1..5dc9da2ec57 100644 --- a/containeranalysis/v1/containeranalysis-gen.go +++ b/containeranalysis/v1/containeranalysis-gen.go @@ -521,16 +521,20 @@ type Binding struct { // who is authenticated with a Google account or a service account. * // `user:{emailid}`: An email address that represents a specific Google // account. For example, `alice@example.com` . * - // `serviceAccount:{emailid}`: An email address that represents a + // `serviceAccount:{emailid}`: An email address that represents a Google // service account. For example, - // `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An - // email address that represents a Google group. For example, - // `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An - // email address (plus unique identifier) representing a user that has - // been recently deleted. For example, - // `alice@example.com?uid=123456789012345678901`. If the user is - // recovered, this value reverts to `user:{emailid}` and the recovered - // user retains the role in the binding. * + // `my-other-app@appspot.gserviceaccount.com`. * + // `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. * + // `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus + // unique identifier) representing a user that has been recently + // deleted. For example, `alice@example.com?uid=123456789012345678901`. + // If the user is recovered, this value reverts to `user:{emailid}` and + // the recovered user retains the role in the binding. * // `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address // (plus unique identifier) representing a service account that has been // recently deleted. For example, @@ -3038,8 +3042,8 @@ type DiscoveryOccurrence struct { // "ANALYSIS_STATUS_UNSPECIFIED" - Unknown. // "PENDING" - Resource is known but no action has been taken yet. // "SCANNING" - Resource is being analyzed. - // "COMPLETE" - Analysis has completed // "FINISHED_SUCCESS" - Analysis has finished successfully. + // "COMPLETE" - Analysis has completed // "FINISHED_FAILED" - Analysis has finished unsuccessfully, the // analysis itself is in a bad state. // "FINISHED_UNSUPPORTED" - The resource is known not to be supported. diff --git a/containeranalysis/v1alpha1/containeranalysis-api.json b/containeranalysis/v1alpha1/containeranalysis-api.json index bda2e4733d8..08ff435f27f 100644 --- a/containeranalysis/v1alpha1/containeranalysis-api.json +++ b/containeranalysis/v1alpha1/containeranalysis-api.json @@ -1229,7 +1229,7 @@ } } }, - "revision": "20220727", + "revision": "20220805", "rootUrl": "https://containeranalysis.googleapis.com/", "schemas": { "AnalysisCompleted": { @@ -1327,7 +1327,7 @@ "description": "The condition that is associated with this binding. If the condition evaluates to `true`, then this binding applies to the current request. If the condition evaluates to `false`, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. To learn which resources support conditions in their IAM policies, see the [IAM documentation](https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", + "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a Google service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: An identifier for a [Kubernetes service account](https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", "items": { "type": "string" }, diff --git a/containeranalysis/v1alpha1/containeranalysis-gen.go b/containeranalysis/v1alpha1/containeranalysis-gen.go index e4fe09c2adf..d2b7a3cb820 100644 --- a/containeranalysis/v1alpha1/containeranalysis-gen.go +++ b/containeranalysis/v1alpha1/containeranalysis-gen.go @@ -485,16 +485,20 @@ type Binding struct { // who is authenticated with a Google account or a service account. * // `user:{emailid}`: An email address that represents a specific Google // account. For example, `alice@example.com` . * - // `serviceAccount:{emailid}`: An email address that represents a + // `serviceAccount:{emailid}`: An email address that represents a Google // service account. For example, - // `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An - // email address that represents a Google group. For example, - // `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An - // email address (plus unique identifier) representing a user that has - // been recently deleted. For example, - // `alice@example.com?uid=123456789012345678901`. If the user is - // recovered, this value reverts to `user:{emailid}` and the recovered - // user retains the role in the binding. * + // `my-other-app@appspot.gserviceaccount.com`. * + // `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. * + // `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus + // unique identifier) representing a user that has been recently + // deleted. For example, `alice@example.com?uid=123456789012345678901`. + // If the user is recovered, this value reverts to `user:{emailid}` and + // the recovered user retains the role in the binding. * // `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address // (plus unique identifier) representing a service account that has been // recently deleted. For example, diff --git a/containeranalysis/v1beta1/containeranalysis-api.json b/containeranalysis/v1beta1/containeranalysis-api.json index c2e22358225..e265068fce1 100644 --- a/containeranalysis/v1beta1/containeranalysis-api.json +++ b/containeranalysis/v1beta1/containeranalysis-api.json @@ -853,7 +853,7 @@ } } }, - "revision": "20220727", + "revision": "20220805", "rootUrl": "https://containeranalysis.googleapis.com/", "schemas": { "AliasContext": { @@ -1046,7 +1046,7 @@ "description": "The condition that is associated with this binding. If the condition evaluates to `true`, then this binding applies to the current request. If the condition evaluates to `false`, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. To learn which resources support conditions in their IAM policies, see the [IAM documentation](https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", + "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a Google service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: An identifier for a [Kubernetes service account](https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", "items": { "type": "string" }, @@ -2726,8 +2726,8 @@ "ANALYSIS_STATUS_UNSPECIFIED", "PENDING", "SCANNING", - "COMPLETE", "FINISHED_SUCCESS", + "COMPLETE", "FINISHED_FAILED", "FINISHED_UNSUPPORTED" ], @@ -2735,8 +2735,8 @@ "Unknown.", "Resource is known but no action has been taken yet.", "Resource is being analyzed.", - "Analysis has completed.", "Analysis has finished successfully.", + "Analysis has completed.", "Analysis has finished unsuccessfully, the analysis itself is in a bad state.", "The resource is known not to be supported" ], diff --git a/containeranalysis/v1beta1/containeranalysis-gen.go b/containeranalysis/v1beta1/containeranalysis-gen.go index d61e9f485b8..c67131873bc 100644 --- a/containeranalysis/v1beta1/containeranalysis-gen.go +++ b/containeranalysis/v1beta1/containeranalysis-gen.go @@ -609,16 +609,20 @@ type Binding struct { // who is authenticated with a Google account or a service account. * // `user:{emailid}`: An email address that represents a specific Google // account. For example, `alice@example.com` . * - // `serviceAccount:{emailid}`: An email address that represents a + // `serviceAccount:{emailid}`: An email address that represents a Google // service account. For example, - // `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An - // email address that represents a Google group. For example, - // `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An - // email address (plus unique identifier) representing a user that has - // been recently deleted. For example, - // `alice@example.com?uid=123456789012345678901`. If the user is - // recovered, this value reverts to `user:{emailid}` and the recovered - // user retains the role in the binding. * + // `my-other-app@appspot.gserviceaccount.com`. * + // `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. * + // `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus + // unique identifier) representing a user that has been recently + // deleted. For example, `alice@example.com?uid=123456789012345678901`. + // If the user is recovered, this value reverts to `user:{emailid}` and + // the recovered user retains the role in the binding. * // `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address // (plus unique identifier) representing a service account that has been // recently deleted. For example, @@ -2848,8 +2852,8 @@ type Discovered struct { // "ANALYSIS_STATUS_UNSPECIFIED" - Unknown. // "PENDING" - Resource is known but no action has been taken yet. // "SCANNING" - Resource is being analyzed. - // "COMPLETE" - Analysis has completed. // "FINISHED_SUCCESS" - Analysis has finished successfully. + // "COMPLETE" - Analysis has completed. // "FINISHED_FAILED" - Analysis has finished unsuccessfully, the // analysis itself is in a bad state. // "FINISHED_UNSUPPORTED" - The resource is known not to be supported diff --git a/content/v2.1/content-api.json b/content/v2.1/content-api.json index b35ca16081a..5524412e361 100644 --- a/content/v2.1/content-api.json +++ b/content/v2.1/content-api.json @@ -5908,7 +5908,7 @@ } } }, - "revision": "20220728", + "revision": "20220805", "rootUrl": "https://shoppingcontent.googleapis.com/", "schemas": { "Account": { @@ -7414,7 +7414,7 @@ "type": "array" }, "creationDate": { - "description": "Date on which the collection has been created in [ISO 8601](http://en.wikipedia.org/wiki/ISO_8601) format: Date, time, and offset, e.g. \"2020-01-02T09:00:00+01:00\" or \"2020-01-02T09:00:00Z\"", + "description": "Date on which the collection has been created in [ISO 8601](http://en.wikipedia.org/wiki/ISO_8601) format: Date, time, and offset, for example \"2020-01-02T09:00:00+01:00\" or \"2020-01-02T09:00:00Z\"", "type": "string" }, "destinationStatuses": { @@ -7429,7 +7429,7 @@ "type": "string" }, "lastUpdateDate": { - "description": "Date on which the collection has been last updated in [ISO 8601](http://en.wikipedia.org/wiki/ISO_8601) format: Date, time, and offset, e.g. \"2020-01-02T09:00:00+01:00\" or \"2020-01-02T09:00:00Z\"", + "description": "Date on which the collection has been last updated in [ISO 8601](http://en.wikipedia.org/wiki/ISO_8601) format: Date, time, and offset, for example \"2020-01-02T09:00:00+01:00\" or \"2020-01-02T09:00:00Z\"", "type": "string" } }, @@ -7444,7 +7444,7 @@ "type": "string" }, "status": { - "description": "The status for the specified destination.", + "description": "The status for the specified destination in the collections target country.", "type": "string" } }, @@ -12571,6 +12571,10 @@ "description": "Required for multi-seller accounts. Use this attribute if you're a marketplace uploading products for various sellers to your multi-seller account.", "type": "string" }, + "feedLabel": { + "description": "Feed label for the item. Either `targetCountry` or `feedLabel` is required.", + "type": "string" + }, "gender": { "description": "Target gender of the item.", "type": "string" diff --git a/content/v2.1/content-gen.go b/content/v2.1/content-gen.go index d7a9d065d86..21927335cba 100644 --- a/content/v2.1/content-gen.go +++ b/content/v2.1/content-gen.go @@ -3164,7 +3164,8 @@ type CollectionStatus struct { // CreationDate: Date on which the collection has been created in ISO // 8601 (http://en.wikipedia.org/wiki/ISO_8601) format: Date, time, and - // offset, e.g. "2020-01-02T09:00:00+01:00" or "2020-01-02T09:00:00Z" + // offset, for example "2020-01-02T09:00:00+01:00" or + // "2020-01-02T09:00:00Z" CreationDate string `json:"creationDate,omitempty"` // DestinationStatuses: The intended destinations for the collection. @@ -3175,7 +3176,7 @@ type CollectionStatus struct { // LastUpdateDate: Date on which the collection has been last updated in // ISO 8601 (http://en.wikipedia.org/wiki/ISO_8601) format: Date, time, - // and offset, e.g. "2020-01-02T09:00:00+01:00" or + // and offset, for example "2020-01-02T09:00:00+01:00" or // "2020-01-02T09:00:00Z" LastUpdateDate string `json:"lastUpdateDate,omitempty"` @@ -3213,7 +3214,8 @@ type CollectionStatusDestinationStatus struct { // Destination: The name of the destination Destination string `json:"destination,omitempty"` - // Status: The status for the specified destination. + // Status: The status for the specified destination in the collections + // target country. Status string `json:"status,omitempty"` // ForceSendFields is a list of field names (e.g. "Destination") to @@ -12068,6 +12070,10 @@ type Product struct { // sellers to your multi-seller account. ExternalSellerId string `json:"externalSellerId,omitempty"` + // FeedLabel: Feed label for the item. Either `targetCountry` or + // `feedLabel` is required. + FeedLabel string `json:"feedLabel,omitempty"` + // Gender: Target gender of the item. Gender string `json:"gender,omitempty"` diff --git a/datacatalog/v1/datacatalog-api.json b/datacatalog/v1/datacatalog-api.json index 26d0ce04969..e2b1c32bc83 100644 --- a/datacatalog/v1/datacatalog-api.json +++ b/datacatalog/v1/datacatalog-api.json @@ -1953,7 +1953,7 @@ } } }, - "revision": "20220707", + "revision": "20220805", "rootUrl": "https://datacatalog.googleapis.com/", "schemas": { "Binding": { @@ -1965,7 +1965,7 @@ "description": "The condition that is associated with this binding. If the condition evaluates to `true`, then this binding applies to the current request. If the condition evaluates to `false`, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. To learn which resources support conditions in their IAM policies, see the [IAM documentation](https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", + "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a Google service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: An identifier for a [Kubernetes service account](https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", "items": { "type": "string" }, @@ -2311,12 +2311,12 @@ "type": "object" }, "GoogleCloudDatacatalogV1DataSourceConnectionSpec": { - "description": "Specification that applies to a data source connection. Valid only for entries with the `DATA_SOURCE_CONNECTION` type.", + "description": "Specification that applies to a data source connection. Valid only for entries with the `DATA_SOURCE_CONNECTION` type. Only one of internal specs can be set at the time, and cannot be changed later.", "id": "GoogleCloudDatacatalogV1DataSourceConnectionSpec", "properties": { "bigqueryConnectionSpec": { "$ref": "GoogleCloudDatacatalogV1BigQueryConnectionSpec", - "description": "Fields specific to BigQuery connections." + "description": "Output only. Fields specific to BigQuery connections." } }, "type": "object" diff --git a/datacatalog/v1/datacatalog-gen.go b/datacatalog/v1/datacatalog-gen.go index dadef9e6a79..99ebe329e0b 100644 --- a/datacatalog/v1/datacatalog-gen.go +++ b/datacatalog/v1/datacatalog-gen.go @@ -310,16 +310,20 @@ type Binding struct { // who is authenticated with a Google account or a service account. * // `user:{emailid}`: An email address that represents a specific Google // account. For example, `alice@example.com` . * - // `serviceAccount:{emailid}`: An email address that represents a + // `serviceAccount:{emailid}`: An email address that represents a Google // service account. For example, - // `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An - // email address that represents a Google group. For example, - // `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An - // email address (plus unique identifier) representing a user that has - // been recently deleted. For example, - // `alice@example.com?uid=123456789012345678901`. If the user is - // recovered, this value reverts to `user:{emailid}` and the recovered - // user retains the role in the binding. * + // `my-other-app@appspot.gserviceaccount.com`. * + // `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. * + // `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus + // unique identifier) representing a user that has been recently + // deleted. For example, `alice@example.com?uid=123456789012345678901`. + // If the user is recovered, this value reverts to `user:{emailid}` and + // the recovered user retains the role in the binding. * // `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address // (plus unique identifier) representing a service account that has been // recently deleted. For example, @@ -970,9 +974,11 @@ func (s *GoogleCloudDatacatalogV1DataSource) MarshalJSON() ([]byte, error) { // GoogleCloudDatacatalogV1DataSourceConnectionSpec: Specification that // applies to a data source connection. Valid only for entries with the -// `DATA_SOURCE_CONNECTION` type. +// `DATA_SOURCE_CONNECTION` type. Only one of internal specs can be set +// at the time, and cannot be changed later. type GoogleCloudDatacatalogV1DataSourceConnectionSpec struct { - // BigqueryConnectionSpec: Fields specific to BigQuery connections. + // BigqueryConnectionSpec: Output only. Fields specific to BigQuery + // connections. BigqueryConnectionSpec *GoogleCloudDatacatalogV1BigQueryConnectionSpec `json:"bigqueryConnectionSpec,omitempty"` // ForceSendFields is a list of field names (e.g. diff --git a/datacatalog/v1beta1/datacatalog-api.json b/datacatalog/v1beta1/datacatalog-api.json index 1e274c87bee..47d9f035065 100644 --- a/datacatalog/v1beta1/datacatalog-api.json +++ b/datacatalog/v1beta1/datacatalog-api.json @@ -1808,7 +1808,7 @@ } } }, - "revision": "20220505", + "revision": "20220805", "rootUrl": "https://datacatalog.googleapis.com/", "schemas": { "Binding": { @@ -1820,7 +1820,7 @@ "description": "The condition that is associated with this binding. If the condition evaluates to `true`, then this binding applies to the current request. If the condition evaluates to `false`, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. To learn which resources support conditions in their IAM policies, see the [IAM documentation](https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", + "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a Google service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: An identifier for a [Kubernetes service account](https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", "items": { "type": "string" }, diff --git a/datacatalog/v1beta1/datacatalog-gen.go b/datacatalog/v1beta1/datacatalog-gen.go index ff7f6aa9cd0..d3b8b749558 100644 --- a/datacatalog/v1beta1/datacatalog-gen.go +++ b/datacatalog/v1beta1/datacatalog-gen.go @@ -310,16 +310,20 @@ type Binding struct { // who is authenticated with a Google account or a service account. * // `user:{emailid}`: An email address that represents a specific Google // account. For example, `alice@example.com` . * - // `serviceAccount:{emailid}`: An email address that represents a + // `serviceAccount:{emailid}`: An email address that represents a Google // service account. For example, - // `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An - // email address that represents a Google group. For example, - // `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An - // email address (plus unique identifier) representing a user that has - // been recently deleted. For example, - // `alice@example.com?uid=123456789012345678901`. If the user is - // recovered, this value reverts to `user:{emailid}` and the recovered - // user retains the role in the binding. * + // `my-other-app@appspot.gserviceaccount.com`. * + // `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. * + // `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus + // unique identifier) representing a user that has been recently + // deleted. For example, `alice@example.com?uid=123456789012345678901`. + // If the user is recovered, this value reverts to `user:{emailid}` and + // the recovered user retains the role in the binding. * // `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address // (plus unique identifier) representing a service account that has been // recently deleted. For example, diff --git a/dataproc/v1/dataproc-api.json b/dataproc/v1/dataproc-api.json index 85498afc229..0b909452809 100644 --- a/dataproc/v1/dataproc-api.json +++ b/dataproc/v1/dataproc-api.json @@ -2444,7 +2444,7 @@ } } }, - "revision": "20220726", + "revision": "20220804", "rootUrl": "https://dataproc.googleapis.com/", "schemas": { "AcceleratorConfig": { @@ -2750,7 +2750,7 @@ "description": "The condition that is associated with this binding.If the condition evaluates to true, then this binding applies to the current request.If the condition evaluates to false, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding.To learn which resources support conditions in their IAM policies, see the IAM documentation (https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. members can have the following values: allUsers: A special identifier that represents anyone who is on the internet; with or without a Google account. allAuthenticatedUsers: A special identifier that represents anyone who is authenticated with a Google account or a service account. user:{emailid}: An email address that represents a specific Google account. For example, alice@example.com . serviceAccount:{emailid}: An email address that represents a service account. For example, my-other-app@appspot.gserviceaccount.com. group:{emailid}: An email address that represents a Google group. For example, admins@example.com. deleted:user:{emailid}?uid={uniqueid}: An email address (plus unique identifier) representing a user that has been recently deleted. For example, alice@example.com?uid=123456789012345678901. If the user is recovered, this value reverts to user:{emailid} and the recovered user retains the role in the binding. deleted:serviceAccount:{emailid}?uid={uniqueid}: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901. If the service account is undeleted, this value reverts to serviceAccount:{emailid} and the undeleted service account retains the role in the binding. deleted:group:{emailid}?uid={uniqueid}: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, admins@example.com?uid=123456789012345678901. If the group is recovered, this value reverts to group:{emailid} and the recovered group retains the role in the binding. domain:{domain}: The G Suite domain (primary) that represents all the users of that domain. For example, google.com or example.com.", + "description": "Specifies the principals requesting access for a Google Cloud resource. members can have the following values: allUsers: A special identifier that represents anyone who is on the internet; with or without a Google account. allAuthenticatedUsers: A special identifier that represents anyone who is authenticated with a Google account or a service account. user:{emailid}: An email address that represents a specific Google account. For example, alice@example.com . serviceAccount:{emailid}: An email address that represents a Google service account. For example, my-other-app@appspot.gserviceaccount.com. serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]: An identifier for a Kubernetes service account (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, my-project.svc.id.goog[my-namespace/my-kubernetes-sa]. group:{emailid}: An email address that represents a Google group. For example, admins@example.com. deleted:user:{emailid}?uid={uniqueid}: An email address (plus unique identifier) representing a user that has been recently deleted. For example, alice@example.com?uid=123456789012345678901. If the user is recovered, this value reverts to user:{emailid} and the recovered user retains the role in the binding. deleted:serviceAccount:{emailid}?uid={uniqueid}: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901. If the service account is undeleted, this value reverts to serviceAccount:{emailid} and the undeleted service account retains the role in the binding. deleted:group:{emailid}?uid={uniqueid}: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, admins@example.com?uid=123456789012345678901. If the group is recovered, this value reverts to group:{emailid} and the recovered group retains the role in the binding. domain:{domain}: The G Suite domain (primary) that represents all the users of that domain. For example, google.com or example.com.", "items": { "type": "string" }, diff --git a/dataproc/v1/dataproc-gen.go b/dataproc/v1/dataproc-gen.go index f83356c114a..5b1f758214e 100644 --- a/dataproc/v1/dataproc-gen.go +++ b/dataproc/v1/dataproc-gen.go @@ -753,13 +753,17 @@ type Binding struct { // identifier that represents anyone who is authenticated with a Google // account or a service account. user:{emailid}: An email address that // represents a specific Google account. For example, alice@example.com - // . serviceAccount:{emailid}: An email address that represents a + // . serviceAccount:{emailid}: An email address that represents a Google // service account. For example, - // my-other-app@appspot.gserviceaccount.com. group:{emailid}: An email - // address that represents a Google group. For example, - // admins@example.com. deleted:user:{emailid}?uid={uniqueid}: An email - // address (plus unique identifier) representing a user that has been - // recently deleted. For example, + // my-other-app@appspot.gserviceaccount.com. + // serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, my-project.svc.id.goog[my-namespace/my-kubernetes-sa]. + // group:{emailid}: An email address that represents a Google group. For + // example, admins@example.com. deleted:user:{emailid}?uid={uniqueid}: + // An email address (plus unique identifier) representing a user that + // has been recently deleted. For example, // alice@example.com?uid=123456789012345678901. If the user is // recovered, this value reverts to user:{emailid} and the recovered // user retains the role in the binding. diff --git a/dlp/v2/dlp-api.json b/dlp/v2/dlp-api.json index 29a625b033a..09d9d5b27f0 100644 --- a/dlp/v2/dlp-api.json +++ b/dlp/v2/dlp-api.json @@ -3412,7 +3412,7 @@ } } }, - "revision": "20220730", + "revision": "20220806", "rootUrl": "https://dlp.googleapis.com/", "schemas": { "GooglePrivacyDlpV2Action": { @@ -6965,7 +6965,7 @@ "type": "object" }, "GooglePrivacyDlpV2PublishFindingsToCloudDataCatalog": { - "description": "Publish findings of a DlpJob to Data Catalog. Labels summarizing the results of the DlpJob will be applied to the entry for the resource scanned in Data Catalog. Any labels previously written by another DlpJob will be deleted. InfoType naming patterns are strictly enforced when using this feature. Note that the findings will be persisted in Data Catalog storage and are governed by Data Catalog service-specific policy, see https://cloud.google.com/terms/service-terms Only a single instance of this action can be specified and only allowed if all resources being scanned are BigQuery tables. Compatible with: Inspect", + "description": "Publish findings of a DlpJob to Data Catalog. In Data Catalog, tag templates are applied to the resource that Cloud DLP scanned. Data Catalog tag templates are stored in the same project and region where the BigQuery table exists. For Cloud DLP to create and apply the tag template, the Cloud DLP service agent must have the `roles/datacatalog.tagTemplateOwner` permission on the project. The tag template contains fields summarizing the results of the DlpJob. Any field values previously written by another DlpJob are deleted. InfoType naming patterns are strictly enforced when using this feature. Findings are persisted in Data Catalog storage and are governed by service-specific policies for Data Catalog. For more information, see [Service Specific Terms](https://cloud.google.com/terms/service-terms). Only a single instance of this action can be specified. This action is allowed only if all resources being scanned are BigQuery tables. Compatible with: Inspect", "id": "GooglePrivacyDlpV2PublishFindingsToCloudDataCatalog", "properties": {}, "type": "object" diff --git a/dlp/v2/dlp-gen.go b/dlp/v2/dlp-gen.go index 70e48d6ce20..4718ae148f9 100644 --- a/dlp/v2/dlp-gen.go +++ b/dlp/v2/dlp-gen.go @@ -6741,15 +6741,21 @@ func (s *GooglePrivacyDlpV2PubSubNotification) MarshalJSON() ([]byte, error) { } // GooglePrivacyDlpV2PublishFindingsToCloudDataCatalog: Publish findings -// of a DlpJob to Data Catalog. Labels summarizing the results of the -// DlpJob will be applied to the entry for the resource scanned in Data -// Catalog. Any labels previously written by another DlpJob will be -// deleted. InfoType naming patterns are strictly enforced when using -// this feature. Note that the findings will be persisted in Data -// Catalog storage and are governed by Data Catalog service-specific -// policy, see https://cloud.google.com/terms/service-terms Only a -// single instance of this action can be specified and only allowed if -// all resources being scanned are BigQuery tables. Compatible with: +// of a DlpJob to Data Catalog. In Data Catalog, tag templates are +// applied to the resource that Cloud DLP scanned. Data Catalog tag +// templates are stored in the same project and region where the +// BigQuery table exists. For Cloud DLP to create and apply the tag +// template, the Cloud DLP service agent must have the +// `roles/datacatalog.tagTemplateOwner` permission on the project. The +// tag template contains fields summarizing the results of the DlpJob. +// Any field values previously written by another DlpJob are deleted. +// InfoType naming patterns are strictly enforced when using this +// feature. Findings are persisted in Data Catalog storage and are +// governed by service-specific policies for Data Catalog. For more +// information, see Service Specific Terms +// (https://cloud.google.com/terms/service-terms). Only a single +// instance of this action can be specified. This action is allowed only +// if all resources being scanned are BigQuery tables. Compatible with: // Inspect type GooglePrivacyDlpV2PublishFindingsToCloudDataCatalog struct { } diff --git a/dns/v1/dns-api.json b/dns/v1/dns-api.json index 873612bc60c..55ac1499de5 100644 --- a/dns/v1/dns-api.json +++ b/dns/v1/dns-api.json @@ -1824,7 +1824,7 @@ } } }, - "revision": "20220728", + "revision": "20220804", "rootUrl": "https://dns.googleapis.com/", "schemas": { "Change": { @@ -2156,7 +2156,7 @@ "description": "The condition that is associated with this binding. If the condition evaluates to `true`, then this binding applies to the current request. If the condition evaluates to `false`, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. To learn which resources support conditions in their IAM policies, see the [IAM documentation](https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", + "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a Google service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: An identifier for a [Kubernetes service account](https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", "items": { "type": "string" }, diff --git a/dns/v1/dns-gen.go b/dns/v1/dns-gen.go index 778da4e4b8c..7df0116ddaa 100644 --- a/dns/v1/dns-gen.go +++ b/dns/v1/dns-gen.go @@ -783,16 +783,20 @@ type GoogleIamV1Binding struct { // who is authenticated with a Google account or a service account. * // `user:{emailid}`: An email address that represents a specific Google // account. For example, `alice@example.com` . * - // `serviceAccount:{emailid}`: An email address that represents a + // `serviceAccount:{emailid}`: An email address that represents a Google // service account. For example, - // `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An - // email address that represents a Google group. For example, - // `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An - // email address (plus unique identifier) representing a user that has - // been recently deleted. For example, - // `alice@example.com?uid=123456789012345678901`. If the user is - // recovered, this value reverts to `user:{emailid}` and the recovered - // user retains the role in the binding. * + // `my-other-app@appspot.gserviceaccount.com`. * + // `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. * + // `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus + // unique identifier) representing a user that has been recently + // deleted. For example, `alice@example.com?uid=123456789012345678901`. + // If the user is recovered, this value reverts to `user:{emailid}` and + // the recovered user retains the role in the binding. * // `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address // (plus unique identifier) representing a service account that has been // recently deleted. For example, diff --git a/dns/v1beta2/dns-api.json b/dns/v1beta2/dns-api.json index cd43ee524ab..35ac35b6f9c 100644 --- a/dns/v1beta2/dns-api.json +++ b/dns/v1beta2/dns-api.json @@ -1821,7 +1821,7 @@ } } }, - "revision": "20220728", + "revision": "20220804", "rootUrl": "https://dns.googleapis.com/", "schemas": { "Change": { @@ -2153,7 +2153,7 @@ "description": "The condition that is associated with this binding. If the condition evaluates to `true`, then this binding applies to the current request. If the condition evaluates to `false`, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. To learn which resources support conditions in their IAM policies, see the [IAM documentation](https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", + "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a Google service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: An identifier for a [Kubernetes service account](https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", "items": { "type": "string" }, diff --git a/dns/v1beta2/dns-gen.go b/dns/v1beta2/dns-gen.go index 205b6b10a28..483f1d4e635 100644 --- a/dns/v1beta2/dns-gen.go +++ b/dns/v1beta2/dns-gen.go @@ -783,16 +783,20 @@ type GoogleIamV1Binding struct { // who is authenticated with a Google account or a service account. * // `user:{emailid}`: An email address that represents a specific Google // account. For example, `alice@example.com` . * - // `serviceAccount:{emailid}`: An email address that represents a + // `serviceAccount:{emailid}`: An email address that represents a Google // service account. For example, - // `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An - // email address that represents a Google group. For example, - // `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An - // email address (plus unique identifier) representing a user that has - // been recently deleted. For example, - // `alice@example.com?uid=123456789012345678901`. If the user is - // recovered, this value reverts to `user:{emailid}` and the recovered - // user retains the role in the binding. * + // `my-other-app@appspot.gserviceaccount.com`. * + // `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. * + // `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus + // unique identifier) representing a user that has been recently + // deleted. For example, `alice@example.com?uid=123456789012345678901`. + // If the user is recovered, this value reverts to `user:{emailid}` and + // the recovered user retains the role in the binding. * // `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address // (plus unique identifier) representing a service account that has been // recently deleted. For example, diff --git a/documentai/v1/documentai-api.json b/documentai/v1/documentai-api.json index 9e4ed6ef301..a7d63c85d90 100644 --- a/documentai/v1/documentai-api.json +++ b/documentai/v1/documentai-api.json @@ -1069,7 +1069,7 @@ } } }, - "revision": "20220720", + "revision": "20220808", "rootUrl": "https://documentai.googleapis.com/", "schemas": { "GoogleCloudDocumentaiUiv1beta3BatchDeleteDocumentsMetadata": { @@ -1753,7 +1753,7 @@ }, "status": { "$ref": "GoogleRpcStatus", - "description": "The error encountered while attempting to process the document. Empty if there are no errors." + "description": "The status processing the document." } }, "type": "object" @@ -2964,6 +2964,10 @@ "prefixedNamingOnProperties": { "description": "If set, all the nested entities must be prefixed with the parents.", "type": "boolean" + }, + "skipNamingValidation": { + "description": "If set, we will skip the naming format validation in the schema. So the string values in `DocumentSchema.EntityType.name` and `DocumentSchema.EntityType.Property.name` will not be checked.", + "type": "boolean" } }, "type": "object" @@ -6303,7 +6307,7 @@ }, "status": { "$ref": "GoogleRpcStatus", - "description": "The error encountered while attempting to process the document. Empty if there are no errors." + "description": "The status processing the document." } }, "type": "object" diff --git a/documentai/v1/documentai-gen.go b/documentai/v1/documentai-gen.go index a8a192eff4e..c27037427f2 100644 --- a/documentai/v1/documentai-gen.go +++ b/documentai/v1/documentai-gen.go @@ -1574,8 +1574,7 @@ type GoogleCloudDocumentaiV1BatchProcessMetadataIndividualProcessStatus struct { // successful, otherwise empty. OutputGcsDestination string `json:"outputGcsDestination,omitempty"` - // Status: The error encountered while attempting to process the - // document. Empty if there are no errors. + // Status: The status processing the document. Status *GoogleRpcStatus `json:"status,omitempty"` // ForceSendFields is a list of field names (e.g. "HumanReviewStatus") @@ -3461,6 +3460,12 @@ type GoogleCloudDocumentaiV1DocumentSchemaMetadata struct { // prefixed with the parents. PrefixedNamingOnProperties bool `json:"prefixedNamingOnProperties,omitempty"` + // SkipNamingValidation: If set, we will skip the naming format + // validation in the schema. So the string values in + // `DocumentSchema.EntityType.name` and + // `DocumentSchema.EntityType.Property.name` will not be checked. + SkipNamingValidation bool `json:"skipNamingValidation,omitempty"` + // ForceSendFields is a list of field names (e.g. // "DocumentAllowMultipleLabels") to unconditionally include in API // requests. By default, fields with empty or default values are omitted @@ -9014,8 +9019,7 @@ type GoogleCloudDocumentaiV1beta3BatchProcessMetadataIndividualProcessStatus str // successful, otherwise empty. OutputGcsDestination string `json:"outputGcsDestination,omitempty"` - // Status: The error encountered while attempting to process the - // document. Empty if there are no errors. + // Status: The status processing the document. Status *GoogleRpcStatus `json:"status,omitempty"` // ForceSendFields is a list of field names (e.g. diff --git a/documentai/v1beta2/documentai-api.json b/documentai/v1beta2/documentai-api.json index 047e1de192f..6d1c6650831 100644 --- a/documentai/v1beta2/documentai-api.json +++ b/documentai/v1beta2/documentai-api.json @@ -292,7 +292,7 @@ } } }, - "revision": "20220720", + "revision": "20220808", "rootUrl": "https://documentai.googleapis.com/", "schemas": { "GoogleCloudDocumentaiUiv1beta3BatchDeleteDocumentsMetadata": { @@ -942,7 +942,7 @@ }, "status": { "$ref": "GoogleRpcStatus", - "description": "The error encountered while attempting to process the document. Empty if there are no errors." + "description": "The status processing the document." } }, "type": "object" @@ -3986,7 +3986,7 @@ }, "status": { "$ref": "GoogleRpcStatus", - "description": "The error encountered while attempting to process the document. Empty if there are no errors." + "description": "The status processing the document." } }, "type": "object" diff --git a/documentai/v1beta2/documentai-gen.go b/documentai/v1beta2/documentai-gen.go index 285391ba5f0..65134dbaf6e 100644 --- a/documentai/v1beta2/documentai-gen.go +++ b/documentai/v1beta2/documentai-gen.go @@ -1410,8 +1410,7 @@ type GoogleCloudDocumentaiV1BatchProcessMetadataIndividualProcessStatus struct { // successful, otherwise empty. OutputGcsDestination string `json:"outputGcsDestination,omitempty"` - // Status: The error encountered while attempting to process the - // document. Empty if there are no errors. + // Status: The status processing the document. Status *GoogleRpcStatus `json:"status,omitempty"` // ForceSendFields is a list of field names (e.g. "HumanReviewStatus") @@ -6439,8 +6438,7 @@ type GoogleCloudDocumentaiV1beta3BatchProcessMetadataIndividualProcessStatus str // successful, otherwise empty. OutputGcsDestination string `json:"outputGcsDestination,omitempty"` - // Status: The error encountered while attempting to process the - // document. Empty if there are no errors. + // Status: The status processing the document. Status *GoogleRpcStatus `json:"status,omitempty"` // ForceSendFields is a list of field names (e.g. diff --git a/documentai/v1beta3/documentai-api.json b/documentai/v1beta3/documentai-api.json index 295b4974f1a..feba2e0f294 100644 --- a/documentai/v1beta3/documentai-api.json +++ b/documentai/v1beta3/documentai-api.json @@ -836,7 +836,7 @@ } } }, - "revision": "20220720", + "revision": "20220808", "rootUrl": "https://documentai.googleapis.com/", "schemas": { "GoogleCloudDocumentaiUiv1beta3BatchDeleteDocumentsMetadata": { @@ -1486,7 +1486,7 @@ }, "status": { "$ref": "GoogleRpcStatus", - "description": "The error encountered while attempting to process the document. Empty if there are no errors." + "description": "The status processing the document." } }, "type": "object" @@ -4382,7 +4382,7 @@ }, "status": { "$ref": "GoogleRpcStatus", - "description": "The error encountered while attempting to process the document. Empty if there are no errors." + "description": "The status processing the document." } }, "type": "object" @@ -5630,6 +5630,10 @@ "prefixedNamingOnProperties": { "description": "If set, all the nested entities must be prefixed with the parents.", "type": "boolean" + }, + "skipNamingValidation": { + "description": "If set, we will skip the naming format validation in the schema. So the string values in `DocumentSchema.EntityType.name` and `DocumentSchema.EntityType.Property.name` will not be checked.", + "type": "boolean" } }, "type": "object" diff --git a/documentai/v1beta3/documentai-gen.go b/documentai/v1beta3/documentai-gen.go index 587d99c14e5..2d507bd5300 100644 --- a/documentai/v1beta3/documentai-gen.go +++ b/documentai/v1beta3/documentai-gen.go @@ -1422,8 +1422,7 @@ type GoogleCloudDocumentaiV1BatchProcessMetadataIndividualProcessStatus struct { // successful, otherwise empty. OutputGcsDestination string `json:"outputGcsDestination,omitempty"` - // Status: The error encountered while attempting to process the - // document. Empty if there are no errors. + // Status: The status processing the document. Status *GoogleRpcStatus `json:"status,omitempty"` // ForceSendFields is a list of field names (e.g. "HumanReviewStatus") @@ -6180,8 +6179,7 @@ type GoogleCloudDocumentaiV1beta3BatchProcessMetadataIndividualProcessStatus str // successful, otherwise empty. OutputGcsDestination string `json:"outputGcsDestination,omitempty"` - // Status: The error encountered while attempting to process the - // document. Empty if there are no errors. + // Status: The status processing the document. Status *GoogleRpcStatus `json:"status,omitempty"` // ForceSendFields is a list of field names (e.g. @@ -8144,6 +8142,12 @@ type GoogleCloudDocumentaiV1beta3DocumentSchemaMetadata struct { // prefixed with the parents. PrefixedNamingOnProperties bool `json:"prefixedNamingOnProperties,omitempty"` + // SkipNamingValidation: If set, we will skip the naming format + // validation in the schema. So the string values in + // `DocumentSchema.EntityType.name` and + // `DocumentSchema.EntityType.Property.name` will not be checked. + SkipNamingValidation bool `json:"skipNamingValidation,omitempty"` + // ForceSendFields is a list of field names (e.g. // "DocumentAllowMultipleLabels") to unconditionally include in API // requests. By default, fields with empty or default values are omitted diff --git a/firebase/v1beta1/firebase-api.json b/firebase/v1beta1/firebase-api.json index bab143d5d80..ce439c394e0 100644 --- a/firebase/v1beta1/firebase-api.json +++ b/firebase/v1beta1/firebase-api.json @@ -1225,7 +1225,7 @@ } } }, - "revision": "20220725", + "revision": "20220808", "rootUrl": "https://firebase.googleapis.com/", "schemas": { "AddFirebaseRequest": { @@ -1317,7 +1317,7 @@ "id": "AndroidApp", "properties": { "apiKeyId": { - "description": "The key_id of the GCP ApiKey associated with this App. If set must have no restrictions, or only have restrictions that are valid for the associated Firebase App. Cannot be set in create requests, instead an existing valid API Key will be chosen, or if no valid API Keys exist, one will be provisioned for you. Cannot be set to an empty value in update requests.", + "description": "The globally unique, Google-assigned identifier (UID) for the Firebase API key associated with the `AndroidApp`. Be aware that this value is the UID of the API key, _not_ the [`keyString`](https://cloud.google.com/api-keys/docs/reference/rest/v2/projects.locations.keys#Key.FIELDS.key_string) of the API key. The `keyString` is the value that can be found in the App's [configuration artifact](../../rest/v1beta1/projects.androidApps/getConfig). If `api_key_id` is not set in requests to [`androidApps.Create`](../../rest/v1beta1/projects.androidApps/create), then Firebase automatically associates an `api_key_id` with the `AndroidApp`. This auto-associated key may be an existing valid key or, if no valid key exists, a new one will be provisioned. In patch requests, `api_key_id` cannot be set to an empty value, and the new UID must have no restrictions or only have restrictions that are valid for the associated `AndroidApp`. We recommend using the [Google Cloud Console](https://console.cloud.google.com/apis/credentials) to manage API keys.", "type": "string" }, "appId": { @@ -1438,7 +1438,7 @@ "id": "FirebaseAppInfo", "properties": { "apiKeyId": { - "description": "The key_id of the GCP ApiKey associated with this App. If set must have no restrictions, or only have restrictions that are valid for the associated Firebase App. Cannot be set to an empty value in update requests. If left unset on create requests, an existing valid API Key will be chosen, or if no valid API Keys exist, one will be provisioned for you.", + "description": "The globally unique, Google-assigned identifier (UID) for the Firebase API key associated with the App. Be aware that this value is the UID of the API key, _not_ the [`keyString`](https://cloud.google.com/api-keys/docs/reference/rest/v2/projects.locations.keys#Key.FIELDS.key_string) of the API key. The `keyString` is the value that can be found in the App's configuration artifact ([`AndroidApp`](../../rest/v1beta1/projects.androidApps/getConfig) | [`IosApp`](../../rest/v1beta1/projects.iosApps/getConfig) | [`WebApp`](../../rest/v1beta1/projects.webApps/getConfig)). If `api_key_id` is not set in requests to create the App ([`AndroidApp`](../../rest/v1beta1/projects.androidApps/create) | [`IosApp`](../../rest/v1beta1/projects.iosApps/create) | [`WebApp`](../../rest/v1beta1/projects.webApps/create)), then Firebase automatically associates an `api_key_id` with the App. This auto-associated key may be an existing valid key or, if no valid key exists, a new one will be provisioned.", "type": "string" }, "appId": { @@ -1555,7 +1555,7 @@ "id": "IosApp", "properties": { "apiKeyId": { - "description": "The key_id of the GCP ApiKey associated with this App. If set must have no restrictions, or only have restrictions that are valid for the associated Firebase App. Cannot be set in create requests, instead an existing valid API Key will be chosen, or if no valid API Keys exist, one will be provisioned for you. Cannot be set to an empty value in update requests.", + "description": "The globally unique, Google-assigned identifier (UID) for the Firebase API key associated with the `IosApp`. Be aware that this value is the UID of the API key, _not_ the [`keyString`](https://cloud.google.com/api-keys/docs/reference/rest/v2/projects.locations.keys#Key.FIELDS.key_string) of the API key. The `keyString` is the value that can be found in the App's [configuration artifact](../../rest/v1beta1/projects.iosApps/getConfig). If `api_key_id` is not set in requests to [`iosApps.Create`](../../rest/v1beta1/projects.iosApps/create), then Firebase automatically associates an `api_key_id` with the `IosApp`. This auto-associated key may be an existing valid key or, if no valid key exists, a new one will be provisioned. In patch requests, `api_key_id` cannot be set to an empty value, and the new UID must have no restrictions or only have restrictions that are valid for the associated `IosApp`. We recommend using the [Google Cloud Console](https://console.cloud.google.com/apis/credentials) to manage API keys.", "type": "string" }, "appId": { @@ -2032,7 +2032,7 @@ "id": "WebApp", "properties": { "apiKeyId": { - "description": "The key_id of the GCP ApiKey associated with this App. If set must have no restrictions, or only have restrictions that are valid for the associated Firebase App. Cannot be set in create requests, instead an existing valid API Key will be chosen, or if no valid API Keys exist, one will be provisioned for you. Cannot be set to an empty value in update requests.", + "description": "The globally unique, Google-assigned identifier (UID) for the Firebase API key associated with the `WebApp`. Be aware that this value is the UID of the API key, _not_ the [`keyString`](https://cloud.google.com/api-keys/docs/reference/rest/v2/projects.locations.keys#Key.FIELDS.key_string) of the API key. The `keyString` is the value that can be found in the App's [configuration artifact](../../rest/v1beta1/projects.webApps/getConfig). If `api_key_id` is not set in requests to [`webApps.Create`](../../rest/v1beta1/projects.webApps/create), then Firebase automatically associates an `api_key_id` with the `WebApp`. This auto-associated key may be an existing valid key or, if no valid key exists, a new one will be provisioned. In patch requests, `api_key_id` cannot be set to an empty value, and the new UID must have no restrictions or only have restrictions that are valid for the associated `WebApp`. We recommend using the [Google Cloud Console](https://console.cloud.google.com/apis/credentials) to manage API keys.", "type": "string" }, "appId": { @@ -2088,7 +2088,7 @@ "id": "WebAppConfig", "properties": { "apiKey": { - "description": "The API key associated with the `WebApp`.", + "description": "The [`keyString`](https://cloud.google.com/api-keys/docs/reference/rest/v2/projects.locations.keys#Key.FIELDS.key_string) of the API key associated with the `WebApp`. Note that this value is _not_ the [`apiKeyId`](../projects.webApps#WebApp.FIELDS.api_key_id) (the UID) of the API key associated with the `WebApp`.", "type": "string" }, "appId": { diff --git a/firebase/v1beta1/firebase-gen.go b/firebase/v1beta1/firebase-gen.go index 8cb9303ef46..5081e4fa338 100644 --- a/firebase/v1beta1/firebase-gen.go +++ b/firebase/v1beta1/firebase-gen.go @@ -467,12 +467,23 @@ func (s *AnalyticsProperty) MarshalJSON() ([]byte, error) { // AndroidApp: Details of a Firebase App for Android. type AndroidApp struct { - // ApiKeyId: The key_id of the GCP ApiKey associated with this App. If - // set must have no restrictions, or only have restrictions that are - // valid for the associated Firebase App. Cannot be set in create - // requests, instead an existing valid API Key will be chosen, or if no - // valid API Keys exist, one will be provisioned for you. Cannot be set - // to an empty value in update requests. + // ApiKeyId: The globally unique, Google-assigned identifier (UID) for + // the Firebase API key associated with the `AndroidApp`. Be aware that + // this value is the UID of the API key, _not_ the `keyString` + // (https://cloud.google.com/api-keys/docs/reference/rest/v2/projects.locations.keys#Key.FIELDS.key_string) + // of the API key. The `keyString` is the value that can be found in the + // App's configuration artifact + // (../../rest/v1beta1/projects.androidApps/getConfig). If `api_key_id` + // is not set in requests to `androidApps.Create` + // (../../rest/v1beta1/projects.androidApps/create), then Firebase + // automatically associates an `api_key_id` with the `AndroidApp`. This + // auto-associated key may be an existing valid key or, if no valid key + // exists, a new one will be provisioned. In patch requests, + // `api_key_id` cannot be set to an empty value, and the new UID must + // have no restrictions or only have restrictions that are valid for the + // associated `AndroidApp`. We recommend using the Google Cloud Console + // (https://console.cloud.google.com/apis/credentials) to manage API + // keys. ApiKeyId string `json:"apiKeyId,omitempty"` // AppId: Output only. Immutable. The globally unique, Firebase-assigned @@ -687,12 +698,22 @@ func (s *FinalizeDefaultLocationRequest) MarshalJSON() ([]byte, error) { // FirebaseAppInfo: A high-level summary of an App. type FirebaseAppInfo struct { - // ApiKeyId: The key_id of the GCP ApiKey associated with this App. If - // set must have no restrictions, or only have restrictions that are - // valid for the associated Firebase App. Cannot be set to an empty - // value in update requests. If left unset on create requests, an - // existing valid API Key will be chosen, or if no valid API Keys exist, - // one will be provisioned for you. + // ApiKeyId: The globally unique, Google-assigned identifier (UID) for + // the Firebase API key associated with the App. Be aware that this + // value is the UID of the API key, _not_ the `keyString` + // (https://cloud.google.com/api-keys/docs/reference/rest/v2/projects.locations.keys#Key.FIELDS.key_string) + // of the API key. The `keyString` is the value that can be found in the + // App's configuration artifact (`AndroidApp` + // (../../rest/v1beta1/projects.androidApps/getConfig) | `IosApp` + // (../../rest/v1beta1/projects.iosApps/getConfig) | `WebApp` + // (../../rest/v1beta1/projects.webApps/getConfig)). If `api_key_id` is + // not set in requests to create the App (`AndroidApp` + // (../../rest/v1beta1/projects.androidApps/create) | `IosApp` + // (../../rest/v1beta1/projects.iosApps/create) | `WebApp` + // (../../rest/v1beta1/projects.webApps/create)), then Firebase + // automatically associates an `api_key_id` with the App. This + // auto-associated key may be an existing valid key or, if no valid key + // exists, a new one will be provisioned. ApiKeyId string `json:"apiKeyId,omitempty"` // AppId: Output only. Immutable. The globally unique, Firebase-assigned @@ -855,12 +876,23 @@ func (s *FirebaseProject) MarshalJSON() ([]byte, error) { // IosApp: Details of a Firebase App for iOS. type IosApp struct { - // ApiKeyId: The key_id of the GCP ApiKey associated with this App. If - // set must have no restrictions, or only have restrictions that are - // valid for the associated Firebase App. Cannot be set in create - // requests, instead an existing valid API Key will be chosen, or if no - // valid API Keys exist, one will be provisioned for you. Cannot be set - // to an empty value in update requests. + // ApiKeyId: The globally unique, Google-assigned identifier (UID) for + // the Firebase API key associated with the `IosApp`. Be aware that this + // value is the UID of the API key, _not_ the `keyString` + // (https://cloud.google.com/api-keys/docs/reference/rest/v2/projects.locations.keys#Key.FIELDS.key_string) + // of the API key. The `keyString` is the value that can be found in the + // App's configuration artifact + // (../../rest/v1beta1/projects.iosApps/getConfig). If `api_key_id` is + // not set in requests to `iosApps.Create` + // (../../rest/v1beta1/projects.iosApps/create), then Firebase + // automatically associates an `api_key_id` with the `IosApp`. This + // auto-associated key may be an existing valid key or, if no valid key + // exists, a new one will be provisioned. In patch requests, + // `api_key_id` cannot be set to an empty value, and the new UID must + // have no restrictions or only have restrictions that are valid for the + // associated `IosApp`. We recommend using the Google Cloud Console + // (https://console.cloud.google.com/apis/credentials) to manage API + // keys. ApiKeyId string `json:"apiKeyId,omitempty"` // AppId: Output only. Immutable. The globally unique, Firebase-assigned @@ -1796,12 +1828,23 @@ func (s *StreamMapping) MarshalJSON() ([]byte, error) { // WebApp: Details of a Firebase App for the web. type WebApp struct { - // ApiKeyId: The key_id of the GCP ApiKey associated with this App. If - // set must have no restrictions, or only have restrictions that are - // valid for the associated Firebase App. Cannot be set in create - // requests, instead an existing valid API Key will be chosen, or if no - // valid API Keys exist, one will be provisioned for you. Cannot be set - // to an empty value in update requests. + // ApiKeyId: The globally unique, Google-assigned identifier (UID) for + // the Firebase API key associated with the `WebApp`. Be aware that this + // value is the UID of the API key, _not_ the `keyString` + // (https://cloud.google.com/api-keys/docs/reference/rest/v2/projects.locations.keys#Key.FIELDS.key_string) + // of the API key. The `keyString` is the value that can be found in the + // App's configuration artifact + // (../../rest/v1beta1/projects.webApps/getConfig). If `api_key_id` is + // not set in requests to `webApps.Create` + // (../../rest/v1beta1/projects.webApps/create), then Firebase + // automatically associates an `api_key_id` with the `WebApp`. This + // auto-associated key may be an existing valid key or, if no valid key + // exists, a new one will be provisioned. In patch requests, + // `api_key_id` cannot be set to an empty value, and the new UID must + // have no restrictions or only have restrictions that are valid for the + // associated `WebApp`. We recommend using the Google Cloud Console + // (https://console.cloud.google.com/apis/credentials) to manage API + // keys. ApiKeyId string `json:"apiKeyId,omitempty"` // AppId: Output only. Immutable. The globally unique, Firebase-assigned @@ -1877,7 +1920,11 @@ func (s *WebApp) MarshalJSON() ([]byte, error) { // WebAppConfig: Configuration metadata of a single Firebase App for the // web. type WebAppConfig struct { - // ApiKey: The API key associated with the `WebApp`. + // ApiKey: The `keyString` + // (https://cloud.google.com/api-keys/docs/reference/rest/v2/projects.locations.keys#Key.FIELDS.key_string) + // of the API key associated with the `WebApp`. Note that this value is + // _not_ the `apiKeyId` (../projects.webApps#WebApp.FIELDS.api_key_id) + // (the UID) of the API key associated with the `WebApp`. ApiKey string `json:"apiKey,omitempty"` // AppId: Immutable. The globally unique, Firebase-assigned identifier diff --git a/iap/v1/iap-api.json b/iap/v1/iap-api.json index 695baeed403..697b33a7cd0 100644 --- a/iap/v1/iap-api.json +++ b/iap/v1/iap-api.json @@ -652,7 +652,7 @@ } } }, - "revision": "20220729", + "revision": "20220805", "rootUrl": "https://iap.googleapis.com/", "schemas": { "AccessDeniedPageSettings": { @@ -751,7 +751,7 @@ "description": "The condition that is associated with this binding. If the condition evaluates to `true`, then this binding applies to the current request. If the condition evaluates to `false`, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. To learn which resources support conditions in their IAM policies, see the [IAM documentation](https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", + "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a Google service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: An identifier for a [Kubernetes service account](https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", "items": { "type": "string" }, diff --git a/iap/v1/iap-gen.go b/iap/v1/iap-gen.go index fea6b5f6dab..ca5d6f53f5c 100644 --- a/iap/v1/iap-gen.go +++ b/iap/v1/iap-gen.go @@ -400,16 +400,20 @@ type Binding struct { // who is authenticated with a Google account or a service account. * // `user:{emailid}`: An email address that represents a specific Google // account. For example, `alice@example.com` . * - // `serviceAccount:{emailid}`: An email address that represents a + // `serviceAccount:{emailid}`: An email address that represents a Google // service account. For example, - // `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An - // email address that represents a Google group. For example, - // `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An - // email address (plus unique identifier) representing a user that has - // been recently deleted. For example, - // `alice@example.com?uid=123456789012345678901`. If the user is - // recovered, this value reverts to `user:{emailid}` and the recovered - // user retains the role in the binding. * + // `my-other-app@appspot.gserviceaccount.com`. * + // `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. * + // `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus + // unique identifier) representing a user that has been recently + // deleted. For example, `alice@example.com?uid=123456789012345678901`. + // If the user is recovered, this value reverts to `user:{emailid}` and + // the recovered user retains the role in the binding. * // `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address // (plus unique identifier) representing a service account that has been // recently deleted. For example, diff --git a/iap/v1beta1/iap-api.json b/iap/v1beta1/iap-api.json index 44324b378a1..7a3d289ca67 100644 --- a/iap/v1beta1/iap-api.json +++ b/iap/v1beta1/iap-api.json @@ -194,7 +194,7 @@ } } }, - "revision": "20220506", + "revision": "20220805", "rootUrl": "https://iap.googleapis.com/", "schemas": { "Binding": { @@ -206,7 +206,7 @@ "description": "The condition that is associated with this binding. If the condition evaluates to `true`, then this binding applies to the current request. If the condition evaluates to `false`, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. To learn which resources support conditions in their IAM policies, see the [IAM documentation](https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", + "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a Google service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: An identifier for a [Kubernetes service account](https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", "items": { "type": "string" }, diff --git a/iap/v1beta1/iap-gen.go b/iap/v1beta1/iap-gen.go index ba369fb57db..cadb1513052 100644 --- a/iap/v1beta1/iap-gen.go +++ b/iap/v1beta1/iap-gen.go @@ -166,16 +166,20 @@ type Binding struct { // who is authenticated with a Google account or a service account. * // `user:{emailid}`: An email address that represents a specific Google // account. For example, `alice@example.com` . * - // `serviceAccount:{emailid}`: An email address that represents a + // `serviceAccount:{emailid}`: An email address that represents a Google // service account. For example, - // `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An - // email address that represents a Google group. For example, - // `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An - // email address (plus unique identifier) representing a user that has - // been recently deleted. For example, - // `alice@example.com?uid=123456789012345678901`. If the user is - // recovered, this value reverts to `user:{emailid}` and the recovered - // user retains the role in the binding. * + // `my-other-app@appspot.gserviceaccount.com`. * + // `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. * + // `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus + // unique identifier) representing a user that has been recently + // deleted. For example, `alice@example.com?uid=123456789012345678901`. + // If the user is recovered, this value reverts to `user:{emailid}` and + // the recovered user retains the role in the binding. * // `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address // (plus unique identifier) representing a service account that has been // recently deleted. For example, diff --git a/manufacturers/v1/manufacturers-api.json b/manufacturers/v1/manufacturers-api.json index b9b748d697a..a8b3ee333fd 100644 --- a/manufacturers/v1/manufacturers-api.json +++ b/manufacturers/v1/manufacturers-api.json @@ -287,7 +287,7 @@ } } }, - "revision": "20220323", + "revision": "20220809", "rootUrl": "https://manufacturers.googleapis.com/", "schemas": { "Attributes": { @@ -355,6 +355,10 @@ "description": "The target gender of the product. For more information, see https://support.google.com/manufacturers/answer/6124116#gender.", "type": "string" }, + "grocery": { + "$ref": "Grocery", + "description": "Grocery Attributes. For more information, see go/mfc-nutrition-attributes." + }, "gtin": { "description": "The Global Trade Item Number (GTIN) of the product. For more information, see https://support.google.com/manufacturers/answer/6124116#gtin.", "items": { @@ -385,6 +389,10 @@ "description": "The Manufacturer Part Number (MPN) of the product. For more information, see https://support.google.com/manufacturers/answer/6124116#mpn.", "type": "string" }, + "nutrition": { + "$ref": "Nutrition", + "description": "Nutrition Attributes. For more information, see go/mfc-nutrition-attributes." + }, "pattern": { "description": "The pattern of the product. For more information, see https://support.google.com/manufacturers/answer/6124116#pattern.", "type": "string" @@ -562,6 +570,71 @@ }, "type": "object" }, + "FloatUnit": { + "description": "Combination of float amout and unit.", + "id": "FloatUnit", + "properties": { + "amount": { + "description": "amount.", + "format": "double", + "type": "number" + }, + "unit": { + "description": "unit.", + "type": "string" + } + }, + "type": "object" + }, + "Grocery": { + "id": "Grocery", + "properties": { + "activeIngredients": { + "description": "Active ingredients.", + "type": "string" + }, + "alcoholByVolume": { + "description": "Alcohol by volume.", + "format": "double", + "type": "number" + }, + "allergens": { + "description": "Allergens.", + "type": "string" + }, + "derivedNutritionClaim": { + "description": "Derived nutrition claim.", + "items": { + "type": "string" + }, + "type": "array" + }, + "directions": { + "description": "Directions.", + "type": "string" + }, + "indications": { + "description": "Indications.", + "type": "string" + }, + "ingredients": { + "description": "Ingredients.", + "type": "string" + }, + "nutritionClaim": { + "description": "Nutrition claim.", + "items": { + "type": "string" + }, + "type": "array" + }, + "storageInstructions": { + "description": "Storage instructions.", + "type": "string" + } + }, + "type": "object" + }, "Image": { "description": "An image.", "id": "Image", @@ -700,6 +773,203 @@ }, "type": "object" }, + "Nutrition": { + "id": "Nutrition", + "properties": { + "addedSugars": { + "$ref": "FloatUnit", + "description": "Added sugars." + }, + "addedSugarsDailyPercentage": { + "description": "Added sugars daily percentage.", + "format": "double", + "type": "number" + }, + "calcium": { + "$ref": "FloatUnit", + "description": "Calcium." + }, + "calciumDailyPercentage": { + "description": "Calcium daily percentage.", + "format": "double", + "type": "number" + }, + "cholesterol": { + "$ref": "FloatUnit", + "description": "Cholesterol." + }, + "cholesterolDailyPercentage": { + "description": "Cholesterol daily percentage.", + "format": "double", + "type": "number" + }, + "dietaryFiber": { + "$ref": "FloatUnit", + "description": "Dietary fiber." + }, + "dietaryFiberDailyPercentage": { + "description": "Dietary fiber daily percentage.", + "format": "double", + "type": "number" + }, + "energy": { + "$ref": "FloatUnit", + "description": "Mandatory Nutrition Facts. Energy." + }, + "energyFromFat": { + "$ref": "FloatUnit", + "description": "Energy from fat." + }, + "folateDailyPercentage": { + "description": "Folate daily percentage.", + "format": "double", + "type": "number" + }, + "folateFolicAcid": { + "$ref": "FloatUnit", + "description": "Folate folic acid." + }, + "folateMcgDfe": { + "description": "Folate mcg DFE.", + "format": "double", + "type": "number" + }, + "iron": { + "$ref": "FloatUnit", + "description": "Iron." + }, + "ironDailyPercentage": { + "description": "Iron daily percentage.", + "format": "double", + "type": "number" + }, + "monounsaturatedFat": { + "$ref": "FloatUnit", + "description": "Monounsaturated fat." + }, + "nutritionFactMeasure": { + "description": "Nutrition fact measure.", + "type": "string" + }, + "polyols": { + "$ref": "FloatUnit", + "description": "Polyols." + }, + "polyunsaturatedFat": { + "$ref": "FloatUnit", + "description": "Polyunsaturated fat." + }, + "potassium": { + "$ref": "FloatUnit", + "description": "Potassium." + }, + "potassiumDailyPercentage": { + "description": "Potassium daily percentage.", + "format": "double", + "type": "number" + }, + "preparedSizeDescription": { + "description": "Prepared size description.", + "type": "string" + }, + "protein": { + "$ref": "FloatUnit", + "description": "Protein." + }, + "proteinDailyPercentage": { + "description": "Protein daily percentage.", + "format": "double", + "type": "number" + }, + "saturatedFat": { + "$ref": "FloatUnit", + "description": "Saturated fat." + }, + "saturatedFatDailyPercentage": { + "description": "Saturated fat daily percentage.", + "format": "double", + "type": "number" + }, + "servingSizeDescription": { + "description": "Food Serving Size. Serving size description.", + "type": "string" + }, + "servingSizeMeasure": { + "$ref": "FloatUnit", + "description": "Serving size measure." + }, + "servingsPerContainer": { + "description": "Servings per container.", + "type": "string" + }, + "sodium": { + "$ref": "FloatUnit", + "description": "Sodium." + }, + "sodiumDailyPercentage": { + "description": "Sodium daily percentage.", + "format": "double", + "type": "number" + }, + "starch": { + "$ref": "FloatUnit", + "description": "Starch." + }, + "totalCarbohydrate": { + "$ref": "FloatUnit", + "description": "Total carbohydrate." + }, + "totalCarbohydrateDailyPercentage": { + "description": "Total carbohydrate daily percentage.", + "format": "double", + "type": "number" + }, + "totalFat": { + "$ref": "FloatUnit", + "description": "Total fat." + }, + "totalFatDailyPercentage": { + "description": "Total fat daily percentage.", + "format": "double", + "type": "number" + }, + "totalSugars": { + "$ref": "FloatUnit", + "description": "Total sugars." + }, + "totalSugarsDailyPercentage": { + "description": "Total sugars daily percentage.", + "format": "double", + "type": "number" + }, + "transFat": { + "$ref": "FloatUnit", + "description": "Trans fat." + }, + "transFatDailyPercentage": { + "description": "Trans fat daily percentage.", + "format": "double", + "type": "number" + }, + "vitaminD": { + "$ref": "FloatUnit", + "description": "Vitamin D." + }, + "vitaminDDailyPercentage": { + "description": "Vitamin D daily percentage.", + "format": "double", + "type": "number" + }, + "voluntaryNutritionFact": { + "description": "Voluntary nutrition fact.", + "items": { + "$ref": "VoluntaryNutritionFact" + }, + "type": "array" + } + }, + "type": "object" + }, "Price": { "description": "A price.", "id": "Price", @@ -778,6 +1048,26 @@ } }, "type": "object" + }, + "VoluntaryNutritionFact": { + "description": "Voluntary Nutrition Facts.", + "id": "VoluntaryNutritionFact", + "properties": { + "dailyPercentage": { + "description": "Daily percentage.", + "format": "double", + "type": "number" + }, + "name": { + "description": "Name.", + "type": "string" + }, + "value": { + "$ref": "FloatUnit", + "description": "Value." + } + }, + "type": "object" } }, "servicePath": "", diff --git a/manufacturers/v1/manufacturers-gen.go b/manufacturers/v1/manufacturers-gen.go index db7568f6818..c67a279e0ea 100644 --- a/manufacturers/v1/manufacturers-gen.go +++ b/manufacturers/v1/manufacturers-gen.go @@ -218,6 +218,10 @@ type Attributes struct { // https://support.google.com/manufacturers/answer/6124116#gender. Gender string `json:"gender,omitempty"` + // Grocery: Grocery Attributes. For more information, see + // go/mfc-nutrition-attributes. + Grocery *Grocery `json:"grocery,omitempty"` + // Gtin: The Global Trade Item Number (GTIN) of the product. For more // information, see // https://support.google.com/manufacturers/answer/6124116#gtin. @@ -247,6 +251,10 @@ type Attributes struct { // https://support.google.com/manufacturers/answer/6124116#mpn. Mpn string `json:"mpn,omitempty"` + // Nutrition: Nutrition Attributes. For more information, see + // go/mfc-nutrition-attributes. + Nutrition *Nutrition `json:"nutrition,omitempty"` + // Pattern: The pattern of the product. For more information, see // https://support.google.com/manufacturers/answer/6124116#pattern. Pattern string `json:"pattern,omitempty"` @@ -499,6 +507,117 @@ func (s *FeatureDescription) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// FloatUnit: Combination of float amout and unit. +type FloatUnit struct { + // Amount: amount. + Amount float64 `json:"amount,omitempty"` + + // Unit: unit. + Unit string `json:"unit,omitempty"` + + // ForceSendFields is a list of field names (e.g. "Amount") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "Amount") to include in API + // requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. However, any field with an + // empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *FloatUnit) MarshalJSON() ([]byte, error) { + type NoMethod FloatUnit + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + +func (s *FloatUnit) UnmarshalJSON(data []byte) error { + type NoMethod FloatUnit + var s1 struct { + Amount gensupport.JSONFloat64 `json:"amount"` + *NoMethod + } + s1.NoMethod = (*NoMethod)(s) + if err := json.Unmarshal(data, &s1); err != nil { + return err + } + s.Amount = float64(s1.Amount) + return nil +} + +type Grocery struct { + // ActiveIngredients: Active ingredients. + ActiveIngredients string `json:"activeIngredients,omitempty"` + + // AlcoholByVolume: Alcohol by volume. + AlcoholByVolume float64 `json:"alcoholByVolume,omitempty"` + + // Allergens: Allergens. + Allergens string `json:"allergens,omitempty"` + + // DerivedNutritionClaim: Derived nutrition claim. + DerivedNutritionClaim []string `json:"derivedNutritionClaim,omitempty"` + + // Directions: Directions. + Directions string `json:"directions,omitempty"` + + // Indications: Indications. + Indications string `json:"indications,omitempty"` + + // Ingredients: Ingredients. + Ingredients string `json:"ingredients,omitempty"` + + // NutritionClaim: Nutrition claim. + NutritionClaim []string `json:"nutritionClaim,omitempty"` + + // StorageInstructions: Storage instructions. + StorageInstructions string `json:"storageInstructions,omitempty"` + + // ForceSendFields is a list of field names (e.g. "ActiveIngredients") + // to unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "ActiveIngredients") to + // include in API requests with the JSON null value. By default, fields + // with empty values are omitted from API requests. However, any field + // with an empty value appearing in NullFields will be sent to the + // server as null. It is an error if a field in this list has a + // non-empty value. This may be used to include null fields in Patch + // requests. + NullFields []string `json:"-"` +} + +func (s *Grocery) MarshalJSON() ([]byte, error) { + type NoMethod Grocery + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + +func (s *Grocery) UnmarshalJSON(data []byte) error { + type NoMethod Grocery + var s1 struct { + AlcoholByVolume gensupport.JSONFloat64 `json:"alcoholByVolume"` + *NoMethod + } + s1.NoMethod = (*NoMethod)(s) + if err := json.Unmarshal(data, &s1); err != nil { + return err + } + s.AlcoholByVolume = float64(s1.AlcoholByVolume) + return nil +} + // Image: An image. type Image struct { // ImageUrl: The URL of the image. For crawled images, this is the @@ -669,6 +788,204 @@ func (s *ListProductsResponse) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +type Nutrition struct { + // AddedSugars: Added sugars. + AddedSugars *FloatUnit `json:"addedSugars,omitempty"` + + // AddedSugarsDailyPercentage: Added sugars daily percentage. + AddedSugarsDailyPercentage float64 `json:"addedSugarsDailyPercentage,omitempty"` + + // Calcium: Calcium. + Calcium *FloatUnit `json:"calcium,omitempty"` + + // CalciumDailyPercentage: Calcium daily percentage. + CalciumDailyPercentage float64 `json:"calciumDailyPercentage,omitempty"` + + // Cholesterol: Cholesterol. + Cholesterol *FloatUnit `json:"cholesterol,omitempty"` + + // CholesterolDailyPercentage: Cholesterol daily percentage. + CholesterolDailyPercentage float64 `json:"cholesterolDailyPercentage,omitempty"` + + // DietaryFiber: Dietary fiber. + DietaryFiber *FloatUnit `json:"dietaryFiber,omitempty"` + + // DietaryFiberDailyPercentage: Dietary fiber daily percentage. + DietaryFiberDailyPercentage float64 `json:"dietaryFiberDailyPercentage,omitempty"` + + // Energy: Mandatory Nutrition Facts. Energy. + Energy *FloatUnit `json:"energy,omitempty"` + + // EnergyFromFat: Energy from fat. + EnergyFromFat *FloatUnit `json:"energyFromFat,omitempty"` + + // FolateDailyPercentage: Folate daily percentage. + FolateDailyPercentage float64 `json:"folateDailyPercentage,omitempty"` + + // FolateFolicAcid: Folate folic acid. + FolateFolicAcid *FloatUnit `json:"folateFolicAcid,omitempty"` + + // FolateMcgDfe: Folate mcg DFE. + FolateMcgDfe float64 `json:"folateMcgDfe,omitempty"` + + // Iron: Iron. + Iron *FloatUnit `json:"iron,omitempty"` + + // IronDailyPercentage: Iron daily percentage. + IronDailyPercentage float64 `json:"ironDailyPercentage,omitempty"` + + // MonounsaturatedFat: Monounsaturated fat. + MonounsaturatedFat *FloatUnit `json:"monounsaturatedFat,omitempty"` + + // NutritionFactMeasure: Nutrition fact measure. + NutritionFactMeasure string `json:"nutritionFactMeasure,omitempty"` + + // Polyols: Polyols. + Polyols *FloatUnit `json:"polyols,omitempty"` + + // PolyunsaturatedFat: Polyunsaturated fat. + PolyunsaturatedFat *FloatUnit `json:"polyunsaturatedFat,omitempty"` + + // Potassium: Potassium. + Potassium *FloatUnit `json:"potassium,omitempty"` + + // PotassiumDailyPercentage: Potassium daily percentage. + PotassiumDailyPercentage float64 `json:"potassiumDailyPercentage,omitempty"` + + // PreparedSizeDescription: Prepared size description. + PreparedSizeDescription string `json:"preparedSizeDescription,omitempty"` + + // Protein: Protein. + Protein *FloatUnit `json:"protein,omitempty"` + + // ProteinDailyPercentage: Protein daily percentage. + ProteinDailyPercentage float64 `json:"proteinDailyPercentage,omitempty"` + + // SaturatedFat: Saturated fat. + SaturatedFat *FloatUnit `json:"saturatedFat,omitempty"` + + // SaturatedFatDailyPercentage: Saturated fat daily percentage. + SaturatedFatDailyPercentage float64 `json:"saturatedFatDailyPercentage,omitempty"` + + // ServingSizeDescription: Food Serving Size. Serving size description. + ServingSizeDescription string `json:"servingSizeDescription,omitempty"` + + // ServingSizeMeasure: Serving size measure. + ServingSizeMeasure *FloatUnit `json:"servingSizeMeasure,omitempty"` + + // ServingsPerContainer: Servings per container. + ServingsPerContainer string `json:"servingsPerContainer,omitempty"` + + // Sodium: Sodium. + Sodium *FloatUnit `json:"sodium,omitempty"` + + // SodiumDailyPercentage: Sodium daily percentage. + SodiumDailyPercentage float64 `json:"sodiumDailyPercentage,omitempty"` + + // Starch: Starch. + Starch *FloatUnit `json:"starch,omitempty"` + + // TotalCarbohydrate: Total carbohydrate. + TotalCarbohydrate *FloatUnit `json:"totalCarbohydrate,omitempty"` + + // TotalCarbohydrateDailyPercentage: Total carbohydrate daily + // percentage. + TotalCarbohydrateDailyPercentage float64 `json:"totalCarbohydrateDailyPercentage,omitempty"` + + // TotalFat: Total fat. + TotalFat *FloatUnit `json:"totalFat,omitempty"` + + // TotalFatDailyPercentage: Total fat daily percentage. + TotalFatDailyPercentage float64 `json:"totalFatDailyPercentage,omitempty"` + + // TotalSugars: Total sugars. + TotalSugars *FloatUnit `json:"totalSugars,omitempty"` + + // TotalSugarsDailyPercentage: Total sugars daily percentage. + TotalSugarsDailyPercentage float64 `json:"totalSugarsDailyPercentage,omitempty"` + + // TransFat: Trans fat. + TransFat *FloatUnit `json:"transFat,omitempty"` + + // TransFatDailyPercentage: Trans fat daily percentage. + TransFatDailyPercentage float64 `json:"transFatDailyPercentage,omitempty"` + + // VitaminD: Vitamin D. + VitaminD *FloatUnit `json:"vitaminD,omitempty"` + + // VitaminDDailyPercentage: Vitamin D daily percentage. + VitaminDDailyPercentage float64 `json:"vitaminDDailyPercentage,omitempty"` + + // VoluntaryNutritionFact: Voluntary nutrition fact. + VoluntaryNutritionFact []*VoluntaryNutritionFact `json:"voluntaryNutritionFact,omitempty"` + + // ForceSendFields is a list of field names (e.g. "AddedSugars") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "AddedSugars") to include + // in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. However, any field with + // an empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *Nutrition) MarshalJSON() ([]byte, error) { + type NoMethod Nutrition + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + +func (s *Nutrition) UnmarshalJSON(data []byte) error { + type NoMethod Nutrition + var s1 struct { + AddedSugarsDailyPercentage gensupport.JSONFloat64 `json:"addedSugarsDailyPercentage"` + CalciumDailyPercentage gensupport.JSONFloat64 `json:"calciumDailyPercentage"` + CholesterolDailyPercentage gensupport.JSONFloat64 `json:"cholesterolDailyPercentage"` + DietaryFiberDailyPercentage gensupport.JSONFloat64 `json:"dietaryFiberDailyPercentage"` + FolateDailyPercentage gensupport.JSONFloat64 `json:"folateDailyPercentage"` + FolateMcgDfe gensupport.JSONFloat64 `json:"folateMcgDfe"` + IronDailyPercentage gensupport.JSONFloat64 `json:"ironDailyPercentage"` + PotassiumDailyPercentage gensupport.JSONFloat64 `json:"potassiumDailyPercentage"` + ProteinDailyPercentage gensupport.JSONFloat64 `json:"proteinDailyPercentage"` + SaturatedFatDailyPercentage gensupport.JSONFloat64 `json:"saturatedFatDailyPercentage"` + SodiumDailyPercentage gensupport.JSONFloat64 `json:"sodiumDailyPercentage"` + TotalCarbohydrateDailyPercentage gensupport.JSONFloat64 `json:"totalCarbohydrateDailyPercentage"` + TotalFatDailyPercentage gensupport.JSONFloat64 `json:"totalFatDailyPercentage"` + TotalSugarsDailyPercentage gensupport.JSONFloat64 `json:"totalSugarsDailyPercentage"` + TransFatDailyPercentage gensupport.JSONFloat64 `json:"transFatDailyPercentage"` + VitaminDDailyPercentage gensupport.JSONFloat64 `json:"vitaminDDailyPercentage"` + *NoMethod + } + s1.NoMethod = (*NoMethod)(s) + if err := json.Unmarshal(data, &s1); err != nil { + return err + } + s.AddedSugarsDailyPercentage = float64(s1.AddedSugarsDailyPercentage) + s.CalciumDailyPercentage = float64(s1.CalciumDailyPercentage) + s.CholesterolDailyPercentage = float64(s1.CholesterolDailyPercentage) + s.DietaryFiberDailyPercentage = float64(s1.DietaryFiberDailyPercentage) + s.FolateDailyPercentage = float64(s1.FolateDailyPercentage) + s.FolateMcgDfe = float64(s1.FolateMcgDfe) + s.IronDailyPercentage = float64(s1.IronDailyPercentage) + s.PotassiumDailyPercentage = float64(s1.PotassiumDailyPercentage) + s.ProteinDailyPercentage = float64(s1.ProteinDailyPercentage) + s.SaturatedFatDailyPercentage = float64(s1.SaturatedFatDailyPercentage) + s.SodiumDailyPercentage = float64(s1.SodiumDailyPercentage) + s.TotalCarbohydrateDailyPercentage = float64(s1.TotalCarbohydrateDailyPercentage) + s.TotalFatDailyPercentage = float64(s1.TotalFatDailyPercentage) + s.TotalSugarsDailyPercentage = float64(s1.TotalSugarsDailyPercentage) + s.TransFatDailyPercentage = float64(s1.TransFatDailyPercentage) + s.VitaminDDailyPercentage = float64(s1.VitaminDDailyPercentage) + return nil +} + // Price: A price. type Price struct { // Amount: The numeric value of the price. @@ -802,6 +1119,55 @@ func (s *ProductDetail) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// VoluntaryNutritionFact: Voluntary Nutrition Facts. +type VoluntaryNutritionFact struct { + // DailyPercentage: Daily percentage. + DailyPercentage float64 `json:"dailyPercentage,omitempty"` + + // Name: Name. + Name string `json:"name,omitempty"` + + // Value: Value. + Value *FloatUnit `json:"value,omitempty"` + + // ForceSendFields is a list of field names (e.g. "DailyPercentage") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "DailyPercentage") to + // include in API requests with the JSON null value. By default, fields + // with empty values are omitted from API requests. However, any field + // with an empty value appearing in NullFields will be sent to the + // server as null. It is an error if a field in this list has a + // non-empty value. This may be used to include null fields in Patch + // requests. + NullFields []string `json:"-"` +} + +func (s *VoluntaryNutritionFact) MarshalJSON() ([]byte, error) { + type NoMethod VoluntaryNutritionFact + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + +func (s *VoluntaryNutritionFact) UnmarshalJSON(data []byte) error { + type NoMethod VoluntaryNutritionFact + var s1 struct { + DailyPercentage gensupport.JSONFloat64 `json:"dailyPercentage"` + *NoMethod + } + s1.NoMethod = (*NoMethod)(s) + if err := json.Unmarshal(data, &s1); err != nil { + return err + } + s.DailyPercentage = float64(s1.DailyPercentage) + return nil +} + // method id "manufacturers.accounts.products.delete": type AccountsProductsDeleteCall struct { diff --git a/ondemandscanning/v1/ondemandscanning-api.json b/ondemandscanning/v1/ondemandscanning-api.json index 1894f29118a..00f37f8f444 100644 --- a/ondemandscanning/v1/ondemandscanning-api.json +++ b/ondemandscanning/v1/ondemandscanning-api.json @@ -339,7 +339,7 @@ } } }, - "revision": "20220730", + "revision": "20220806", "rootUrl": "https://ondemandscanning.googleapis.com/", "schemas": { "AliasContext": { @@ -956,8 +956,8 @@ "ANALYSIS_STATUS_UNSPECIFIED", "PENDING", "SCANNING", - "COMPLETE", "FINISHED_SUCCESS", + "COMPLETE", "FINISHED_FAILED", "FINISHED_UNSUPPORTED" ], @@ -965,8 +965,8 @@ "Unknown.", "Resource is known but no action has been taken yet.", "Resource is being analyzed.", - "Analysis has completed", "Analysis has finished successfully.", + "Analysis has completed", "Analysis has finished unsuccessfully, the analysis itself is in a bad state.", "The resource is known not to be supported." ], diff --git a/ondemandscanning/v1/ondemandscanning-gen.go b/ondemandscanning/v1/ondemandscanning-gen.go index 3f943d107a0..b0cab62516a 100644 --- a/ondemandscanning/v1/ondemandscanning-gen.go +++ b/ondemandscanning/v1/ondemandscanning-gen.go @@ -1073,8 +1073,8 @@ type DiscoveryOccurrence struct { // "ANALYSIS_STATUS_UNSPECIFIED" - Unknown. // "PENDING" - Resource is known but no action has been taken yet. // "SCANNING" - Resource is being analyzed. - // "COMPLETE" - Analysis has completed // "FINISHED_SUCCESS" - Analysis has finished successfully. + // "COMPLETE" - Analysis has completed // "FINISHED_FAILED" - Analysis has finished unsuccessfully, the // analysis itself is in a bad state. // "FINISHED_UNSUPPORTED" - The resource is known not to be supported. diff --git a/ondemandscanning/v1beta1/ondemandscanning-api.json b/ondemandscanning/v1beta1/ondemandscanning-api.json index 11e2a348d8d..1c12a342de2 100644 --- a/ondemandscanning/v1beta1/ondemandscanning-api.json +++ b/ondemandscanning/v1beta1/ondemandscanning-api.json @@ -339,7 +339,7 @@ } } }, - "revision": "20220730", + "revision": "20220806", "rootUrl": "https://ondemandscanning.googleapis.com/", "schemas": { "AliasContext": { @@ -952,8 +952,8 @@ "ANALYSIS_STATUS_UNSPECIFIED", "PENDING", "SCANNING", - "COMPLETE", "FINISHED_SUCCESS", + "COMPLETE", "FINISHED_FAILED", "FINISHED_UNSUPPORTED" ], @@ -961,8 +961,8 @@ "Unknown.", "Resource is known but no action has been taken yet.", "Resource is being analyzed.", - "Analysis has completed", "Analysis has finished successfully.", + "Analysis has completed", "Analysis has finished unsuccessfully, the analysis itself is in a bad state.", "The resource is known not to be supported." ], diff --git a/ondemandscanning/v1beta1/ondemandscanning-gen.go b/ondemandscanning/v1beta1/ondemandscanning-gen.go index 743f602a063..cc52f0c1d78 100644 --- a/ondemandscanning/v1beta1/ondemandscanning-gen.go +++ b/ondemandscanning/v1beta1/ondemandscanning-gen.go @@ -1067,8 +1067,8 @@ type DiscoveryOccurrence struct { // "ANALYSIS_STATUS_UNSPECIFIED" - Unknown. // "PENDING" - Resource is known but no action has been taken yet. // "SCANNING" - Resource is being analyzed. - // "COMPLETE" - Analysis has completed // "FINISHED_SUCCESS" - Analysis has finished successfully. + // "COMPLETE" - Analysis has completed // "FINISHED_FAILED" - Analysis has finished unsuccessfully, the // analysis itself is in a bad state. // "FINISHED_UNSUPPORTED" - The resource is known not to be supported. diff --git a/policysimulator/v1/policysimulator-api.json b/policysimulator/v1/policysimulator-api.json index f8050cb29ce..5b9102e408b 100644 --- a/policysimulator/v1/policysimulator-api.json +++ b/policysimulator/v1/policysimulator-api.json @@ -493,7 +493,7 @@ } } }, - "revision": "20220429", + "revision": "20220806", "rootUrl": "https://policysimulator.googleapis.com/", "schemas": { "GoogleCloudPolicysimulatorV1AccessStateDiff": { @@ -1111,7 +1111,7 @@ "description": "The condition that is associated with this binding. If the condition evaluates to `true`, then this binding applies to the current request. If the condition evaluates to `false`, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. To learn which resources support conditions in their IAM policies, see the [IAM documentation](https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", + "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a Google service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: An identifier for a [Kubernetes service account](https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", "items": { "type": "string" }, diff --git a/policysimulator/v1/policysimulator-gen.go b/policysimulator/v1/policysimulator-gen.go index 0dbae60b791..9d87dc41b02 100644 --- a/policysimulator/v1/policysimulator-gen.go +++ b/policysimulator/v1/policysimulator-gen.go @@ -1320,16 +1320,20 @@ type GoogleIamV1Binding struct { // who is authenticated with a Google account or a service account. * // `user:{emailid}`: An email address that represents a specific Google // account. For example, `alice@example.com` . * - // `serviceAccount:{emailid}`: An email address that represents a + // `serviceAccount:{emailid}`: An email address that represents a Google // service account. For example, - // `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An - // email address that represents a Google group. For example, - // `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An - // email address (plus unique identifier) representing a user that has - // been recently deleted. For example, - // `alice@example.com?uid=123456789012345678901`. If the user is - // recovered, this value reverts to `user:{emailid}` and the recovered - // user retains the role in the binding. * + // `my-other-app@appspot.gserviceaccount.com`. * + // `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. * + // `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus + // unique identifier) representing a user that has been recently + // deleted. For example, `alice@example.com?uid=123456789012345678901`. + // If the user is recovered, this value reverts to `user:{emailid}` and + // the recovered user retains the role in the binding. * // `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address // (plus unique identifier) representing a service account that has been // recently deleted. For example, diff --git a/policysimulator/v1beta1/policysimulator-api.json b/policysimulator/v1beta1/policysimulator-api.json index 2d6ac00039f..a77eefb84ee 100644 --- a/policysimulator/v1beta1/policysimulator-api.json +++ b/policysimulator/v1beta1/policysimulator-api.json @@ -493,7 +493,7 @@ } } }, - "revision": "20220429", + "revision": "20220806", "rootUrl": "https://policysimulator.googleapis.com/", "schemas": { "GoogleCloudPolicysimulatorV1Replay": { @@ -1111,7 +1111,7 @@ "description": "The condition that is associated with this binding. If the condition evaluates to `true`, then this binding applies to the current request. If the condition evaluates to `false`, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. To learn which resources support conditions in their IAM policies, see the [IAM documentation](https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", + "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a Google service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: An identifier for a [Kubernetes service account](https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", "items": { "type": "string" }, diff --git a/policysimulator/v1beta1/policysimulator-gen.go b/policysimulator/v1beta1/policysimulator-gen.go index 7c5284f4998..01a62b1da18 100644 --- a/policysimulator/v1beta1/policysimulator-gen.go +++ b/policysimulator/v1beta1/policysimulator-gen.go @@ -1321,16 +1321,20 @@ type GoogleIamV1Binding struct { // who is authenticated with a Google account or a service account. * // `user:{emailid}`: An email address that represents a specific Google // account. For example, `alice@example.com` . * - // `serviceAccount:{emailid}`: An email address that represents a + // `serviceAccount:{emailid}`: An email address that represents a Google // service account. For example, - // `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An - // email address that represents a Google group. For example, - // `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An - // email address (plus unique identifier) representing a user that has - // been recently deleted. For example, - // `alice@example.com?uid=123456789012345678901`. If the user is - // recovered, this value reverts to `user:{emailid}` and the recovered - // user retains the role in the binding. * + // `my-other-app@appspot.gserviceaccount.com`. * + // `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. * + // `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus + // unique identifier) representing a user that has been recently + // deleted. For example, `alice@example.com?uid=123456789012345678901`. + // If the user is recovered, this value reverts to `user:{emailid}` and + // the recovered user retains the role in the binding. * // `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address // (plus unique identifier) representing a service account that has been // recently deleted. For example, diff --git a/run/v1/run-api.json b/run/v1/run-api.json index 2f9247e2e2e..b52e5646622 100644 --- a/run/v1/run-api.json +++ b/run/v1/run-api.json @@ -407,6 +407,34 @@ }, "executions": { "methods": { + "cancel": { + "description": "Cancel an execution.", + "flatPath": "apis/run.googleapis.com/v1/namespaces/{namespacesId}/executions/{executionsId}:cancel", + "httpMethod": "POST", + "id": "run.namespaces.executions.cancel", + "parameterOrder": [ + "name" + ], + "parameters": { + "name": { + "description": "Required. The name of the execution to cancel. Replace {namespace} with the project ID or number. It takes the form namespaces/{namespace}. For example: namespaces/PROJECT_ID", + "location": "path", + "pattern": "^namespaces/[^/]+/executions/[^/]+$", + "required": true, + "type": "string" + } + }, + "path": "apis/run.googleapis.com/v1/{+name}:cancel", + "request": { + "$ref": "CancelExecutionRequest" + }, + "response": { + "$ref": "Execution" + }, + "scopes": [ + "https://www.googleapis.com/auth/cloud-platform" + ] + }, "delete": { "description": "Delete an execution.", "flatPath": "apis/run.googleapis.com/v1/namespaces/{namespacesId}/executions/{executionsId}", @@ -2261,7 +2289,7 @@ } } }, - "revision": "20220731", + "revision": "20220807", "rootUrl": "https://run.googleapis.com/", "schemas": { "Addressable": { @@ -2346,7 +2374,7 @@ "description": "The condition that is associated with this binding. If the condition evaluates to `true`, then this binding applies to the current request. If the condition evaluates to `false`, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. To learn which resources support conditions in their IAM policies, see the [IAM documentation](https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", + "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a Google service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: An identifier for a [Kubernetes service account](https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", "items": { "type": "string" }, @@ -2359,6 +2387,12 @@ }, "type": "object" }, + "CancelExecutionRequest": { + "description": "Request message for cancelling an execution.", + "id": "CancelExecutionRequest", + "properties": {}, + "type": "object" + }, "ConfigMapEnvSource": { "description": "Not supported by Cloud Run ConfigMapEnvSource selects a ConfigMap to populate the environment variables with. The contents of the target ConfigMap's Data field will represent the key-value pairs as environment variables.", "id": "ConfigMapEnvSource", @@ -2929,7 +2963,7 @@ "type": "object" }, "GRPCAction": { - "description": "Not supported by Cloud Run GRPCAction describes an action involving a GRPC port.", + "description": "GRPCAction describes an action involving a GRPC port.", "id": "GRPCAction", "properties": { "port": { @@ -3004,7 +3038,7 @@ "type": "object" }, "HTTPGetAction": { - "description": "Not supported by Cloud Run HTTPGetAction describes an action based on HTTP Get requests.", + "description": "HTTPGetAction describes an action based on HTTP Get requests.", "id": "HTTPGetAction", "properties": { "host": { @@ -3030,7 +3064,7 @@ "type": "object" }, "HTTPHeader": { - "description": "Not supported by Cloud Run HTTPHeader describes a custom header to be used in HTTP probes", + "description": "HTTPHeader describes a custom header to be used in HTTP probes", "id": "HTTPHeader", "properties": { "name": { @@ -4210,7 +4244,7 @@ "type": "object" }, "TCPSocketAction": { - "description": "Not supported by Cloud Run TCPSocketAction describes an action based on opening a socket", + "description": "TCPSocketAction describes an action based on opening a socket", "id": "TCPSocketAction", "properties": { "host": { diff --git a/run/v1/run-gen.go b/run/v1/run-gen.go index 32e2a135181..8e71e2d84d9 100644 --- a/run/v1/run-gen.go +++ b/run/v1/run-gen.go @@ -555,16 +555,20 @@ type Binding struct { // who is authenticated with a Google account or a service account. * // `user:{emailid}`: An email address that represents a specific Google // account. For example, `alice@example.com` . * - // `serviceAccount:{emailid}`: An email address that represents a + // `serviceAccount:{emailid}`: An email address that represents a Google // service account. For example, - // `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An - // email address that represents a Google group. For example, - // `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An - // email address (plus unique identifier) representing a user that has - // been recently deleted. For example, - // `alice@example.com?uid=123456789012345678901`. If the user is - // recovered, this value reverts to `user:{emailid}` and the recovered - // user retains the role in the binding. * + // `my-other-app@appspot.gserviceaccount.com`. * + // `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. * + // `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus + // unique identifier) representing a user that has been recently + // deleted. For example, `alice@example.com?uid=123456789012345678901`. + // If the user is recovered, this value reverts to `user:{emailid}` and + // the recovered user retains the role in the binding. * // `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address // (plus unique identifier) representing a service account that has been // recently deleted. For example, @@ -608,6 +612,10 @@ func (s *Binding) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// CancelExecutionRequest: Request message for cancelling an execution. +type CancelExecutionRequest struct { +} + // ConfigMapEnvSource: Not supported by Cloud Run ConfigMapEnvSource // selects a ConfigMap to populate the environment variables with. The // contents of the target ConfigMap's Data field will represent the @@ -1671,8 +1679,7 @@ func (s *Expr) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } -// GRPCAction: Not supported by Cloud Run GRPCAction describes an action -// involving a GRPC port. +// GRPCAction: GRPCAction describes an action involving a GRPC port. type GRPCAction struct { // Port: Port number of the gRPC service. Number must be in the range 1 // to 65535. @@ -1804,8 +1811,8 @@ func (s *GoogleRpcStatus) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } -// HTTPGetAction: Not supported by Cloud Run HTTPGetAction describes an -// action based on HTTP Get requests. +// HTTPGetAction: HTTPGetAction describes an action based on HTTP Get +// requests. type HTTPGetAction struct { // Host: (Optional) Host name to connect to, defaults to the pod IP. You // probably want to set "Host" in httpHeaders instead. @@ -1845,8 +1852,8 @@ func (s *HTTPGetAction) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } -// HTTPHeader: Not supported by Cloud Run HTTPHeader describes a custom -// header to be used in HTTP probes +// HTTPHeader: HTTPHeader describes a custom header to be used in HTTP +// probes type HTTPHeader struct { // Name: The header field name Name string `json:"name,omitempty"` @@ -4051,8 +4058,8 @@ func (s *StatusDetails) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } -// TCPSocketAction: Not supported by Cloud Run TCPSocketAction describes -// an action based on opening a socket +// TCPSocketAction: TCPSocketAction describes an action based on opening +// a socket type TCPSocketAction struct { // Host: (Optional) Optional: Host name to connect to, defaults to the // pod IP. @@ -5846,6 +5853,150 @@ func (c *NamespacesDomainmappingsListCall) Do(opts ...googleapi.CallOption) (*Li } +// method id "run.namespaces.executions.cancel": + +type NamespacesExecutionsCancelCall struct { + s *APIService + name string + cancelexecutionrequest *CancelExecutionRequest + urlParams_ gensupport.URLParams + ctx_ context.Context + header_ http.Header +} + +// Cancel: Cancel an execution. +// +// - name: The name of the execution to cancel. Replace {namespace} with +// the project ID or number. It takes the form namespaces/{namespace}. +// For example: namespaces/PROJECT_ID. +func (r *NamespacesExecutionsService) Cancel(name string, cancelexecutionrequest *CancelExecutionRequest) *NamespacesExecutionsCancelCall { + c := &NamespacesExecutionsCancelCall{s: r.s, urlParams_: make(gensupport.URLParams)} + c.name = name + c.cancelexecutionrequest = cancelexecutionrequest + return c +} + +// Fields allows partial responses to be retrieved. See +// https://developers.google.com/gdata/docs/2.0/basics#PartialResponse +// for more information. +func (c *NamespacesExecutionsCancelCall) Fields(s ...googleapi.Field) *NamespacesExecutionsCancelCall { + c.urlParams_.Set("fields", googleapi.CombineFields(s)) + return c +} + +// Context sets the context to be used in this call's Do method. Any +// pending HTTP request will be aborted if the provided context is +// canceled. +func (c *NamespacesExecutionsCancelCall) Context(ctx context.Context) *NamespacesExecutionsCancelCall { + c.ctx_ = ctx + return c +} + +// Header returns an http.Header that can be modified by the caller to +// add HTTP headers to the request. +func (c *NamespacesExecutionsCancelCall) Header() http.Header { + if c.header_ == nil { + c.header_ = make(http.Header) + } + return c.header_ +} + +func (c *NamespacesExecutionsCancelCall) doRequest(alt string) (*http.Response, error) { + reqHeaders := make(http.Header) + reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/"+internal.Version) + for k, v := range c.header_ { + reqHeaders[k] = v + } + reqHeaders.Set("User-Agent", c.s.userAgent()) + var body io.Reader = nil + body, err := googleapi.WithoutDataWrapper.JSONReader(c.cancelexecutionrequest) + if err != nil { + return nil, err + } + reqHeaders.Set("Content-Type", "application/json") + c.urlParams_.Set("alt", alt) + c.urlParams_.Set("prettyPrint", "false") + urls := googleapi.ResolveRelative(c.s.BasePath, "apis/run.googleapis.com/v1/{+name}:cancel") + urls += "?" + c.urlParams_.Encode() + req, err := http.NewRequest("POST", 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 "run.namespaces.executions.cancel" call. +// Exactly one of *Execution or error will be non-nil. Any non-2xx +// status code is an error. Response headers are in either +// *Execution.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 *NamespacesExecutionsCancelCall) Do(opts ...googleapi.CallOption) (*Execution, 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, &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, err + } + ret := &Execution{ + 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 + // { + // "description": "Cancel an execution.", + // "flatPath": "apis/run.googleapis.com/v1/namespaces/{namespacesId}/executions/{executionsId}:cancel", + // "httpMethod": "POST", + // "id": "run.namespaces.executions.cancel", + // "parameterOrder": [ + // "name" + // ], + // "parameters": { + // "name": { + // "description": "Required. The name of the execution to cancel. Replace {namespace} with the project ID or number. It takes the form namespaces/{namespace}. For example: namespaces/PROJECT_ID", + // "location": "path", + // "pattern": "^namespaces/[^/]+/executions/[^/]+$", + // "required": true, + // "type": "string" + // } + // }, + // "path": "apis/run.googleapis.com/v1/{+name}:cancel", + // "request": { + // "$ref": "CancelExecutionRequest" + // }, + // "response": { + // "$ref": "Execution" + // }, + // "scopes": [ + // "https://www.googleapis.com/auth/cloud-platform" + // ] + // } + +} + // method id "run.namespaces.executions.delete": type NamespacesExecutionsDeleteCall struct { diff --git a/run/v2/run-api.json b/run/v2/run-api.json index b267778133f..9713929d91e 100644 --- a/run/v2/run-api.json +++ b/run/v2/run-api.json @@ -1064,7 +1064,7 @@ } } }, - "revision": "20220731", + "revision": "20220807", "rootUrl": "https://run.googleapis.com/", "schemas": { "GoogleCloudRunV2BinaryAuthorization": { @@ -2809,7 +2809,7 @@ "description": "The condition that is associated with this binding. If the condition evaluates to `true`, then this binding applies to the current request. If the condition evaluates to `false`, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. To learn which resources support conditions in their IAM policies, see the [IAM documentation](https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", + "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a Google service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: An identifier for a [Kubernetes service account](https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", "items": { "type": "string" }, diff --git a/run/v2/run-gen.go b/run/v2/run-gen.go index a2647cb706f..49d3557f260 100644 --- a/run/v2/run-gen.go +++ b/run/v2/run-gen.go @@ -2652,16 +2652,20 @@ type GoogleIamV1Binding struct { // who is authenticated with a Google account or a service account. * // `user:{emailid}`: An email address that represents a specific Google // account. For example, `alice@example.com` . * - // `serviceAccount:{emailid}`: An email address that represents a + // `serviceAccount:{emailid}`: An email address that represents a Google // service account. For example, - // `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An - // email address that represents a Google group. For example, - // `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An - // email address (plus unique identifier) representing a user that has - // been recently deleted. For example, - // `alice@example.com?uid=123456789012345678901`. If the user is - // recovered, this value reverts to `user:{emailid}` and the recovered - // user retains the role in the binding. * + // `my-other-app@appspot.gserviceaccount.com`. * + // `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. * + // `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus + // unique identifier) representing a user that has been recently + // deleted. For example, `alice@example.com?uid=123456789012345678901`. + // If the user is recovered, this value reverts to `user:{emailid}` and + // the recovered user retains the role in the binding. * // `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address // (plus unique identifier) representing a service account that has been // recently deleted. For example, diff --git a/runtimeconfig/v1beta1/runtimeconfig-api.json b/runtimeconfig/v1beta1/runtimeconfig-api.json index 219383a16cb..9d3dbf8baaf 100644 --- a/runtimeconfig/v1beta1/runtimeconfig-api.json +++ b/runtimeconfig/v1beta1/runtimeconfig-api.json @@ -805,7 +805,7 @@ } } }, - "revision": "20220502", + "revision": "20220808", "rootUrl": "https://runtimeconfig.googleapis.com/", "schemas": { "Binding": { @@ -817,7 +817,7 @@ "description": "The condition that is associated with this binding. If the condition evaluates to `true`, then this binding applies to the current request. If the condition evaluates to `false`, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. To learn which resources support conditions in their IAM policies, see the [IAM documentation](https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", + "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a Google service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: An identifier for a [Kubernetes service account](https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", "items": { "type": "string" }, diff --git a/runtimeconfig/v1beta1/runtimeconfig-gen.go b/runtimeconfig/v1beta1/runtimeconfig-gen.go index edaeac2bd80..7a3fe57e382 100644 --- a/runtimeconfig/v1beta1/runtimeconfig-gen.go +++ b/runtimeconfig/v1beta1/runtimeconfig-gen.go @@ -222,16 +222,20 @@ type Binding struct { // who is authenticated with a Google account or a service account. * // `user:{emailid}`: An email address that represents a specific Google // account. For example, `alice@example.com` . * - // `serviceAccount:{emailid}`: An email address that represents a + // `serviceAccount:{emailid}`: An email address that represents a Google // service account. For example, - // `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An - // email address that represents a Google group. For example, - // `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An - // email address (plus unique identifier) representing a user that has - // been recently deleted. For example, - // `alice@example.com?uid=123456789012345678901`. If the user is - // recovered, this value reverts to `user:{emailid}` and the recovered - // user retains the role in the binding. * + // `my-other-app@appspot.gserviceaccount.com`. * + // `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. * + // `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus + // unique identifier) representing a user that has been recently + // deleted. For example, `alice@example.com?uid=123456789012345678901`. + // If the user is recovered, this value reverts to `user:{emailid}` and + // the recovered user retains the role in the binding. * // `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address // (plus unique identifier) representing a service account that has been // recently deleted. For example, diff --git a/securitycenter/v1/securitycenter-api.json b/securitycenter/v1/securitycenter-api.json index 9120b167c95..e2a923d5d2f 100644 --- a/securitycenter/v1/securitycenter-api.json +++ b/securitycenter/v1/securitycenter-api.json @@ -3058,7 +3058,7 @@ } } }, - "revision": "20220728", + "revision": "20220809", "rootUrl": "https://securitycenter.googleapis.com/", "schemas": { "Access": { @@ -3278,7 +3278,7 @@ "description": "The condition that is associated with this binding. If the condition evaluates to `true`, then this binding applies to the current request. If the condition evaluates to `false`, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. To learn which resources support conditions in their IAM policies, see the [IAM documentation](https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", + "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a Google service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: An identifier for a [Kubernetes service account](https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", "items": { "type": "string" }, @@ -3586,6 +3586,36 @@ }, "type": "object" }, + "Database": { + "description": "Represents database access information, such as queries. A database may be a sub-resource of an instance (as in the case of CloudSQL instances or Cloud Spanner instances), or the database instance itself. Some database resources may not have the full resource name populated because these resource types are not yet supported by Cloud Asset Inventory (e.g. CloudSQL databases). In these cases only the display name will be provided.", + "id": "Database", + "properties": { + "displayName": { + "description": "The human readable name of the database the user connected to.", + "type": "string" + }, + "grantees": { + "description": "The target usernames/roles/groups of a SQL privilege grant (not an IAM policy change).", + "items": { + "type": "string" + }, + "type": "array" + }, + "name": { + "description": "The full resource name of the database the user connected to, if it is supported by CAI. (https://google.aip.dev/122#full-resource-names)", + "type": "string" + }, + "query": { + "description": "The SQL statement associated with the relevant access.", + "type": "string" + }, + "userName": { + "description": "The username used to connect to the DB. This may not necessarily be an IAM principal, and has no required format.", + "type": "string" + } + }, + "type": "object" + }, "Detection": { "description": "Memory hash detection contributing to the binary family match.", "id": "Detection", @@ -3768,6 +3798,10 @@ "format": "google-datetime", "type": "string" }, + "database": { + "$ref": "Database", + "description": "Database associated with the finding." + }, "description": { "description": "Contains more detail about the finding.", "type": "string" diff --git a/securitycenter/v1/securitycenter-gen.go b/securitycenter/v1/securitycenter-gen.go index 99a832d89ea..c24d87171bb 100644 --- a/securitycenter/v1/securitycenter-gen.go +++ b/securitycenter/v1/securitycenter-gen.go @@ -809,16 +809,20 @@ type Binding struct { // who is authenticated with a Google account or a service account. * // `user:{emailid}`: An email address that represents a specific Google // account. For example, `alice@example.com` . * - // `serviceAccount:{emailid}`: An email address that represents a + // `serviceAccount:{emailid}`: An email address that represents a Google // service account. For example, - // `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An - // email address that represents a Google group. For example, - // `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An - // email address (plus unique identifier) representing a user that has - // been recently deleted. For example, - // `alice@example.com?uid=123456789012345678901`. If the user is - // recovered, this value reverts to `user:{emailid}` and the recovered - // user retains the role in the binding. * + // `my-other-app@appspot.gserviceaccount.com`. * + // `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. * + // `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus + // unique identifier) representing a user that has been recently + // deleted. For example, `alice@example.com?uid=123456789012345678901`. + // If the user is recovered, this value reverts to `user:{emailid}` and + // the recovered user retains the role in the binding. * // `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address // (plus unique identifier) representing a service account that has been // recently deleted. For example, @@ -1288,6 +1292,57 @@ func (s *Cvssv3) UnmarshalJSON(data []byte) error { return nil } +// Database: Represents database access information, such as queries. A +// database may be a sub-resource of an instance (as in the case of +// CloudSQL instances or Cloud Spanner instances), or the database +// instance itself. Some database resources may not have the full +// resource name populated because these resource types are not yet +// supported by Cloud Asset Inventory (e.g. CloudSQL databases). In +// these cases only the display name will be provided. +type Database struct { + // DisplayName: The human readable name of the database the user + // connected to. + DisplayName string `json:"displayName,omitempty"` + + // Grantees: The target usernames/roles/groups of a SQL privilege grant + // (not an IAM policy change). + Grantees []string `json:"grantees,omitempty"` + + // Name: The full resource name of the database the user connected to, + // if it is supported by CAI. + // (https://google.aip.dev/122#full-resource-names) + Name string `json:"name,omitempty"` + + // Query: The SQL statement associated with the relevant access. + Query string `json:"query,omitempty"` + + // UserName: The username used to connect to the DB. This may not + // necessarily be an IAM principal, and has no required format. + UserName string `json:"userName,omitempty"` + + // ForceSendFields is a list of field names (e.g. "DisplayName") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "DisplayName") to include + // in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. However, any field with + // an empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *Database) MarshalJSON() ([]byte, error) { + type NoMethod Database + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // Detection: Memory hash detection contributing to the binary family // match. type Detection struct { @@ -1612,6 +1667,9 @@ type Finding struct { // Command Center. CreateTime string `json:"createTime,omitempty"` + // Database: Database associated with the finding. + Database *Database `json:"database,omitempty"` + // Description: Contains more detail about the finding. Description string `json:"description,omitempty"` diff --git a/securitycenter/v1beta1/securitycenter-api.json b/securitycenter/v1beta1/securitycenter-api.json index 4fd02b351e7..8aa85cbc0ff 100644 --- a/securitycenter/v1beta1/securitycenter-api.json +++ b/securitycenter/v1beta1/securitycenter-api.json @@ -896,7 +896,7 @@ } } }, - "revision": "20220728", + "revision": "20220809", "rootUrl": "https://securitycenter.googleapis.com/", "schemas": { "Access": { @@ -1101,7 +1101,7 @@ "description": "The condition that is associated with this binding. If the condition evaluates to `true`, then this binding applies to the current request. If the condition evaluates to `false`, then this binding does not apply to the current request. However, a different role binding might grant the same role to one or more of the principals in this binding. To learn which resources support conditions in their IAM policies, see the [IAM documentation](https://cloud.google.com/iam/help/conditions/resource-policies)." }, "members": { - "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", + "description": "Specifies the principals requesting access for a Google Cloud resource. `members` can have the following values: * `allUsers`: A special identifier that represents anyone who is on the internet; with or without a Google account. * `allAuthenticatedUsers`: A special identifier that represents anyone who is authenticated with a Google account or a service account. * `user:{emailid}`: An email address that represents a specific Google account. For example, `alice@example.com` . * `serviceAccount:{emailid}`: An email address that represents a Google service account. For example, `my-other-app@appspot.gserviceaccount.com`. * `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: An identifier for a [Kubernetes service account](https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. * `group:{emailid}`: An email address that represents a Google group. For example, `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a user that has been recently deleted. For example, `alice@example.com?uid=123456789012345678901`. If the user is recovered, this value reverts to `user:{emailid}` and the recovered user retains the role in the binding. * `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a service account that has been recently deleted. For example, `my-other-app@appspot.gserviceaccount.com?uid=123456789012345678901`. If the service account is undeleted, this value reverts to `serviceAccount:{emailid}` and the undeleted service account retains the role in the binding. * `deleted:group:{emailid}?uid={uniqueid}`: An email address (plus unique identifier) representing a Google group that has been recently deleted. For example, `admins@example.com?uid=123456789012345678901`. If the group is recovered, this value reverts to `group:{emailid}` and the recovered group retains the role in the binding. * `domain:{domain}`: The G Suite domain (primary) that represents all the users of that domain. For example, `google.com` or `example.com`. ", "items": { "type": "string" }, @@ -1400,6 +1400,36 @@ }, "type": "object" }, + "Database": { + "description": "Represents database access information, such as queries. A database may be a sub-resource of an instance (as in the case of CloudSQL instances or Cloud Spanner instances), or the database instance itself. Some database resources may not have the full resource name populated because these resource types are not yet supported by Cloud Asset Inventory (e.g. CloudSQL databases). In these cases only the display name will be provided.", + "id": "Database", + "properties": { + "displayName": { + "description": "The human readable name of the database the user connected to.", + "type": "string" + }, + "grantees": { + "description": "The target usernames/roles/groups of a SQL privilege grant (not an IAM policy change).", + "items": { + "type": "string" + }, + "type": "array" + }, + "name": { + "description": "The full resource name of the database the user connected to, if it is supported by CAI. (https://google.aip.dev/122#full-resource-names)", + "type": "string" + }, + "query": { + "description": "The SQL statement associated with the relevant access.", + "type": "string" + }, + "userName": { + "description": "The username used to connect to the DB. This may not necessarily be an IAM principal, and has no required format.", + "type": "string" + } + }, + "type": "object" + }, "Detection": { "description": "Memory hash detection contributing to the binary family match.", "id": "Detection", @@ -1582,6 +1612,10 @@ "format": "google-datetime", "type": "string" }, + "database": { + "$ref": "Database", + "description": "Database associated with the finding." + }, "description": { "description": "Contains more detail about the finding.", "type": "string" diff --git a/securitycenter/v1beta1/securitycenter-gen.go b/securitycenter/v1beta1/securitycenter-gen.go index e718aff37b2..861bf665f5f 100644 --- a/securitycenter/v1beta1/securitycenter-gen.go +++ b/securitycenter/v1beta1/securitycenter-gen.go @@ -540,16 +540,20 @@ type Binding struct { // who is authenticated with a Google account or a service account. * // `user:{emailid}`: An email address that represents a specific Google // account. For example, `alice@example.com` . * - // `serviceAccount:{emailid}`: An email address that represents a + // `serviceAccount:{emailid}`: An email address that represents a Google // service account. For example, - // `my-other-app@appspot.gserviceaccount.com`. * `group:{emailid}`: An - // email address that represents a Google group. For example, - // `admins@example.com`. * `deleted:user:{emailid}?uid={uniqueid}`: An - // email address (plus unique identifier) representing a user that has - // been recently deleted. For example, - // `alice@example.com?uid=123456789012345678901`. If the user is - // recovered, this value reverts to `user:{emailid}` and the recovered - // user retains the role in the binding. * + // `my-other-app@appspot.gserviceaccount.com`. * + // `serviceAccount:{projectid}.svc.id.goog[{namespace}/{kubernetes-sa}]`: + // An identifier for a Kubernetes service account + // (https://cloud.google.com/kubernetes-engine/docs/how-to/kubernetes-service-accounts). + // For example, `my-project.svc.id.goog[my-namespace/my-kubernetes-sa]`. + // * `group:{emailid}`: An email address that represents a Google group. + // For example, `admins@example.com`. * + // `deleted:user:{emailid}?uid={uniqueid}`: An email address (plus + // unique identifier) representing a user that has been recently + // deleted. For example, `alice@example.com?uid=123456789012345678901`. + // If the user is recovered, this value reverts to `user:{emailid}` and + // the recovered user retains the role in the binding. * // `deleted:serviceAccount:{emailid}?uid={uniqueid}`: An email address // (plus unique identifier) representing a service account that has been // recently deleted. For example, @@ -979,6 +983,57 @@ func (s *Cvssv3) UnmarshalJSON(data []byte) error { return nil } +// Database: Represents database access information, such as queries. A +// database may be a sub-resource of an instance (as in the case of +// CloudSQL instances or Cloud Spanner instances), or the database +// instance itself. Some database resources may not have the full +// resource name populated because these resource types are not yet +// supported by Cloud Asset Inventory (e.g. CloudSQL databases). In +// these cases only the display name will be provided. +type Database struct { + // DisplayName: The human readable name of the database the user + // connected to. + DisplayName string `json:"displayName,omitempty"` + + // Grantees: The target usernames/roles/groups of a SQL privilege grant + // (not an IAM policy change). + Grantees []string `json:"grantees,omitempty"` + + // Name: The full resource name of the database the user connected to, + // if it is supported by CAI. + // (https://google.aip.dev/122#full-resource-names) + Name string `json:"name,omitempty"` + + // Query: The SQL statement associated with the relevant access. + Query string `json:"query,omitempty"` + + // UserName: The username used to connect to the DB. This may not + // necessarily be an IAM principal, and has no required format. + UserName string `json:"userName,omitempty"` + + // ForceSendFields is a list of field names (e.g. "DisplayName") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "DisplayName") to include + // in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. However, any field with + // an empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *Database) MarshalJSON() ([]byte, error) { + type NoMethod Database + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // Detection: Memory hash detection contributing to the binary family // match. type Detection struct { @@ -1303,6 +1358,9 @@ type Finding struct { // Command Center. CreateTime string `json:"createTime,omitempty"` + // Database: Database associated with the finding. + Database *Database `json:"database,omitempty"` + // Description: Contains more detail about the finding. Description string `json:"description,omitempty"` diff --git a/securitycenter/v1beta2/securitycenter-api.json b/securitycenter/v1beta2/securitycenter-api.json index 83e595cc453..92dd8643b57 100644 --- a/securitycenter/v1beta2/securitycenter-api.json +++ b/securitycenter/v1beta2/securitycenter-api.json @@ -1981,7 +1981,7 @@ } } }, - "revision": "20220728", + "revision": "20220809", "rootUrl": "https://securitycenter.googleapis.com/", "schemas": { "Access": { @@ -2421,6 +2421,36 @@ }, "type": "object" }, + "Database": { + "description": "Represents database access information, such as queries. A database may be a sub-resource of an instance (as in the case of CloudSQL instances or Cloud Spanner instances), or the database instance itself. Some database resources may not have the full resource name populated because these resource types are not yet supported by Cloud Asset Inventory (e.g. CloudSQL databases). In these cases only the display name will be provided.", + "id": "Database", + "properties": { + "displayName": { + "description": "The human readable name of the database the user connected to.", + "type": "string" + }, + "grantees": { + "description": "The target usernames/roles/groups of a SQL privilege grant (not an IAM policy change).", + "items": { + "type": "string" + }, + "type": "array" + }, + "name": { + "description": "The full resource name of the database the user connected to, if it is supported by CAI. (https://google.aip.dev/122#full-resource-names)", + "type": "string" + }, + "query": { + "description": "The SQL statement associated with the relevant access.", + "type": "string" + }, + "userName": { + "description": "The username used to connect to the DB. This may not necessarily be an IAM principal, and has no required format.", + "type": "string" + } + }, + "type": "object" + }, "Details": { "description": "Details of a subscription.", "id": "Details", @@ -2649,6 +2679,10 @@ "format": "google-datetime", "type": "string" }, + "database": { + "$ref": "Database", + "description": "Database associated with the finding." + }, "description": { "description": "Contains more detail about the finding.", "type": "string" diff --git a/securitycenter/v1beta2/securitycenter-gen.go b/securitycenter/v1beta2/securitycenter-gen.go index 20d41edbebc..99d7e7715f7 100644 --- a/securitycenter/v1beta2/securitycenter-gen.go +++ b/securitycenter/v1beta2/securitycenter-gen.go @@ -1041,6 +1041,57 @@ func (s *Cvssv3) UnmarshalJSON(data []byte) error { return nil } +// Database: Represents database access information, such as queries. A +// database may be a sub-resource of an instance (as in the case of +// CloudSQL instances or Cloud Spanner instances), or the database +// instance itself. Some database resources may not have the full +// resource name populated because these resource types are not yet +// supported by Cloud Asset Inventory (e.g. CloudSQL databases). In +// these cases only the display name will be provided. +type Database struct { + // DisplayName: The human readable name of the database the user + // connected to. + DisplayName string `json:"displayName,omitempty"` + + // Grantees: The target usernames/roles/groups of a SQL privilege grant + // (not an IAM policy change). + Grantees []string `json:"grantees,omitempty"` + + // Name: The full resource name of the database the user connected to, + // if it is supported by CAI. + // (https://google.aip.dev/122#full-resource-names) + Name string `json:"name,omitempty"` + + // Query: The SQL statement associated with the relevant access. + Query string `json:"query,omitempty"` + + // UserName: The username used to connect to the DB. This may not + // necessarily be an IAM principal, and has no required format. + UserName string `json:"userName,omitempty"` + + // ForceSendFields is a list of field names (e.g. "DisplayName") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "DisplayName") to include + // in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. However, any field with + // an empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *Database) MarshalJSON() ([]byte, error) { + type NoMethod Database + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // Details: Details of a subscription. type Details struct { // EndTime: The time the subscription has or will end. @@ -1391,6 +1442,9 @@ type Finding struct { // Command Center. CreateTime string `json:"createTime,omitempty"` + // Database: Database associated with the finding. + Database *Database `json:"database,omitempty"` + // Description: Contains more detail about the finding. Description string `json:"description,omitempty"` diff --git a/testing/v1/testing-api.json b/testing/v1/testing-api.json index 504ada739ca..1cd1332d358 100644 --- a/testing/v1/testing-api.json +++ b/testing/v1/testing-api.json @@ -282,7 +282,7 @@ } } }, - "revision": "20220419", + "revision": "20220806", "rootUrl": "https://testing.googleapis.com/", "schemas": { "Account": { @@ -1402,7 +1402,7 @@ "id": "ManualSharding", "properties": { "testTargetsForShard": { - "description": "Required. Group of packages, classes, and/or test methods to be run for each shard. When any physical devices are selected, the number of test_targets_for_shard must be \u003e= 1 and \u003c= 50. When no physical devices are selected, the number must be \u003e= 1 and \u003c= 500.", + "description": "Required. Group of packages, classes, and/or test methods to be run for each manually-created shard. You must specify at least one shard if this field is present. When you select one or more physical devices, the number of repeated test_targets_for_shard must be \u003c= 50. When you select one or more ARM virtual devices, it must be \u003c= 50. When you select only x86 virtual devices, it must be \u003c= 500.", "items": { "$ref": "TestTargetsForShard" }, @@ -2151,11 +2151,11 @@ "type": "object" }, "UniformSharding": { - "description": "Uniformly shards test cases given a total number of shards. For Instrumentation test, it will be translated to \"-e numShard\" \"-e shardIndex\" AndroidJUnitRunner arguments. Based on the sharding mechanism AndroidJUnitRunner uses, there is no guarantee that test cases will be distributed uniformly across all shards. With uniform sharding enabled, specifying these sharding arguments via environment_variables is invalid.", + "description": "Uniformly shards test cases given a total number of shards. For instrumentation tests, it will be translated to \"-e numShard\" and \"-e shardIndex\" AndroidJUnitRunner arguments. With uniform sharding enabled, specifying either of these sharding arguments via `environment_variables` is invalid. Based on the sharding mechanism AndroidJUnitRunner uses, there is no guarantee that test cases will be distributed uniformly across all shards.", "id": "UniformSharding", "properties": { "numShards": { - "description": "Required. Total number of shards. When any physical devices are selected, the number must be \u003e= 1 and \u003c= 50. When no physical devices are selected, the number must be \u003e= 1 and \u003c= 500.", + "description": "Required. The total number of shards to create. This must always be a positive number that is no greater than the total number of test cases. When you select one or more physical devices, the number of shards must be \u003c= 50. When you select one or more ARM virtual devices, it must be \u003c= 50. When you select only x86 virtual devices, it must be \u003c= 500.", "format": "int32", "type": "integer" } diff --git a/testing/v1/testing-gen.go b/testing/v1/testing-gen.go index 7f4d1309697..3b2c76312f3 100644 --- a/testing/v1/testing-gen.go +++ b/testing/v1/testing-gen.go @@ -1966,10 +1966,12 @@ func (s *Locale) MarshalJSON() ([]byte, error) { // InstrumentationTest is invalid. type ManualSharding struct { // TestTargetsForShard: Required. Group of packages, classes, and/or - // test methods to be run for each shard. When any physical devices are - // selected, the number of test_targets_for_shard must be >= 1 and <= - // 50. When no physical devices are selected, the number must be >= 1 - // and <= 500. + // test methods to be run for each manually-created shard. You must + // specify at least one shard if this field is present. When you select + // one or more physical devices, the number of repeated + // test_targets_for_shard must be <= 50. When you select one or more ARM + // virtual devices, it must be <= 50. When you select only x86 virtual + // devices, it must be <= 500. TestTargetsForShard []*TestTargetsForShard `json:"testTargetsForShard,omitempty"` // ForceSendFields is a list of field names (e.g. "TestTargetsForShard") @@ -3187,16 +3189,19 @@ func (s *TrafficRule) UnmarshalJSON(data []byte) error { } // UniformSharding: Uniformly shards test cases given a total number of -// shards. For Instrumentation test, it will be translated to "-e -// numShard" "-e shardIndex" AndroidJUnitRunner arguments. Based on the +// shards. For instrumentation tests, it will be translated to "-e +// numShard" and "-e shardIndex" AndroidJUnitRunner arguments. With +// uniform sharding enabled, specifying either of these sharding +// arguments via `environment_variables` is invalid. Based on the // sharding mechanism AndroidJUnitRunner uses, there is no guarantee -// that test cases will be distributed uniformly across all shards. With -// uniform sharding enabled, specifying these sharding arguments via -// environment_variables is invalid. +// that test cases will be distributed uniformly across all shards. type UniformSharding struct { - // NumShards: Required. Total number of shards. When any physical - // devices are selected, the number must be >= 1 and <= 50. When no - // physical devices are selected, the number must be >= 1 and <= 500. + // NumShards: Required. The total number of shards to create. This must + // always be a positive number that is no greater than the total number + // of test cases. When you select one or more physical devices, the + // number of shards must be <= 50. When you select one or more ARM + // virtual devices, it must be <= 50. When you select only x86 virtual + // devices, it must be <= 500. NumShards int64 `json:"numShards,omitempty"` // ForceSendFields is a list of field names (e.g. "NumShards") to diff --git a/toolresults/v1beta3/toolresults-api.json b/toolresults/v1beta3/toolresults-api.json index fdbbf13f299..6feb1990f49 100644 --- a/toolresults/v1beta3/toolresults-api.json +++ b/toolresults/v1beta3/toolresults-api.json @@ -1463,7 +1463,7 @@ } } }, - "revision": "20210809", + "revision": "20220810", "rootUrl": "https://toolresults.googleapis.com/", "schemas": { "ANR": { @@ -1768,6 +1768,12 @@ }, "type": "object" }, + "DetectedAppSplashScreen": { + "description": "A notification that Robo detected a splash screen provided by app (vs. Android OS splash screen).", + "id": "DetectedAppSplashScreen", + "properties": {}, + "type": "object" + }, "DeviceOutOfMemory": { "description": "A warning that device ran out of memory", "id": "DeviceOutOfMemory", @@ -3616,7 +3622,8 @@ "overlappingUiElements", "unityException", "deviceOutOfMemory", - "logcatCollectionError" + "logcatCollectionError", + "detectedAppSplashScreen" ], "enumDescriptions": [ "Default unspecified type. Do not use. For versioning only.", @@ -3649,7 +3656,8 @@ "Overlapping UI elements are found in the Robo crawl", "An uncaught Unity exception was detected (these don't crash apps).", "Device running out of memory was detected", - "Problems detected while collecting logcat" + "Problems detected while collecting logcat", + "Robo detected a splash screen provided by app (vs. Android OS splash screen)." ], "type": "string" }, diff --git a/toolresults/v1beta3/toolresults-gen.go b/toolresults/v1beta3/toolresults-gen.go index 450c9fbc4ae..22e927ec0de 100644 --- a/toolresults/v1beta3/toolresults-gen.go +++ b/toolresults/v1beta3/toolresults-gen.go @@ -814,6 +814,11 @@ func (s *CrashDialogError) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// DetectedAppSplashScreen: A notification that Robo detected a splash +// screen provided by app (vs. Android OS splash screen). +type DetectedAppSplashScreen struct { +} + // DeviceOutOfMemory: A warning that device ran out of memory type DeviceOutOfMemory struct { } @@ -4006,6 +4011,8 @@ type TestIssue struct { // don't crash apps). // "deviceOutOfMemory" - Device running out of memory was detected // "logcatCollectionError" - Problems detected while collecting logcat + // "detectedAppSplashScreen" - Robo detected a splash screen provided + // by app (vs. Android OS splash screen). Type string `json:"type,omitempty"` // Warning: Warning message with additional details of the issue. Should diff --git a/translate/v3/translate-api.json b/translate/v3/translate-api.json index 4aad0896707..381c76922d2 100644 --- a/translate/v3/translate-api.json +++ b/translate/v3/translate-api.json @@ -580,6 +580,193 @@ "https://www.googleapis.com/auth/cloud-platform", "https://www.googleapis.com/auth/cloud-translation" ] + }, + "patch": { + "description": "Updates a glossary. A LRO is used since the update can be async if the glossary's entry file is updated.", + "flatPath": "v3/projects/{projectsId}/locations/{locationsId}/glossaries/{glossariesId}", + "httpMethod": "PATCH", + "id": "translate.projects.locations.glossaries.patch", + "parameterOrder": [ + "name" + ], + "parameters": { + "name": { + "description": "Required. The resource name of the glossary. Glossary names have the form `projects/{project-number-or-id}/locations/{location-id}/glossaries/{glossary-id}`.", + "location": "path", + "pattern": "^projects/[^/]+/locations/[^/]+/glossaries/[^/]+$", + "required": true, + "type": "string" + }, + "updateMask": { + "description": "The list of fields to be updated. Currently only `display_name` and 'input_config'", + "format": "google-fieldmask", + "location": "query", + "type": "string" + } + }, + "path": "v3/{+name}", + "request": { + "$ref": "Glossary" + }, + "response": { + "$ref": "Operation" + }, + "scopes": [ + "https://www.googleapis.com/auth/cloud-platform" + ] + } + }, + "resources": { + "glossaryEntries": { + "methods": { + "create": { + "description": "Creates a glossary entry.", + "flatPath": "v3/projects/{projectsId}/locations/{locationsId}/glossaries/{glossariesId}/glossaryEntries", + "httpMethod": "POST", + "id": "translate.projects.locations.glossaries.glossaryEntries.create", + "parameterOrder": [ + "parent" + ], + "parameters": { + "parent": { + "description": "Required. The resource name of the glossary to create the entry under.", + "location": "path", + "pattern": "^projects/[^/]+/locations/[^/]+/glossaries/[^/]+$", + "required": true, + "type": "string" + } + }, + "path": "v3/{+parent}/glossaryEntries", + "request": { + "$ref": "GlossaryEntry" + }, + "response": { + "$ref": "GlossaryEntry" + }, + "scopes": [ + "https://www.googleapis.com/auth/cloud-platform", + "https://www.googleapis.com/auth/cloud-translation" + ] + }, + "delete": { + "description": "Deletes a single entry from the glossary", + "flatPath": "v3/projects/{projectsId}/locations/{locationsId}/glossaries/{glossariesId}/glossaryEntries/{glossaryEntriesId}", + "httpMethod": "DELETE", + "id": "translate.projects.locations.glossaries.glossaryEntries.delete", + "parameterOrder": [ + "name" + ], + "parameters": { + "name": { + "description": "Required. The resource name of the glossary entry to delete", + "location": "path", + "pattern": "^projects/[^/]+/locations/[^/]+/glossaries/[^/]+/glossaryEntries/[^/]+$", + "required": true, + "type": "string" + } + }, + "path": "v3/{+name}", + "response": { + "$ref": "Empty" + }, + "scopes": [ + "https://www.googleapis.com/auth/cloud-platform", + "https://www.googleapis.com/auth/cloud-translation" + ] + }, + "get": { + "description": "Gets a single glossary entry by the given id.", + "flatPath": "v3/projects/{projectsId}/locations/{locationsId}/glossaries/{glossariesId}/glossaryEntries/{glossaryEntriesId}", + "httpMethod": "GET", + "id": "translate.projects.locations.glossaries.glossaryEntries.get", + "parameterOrder": [ + "name" + ], + "parameters": { + "name": { + "description": "Required. The resource name of the glossary entry to get", + "location": "path", + "pattern": "^projects/[^/]+/locations/[^/]+/glossaries/[^/]+/glossaryEntries/[^/]+$", + "required": true, + "type": "string" + } + }, + "path": "v3/{+name}", + "response": { + "$ref": "GlossaryEntry" + }, + "scopes": [ + "https://www.googleapis.com/auth/cloud-platform", + "https://www.googleapis.com/auth/cloud-translation" + ] + }, + "list": { + "description": "List the entries for the glossary.", + "flatPath": "v3/projects/{projectsId}/locations/{locationsId}/glossaries/{glossariesId}/glossaryEntries", + "httpMethod": "GET", + "id": "translate.projects.locations.glossaries.glossaryEntries.list", + "parameterOrder": [ + "parent" + ], + "parameters": { + "pageSize": { + "description": "Optional. Requested page size. The server may return fewer glossary entries than requested. If unspecified, the server picks an appropriate default.", + "format": "int32", + "location": "query", + "type": "integer" + }, + "pageToken": { + "description": "Optional. A token identifying a page of results the server should return. Typically, this is the value of [ListGlossaryEntriesResponse.next_page_token] returned from the previous call. The first page is returned if `page_token`is empty or missing.", + "location": "query", + "type": "string" + }, + "parent": { + "description": "Required. The parent glossary resource name for listing the glossary's entries.", + "location": "path", + "pattern": "^projects/[^/]+/locations/[^/]+/glossaries/[^/]+$", + "required": true, + "type": "string" + } + }, + "path": "v3/{+parent}/glossaryEntries", + "response": { + "$ref": "ListGlossaryEntriesResponse" + }, + "scopes": [ + "https://www.googleapis.com/auth/cloud-platform", + "https://www.googleapis.com/auth/cloud-translation" + ] + }, + "patch": { + "description": "Updates a glossary entry.", + "flatPath": "v3/projects/{projectsId}/locations/{locationsId}/glossaries/{glossariesId}/glossaryEntries/{glossaryEntriesId}", + "httpMethod": "PATCH", + "id": "translate.projects.locations.glossaries.glossaryEntries.patch", + "parameterOrder": [ + "name" + ], + "parameters": { + "name": { + "description": "Required. The resource name of the entry. Format: \"projects/*/locations/*/glossaries/*/glossaryEntries/*\"", + "location": "path", + "pattern": "^projects/[^/]+/locations/[^/]+/glossaries/[^/]+/glossaryEntries/[^/]+$", + "required": true, + "type": "string" + } + }, + "path": "v3/{+name}", + "request": { + "$ref": "GlossaryEntry" + }, + "response": { + "$ref": "GlossaryEntry" + }, + "scopes": [ + "https://www.googleapis.com/auth/cloud-platform", + "https://www.googleapis.com/auth/cloud-translation" + ] + } + } } } }, @@ -744,7 +931,7 @@ } } }, - "revision": "20220401", + "revision": "20220805", "rootUrl": "https://translation.googleapis.com/", "schemas": { "BatchDocumentInputConfig": { @@ -764,7 +951,7 @@ "properties": { "gcsDestination": { "$ref": "GcsDestination", - "description": "Google Cloud Storage destination for output content. For every single input document (for example, gs://a/b/c.[extension]), we generate at most 2 * n output files. (n is the # of target_language_codes in the BatchTranslateDocumentRequest). While the input documents are being processed, we write/update an index file `index.csv` under `gcs_destination.output_uri_prefix` (for example, gs://translation_output/index.csv) The index file is generated/updated as new files are being translated. The format is: input_document,target_language_code,translation_output,error_output, glossary_translation_output,glossary_error_output `input_document` is one file we matched using gcs_source.input_uri. `target_language_code` is provided in the request. `translation_output` contains the translations. (details provided below) `error_output` contains the error message during processing of the file. Both translations_file and errors_file could be empty strings if we have no content to output. `glossary_translation_output` and `glossary_error_output` are the translated output/error when we apply glossaries. They could also be empty if we have no content to output. Once a row is present in index.csv, the input/output matching never changes. Callers should also expect all the content in input_file are processed and ready to be consumed (that is, no partial output file is written). Since index.csv will be keeping updated during the process, please make sure there is no custom retention policy applied on the output bucket that may avoid file updating. (https://cloud.google.com/storage/docs/bucket-lock?hl=en#retention-policy) The naming format of translation output files follows (for target language code [trg]): `translation_output`: gs://translation_output/a_b_c_[trg]_translation.[extension] `glossary_translation_output`: gs://translation_test/a_b_c_[trg]_glossary_translation.[extension] The output document will maintain the same file format as the input document. The naming format of error output files follows (for target language code [trg]): `error_output`: gs://translation_test/a_b_c_[trg]_errors.txt `glossary_error_output`: gs://translation_test/a_b_c_[trg]_glossary_translation.txt The error output is a txt file containing error details." + "description": "Google Cloud Storage destination for output content. For every single input document (for example, gs://a/b/c.[extension]), we generate at most 2 * n output files. (n is the # of target_language_codes in the BatchTranslateDocumentRequest). While the input documents are being processed, we write/update an index file `index.csv` under `gcs_destination.output_uri_prefix` (for example, gs://translation_output/index.csv) The index file is generated/updated as new files are being translated. The format is: input_document,target_language_code,translation_output,error_output, glossary_translation_output,glossary_error_output `input_document` is one file we matched using gcs_source.input_uri. `target_language_code` is provided in the request. `translation_output` contains the translations. (details provided below) `error_output` contains the error message during processing of the file. Both translations_file and errors_file could be empty strings if we have no content to output. `glossary_translation_output` and `glossary_error_output` are the translated output/error when we apply glossaries. They could also be empty if we have no content to output. Once a row is present in index.csv, the input/output matching never changes. Callers should also expect all the content in input_file are processed and ready to be consumed (that is, no partial output file is written). Since index.csv will be keeping updated during the process, please make sure there is no custom retention policy applied on the output bucket that may avoid file updating. (https://cloud.google.com/storage/docs/bucket-lock#retention-policy) The naming format of translation output files follows (for target language code [trg]): `translation_output`: gs://translation_output/a_b_c_[trg]_translation.[extension] `glossary_translation_output`: gs://translation_test/a_b_c_[trg]_glossary_translation.[extension] The output document will maintain the same file format as the input document. The naming format of error output files follows (for target language code [trg]): `error_output`: gs://translation_test/a_b_c_[trg]_errors.txt `glossary_error_output`: gs://translation_test/a_b_c_[trg]_glossary_translation.txt The error output is a txt file containing error details." } }, "type": "object" @@ -806,7 +993,7 @@ "description": "Required. Output configuration. If 2 input configs match to the same file (that is, same input path), we don't generate output for duplicate inputs." }, "sourceLanguageCode": { - "description": "Required. The BCP-47 language code of the input document if known, for example, \"en-US\" or \"sr-Latn\". Supported language codes are listed in Language Support (https://cloud.google.com/translate/docs/languages).", + "description": "Required. The BCP-47 language code of the input document if known, for example, \"en-US\" or \"sr-Latn\". Supported language codes are listed in [Language Support](https://cloud.google.com/translate/docs/languages).", "type": "string" }, "targetLanguageCodes": { @@ -1021,6 +1208,10 @@ "description": "Represents a glossary built from user provided data.", "id": "Glossary", "properties": { + "displayName": { + "description": "Optional. The display name of the glossary.", + "type": "string" + }, "endTime": { "description": "Output only. When the glossary creation was finished.", "format": "google-datetime", @@ -1058,6 +1249,29 @@ }, "type": "object" }, + "GlossaryEntry": { + "description": "Represents a single entry in a glossary.", + "id": "GlossaryEntry", + "properties": { + "description": { + "description": "Describes the glossary entry.", + "type": "string" + }, + "name": { + "description": "Required. The resource name of the entry. Format: \"projects/*/locations/*/glossaries/*/glossaryEntries/*\"", + "type": "string" + }, + "termsPair": { + "$ref": "GlossaryTermsPair", + "description": "Used for an unidirectional glossary." + }, + "termsSet": { + "$ref": "GlossaryTermsSet", + "description": "Used for an equivalent term sets glossary." + } + }, + "type": "object" + }, "GlossaryInputConfig": { "description": "Input configuration for glossaries.", "id": "GlossaryInputConfig", @@ -1069,6 +1283,50 @@ }, "type": "object" }, + "GlossaryTerm": { + "description": "Represents a single glossary term", + "id": "GlossaryTerm", + "properties": { + "languageCode": { + "description": "The language for this glossary term.", + "type": "string" + }, + "text": { + "description": "The text for the glossary term.", + "type": "string" + } + }, + "type": "object" + }, + "GlossaryTermsPair": { + "description": "Represents a single entry for an unidirectional glossary.", + "id": "GlossaryTermsPair", + "properties": { + "sourceTerm": { + "$ref": "GlossaryTerm", + "description": "The source term is the term that will get match in the text," + }, + "targetTerm": { + "$ref": "GlossaryTerm", + "description": "The term that will replace the match source term." + } + }, + "type": "object" + }, + "GlossaryTermsSet": { + "description": "Represents a single entry for an equivalent term set glossary. This is used for equivalent term sets where each term can be replaced by the other terms in the set.", + "id": "GlossaryTermsSet", + "properties": { + "terms": { + "description": "Each term in the set represents a term that can be replaced by the other terms.", + "items": { + "$ref": "GlossaryTerm" + }, + "type": "array" + } + }, + "type": "object" + }, "InputConfig": { "description": "Input configuration for BatchTranslateText request.", "id": "InputConfig", @@ -1131,6 +1389,24 @@ }, "type": "object" }, + "ListGlossaryEntriesResponse": { + "description": "Response message for ListGlossaryEntries", + "id": "ListGlossaryEntriesResponse", + "properties": { + "glossaryEntries": { + "description": "Optional. The Glossary Entries", + "items": { + "$ref": "GlossaryEntry" + }, + "type": "array" + }, + "nextPageToken": { + "description": "Optional. A token to retrieve a page of results. Pass this value in the [ListGLossaryEntriesRequest.page_token] field in the subsequent calls.", + "type": "string" + } + }, + "type": "object" + }, "ListLocationsResponse": { "description": "The response message for Locations.ListLocations.", "id": "ListLocationsResponse", @@ -1242,7 +1518,7 @@ "properties": { "gcsDestination": { "$ref": "GcsDestination", - "description": "Google Cloud Storage destination for output content. For every single input file (for example, gs://a/b/c.[extension]), we generate at most 2 * n output files. (n is the # of target_language_codes in the BatchTranslateTextRequest). Output files (tsv) generated are compliant with RFC 4180 except that record delimiters are '\\n' instead of '\\r\\n'. We don't provide any way to change record delimiters. While the input files are being processed, we write/update an index file 'index.csv' under 'output_uri_prefix' (for example, gs://translation-test/index.csv) The index file is generated/updated as new files are being translated. The format is: input_file,target_language_code,translations_file,errors_file, glossary_translations_file,glossary_errors_file input_file is one file we matched using gcs_source.input_uri. target_language_code is provided in the request. translations_file contains the translations. (details provided below) errors_file contains the errors during processing of the file. (details below). Both translations_file and errors_file could be empty strings if we have no content to output. glossary_translations_file and glossary_errors_file are always empty strings if the input_file is tsv. They could also be empty if we have no content to output. Once a row is present in index.csv, the input/output matching never changes. Callers should also expect all the content in input_file are processed and ready to be consumed (that is, no partial output file is written). Since index.csv will be keeping updated during the process, please make sure there is no custom retention policy applied on the output bucket that may avoid file updating. (https://cloud.google.com/storage/docs/bucket-lock?hl=en#retention-policy) The format of translations_file (for target language code 'trg') is: gs://translation_test/a_b_c_'trg'_translations.[extension] If the input file extension is tsv, the output has the following columns: Column 1: ID of the request provided in the input, if it's not provided in the input, then the input row number is used (0-based). Column 2: source sentence. Column 3: translation without applying a glossary. Empty string if there is an error. Column 4 (only present if a glossary is provided in the request): translation after applying the glossary. Empty string if there is an error applying the glossary. Could be same string as column 3 if there is no glossary applied. If input file extension is a txt or html, the translation is directly written to the output file. If glossary is requested, a separate glossary_translations_file has format of gs://translation_test/a_b_c_'trg'_glossary_translations.[extension] The format of errors file (for target language code 'trg') is: gs://translation_test/a_b_c_'trg'_errors.[extension] If the input file extension is tsv, errors_file contains the following: Column 1: ID of the request provided in the input, if it's not provided in the input, then the input row number is used (0-based). Column 2: source sentence. Column 3: Error detail for the translation. Could be empty. Column 4 (only present if a glossary is provided in the request): Error when applying the glossary. If the input file extension is txt or html, glossary_error_file will be generated that contains error details. glossary_error_file has format of gs://translation_test/a_b_c_'trg'_glossary_errors.[extension]" + "description": "Google Cloud Storage destination for output content. For every single input file (for example, gs://a/b/c.[extension]), we generate at most 2 * n output files. (n is the # of target_language_codes in the BatchTranslateTextRequest). Output files (tsv) generated are compliant with RFC 4180 except that record delimiters are '\\n' instead of '\\r\\n'. We don't provide any way to change record delimiters. While the input files are being processed, we write/update an index file 'index.csv' under 'output_uri_prefix' (for example, gs://translation-test/index.csv) The index file is generated/updated as new files are being translated. The format is: input_file,target_language_code,translations_file,errors_file, glossary_translations_file,glossary_errors_file input_file is one file we matched using gcs_source.input_uri. target_language_code is provided in the request. translations_file contains the translations. (details provided below) errors_file contains the errors during processing of the file. (details below). Both translations_file and errors_file could be empty strings if we have no content to output. glossary_translations_file and glossary_errors_file are always empty strings if the input_file is tsv. They could also be empty if we have no content to output. Once a row is present in index.csv, the input/output matching never changes. Callers should also expect all the content in input_file are processed and ready to be consumed (that is, no partial output file is written). Since index.csv will be keeping updated during the process, please make sure there is no custom retention policy applied on the output bucket that may avoid file updating. (https://cloud.google.com/storage/docs/bucket-lock#retention-policy) The format of translations_file (for target language code 'trg') is: gs://translation_test/a_b_c_'trg'_translations.[extension] If the input file extension is tsv, the output has the following columns: Column 1: ID of the request provided in the input, if it's not provided in the input, then the input row number is used (0-based). Column 2: source sentence. Column 3: translation without applying a glossary. Empty string if there is an error. Column 4 (only present if a glossary is provided in the request): translation after applying the glossary. Empty string if there is an error applying the glossary. Could be same string as column 3 if there is no glossary applied. If input file extension is a txt or html, the translation is directly written to the output file. If glossary is requested, a separate glossary_translations_file has format of gs://translation_test/a_b_c_'trg'_glossary_translations.[extension] The format of errors file (for target language code 'trg') is: gs://translation_test/a_b_c_'trg'_errors.[extension] If the input file extension is tsv, errors_file contains the following: Column 1: ID of the request provided in the input, if it's not provided in the input, then the input row number is used (0-based). Column 2: source sentence. Column 3: Error detail for the translation. Could be empty. Column 4 (only present if a glossary is provided in the request): Error when applying the glossary. If the input file extension is txt or html, glossary_error_file will be generated that contains error details. glossary_error_file has format of gs://translation_test/a_b_c_'trg'_glossary_errors.[extension]" } }, "type": "object" diff --git a/translate/v3/translate-gen.go b/translate/v3/translate-gen.go index 0d495ed4ed7..0df5e2f4dcc 100644 --- a/translate/v3/translate-gen.go +++ b/translate/v3/translate-gen.go @@ -176,11 +176,23 @@ type ProjectsLocationsService struct { func NewProjectsLocationsGlossariesService(s *Service) *ProjectsLocationsGlossariesService { rs := &ProjectsLocationsGlossariesService{s: s} + rs.GlossaryEntries = NewProjectsLocationsGlossariesGlossaryEntriesService(s) return rs } type ProjectsLocationsGlossariesService struct { s *Service + + GlossaryEntries *ProjectsLocationsGlossariesGlossaryEntriesService +} + +func NewProjectsLocationsGlossariesGlossaryEntriesService(s *Service) *ProjectsLocationsGlossariesGlossaryEntriesService { + rs := &ProjectsLocationsGlossariesGlossaryEntriesService{s: s} + return rs +} + +type ProjectsLocationsGlossariesGlossaryEntriesService struct { + s *Service } func NewProjectsLocationsOperationsService(s *Service) *ProjectsLocationsOperationsService { @@ -264,7 +276,7 @@ type BatchDocumentOutputConfig struct { // index.csv will be keeping updated during the process, please make // sure there is no custom retention policy applied on the output bucket // that may avoid file updating. - // (https://cloud.google.com/storage/docs/bucket-lock?hl=en#retention-policy) + // (https://cloud.google.com/storage/docs/bucket-lock#retention-policy) // The naming format of translation output files follows (for target // language code [trg]): `translation_output`: // gs://translation_output/a_b_c_[trg]_translation.[extension] @@ -798,6 +810,9 @@ func (s *GcsSource) MarshalJSON() ([]byte, error) { // Glossary: Represents a glossary built from user provided data. type Glossary struct { + // DisplayName: Optional. The display name of the glossary. + DisplayName string `json:"displayName,omitempty"` + // EndTime: Output only. When the glossary creation was finished. EndTime string `json:"endTime,omitempty"` @@ -828,7 +843,7 @@ type Glossary struct { // server. googleapi.ServerResponse `json:"-"` - // ForceSendFields is a list of field names (e.g. "EndTime") to + // ForceSendFields is a list of field names (e.g. "DisplayName") to // unconditionally include in API requests. By default, fields with // empty or default values are omitted from API requests. However, any // non-pointer, non-interface field appearing in ForceSendFields will be @@ -836,10 +851,10 @@ type Glossary struct { // This may be used to include empty fields in Patch requests. 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. However, any field with an - // empty value appearing in NullFields will be sent to the server as + // NullFields is a list of field names (e.g. "DisplayName") to include + // in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. However, any field with + // an empty value appearing in NullFields will be sent to the server as // null. It is an error if a field in this list has a non-empty value. // This may be used to include null fields in Patch requests. NullFields []string `json:"-"` @@ -851,6 +866,48 @@ func (s *Glossary) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// GlossaryEntry: Represents a single entry in a glossary. +type GlossaryEntry struct { + // Description: Describes the glossary entry. + Description string `json:"description,omitempty"` + + // Name: Required. The resource name of the entry. Format: + // "projects/*/locations/*/glossaries/*/glossaryEntries/*" + Name string `json:"name,omitempty"` + + // TermsPair: Used for an unidirectional glossary. + TermsPair *GlossaryTermsPair `json:"termsPair,omitempty"` + + // TermsSet: Used for an equivalent term sets glossary. + TermsSet *GlossaryTermsSet `json:"termsSet,omitempty"` + + // ServerResponse contains the HTTP response code and headers from the + // server. + googleapi.ServerResponse `json:"-"` + + // ForceSendFields is a list of field names (e.g. "Description") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "Description") to include + // in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. However, any field with + // an empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *GlossaryEntry) MarshalJSON() ([]byte, error) { + type NoMethod GlossaryEntry + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // GlossaryInputConfig: Input configuration for glossaries. type GlossaryInputConfig struct { // GcsSource: Required. Google Cloud Storage location of glossary data. @@ -892,6 +949,101 @@ func (s *GlossaryInputConfig) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// GlossaryTerm: Represents a single glossary term +type GlossaryTerm struct { + // LanguageCode: The language for this glossary term. + LanguageCode string `json:"languageCode,omitempty"` + + // Text: The text for the glossary term. + Text string `json:"text,omitempty"` + + // ForceSendFields is a list of field names (e.g. "LanguageCode") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "LanguageCode") to include + // in API requests with the JSON null value. By default, fields with + // empty values are omitted from API requests. However, any field with + // an empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *GlossaryTerm) MarshalJSON() ([]byte, error) { + type NoMethod GlossaryTerm + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + +// GlossaryTermsPair: Represents a single entry for an unidirectional +// glossary. +type GlossaryTermsPair struct { + // SourceTerm: The source term is the term that will get match in the + // text, + SourceTerm *GlossaryTerm `json:"sourceTerm,omitempty"` + + // TargetTerm: The term that will replace the match source term. + TargetTerm *GlossaryTerm `json:"targetTerm,omitempty"` + + // ForceSendFields is a list of field names (e.g. "SourceTerm") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "SourceTerm") to include in + // API requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. However, any field with an + // empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *GlossaryTermsPair) MarshalJSON() ([]byte, error) { + type NoMethod GlossaryTermsPair + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + +// GlossaryTermsSet: Represents a single entry for an equivalent term +// set glossary. This is used for equivalent term sets where each term +// can be replaced by the other terms in the set. +type GlossaryTermsSet struct { + // Terms: Each term in the set represents a term that can be replaced by + // the other terms. + Terms []*GlossaryTerm `json:"terms,omitempty"` + + // ForceSendFields is a list of field names (e.g. "Terms") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "Terms") to include in API + // requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. However, any field with an + // empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *GlossaryTermsSet) MarshalJSON() ([]byte, error) { + type NoMethod GlossaryTermsSet + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // InputConfig: Input configuration for BatchTranslateText request. type InputConfig struct { // GcsSource: Required. Google Cloud Storage location for the source @@ -1044,6 +1196,44 @@ func (s *ListGlossariesResponse) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// ListGlossaryEntriesResponse: Response message for ListGlossaryEntries +type ListGlossaryEntriesResponse struct { + // GlossaryEntries: Optional. The Glossary Entries + GlossaryEntries []*GlossaryEntry `json:"glossaryEntries,omitempty"` + + // NextPageToken: Optional. A token to retrieve a page of results. Pass + // this value in the [ListGLossaryEntriesRequest.page_token] field in + // the subsequent calls. + NextPageToken string `json:"nextPageToken,omitempty"` + + // ServerResponse contains the HTTP response code and headers from the + // server. + googleapi.ServerResponse `json:"-"` + + // ForceSendFields is a list of field names (e.g. "GlossaryEntries") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "GlossaryEntries") to + // include in API requests with the JSON null value. By default, fields + // with empty values are omitted from API requests. However, any field + // with an empty value appearing in NullFields will be sent to the + // server as null. It is an error if a field in this list has a + // non-empty value. This may be used to include null fields in Patch + // requests. + NullFields []string `json:"-"` +} + +func (s *ListGlossaryEntriesResponse) MarshalJSON() ([]byte, error) { + type NoMethod ListGlossaryEntriesResponse + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // ListLocationsResponse: The response message for // Locations.ListLocations. type ListLocationsResponse struct { @@ -1258,7 +1448,7 @@ type OutputConfig struct { // keeping updated during the process, please make sure there is no // custom retention policy applied on the output bucket that may avoid // file updating. - // (https://cloud.google.com/storage/docs/bucket-lock?hl=en#retention-policy) + // (https://cloud.google.com/storage/docs/bucket-lock#retention-policy) // The format of translations_file (for target language code 'trg') is: // gs://translation_test/a_b_c_'trg'_translations.[extension] If the // input file extension is tsv, the output has the following columns: @@ -4230,6 +4420,932 @@ func (c *ProjectsLocationsGlossariesListCall) Pages(ctx context.Context, f func( } } +// method id "translate.projects.locations.glossaries.patch": + +type ProjectsLocationsGlossariesPatchCall struct { + s *Service + name string + glossary *Glossary + urlParams_ gensupport.URLParams + ctx_ context.Context + header_ http.Header +} + +// Patch: Updates a glossary. A LRO is used since the update can be +// async if the glossary's entry file is updated. +// +// - name: The resource name of the glossary. Glossary names have the +// form +// `projects/{project-number-or-id}/locations/{location-id}/glossaries/ +// {glossary-id}`. +func (r *ProjectsLocationsGlossariesService) Patch(name string, glossary *Glossary) *ProjectsLocationsGlossariesPatchCall { + c := &ProjectsLocationsGlossariesPatchCall{s: r.s, urlParams_: make(gensupport.URLParams)} + c.name = name + c.glossary = glossary + return c +} + +// UpdateMask sets the optional parameter "updateMask": The list of +// fields to be updated. Currently only `display_name` and +// 'input_config' +func (c *ProjectsLocationsGlossariesPatchCall) UpdateMask(updateMask string) *ProjectsLocationsGlossariesPatchCall { + c.urlParams_.Set("updateMask", updateMask) + return c +} + +// Fields allows partial responses to be retrieved. See +// https://developers.google.com/gdata/docs/2.0/basics#PartialResponse +// for more information. +func (c *ProjectsLocationsGlossariesPatchCall) Fields(s ...googleapi.Field) *ProjectsLocationsGlossariesPatchCall { + c.urlParams_.Set("fields", googleapi.CombineFields(s)) + return c +} + +// Context sets the context to be used in this call's Do method. Any +// pending HTTP request will be aborted if the provided context is +// canceled. +func (c *ProjectsLocationsGlossariesPatchCall) Context(ctx context.Context) *ProjectsLocationsGlossariesPatchCall { + c.ctx_ = ctx + return c +} + +// Header returns an http.Header that can be modified by the caller to +// add HTTP headers to the request. +func (c *ProjectsLocationsGlossariesPatchCall) Header() http.Header { + if c.header_ == nil { + c.header_ = make(http.Header) + } + return c.header_ +} + +func (c *ProjectsLocationsGlossariesPatchCall) doRequest(alt string) (*http.Response, error) { + reqHeaders := make(http.Header) + reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/"+internal.Version) + for k, v := range c.header_ { + reqHeaders[k] = v + } + reqHeaders.Set("User-Agent", c.s.userAgent()) + var body io.Reader = nil + body, err := googleapi.WithoutDataWrapper.JSONReader(c.glossary) + if err != nil { + return nil, err + } + reqHeaders.Set("Content-Type", "application/json") + c.urlParams_.Set("alt", alt) + c.urlParams_.Set("prettyPrint", "false") + urls := googleapi.ResolveRelative(c.s.BasePath, "v3/{+name}") + urls += "?" + c.urlParams_.Encode() + req, err := http.NewRequest("PATCH", 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 "translate.projects.locations.glossaries.patch" call. +// Exactly one of *Operation or error will be non-nil. Any non-2xx +// status code is an error. Response headers are in either +// *Operation.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 *ProjectsLocationsGlossariesPatchCall) Do(opts ...googleapi.CallOption) (*Operation, 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, &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, err + } + ret := &Operation{ + 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 + // { + // "description": "Updates a glossary. A LRO is used since the update can be async if the glossary's entry file is updated.", + // "flatPath": "v3/projects/{projectsId}/locations/{locationsId}/glossaries/{glossariesId}", + // "httpMethod": "PATCH", + // "id": "translate.projects.locations.glossaries.patch", + // "parameterOrder": [ + // "name" + // ], + // "parameters": { + // "name": { + // "description": "Required. The resource name of the glossary. Glossary names have the form `projects/{project-number-or-id}/locations/{location-id}/glossaries/{glossary-id}`.", + // "location": "path", + // "pattern": "^projects/[^/]+/locations/[^/]+/glossaries/[^/]+$", + // "required": true, + // "type": "string" + // }, + // "updateMask": { + // "description": "The list of fields to be updated. Currently only `display_name` and 'input_config'", + // "format": "google-fieldmask", + // "location": "query", + // "type": "string" + // } + // }, + // "path": "v3/{+name}", + // "request": { + // "$ref": "Glossary" + // }, + // "response": { + // "$ref": "Operation" + // }, + // "scopes": [ + // "https://www.googleapis.com/auth/cloud-platform" + // ] + // } + +} + +// method id "translate.projects.locations.glossaries.glossaryEntries.create": + +type ProjectsLocationsGlossariesGlossaryEntriesCreateCall struct { + s *Service + parent string + glossaryentry *GlossaryEntry + urlParams_ gensupport.URLParams + ctx_ context.Context + header_ http.Header +} + +// Create: Creates a glossary entry. +// +// - parent: The resource name of the glossary to create the entry +// under. +func (r *ProjectsLocationsGlossariesGlossaryEntriesService) Create(parent string, glossaryentry *GlossaryEntry) *ProjectsLocationsGlossariesGlossaryEntriesCreateCall { + c := &ProjectsLocationsGlossariesGlossaryEntriesCreateCall{s: r.s, urlParams_: make(gensupport.URLParams)} + c.parent = parent + c.glossaryentry = glossaryentry + return c +} + +// Fields allows partial responses to be retrieved. See +// https://developers.google.com/gdata/docs/2.0/basics#PartialResponse +// for more information. +func (c *ProjectsLocationsGlossariesGlossaryEntriesCreateCall) Fields(s ...googleapi.Field) *ProjectsLocationsGlossariesGlossaryEntriesCreateCall { + c.urlParams_.Set("fields", googleapi.CombineFields(s)) + return c +} + +// Context sets the context to be used in this call's Do method. Any +// pending HTTP request will be aborted if the provided context is +// canceled. +func (c *ProjectsLocationsGlossariesGlossaryEntriesCreateCall) Context(ctx context.Context) *ProjectsLocationsGlossariesGlossaryEntriesCreateCall { + c.ctx_ = ctx + return c +} + +// Header returns an http.Header that can be modified by the caller to +// add HTTP headers to the request. +func (c *ProjectsLocationsGlossariesGlossaryEntriesCreateCall) Header() http.Header { + if c.header_ == nil { + c.header_ = make(http.Header) + } + return c.header_ +} + +func (c *ProjectsLocationsGlossariesGlossaryEntriesCreateCall) doRequest(alt string) (*http.Response, error) { + reqHeaders := make(http.Header) + reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/"+internal.Version) + for k, v := range c.header_ { + reqHeaders[k] = v + } + reqHeaders.Set("User-Agent", c.s.userAgent()) + var body io.Reader = nil + body, err := googleapi.WithoutDataWrapper.JSONReader(c.glossaryentry) + if err != nil { + return nil, err + } + reqHeaders.Set("Content-Type", "application/json") + c.urlParams_.Set("alt", alt) + c.urlParams_.Set("prettyPrint", "false") + urls := googleapi.ResolveRelative(c.s.BasePath, "v3/{+parent}/glossaryEntries") + urls += "?" + c.urlParams_.Encode() + req, err := http.NewRequest("POST", urls, body) + if err != nil { + return nil, err + } + req.Header = reqHeaders + googleapi.Expand(req.URL, map[string]string{ + "parent": c.parent, + }) + return gensupport.SendRequest(c.ctx_, c.s.client, req) +} + +// Do executes the "translate.projects.locations.glossaries.glossaryEntries.create" call. +// Exactly one of *GlossaryEntry or error will be non-nil. Any non-2xx +// status code is an error. Response headers are in either +// *GlossaryEntry.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 *ProjectsLocationsGlossariesGlossaryEntriesCreateCall) Do(opts ...googleapi.CallOption) (*GlossaryEntry, 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, &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, err + } + ret := &GlossaryEntry{ + 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 + // { + // "description": "Creates a glossary entry.", + // "flatPath": "v3/projects/{projectsId}/locations/{locationsId}/glossaries/{glossariesId}/glossaryEntries", + // "httpMethod": "POST", + // "id": "translate.projects.locations.glossaries.glossaryEntries.create", + // "parameterOrder": [ + // "parent" + // ], + // "parameters": { + // "parent": { + // "description": "Required. The resource name of the glossary to create the entry under.", + // "location": "path", + // "pattern": "^projects/[^/]+/locations/[^/]+/glossaries/[^/]+$", + // "required": true, + // "type": "string" + // } + // }, + // "path": "v3/{+parent}/glossaryEntries", + // "request": { + // "$ref": "GlossaryEntry" + // }, + // "response": { + // "$ref": "GlossaryEntry" + // }, + // "scopes": [ + // "https://www.googleapis.com/auth/cloud-platform", + // "https://www.googleapis.com/auth/cloud-translation" + // ] + // } + +} + +// method id "translate.projects.locations.glossaries.glossaryEntries.delete": + +type ProjectsLocationsGlossariesGlossaryEntriesDeleteCall struct { + s *Service + name string + urlParams_ gensupport.URLParams + ctx_ context.Context + header_ http.Header +} + +// Delete: Deletes a single entry from the glossary +// +// - name: The resource name of the glossary entry to delete. +func (r *ProjectsLocationsGlossariesGlossaryEntriesService) Delete(name string) *ProjectsLocationsGlossariesGlossaryEntriesDeleteCall { + c := &ProjectsLocationsGlossariesGlossaryEntriesDeleteCall{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 information. +func (c *ProjectsLocationsGlossariesGlossaryEntriesDeleteCall) Fields(s ...googleapi.Field) *ProjectsLocationsGlossariesGlossaryEntriesDeleteCall { + c.urlParams_.Set("fields", googleapi.CombineFields(s)) + return c +} + +// Context sets the context to be used in this call's Do method. Any +// pending HTTP request will be aborted if the provided context is +// canceled. +func (c *ProjectsLocationsGlossariesGlossaryEntriesDeleteCall) Context(ctx context.Context) *ProjectsLocationsGlossariesGlossaryEntriesDeleteCall { + c.ctx_ = ctx + return c +} + +// Header returns an http.Header that can be modified by the caller to +// add HTTP headers to the request. +func (c *ProjectsLocationsGlossariesGlossaryEntriesDeleteCall) Header() http.Header { + if c.header_ == nil { + c.header_ = make(http.Header) + } + return c.header_ +} + +func (c *ProjectsLocationsGlossariesGlossaryEntriesDeleteCall) doRequest(alt string) (*http.Response, error) { + reqHeaders := make(http.Header) + reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/"+internal.Version) + for k, v := range c.header_ { + reqHeaders[k] = v + } + reqHeaders.Set("User-Agent", c.s.userAgent()) + var body io.Reader = nil + c.urlParams_.Set("alt", alt) + c.urlParams_.Set("prettyPrint", "false") + urls := googleapi.ResolveRelative(c.s.BasePath, "v3/{+name}") + urls += "?" + c.urlParams_.Encode() + req, err := http.NewRequest("DELETE", 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 "translate.projects.locations.glossaries.glossaryEntries.delete" call. +// Exactly one of *Empty or error will be non-nil. Any non-2xx status +// code is an error. Response headers are in either +// *Empty.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 *ProjectsLocationsGlossariesGlossaryEntriesDeleteCall) Do(opts ...googleapi.CallOption) (*Empty, 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, &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, err + } + ret := &Empty{ + 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 + // { + // "description": "Deletes a single entry from the glossary", + // "flatPath": "v3/projects/{projectsId}/locations/{locationsId}/glossaries/{glossariesId}/glossaryEntries/{glossaryEntriesId}", + // "httpMethod": "DELETE", + // "id": "translate.projects.locations.glossaries.glossaryEntries.delete", + // "parameterOrder": [ + // "name" + // ], + // "parameters": { + // "name": { + // "description": "Required. The resource name of the glossary entry to delete", + // "location": "path", + // "pattern": "^projects/[^/]+/locations/[^/]+/glossaries/[^/]+/glossaryEntries/[^/]+$", + // "required": true, + // "type": "string" + // } + // }, + // "path": "v3/{+name}", + // "response": { + // "$ref": "Empty" + // }, + // "scopes": [ + // "https://www.googleapis.com/auth/cloud-platform", + // "https://www.googleapis.com/auth/cloud-translation" + // ] + // } + +} + +// method id "translate.projects.locations.glossaries.glossaryEntries.get": + +type ProjectsLocationsGlossariesGlossaryEntriesGetCall struct { + s *Service + name string + urlParams_ gensupport.URLParams + ifNoneMatch_ string + ctx_ context.Context + header_ http.Header +} + +// Get: Gets a single glossary entry by the given id. +// +// - name: The resource name of the glossary entry to get. +func (r *ProjectsLocationsGlossariesGlossaryEntriesService) Get(name string) *ProjectsLocationsGlossariesGlossaryEntriesGetCall { + c := &ProjectsLocationsGlossariesGlossaryEntriesGetCall{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 information. +func (c *ProjectsLocationsGlossariesGlossaryEntriesGetCall) Fields(s ...googleapi.Field) *ProjectsLocationsGlossariesGlossaryEntriesGetCall { + c.urlParams_.Set("fields", googleapi.CombineFields(s)) + return c +} + +// IfNoneMatch sets the 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. Use googleapi.IsNotModified to check whether the response +// error from Do is the result of In-None-Match. +func (c *ProjectsLocationsGlossariesGlossaryEntriesGetCall) IfNoneMatch(entityTag string) *ProjectsLocationsGlossariesGlossaryEntriesGetCall { + c.ifNoneMatch_ = entityTag + return c +} + +// Context sets the context to be used in this call's Do method. Any +// pending HTTP request will be aborted if the provided context is +// canceled. +func (c *ProjectsLocationsGlossariesGlossaryEntriesGetCall) Context(ctx context.Context) *ProjectsLocationsGlossariesGlossaryEntriesGetCall { + c.ctx_ = ctx + return c +} + +// Header returns an http.Header that can be modified by the caller to +// add HTTP headers to the request. +func (c *ProjectsLocationsGlossariesGlossaryEntriesGetCall) Header() http.Header { + if c.header_ == nil { + c.header_ = make(http.Header) + } + return c.header_ +} + +func (c *ProjectsLocationsGlossariesGlossaryEntriesGetCall) doRequest(alt string) (*http.Response, error) { + reqHeaders := make(http.Header) + reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/"+internal.Version) + for k, v := range c.header_ { + reqHeaders[k] = v + } + reqHeaders.Set("User-Agent", c.s.userAgent()) + 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, "v3/{+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 "translate.projects.locations.glossaries.glossaryEntries.get" call. +// Exactly one of *GlossaryEntry or error will be non-nil. Any non-2xx +// status code is an error. Response headers are in either +// *GlossaryEntry.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 *ProjectsLocationsGlossariesGlossaryEntriesGetCall) Do(opts ...googleapi.CallOption) (*GlossaryEntry, 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, &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, err + } + ret := &GlossaryEntry{ + 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 + // { + // "description": "Gets a single glossary entry by the given id.", + // "flatPath": "v3/projects/{projectsId}/locations/{locationsId}/glossaries/{glossariesId}/glossaryEntries/{glossaryEntriesId}", + // "httpMethod": "GET", + // "id": "translate.projects.locations.glossaries.glossaryEntries.get", + // "parameterOrder": [ + // "name" + // ], + // "parameters": { + // "name": { + // "description": "Required. The resource name of the glossary entry to get", + // "location": "path", + // "pattern": "^projects/[^/]+/locations/[^/]+/glossaries/[^/]+/glossaryEntries/[^/]+$", + // "required": true, + // "type": "string" + // } + // }, + // "path": "v3/{+name}", + // "response": { + // "$ref": "GlossaryEntry" + // }, + // "scopes": [ + // "https://www.googleapis.com/auth/cloud-platform", + // "https://www.googleapis.com/auth/cloud-translation" + // ] + // } + +} + +// method id "translate.projects.locations.glossaries.glossaryEntries.list": + +type ProjectsLocationsGlossariesGlossaryEntriesListCall struct { + s *Service + parent string + urlParams_ gensupport.URLParams + ifNoneMatch_ string + ctx_ context.Context + header_ http.Header +} + +// List: List the entries for the glossary. +// +// - parent: The parent glossary resource name for listing the +// glossary's entries. +func (r *ProjectsLocationsGlossariesGlossaryEntriesService) List(parent string) *ProjectsLocationsGlossariesGlossaryEntriesListCall { + c := &ProjectsLocationsGlossariesGlossaryEntriesListCall{s: r.s, urlParams_: make(gensupport.URLParams)} + c.parent = parent + return c +} + +// PageSize sets the optional parameter "pageSize": Requested page size. +// The server may return fewer glossary entries than requested. If +// unspecified, the server picks an appropriate default. +func (c *ProjectsLocationsGlossariesGlossaryEntriesListCall) PageSize(pageSize int64) *ProjectsLocationsGlossariesGlossaryEntriesListCall { + c.urlParams_.Set("pageSize", fmt.Sprint(pageSize)) + return c +} + +// PageToken sets the optional parameter "pageToken": A token +// identifying a page of results the server should return. Typically, +// this is the value of [ListGlossaryEntriesResponse.next_page_token] +// returned from the previous call. The first page is returned if +// `page_token`is empty or missing. +func (c *ProjectsLocationsGlossariesGlossaryEntriesListCall) PageToken(pageToken string) *ProjectsLocationsGlossariesGlossaryEntriesListCall { + 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 information. +func (c *ProjectsLocationsGlossariesGlossaryEntriesListCall) Fields(s ...googleapi.Field) *ProjectsLocationsGlossariesGlossaryEntriesListCall { + c.urlParams_.Set("fields", googleapi.CombineFields(s)) + return c +} + +// IfNoneMatch sets the 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. Use googleapi.IsNotModified to check whether the response +// error from Do is the result of In-None-Match. +func (c *ProjectsLocationsGlossariesGlossaryEntriesListCall) IfNoneMatch(entityTag string) *ProjectsLocationsGlossariesGlossaryEntriesListCall { + c.ifNoneMatch_ = entityTag + return c +} + +// Context sets the context to be used in this call's Do method. Any +// pending HTTP request will be aborted if the provided context is +// canceled. +func (c *ProjectsLocationsGlossariesGlossaryEntriesListCall) Context(ctx context.Context) *ProjectsLocationsGlossariesGlossaryEntriesListCall { + c.ctx_ = ctx + return c +} + +// Header returns an http.Header that can be modified by the caller to +// add HTTP headers to the request. +func (c *ProjectsLocationsGlossariesGlossaryEntriesListCall) Header() http.Header { + if c.header_ == nil { + c.header_ = make(http.Header) + } + return c.header_ +} + +func (c *ProjectsLocationsGlossariesGlossaryEntriesListCall) doRequest(alt string) (*http.Response, error) { + reqHeaders := make(http.Header) + reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/"+internal.Version) + for k, v := range c.header_ { + reqHeaders[k] = v + } + reqHeaders.Set("User-Agent", c.s.userAgent()) + 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, "v3/{+parent}/glossaryEntries") + 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{ + "parent": c.parent, + }) + return gensupport.SendRequest(c.ctx_, c.s.client, req) +} + +// Do executes the "translate.projects.locations.glossaries.glossaryEntries.list" call. +// Exactly one of *ListGlossaryEntriesResponse or error will be non-nil. +// Any non-2xx status code is an error. Response headers are in either +// *ListGlossaryEntriesResponse.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 *ProjectsLocationsGlossariesGlossaryEntriesListCall) Do(opts ...googleapi.CallOption) (*ListGlossaryEntriesResponse, 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, &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, err + } + ret := &ListGlossaryEntriesResponse{ + 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 + // { + // "description": "List the entries for the glossary.", + // "flatPath": "v3/projects/{projectsId}/locations/{locationsId}/glossaries/{glossariesId}/glossaryEntries", + // "httpMethod": "GET", + // "id": "translate.projects.locations.glossaries.glossaryEntries.list", + // "parameterOrder": [ + // "parent" + // ], + // "parameters": { + // "pageSize": { + // "description": "Optional. Requested page size. The server may return fewer glossary entries than requested. If unspecified, the server picks an appropriate default.", + // "format": "int32", + // "location": "query", + // "type": "integer" + // }, + // "pageToken": { + // "description": "Optional. A token identifying a page of results the server should return. Typically, this is the value of [ListGlossaryEntriesResponse.next_page_token] returned from the previous call. The first page is returned if `page_token`is empty or missing.", + // "location": "query", + // "type": "string" + // }, + // "parent": { + // "description": "Required. The parent glossary resource name for listing the glossary's entries.", + // "location": "path", + // "pattern": "^projects/[^/]+/locations/[^/]+/glossaries/[^/]+$", + // "required": true, + // "type": "string" + // } + // }, + // "path": "v3/{+parent}/glossaryEntries", + // "response": { + // "$ref": "ListGlossaryEntriesResponse" + // }, + // "scopes": [ + // "https://www.googleapis.com/auth/cloud-platform", + // "https://www.googleapis.com/auth/cloud-translation" + // ] + // } + +} + +// 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 *ProjectsLocationsGlossariesGlossaryEntriesListCall) Pages(ctx context.Context, f func(*ListGlossaryEntriesResponse) error) error { + c.ctx_ = ctx + defer c.PageToken(c.urlParams_.Get("pageToken")) // reset paging to original point + 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) + } +} + +// method id "translate.projects.locations.glossaries.glossaryEntries.patch": + +type ProjectsLocationsGlossariesGlossaryEntriesPatchCall struct { + s *Service + name string + glossaryentry *GlossaryEntry + urlParams_ gensupport.URLParams + ctx_ context.Context + header_ http.Header +} + +// Patch: Updates a glossary entry. +// +// - name: The resource name of the entry. Format: +// "projects/*/locations/*/glossaries/*/glossaryEntries/*". +func (r *ProjectsLocationsGlossariesGlossaryEntriesService) Patch(name string, glossaryentry *GlossaryEntry) *ProjectsLocationsGlossariesGlossaryEntriesPatchCall { + c := &ProjectsLocationsGlossariesGlossaryEntriesPatchCall{s: r.s, urlParams_: make(gensupport.URLParams)} + c.name = name + c.glossaryentry = glossaryentry + return c +} + +// Fields allows partial responses to be retrieved. See +// https://developers.google.com/gdata/docs/2.0/basics#PartialResponse +// for more information. +func (c *ProjectsLocationsGlossariesGlossaryEntriesPatchCall) Fields(s ...googleapi.Field) *ProjectsLocationsGlossariesGlossaryEntriesPatchCall { + c.urlParams_.Set("fields", googleapi.CombineFields(s)) + return c +} + +// Context sets the context to be used in this call's Do method. Any +// pending HTTP request will be aborted if the provided context is +// canceled. +func (c *ProjectsLocationsGlossariesGlossaryEntriesPatchCall) Context(ctx context.Context) *ProjectsLocationsGlossariesGlossaryEntriesPatchCall { + c.ctx_ = ctx + return c +} + +// Header returns an http.Header that can be modified by the caller to +// add HTTP headers to the request. +func (c *ProjectsLocationsGlossariesGlossaryEntriesPatchCall) Header() http.Header { + if c.header_ == nil { + c.header_ = make(http.Header) + } + return c.header_ +} + +func (c *ProjectsLocationsGlossariesGlossaryEntriesPatchCall) doRequest(alt string) (*http.Response, error) { + reqHeaders := make(http.Header) + reqHeaders.Set("x-goog-api-client", "gl-go/"+gensupport.GoVersion()+" gdcl/"+internal.Version) + for k, v := range c.header_ { + reqHeaders[k] = v + } + reqHeaders.Set("User-Agent", c.s.userAgent()) + var body io.Reader = nil + body, err := googleapi.WithoutDataWrapper.JSONReader(c.glossaryentry) + if err != nil { + return nil, err + } + reqHeaders.Set("Content-Type", "application/json") + c.urlParams_.Set("alt", alt) + c.urlParams_.Set("prettyPrint", "false") + urls := googleapi.ResolveRelative(c.s.BasePath, "v3/{+name}") + urls += "?" + c.urlParams_.Encode() + req, err := http.NewRequest("PATCH", 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 "translate.projects.locations.glossaries.glossaryEntries.patch" call. +// Exactly one of *GlossaryEntry or error will be non-nil. Any non-2xx +// status code is an error. Response headers are in either +// *GlossaryEntry.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 *ProjectsLocationsGlossariesGlossaryEntriesPatchCall) Do(opts ...googleapi.CallOption) (*GlossaryEntry, 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, &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, err + } + ret := &GlossaryEntry{ + 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 + // { + // "description": "Updates a glossary entry.", + // "flatPath": "v3/projects/{projectsId}/locations/{locationsId}/glossaries/{glossariesId}/glossaryEntries/{glossaryEntriesId}", + // "httpMethod": "PATCH", + // "id": "translate.projects.locations.glossaries.glossaryEntries.patch", + // "parameterOrder": [ + // "name" + // ], + // "parameters": { + // "name": { + // "description": "Required. The resource name of the entry. Format: \"projects/*/locations/*/glossaries/*/glossaryEntries/*\"", + // "location": "path", + // "pattern": "^projects/[^/]+/locations/[^/]+/glossaries/[^/]+/glossaryEntries/[^/]+$", + // "required": true, + // "type": "string" + // } + // }, + // "path": "v3/{+name}", + // "request": { + // "$ref": "GlossaryEntry" + // }, + // "response": { + // "$ref": "GlossaryEntry" + // }, + // "scopes": [ + // "https://www.googleapis.com/auth/cloud-platform", + // "https://www.googleapis.com/auth/cloud-translation" + // ] + // } + +} + // method id "translate.projects.locations.operations.cancel": type ProjectsLocationsOperationsCancelCall struct { diff --git a/translate/v3beta1/translate-api.json b/translate/v3beta1/translate-api.json index 51903a56278..52f2018d296 100644 --- a/translate/v3beta1/translate-api.json +++ b/translate/v3beta1/translate-api.json @@ -744,7 +744,7 @@ } } }, - "revision": "20220401", + "revision": "20220805", "rootUrl": "https://translation.googleapis.com/", "schemas": { "BatchDocumentInputConfig": { @@ -764,7 +764,7 @@ "properties": { "gcsDestination": { "$ref": "GcsDestination", - "description": "Google Cloud Storage destination for output content. For every single input document (for example, gs://a/b/c.[extension]), we generate at most 2 * n output files. (n is the # of target_language_codes in the BatchTranslateDocumentRequest). While the input documents are being processed, we write/update an index file `index.csv` under `gcs_destination.output_uri_prefix` (for example, gs://translation_output/index.csv) The index file is generated/updated as new files are being translated. The format is: input_document,target_language_code,translation_output,error_output, glossary_translation_output,glossary_error_output `input_document` is one file we matched using gcs_source.input_uri. `target_language_code` is provided in the request. `translation_output` contains the translations. (details provided below) `error_output` contains the error message during processing of the file. Both translations_file and errors_file could be empty strings if we have no content to output. `glossary_translation_output` and `glossary_error_output` are the translated output/error when we apply glossaries. They could also be empty if we have no content to output. Once a row is present in index.csv, the input/output matching never changes. Callers should also expect all the content in input_file are processed and ready to be consumed (that is, no partial output file is written). Since index.csv will be keeping updated during the process, please make sure there is no custom retention policy applied on the output bucket that may avoid file updating. (https://cloud.google.com/storage/docs/bucket-lock?hl=en#retention-policy) The naming format of translation output files follows (for target language code [trg]): `translation_output`: gs://translation_output/a_b_c_[trg]_translation.[extension] `glossary_translation_output`: gs://translation_test/a_b_c_[trg]_glossary_translation.[extension] The output document will maintain the same file format as the input document. The naming format of error output files follows (for target language code [trg]): `error_output`: gs://translation_test/a_b_c_[trg]_errors.txt `glossary_error_output`: gs://translation_test/a_b_c_[trg]_glossary_translation.txt The error output is a txt file containing error details." + "description": "Google Cloud Storage destination for output content. For every single input document (for example, gs://a/b/c.[extension]), we generate at most 2 * n output files. (n is the # of target_language_codes in the BatchTranslateDocumentRequest). While the input documents are being processed, we write/update an index file `index.csv` under `gcs_destination.output_uri_prefix` (for example, gs://translation_output/index.csv) The index file is generated/updated as new files are being translated. The format is: input_document,target_language_code,translation_output,error_output, glossary_translation_output,glossary_error_output `input_document` is one file we matched using gcs_source.input_uri. `target_language_code` is provided in the request. `translation_output` contains the translations. (details provided below) `error_output` contains the error message during processing of the file. Both translations_file and errors_file could be empty strings if we have no content to output. `glossary_translation_output` and `glossary_error_output` are the translated output/error when we apply glossaries. They could also be empty if we have no content to output. Once a row is present in index.csv, the input/output matching never changes. Callers should also expect all the content in input_file are processed and ready to be consumed (that is, no partial output file is written). Since index.csv will be keeping updated during the process, please make sure there is no custom retention policy applied on the output bucket that may avoid file updating. (https://cloud.google.com/storage/docs/bucket-lock#retention-policy) The naming format of translation output files follows (for target language code [trg]): `translation_output`: gs://translation_output/a_b_c_[trg]_translation.[extension] `glossary_translation_output`: gs://translation_test/a_b_c_[trg]_glossary_translation.[extension] The output document will maintain the same file format as the input document. The naming format of error output files follows (for target language code [trg]): `error_output`: gs://translation_test/a_b_c_[trg]_errors.txt `glossary_error_output`: gs://translation_test/a_b_c_[trg]_glossary_translation.txt The error output is a txt file containing error details." } }, "type": "object" @@ -806,7 +806,7 @@ "description": "Required. Output configuration. If 2 input configs match to the same file (that is, same input path), we don't generate output for duplicate inputs." }, "sourceLanguageCode": { - "description": "Required. The BCP-47 language code of the input document if known, for example, \"en-US\" or \"sr-Latn\". Supported language codes are listed in Language Support (https://cloud.google.com/translate/docs/languages).", + "description": "Required. The BCP-47 language code of the input document if known, for example, \"en-US\" or \"sr-Latn\". Supported language codes are listed in [Language Support](https://cloud.google.com/translate/docs/languages).", "type": "string" }, "targetLanguageCodes": { @@ -1064,7 +1064,7 @@ "properties": { "gcsSource": { "$ref": "GcsSource", - "description": "Required. Google Cloud Storage location of glossary data. File format is determined based on the filename extension. API returns [google.rpc.Code.INVALID_ARGUMENT] for unsupported URI-s and file formats. Wildcards are not allowed. This must be a single file in one of the following formats: For unidirectional glossaries: - TSV/CSV (`.tsv`/`.csv`): 2 column file, tab- or comma-separated. The first column is source text. The second column is target text. The file must not contain headers. That is, the first row is data, not column names. - TMX (`.tmx`): TMX file with parallel data defining source/target term pairs. For equivalent term sets glossaries: - CSV (`.csv`): Multi-column CSV file defining equivalent glossary terms in multiple languages. The format is defined for Google Translation Toolkit and documented in [Use a glossary](https://support.google.com/translatortoolkit/answer/6306379?hl=en)." + "description": "Required. Google Cloud Storage location of glossary data. File format is determined based on the filename extension. API returns [google.rpc.Code.INVALID_ARGUMENT] for unsupported URI-s and file formats. Wildcards are not allowed. This must be a single file in one of the following formats: For unidirectional glossaries: - TSV/CSV (`.tsv`/`.csv`): 2 column file, tab- or comma-separated. The first column is source text. The second column is target text. The file must not contain headers. That is, the first row is data, not column names. - TMX (`.tmx`): TMX file with parallel data defining source/target term pairs. For equivalent term sets glossaries: - CSV (`.csv`): Multi-column CSV file defining equivalent glossary terms in multiple languages. See documentation for more information - [glossaries](https://cloud.google.com/translate/docs/advanced/glossary)." } }, "type": "object" @@ -1242,7 +1242,7 @@ "properties": { "gcsDestination": { "$ref": "GcsDestination", - "description": "Google Cloud Storage destination for output content. For every single input file (for example, gs://a/b/c.[extension]), we generate at most 2 * n output files. (n is the # of target_language_codes in the BatchTranslateTextRequest). Output files (tsv) generated are compliant with RFC 4180 except that record delimiters are '\\n' instead of '\\r\\n'. We don't provide any way to change record delimiters. While the input files are being processed, we write/update an index file 'index.csv' under 'output_uri_prefix' (for example, gs://translation-test/index.csv) The index file is generated/updated as new files are being translated. The format is: input_file,target_language_code,translations_file,errors_file, glossary_translations_file,glossary_errors_file input_file is one file we matched using gcs_source.input_uri. target_language_code is provided in the request. translations_file contains the translations. (details provided below) errors_file contains the errors during processing of the file. (details below). Both translations_file and errors_file could be empty strings if we have no content to output. glossary_translations_file and glossary_errors_file are always empty strings if the input_file is tsv. They could also be empty if we have no content to output. Once a row is present in index.csv, the input/output matching never changes. Callers should also expect all the content in input_file are processed and ready to be consumed (that is, no partial output file is written). Since index.csv will be keeping updated during the process, please make sure there is no custom retention policy applied on the output bucket that may avoid file updating. (https://cloud.google.com/storage/docs/bucket-lock?hl=en#retention-policy) The format of translations_file (for target language code 'trg') is: gs://translation_test/a_b_c_'trg'_translations.[extension] If the input file extension is tsv, the output has the following columns: Column 1: ID of the request provided in the input, if it's not provided in the input, then the input row number is used (0-based). Column 2: source sentence. Column 3: translation without applying a glossary. Empty string if there is an error. Column 4 (only present if a glossary is provided in the request): translation after applying the glossary. Empty string if there is an error applying the glossary. Could be same string as column 3 if there is no glossary applied. If input file extension is a txt or html, the translation is directly written to the output file. If glossary is requested, a separate glossary_translations_file has format of gs://translation_test/a_b_c_'trg'_glossary_translations.[extension] The format of errors file (for target language code 'trg') is: gs://translation_test/a_b_c_'trg'_errors.[extension] If the input file extension is tsv, errors_file contains the following: Column 1: ID of the request provided in the input, if it's not provided in the input, then the input row number is used (0-based). Column 2: source sentence. Column 3: Error detail for the translation. Could be empty. Column 4 (only present if a glossary is provided in the request): Error when applying the glossary. If the input file extension is txt or html, glossary_error_file will be generated that contains error details. glossary_error_file has format of gs://translation_test/a_b_c_'trg'_glossary_errors.[extension]" + "description": "Google Cloud Storage destination for output content. For every single input file (for example, gs://a/b/c.[extension]), we generate at most 2 * n output files. (n is the # of target_language_codes in the BatchTranslateTextRequest). Output files (tsv) generated are compliant with RFC 4180 except that record delimiters are '\\n' instead of '\\r\\n'. We don't provide any way to change record delimiters. While the input files are being processed, we write/update an index file 'index.csv' under 'output_uri_prefix' (for example, gs://translation-test/index.csv) The index file is generated/updated as new files are being translated. The format is: input_file,target_language_code,translations_file,errors_file, glossary_translations_file,glossary_errors_file input_file is one file we matched using gcs_source.input_uri. target_language_code is provided in the request. translations_file contains the translations. (details provided below) errors_file contains the errors during processing of the file. (details below). Both translations_file and errors_file could be empty strings if we have no content to output. glossary_translations_file and glossary_errors_file are always empty strings if the input_file is tsv. They could also be empty if we have no content to output. Once a row is present in index.csv, the input/output matching never changes. Callers should also expect all the content in input_file are processed and ready to be consumed (that is, no partial output file is written). Since index.csv will be keeping updated during the process, please make sure there is no custom retention policy applied on the output bucket that may avoid file updating. (https://cloud.google.com/storage/docs/bucket-lock#retention-policy) The format of translations_file (for target language code 'trg') is: gs://translation_test/a_b_c_'trg'_translations.[extension] If the input file extension is tsv, the output has the following columns: Column 1: ID of the request provided in the input, if it's not provided in the input, then the input row number is used (0-based). Column 2: source sentence. Column 3: translation without applying a glossary. Empty string if there is an error. Column 4 (only present if a glossary is provided in the request): translation after applying the glossary. Empty string if there is an error applying the glossary. Could be same string as column 3 if there is no glossary applied. If input file extension is a txt or html, the translation is directly written to the output file. If glossary is requested, a separate glossary_translations_file has format of gs://translation_test/a_b_c_'trg'_glossary_translations.[extension] The format of errors file (for target language code 'trg') is: gs://translation_test/a_b_c_'trg'_errors.[extension] If the input file extension is tsv, errors_file contains the following: Column 1: ID of the request provided in the input, if it's not provided in the input, then the input row number is used (0-based). Column 2: source sentence. Column 3: Error detail for the translation. Could be empty. Column 4 (only present if a glossary is provided in the request): Error when applying the glossary. If the input file extension is txt or html, glossary_error_file will be generated that contains error details. glossary_error_file has format of gs://translation_test/a_b_c_'trg'_glossary_errors.[extension]" } }, "type": "object" diff --git a/translate/v3beta1/translate-gen.go b/translate/v3beta1/translate-gen.go index cdf0eb8253c..14059941cd9 100644 --- a/translate/v3beta1/translate-gen.go +++ b/translate/v3beta1/translate-gen.go @@ -264,7 +264,7 @@ type BatchDocumentOutputConfig struct { // index.csv will be keeping updated during the process, please make // sure there is no custom retention policy applied on the output bucket // that may avoid file updating. - // (https://cloud.google.com/storage/docs/bucket-lock?hl=en#retention-policy) + // (https://cloud.google.com/storage/docs/bucket-lock#retention-policy) // The naming format of translation output files follows (for target // language code [trg]): `translation_output`: // gs://translation_output/a_b_c_[trg]_translation.[extension] @@ -861,9 +861,9 @@ type GlossaryInputConfig struct { // column names. - TMX (`.tmx`): TMX file with parallel data defining // source/target term pairs. For equivalent term sets glossaries: - CSV // (`.csv`): Multi-column CSV file defining equivalent glossary terms in - // multiple languages. The format is defined for Google Translation - // Toolkit and documented in Use a glossary - // (https://support.google.com/translatortoolkit/answer/6306379?hl=en). + // multiple languages. See documentation for more information - + // glossaries + // (https://cloud.google.com/translate/docs/advanced/glossary). GcsSource *GcsSource `json:"gcsSource,omitempty"` // ForceSendFields is a list of field names (e.g. "GcsSource") to @@ -1255,7 +1255,7 @@ type OutputConfig struct { // keeping updated during the process, please make sure there is no // custom retention policy applied on the output bucket that may avoid // file updating. - // (https://cloud.google.com/storage/docs/bucket-lock?hl=en#retention-policy) + // (https://cloud.google.com/storage/docs/bucket-lock#retention-policy) // The format of translations_file (for target language code 'trg') is: // gs://translation_test/a_b_c_'trg'_translations.[extension] If the // input file extension is tsv, the output has the following columns: diff --git a/vision/v1/vision-api.json b/vision/v1/vision-api.json index 19cb1dc10e3..5e7dbb87015 100644 --- a/vision/v1/vision-api.json +++ b/vision/v1/vision-api.json @@ -1282,7 +1282,7 @@ } } }, - "revision": "20220319", + "revision": "20220805", "rootUrl": "https://vision.googleapis.com/", "schemas": { "AddProductToProductSetRequest": { @@ -9147,6 +9147,13 @@ "description": "Parameters for text detections. This is used to control TEXT_DETECTION and DOCUMENT_TEXT_DETECTION features.", "id": "TextDetectionParams", "properties": { + "advancedOcrOptions": { + "description": "A list of advanced OCR options to fine-tune OCR behavior.", + "items": { + "type": "string" + }, + "type": "array" + }, "enableTextDetectionConfidenceScore": { "description": "By default, Cloud Vision API only includes confidence score for DOCUMENT_TEXT_DETECTION result. Set the flag to true to include confidence score for TEXT_DETECTION as well.", "type": "boolean" diff --git a/vision/v1/vision-gen.go b/vision/v1/vision-gen.go index 08049bf5fd9..554a86e5571 100644 --- a/vision/v1/vision-gen.go +++ b/vision/v1/vision-gen.go @@ -13513,27 +13513,30 @@ func (s *TextAnnotation) MarshalJSON() ([]byte, error) { // TextDetectionParams: Parameters for text detections. This is used to // control TEXT_DETECTION and DOCUMENT_TEXT_DETECTION features. type TextDetectionParams struct { + // AdvancedOcrOptions: A list of advanced OCR options to fine-tune OCR + // behavior. + AdvancedOcrOptions []string `json:"advancedOcrOptions,omitempty"` + // EnableTextDetectionConfidenceScore: By default, Cloud Vision API only // includes confidence score for DOCUMENT_TEXT_DETECTION result. Set the // flag to true to include confidence score for TEXT_DETECTION as well. EnableTextDetectionConfidenceScore bool `json:"enableTextDetectionConfidenceScore,omitempty"` - // ForceSendFields is a list of field names (e.g. - // "EnableTextDetectionConfidenceScore") to unconditionally include in - // API requests. By default, fields with empty or default values are - // omitted from API requests. However, any non-pointer, non-interface - // field appearing in ForceSendFields will be sent to the server - // regardless of whether the field is empty or not. This may be used to - // include empty fields in Patch requests. - ForceSendFields []string `json:"-"` - - // NullFields is a list of field names (e.g. - // "EnableTextDetectionConfidenceScore") to include in API requests with - // the JSON null value. By default, fields with empty values are omitted - // from API requests. However, any field with an empty value appearing - // in NullFields will be sent to the server as null. It is an error if a - // field in this list has a non-empty value. This may be used to include - // null fields in Patch requests. + // ForceSendFields is a list of field names (e.g. "AdvancedOcrOptions") + // to unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "AdvancedOcrOptions") to + // include in API requests with the JSON null value. By default, fields + // with empty values are omitted from API requests. However, any field + // with an empty value appearing in NullFields will be sent to the + // server as null. It is an error if a field in this list has a + // non-empty value. This may be used to include null fields in Patch + // requests. NullFields []string `json:"-"` } diff --git a/vision/v1p1beta1/vision-api.json b/vision/v1p1beta1/vision-api.json index 7c6842a1a5d..0b1bca8c352 100644 --- a/vision/v1p1beta1/vision-api.json +++ b/vision/v1p1beta1/vision-api.json @@ -449,7 +449,7 @@ } } }, - "revision": "20210809", + "revision": "20220805", "rootUrl": "https://vision.googleapis.com/", "schemas": { "AnnotateFileResponse": { @@ -2710,6 +2710,13 @@ "description": "Parameters for text detections. This is used to control TEXT_DETECTION and DOCUMENT_TEXT_DETECTION features.", "id": "GoogleCloudVisionV1p1beta1TextDetectionParams", "properties": { + "advancedOcrOptions": { + "description": "A list of advanced OCR options to fine-tune OCR behavior.", + "items": { + "type": "string" + }, + "type": "array" + }, "enableTextDetectionConfidenceScore": { "description": "By default, Cloud Vision API only includes confidence score for DOCUMENT_TEXT_DETECTION result. Set the flag to true to include confidence score for TEXT_DETECTION as well.", "type": "boolean" diff --git a/vision/v1p1beta1/vision-gen.go b/vision/v1p1beta1/vision-gen.go index 759d6fd49d0..d6b93f0c094 100644 --- a/vision/v1p1beta1/vision-gen.go +++ b/vision/v1p1beta1/vision-gen.go @@ -3979,27 +3979,30 @@ func (s *GoogleCloudVisionV1p1beta1TextAnnotationTextProperty) MarshalJSON() ([] // detections. This is used to control TEXT_DETECTION and // DOCUMENT_TEXT_DETECTION features. type GoogleCloudVisionV1p1beta1TextDetectionParams struct { + // AdvancedOcrOptions: A list of advanced OCR options to fine-tune OCR + // behavior. + AdvancedOcrOptions []string `json:"advancedOcrOptions,omitempty"` + // EnableTextDetectionConfidenceScore: By default, Cloud Vision API only // includes confidence score for DOCUMENT_TEXT_DETECTION result. Set the // flag to true to include confidence score for TEXT_DETECTION as well. EnableTextDetectionConfidenceScore bool `json:"enableTextDetectionConfidenceScore,omitempty"` - // ForceSendFields is a list of field names (e.g. - // "EnableTextDetectionConfidenceScore") to unconditionally include in - // API requests. By default, fields with empty or default values are - // omitted from API requests. However, any non-pointer, non-interface - // field appearing in ForceSendFields will be sent to the server - // regardless of whether the field is empty or not. This may be used to - // include empty fields in Patch requests. - ForceSendFields []string `json:"-"` - - // NullFields is a list of field names (e.g. - // "EnableTextDetectionConfidenceScore") to include in API requests with - // the JSON null value. By default, fields with empty values are omitted - // from API requests. However, any field with an empty value appearing - // in NullFields will be sent to the server as null. It is an error if a - // field in this list has a non-empty value. This may be used to include - // null fields in Patch requests. + // ForceSendFields is a list of field names (e.g. "AdvancedOcrOptions") + // to unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "AdvancedOcrOptions") to + // include in API requests with the JSON null value. By default, fields + // with empty values are omitted from API requests. However, any field + // with an empty value appearing in NullFields will be sent to the + // server as null. It is an error if a field in this list has a + // non-empty value. This may be used to include null fields in Patch + // requests. NullFields []string `json:"-"` } diff --git a/vision/v1p2beta1/vision-api.json b/vision/v1p2beta1/vision-api.json index 0eecf7bbc62..92c48896d87 100644 --- a/vision/v1p2beta1/vision-api.json +++ b/vision/v1p2beta1/vision-api.json @@ -449,7 +449,7 @@ } } }, - "revision": "20210809", + "revision": "20220805", "rootUrl": "https://vision.googleapis.com/", "schemas": { "AnnotateFileResponse": { @@ -4123,6 +4123,13 @@ "description": "Parameters for text detections. This is used to control TEXT_DETECTION and DOCUMENT_TEXT_DETECTION features.", "id": "GoogleCloudVisionV1p2beta1TextDetectionParams", "properties": { + "advancedOcrOptions": { + "description": "A list of advanced OCR options to fine-tune OCR behavior.", + "items": { + "type": "string" + }, + "type": "array" + }, "enableTextDetectionConfidenceScore": { "description": "By default, Cloud Vision API only includes confidence score for DOCUMENT_TEXT_DETECTION result. Set the flag to true to include confidence score for TEXT_DETECTION as well.", "type": "boolean" diff --git a/vision/v1p2beta1/vision-gen.go b/vision/v1p2beta1/vision-gen.go index 450a95be010..dc9c4160045 100644 --- a/vision/v1p2beta1/vision-gen.go +++ b/vision/v1p2beta1/vision-gen.go @@ -6279,27 +6279,30 @@ func (s *GoogleCloudVisionV1p2beta1TextAnnotationTextProperty) MarshalJSON() ([] // detections. This is used to control TEXT_DETECTION and // DOCUMENT_TEXT_DETECTION features. type GoogleCloudVisionV1p2beta1TextDetectionParams struct { + // AdvancedOcrOptions: A list of advanced OCR options to fine-tune OCR + // behavior. + AdvancedOcrOptions []string `json:"advancedOcrOptions,omitempty"` + // EnableTextDetectionConfidenceScore: By default, Cloud Vision API only // includes confidence score for DOCUMENT_TEXT_DETECTION result. Set the // flag to true to include confidence score for TEXT_DETECTION as well. EnableTextDetectionConfidenceScore bool `json:"enableTextDetectionConfidenceScore,omitempty"` - // ForceSendFields is a list of field names (e.g. - // "EnableTextDetectionConfidenceScore") to unconditionally include in - // API requests. By default, fields with empty or default values are - // omitted from API requests. However, any non-pointer, non-interface - // field appearing in ForceSendFields will be sent to the server - // regardless of whether the field is empty or not. This may be used to - // include empty fields in Patch requests. - ForceSendFields []string `json:"-"` - - // NullFields is a list of field names (e.g. - // "EnableTextDetectionConfidenceScore") to include in API requests with - // the JSON null value. By default, fields with empty values are omitted - // from API requests. However, any field with an empty value appearing - // in NullFields will be sent to the server as null. It is an error if a - // field in this list has a non-empty value. This may be used to include - // null fields in Patch requests. + // ForceSendFields is a list of field names (e.g. "AdvancedOcrOptions") + // to unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "AdvancedOcrOptions") to + // include in API requests with the JSON null value. By default, fields + // with empty values are omitted from API requests. However, any field + // with an empty value appearing in NullFields will be sent to the + // server as null. It is an error if a field in this list has a + // non-empty value. This may be used to include null fields in Patch + // requests. NullFields []string `json:"-"` } diff --git a/webrisk/v1/webrisk-api.json b/webrisk/v1/webrisk-api.json index bddb1b507ed..2e1d4f29017 100644 --- a/webrisk/v1/webrisk-api.json +++ b/webrisk/v1/webrisk-api.json @@ -452,7 +452,7 @@ } } }, - "revision": "20220708", + "revision": "20220806", "rootUrl": "https://webrisk.googleapis.com/", "schemas": { "GoogleCloudWebriskV1ComputeThreatListDiffResponse": { @@ -715,14 +715,16 @@ "RUNNING", "SUCCEEDED", "CANCELLED", - "FAILED" + "FAILED", + "CLOSED" ], "enumDescriptions": [ "Default unspecified state.", "The operation is currently running.", "The operation finished with a success status.", "The operation was cancelled.", - "The operation finished with a failure status." + "The operation finished with a failure status.", + "The operation was closed with no action taken." ], "type": "string" }, diff --git a/webrisk/v1/webrisk-gen.go b/webrisk/v1/webrisk-gen.go index 205b7763e34..3c9b1a10554 100644 --- a/webrisk/v1/webrisk-gen.go +++ b/webrisk/v1/webrisk-gen.go @@ -652,6 +652,7 @@ type GoogleCloudWebriskV1SubmitUriMetadata struct { // "SUCCEEDED" - The operation finished with a success status. // "CANCELLED" - The operation was cancelled. // "FAILED" - The operation finished with a failure status. + // "CLOSED" - The operation was closed with no action taken. State string `json:"state,omitempty"` // UpdateTime: Latest update time of the operation.