diff --git a/go.mod b/go.mod index 097db78cfc..8db6ab74c2 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( golang.org/x/sync v0.6.0 golang.org/x/tools v0.19.0 gomodules.xyz/jsonpatch/v2 v2.4.0 - google.golang.org/api v0.171.0 + google.golang.org/api v0.172.0 google.golang.org/grpc v1.62.1 google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v3 v3.0.1 @@ -105,7 +105,7 @@ require ( google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect diff --git a/go.sum b/go.sum index 0f16b130db..0c556978d0 100644 --- a/go.sum +++ b/go.sum @@ -657,8 +657,8 @@ google.golang.org/api v0.25.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.171.0 h1:w174hnBPqut76FzW5Qaupt7zY8Kql6fiVjgys4f58sU= -google.golang.org/api v0.171.0/go.mod h1:Hnq5AHm4OTMt2BUVjael2CWZFD6vksJdWCWiUAmjC9o= +google.golang.org/api v0.172.0 h1:/1OcMZGPmW1rX2LCu2CmGUD1KXK1+pfzxotxyRUCCdk= +google.golang.org/api v0.172.0/go.mod h1:+fJZq6QXWfa9pXhnIzsjx4yI22d4aI9ZpLb58gvXjis= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -702,8 +702,8 @@ google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJ google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 h1:rIo7ocm2roD9DcFIX67Ym8icoGCKSARAiPljFhh5suQ= google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c h1:lfpJ/2rWPa/kJgxyyXM8PrNnfCzcmxJ265mADgwmvLI= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= diff --git a/vendor/google.golang.org/api/container/v1beta1/container-api.json b/vendor/google.golang.org/api/container/v1beta1/container-api.json index cdacf1e12a..eb018649b7 100644 --- a/vendor/google.golang.org/api/container/v1beta1/container-api.json +++ b/vendor/google.golang.org/api/container/v1beta1/container-api.json @@ -2565,7 +2565,7 @@ } } }, - "revision": "20240304", + "revision": "20240313", "rootUrl": "https://container.googleapis.com/", "schemas": { "AcceleratorConfig": { @@ -4143,10 +4143,49 @@ "description": "Configuration of etcd encryption.", "id": "DatabaseEncryption", "properties": { + "currentState": { + "description": "Output only. The current state of etcd encryption.", + "enum": [ + "CURRENT_STATE_UNSPECIFIED", + "CURRENT_STATE_ENCRYPTED", + "CURRENT_STATE_DECRYPTED", + "CURRENT_STATE_ENCRYPTION_PENDING", + "CURRENT_STATE_ENCRYPTION_ERROR", + "CURRENT_STATE_DECRYPTION_PENDING", + "CURRENT_STATE_DECRYPTION_ERROR" + ], + "enumDescriptions": [ + "Should never be set", + "Secrets in etcd are encrypted.", + "Secrets in etcd are stored in plain text (at etcd level) - this is unrelated to Compute Engine level full disk encryption.", + "Encryption (or re-encryption with a different CloudKMS key) of Secrets is in progress.", + "Encryption (or re-encryption with a different CloudKMS key) of Secrets in etcd encountered an error.", + "De-crypting Secrets to plain text in etcd is in progress.", + "De-crypting Secrets to plain text in etcd encountered an error." + ], + "readOnly": true, + "type": "string" + }, + "decryptionKeys": { + "description": "Output only. Keys in use by the cluster for decrypting existing objects, in addition to the key in `key_name`. Each item is a CloudKMS key resource.", + "items": { + "type": "string" + }, + "readOnly": true, + "type": "array" + }, "keyName": { "description": "Name of CloudKMS key to use for the encryption of secrets in etcd. Ex. projects/my-project/locations/global/keyRings/my-ring/cryptoKeys/my-key", "type": "string" }, + "lastOperationErrors": { + "description": "Output only. Records errors seen during DatabaseEncryption update operations.", + "items": { + "$ref": "OperationError" + }, + "readOnly": true, + "type": "array" + }, "state": { "description": "The desired state of etcd encryption.", "enum": [ @@ -6277,6 +6316,26 @@ }, "type": "object" }, + "OperationError": { + "description": "OperationError records errors seen from CloudKMS keys encountered during updates to DatabaseEncryption configuration.", + "id": "OperationError", + "properties": { + "errorMessage": { + "description": "Description of the error seen during the operation.", + "type": "string" + }, + "keyName": { + "description": "CloudKMS key resource that had the error.", + "type": "string" + }, + "timestamp": { + "description": "Time when the CloudKMS error was seen.", + "format": "google-datetime", + "type": "string" + } + }, + "type": "object" + }, "OperationProgress": { "description": "Information about operation (or operation stage) progress.", "id": "OperationProgress", diff --git a/vendor/google.golang.org/api/container/v1beta1/container-gen.go b/vendor/google.golang.org/api/container/v1beta1/container-gen.go index c2fa35e09f..6920f0afd5 100644 --- a/vendor/google.golang.org/api/container/v1beta1/container-gen.go +++ b/vendor/google.golang.org/api/container/v1beta1/container-gen.go @@ -2618,12 +2618,40 @@ func (s *DailyMaintenanceWindow) MarshalJSON() ([]byte, error) { // DatabaseEncryption: Configuration of etcd encryption. type DatabaseEncryption struct { + // CurrentState: Output only. The current state of etcd encryption. + // + // Possible values: + // "CURRENT_STATE_UNSPECIFIED" - Should never be set + // "CURRENT_STATE_ENCRYPTED" - Secrets in etcd are encrypted. + // "CURRENT_STATE_DECRYPTED" - Secrets in etcd are stored in plain + // text (at etcd level) - this is unrelated to Compute Engine level full + // disk encryption. + // "CURRENT_STATE_ENCRYPTION_PENDING" - Encryption (or re-encryption + // with a different CloudKMS key) of Secrets is in progress. + // "CURRENT_STATE_ENCRYPTION_ERROR" - Encryption (or re-encryption + // with a different CloudKMS key) of Secrets in etcd encountered an + // error. + // "CURRENT_STATE_DECRYPTION_PENDING" - De-crypting Secrets to plain + // text in etcd is in progress. + // "CURRENT_STATE_DECRYPTION_ERROR" - De-crypting Secrets to plain + // text in etcd encountered an error. + CurrentState string `json:"currentState,omitempty"` + + // DecryptionKeys: Output only. Keys in use by the cluster for + // decrypting existing objects, in addition to the key in `key_name`. + // Each item is a CloudKMS key resource. + DecryptionKeys []string `json:"decryptionKeys,omitempty"` + // KeyName: Name of CloudKMS key to use for the encryption of secrets in // etcd. Ex. // projects/my-project/locations/global/keyRings/my-ring/cryptoKeys/my-ke // y KeyName string `json:"keyName,omitempty"` + // LastOperationErrors: Output only. Records errors seen during + // DatabaseEncryption update operations. + LastOperationErrors []*OperationError `json:"lastOperationErrors,omitempty"` + // State: The desired state of etcd encryption. // // Possible values: @@ -2634,7 +2662,7 @@ type DatabaseEncryption struct { // encryption. State string `json:"state,omitempty"` - // ForceSendFields is a list of field names (e.g. "KeyName") to + // ForceSendFields is a list of field names (e.g. "CurrentState") 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 @@ -2642,10 +2670,10 @@ type DatabaseEncryption struct { // This may be used to include empty fields in Patch requests. ForceSendFields []string `json:"-"` - // NullFields is a list of field names (e.g. "KeyName") 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. "CurrentState") 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:"-"` @@ -6286,6 +6314,41 @@ func (s *Operation) MarshalJSON() ([]byte, error) { return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } +// OperationError: OperationError records errors seen from CloudKMS keys +// encountered during updates to DatabaseEncryption configuration. +type OperationError struct { + // ErrorMessage: Description of the error seen during the operation. + ErrorMessage string `json:"errorMessage,omitempty"` + + // KeyName: CloudKMS key resource that had the error. + KeyName string `json:"keyName,omitempty"` + + // Timestamp: Time when the CloudKMS error was seen. + Timestamp string `json:"timestamp,omitempty"` + + // ForceSendFields is a list of field names (e.g. "ErrorMessage") 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. "ErrorMessage") 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 *OperationError) MarshalJSON() ([]byte, error) { + type NoMethod OperationError + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) +} + // OperationProgress: Information about operation (or operation stage) // progress. type OperationProgress struct { diff --git a/vendor/google.golang.org/api/internal/version.go b/vendor/google.golang.org/api/internal/version.go index eedb1faa7b..9c5b996bb4 100644 --- a/vendor/google.golang.org/api/internal/version.go +++ b/vendor/google.golang.org/api/internal/version.go @@ -5,4 +5,4 @@ package internal // Version is the current tagged release of the library. -const Version = "0.171.0" +const Version = "0.172.0" diff --git a/vendor/google.golang.org/api/storage/v1/storage-api.json b/vendor/google.golang.org/api/storage/v1/storage-api.json index e100da3e29..1b4be6993d 100644 --- a/vendor/google.golang.org/api/storage/v1/storage-api.json +++ b/vendor/google.golang.org/api/storage/v1/storage-api.json @@ -33,7 +33,7 @@ "location": "me-central2" } ], - "etag": "\"33383639383534303336303331313132393335\"", + "etag": "\"33303333323233383838323039393532373539\"", "icons": { "x16": "https://www.google.com/images/icons/product/cloud_storage-16.png", "x32": "https://www.google.com/images/icons/product/cloud_storage-32.png" @@ -3146,7 +3146,8 @@ "id": "storage.objects.restore", "parameterOrder": [ "bucket", - "object" + "object", + "generation" ], "parameters": { "bucket": { @@ -4042,7 +4043,7 @@ } } }, - "revision": "20240311", + "revision": "20240319", "rootUrl": "https://storage.googleapis.com/", "schemas": { "AnywhereCache": { diff --git a/vendor/google.golang.org/api/storage/v1/storage-gen.go b/vendor/google.golang.org/api/storage/v1/storage-gen.go index 3fa4184726..a3f17e5c6f 100644 --- a/vendor/google.golang.org/api/storage/v1/storage-gen.go +++ b/vendor/google.golang.org/api/storage/v1/storage-gen.go @@ -15078,10 +15078,11 @@ type ObjectsRestoreCall struct { // - generation: Selects a specific revision of this object. // - object: Name of the object. For information about how to URL encode // object names to be path safe, see Encoding URI Path Parts. -func (r *ObjectsService) Restore(bucket string, object string) *ObjectsRestoreCall { +func (r *ObjectsService) Restore(bucket string, object string, generation int64) *ObjectsRestoreCall { c := &ObjectsRestoreCall{s: r.s, urlParams_: make(gensupport.URLParams)} c.bucket = bucket c.object = object + c.urlParams_.Set("generation", fmt.Sprint(generation)) return c } @@ -15240,7 +15241,8 @@ func (c *ObjectsRestoreCall) Do(opts ...googleapi.CallOption) (*Object, error) { // "id": "storage.objects.restore", // "parameterOrder": [ // "bucket", - // "object" + // "object", + // "generation" // ], // "parameters": { // "bucket": { diff --git a/vendor/modules.txt b/vendor/modules.txt index 940128a084..ea8351ed78 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -440,7 +440,7 @@ golang.org/x/tools/internal/versions # gomodules.xyz/jsonpatch/v2 v2.4.0 ## explicit; go 1.20 gomodules.xyz/jsonpatch/v2 -# google.golang.org/api v0.171.0 +# google.golang.org/api v0.172.0 ## explicit; go 1.19 google.golang.org/api/container/v1beta1 google.golang.org/api/googleapi @@ -481,7 +481,7 @@ google.golang.org/genproto/googleapis/type/expr google.golang.org/genproto/googleapis/api google.golang.org/genproto/googleapis/api/annotations google.golang.org/genproto/googleapis/api/httpbody -# google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c +# google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 ## explicit; go 1.19 google.golang.org/genproto/googleapis/rpc/code google.golang.org/genproto/googleapis/rpc/errdetails