From 6a8ec7426120be3c7febb874336b71d8fc96c6d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Feb 2024 13:19:14 +0000 Subject: mod: bump cloud.google.com/go/secretmanager from 1.11.4 to 1.11.5 Bumps [cloud.google.com/go/secretmanager](https://github.com/googleapis/google-cloud-go) from 1.11.4 to 1.11.5. - [Release notes](https://github.com/googleapis/google-cloud-go/releases) - [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-cloud-go/compare/orgpolicy/v1.11.4...secretmanager/v1.11.5) --- updated-dependencies: - dependency-name: cloud.google.com/go/secretmanager dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 +- .../go/secretmanager/apiv1/auxiliary.go | 116 +++++++++++++++++++++ .../cloud.google.com/go/secretmanager/apiv1/doc.go | 22 ++-- .../secretmanager/apiv1/secret_manager_client.go | 100 +----------------- .../apiv1/secretmanagerpb/resources.pb.go | 5 +- .../apiv1/secretmanagerpb/service.pb.go | 2 +- .../go/secretmanager/internal/version.go | 2 +- vendor/modules.txt | 2 +- 9 files changed, 139 insertions(+), 116 deletions(-) create mode 100644 vendor/cloud.google.com/go/secretmanager/apiv1/auxiliary.go diff --git a/go.mod b/go.mod index 29e7914d1..5268bc0bf 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( cloud.google.com/go/logging v1.9.0 cloud.google.com/go/profiler v0.4.0 cloud.google.com/go/pubsub v1.36.1 - cloud.google.com/go/secretmanager v1.11.4 + cloud.google.com/go/secretmanager v1.11.5 cloud.google.com/go/storage v1.36.0 github.com/dvyukov/go-fuzz v0.0.0-20220726122315-1d375ef9f9f6 github.com/golangci/golangci-lint v1.55.2 diff --git a/go.sum b/go.sum index fb5faf5a3..522afa743 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIA cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= cloud.google.com/go/pubsub v1.36.1 h1:dfEPuGCHGbWUhaMCTHUFjfroILEkx55iUmKBZTP5f+Y= cloud.google.com/go/pubsub v1.36.1/go.mod h1:iYjCa9EzWOoBiTdd4ps7QoMtMln5NwaZQpK1hbRfBDE= -cloud.google.com/go/secretmanager v1.11.4 h1:krnX9qpG2kR2fJ+u+uNyNo+ACVhplIAS4Pu7u+4gd+k= -cloud.google.com/go/secretmanager v1.11.4/go.mod h1:wreJlbS9Zdq21lMzWmJ0XhWW2ZxgPeahsqeV/vZoJ3w= +cloud.google.com/go/secretmanager v1.11.5 h1:82fpF5vBBvu9XW4qj0FU2C6qVMtj1RM/XHwKXUEAfYY= +cloud.google.com/go/secretmanager v1.11.5/go.mod h1:eAGv+DaCHkeVyQi0BeXgAHOU0RdrMeZIASKc+S7VqH4= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= diff --git a/vendor/cloud.google.com/go/secretmanager/apiv1/auxiliary.go b/vendor/cloud.google.com/go/secretmanager/apiv1/auxiliary.go new file mode 100644 index 000000000..1e842c9fd --- /dev/null +++ b/vendor/cloud.google.com/go/secretmanager/apiv1/auxiliary.go @@ -0,0 +1,116 @@ +// Copyright 2024 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Code generated by protoc-gen-go_gapic. DO NOT EDIT. + +package secretmanager + +import ( + secretmanagerpb "cloud.google.com/go/secretmanager/apiv1/secretmanagerpb" + "google.golang.org/api/iterator" +) + +// SecretIterator manages a stream of *secretmanagerpb.Secret. +type SecretIterator struct { + items []*secretmanagerpb.Secret + pageInfo *iterator.PageInfo + nextFunc func() error + + // Response is the raw response for the current page. + // It must be cast to the RPC response type. + // Calling Next() or InternalFetch() updates this value. + Response interface{} + + // InternalFetch is for use by the Google Cloud Libraries only. + // It is not part of the stable interface of this package. + // + // InternalFetch returns results from a single call to the underlying RPC. + // The number of results is no greater than pageSize. + // If there are no more results, nextPageToken is empty and err is nil. + InternalFetch func(pageSize int, pageToken string) (results []*secretmanagerpb.Secret, nextPageToken string, err error) +} + +// PageInfo supports pagination. See the google.golang.org/api/iterator package for details. +func (it *SecretIterator) PageInfo() *iterator.PageInfo { + return it.pageInfo +} + +// Next returns the next result. Its second return value is iterator.Done if there are no more +// results. Once Next returns Done, all subsequent calls will return Done. +func (it *SecretIterator) Next() (*secretmanagerpb.Secret, error) { + var item *secretmanagerpb.Secret + if err := it.nextFunc(); err != nil { + return item, err + } + item = it.items[0] + it.items = it.items[1:] + return item, nil +} + +func (it *SecretIterator) bufLen() int { + return len(it.items) +} + +func (it *SecretIterator) takeBuf() interface{} { + b := it.items + it.items = nil + return b +} + +// SecretVersionIterator manages a stream of *secretmanagerpb.SecretVersion. +type SecretVersionIterator struct { + items []*secretmanagerpb.SecretVersion + pageInfo *iterator.PageInfo + nextFunc func() error + + // Response is the raw response for the current page. + // It must be cast to the RPC response type. + // Calling Next() or InternalFetch() updates this value. + Response interface{} + + // InternalFetch is for use by the Google Cloud Libraries only. + // It is not part of the stable interface of this package. + // + // InternalFetch returns results from a single call to the underlying RPC. + // The number of results is no greater than pageSize. + // If there are no more results, nextPageToken is empty and err is nil. + InternalFetch func(pageSize int, pageToken string) (results []*secretmanagerpb.SecretVersion, nextPageToken string, err error) +} + +// PageInfo supports pagination. See the google.golang.org/api/iterator package for details. +func (it *SecretVersionIterator) PageInfo() *iterator.PageInfo { + return it.pageInfo +} + +// Next returns the next result. Its second return value is iterator.Done if there are no more +// results. Once Next returns Done, all subsequent calls will return Done. +func (it *SecretVersionIterator) Next() (*secretmanagerpb.SecretVersion, error) { + var item *secretmanagerpb.SecretVersion + if err := it.nextFunc(); err != nil { + return item, err + } + item = it.items[0] + it.items = it.items[1:] + return item, nil +} + +func (it *SecretVersionIterator) bufLen() int { + return len(it.items) +} + +func (it *SecretVersionIterator) takeBuf() interface{} { + b := it.items + it.items = nil + return b +} diff --git a/vendor/cloud.google.com/go/secretmanager/apiv1/doc.go b/vendor/cloud.google.com/go/secretmanager/apiv1/doc.go index 04582cf89..4255deed3 100644 --- a/vendor/cloud.google.com/go/secretmanager/apiv1/doc.go +++ b/vendor/cloud.google.com/go/secretmanager/apiv1/doc.go @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -68,22 +68,16 @@ // } // defer c.Close() // -// req := &secretmanagerpb.ListSecretsRequest{ +// req := &secretmanagerpb.AccessSecretVersionRequest{ // // TODO: Fill request struct fields. -// // See https://pkg.go.dev/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb#ListSecretsRequest. +// // See https://pkg.go.dev/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb#AccessSecretVersionRequest. // } -// it := c.ListSecrets(ctx, req) -// for { -// resp, err := it.Next() -// if err == iterator.Done { -// break -// } -// if err != nil { -// // TODO: Handle error. -// } -// // TODO: Use resp. -// _ = resp +// resp, err := c.AccessSecretVersion(ctx, req) +// if err != nil { +// // TODO: Handle error. // } +// // TODO: Use resp. +// _ = resp // // # Use of Context // diff --git a/vendor/cloud.google.com/go/secretmanager/apiv1/secret_manager_client.go b/vendor/cloud.google.com/go/secretmanager/apiv1/secret_manager_client.go index d65d36f12..4e866e66d 100644 --- a/vendor/cloud.google.com/go/secretmanager/apiv1/secret_manager_client.go +++ b/vendor/cloud.google.com/go/secretmanager/apiv1/secret_manager_client.go @@ -1,4 +1,4 @@ -// Copyright 2023 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -65,7 +65,9 @@ type CallOptions struct { func defaultGRPCClientOptions() []option.ClientOption { return []option.ClientOption{ internaloption.WithDefaultEndpoint("secretmanager.googleapis.com:443"), + internaloption.WithDefaultEndpointTemplate("secretmanager.UNIVERSE_DOMAIN:443"), internaloption.WithDefaultMTLSEndpoint("secretmanager.mtls.googleapis.com:443"), + internaloption.WithDefaultUniverseDomain("googleapis.com"), internaloption.WithDefaultAudience("https://secretmanager.googleapis.com/"), internaloption.WithDefaultScopes(DefaultAuthScopes()...), internaloption.EnableJwtWithScope(), @@ -486,7 +488,9 @@ func NewRESTClient(ctx context.Context, opts ...option.ClientOption) (*Client, e func defaultRESTClientOptions() []option.ClientOption { return []option.ClientOption{ internaloption.WithDefaultEndpoint("https://secretmanager.googleapis.com"), + internaloption.WithDefaultEndpointTemplate("https://secretmanager.UNIVERSE_DOMAIN"), internaloption.WithDefaultMTLSEndpoint("https://secretmanager.mtls.googleapis.com"), + internaloption.WithDefaultUniverseDomain("googleapis.com"), internaloption.WithDefaultAudience("https://secretmanager.googleapis.com/"), internaloption.WithDefaultScopes(DefaultAuthScopes()...), } @@ -1875,97 +1879,3 @@ func (c *restClient) TestIamPermissions(ctx context.Context, req *iampb.TestIamP } return resp, nil } - -// SecretIterator manages a stream of *secretmanagerpb.Secret. -type SecretIterator struct { - items []*secretmanagerpb.Secret - pageInfo *iterator.PageInfo - nextFunc func() error - - // Response is the raw response for the current page. - // It must be cast to the RPC response type. - // Calling Next() or InternalFetch() updates this value. - Response interface{} - - // InternalFetch is for use by the Google Cloud Libraries only. - // It is not part of the stable interface of this package. - // - // InternalFetch returns results from a single call to the underlying RPC. - // The number of results is no greater than pageSize. - // If there are no more results, nextPageToken is empty and err is nil. - InternalFetch func(pageSize int, pageToken string) (results []*secretmanagerpb.Secret, nextPageToken string, err error) -} - -// PageInfo supports pagination. See the google.golang.org/api/iterator package for details. -func (it *SecretIterator) PageInfo() *iterator.PageInfo { - return it.pageInfo -} - -// Next returns the next result. Its second return value is iterator.Done if there are no more -// results. Once Next returns Done, all subsequent calls will return Done. -func (it *SecretIterator) Next() (*secretmanagerpb.Secret, error) { - var item *secretmanagerpb.Secret - if err := it.nextFunc(); err != nil { - return item, err - } - item = it.items[0] - it.items = it.items[1:] - return item, nil -} - -func (it *SecretIterator) bufLen() int { - return len(it.items) -} - -func (it *SecretIterator) takeBuf() interface{} { - b := it.items - it.items = nil - return b -} - -// SecretVersionIterator manages a stream of *secretmanagerpb.SecretVersion. -type SecretVersionIterator struct { - items []*secretmanagerpb.SecretVersion - pageInfo *iterator.PageInfo - nextFunc func() error - - // Response is the raw response for the current page. - // It must be cast to the RPC response type. - // Calling Next() or InternalFetch() updates this value. - Response interface{} - - // InternalFetch is for use by the Google Cloud Libraries only. - // It is not part of the stable interface of this package. - // - // InternalFetch returns results from a single call to the underlying RPC. - // The number of results is no greater than pageSize. - // If there are no more results, nextPageToken is empty and err is nil. - InternalFetch func(pageSize int, pageToken string) (results []*secretmanagerpb.SecretVersion, nextPageToken string, err error) -} - -// PageInfo supports pagination. See the google.golang.org/api/iterator package for details. -func (it *SecretVersionIterator) PageInfo() *iterator.PageInfo { - return it.pageInfo -} - -// Next returns the next result. Its second return value is iterator.Done if there are no more -// results. Once Next returns Done, all subsequent calls will return Done. -func (it *SecretVersionIterator) Next() (*secretmanagerpb.SecretVersion, error) { - var item *secretmanagerpb.SecretVersion - if err := it.nextFunc(); err != nil { - return item, err - } - item = it.items[0] - it.items = it.items[1:] - return item, nil -} - -func (it *SecretVersionIterator) bufLen() int { - return len(it.items) -} - -func (it *SecretVersionIterator) takeBuf() interface{} { - b := it.items - it.items = nil - return b -} diff --git a/vendor/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb/resources.pb.go b/vendor/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb/resources.pb.go index 05e828237..1d874cd71 100644 --- a/vendor/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb/resources.pb.go +++ b/vendor/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb/resources.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.23.2 // source: google/cloud/secretmanager/v1/resources.proto @@ -155,6 +155,7 @@ type Secret struct { // can be reversed. // // Types that are assignable to Expiration: + // // *Secret_ExpireTime // *Secret_Ttl Expiration isSecret_Expiration `protobuf_oneof:"expiration"` @@ -460,6 +461,7 @@ type Replication struct { // The replication policy for this secret. // // Types that are assignable to Replication: + // // *Replication_Automatic_ // *Replication_UserManaged_ Replication isReplication_Replication `protobuf_oneof:"replication"` @@ -611,6 +613,7 @@ type ReplicationStatus struct { // [SecretVersion][google.cloud.secretmanager.v1.SecretVersion]. // // Types that are assignable to ReplicationStatus: + // // *ReplicationStatus_Automatic // *ReplicationStatus_UserManaged ReplicationStatus isReplicationStatus_ReplicationStatus `protobuf_oneof:"replication_status"` diff --git a/vendor/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb/service.pb.go b/vendor/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb/service.pb.go index ac0cf8128..9fd866401 100644 --- a/vendor/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb/service.pb.go +++ b/vendor/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb/service.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc v4.23.2 // source: google/cloud/secretmanager/v1/service.proto diff --git a/vendor/cloud.google.com/go/secretmanager/internal/version.go b/vendor/cloud.google.com/go/secretmanager/internal/version.go index 1a7f5cb6c..db61bfa8f 100644 --- a/vendor/cloud.google.com/go/secretmanager/internal/version.go +++ b/vendor/cloud.google.com/go/secretmanager/internal/version.go @@ -15,4 +15,4 @@ package internal // Version is the current tagged release of the library. -const Version = "1.11.4" +const Version = "1.11.5" diff --git a/vendor/modules.txt b/vendor/modules.txt index be835c915..6f3ab0ce8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -47,7 +47,7 @@ cloud.google.com/go/pubsub/apiv1/pubsubpb cloud.google.com/go/pubsub/internal cloud.google.com/go/pubsub/internal/distribution cloud.google.com/go/pubsub/internal/scheduler -# cloud.google.com/go/secretmanager v1.11.4 +# cloud.google.com/go/secretmanager v1.11.5 ## explicit; go 1.19 cloud.google.com/go/secretmanager/apiv1 cloud.google.com/go/secretmanager/apiv1/secretmanagerpb -- cgit mrf-deployment