mirror of https://github.com/knative/pkg.git
Bump google.golang.org/api from 0.161.0 to 0.163.0 (#2953)
* Bump google.golang.org/api from 0.161.0 to 0.163.0 Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.161.0 to 0.163.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.161.0...v0.163.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Run ./hack/update-codegen.sh --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
parent
085f5055ce
commit
3b39834f58
4
go.mod
4
go.mod
|
|
@ -36,7 +36,7 @@ require (
|
|||
golang.org/x/sync v0.6.0
|
||||
golang.org/x/tools v0.17.0
|
||||
gomodules.xyz/jsonpatch/v2 v2.4.0
|
||||
google.golang.org/api v0.161.0
|
||||
google.golang.org/api v0.163.0
|
||||
google.golang.org/grpc v1.61.0
|
||||
google.golang.org/protobuf v1.32.0
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
|
|
@ -106,7 +106,7 @@ require (
|
|||
google.golang.org/appengine v1.6.8 // indirect
|
||||
google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac // indirect
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20240122161410-6c6643bf1457 // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect
|
||||
gopkg.in/inf.v0 v0.9.1 // indirect
|
||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
|
||||
|
|
|
|||
8
go.sum
8
go.sum
|
|
@ -645,8 +645,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.161.0 h1:oYzk/bs26WN10AV7iU7MVJVXBH8oCPS2hHyBiEeFoSU=
|
||||
google.golang.org/api v0.161.0/go.mod h1:0mu0TpK33qnydLvWqbImq2b1eQ5FHRSDCBzAxX9ZHyw=
|
||||
google.golang.org/api v0.163.0 h1:4BBDpPaSH+H28NhnX+WwjXxbRLQ7TWuEKp4BQyEjxvk=
|
||||
google.golang.org/api v0.163.0/go.mod h1:6SulDkfoBIg4NFmCuZ39XeeAgSHCPecfSUuDyYlAHs0=
|
||||
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=
|
||||
|
|
@ -690,8 +690,8 @@ google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac h1:ZL/Teoy/ZGnzyrq
|
|||
google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:+Rvu7ElI+aLzyDQhpHMFMMltsD6m7nqpuWDd2CwJw3k=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20240122161410-6c6643bf1457 h1:KHBtwE+eQc3+NxpjmRFlQ3pJQ2FNnhhgB9xOV8kyBuU=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20240122161410-6c6643bf1457/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac h1:nUQEQmH/csSvFECKYRv6HWEyypysidKl2I6Qpsglq/0=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:daQN87bsDqDoe316QbbvX60nMoJQa4r6Ds0ZuoAe5yA=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe h1:bQnxqljG/wqi4NTXu2+DJ3n7APcEA882QZ1JvhQAq9o=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
|
||||
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=
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import (
|
|||
"net/http"
|
||||
"os"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"golang.org/x/oauth2"
|
||||
"golang.org/x/oauth2/google"
|
||||
|
|
@ -187,3 +188,41 @@ func (ds *DialSettings) GetUniverseDomain() string {
|
|||
func (ds *DialSettings) IsUniverseDomainGDU() bool {
|
||||
return ds.GetUniverseDomain() == ds.GetDefaultUniverseDomain()
|
||||
}
|
||||
|
||||
// GetUniverseDomain returns the default service domain for a given Cloud
|
||||
// universe, from google.Credentials, for comparison with the value returned by
|
||||
// (*DialSettings).GetUniverseDomain. This wrapper function should be removed
|
||||
// to close [TODO(chrisdsmith): issue link here]. See details below.
|
||||
func GetUniverseDomain(creds *google.Credentials) (string, error) {
|
||||
timer := time.NewTimer(time.Second)
|
||||
defer timer.Stop()
|
||||
errors := make(chan error)
|
||||
results := make(chan string)
|
||||
|
||||
go func() {
|
||||
result, err := creds.GetUniverseDomain()
|
||||
if err != nil {
|
||||
errors <- err
|
||||
return
|
||||
}
|
||||
results <- result
|
||||
}()
|
||||
|
||||
select {
|
||||
case err := <-errors:
|
||||
// An error that is returned before the timer expires is legitimate.
|
||||
return "", err
|
||||
case res := <-results:
|
||||
return res, nil
|
||||
case <-timer.C: // Timer is expired.
|
||||
// If err or res was not returned, it means that creds.GetUniverseDomain()
|
||||
// did not complete in 1s. Assume that MDS is likely never responding to
|
||||
// the endpoint and will timeout. This is the source of issues such as
|
||||
// https://github.com/googleapis/google-cloud-go/issues/9350.
|
||||
// Temporarily (2024-02-02) return the GDU domain. Restore the original
|
||||
// calls to creds.GetUniverseDomain() in grpc/dial.go and http/dial.go
|
||||
// and remove this method to close
|
||||
// https://github.com/googleapis/google-api-go-client/issues/2399.
|
||||
return universeDomainDefault, nil
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,4 +5,4 @@
|
|||
package internal
|
||||
|
||||
// Version is the current tagged release of the library.
|
||||
const Version = "0.161.0"
|
||||
const Version = "0.163.0"
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
"location": "me-central2"
|
||||
}
|
||||
],
|
||||
"etag": "\"3136323232353032373039383637313835303036\"",
|
||||
"etag": "\"3136303536373738333537393834303934353433\"",
|
||||
"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"
|
||||
|
|
@ -1632,6 +1632,11 @@
|
|||
"managedFolder"
|
||||
],
|
||||
"parameters": {
|
||||
"allowNonEmpty": {
|
||||
"description": "Allows the deletion of a managed folder even if it is not empty. A managed folder is empty if there are no objects or managed folders that it applies to. Callers must have storage.managedFolders.setIamPolicy permission.",
|
||||
"location": "query",
|
||||
"type": "boolean"
|
||||
},
|
||||
"bucket": {
|
||||
"description": "Name of the bucket containing the managed folder.",
|
||||
"location": "path",
|
||||
|
|
@ -4040,7 +4045,7 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"revision": "20240105",
|
||||
"revision": "20240205",
|
||||
"rootUrl": "https://storage.googleapis.com/",
|
||||
"schemas": {
|
||||
"AnywhereCache": {
|
||||
|
|
@ -4862,14 +4867,6 @@
|
|||
"description": "The kind of item this is. For folders, this is always storage#folder.",
|
||||
"type": "string"
|
||||
},
|
||||
"metadata": {
|
||||
"additionalProperties": {
|
||||
"description": "An individual metadata entry.",
|
||||
"type": "string"
|
||||
},
|
||||
"description": "User-provided metadata, in key/value pairs.",
|
||||
"type": "object"
|
||||
},
|
||||
"metageneration": {
|
||||
"description": "The version of the metadata for this folder. Used for preconditions and for detecting changes in metadata.",
|
||||
"format": "int64",
|
||||
|
|
|
|||
|
|
@ -1860,9 +1860,6 @@ type Folder struct {
|
|||
// storage#folder.
|
||||
Kind string `json:"kind,omitempty"`
|
||||
|
||||
// Metadata: User-provided metadata, in key/value pairs.
|
||||
Metadata map[string]string `json:"metadata,omitempty"`
|
||||
|
||||
// Metageneration: The version of the metadata for this folder. Used for
|
||||
// preconditions and for detecting changes in metadata.
|
||||
Metageneration int64 `json:"metageneration,omitempty,string"`
|
||||
|
|
@ -9455,6 +9452,16 @@ func (r *ManagedFoldersService) Delete(bucket string, managedFolder string) *Man
|
|||
return c
|
||||
}
|
||||
|
||||
// AllowNonEmpty sets the optional parameter "allowNonEmpty": Allows the
|
||||
// deletion of a managed folder even if it is not empty. A managed
|
||||
// folder is empty if there are no objects or managed folders that it
|
||||
// applies to. Callers must have storage.managedFolders.setIamPolicy
|
||||
// permission.
|
||||
func (c *ManagedFoldersDeleteCall) AllowNonEmpty(allowNonEmpty bool) *ManagedFoldersDeleteCall {
|
||||
c.urlParams_.Set("allowNonEmpty", fmt.Sprint(allowNonEmpty))
|
||||
return c
|
||||
}
|
||||
|
||||
// IfMetagenerationMatch sets the optional parameter
|
||||
// "ifMetagenerationMatch": If set, only deletes the managed folder if
|
||||
// its metageneration matches this value.
|
||||
|
|
@ -9541,6 +9548,11 @@ func (c *ManagedFoldersDeleteCall) Do(opts ...googleapi.CallOption) error {
|
|||
// "managedFolder"
|
||||
// ],
|
||||
// "parameters": {
|
||||
// "allowNonEmpty": {
|
||||
// "description": "Allows the deletion of a managed folder even if it is not empty. A managed folder is empty if there are no objects or managed folders that it applies to. Callers must have storage.managedFolders.setIamPolicy permission.",
|
||||
// "location": "query",
|
||||
// "type": "boolean"
|
||||
// },
|
||||
// "bucket": {
|
||||
// "description": "Name of the bucket containing the managed folder.",
|
||||
// "location": "path",
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ func dial(ctx context.Context, insecure bool, o *internal.DialSettings) (*grpc.C
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
credsUniverseDomain, err := creds.GetUniverseDomain()
|
||||
credsUniverseDomain, err := internal.GetUniverseDomain(creds)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ func newTransport(ctx context.Context, base http.RoundTripper, settings *interna
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
credsUniverseDomain, err := creds.GetUniverseDomain()
|
||||
credsUniverseDomain, err := internal.GetUniverseDomain(creds)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -439,7 +439,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.161.0
|
||||
# google.golang.org/api v0.163.0
|
||||
## explicit; go 1.19
|
||||
google.golang.org/api/container/v1beta1
|
||||
google.golang.org/api/googleapi
|
||||
|
|
@ -482,7 +482,7 @@ google.golang.org/genproto/protobuf/field_mask
|
|||
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-20240116215550-a9fa1716bcac
|
||||
# google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe
|
||||
## explicit; go 1.19
|
||||
google.golang.org/genproto/googleapis/rpc/code
|
||||
google.golang.org/genproto/googleapis/rpc/errdetails
|
||||
|
|
|
|||
Loading…
Reference in New Issue