make vendor-update (#6627)

make vendor-update
This commit is contained in:
Nikolay 2024-07-10 17:14:51 +02:00 committed by GitHub
parent c688b53f56
commit 14ac8a09ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
79 changed files with 11107 additions and 593 deletions

40
go.mod
View file

@ -3,17 +3,17 @@ module github.com/VictoriaMetrics/VictoriaMetrics
go 1.22.5 go 1.22.5
require ( require (
cloud.google.com/go/storage v1.42.0 cloud.google.com/go/storage v1.43.0
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2
github.com/VictoriaMetrics/easyproto v0.1.4 github.com/VictoriaMetrics/easyproto v0.1.4
github.com/VictoriaMetrics/fastcache v1.12.2 github.com/VictoriaMetrics/fastcache v1.12.2
github.com/VictoriaMetrics/metrics v1.34.0 github.com/VictoriaMetrics/metrics v1.34.1
github.com/VictoriaMetrics/metricsql v0.76.0 github.com/VictoriaMetrics/metricsql v0.76.0
github.com/aws/aws-sdk-go-v2 v1.30.1 github.com/aws/aws-sdk-go-v2 v1.30.1
github.com/aws/aws-sdk-go-v2/config v1.27.23 github.com/aws/aws-sdk-go-v2/config v1.27.24
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.4 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.5
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.58.0
github.com/bmatcuk/doublestar/v4 v4.6.1 github.com/bmatcuk/doublestar/v4 v4.6.1
github.com/cespare/xxhash/v2 v2.3.0 github.com/cespare/xxhash/v2 v2.3.0
@ -23,7 +23,7 @@ require (
github.com/googleapis/gax-go/v2 v2.12.5 github.com/googleapis/gax-go/v2 v2.12.5
github.com/influxdata/influxdb v1.11.5 github.com/influxdata/influxdb v1.11.5
github.com/klauspost/compress v1.17.9 github.com/klauspost/compress v1.17.9
github.com/prometheus/prometheus v0.53.0 github.com/prometheus/prometheus v0.53.1
github.com/urfave/cli/v2 v2.27.2 github.com/urfave/cli/v2 v2.27.2
github.com/valyala/fastjson v1.6.4 github.com/valyala/fastjson v1.6.4
github.com/valyala/fastrand v1.1.0 github.com/valyala/fastrand v1.1.0
@ -32,24 +32,24 @@ require (
github.com/valyala/histogram v1.2.0 github.com/valyala/histogram v1.2.0
github.com/valyala/quicktemplate v1.8.0 github.com/valyala/quicktemplate v1.8.0
golang.org/x/oauth2 v0.21.0 golang.org/x/oauth2 v0.21.0
golang.org/x/sys v0.21.0 golang.org/x/sys v0.22.0
google.golang.org/api v0.187.0 google.golang.org/api v0.188.0
gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v2 v2.4.0
) )
require ( require (
cloud.google.com/go v0.115.0 // indirect cloud.google.com/go v0.115.0 // indirect
cloud.google.com/go/auth v0.6.1 // indirect cloud.google.com/go/auth v0.7.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect
cloud.google.com/go/compute/metadata v0.4.0 // indirect cloud.google.com/go/compute/metadata v0.4.0 // indirect
cloud.google.com/go/iam v1.1.10 // indirect cloud.google.com/go/iam v1.1.10 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.1 // indirect github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.1 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/VividCortex/ewma v1.2.0 // indirect github.com/VividCortex/ewma v1.2.0 // indirect
github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect
github.com/aws/aws-sdk-go v1.54.13 // indirect github.com/aws/aws-sdk-go v1.54.17 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.23 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.17.24 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.9 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.9 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.13 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.13 // indirect
@ -60,7 +60,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.15 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.15 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.13 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.13 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.22.1 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.22.1 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.1 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.2 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.30.1 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.30.1 // indirect
github.com/aws/smithy-go v1.20.3 // indirect github.com/aws/smithy-go v1.20.3 // indirect
github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 // indirect github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 // indirect
@ -109,23 +109,23 @@ require (
go.opencensus.io v0.24.0 // indirect go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect
go.opentelemetry.io/collector/semconv v0.104.0 // indirect go.opentelemetry.io/collector/semconv v0.104.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.uber.org/atomic v1.11.0 // indirect go.uber.org/atomic v1.11.0 // indirect
go.uber.org/goleak v1.3.0 // indirect go.uber.org/goleak v1.3.0 // indirect
go.uber.org/multierr v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.24.0 // indirect golang.org/x/crypto v0.25.0 // indirect
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect
golang.org/x/net v0.26.0 // indirect golang.org/x/net v0.27.0 // indirect
golang.org/x/sync v0.7.0 // indirect golang.org/x/sync v0.7.0 // indirect
golang.org/x/text v0.16.0 // indirect golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect golang.org/x/time v0.5.0 // indirect
google.golang.org/genproto v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/genproto v0.0.0-20240709173604-40e1e62336c5 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240709173604-40e1e62336c5 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5 // indirect
google.golang.org/grpc v1.65.0 // indirect google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect

96
go.sum
View file

@ -15,10 +15,10 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY
cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14=
cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU= cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU=
cloud.google.com/go/auth v0.6.1 h1:T0Zw1XM5c1GlpN2HYr2s+m3vr1p2wy+8VN+Z1FKxW38= cloud.google.com/go/auth v0.7.0 h1:kf/x9B3WTbBUHkC+1VS8wwwli9TzhSt0vSTVBmMR8Ts=
cloud.google.com/go/auth v0.6.1/go.mod h1:eFHG7zDzbXHKmjJddFG/rBlcGp6t25SwRUiEQSlO4x4= cloud.google.com/go/auth v0.7.0/go.mod h1:D+WqdrpcjmiCgWrXmLLxOVq1GACoE36chW6KXoEvuIw=
cloud.google.com/go/auth/oauth2adapt v0.2.2 h1:+TTV8aXpjeChS9M+aTtN/TjdQnzJvmzKFt//oWu7HX4= cloud.google.com/go/auth/oauth2adapt v0.2.3 h1:MlxF+Pd3OmSudg/b1yZ5lJwoXCEaeedAguodky1PcKI=
cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q= cloud.google.com/go/auth/oauth2adapt v0.2.3/go.mod h1:tMQXOfZzFuNuUxOypHlQEXgdfX5cuhwU+ffUuXRJE8I=
cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
@ -31,8 +31,8 @@ cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7
cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
cloud.google.com/go/iam v1.1.10 h1:ZSAr64oEhQSClwBL670MsJAW5/RLiC6kfw3Bqmd5ZDI= cloud.google.com/go/iam v1.1.10 h1:ZSAr64oEhQSClwBL670MsJAW5/RLiC6kfw3Bqmd5ZDI=
cloud.google.com/go/iam v1.1.10/go.mod h1:iEgMq62sg8zx446GCaijmA2Miwg5o3UbO+nI47WHJps= cloud.google.com/go/iam v1.1.10/go.mod h1:iEgMq62sg8zx446GCaijmA2Miwg5o3UbO+nI47WHJps=
cloud.google.com/go/longrunning v0.5.8 h1:QThI5BFSlYlS7K0wnABCdmKsXbG/htLc3nTPzrfOgeU= cloud.google.com/go/longrunning v0.5.9 h1:haH9pAuXdPAMqHvzX0zlWQigXT7B0+CL4/2nXXdBo5k=
cloud.google.com/go/longrunning v0.5.8/go.mod h1:oJDErR/mm5h44gzsfjQlxd6jyjFvuBPOxR1TLy2+cQk= cloud.google.com/go/longrunning v0.5.9/go.mod h1:HD+0l9/OOW0za6UWdKJtXoFAX/BGg/3Wj8p10NeWF7c=
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
@ -42,8 +42,8 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
cloud.google.com/go/storage v1.42.0 h1:4QtGpplCVt1wz6g5o1ifXd656P5z+yNgzdw1tVfp0cU= cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyXFs=
cloud.google.com/go/storage v1.42.0/go.mod h1:HjMXRFq65pGKFn6hxj6x3HCyR41uSB72Z0SO/Vn6JFQ= cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0 h1:1nGuui+4POelzDwI7RG56yfQJHCnKvwfMoU7VsEp+Zg= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0 h1:1nGuui+4POelzDwI7RG56yfQJHCnKvwfMoU7VsEp+Zg=
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0/go.mod h1:99EvauvlcJ1U06amZiksfYz/3aFGyIhWGHVyiZXtBAI= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0/go.mod h1:99EvauvlcJ1U06amZiksfYz/3aFGyIhWGHVyiZXtBAI=
@ -71,8 +71,9 @@ github.com/VictoriaMetrics/easyproto v0.1.4 h1:r8cNvo8o6sR4QShBXQd1bKw/VVLSQma/V
github.com/VictoriaMetrics/easyproto v0.1.4/go.mod h1:QlGlzaJnDfFd8Lk6Ci/fuLxfTo3/GThPs2KH23mv710= github.com/VictoriaMetrics/easyproto v0.1.4/go.mod h1:QlGlzaJnDfFd8Lk6Ci/fuLxfTo3/GThPs2KH23mv710=
github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI= github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI=
github.com/VictoriaMetrics/fastcache v1.12.2/go.mod h1:AmC+Nzz1+3G2eCPapF6UcsnkThDcMsQicp4xDukwJYI= github.com/VictoriaMetrics/fastcache v1.12.2/go.mod h1:AmC+Nzz1+3G2eCPapF6UcsnkThDcMsQicp4xDukwJYI=
github.com/VictoriaMetrics/metrics v1.34.0 h1:0i8k/gdOJdSoZB4Z9pikVnVQXfhcIvnG7M7h2WaQW2w=
github.com/VictoriaMetrics/metrics v1.34.0/go.mod h1:r7hveu6xMdUACXvB8TYdAj8WEsKzWB0EkpJN+RDtOf8= github.com/VictoriaMetrics/metrics v1.34.0/go.mod h1:r7hveu6xMdUACXvB8TYdAj8WEsKzWB0EkpJN+RDtOf8=
github.com/VictoriaMetrics/metrics v1.34.1 h1:7EUEObv45ekfyY6PWat0K/ytluZ4q6aujzXN3g41g/A=
github.com/VictoriaMetrics/metrics v1.34.1/go.mod h1:r7hveu6xMdUACXvB8TYdAj8WEsKzWB0EkpJN+RDtOf8=
github.com/VictoriaMetrics/metricsql v0.76.0 h1:hl7vqJqyH2d8zKImzalkFrkFiD5q4ACF8gl3s86DqKA= github.com/VictoriaMetrics/metricsql v0.76.0 h1:hl7vqJqyH2d8zKImzalkFrkFiD5q4ACF8gl3s86DqKA=
github.com/VictoriaMetrics/metricsql v0.76.0/go.mod h1:1g4hdCwlbJZ851PU9VN65xy9Rdlzupo6fx3SNZ8Z64U= github.com/VictoriaMetrics/metricsql v0.76.0/go.mod h1:1g4hdCwlbJZ851PU9VN65xy9Rdlzupo6fx3SNZ8Z64U=
github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow= github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow=
@ -89,20 +90,20 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax
github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
github.com/aws/aws-sdk-go v1.54.13 h1:zpCuiG+/mFdDY/klKJvmSioAZWk45F4rLGq0JWVAAzk= github.com/aws/aws-sdk-go v1.54.17 h1:ZV/qwcCIhMHgsJ6iXXPVYI0s1MdLT+5LW28ClzCUPeI=
github.com/aws/aws-sdk-go v1.54.13/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aws/aws-sdk-go v1.54.17/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
github.com/aws/aws-sdk-go-v2 v1.30.1 h1:4y/5Dvfrhd1MxRDD77SrfsDaj8kUkkljU7XE83NPV+o= github.com/aws/aws-sdk-go-v2 v1.30.1 h1:4y/5Dvfrhd1MxRDD77SrfsDaj8kUkkljU7XE83NPV+o=
github.com/aws/aws-sdk-go-v2 v1.30.1/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc= github.com/aws/aws-sdk-go-v2 v1.30.1/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 h1:tW1/Rkad38LA15X4UQtjXZXNKsCgkshC3EbmcUmghTg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 h1:tW1/Rkad38LA15X4UQtjXZXNKsCgkshC3EbmcUmghTg=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3/go.mod h1:UbnqO+zjqk3uIt9yCACHJ9IVNhyhOCnYk8yA19SAWrM= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3/go.mod h1:UbnqO+zjqk3uIt9yCACHJ9IVNhyhOCnYk8yA19SAWrM=
github.com/aws/aws-sdk-go-v2/config v1.27.23 h1:Cr/gJEa9NAS7CDAjbnB7tHYb3aLZI2gVggfmSAasDac= github.com/aws/aws-sdk-go-v2/config v1.27.24 h1:NM9XicZ5o1CBU/MZaHwFtimRpWx9ohAUAqkG6AqSqPo=
github.com/aws/aws-sdk-go-v2/config v1.27.23/go.mod h1:WMMYHqLCFu5LH05mFOF5tsq1PGEMfKbu083VKqLCd0o= github.com/aws/aws-sdk-go-v2/config v1.27.24/go.mod h1:aXzi6QJTuQRVVusAO8/NxpdTeTyr/wRcybdDtfUwJSs=
github.com/aws/aws-sdk-go-v2/credentials v1.17.23 h1:G1CfmLVoO2TdQ8z9dW+JBc/r8+MqyPQhXCafNZcXVZo= github.com/aws/aws-sdk-go-v2/credentials v1.17.24 h1:YclAsrnb1/GTQNt2nzv+756Iw4mF8AOzcDfweWwwm/M=
github.com/aws/aws-sdk-go-v2/credentials v1.17.23/go.mod h1:V/DvSURn6kKgcuKEk4qwSwb/fZ2d++FFARtWSbXnLqY= github.com/aws/aws-sdk-go-v2/credentials v1.17.24/go.mod h1:Hld7tmnAkoBQdTMNYZGzztzKRdA4fCdn9L83LOoigac=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.9 h1:Aznqksmd6Rfv2HQN9cpqIV/lQRMaIpJkLLaJ1ZI76no= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.9 h1:Aznqksmd6Rfv2HQN9cpqIV/lQRMaIpJkLLaJ1ZI76no=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.9/go.mod h1:WQr3MY7AxGNxaqAtsDWn+fBxmd4XvLkzeqQ8P1VM0/w= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.9/go.mod h1:WQr3MY7AxGNxaqAtsDWn+fBxmd4XvLkzeqQ8P1VM0/w=
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.4 h1:6eKRM6fgeXG4krRO9XKz755vuRhT5UyB9M1W6vjA3JU= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.5 h1:qkipTyOc+ElVS+TgGJCf/6gqu0CL5+ii19W/eMQfY94=
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.4/go.mod h1:h0TjcRi+nTob6fksqubKOe+Hra8uqfgmN+vuw4xRwWE= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.5/go.mod h1:UjB35RXl+ESpnVtyaKqdw11NhMxm90lF9o2zqJNbi14=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13 h1:5SAoZ4jYpGH4721ZNoS1znQrhOfZinOhc4XuTXx/nVc= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13 h1:5SAoZ4jYpGH4721ZNoS1znQrhOfZinOhc4XuTXx/nVc=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13/go.mod h1:+rdA6ZLpaSeM7tSg/B0IEDinCIBJGmW8rKDFkYpP04g= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13/go.mod h1:+rdA6ZLpaSeM7tSg/B0IEDinCIBJGmW8rKDFkYpP04g=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.13 h1:WIijqeaAO7TYFLbhsZmi2rgLEAtWOC1LhxCAVTJlSKw= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.13 h1:WIijqeaAO7TYFLbhsZmi2rgLEAtWOC1LhxCAVTJlSKw=
@ -123,8 +124,8 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.58.0 h1:4rhV0Hn+bf8IAIUphRX1moBcEvKJi
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.0/go.mod h1:hdV0NTYd0RwV4FvNKhKUNbPLZoq9CTr/lke+3I7aCAI= github.com/aws/aws-sdk-go-v2/service/s3 v1.58.0/go.mod h1:hdV0NTYd0RwV4FvNKhKUNbPLZoq9CTr/lke+3I7aCAI=
github.com/aws/aws-sdk-go-v2/service/sso v1.22.1 h1:p1GahKIjyMDZtiKoIn0/jAj/TkMzfzndDv5+zi2Mhgc= github.com/aws/aws-sdk-go-v2/service/sso v1.22.1 h1:p1GahKIjyMDZtiKoIn0/jAj/TkMzfzndDv5+zi2Mhgc=
github.com/aws/aws-sdk-go-v2/service/sso v1.22.1/go.mod h1:/vWdhoIoYA5hYoPZ6fm7Sv4d8701PiG5VKe8/pPJL60= github.com/aws/aws-sdk-go-v2/service/sso v1.22.1/go.mod h1:/vWdhoIoYA5hYoPZ6fm7Sv4d8701PiG5VKe8/pPJL60=
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.1 h1:lCEv9f8f+zJ8kcFeAjRZsekLd/x5SAm96Cva+VbUdo8= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.2 h1:ORnrOK0C4WmYV/uYt3koHEWBLYsRDwk2Np+eEoyV4Z0=
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.1/go.mod h1:xyFHA4zGxgYkdD73VeezHt3vSKEG9EmFnGwoKlP00u4= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.2/go.mod h1:xyFHA4zGxgYkdD73VeezHt3vSKEG9EmFnGwoKlP00u4=
github.com/aws/aws-sdk-go-v2/service/sts v1.30.1 h1:+woJ607dllHJQtsnJLi52ycuqHMwlW+Wqm2Ppsfp4nQ= github.com/aws/aws-sdk-go-v2/service/sts v1.30.1 h1:+woJ607dllHJQtsnJLi52ycuqHMwlW+Wqm2Ppsfp4nQ=
github.com/aws/aws-sdk-go-v2/service/sts v1.30.1/go.mod h1:jiNR3JqT15Dm+QWq2SRgh0x0bCNSRP2L25+CqPNpJlQ= github.com/aws/aws-sdk-go-v2/service/sts v1.30.1/go.mod h1:jiNR3JqT15Dm+QWq2SRgh0x0bCNSRP2L25+CqPNpJlQ=
github.com/aws/smithy-go v1.20.3 h1:ryHwveWzPV5BIof6fyDvor6V3iUL7nTfiTKXHiW05nE= github.com/aws/smithy-go v1.20.3 h1:ryHwveWzPV5BIof6fyDvor6V3iUL7nTfiTKXHiW05nE=
@ -450,8 +451,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
github.com/prometheus/prometheus v0.53.0 h1:vOnhpUKrDv954jnVBvhG/ZQJ3kqscnKI+Hbdwo2tAhc= github.com/prometheus/prometheus v0.53.1 h1:B0xu4VuVTKYrIuBMn/4YSUoIPYxs956qsOfcS4rqCuA=
github.com/prometheus/prometheus v0.53.0/go.mod h1:RZDkzs+ShMBDkAPQkLEaLBXpjmDcjhNxU2drUVPgKUU= github.com/prometheus/prometheus v0.53.1/go.mod h1:RZDkzs+ShMBDkAPQkLEaLBXpjmDcjhNxU2drUVPgKUU=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
@ -518,10 +519,10 @@ go.opentelemetry.io/collector/pdata v1.11.0 h1:rzYyV1zfTQQz1DI9hCiaKyyaczqawN75X
go.opentelemetry.io/collector/pdata v1.11.0/go.mod h1:IHxHsp+Jq/xfjORQMDJjSH6jvedOSTOyu3nbxqhWSYE= go.opentelemetry.io/collector/pdata v1.11.0/go.mod h1:IHxHsp+Jq/xfjORQMDJjSH6jvedOSTOyu3nbxqhWSYE=
go.opentelemetry.io/collector/semconv v0.104.0 h1:dUvajnh+AYJLEW/XOPk0T0BlwltSdi3vrjO7nSOos3k= go.opentelemetry.io/collector/semconv v0.104.0 h1:dUvajnh+AYJLEW/XOPk0T0BlwltSdi3vrjO7nSOos3k=
go.opentelemetry.io/collector/semconv v0.104.0/go.mod h1:yMVUCNoQPZVq/IPfrHrnntZTWsLf5YGZ7qwKulIl5hw= go.opentelemetry.io/collector/semconv v0.104.0/go.mod h1:yMVUCNoQPZVq/IPfrHrnntZTWsLf5YGZ7qwKulIl5hw=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 h1:vS1Ao/R55RNV4O7TA2Qopok8yN+X0LIP6RVWLFkprck= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg=
go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=
go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q=
@ -542,8 +543,8 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@ -554,8 +555,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY= golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w=
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@ -576,8 +577,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@ -609,8 +610,8 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@ -672,11 +673,12 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@ -732,14 +734,12 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc
golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@ -756,8 +756,8 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M
google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= 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.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
google.golang.org/api v0.187.0 h1:Mxs7VATVC2v7CY+7Xwm4ndkX71hpElcvx0D1Ji/p1eo= google.golang.org/api v0.188.0 h1:51y8fJ/b1AaaBRJr4yWm96fPcuxSo0JcegXE3DaHQHw=
google.golang.org/api v0.187.0/go.mod h1:KIHlTc4x7N7gKKuVsdmfBXN13yEEWXWFURWY6SBp2gk= google.golang.org/api v0.188.0/go.mod h1:VR0d+2SIiWOYG3r/jdm7adPW9hI2aRv9ETOSCQ9Beag=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= 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.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@ -793,12 +793,12 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc
google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20240701130421-f6361c86f094 h1:6whtk83KtD3FkGrVb2hFXuQ+ZMbCNdakARIn/aHMmG8= google.golang.org/genproto v0.0.0-20240709173604-40e1e62336c5 h1:ORprMx6Xqr56pGwKXMnVEFBI0k7OIcHI0Rx92/rKypo=
google.golang.org/genproto v0.0.0-20240701130421-f6361c86f094/go.mod h1:Zs4wYw8z1zr6RNF4cwYb31mvN/EGaKAdQjNCF3DW6K4= google.golang.org/genproto v0.0.0-20240709173604-40e1e62336c5/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY=
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= google.golang.org/genproto/googleapis/api v0.0.0-20240709173604-40e1e62336c5 h1:a/Z0jgw03aJ2rQnp5PlPpznJqJft0HyvyrcUcxgzPwY=
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= google.golang.org/genproto/googleapis/api v0.0.0-20240709173604-40e1e62336c5/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5 h1:SbSDUWW1PAO24TNpLdeheoYPd7kllICcLU52x6eD4kQ=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=

View file

@ -1,5 +1,19 @@
# Changelog # Changelog
## [0.7.0](https://github.com/googleapis/google-cloud-go/compare/auth/v0.6.1...auth/v0.7.0) (2024-07-09)
### Features
* **auth:** Add workload X509 cert provider as a default cert provider ([#10479](https://github.com/googleapis/google-cloud-go/issues/10479)) ([c51ee6c](https://github.com/googleapis/google-cloud-go/commit/c51ee6cf65ce05b4d501083e49d468c75ac1ea63))
### Bug Fixes
* **auth/oauth2adapt:** Bump google.golang.org/api@v0.187.0 ([8fa9e39](https://github.com/googleapis/google-cloud-go/commit/8fa9e398e512fd8533fd49060371e61b5725a85b))
* **auth:** Bump google.golang.org/api@v0.187.0 ([8fa9e39](https://github.com/googleapis/google-cloud-go/commit/8fa9e398e512fd8533fd49060371e61b5725a85b))
* **auth:** Check len of slices, not non-nil ([#10483](https://github.com/googleapis/google-cloud-go/issues/10483)) ([0a966a1](https://github.com/googleapis/google-cloud-go/commit/0a966a183e5f0e811977216d736d875b7233e942))
## [0.6.1](https://github.com/googleapis/google-cloud-go/compare/auth/v0.6.0...auth/v0.6.1) (2024-07-01) ## [0.6.1](https://github.com/googleapis/google-cloud-go/compare/auth/v0.6.0...auth/v0.6.1) (2024-07-01)

View file

@ -538,12 +538,12 @@ func (tp tokenProvider2LO) Token(ctx context.Context) (*Token, error) {
v := url.Values{} v := url.Values{}
v.Set("grant_type", defaultGrantType) v.Set("grant_type", defaultGrantType)
v.Set("assertion", payload) v.Set("assertion", payload)
resp, err := tp.Client.PostForm(tp.opts.TokenURL, v) req, err := http.NewRequestWithContext(ctx, "POST", tp.opts.TokenURL, strings.NewReader(v.Encode()))
if err != nil { if err != nil {
return nil, fmt.Errorf("auth: cannot fetch token: %w", err) return nil, err
} }
defer resp.Body.Close() req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
body, err := internal.ReadAll(resp.Body) resp, body, err := internal.DoRequest(tp.Client, req)
if err != nil { if err != nil {
return nil, fmt.Errorf("auth: cannot fetch token: %w", err) return nil, fmt.Errorf("auth: cannot fetch token: %w", err)
} }

View file

@ -76,7 +76,7 @@ func DetectDefault(opts *DetectOptions) (*auth.Credentials, error) {
if err := opts.validate(); err != nil { if err := opts.validate(); err != nil {
return nil, err return nil, err
} }
if opts.CredentialsJSON != nil { if len(opts.CredentialsJSON) > 0 {
return readCredentialsFileJSON(opts.CredentialsJSON, opts) return readCredentialsFileJSON(opts.CredentialsJSON, opts)
} }
if opts.CredentialsFile != "" { if opts.CredentialsFile != "" {

View file

@ -122,7 +122,7 @@ func (sp *awsSubjectProvider) subjectToken(ctx context.Context) (string, error)
// Generate the signed request to AWS STS GetCallerIdentity API. // Generate the signed request to AWS STS GetCallerIdentity API.
// Use the required regional endpoint. Otherwise, the request will fail. // Use the required regional endpoint. Otherwise, the request will fail.
req, err := http.NewRequest("POST", strings.Replace(sp.RegionalCredVerificationURL, "{region}", sp.region, 1), nil) req, err := http.NewRequestWithContext(ctx, "POST", strings.Replace(sp.RegionalCredVerificationURL, "{region}", sp.region, 1), nil)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -194,20 +194,14 @@ func (sp *awsSubjectProvider) getAWSSessionToken(ctx context.Context) (string, e
} }
req.Header.Set(awsIMDSv2SessionTTLHeader, awsIMDSv2SessionTTL) req.Header.Set(awsIMDSv2SessionTTLHeader, awsIMDSv2SessionTTL)
resp, err := sp.Client.Do(req) resp, body, err := internal.DoRequest(sp.Client, req)
if err != nil {
return "", err
}
defer resp.Body.Close()
respBody, err := internal.ReadAll(resp.Body)
if err != nil { if err != nil {
return "", err return "", err
} }
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
return "", fmt.Errorf("credentials: unable to retrieve AWS session token: %s", respBody) return "", fmt.Errorf("credentials: unable to retrieve AWS session token: %s", body)
} }
return string(respBody), nil return string(body), nil
} }
func (sp *awsSubjectProvider) getRegion(ctx context.Context, headers map[string]string) (string, error) { func (sp *awsSubjectProvider) getRegion(ctx context.Context, headers map[string]string) (string, error) {
@ -233,29 +227,21 @@ func (sp *awsSubjectProvider) getRegion(ctx context.Context, headers map[string]
for name, value := range headers { for name, value := range headers {
req.Header.Add(name, value) req.Header.Add(name, value)
} }
resp, body, err := internal.DoRequest(sp.Client, req)
resp, err := sp.Client.Do(req)
if err != nil { if err != nil {
return "", err return "", err
} }
defer resp.Body.Close()
respBody, err := internal.ReadAll(resp.Body)
if err != nil {
return "", err
}
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
return "", fmt.Errorf("credentials: unable to retrieve AWS region - %s", respBody) return "", fmt.Errorf("credentials: unable to retrieve AWS region - %s", body)
} }
// This endpoint will return the region in format: us-east-2b. // This endpoint will return the region in format: us-east-2b.
// Only the us-east-2 part should be used. // Only the us-east-2 part should be used.
bodyLen := len(respBody) bodyLen := len(body)
if bodyLen == 0 { if bodyLen == 0 {
return "", nil return "", nil
} }
return string(respBody[:bodyLen-1]), nil return string(body[:bodyLen-1]), nil
} }
func (sp *awsSubjectProvider) getSecurityCredentials(ctx context.Context, headers map[string]string) (result *AwsSecurityCredentials, err error) { func (sp *awsSubjectProvider) getSecurityCredentials(ctx context.Context, headers map[string]string) (result *AwsSecurityCredentials, err error) {
@ -299,22 +285,17 @@ func (sp *awsSubjectProvider) getMetadataSecurityCredentials(ctx context.Context
for name, value := range headers { for name, value := range headers {
req.Header.Add(name, value) req.Header.Add(name, value)
} }
resp, body, err := internal.DoRequest(sp.Client, req)
resp, err := sp.Client.Do(req)
if err != nil {
return result, err
}
defer resp.Body.Close()
respBody, err := internal.ReadAll(resp.Body)
if err != nil { if err != nil {
return result, err return result, err
} }
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
return result, fmt.Errorf("credentials: unable to retrieve AWS security credentials - %s", respBody) return result, fmt.Errorf("credentials: unable to retrieve AWS security credentials - %s", body)
} }
err = json.Unmarshal(respBody, &result) if err := json.Unmarshal(body, &result); err != nil {
return result, err return nil, err
}
return result, nil
} }
func (sp *awsSubjectProvider) getMetadataRoleName(ctx context.Context, headers map[string]string) (string, error) { func (sp *awsSubjectProvider) getMetadataRoleName(ctx context.Context, headers map[string]string) (string, error) {
@ -329,20 +310,14 @@ func (sp *awsSubjectProvider) getMetadataRoleName(ctx context.Context, headers m
req.Header.Add(name, value) req.Header.Add(name, value)
} }
resp, err := sp.Client.Do(req) resp, body, err := internal.DoRequest(sp.Client, req)
if err != nil {
return "", err
}
defer resp.Body.Close()
respBody, err := internal.ReadAll(resp.Body)
if err != nil { if err != nil {
return "", err return "", err
} }
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
return "", fmt.Errorf("credentials: unable to retrieve AWS role name - %s", respBody) return "", fmt.Errorf("credentials: unable to retrieve AWS role name - %s", body)
} }
return string(respBody), nil return string(body), nil
} }
// awsRequestSigner is a utility class to sign http requests using a AWS V4 signature. // awsRequestSigner is a utility class to sign http requests using a AWS V4 signature.

View file

@ -48,27 +48,21 @@ func (sp *urlSubjectProvider) subjectToken(ctx context.Context) (string, error)
for key, val := range sp.Headers { for key, val := range sp.Headers {
req.Header.Add(key, val) req.Header.Add(key, val)
} }
resp, err := sp.Client.Do(req) resp, body, err := internal.DoRequest(sp.Client, req)
if err != nil { if err != nil {
return "", fmt.Errorf("credentials: invalid response when retrieving subject token: %w", err) return "", fmt.Errorf("credentials: invalid response when retrieving subject token: %w", err)
} }
defer resp.Body.Close()
respBody, err := internal.ReadAll(resp.Body)
if err != nil {
return "", fmt.Errorf("credentials: invalid body in subject token URL query: %w", err)
}
if c := resp.StatusCode; c < http.StatusOK || c >= http.StatusMultipleChoices { if c := resp.StatusCode; c < http.StatusOK || c >= http.StatusMultipleChoices {
return "", fmt.Errorf("credentials: status code %d: %s", c, respBody) return "", fmt.Errorf("credentials: status code %d: %s", c, body)
} }
if sp.Format == nil { if sp.Format == nil {
return string(respBody), nil return string(body), nil
} }
switch sp.Format.Type { switch sp.Format.Type {
case "json": case "json":
jsonData := make(map[string]interface{}) jsonData := make(map[string]interface{})
err = json.Unmarshal(respBody, &jsonData) err = json.Unmarshal(body, &jsonData)
if err != nil { if err != nil {
return "", fmt.Errorf("credentials: failed to unmarshal subject token file: %w", err) return "", fmt.Errorf("credentials: failed to unmarshal subject token file: %w", err)
} }
@ -82,7 +76,7 @@ func (sp *urlSubjectProvider) subjectToken(ctx context.Context) (string, error)
} }
return token, nil return token, nil
case fileTypeText: case fileTypeText:
return string(respBody), nil return string(body), nil
default: default:
return "", errors.New("credentials: invalid credential_source file format type: " + sp.Format.Type) return "", errors.New("credentials: invalid credential_source file format type: " + sp.Format.Type)
} }

View file

@ -25,6 +25,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
"strings"
"time" "time"
"cloud.google.com/go/auth" "cloud.google.com/go/auth"
@ -129,12 +130,13 @@ func (g gdchProvider) Token(ctx context.Context) (*auth.Token, error) {
v.Set("requested_token_type", requestTokenType) v.Set("requested_token_type", requestTokenType)
v.Set("subject_token", payload) v.Set("subject_token", payload)
v.Set("subject_token_type", subjectTokenType) v.Set("subject_token_type", subjectTokenType)
resp, err := g.client.PostForm(g.tokenURL, v)
req, err := http.NewRequestWithContext(ctx, "POST", g.tokenURL, strings.NewReader(v.Encode()))
if err != nil { if err != nil {
return nil, fmt.Errorf("credentials: cannot fetch token: %w", err) return nil, err
} }
defer resp.Body.Close() req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
body, err := internal.ReadAll(resp.Body) resp, body, err := internal.DoRequest(g.client, req)
if err != nil { if err != nil {
return nil, fmt.Errorf("credentials: cannot fetch token: %w", err) return nil, fmt.Errorf("credentials: cannot fetch token: %w", err)
} }

View file

@ -109,15 +109,10 @@ func (o *Options) Token(ctx context.Context) (*auth.Token, error) {
if err := setAuthHeader(ctx, o.Tp, req); err != nil { if err := setAuthHeader(ctx, o.Tp, req); err != nil {
return nil, err return nil, err
} }
resp, err := o.Client.Do(req) resp, body, err := internal.DoRequest(o.Client, req)
if err != nil { if err != nil {
return nil, fmt.Errorf("credentials: unable to generate access token: %w", err) return nil, fmt.Errorf("credentials: unable to generate access token: %w", err)
} }
defer resp.Body.Close()
body, err := internal.ReadAll(resp.Body)
if err != nil {
return nil, fmt.Errorf("credentials: unable to read body: %w", err)
}
if c := resp.StatusCode; c < http.StatusOK || c >= http.StatusMultipleChoices { if c := resp.StatusCode; c < http.StatusOK || c >= http.StatusMultipleChoices {
return nil, fmt.Errorf("credentials: status code %d: %s", c, body) return nil, fmt.Errorf("credentials: status code %d: %s", c, body)
} }

View file

@ -93,16 +93,10 @@ func doRequest(ctx context.Context, opts *Options, data url.Values) (*TokenRespo
} }
req.Header.Set("Content-Length", strconv.Itoa(len(encodedData))) req.Header.Set("Content-Length", strconv.Itoa(len(encodedData)))
resp, err := opts.Client.Do(req) resp, body, err := internal.DoRequest(opts.Client, req)
if err != nil { if err != nil {
return nil, fmt.Errorf("credentials: invalid response from Secure Token Server: %w", err) return nil, fmt.Errorf("credentials: invalid response from Secure Token Server: %w", err)
} }
defer resp.Body.Close()
body, err := internal.ReadAll(resp.Body)
if err != nil {
return nil, err
}
if c := resp.StatusCode; c < http.StatusOK || c > http.StatusMultipleChoices { if c := resp.StatusCode; c < http.StatusOK || c > http.StatusMultipleChoices {
return nil, fmt.Errorf("credentials: status code %d: %s", c, body) return nil, fmt.Errorf("credentials: status code %d: %s", c, body)
} }

View file

@ -124,6 +124,21 @@ func GetProjectID(b []byte, override string) string {
return v.Project return v.Project
} }
// DoRequest executes the provided req with the client. It reads the response
// body, closes it, and returns it.
func DoRequest(client *http.Client, req *http.Request) (*http.Response, []byte, error) {
resp, err := client.Do(req)
if err != nil {
return nil, nil, err
}
defer resp.Body.Close()
body, err := ReadAll(io.LimitReader(resp.Body, maxBodySize))
if err != nil {
return nil, nil, err
}
return resp, body, nil
}
// ReadAll consumes the whole reader and safely reads the content of its body // ReadAll consumes the whole reader and safely reads the content of its body
// with some overflow protection. // with some overflow protection.
func ReadAll(r io.Reader) ([]byte, error) { func ReadAll(r io.Reader) ([]byte, error) {
@ -167,8 +182,7 @@ func (c *ComputeUniverseDomainProvider) GetProperty(ctx context.Context) (string
// httpGetMetadataUniverseDomain is a package var for unit test substitution. // httpGetMetadataUniverseDomain is a package var for unit test substitution.
var httpGetMetadataUniverseDomain = func(ctx context.Context) (string, error) { var httpGetMetadataUniverseDomain = func(ctx context.Context) (string, error) {
client := metadata.NewClient(&http.Client{Timeout: time.Second}) client := metadata.NewClient(&http.Client{Timeout: time.Second})
// TODO(quartzmo): set ctx on request return client.GetWithContext(ctx, "universe/universe_domain")
return client.Get("universe/universe_domain")
} }
func getMetadataUniverseDomain(ctx context.Context) (string, error) { func getMetadataUniverseDomain(ctx context.Context) (string, error) {

View file

@ -50,11 +50,14 @@ var errSourceUnavailable = errors.New("certificate source is unavailable")
// returned to indicate that a default certificate source is unavailable. // returned to indicate that a default certificate source is unavailable.
func DefaultProvider() (Provider, error) { func DefaultProvider() (Provider, error) {
defaultCert.once.Do(func() { defaultCert.once.Do(func() {
defaultCert.provider, defaultCert.err = NewEnterpriseCertificateProxyProvider("") defaultCert.provider, defaultCert.err = NewWorkloadX509CertProvider("")
if errors.Is(defaultCert.err, errSourceUnavailable) { if errors.Is(defaultCert.err, errSourceUnavailable) {
defaultCert.provider, defaultCert.err = NewSecureConnectProvider("") defaultCert.provider, defaultCert.err = NewEnterpriseCertificateProxyProvider("")
if errors.Is(defaultCert.err, errSourceUnavailable) { if errors.Is(defaultCert.err, errSourceUnavailable) {
defaultCert.provider, defaultCert.err = nil, nil defaultCert.provider, defaultCert.err = NewSecureConnectProvider("")
if errors.Is(defaultCert.err, errSourceUnavailable) {
defaultCert.provider, defaultCert.err = nil, nil
}
} }
} }
}) })

View file

@ -99,7 +99,7 @@ func getCertAndKeyFiles(configFilePath string) (string, string, error) {
} }
if config.CertConfigs.Workload == nil { if config.CertConfigs.Workload == nil {
return "", "", errors.New("no Workload Identity Federation certificate information found in the certificate configuration file") return "", "", errSourceUnavailable
} }
certFile := config.CertConfigs.Workload.CertPath certFile := config.CertConfigs.Workload.CertPath

View file

@ -53,11 +53,11 @@ func CloneDetectOptions(oldDo *credentials.DetectOptions) *credentials.DetectOpt
} }
// Smartly size this memory and copy below. // Smartly size this memory and copy below.
if oldDo.CredentialsJSON != nil { if len(oldDo.CredentialsJSON) > 0 {
newDo.CredentialsJSON = make([]byte, len(oldDo.CredentialsJSON)) newDo.CredentialsJSON = make([]byte, len(oldDo.CredentialsJSON))
copy(newDo.CredentialsJSON, oldDo.CredentialsJSON) copy(newDo.CredentialsJSON, oldDo.CredentialsJSON)
} }
if oldDo.Scopes != nil { if len(oldDo.Scopes) > 0 {
newDo.Scopes = make([]string, len(oldDo.Scopes)) newDo.Scopes = make([]string, len(oldDo.Scopes))
copy(newDo.Scopes, oldDo.Scopes) copy(newDo.Scopes, oldDo.Scopes)
} }

View file

@ -1,5 +1,12 @@
# Changelog # Changelog
## [0.2.3](https://github.com/googleapis/google-cloud-go/compare/auth/oauth2adapt/v0.2.2...auth/oauth2adapt/v0.2.3) (2024-07-10)
### Bug Fixes
* **auth/oauth2adapt:** Bump google.golang.org/api@v0.187.0 ([8fa9e39](https://github.com/googleapis/google-cloud-go/commit/8fa9e398e512fd8533fd49060371e61b5725a85b))
## [0.2.2](https://github.com/googleapis/google-cloud-go/compare/auth/oauth2adapt/v0.2.1...auth/oauth2adapt/v0.2.2) (2024-04-23) ## [0.2.2](https://github.com/googleapis/google-cloud-go/compare/auth/oauth2adapt/v0.2.1...auth/oauth2adapt/v0.2.2) (2024-04-23)

View file

@ -285,7 +285,7 @@ func fetchToken(ctx context.Context, o *Options3LO, v url.Values) (*Token, strin
v.Set("client_secret", o.ClientSecret) v.Set("client_secret", o.ClientSecret)
} }
} }
req, err := http.NewRequest("POST", o.TokenURL, strings.NewReader(v.Encode())) req, err := http.NewRequestWithContext(ctx, "POST", o.TokenURL, strings.NewReader(v.Encode()))
if err != nil { if err != nil {
return nil, refreshToken, err return nil, refreshToken, err
} }
@ -295,25 +295,19 @@ func fetchToken(ctx context.Context, o *Options3LO, v url.Values) (*Token, strin
} }
// Make request // Make request
r, err := o.client().Do(req.WithContext(ctx)) resp, body, err := internal.DoRequest(o.client(), req)
if err != nil { if err != nil {
return nil, refreshToken, err return nil, refreshToken, err
} }
body, err := internal.ReadAll(r.Body) failureStatus := resp.StatusCode < 200 || resp.StatusCode > 299
r.Body.Close()
if err != nil {
return nil, refreshToken, fmt.Errorf("auth: cannot fetch token: %w", err)
}
failureStatus := r.StatusCode < 200 || r.StatusCode > 299
tokError := &Error{ tokError := &Error{
Response: r, Response: resp,
Body: body, Body: body,
} }
var token *Token var token *Token
// errors ignored because of default switch on content // errors ignored because of default switch on content
content, _, _ := mime.ParseMediaType(r.Header.Get("Content-Type")) content, _, _ := mime.ParseMediaType(resp.Header.Get("Content-Type"))
switch content { switch content {
case "application/x-www-form-urlencoded", "text/plain": case "application/x-www-form-urlencoded", "text/plain":
// some endpoints return a query string // some endpoints return a query string

View file

@ -1,6 +1,27 @@
# Changes # Changes
## [1.43.0](https://github.com/googleapis/google-cloud-go/compare/storage/v1.42.0...storage/v1.43.0) (2024-07-03)
### Features
* **storage/transfermanager:** Add DownloadDirectory ([#10430](https://github.com/googleapis/google-cloud-go/issues/10430)) ([0d0e5dd](https://github.com/googleapis/google-cloud-go/commit/0d0e5dd5214769cc2c197991c2ece1303bd600de))
* **storage/transfermanager:** Automatically shard downloads ([#10379](https://github.com/googleapis/google-cloud-go/issues/10379)) ([05816f9](https://github.com/googleapis/google-cloud-go/commit/05816f9fafd3132c371da37f3a879bb9e8e7e604))
### Bug Fixes
* **storage/transfermanager:** WaitAndClose waits for Callbacks to finish ([#10504](https://github.com/googleapis/google-cloud-go/issues/10504)) ([0e81002](https://github.com/googleapis/google-cloud-go/commit/0e81002b3a5e560c874d814d28a35a102311d9ef)), refs [#10502](https://github.com/googleapis/google-cloud-go/issues/10502)
* **storage:** Allow empty soft delete on Create ([#10394](https://github.com/googleapis/google-cloud-go/issues/10394)) ([d8bd2c1](https://github.com/googleapis/google-cloud-go/commit/d8bd2c1ffc4f27503a74ded438d8bfbdd7707c63)), refs [#10380](https://github.com/googleapis/google-cloud-go/issues/10380)
* **storage:** Bump google.golang.org/api@v0.187.0 ([8fa9e39](https://github.com/googleapis/google-cloud-go/commit/8fa9e398e512fd8533fd49060371e61b5725a85b))
* **storage:** Retry broken pipe error ([#10374](https://github.com/googleapis/google-cloud-go/issues/10374)) ([2f4daa1](https://github.com/googleapis/google-cloud-go/commit/2f4daa11acf9d3f260fa888333090359c4d9198e)), refs [#9178](https://github.com/googleapis/google-cloud-go/issues/9178)
### Documentation
* **storage/control:** Remove allowlist note from Folders RPCs ([d6c543c](https://github.com/googleapis/google-cloud-go/commit/d6c543c3969016c63e158a862fc173dff60fb8d9))
## [1.42.0](https://github.com/googleapis/google-cloud-go/compare/storage/v1.41.0...storage/v1.42.0) (2024-06-10) ## [1.42.0](https://github.com/googleapis/google-cloud-go/compare/storage/v1.41.0...storage/v1.42.0) (2024-06-10)

View file

@ -2123,8 +2123,11 @@ func (p *SoftDeletePolicy) toRawSoftDeletePolicy() *raw.BucketSoftDeletePolicy {
return nil return nil
} }
// Excluding read only field EffectiveTime. // Excluding read only field EffectiveTime.
// ForceSendFields must be set to send a zero value for RetentionDuration and disable
// soft delete.
return &raw.BucketSoftDeletePolicy{ return &raw.BucketSoftDeletePolicy{
RetentionDurationSeconds: int64(p.RetentionDuration.Seconds()), RetentionDurationSeconds: int64(p.RetentionDuration.Seconds()),
ForceSendFields: []string{"RetentionDurationSeconds"},
} }
} }

View file

@ -14,7 +14,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions: // versions:
// protoc-gen-go v1.34.1 // protoc-gen-go v1.34.2
// protoc v4.25.3 // protoc v4.25.3
// source: google/storage/v2/storage.proto // source: google/storage/v2/storage.proto
@ -8968,7 +8968,7 @@ func file_google_storage_v2_storage_proto_rawDescGZIP() []byte {
var file_google_storage_v2_storage_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_google_storage_v2_storage_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_google_storage_v2_storage_proto_msgTypes = make([]protoimpl.MessageInfo, 79) var file_google_storage_v2_storage_proto_msgTypes = make([]protoimpl.MessageInfo, 79)
var file_google_storage_v2_storage_proto_goTypes = []interface{}{ var file_google_storage_v2_storage_proto_goTypes = []any{
(ServiceConstants_Values)(0), // 0: google.storage.v2.ServiceConstants.Values (ServiceConstants_Values)(0), // 0: google.storage.v2.ServiceConstants.Values
(*DeleteBucketRequest)(nil), // 1: google.storage.v2.DeleteBucketRequest (*DeleteBucketRequest)(nil), // 1: google.storage.v2.DeleteBucketRequest
(*GetBucketRequest)(nil), // 2: google.storage.v2.GetBucketRequest (*GetBucketRequest)(nil), // 2: google.storage.v2.GetBucketRequest
@ -9241,7 +9241,7 @@ func file_google_storage_v2_storage_proto_init() {
return return
} }
if !protoimpl.UnsafeEnabled { if !protoimpl.UnsafeEnabled {
file_google_storage_v2_storage_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[0].Exporter = func(v any, i int) any {
switch v := v.(*DeleteBucketRequest); i { switch v := v.(*DeleteBucketRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9253,7 +9253,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[1].Exporter = func(v any, i int) any {
switch v := v.(*GetBucketRequest); i { switch v := v.(*GetBucketRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9265,7 +9265,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[2].Exporter = func(v any, i int) any {
switch v := v.(*CreateBucketRequest); i { switch v := v.(*CreateBucketRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9277,7 +9277,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[3].Exporter = func(v any, i int) any {
switch v := v.(*ListBucketsRequest); i { switch v := v.(*ListBucketsRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9289,7 +9289,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[4].Exporter = func(v any, i int) any {
switch v := v.(*ListBucketsResponse); i { switch v := v.(*ListBucketsResponse); i {
case 0: case 0:
return &v.state return &v.state
@ -9301,7 +9301,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[5].Exporter = func(v any, i int) any {
switch v := v.(*LockBucketRetentionPolicyRequest); i { switch v := v.(*LockBucketRetentionPolicyRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9313,7 +9313,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[6].Exporter = func(v any, i int) any {
switch v := v.(*UpdateBucketRequest); i { switch v := v.(*UpdateBucketRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9325,7 +9325,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[7].Exporter = func(v any, i int) any {
switch v := v.(*DeleteNotificationConfigRequest); i { switch v := v.(*DeleteNotificationConfigRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9337,7 +9337,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[8].Exporter = func(v any, i int) any {
switch v := v.(*GetNotificationConfigRequest); i { switch v := v.(*GetNotificationConfigRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9349,7 +9349,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[9].Exporter = func(v any, i int) any {
switch v := v.(*CreateNotificationConfigRequest); i { switch v := v.(*CreateNotificationConfigRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9361,7 +9361,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[10].Exporter = func(v any, i int) any {
switch v := v.(*ListNotificationConfigsRequest); i { switch v := v.(*ListNotificationConfigsRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9373,7 +9373,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[11].Exporter = func(v any, i int) any {
switch v := v.(*ListNotificationConfigsResponse); i { switch v := v.(*ListNotificationConfigsResponse); i {
case 0: case 0:
return &v.state return &v.state
@ -9385,7 +9385,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[12].Exporter = func(v any, i int) any {
switch v := v.(*ComposeObjectRequest); i { switch v := v.(*ComposeObjectRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9397,7 +9397,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[13].Exporter = func(v any, i int) any {
switch v := v.(*DeleteObjectRequest); i { switch v := v.(*DeleteObjectRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9409,7 +9409,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[14].Exporter = func(v any, i int) any {
switch v := v.(*RestoreObjectRequest); i { switch v := v.(*RestoreObjectRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9421,7 +9421,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[15].Exporter = func(v any, i int) any {
switch v := v.(*CancelResumableWriteRequest); i { switch v := v.(*CancelResumableWriteRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9433,7 +9433,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[16].Exporter = func(v any, i int) any {
switch v := v.(*CancelResumableWriteResponse); i { switch v := v.(*CancelResumableWriteResponse); i {
case 0: case 0:
return &v.state return &v.state
@ -9445,7 +9445,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[17].Exporter = func(v any, i int) any {
switch v := v.(*ReadObjectRequest); i { switch v := v.(*ReadObjectRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9457,7 +9457,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[18].Exporter = func(v any, i int) any {
switch v := v.(*GetObjectRequest); i { switch v := v.(*GetObjectRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9469,7 +9469,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[19].Exporter = func(v any, i int) any {
switch v := v.(*ReadObjectResponse); i { switch v := v.(*ReadObjectResponse); i {
case 0: case 0:
return &v.state return &v.state
@ -9481,7 +9481,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[20].Exporter = func(v any, i int) any {
switch v := v.(*WriteObjectSpec); i { switch v := v.(*WriteObjectSpec); i {
case 0: case 0:
return &v.state return &v.state
@ -9493,7 +9493,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[21].Exporter = func(v any, i int) any {
switch v := v.(*WriteObjectRequest); i { switch v := v.(*WriteObjectRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9505,7 +9505,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[22].Exporter = func(v any, i int) any {
switch v := v.(*WriteObjectResponse); i { switch v := v.(*WriteObjectResponse); i {
case 0: case 0:
return &v.state return &v.state
@ -9517,7 +9517,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[23].Exporter = func(v any, i int) any {
switch v := v.(*BidiWriteObjectRequest); i { switch v := v.(*BidiWriteObjectRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9529,7 +9529,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[24].Exporter = func(v any, i int) any {
switch v := v.(*BidiWriteObjectResponse); i { switch v := v.(*BidiWriteObjectResponse); i {
case 0: case 0:
return &v.state return &v.state
@ -9541,7 +9541,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[25].Exporter = func(v any, i int) any {
switch v := v.(*ListObjectsRequest); i { switch v := v.(*ListObjectsRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9553,7 +9553,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[26].Exporter = func(v any, i int) any {
switch v := v.(*QueryWriteStatusRequest); i { switch v := v.(*QueryWriteStatusRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9565,7 +9565,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[27].Exporter = func(v any, i int) any {
switch v := v.(*QueryWriteStatusResponse); i { switch v := v.(*QueryWriteStatusResponse); i {
case 0: case 0:
return &v.state return &v.state
@ -9577,7 +9577,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[28].Exporter = func(v any, i int) any {
switch v := v.(*RewriteObjectRequest); i { switch v := v.(*RewriteObjectRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9589,7 +9589,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[29].Exporter = func(v any, i int) any {
switch v := v.(*RewriteResponse); i { switch v := v.(*RewriteResponse); i {
case 0: case 0:
return &v.state return &v.state
@ -9601,7 +9601,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[30].Exporter = func(v any, i int) any {
switch v := v.(*StartResumableWriteRequest); i { switch v := v.(*StartResumableWriteRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9613,7 +9613,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[31].Exporter = func(v any, i int) any {
switch v := v.(*StartResumableWriteResponse); i { switch v := v.(*StartResumableWriteResponse); i {
case 0: case 0:
return &v.state return &v.state
@ -9625,7 +9625,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[32].Exporter = func(v any, i int) any {
switch v := v.(*UpdateObjectRequest); i { switch v := v.(*UpdateObjectRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9637,7 +9637,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[33].Exporter = func(v any, i int) any {
switch v := v.(*GetServiceAccountRequest); i { switch v := v.(*GetServiceAccountRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9649,7 +9649,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[34].Exporter = func(v any, i int) any {
switch v := v.(*CreateHmacKeyRequest); i { switch v := v.(*CreateHmacKeyRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9661,7 +9661,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[35].Exporter = func(v any, i int) any {
switch v := v.(*CreateHmacKeyResponse); i { switch v := v.(*CreateHmacKeyResponse); i {
case 0: case 0:
return &v.state return &v.state
@ -9673,7 +9673,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[36].Exporter = func(v any, i int) any {
switch v := v.(*DeleteHmacKeyRequest); i { switch v := v.(*DeleteHmacKeyRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9685,7 +9685,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[37].Exporter = func(v any, i int) any {
switch v := v.(*GetHmacKeyRequest); i { switch v := v.(*GetHmacKeyRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9697,7 +9697,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[38].Exporter = func(v any, i int) any {
switch v := v.(*ListHmacKeysRequest); i { switch v := v.(*ListHmacKeysRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9709,7 +9709,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[39].Exporter = func(v any, i int) any {
switch v := v.(*ListHmacKeysResponse); i { switch v := v.(*ListHmacKeysResponse); i {
case 0: case 0:
return &v.state return &v.state
@ -9721,7 +9721,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[40].Exporter = func(v any, i int) any {
switch v := v.(*UpdateHmacKeyRequest); i { switch v := v.(*UpdateHmacKeyRequest); i {
case 0: case 0:
return &v.state return &v.state
@ -9733,7 +9733,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[41].Exporter = func(v any, i int) any {
switch v := v.(*CommonObjectRequestParams); i { switch v := v.(*CommonObjectRequestParams); i {
case 0: case 0:
return &v.state return &v.state
@ -9745,7 +9745,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[42].Exporter = func(v any, i int) any {
switch v := v.(*ServiceConstants); i { switch v := v.(*ServiceConstants); i {
case 0: case 0:
return &v.state return &v.state
@ -9757,7 +9757,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[43].Exporter = func(v any, i int) any {
switch v := v.(*Bucket); i { switch v := v.(*Bucket); i {
case 0: case 0:
return &v.state return &v.state
@ -9769,7 +9769,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[44].Exporter = func(v any, i int) any {
switch v := v.(*BucketAccessControl); i { switch v := v.(*BucketAccessControl); i {
case 0: case 0:
return &v.state return &v.state
@ -9781,7 +9781,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[45].Exporter = func(v any, i int) any {
switch v := v.(*ChecksummedData); i { switch v := v.(*ChecksummedData); i {
case 0: case 0:
return &v.state return &v.state
@ -9793,7 +9793,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[46].Exporter = func(v any, i int) any {
switch v := v.(*ObjectChecksums); i { switch v := v.(*ObjectChecksums); i {
case 0: case 0:
return &v.state return &v.state
@ -9805,7 +9805,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[47].Exporter = func(v any, i int) any {
switch v := v.(*HmacKeyMetadata); i { switch v := v.(*HmacKeyMetadata); i {
case 0: case 0:
return &v.state return &v.state
@ -9817,7 +9817,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[48].Exporter = func(v any, i int) any {
switch v := v.(*NotificationConfig); i { switch v := v.(*NotificationConfig); i {
case 0: case 0:
return &v.state return &v.state
@ -9829,7 +9829,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[49].Exporter = func(v any, i int) any {
switch v := v.(*CustomerEncryption); i { switch v := v.(*CustomerEncryption); i {
case 0: case 0:
return &v.state return &v.state
@ -9841,7 +9841,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[50].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[50].Exporter = func(v any, i int) any {
switch v := v.(*Object); i { switch v := v.(*Object); i {
case 0: case 0:
return &v.state return &v.state
@ -9853,7 +9853,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[51].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[51].Exporter = func(v any, i int) any {
switch v := v.(*ObjectAccessControl); i { switch v := v.(*ObjectAccessControl); i {
case 0: case 0:
return &v.state return &v.state
@ -9865,7 +9865,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[52].Exporter = func(v any, i int) any {
switch v := v.(*ListObjectsResponse); i { switch v := v.(*ListObjectsResponse); i {
case 0: case 0:
return &v.state return &v.state
@ -9877,7 +9877,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[53].Exporter = func(v any, i int) any {
switch v := v.(*ProjectTeam); i { switch v := v.(*ProjectTeam); i {
case 0: case 0:
return &v.state return &v.state
@ -9889,7 +9889,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[54].Exporter = func(v any, i int) any {
switch v := v.(*ServiceAccount); i { switch v := v.(*ServiceAccount); i {
case 0: case 0:
return &v.state return &v.state
@ -9901,7 +9901,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[55].Exporter = func(v any, i int) any {
switch v := v.(*Owner); i { switch v := v.(*Owner); i {
case 0: case 0:
return &v.state return &v.state
@ -9913,7 +9913,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[56].Exporter = func(v any, i int) any {
switch v := v.(*ContentRange); i { switch v := v.(*ContentRange); i {
case 0: case 0:
return &v.state return &v.state
@ -9925,7 +9925,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[57].Exporter = func(v any, i int) any {
switch v := v.(*ComposeObjectRequest_SourceObject); i { switch v := v.(*ComposeObjectRequest_SourceObject); i {
case 0: case 0:
return &v.state return &v.state
@ -9937,7 +9937,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[58].Exporter = func(v any, i int) any {
switch v := v.(*ComposeObjectRequest_SourceObject_ObjectPreconditions); i { switch v := v.(*ComposeObjectRequest_SourceObject_ObjectPreconditions); i {
case 0: case 0:
return &v.state return &v.state
@ -9949,7 +9949,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[59].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[59].Exporter = func(v any, i int) any {
switch v := v.(*Bucket_Billing); i { switch v := v.(*Bucket_Billing); i {
case 0: case 0:
return &v.state return &v.state
@ -9961,7 +9961,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[60].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[60].Exporter = func(v any, i int) any {
switch v := v.(*Bucket_Cors); i { switch v := v.(*Bucket_Cors); i {
case 0: case 0:
return &v.state return &v.state
@ -9973,7 +9973,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[61].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[61].Exporter = func(v any, i int) any {
switch v := v.(*Bucket_Encryption); i { switch v := v.(*Bucket_Encryption); i {
case 0: case 0:
return &v.state return &v.state
@ -9985,7 +9985,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[62].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[62].Exporter = func(v any, i int) any {
switch v := v.(*Bucket_IamConfig); i { switch v := v.(*Bucket_IamConfig); i {
case 0: case 0:
return &v.state return &v.state
@ -9997,7 +9997,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[63].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[63].Exporter = func(v any, i int) any {
switch v := v.(*Bucket_Lifecycle); i { switch v := v.(*Bucket_Lifecycle); i {
case 0: case 0:
return &v.state return &v.state
@ -10009,7 +10009,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[64].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[64].Exporter = func(v any, i int) any {
switch v := v.(*Bucket_Logging); i { switch v := v.(*Bucket_Logging); i {
case 0: case 0:
return &v.state return &v.state
@ -10021,7 +10021,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[65].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[65].Exporter = func(v any, i int) any {
switch v := v.(*Bucket_RetentionPolicy); i { switch v := v.(*Bucket_RetentionPolicy); i {
case 0: case 0:
return &v.state return &v.state
@ -10033,7 +10033,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[66].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[66].Exporter = func(v any, i int) any {
switch v := v.(*Bucket_SoftDeletePolicy); i { switch v := v.(*Bucket_SoftDeletePolicy); i {
case 0: case 0:
return &v.state return &v.state
@ -10045,7 +10045,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[67].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[67].Exporter = func(v any, i int) any {
switch v := v.(*Bucket_Versioning); i { switch v := v.(*Bucket_Versioning); i {
case 0: case 0:
return &v.state return &v.state
@ -10057,7 +10057,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[68].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[68].Exporter = func(v any, i int) any {
switch v := v.(*Bucket_Website); i { switch v := v.(*Bucket_Website); i {
case 0: case 0:
return &v.state return &v.state
@ -10069,7 +10069,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[69].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[69].Exporter = func(v any, i int) any {
switch v := v.(*Bucket_CustomPlacementConfig); i { switch v := v.(*Bucket_CustomPlacementConfig); i {
case 0: case 0:
return &v.state return &v.state
@ -10081,7 +10081,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[70].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[70].Exporter = func(v any, i int) any {
switch v := v.(*Bucket_Autoclass); i { switch v := v.(*Bucket_Autoclass); i {
case 0: case 0:
return &v.state return &v.state
@ -10093,7 +10093,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[71].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[71].Exporter = func(v any, i int) any {
switch v := v.(*Bucket_HierarchicalNamespace); i { switch v := v.(*Bucket_HierarchicalNamespace); i {
case 0: case 0:
return &v.state return &v.state
@ -10105,7 +10105,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[73].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[73].Exporter = func(v any, i int) any {
switch v := v.(*Bucket_IamConfig_UniformBucketLevelAccess); i { switch v := v.(*Bucket_IamConfig_UniformBucketLevelAccess); i {
case 0: case 0:
return &v.state return &v.state
@ -10117,7 +10117,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[74].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[74].Exporter = func(v any, i int) any {
switch v := v.(*Bucket_Lifecycle_Rule); i { switch v := v.(*Bucket_Lifecycle_Rule); i {
case 0: case 0:
return &v.state return &v.state
@ -10129,7 +10129,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[75].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[75].Exporter = func(v any, i int) any {
switch v := v.(*Bucket_Lifecycle_Rule_Action); i { switch v := v.(*Bucket_Lifecycle_Rule_Action); i {
case 0: case 0:
return &v.state return &v.state
@ -10141,7 +10141,7 @@ func file_google_storage_v2_storage_proto_init() {
return nil return nil
} }
} }
file_google_storage_v2_storage_proto_msgTypes[76].Exporter = func(v interface{}, i int) interface{} { file_google_storage_v2_storage_proto_msgTypes[76].Exporter = func(v any, i int) any {
switch v := v.(*Bucket_Lifecycle_Rule_Condition); i { switch v := v.(*Bucket_Lifecycle_Rule_Condition); i {
case 0: case 0:
return &v.state return &v.state
@ -10154,48 +10154,48 @@ func file_google_storage_v2_storage_proto_init() {
} }
} }
} }
file_google_storage_v2_storage_proto_msgTypes[0].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[0].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[1].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[1].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[3].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[3].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[6].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[6].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[12].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[12].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[13].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[13].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[14].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[14].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[17].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[17].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[18].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[18].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[20].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[20].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[21].OneofWrappers = []interface{}{ file_google_storage_v2_storage_proto_msgTypes[21].OneofWrappers = []any{
(*WriteObjectRequest_UploadId)(nil), (*WriteObjectRequest_UploadId)(nil),
(*WriteObjectRequest_WriteObjectSpec)(nil), (*WriteObjectRequest_WriteObjectSpec)(nil),
(*WriteObjectRequest_ChecksummedData)(nil), (*WriteObjectRequest_ChecksummedData)(nil),
} }
file_google_storage_v2_storage_proto_msgTypes[22].OneofWrappers = []interface{}{ file_google_storage_v2_storage_proto_msgTypes[22].OneofWrappers = []any{
(*WriteObjectResponse_PersistedSize)(nil), (*WriteObjectResponse_PersistedSize)(nil),
(*WriteObjectResponse_Resource)(nil), (*WriteObjectResponse_Resource)(nil),
} }
file_google_storage_v2_storage_proto_msgTypes[23].OneofWrappers = []interface{}{ file_google_storage_v2_storage_proto_msgTypes[23].OneofWrappers = []any{
(*BidiWriteObjectRequest_UploadId)(nil), (*BidiWriteObjectRequest_UploadId)(nil),
(*BidiWriteObjectRequest_WriteObjectSpec)(nil), (*BidiWriteObjectRequest_WriteObjectSpec)(nil),
(*BidiWriteObjectRequest_ChecksummedData)(nil), (*BidiWriteObjectRequest_ChecksummedData)(nil),
} }
file_google_storage_v2_storage_proto_msgTypes[24].OneofWrappers = []interface{}{ file_google_storage_v2_storage_proto_msgTypes[24].OneofWrappers = []any{
(*BidiWriteObjectResponse_PersistedSize)(nil), (*BidiWriteObjectResponse_PersistedSize)(nil),
(*BidiWriteObjectResponse_Resource)(nil), (*BidiWriteObjectResponse_Resource)(nil),
} }
file_google_storage_v2_storage_proto_msgTypes[25].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[25].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[27].OneofWrappers = []interface{}{ file_google_storage_v2_storage_proto_msgTypes[27].OneofWrappers = []any{
(*QueryWriteStatusResponse_PersistedSize)(nil), (*QueryWriteStatusResponse_PersistedSize)(nil),
(*QueryWriteStatusResponse_Resource)(nil), (*QueryWriteStatusResponse_Resource)(nil),
} }
file_google_storage_v2_storage_proto_msgTypes[28].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[28].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[32].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[32].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[45].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[45].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[46].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[46].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[50].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[50].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[58].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[58].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[66].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[66].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[70].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[70].OneofWrappers = []any{}
file_google_storage_v2_storage_proto_msgTypes[76].OneofWrappers = []interface{}{} file_google_storage_v2_storage_proto_msgTypes[76].OneofWrappers = []any{}
type x struct{} type x struct{}
out := protoimpl.TypeBuilder{ out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{ File: protoimpl.DescBuilder{

View file

@ -15,4 +15,4 @@
package internal package internal
// Version is the current tagged release of the library. // Version is the current tagged release of the library.
const Version = "1.42.0" const Version = "1.43.0"

View file

@ -132,7 +132,7 @@ func ShouldRetry(err error) bool {
// Retry socket-level errors ECONNREFUSED and ECONNRESET (from syscall). // Retry socket-level errors ECONNREFUSED and ECONNRESET (from syscall).
// Unfortunately the error type is unexported, so we resort to string // Unfortunately the error type is unexported, so we resort to string
// matching. // matching.
retriable := []string{"connection refused", "connection reset"} retriable := []string{"connection refused", "connection reset", "broken pipe"}
for _, s := range retriable { for _, s := range retriable {
if strings.Contains(e.Error(), s) { if strings.Contains(e.Error(), s) {
return true return true

View file

@ -130,7 +130,7 @@ func (h *Histogram) Merge(b *Histogram) {
h.decimalBuckets[i] = &b h.decimalBuckets[i] = &b
} }
for j := range db { for j := range db {
h.decimalBuckets[i][j] = db[j] h.decimalBuckets[i][j] += db[j]
} }
} }
} }

View file

@ -1,3 +1,7 @@
# v1.27.24 (2024-07-03)
* **Dependency Update**: Updated to the latest SDK module versions
# v1.27.23 (2024-06-28) # v1.27.23 (2024-06-28)
* **Dependency Update**: Updated to the latest SDK module versions * **Dependency Update**: Updated to the latest SDK module versions

View file

@ -3,4 +3,4 @@
package config package config
// goModuleVersion is the tagged release for this module // goModuleVersion is the tagged release for this module
const goModuleVersion = "1.27.23" const goModuleVersion = "1.27.24"

View file

@ -1,3 +1,7 @@
# v1.17.24 (2024-07-03)
* **Dependency Update**: Updated to the latest SDK module versions
# v1.17.23 (2024-06-28) # v1.17.23 (2024-06-28)
* **Dependency Update**: Updated to the latest SDK module versions * **Dependency Update**: Updated to the latest SDK module versions

View file

@ -3,4 +3,4 @@
package credentials package credentials
// goModuleVersion is the tagged release for this module // goModuleVersion is the tagged release for this module
const goModuleVersion = "1.17.23" const goModuleVersion = "1.17.24"

View file

@ -1,3 +1,7 @@
# v1.17.5 (2024-07-03)
* **Dependency Update**: Updated to the latest SDK module versions
# v1.17.4 (2024-07-02) # v1.17.4 (2024-07-02)
* **Dependency Update**: Updated to the latest SDK module versions * **Dependency Update**: Updated to the latest SDK module versions

View file

@ -3,4 +3,4 @@
package manager package manager
// goModuleVersion is the tagged release for this module // goModuleVersion is the tagged release for this module
const goModuleVersion = "1.17.4" const goModuleVersion = "1.17.5"

View file

@ -1,3 +1,7 @@
# v1.26.2 (2024-07-03)
* No change notes available for this release.
# v1.26.1 (2024-06-28) # v1.26.1 (2024-06-28)
* **Dependency Update**: Updated to the latest SDK module versions * **Dependency Update**: Updated to the latest SDK module versions

View file

@ -3,4 +3,4 @@
package ssooidc package ssooidc
// goModuleVersion is the tagged release for this module // goModuleVersion is the tagged release for this module
const goModuleVersion = "1.26.1" const goModuleVersion = "1.26.2"

View file

@ -235,6 +235,14 @@ var defaultPartitions = endpoints.Partitions{
Region: "ca-central-1", Region: "ca-central-1",
}, },
}, },
endpoints.EndpointKey{
Region: "ca-west-1",
}: endpoints.Endpoint{
Hostname: "oidc.ca-west-1.amazonaws.com",
CredentialScope: endpoints.CredentialScope{
Region: "ca-west-1",
},
},
endpoints.EndpointKey{ endpoints.EndpointKey{
Region: "eu-central-1", Region: "eu-central-1",
}: endpoints.Endpoint{ }: endpoints.Endpoint{

View file

@ -7056,6 +7056,9 @@ var awsPartition = partition{
endpointKey{ endpointKey{
Region: "af-south-1", Region: "af-south-1",
}: endpoint{}, }: endpoint{},
endpointKey{
Region: "ap-east-1",
}: endpoint{},
endpointKey{ endpointKey{
Region: "ap-northeast-1", Region: "ap-northeast-1",
}: endpoint{}, }: endpoint{},
@ -7086,6 +7089,9 @@ var awsPartition = partition{
endpointKey{ endpointKey{
Region: "ca-central-1", Region: "ca-central-1",
}: endpoint{}, }: endpoint{},
endpointKey{
Region: "ca-west-1",
}: endpoint{},
endpointKey{ endpointKey{
Region: "eu-central-1", Region: "eu-central-1",
}: endpoint{}, }: endpoint{},
@ -7201,6 +7207,9 @@ var awsPartition = partition{
endpointKey{ endpointKey{
Region: "af-south-1", Region: "af-south-1",
}: endpoint{}, }: endpoint{},
endpointKey{
Region: "ap-east-1",
}: endpoint{},
endpointKey{ endpointKey{
Region: "ap-northeast-1", Region: "ap-northeast-1",
}: endpoint{}, }: endpoint{},
@ -7231,6 +7240,9 @@ var awsPartition = partition{
endpointKey{ endpointKey{
Region: "ca-central-1", Region: "ca-central-1",
}: endpoint{}, }: endpoint{},
endpointKey{
Region: "ca-west-1",
}: endpoint{},
endpointKey{ endpointKey{
Region: "eu-central-1", Region: "eu-central-1",
}: endpoint{}, }: endpoint{},
@ -14906,6 +14918,18 @@ var awsPartition = partition{
}, },
}, },
}, },
"globalaccelerator": service{
Endpoints: serviceEndpoints{
endpointKey{
Region: "fips-us-west-2",
}: endpoint{
Hostname: "globalaccelerator-fips.us-west-2.amazonaws.com",
CredentialScope: credentialScope{
Region: "us-west-2",
},
},
},
},
"glue": service{ "glue": service{
Endpoints: serviceEndpoints{ Endpoints: serviceEndpoints{
endpointKey{ endpointKey{
@ -22533,6 +22557,14 @@ var awsPartition = partition{
Region: "ca-central-1", Region: "ca-central-1",
}, },
}, },
endpointKey{
Region: "ca-west-1",
}: endpoint{
Hostname: "oidc.ca-west-1.amazonaws.com",
CredentialScope: credentialScope{
Region: "ca-west-1",
},
},
endpointKey{ endpointKey{
Region: "eu-central-1", Region: "eu-central-1",
}: endpoint{ }: endpoint{
@ -23176,91 +23208,490 @@ var awsPartition = partition{
Endpoints: serviceEndpoints{ Endpoints: serviceEndpoints{
endpointKey{ endpointKey{
Region: "af-south-1", Region: "af-south-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "af-south-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.af-south-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "ap-east-1", Region: "ap-east-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "ap-east-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.ap-east-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "ap-northeast-1", Region: "ap-northeast-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "ap-northeast-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.ap-northeast-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "ap-northeast-2", Region: "ap-northeast-2",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "ap-northeast-2",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.ap-northeast-2.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "ap-northeast-3", Region: "ap-northeast-3",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "ap-northeast-3",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.ap-northeast-3.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "ap-south-1", Region: "ap-south-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "ap-south-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.ap-south-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "ap-south-2", Region: "ap-south-2",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "ap-south-2",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.ap-south-2.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "ap-southeast-1", Region: "ap-southeast-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "ap-southeast-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.ap-southeast-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "ap-southeast-2", Region: "ap-southeast-2",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "ap-southeast-2",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.ap-southeast-2.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "ap-southeast-3", Region: "ap-southeast-3",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "ap-southeast-3",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.ap-southeast-3.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "ap-southeast-4", Region: "ap-southeast-4",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "ap-southeast-4",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.ap-southeast-4.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "ca-central-1", Region: "ca-central-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "ca-central-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.ca-central-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{
Region: "ca-central-1",
Variant: fipsVariant,
}: endpoint{
Hostname: "pi-fips.ca-central-1.amazonaws.com",
Protocols: []string{"https"},
},
endpointKey{
Region: "ca-central-1",
Variant: fipsVariant | dualStackVariant,
}: endpoint{
Hostname: "pi-fips.ca-central-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "ca-west-1", Region: "ca-west-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "ca-west-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.ca-west-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{
Region: "ca-west-1",
Variant: fipsVariant,
}: endpoint{
Hostname: "pi-fips.ca-west-1.amazonaws.com",
Protocols: []string{"https"},
},
endpointKey{
Region: "ca-west-1",
Variant: fipsVariant | dualStackVariant,
}: endpoint{
Hostname: "pi-fips.ca-west-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "eu-central-1", Region: "eu-central-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "eu-central-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.eu-central-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "eu-central-2", Region: "eu-central-2",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "eu-central-2",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.eu-central-2.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "eu-north-1", Region: "eu-north-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "eu-north-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.eu-north-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "eu-south-1", Region: "eu-south-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "eu-south-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.eu-south-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "eu-south-2", Region: "eu-south-2",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "eu-south-2",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.eu-south-2.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "eu-west-1", Region: "eu-west-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "eu-west-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.eu-west-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "eu-west-2", Region: "eu-west-2",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "eu-west-2",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.eu-west-2.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "eu-west-3", Region: "eu-west-3",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "eu-west-3",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.eu-west-3.api.aws",
Protocols: []string{"https"},
},
endpointKey{
Region: "fips-ca-central-1",
}: endpoint{
Hostname: "pi-fips.ca-central-1.amazonaws.com",
CredentialScope: credentialScope{
Region: "ca-central-1",
},
Deprecated: boxedTrue,
},
endpointKey{
Region: "fips-ca-west-1",
}: endpoint{
Hostname: "pi-fips.ca-west-1.amazonaws.com",
CredentialScope: credentialScope{
Region: "ca-west-1",
},
Deprecated: boxedTrue,
},
endpointKey{
Region: "fips-us-east-1",
}: endpoint{
Hostname: "pi-fips.us-east-1.amazonaws.com",
CredentialScope: credentialScope{
Region: "us-east-1",
},
Deprecated: boxedTrue,
},
endpointKey{
Region: "fips-us-east-2",
}: endpoint{
Hostname: "pi-fips.us-east-2.amazonaws.com",
CredentialScope: credentialScope{
Region: "us-east-2",
},
Deprecated: boxedTrue,
},
endpointKey{
Region: "fips-us-west-1",
}: endpoint{
Hostname: "pi-fips.us-west-1.amazonaws.com",
CredentialScope: credentialScope{
Region: "us-west-1",
},
Deprecated: boxedTrue,
},
endpointKey{
Region: "fips-us-west-2",
}: endpoint{
Hostname: "pi-fips.us-west-2.amazonaws.com",
CredentialScope: credentialScope{
Region: "us-west-2",
},
Deprecated: boxedTrue,
},
endpointKey{ endpointKey{
Region: "il-central-1", Region: "il-central-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "il-central-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.il-central-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "me-central-1", Region: "me-central-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "me-central-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.me-central-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "me-south-1", Region: "me-south-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "me-south-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.me-south-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "sa-east-1", Region: "sa-east-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "sa-east-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.sa-east-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "us-east-1", Region: "us-east-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "us-east-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.us-east-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{
Region: "us-east-1",
Variant: fipsVariant,
}: endpoint{
Hostname: "pi-fips.us-east-1.amazonaws.com",
Protocols: []string{"https"},
},
endpointKey{
Region: "us-east-1",
Variant: fipsVariant | dualStackVariant,
}: endpoint{
Hostname: "pi-fips.us-east-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "us-east-2", Region: "us-east-2",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "us-east-2",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.us-east-2.api.aws",
Protocols: []string{"https"},
},
endpointKey{
Region: "us-east-2",
Variant: fipsVariant,
}: endpoint{
Hostname: "pi-fips.us-east-2.amazonaws.com",
Protocols: []string{"https"},
},
endpointKey{
Region: "us-east-2",
Variant: fipsVariant | dualStackVariant,
}: endpoint{
Hostname: "pi-fips.us-east-2.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "us-west-1", Region: "us-west-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "us-west-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.us-west-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{
Region: "us-west-1",
Variant: fipsVariant,
}: endpoint{
Hostname: "pi-fips.us-west-1.amazonaws.com",
Protocols: []string{"https"},
},
endpointKey{
Region: "us-west-1",
Variant: fipsVariant | dualStackVariant,
}: endpoint{
Hostname: "pi-fips.us-west-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "us-west-2", Region: "us-west-2",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "us-west-2",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.us-west-2.api.aws",
Protocols: []string{"https"},
},
endpointKey{
Region: "us-west-2",
Variant: fipsVariant,
}: endpoint{
Hostname: "pi-fips.us-west-2.amazonaws.com",
Protocols: []string{"https"},
},
endpointKey{
Region: "us-west-2",
Variant: fipsVariant | dualStackVariant,
}: endpoint{
Hostname: "pi-fips.us-west-2.api.aws",
Protocols: []string{"https"},
},
}, },
}, },
"pinpoint": service{ "pinpoint": service{
@ -30410,6 +30841,9 @@ var awsPartition = partition{
}: endpoint{ }: endpoint{
Hostname: "sms-voice-fips.ca-central-1.amazonaws.com", Hostname: "sms-voice-fips.ca-central-1.amazonaws.com",
}, },
endpointKey{
Region: "ca-west-1",
}: endpoint{},
endpointKey{ endpointKey{
Region: "eu-central-1", Region: "eu-central-1",
}: endpoint{}, }: endpoint{},
@ -33586,6 +34020,21 @@ var awsPartition = partition{
endpointKey{ endpointKey{
Region: "us-west-1", Region: "us-west-1",
}: endpoint{}, }: endpoint{},
endpointKey{
Region: "us-west-1",
Variant: fipsVariant,
}: endpoint{
Hostname: "translate-fips.us-west-1.amazonaws.com",
},
endpointKey{
Region: "us-west-1-fips",
}: endpoint{
Hostname: "translate-fips.us-west-1.amazonaws.com",
CredentialScope: credentialScope{
Region: "us-west-1",
},
Deprecated: boxedTrue,
},
endpointKey{ endpointKey{
Region: "us-west-2", Region: "us-west-2",
}: endpoint{}, }: endpoint{},
@ -37451,10 +37900,28 @@ var awscnPartition = partition{
Endpoints: serviceEndpoints{ Endpoints: serviceEndpoints{
endpointKey{ endpointKey{
Region: "cn-north-1", Region: "cn-north-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "cn-north-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.cn-north-1.api.amazonwebservices.com.cn",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "cn-northwest-1", Region: "cn-northwest-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "cn-northwest-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.cn-northwest-1.api.amazonwebservices.com.cn",
Protocols: []string{"https"},
},
}, },
}, },
"pipes": service{ "pipes": service{
@ -42843,12 +43310,76 @@ var awsusgovPartition = partition{
}, },
"pi": service{ "pi": service{
Endpoints: serviceEndpoints{ Endpoints: serviceEndpoints{
endpointKey{
Region: "fips-us-gov-east-1",
}: endpoint{
Hostname: "pi-fips.us-gov-east-1.amazonaws.com",
CredentialScope: credentialScope{
Region: "us-gov-east-1",
},
Deprecated: boxedTrue,
},
endpointKey{
Region: "fips-us-gov-west-1",
}: endpoint{
Hostname: "pi-fips.us-gov-west-1.amazonaws.com",
CredentialScope: credentialScope{
Region: "us-gov-west-1",
},
Deprecated: boxedTrue,
},
endpointKey{ endpointKey{
Region: "us-gov-east-1", Region: "us-gov-east-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "us-gov-east-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.us-gov-east-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{
Region: "us-gov-east-1",
Variant: fipsVariant,
}: endpoint{
Hostname: "pi-fips.us-gov-east-1.amazonaws.com",
Protocols: []string{"https"},
},
endpointKey{
Region: "us-gov-east-1",
Variant: fipsVariant | dualStackVariant,
}: endpoint{
Hostname: "pi-fips.us-gov-east-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{ endpointKey{
Region: "us-gov-west-1", Region: "us-gov-west-1",
}: endpoint{}, }: endpoint{
Protocols: []string{"https"},
},
endpointKey{
Region: "us-gov-west-1",
Variant: dualStackVariant,
}: endpoint{
Hostname: "pi.us-gov-west-1.api.aws",
Protocols: []string{"https"},
},
endpointKey{
Region: "us-gov-west-1",
Variant: fipsVariant,
}: endpoint{
Hostname: "pi-fips.us-gov-west-1.amazonaws.com",
Protocols: []string{"https"},
},
endpointKey{
Region: "us-gov-west-1",
Variant: fipsVariant | dualStackVariant,
}: endpoint{
Hostname: "pi-fips.us-gov-west-1.api.aws",
Protocols: []string{"https"},
},
}, },
}, },
"pinpoint": service{ "pinpoint": service{
@ -46143,40 +46674,20 @@ var awsisoPartition = partition{
"redshift": service{ "redshift": service{
Endpoints: serviceEndpoints{ Endpoints: serviceEndpoints{
endpointKey{ endpointKey{
Region: "fips-us-iso-east-1", Region: "us-iso-east-1",
}: endpoint{ }: endpoint{
Hostname: "redshift-fips.us-iso-east-1.c2s.ic.gov", Hostname: "redshift.us-iso-east-1.c2s.ic.gov",
CredentialScope: credentialScope{ CredentialScope: credentialScope{
Region: "us-iso-east-1", Region: "us-iso-east-1",
}, },
Deprecated: boxedTrue,
},
endpointKey{
Region: "fips-us-iso-west-1",
}: endpoint{
Hostname: "redshift-fips.us-iso-west-1.c2s.ic.gov",
CredentialScope: credentialScope{
Region: "us-iso-west-1",
},
Deprecated: boxedTrue,
},
endpointKey{
Region: "us-iso-east-1",
}: endpoint{},
endpointKey{
Region: "us-iso-east-1",
Variant: fipsVariant,
}: endpoint{
Hostname: "redshift-fips.us-iso-east-1.c2s.ic.gov",
}, },
endpointKey{ endpointKey{
Region: "us-iso-west-1", Region: "us-iso-west-1",
}: endpoint{},
endpointKey{
Region: "us-iso-west-1",
Variant: fipsVariant,
}: endpoint{ }: endpoint{
Hostname: "redshift-fips.us-iso-west-1.c2s.ic.gov", Hostname: "redshift.us-iso-west-1.c2s.ic.gov",
CredentialScope: credentialScope{
Region: "us-iso-west-1",
},
}, },
}, },
}, },
@ -47152,22 +47663,12 @@ var awsisobPartition = partition{
"redshift": service{ "redshift": service{
Endpoints: serviceEndpoints{ Endpoints: serviceEndpoints{
endpointKey{ endpointKey{
Region: "fips-us-isob-east-1", Region: "us-isob-east-1",
}: endpoint{ }: endpoint{
Hostname: "redshift-fips.us-isob-east-1.sc2s.sgov.gov", Hostname: "redshift.us-isob-east-1.sc2s.sgov.gov",
CredentialScope: credentialScope{ CredentialScope: credentialScope{
Region: "us-isob-east-1", Region: "us-isob-east-1",
}, },
Deprecated: boxedTrue,
},
endpointKey{
Region: "us-isob-east-1",
}: endpoint{},
endpointKey{
Region: "us-isob-east-1",
Variant: fipsVariant,
}: endpoint{
Hostname: "redshift-fips.us-isob-east-1.sc2s.sgov.gov",
}, },
}, },
}, },

View file

@ -5,4 +5,4 @@ package aws
const SDKName = "aws-sdk-go" const SDKName = "aws-sdk-go"
// SDKVersion is the version of this SDK // SDKVersion is the version of this SDK
const SDKVersion = "1.54.13" const SDKVersion = "1.54.17"

View file

@ -262,6 +262,11 @@ func (w *Watcher) loop() {
// Run the watcher, which will tail the WAL until the quit channel is closed // Run the watcher, which will tail the WAL until the quit channel is closed
// or an error case is hit. // or an error case is hit.
func (w *Watcher) Run() error { func (w *Watcher) Run() error {
_, lastSegment, err := w.firstAndLast()
if err != nil {
return fmt.Errorf("wal.Segments: %w", err)
}
// We want to ensure this is false across iterations since // We want to ensure this is false across iterations since
// Run will be called again if there was a failure to read the WAL. // Run will be called again if there was a failure to read the WAL.
w.sendSamples = false w.sendSamples = false
@ -286,20 +291,14 @@ func (w *Watcher) Run() error {
return err return err
} }
level.Debug(w.logger).Log("msg", "Tailing WAL", "lastCheckpoint", lastCheckpoint, "checkpointIndex", checkpointIndex, "currentSegment", currentSegment) level.Debug(w.logger).Log("msg", "Tailing WAL", "lastCheckpoint", lastCheckpoint, "checkpointIndex", checkpointIndex, "currentSegment", currentSegment, "lastSegment", lastSegment)
for !isClosed(w.quit) { for !isClosed(w.quit) {
w.currentSegmentMetric.Set(float64(currentSegment)) w.currentSegmentMetric.Set(float64(currentSegment))
// Re-check on each iteration in case a new segment was added, // On start, after reading the existing WAL for series records, we have a pointer to what is the latest segment.
// because watch() will wait for notifications on the last segment. // On subsequent calls to this function, currentSegment will have been incremented and we should open that segment.
_, lastSegment, err := w.firstAndLast() level.Debug(w.logger).Log("msg", "Processing segment", "currentSegment", currentSegment)
if err != nil { if err := w.watch(currentSegment, currentSegment >= lastSegment); err != nil && !errors.Is(err, ErrIgnorable) {
return fmt.Errorf("wal.Segments: %w", err)
}
tail := currentSegment >= lastSegment
level.Debug(w.logger).Log("msg", "Processing segment", "currentSegment", currentSegment, "lastSegment", lastSegment)
if err := w.watch(currentSegment, tail); err != nil && !errors.Is(err, ErrIgnorable) {
return err return err
} }

View file

@ -30,7 +30,7 @@ const (
type InterceptorFilter func(*InterceptorInfo) bool type InterceptorFilter func(*InterceptorInfo) bool
// Filter is a predicate used to determine whether a given request in // Filter is a predicate used to determine whether a given request in
// should be instrumented by the attatched RPC tag info. // should be instrumented by the attached RPC tag info.
// A Filter must return true if the request should be instrumented. // A Filter must return true if the request should be instrumented.
type Filter func(*stats.RPCTagInfo) bool type Filter func(*stats.RPCTagInfo) bool

View file

@ -7,6 +7,7 @@ package otelgrpc // import "go.opentelemetry.io/contrib/instrumentation/google.g
// https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/rpc.md // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/rpc.md
import ( import (
"context" "context"
"errors"
"io" "io"
"net" "net"
"strconv" "strconv"
@ -136,7 +137,7 @@ func (w *clientStream) RecvMsg(m interface{}) error {
if err == nil && !w.desc.ServerStreams { if err == nil && !w.desc.ServerStreams {
w.endSpan(nil) w.endSpan(nil)
} else if err == io.EOF { } else if errors.Is(err, io.EOF) {
w.endSpan(nil) w.endSpan(nil)
} else if err != nil { } else if err != nil {
w.endSpan(err) w.endSpan(err)
@ -333,7 +334,7 @@ func UnaryServerInterceptor(opts ...Option) grpc.UnaryServerInterceptor {
elapsedTime := float64(time.Since(before)) / float64(time.Millisecond) elapsedTime := float64(time.Since(before)) / float64(time.Millisecond)
metricAttrs = append(metricAttrs, grpcStatusCodeAttr) metricAttrs = append(metricAttrs, grpcStatusCodeAttr)
cfg.rpcDuration.Record(ctx, elapsedTime, metric.WithAttributes(metricAttrs...)) cfg.rpcDuration.Record(ctx, elapsedTime, metric.WithAttributeSet(attribute.NewSet(metricAttrs...)))
return resp, err return resp, err
} }

View file

@ -151,7 +151,7 @@ func (c *config) handleRPC(ctx context.Context, rs stats.RPCStats, isServer bool
case *stats.InPayload: case *stats.InPayload:
if gctx != nil { if gctx != nil {
messageId = atomic.AddInt64(&gctx.messagesReceived, 1) messageId = atomic.AddInt64(&gctx.messagesReceived, 1)
c.rpcRequestSize.Record(ctx, int64(rs.Length), metric.WithAttributes(metricAttrs...)) c.rpcRequestSize.Record(ctx, int64(rs.Length), metric.WithAttributeSet(attribute.NewSet(metricAttrs...)))
} }
if c.ReceivedEvent { if c.ReceivedEvent {
@ -167,7 +167,7 @@ func (c *config) handleRPC(ctx context.Context, rs stats.RPCStats, isServer bool
case *stats.OutPayload: case *stats.OutPayload:
if gctx != nil { if gctx != nil {
messageId = atomic.AddInt64(&gctx.messagesSent, 1) messageId = atomic.AddInt64(&gctx.messagesSent, 1)
c.rpcResponseSize.Record(ctx, int64(rs.Length), metric.WithAttributes(metricAttrs...)) c.rpcResponseSize.Record(ctx, int64(rs.Length), metric.WithAttributeSet(attribute.NewSet(metricAttrs...)))
} }
if c.SentEvent { if c.SentEvent {
@ -204,14 +204,17 @@ func (c *config) handleRPC(ctx context.Context, rs stats.RPCStats, isServer bool
span.End() span.End()
metricAttrs = append(metricAttrs, rpcStatusAttr) metricAttrs = append(metricAttrs, rpcStatusAttr)
// Allocate vararg slice once.
recordOpts := []metric.RecordOption{metric.WithAttributeSet(attribute.NewSet(metricAttrs...))}
// Use floating point division here for higher precision (instead of Millisecond method). // Use floating point division here for higher precision (instead of Millisecond method).
// Measure right before calling Record() to capture as much elapsed time as possible.
elapsedTime := float64(rs.EndTime.Sub(rs.BeginTime)) / float64(time.Millisecond) elapsedTime := float64(rs.EndTime.Sub(rs.BeginTime)) / float64(time.Millisecond)
c.rpcDuration.Record(ctx, elapsedTime, metric.WithAttributes(metricAttrs...)) c.rpcDuration.Record(ctx, elapsedTime, recordOpts...)
if gctx != nil { if gctx != nil {
c.rpcRequestsPerRPC.Record(ctx, atomic.LoadInt64(&gctx.messagesReceived), metric.WithAttributes(metricAttrs...)) c.rpcRequestsPerRPC.Record(ctx, atomic.LoadInt64(&gctx.messagesReceived), recordOpts...)
c.rpcResponsesPerRPC.Record(ctx, atomic.LoadInt64(&gctx.messagesSent), metric.WithAttributes(metricAttrs...)) c.rpcResponsesPerRPC.Record(ctx, atomic.LoadInt64(&gctx.messagesSent), recordOpts...)
} }
default: default:
return return

View file

@ -5,7 +5,7 @@ package otelgrpc // import "go.opentelemetry.io/contrib/instrumentation/google.g
// Version is the current release version of the gRPC instrumentation. // Version is the current release version of the gRPC instrumentation.
func Version() string { func Version() string {
return "0.52.0" return "0.53.0"
// This string is updated by the pre_release.sh script during release // This string is updated by the pre_release.sh script during release
} }

View file

@ -12,7 +12,7 @@ import (
) )
// DefaultClient is the default Client and is used by Get, Head, Post and PostForm. // DefaultClient is the default Client and is used by Get, Head, Post and PostForm.
// Please be careful of intitialization order - for example, if you change // Please be careful of initialization order - for example, if you change
// the global propagator, the DefaultClient might still be using the old one. // the global propagator, the DefaultClient might still be using the old one.
var DefaultClient = &http.Client{Transport: NewTransport(http.DefaultTransport)} var DefaultClient = &http.Client{Transport: NewTransport(http.DefaultTransport)}

View file

@ -100,7 +100,7 @@ func WithPublicEndpoint() Option {
}) })
} }
// WithPublicEndpointFn runs with every request, and allows conditionnally // WithPublicEndpointFn runs with every request, and allows conditionally
// configuring the Handler to link the span with an incoming span context. If // configuring the Handler to link the span with an incoming span context. If
// this option is not provided or returns false, then the association is a // this option is not provided or returns false, then the association is a
// child association instead of a link. // child association instead of a link.

View file

@ -12,6 +12,7 @@ import (
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconv" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconv"
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconvutil" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconvutil"
"go.opentelemetry.io/otel" "go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/propagation"
"go.opentelemetry.io/otel/trace" "go.opentelemetry.io/otel/trace"
@ -204,10 +205,15 @@ func (h *middleware) serveHTTP(w http.ResponseWriter, r *http.Request, next http
WriteHeader: func(httpsnoop.WriteHeaderFunc) httpsnoop.WriteHeaderFunc { WriteHeader: func(httpsnoop.WriteHeaderFunc) httpsnoop.WriteHeaderFunc {
return rww.WriteHeader return rww.WriteHeader
}, },
Flush: func(httpsnoop.FlushFunc) httpsnoop.FlushFunc {
return rww.Flush
},
}) })
labeler := &Labeler{} labeler, found := LabelerFromContext(ctx)
ctx = injectLabeler(ctx, labeler) if !found {
ctx = ContextWithLabeler(ctx, labeler)
}
next.ServeHTTP(w, r.WithContext(ctx)) next.ServeHTTP(w, r.WithContext(ctx))
@ -225,9 +231,10 @@ func (h *middleware) serveHTTP(w http.ResponseWriter, r *http.Request, next http
if rww.statusCode > 0 { if rww.statusCode > 0 {
attributes = append(attributes, semconv.HTTPStatusCode(rww.statusCode)) attributes = append(attributes, semconv.HTTPStatusCode(rww.statusCode))
} }
o := metric.WithAttributes(attributes...) o := metric.WithAttributeSet(attribute.NewSet(attributes...))
h.requestBytesCounter.Add(ctx, bw.read.Load(), o) addOpts := []metric.AddOption{o} // Allocate vararg slice once.
h.responseBytesCounter.Add(ctx, rww.written, o) h.requestBytesCounter.Add(ctx, bw.read.Load(), addOpts...)
h.responseBytesCounter.Add(ctx, rww.written, addOpts...)
// Use floating point division here for higher precision (instead of Millisecond method). // Use floating point division here for higher precision (instead of Millisecond method).
elapsedTime := float64(time.Since(requestStartTime)) / float64(time.Millisecond) elapsedTime := float64(time.Since(requestStartTime)) / float64(time.Millisecond)

View file

@ -6,6 +6,8 @@ package semconv // import "go.opentelemetry.io/contrib/instrumentation/net/http/
import ( import (
"fmt" "fmt"
"net/http" "net/http"
"os"
"strings"
"go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/codes"
@ -19,40 +21,51 @@ type ResponseTelemetry struct {
WriteError error WriteError error
} }
type HTTPServer interface { type HTTPServer struct {
// RequestTraceAttrs returns trace attributes for an HTTP request received by a duplicate bool
// server.
//
// The server must be the primary server name if it is known. For example this
// would be the ServerName directive
// (https://httpd.apache.org/docs/2.4/mod/core.html#servername) for an Apache
// server, and the server_name directive
// (http://nginx.org/en/docs/http/ngx_http_core_module.html#server_name) for an
// nginx server. More generically, the primary server name would be the host
// header value that matches the default virtual host of an HTTP server. It
// should include the host identifier and if a port is used to route to the
// server that port identifier should be included as an appropriate port
// suffix.
//
// If the primary server name is not known, server should be an empty string.
// The req Host will be used to determine the server instead.
RequestTraceAttrs(server string, req *http.Request) []attribute.KeyValue
// ResponseTraceAttrs returns trace attributes for telemetry from an HTTP response.
//
// If any of the fields in the ResponseTelemetry are not set the attribute will be omitted.
ResponseTraceAttrs(ResponseTelemetry) []attribute.KeyValue
// Route returns the attribute for the route.
Route(string) attribute.KeyValue
} }
// var warnOnce = sync.Once{} // RequestTraceAttrs returns trace attributes for an HTTP request received by a
// server.
//
// The server must be the primary server name if it is known. For example this
// would be the ServerName directive
// (https://httpd.apache.org/docs/2.4/mod/core.html#servername) for an Apache
// server, and the server_name directive
// (http://nginx.org/en/docs/http/ngx_http_core_module.html#server_name) for an
// nginx server. More generically, the primary server name would be the host
// header value that matches the default virtual host of an HTTP server. It
// should include the host identifier and if a port is used to route to the
// server that port identifier should be included as an appropriate port
// suffix.
//
// If the primary server name is not known, server should be an empty string.
// The req Host will be used to determine the server instead.
func (s HTTPServer) RequestTraceAttrs(server string, req *http.Request) []attribute.KeyValue {
if s.duplicate {
return append(oldHTTPServer{}.RequestTraceAttrs(server, req), newHTTPServer{}.RequestTraceAttrs(server, req)...)
}
return oldHTTPServer{}.RequestTraceAttrs(server, req)
}
// ResponseTraceAttrs returns trace attributes for telemetry from an HTTP response.
//
// If any of the fields in the ResponseTelemetry are not set the attribute will be omitted.
func (s HTTPServer) ResponseTraceAttrs(resp ResponseTelemetry) []attribute.KeyValue {
if s.duplicate {
return append(oldHTTPServer{}.ResponseTraceAttrs(resp), newHTTPServer{}.ResponseTraceAttrs(resp)...)
}
return oldHTTPServer{}.ResponseTraceAttrs(resp)
}
// Route returns the attribute for the route.
func (s HTTPServer) Route(route string) attribute.KeyValue {
return oldHTTPServer{}.Route(route)
}
func NewHTTPServer() HTTPServer { func NewHTTPServer() HTTPServer {
// TODO (#5331): Detect version based on environment variable OTEL_HTTP_CLIENT_COMPATIBILITY_MODE. env := strings.ToLower(os.Getenv("OTEL_HTTP_CLIENT_COMPATIBILITY_MODE"))
// TODO (#5331): Add warning of use of a deprecated version of Semantic Versions. return HTTPServer{duplicate: env == "http/dup"}
return oldHTTPServer{}
} }
// ServerStatus returns a span status code and message for an HTTP status code // ServerStatus returns a span status code and message for an HTTP status code

View file

@ -5,8 +5,12 @@ package semconv // import "go.opentelemetry.io/contrib/instrumentation/net/http/
import ( import (
"net" "net"
"net/http"
"strconv" "strconv"
"strings" "strings"
"go.opentelemetry.io/otel/attribute"
semconvNew "go.opentelemetry.io/otel/semconv/v1.24.0"
) )
// splitHostPort splits a network address hostport of the form "host", // splitHostPort splits a network address hostport of the form "host",
@ -47,3 +51,41 @@ func splitHostPort(hostport string) (host string, port int) {
} }
return host, int(p) return host, int(p)
} }
func requiredHTTPPort(https bool, port int) int { // nolint:revive
if https {
if port > 0 && port != 443 {
return port
}
} else {
if port > 0 && port != 80 {
return port
}
}
return -1
}
func serverClientIP(xForwardedFor string) string {
if idx := strings.Index(xForwardedFor, ","); idx >= 0 {
xForwardedFor = xForwardedFor[:idx]
}
return xForwardedFor
}
func netProtocol(proto string) (name string, version string) {
name, version, _ = strings.Cut(proto, "/")
name = strings.ToLower(name)
return name, version
}
var methodLookup = map[string]attribute.KeyValue{
http.MethodConnect: semconvNew.HTTPRequestMethodConnect,
http.MethodDelete: semconvNew.HTTPRequestMethodDelete,
http.MethodGet: semconvNew.HTTPRequestMethodGet,
http.MethodHead: semconvNew.HTTPRequestMethodHead,
http.MethodOptions: semconvNew.HTTPRequestMethodOptions,
http.MethodPatch: semconvNew.HTTPRequestMethodPatch,
http.MethodPost: semconvNew.HTTPRequestMethodPost,
http.MethodPut: semconvNew.HTTPRequestMethodPut,
http.MethodTrace: semconvNew.HTTPRequestMethodTrace,
}

View file

@ -4,6 +4,7 @@
package semconv // import "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconv" package semconv // import "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconv"
import ( import (
"errors"
"io" "io"
"net/http" "net/http"
@ -14,8 +15,6 @@ import (
type oldHTTPServer struct{} type oldHTTPServer struct{}
var _ HTTPServer = oldHTTPServer{}
// RequestTraceAttrs returns trace attributes for an HTTP request received by a // RequestTraceAttrs returns trace attributes for an HTTP request received by a
// server. // server.
// //
@ -45,7 +44,7 @@ func (o oldHTTPServer) ResponseTraceAttrs(resp ResponseTelemetry) []attribute.Ke
if resp.ReadBytes > 0 { if resp.ReadBytes > 0 {
attributes = append(attributes, semconv.HTTPRequestContentLength(int(resp.ReadBytes))) attributes = append(attributes, semconv.HTTPRequestContentLength(int(resp.ReadBytes)))
} }
if resp.ReadError != nil && resp.ReadError != io.EOF { if resp.ReadError != nil && !errors.Is(resp.ReadError, io.EOF) {
// This is not in the semantic conventions, but is historically provided // This is not in the semantic conventions, but is historically provided
attributes = append(attributes, attribute.String("http.read_error", resp.ReadError.Error())) attributes = append(attributes, attribute.String("http.read_error", resp.ReadError.Error()))
} }
@ -55,7 +54,7 @@ func (o oldHTTPServer) ResponseTraceAttrs(resp ResponseTelemetry) []attribute.Ke
if resp.StatusCode > 0 { if resp.StatusCode > 0 {
attributes = append(attributes, semconv.HTTPStatusCode(resp.StatusCode)) attributes = append(attributes, semconv.HTTPStatusCode(resp.StatusCode))
} }
if resp.WriteError != nil && resp.WriteError != io.EOF { if resp.WriteError != nil && !errors.Is(resp.WriteError, io.EOF) {
// This is not in the semantic conventions, but is historically provided // This is not in the semantic conventions, but is historically provided
attributes = append(attributes, attribute.String("http.write_error", resp.WriteError.Error())) attributes = append(attributes, attribute.String("http.write_error", resp.WriteError.Error()))
} }

View file

@ -0,0 +1,197 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0
package semconv // import "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconv"
import (
"net/http"
"strings"
"go.opentelemetry.io/otel/attribute"
semconvNew "go.opentelemetry.io/otel/semconv/v1.24.0"
)
type newHTTPServer struct{}
// TraceRequest returns trace attributes for an HTTP request received by a
// server.
//
// The server must be the primary server name if it is known. For example this
// would be the ServerName directive
// (https://httpd.apache.org/docs/2.4/mod/core.html#servername) for an Apache
// server, and the server_name directive
// (http://nginx.org/en/docs/http/ngx_http_core_module.html#server_name) for an
// nginx server. More generically, the primary server name would be the host
// header value that matches the default virtual host of an HTTP server. It
// should include the host identifier and if a port is used to route to the
// server that port identifier should be included as an appropriate port
// suffix.
//
// If the primary server name is not known, server should be an empty string.
// The req Host will be used to determine the server instead.
func (n newHTTPServer) RequestTraceAttrs(server string, req *http.Request) []attribute.KeyValue {
count := 3 // ServerAddress, Method, Scheme
var host string
var p int
if server == "" {
host, p = splitHostPort(req.Host)
} else {
// Prioritize the primary server name.
host, p = splitHostPort(server)
if p < 0 {
_, p = splitHostPort(req.Host)
}
}
hostPort := requiredHTTPPort(req.TLS != nil, p)
if hostPort > 0 {
count++
}
method, methodOriginal := n.method(req.Method)
if methodOriginal != (attribute.KeyValue{}) {
count++
}
scheme := n.scheme(req.TLS != nil)
if peer, peerPort := splitHostPort(req.RemoteAddr); peer != "" {
// The Go HTTP server sets RemoteAddr to "IP:port", this will not be a
// file-path that would be interpreted with a sock family.
count++
if peerPort > 0 {
count++
}
}
useragent := req.UserAgent()
if useragent != "" {
count++
}
clientIP := serverClientIP(req.Header.Get("X-Forwarded-For"))
if clientIP != "" {
count++
}
if req.URL != nil && req.URL.Path != "" {
count++
}
protoName, protoVersion := netProtocol(req.Proto)
if protoName != "" && protoName != "http" {
count++
}
if protoVersion != "" {
count++
}
attrs := make([]attribute.KeyValue, 0, count)
attrs = append(attrs,
semconvNew.ServerAddress(host),
method,
scheme,
)
if hostPort > 0 {
attrs = append(attrs, semconvNew.ServerPort(hostPort))
}
if methodOriginal != (attribute.KeyValue{}) {
attrs = append(attrs, methodOriginal)
}
if peer, peerPort := splitHostPort(req.RemoteAddr); peer != "" {
// The Go HTTP server sets RemoteAddr to "IP:port", this will not be a
// file-path that would be interpreted with a sock family.
attrs = append(attrs, semconvNew.NetworkPeerAddress(peer))
if peerPort > 0 {
attrs = append(attrs, semconvNew.NetworkPeerPort(peerPort))
}
}
if useragent := req.UserAgent(); useragent != "" {
attrs = append(attrs, semconvNew.UserAgentOriginal(useragent))
}
if clientIP != "" {
attrs = append(attrs, semconvNew.ClientAddress(clientIP))
}
if req.URL != nil && req.URL.Path != "" {
attrs = append(attrs, semconvNew.URLPath(req.URL.Path))
}
if protoName != "" && protoName != "http" {
attrs = append(attrs, semconvNew.NetworkProtocolName(protoName))
}
if protoVersion != "" {
attrs = append(attrs, semconvNew.NetworkProtocolVersion(protoVersion))
}
return attrs
}
func (n newHTTPServer) method(method string) (attribute.KeyValue, attribute.KeyValue) {
if method == "" {
return semconvNew.HTTPRequestMethodGet, attribute.KeyValue{}
}
if attr, ok := methodLookup[method]; ok {
return attr, attribute.KeyValue{}
}
orig := semconvNew.HTTPRequestMethodOriginal(method)
if attr, ok := methodLookup[strings.ToUpper(method)]; ok {
return attr, orig
}
return semconvNew.HTTPRequestMethodGet, orig
}
func (n newHTTPServer) scheme(https bool) attribute.KeyValue { // nolint:revive
if https {
return semconvNew.URLScheme("https")
}
return semconvNew.URLScheme("http")
}
// TraceResponse returns trace attributes for telemetry from an HTTP response.
//
// If any of the fields in the ResponseTelemetry are not set the attribute will be omitted.
func (n newHTTPServer) ResponseTraceAttrs(resp ResponseTelemetry) []attribute.KeyValue {
var count int
if resp.ReadBytes > 0 {
count++
}
if resp.WriteBytes > 0 {
count++
}
if resp.StatusCode > 0 {
count++
}
attributes := make([]attribute.KeyValue, 0, count)
if resp.ReadBytes > 0 {
attributes = append(attributes,
semconvNew.HTTPRequestBodySize(int(resp.ReadBytes)),
)
}
if resp.WriteBytes > 0 {
attributes = append(attributes,
semconvNew.HTTPResponseBodySize(int(resp.WriteBytes)),
)
}
if resp.StatusCode > 0 {
attributes = append(attributes,
semconvNew.HTTPResponseStatusCode(resp.StatusCode),
)
}
return attributes
}
// Route returns the attribute for the route.
func (n newHTTPServer) Route(route string) attribute.KeyValue {
return semconvNew.HTTPRoute(route)
}

View file

@ -92,7 +92,7 @@ func (c *netConv) Host(address string) []attribute.KeyValue {
attrs := make([]attribute.KeyValue, 0, n) attrs := make([]attribute.KeyValue, 0, n)
attrs = append(attrs, c.HostName(h)) attrs = append(attrs, c.HostName(h))
if p > 0 { if p > 0 {
attrs = append(attrs, c.HostPort(int(p))) attrs = append(attrs, c.HostPort(p))
} }
return attrs return attrs
} }
@ -138,7 +138,7 @@ func (c *netConv) Peer(address string) []attribute.KeyValue {
attrs := make([]attribute.KeyValue, 0, n) attrs := make([]attribute.KeyValue, 0, n)
attrs = append(attrs, c.PeerName(h)) attrs = append(attrs, c.PeerName(h))
if p > 0 { if p > 0 {
attrs = append(attrs, c.PeerPort(int(p))) attrs = append(attrs, c.PeerPort(p))
} }
return attrs return attrs
} }

View file

@ -37,8 +37,12 @@ type labelerContextKeyType int
const lablelerContextKey labelerContextKeyType = 0 const lablelerContextKey labelerContextKeyType = 0
func injectLabeler(ctx context.Context, l *Labeler) context.Context { // ContextWithLabeler returns a new context with the provided Labeler instance.
return context.WithValue(ctx, lablelerContextKey, l) // Attributes added to the specified labeler will be injected into metrics
// emitted by the instrumentation. Only one labeller can be injected into the
// context. Injecting it multiple times will override the previous calls.
func ContextWithLabeler(parent context.Context, l *Labeler) context.Context {
return context.WithValue(parent, lablelerContextKey, l)
} }
// LabelerFromContext retrieves a Labeler instance from the provided context if // LabelerFromContext retrieves a Labeler instance from the provided context if

View file

@ -11,15 +11,14 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconvutil" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconvutil"
"go.opentelemetry.io/otel" "go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/codes"
"go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/propagation"
"go.opentelemetry.io/otel/trace"
semconv "go.opentelemetry.io/otel/semconv/v1.20.0" semconv "go.opentelemetry.io/otel/semconv/v1.20.0"
"go.opentelemetry.io/otel/trace"
) )
// Transport implements the http.RoundTripper interface and wraps // Transport implements the http.RoundTripper interface and wraps
@ -137,8 +136,10 @@ func (t *Transport) RoundTrip(r *http.Request) (*http.Response, error) {
ctx = httptrace.WithClientTrace(ctx, t.clientTrace(ctx)) ctx = httptrace.WithClientTrace(ctx, t.clientTrace(ctx))
} }
labeler := &Labeler{} labeler, found := LabelerFromContext(ctx)
ctx = injectLabeler(ctx, labeler) if !found {
ctx = ContextWithLabeler(ctx, labeler)
}
r = r.Clone(ctx) // According to RoundTripper spec, we shouldn't modify the origin request. r = r.Clone(ctx) // According to RoundTripper spec, we shouldn't modify the origin request.
@ -170,11 +171,12 @@ func (t *Transport) RoundTrip(r *http.Request) (*http.Response, error) {
if res.StatusCode > 0 { if res.StatusCode > 0 {
metricAttrs = append(metricAttrs, semconv.HTTPStatusCode(res.StatusCode)) metricAttrs = append(metricAttrs, semconv.HTTPStatusCode(res.StatusCode))
} }
o := metric.WithAttributes(metricAttrs...) o := metric.WithAttributeSet(attribute.NewSet(metricAttrs...))
t.requestBytesCounter.Add(ctx, bw.read.Load(), o) addOpts := []metric.AddOption{o} // Allocate vararg slice once.
t.requestBytesCounter.Add(ctx, bw.read.Load(), addOpts...)
// For handling response bytes we leverage a callback when the client reads the http response // For handling response bytes we leverage a callback when the client reads the http response
readRecordFunc := func(n int64) { readRecordFunc := func(n int64) {
t.responseBytesCounter.Add(ctx, n, o) t.responseBytesCounter.Add(ctx, n, addOpts...)
} }
// traces // traces

View file

@ -5,7 +5,7 @@ package otelhttp // import "go.opentelemetry.io/contrib/instrumentation/net/http
// Version is the current release version of the otelhttp instrumentation. // Version is the current release version of the otelhttp instrumentation.
func Version() string { func Version() string {
return "0.52.0" return "0.53.0"
// This string is updated by the pre_release.sh script during release // This string is updated by the pre_release.sh script during release
} }

View file

@ -87,3 +87,13 @@ func (w *respWriterWrapper) WriteHeader(statusCode int) {
} }
w.ResponseWriter.WriteHeader(statusCode) w.ResponseWriter.WriteHeader(statusCode)
} }
func (w *respWriterWrapper) Flush() {
if !w.wroteHeader {
w.WriteHeader(http.StatusOK)
}
if f, ok := w.ResponseWriter.(http.Flusher); ok {
f.Flush()
}
}

View file

@ -0,0 +1,3 @@
# Semconv v1.24.0
[![PkgGoDev](https://pkg.go.dev/badge/go.opentelemetry.io/otel/semconv/v1.24.0)](https://pkg.go.dev/go.opentelemetry.io/otel/semconv/v1.24.0)

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,9 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0
// Package semconv implements OpenTelemetry semantic conventions.
//
// OpenTelemetry semantic conventions are agreed standardized naming
// patterns for OpenTelemetry things. This package represents the v1.24.0
// version of the OpenTelemetry semantic conventions.
package semconv // import "go.opentelemetry.io/otel/semconv/v1.24.0"

View file

@ -0,0 +1,200 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0
// Code generated from semantic convention specification. DO NOT EDIT.
package semconv // import "go.opentelemetry.io/otel/semconv/v1.24.0"
import "go.opentelemetry.io/otel/attribute"
// This event represents an occurrence of a lifecycle transition on the iOS
// platform.
const (
// IosStateKey is the attribute Key conforming to the "ios.state" semantic
// conventions. It represents the this attribute represents the state the
// application has transitioned into at the occurrence of the event.
//
// Type: Enum
// RequirementLevel: Required
// Stability: experimental
// Note: The iOS lifecycle states are defined in the [UIApplicationDelegate
// documentation](https://developer.apple.com/documentation/uikit/uiapplicationdelegate#1656902),
// and from which the `OS terminology` column values are derived.
IosStateKey = attribute.Key("ios.state")
)
var (
// The app has become `active`. Associated with UIKit notification `applicationDidBecomeActive`
IosStateActive = IosStateKey.String("active")
// The app is now `inactive`. Associated with UIKit notification `applicationWillResignActive`
IosStateInactive = IosStateKey.String("inactive")
// The app is now in the background. This value is associated with UIKit notification `applicationDidEnterBackground`
IosStateBackground = IosStateKey.String("background")
// The app is now in the foreground. This value is associated with UIKit notification `applicationWillEnterForeground`
IosStateForeground = IosStateKey.String("foreground")
// The app is about to terminate. Associated with UIKit notification `applicationWillTerminate`
IosStateTerminate = IosStateKey.String("terminate")
)
// This event represents an occurrence of a lifecycle transition on the Android
// platform.
const (
// AndroidStateKey is the attribute Key conforming to the "android.state"
// semantic conventions. It represents the this attribute represents the
// state the application has transitioned into at the occurrence of the
// event.
//
// Type: Enum
// RequirementLevel: Required
// Stability: experimental
// Note: The Android lifecycle states are defined in [Activity lifecycle
// callbacks](https://developer.android.com/guide/components/activities/activity-lifecycle#lc),
// and from which the `OS identifiers` are derived.
AndroidStateKey = attribute.Key("android.state")
)
var (
// Any time before Activity.onResume() or, if the app has no Activity, Context.startService() has been called in the app for the first time
AndroidStateCreated = AndroidStateKey.String("created")
// Any time after Activity.onPause() or, if the app has no Activity, Context.stopService() has been called when the app was in the foreground state
AndroidStateBackground = AndroidStateKey.String("background")
// Any time after Activity.onResume() or, if the app has no Activity, Context.startService() has been called when the app was in either the created or background states
AndroidStateForeground = AndroidStateKey.String("foreground")
)
// This semantic convention defines the attributes used to represent a feature
// flag evaluation as an event.
const (
// FeatureFlagKeyKey is the attribute Key conforming to the
// "feature_flag.key" semantic conventions. It represents the unique
// identifier of the feature flag.
//
// Type: string
// RequirementLevel: Required
// Stability: experimental
// Examples: 'logo-color'
FeatureFlagKeyKey = attribute.Key("feature_flag.key")
// FeatureFlagProviderNameKey is the attribute Key conforming to the
// "feature_flag.provider_name" semantic conventions. It represents the
// name of the service provider that performs the flag evaluation.
//
// Type: string
// RequirementLevel: Recommended
// Stability: experimental
// Examples: 'Flag Manager'
FeatureFlagProviderNameKey = attribute.Key("feature_flag.provider_name")
// FeatureFlagVariantKey is the attribute Key conforming to the
// "feature_flag.variant" semantic conventions. It represents the sHOULD be
// a semantic identifier for a value. If one is unavailable, a stringified
// version of the value can be used.
//
// Type: string
// RequirementLevel: Recommended
// Stability: experimental
// Examples: 'red', 'true', 'on'
// Note: A semantic identifier, commonly referred to as a variant, provides
// a means
// for referring to a value without including the value itself. This can
// provide additional context for understanding the meaning behind a value.
// For example, the variant `red` maybe be used for the value `#c05543`.
//
// A stringified version of the value can be used in situations where a
// semantic identifier is unavailable. String representation of the value
// should be determined by the implementer.
FeatureFlagVariantKey = attribute.Key("feature_flag.variant")
)
// FeatureFlagKey returns an attribute KeyValue conforming to the
// "feature_flag.key" semantic conventions. It represents the unique identifier
// of the feature flag.
func FeatureFlagKey(val string) attribute.KeyValue {
return FeatureFlagKeyKey.String(val)
}
// FeatureFlagProviderName returns an attribute KeyValue conforming to the
// "feature_flag.provider_name" semantic conventions. It represents the name of
// the service provider that performs the flag evaluation.
func FeatureFlagProviderName(val string) attribute.KeyValue {
return FeatureFlagProviderNameKey.String(val)
}
// FeatureFlagVariant returns an attribute KeyValue conforming to the
// "feature_flag.variant" semantic conventions. It represents the sHOULD be a
// semantic identifier for a value. If one is unavailable, a stringified
// version of the value can be used.
func FeatureFlagVariant(val string) attribute.KeyValue {
return FeatureFlagVariantKey.String(val)
}
// RPC received/sent message.
const (
// MessageCompressedSizeKey is the attribute Key conforming to the
// "message.compressed_size" semantic conventions. It represents the
// compressed size of the message in bytes.
//
// Type: int
// RequirementLevel: Optional
// Stability: experimental
MessageCompressedSizeKey = attribute.Key("message.compressed_size")
// MessageIDKey is the attribute Key conforming to the "message.id"
// semantic conventions. It represents the mUST be calculated as two
// different counters starting from `1` one for sent messages and one for
// received message.
//
// Type: int
// RequirementLevel: Optional
// Stability: experimental
// Note: This way we guarantee that the values will be consistent between
// different implementations.
MessageIDKey = attribute.Key("message.id")
// MessageTypeKey is the attribute Key conforming to the "message.type"
// semantic conventions. It represents the whether this is a received or
// sent message.
//
// Type: Enum
// RequirementLevel: Optional
// Stability: experimental
MessageTypeKey = attribute.Key("message.type")
// MessageUncompressedSizeKey is the attribute Key conforming to the
// "message.uncompressed_size" semantic conventions. It represents the
// uncompressed size of the message in bytes.
//
// Type: int
// RequirementLevel: Optional
// Stability: experimental
MessageUncompressedSizeKey = attribute.Key("message.uncompressed_size")
)
var (
// sent
MessageTypeSent = MessageTypeKey.String("SENT")
// received
MessageTypeReceived = MessageTypeKey.String("RECEIVED")
)
// MessageCompressedSize returns an attribute KeyValue conforming to the
// "message.compressed_size" semantic conventions. It represents the compressed
// size of the message in bytes.
func MessageCompressedSize(val int) attribute.KeyValue {
return MessageCompressedSizeKey.Int(val)
}
// MessageID returns an attribute KeyValue conforming to the "message.id"
// semantic conventions. It represents the mUST be calculated as two different
// counters starting from `1` one for sent messages and one for received
// message.
func MessageID(val int) attribute.KeyValue {
return MessageIDKey.Int(val)
}
// MessageUncompressedSize returns an attribute KeyValue conforming to the
// "message.uncompressed_size" semantic conventions. It represents the
// uncompressed size of the message in bytes.
func MessageUncompressedSize(val int) attribute.KeyValue {
return MessageUncompressedSizeKey.Int(val)
}

View file

@ -0,0 +1,9 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0
package semconv // import "go.opentelemetry.io/otel/semconv/v1.24.0"
const (
// ExceptionEventName is the name of the Span event representing an exception.
ExceptionEventName = "exception"
)

1071
vendor/go.opentelemetry.io/otel/semconv/v1.24.0/metric.go generated vendored Normal file

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,9 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0
package semconv // import "go.opentelemetry.io/otel/semconv/v1.24.0"
// SchemaURL is the schema URL that matches the version of the semantic conventions
// that this package defines. Semconv packages starting from v1.4.0 must declare
// non-empty schema URL in the form https://opentelemetry.io/schemas/<version>
const SchemaURL = "https://opentelemetry.io/schemas/1.24.0"

1323
vendor/go.opentelemetry.io/otel/semconv/v1.24.0/trace.go generated vendored Normal file

File diff suppressed because it is too large Load diff

View file

@ -5,7 +5,7 @@
// Package chacha20poly1305 implements the ChaCha20-Poly1305 AEAD and its // Package chacha20poly1305 implements the ChaCha20-Poly1305 AEAD and its
// extended nonce variant XChaCha20-Poly1305, as specified in RFC 8439 and // extended nonce variant XChaCha20-Poly1305, as specified in RFC 8439 and
// draft-irtf-cfrg-xchacha-01. // draft-irtf-cfrg-xchacha-01.
package chacha20poly1305 // import "golang.org/x/crypto/chacha20poly1305" package chacha20poly1305
import ( import (
"crypto/cipher" "crypto/cipher"

View file

@ -4,7 +4,7 @@
// Package asn1 contains supporting types for parsing and building ASN.1 // Package asn1 contains supporting types for parsing and building ASN.1
// messages with the cryptobyte package. // messages with the cryptobyte package.
package asn1 // import "golang.org/x/crypto/cryptobyte/asn1" package asn1
// Tag represents an ASN.1 identifier octet, consisting of a tag number // Tag represents an ASN.1 identifier octet, consisting of a tag number
// (indicating a type) and class (such as context-specific or constructed). // (indicating a type) and class (such as context-specific or constructed).

View file

@ -15,7 +15,7 @@
// //
// See the documentation and examples for the Builder and String types to get // See the documentation and examples for the Builder and String types to get
// started. // started.
package cryptobyte // import "golang.org/x/crypto/cryptobyte" package cryptobyte
// String represents a string of bytes. It provides methods for parsing // String represents a string of bytes. It provides methods for parsing
// fixed-length and length-prefixed values from it. // fixed-length and length-prefixed values from it.

View file

@ -8,7 +8,7 @@
// HKDF is a cryptographic key derivation function (KDF) with the goal of // HKDF is a cryptographic key derivation function (KDF) with the goal of
// expanding limited input keying material into one or more cryptographically // expanding limited input keying material into one or more cryptographically
// strong secret keys. // strong secret keys.
package hkdf // import "golang.org/x/crypto/hkdf" package hkdf
import ( import (
"crypto/hmac" "crypto/hmac"

View file

@ -827,10 +827,6 @@ func (t *Transport) newClientConn(c net.Conn, singleUse bool) (*ClientConn, erro
cc.henc.SetMaxDynamicTableSizeLimit(t.maxEncoderHeaderTableSize()) cc.henc.SetMaxDynamicTableSizeLimit(t.maxEncoderHeaderTableSize())
cc.peerMaxHeaderTableSize = initialHeaderTableSize cc.peerMaxHeaderTableSize = initialHeaderTableSize
if t.AllowHTTP {
cc.nextStreamID = 3
}
if cs, ok := c.(connectionStater); ok { if cs, ok := c.(connectionStater); ok {
state := cs.ConnectionState() state := cs.ConnectionState()
cc.tlsState = &state cc.tlsState = &state

View file

@ -50,3 +50,8 @@ func (m *mremapMmapper) Mremap(oldData []byte, newLength int, flags int) (data [
func Mremap(oldData []byte, newLength int, flags int) (data []byte, err error) { func Mremap(oldData []byte, newLength int, flags int) (data []byte, err error) {
return mapper.Mremap(oldData, newLength, flags) return mapper.Mremap(oldData, newLength, flags)
} }
func MremapPtr(oldAddr unsafe.Pointer, oldSize uintptr, newAddr unsafe.Pointer, newSize uintptr, flags int) (ret unsafe.Pointer, err error) {
xaddr, err := mapper.mremap(uintptr(oldAddr), oldSize, newSize, flags, uintptr(newAddr))
return unsafe.Pointer(xaddr), err
}

View file

@ -542,6 +542,18 @@ func SysctlKinfoProcSlice(name string, args ...int) ([]KinfoProc, error) {
} }
} }
//sys pthread_chdir_np(path string) (err error)
func PthreadChdir(path string) (err error) {
return pthread_chdir_np(path)
}
//sys pthread_fchdir_np(fd int) (err error)
func PthreadFchdir(fd int) (err error) {
return pthread_fchdir_np(fd)
}
//sys sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) //sys sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error)
//sys shmat(id int, addr uintptr, flag int) (ret uintptr, err error) //sys shmat(id int, addr uintptr, flag int) (ret uintptr, err error)

View file

@ -154,6 +154,15 @@ func Munmap(b []byte) (err error) {
return mapper.Munmap(b) return mapper.Munmap(b)
} }
func MmapPtr(fd int, offset int64, addr unsafe.Pointer, length uintptr, prot int, flags int) (ret unsafe.Pointer, err error) {
xaddr, err := mapper.mmap(uintptr(addr), length, prot, flags, fd, offset)
return unsafe.Pointer(xaddr), err
}
func MunmapPtr(addr unsafe.Pointer, length uintptr) (err error) {
return mapper.munmap(uintptr(addr), length)
}
func Read(fd int, p []byte) (n int, err error) { func Read(fd int, p []byte) (n int, err error) {
n, err = read(fd, p) n, err = read(fd, p)
if raceenabled { if raceenabled {

View file

@ -760,6 +760,39 @@ var libc_sysctl_trampoline_addr uintptr
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func pthread_chdir_np(path string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
return
}
_, _, e1 := syscall_syscall(libc_pthread_chdir_np_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
if e1 != 0 {
err = errnoErr(e1)
}
return
}
var libc_pthread_chdir_np_trampoline_addr uintptr
//go:cgo_import_dynamic libc_pthread_chdir_np pthread_chdir_np "/usr/lib/libSystem.B.dylib"
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func pthread_fchdir_np(fd int) (err error) {
_, _, e1 := syscall_syscall(libc_pthread_fchdir_np_trampoline_addr, uintptr(fd), 0, 0)
if e1 != 0 {
err = errnoErr(e1)
}
return
}
var libc_pthread_fchdir_np_trampoline_addr uintptr
//go:cgo_import_dynamic libc_pthread_fchdir_np pthread_fchdir_np "/usr/lib/libSystem.B.dylib"
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) { func sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) {
_, _, e1 := syscall_syscall6(libc_sendfile_trampoline_addr, uintptr(infd), uintptr(outfd), uintptr(offset), uintptr(unsafe.Pointer(len)), uintptr(hdtr), uintptr(flags)) _, _, e1 := syscall_syscall6(libc_sendfile_trampoline_addr, uintptr(infd), uintptr(outfd), uintptr(offset), uintptr(unsafe.Pointer(len)), uintptr(hdtr), uintptr(flags))
if e1 != 0 { if e1 != 0 {

View file

@ -228,6 +228,16 @@ TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8 GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8
DATA ·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB) DATA ·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
TEXT libc_pthread_chdir_np_trampoline<>(SB),NOSPLIT,$0-0
JMP libc_pthread_chdir_np(SB)
GLOBL ·libc_pthread_chdir_np_trampoline_addr(SB), RODATA, $8
DATA ·libc_pthread_chdir_np_trampoline_addr(SB)/8, $libc_pthread_chdir_np_trampoline<>(SB)
TEXT libc_pthread_fchdir_np_trampoline<>(SB),NOSPLIT,$0-0
JMP libc_pthread_fchdir_np(SB)
GLOBL ·libc_pthread_fchdir_np_trampoline_addr(SB), RODATA, $8
DATA ·libc_pthread_fchdir_np_trampoline_addr(SB)/8, $libc_pthread_fchdir_np_trampoline<>(SB)
TEXT libc_sendfile_trampoline<>(SB),NOSPLIT,$0-0 TEXT libc_sendfile_trampoline<>(SB),NOSPLIT,$0-0
JMP libc_sendfile(SB) JMP libc_sendfile(SB)
GLOBL ·libc_sendfile_trampoline_addr(SB), RODATA, $8 GLOBL ·libc_sendfile_trampoline_addr(SB), RODATA, $8

View file

@ -760,6 +760,39 @@ var libc_sysctl_trampoline_addr uintptr
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func pthread_chdir_np(path string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
return
}
_, _, e1 := syscall_syscall(libc_pthread_chdir_np_trampoline_addr, uintptr(unsafe.Pointer(_p0)), 0, 0)
if e1 != 0 {
err = errnoErr(e1)
}
return
}
var libc_pthread_chdir_np_trampoline_addr uintptr
//go:cgo_import_dynamic libc_pthread_chdir_np pthread_chdir_np "/usr/lib/libSystem.B.dylib"
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func pthread_fchdir_np(fd int) (err error) {
_, _, e1 := syscall_syscall(libc_pthread_fchdir_np_trampoline_addr, uintptr(fd), 0, 0)
if e1 != 0 {
err = errnoErr(e1)
}
return
}
var libc_pthread_fchdir_np_trampoline_addr uintptr
//go:cgo_import_dynamic libc_pthread_fchdir_np pthread_fchdir_np "/usr/lib/libSystem.B.dylib"
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
func sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) { func sendfile(infd int, outfd int, offset int64, len *int64, hdtr unsafe.Pointer, flags int) (err error) {
_, _, e1 := syscall_syscall6(libc_sendfile_trampoline_addr, uintptr(infd), uintptr(outfd), uintptr(offset), uintptr(unsafe.Pointer(len)), uintptr(hdtr), uintptr(flags)) _, _, e1 := syscall_syscall6(libc_sendfile_trampoline_addr, uintptr(infd), uintptr(outfd), uintptr(offset), uintptr(unsafe.Pointer(len)), uintptr(hdtr), uintptr(flags))
if e1 != 0 { if e1 != 0 {

View file

@ -228,6 +228,16 @@ TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8 GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8
DATA ·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB) DATA ·libc_sysctl_trampoline_addr(SB)/8, $libc_sysctl_trampoline<>(SB)
TEXT libc_pthread_chdir_np_trampoline<>(SB),NOSPLIT,$0-0
JMP libc_pthread_chdir_np(SB)
GLOBL ·libc_pthread_chdir_np_trampoline_addr(SB), RODATA, $8
DATA ·libc_pthread_chdir_np_trampoline_addr(SB)/8, $libc_pthread_chdir_np_trampoline<>(SB)
TEXT libc_pthread_fchdir_np_trampoline<>(SB),NOSPLIT,$0-0
JMP libc_pthread_fchdir_np(SB)
GLOBL ·libc_pthread_fchdir_np_trampoline_addr(SB), RODATA, $8
DATA ·libc_pthread_fchdir_np_trampoline_addr(SB)/8, $libc_pthread_fchdir_np_trampoline<>(SB)
TEXT libc_sendfile_trampoline<>(SB),NOSPLIT,$0-0 TEXT libc_sendfile_trampoline<>(SB),NOSPLIT,$0-0
JMP libc_sendfile(SB) JMP libc_sendfile(SB)
GLOBL ·libc_sendfile_trampoline_addr(SB), RODATA, $8 GLOBL ·libc_sendfile_trampoline_addr(SB), RODATA, $8

View file

@ -894,7 +894,7 @@ type ACL struct {
aclRevision byte aclRevision byte
sbz1 byte sbz1 byte
aclSize uint16 aclSize uint16
aceCount uint16 AceCount uint16
sbz2 uint16 sbz2 uint16
} }
@ -1087,6 +1087,27 @@ type EXPLICIT_ACCESS struct {
Trustee TRUSTEE Trustee TRUSTEE
} }
// https://learn.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-ace_header
type ACE_HEADER struct {
AceType uint8
AceFlags uint8
AceSize uint16
}
// https://learn.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-access_allowed_ace
type ACCESS_ALLOWED_ACE struct {
Header ACE_HEADER
Mask ACCESS_MASK
SidStart uint32
}
const (
// Constants for AceType
// https://learn.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-ace_header
ACCESS_ALLOWED_ACE_TYPE = 0
ACCESS_DENIED_ACE_TYPE = 1
)
// This type is the union inside of TRUSTEE and must be created using one of the TrusteeValueFrom* functions. // This type is the union inside of TRUSTEE and must be created using one of the TrusteeValueFrom* functions.
type TrusteeValue uintptr type TrusteeValue uintptr
@ -1158,6 +1179,7 @@ type OBJECTS_AND_NAME struct {
//sys makeSelfRelativeSD(absoluteSD *SECURITY_DESCRIPTOR, selfRelativeSD *SECURITY_DESCRIPTOR, selfRelativeSDSize *uint32) (err error) = advapi32.MakeSelfRelativeSD //sys makeSelfRelativeSD(absoluteSD *SECURITY_DESCRIPTOR, selfRelativeSD *SECURITY_DESCRIPTOR, selfRelativeSDSize *uint32) (err error) = advapi32.MakeSelfRelativeSD
//sys setEntriesInAcl(countExplicitEntries uint32, explicitEntries *EXPLICIT_ACCESS, oldACL *ACL, newACL **ACL) (ret error) = advapi32.SetEntriesInAclW //sys setEntriesInAcl(countExplicitEntries uint32, explicitEntries *EXPLICIT_ACCESS, oldACL *ACL, newACL **ACL) (ret error) = advapi32.SetEntriesInAclW
//sys GetAce(acl *ACL, aceIndex uint32, pAce **ACCESS_ALLOWED_ACE) (ret error) = advapi32.GetAce
// Control returns the security descriptor control bits. // Control returns the security descriptor control bits.
func (sd *SECURITY_DESCRIPTOR) Control() (control SECURITY_DESCRIPTOR_CONTROL, revision uint32, err error) { func (sd *SECURITY_DESCRIPTOR) Control() (control SECURITY_DESCRIPTOR_CONTROL, revision uint32, err error) {

View file

@ -91,6 +91,7 @@ var (
procEnumServicesStatusExW = modadvapi32.NewProc("EnumServicesStatusExW") procEnumServicesStatusExW = modadvapi32.NewProc("EnumServicesStatusExW")
procEqualSid = modadvapi32.NewProc("EqualSid") procEqualSid = modadvapi32.NewProc("EqualSid")
procFreeSid = modadvapi32.NewProc("FreeSid") procFreeSid = modadvapi32.NewProc("FreeSid")
procGetAce = modadvapi32.NewProc("GetAce")
procGetLengthSid = modadvapi32.NewProc("GetLengthSid") procGetLengthSid = modadvapi32.NewProc("GetLengthSid")
procGetNamedSecurityInfoW = modadvapi32.NewProc("GetNamedSecurityInfoW") procGetNamedSecurityInfoW = modadvapi32.NewProc("GetNamedSecurityInfoW")
procGetSecurityDescriptorControl = modadvapi32.NewProc("GetSecurityDescriptorControl") procGetSecurityDescriptorControl = modadvapi32.NewProc("GetSecurityDescriptorControl")
@ -1224,6 +1225,14 @@ func setEntriesInAcl(countExplicitEntries uint32, explicitEntries *EXPLICIT_ACCE
return return
} }
func GetAce(acl *ACL, aceIndex uint32, pAce **ACCESS_ALLOWED_ACE) (ret error) {
r0, _, _ := syscall.Syscall(procGetAce.Addr(), 3, uintptr(unsafe.Pointer(acl)), uintptr(aceIndex), uintptr(unsafe.Pointer(pAce)))
if r0 == 0 {
ret = GetLastError()
}
return
}
func SetKernelObjectSecurity(handle Handle, securityInformation SECURITY_INFORMATION, securityDescriptor *SECURITY_DESCRIPTOR) (err error) { func SetKernelObjectSecurity(handle Handle, securityInformation SECURITY_INFORMATION, securityDescriptor *SECURITY_DESCRIPTOR) (err error) {
r1, _, e1 := syscall.Syscall(procSetKernelObjectSecurity.Addr(), 3, uintptr(handle), uintptr(securityInformation), uintptr(unsafe.Pointer(securityDescriptor))) r1, _, e1 := syscall.Syscall(procSetKernelObjectSecurity.Addr(), 3, uintptr(handle), uintptr(securityInformation), uintptr(unsafe.Pointer(securityDescriptor)))
if r1 == 0 { if r1 == 0 {

View file

@ -217,9 +217,9 @@ type GenerateAccessTokenRequest struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *GenerateAccessTokenRequest) MarshalJSON() ([]byte, error) { func (s GenerateAccessTokenRequest) MarshalJSON() ([]byte, error) {
type NoMethod GenerateAccessTokenRequest type NoMethod GenerateAccessTokenRequest
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
type GenerateAccessTokenResponse struct { type GenerateAccessTokenResponse struct {
@ -243,9 +243,9 @@ type GenerateAccessTokenResponse struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *GenerateAccessTokenResponse) MarshalJSON() ([]byte, error) { func (s GenerateAccessTokenResponse) MarshalJSON() ([]byte, error) {
type NoMethod GenerateAccessTokenResponse type NoMethod GenerateAccessTokenResponse
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
type GenerateIdTokenRequest struct { type GenerateIdTokenRequest struct {
@ -277,9 +277,9 @@ type GenerateIdTokenRequest struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *GenerateIdTokenRequest) MarshalJSON() ([]byte, error) { func (s GenerateIdTokenRequest) MarshalJSON() ([]byte, error) {
type NoMethod GenerateIdTokenRequest type NoMethod GenerateIdTokenRequest
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
type GenerateIdTokenResponse struct { type GenerateIdTokenResponse struct {
@ -301,9 +301,9 @@ type GenerateIdTokenResponse struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *GenerateIdTokenResponse) MarshalJSON() ([]byte, error) { func (s GenerateIdTokenResponse) MarshalJSON() ([]byte, error) {
type NoMethod GenerateIdTokenResponse type NoMethod GenerateIdTokenResponse
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
type SignBlobRequest struct { type SignBlobRequest struct {
@ -331,9 +331,9 @@ type SignBlobRequest struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *SignBlobRequest) MarshalJSON() ([]byte, error) { func (s SignBlobRequest) MarshalJSON() ([]byte, error) {
type NoMethod SignBlobRequest type NoMethod SignBlobRequest
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
type SignBlobResponse struct { type SignBlobResponse struct {
@ -368,9 +368,9 @@ type SignBlobResponse struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *SignBlobResponse) MarshalJSON() ([]byte, error) { func (s SignBlobResponse) MarshalJSON() ([]byte, error) {
type NoMethod SignBlobResponse type NoMethod SignBlobResponse
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
type SignJwtRequest struct { type SignJwtRequest struct {
@ -402,9 +402,9 @@ type SignJwtRequest struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *SignJwtRequest) MarshalJSON() ([]byte, error) { func (s SignJwtRequest) MarshalJSON() ([]byte, error) {
type NoMethod SignJwtRequest type NoMethod SignJwtRequest
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
type SignJwtResponse struct { type SignJwtResponse struct {
@ -441,9 +441,9 @@ type SignJwtResponse struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *SignJwtResponse) MarshalJSON() ([]byte, error) { func (s SignJwtResponse) MarshalJSON() ([]byte, error) {
type NoMethod SignJwtResponse type NoMethod SignJwtResponse
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
type ProjectsServiceAccountsGenerateAccessTokenCall struct { type ProjectsServiceAccountsGenerateAccessTokenCall struct {

View file

@ -127,7 +127,7 @@ func baseCreds(ctx context.Context, ds *DialSettings) (*google.Credentials, erro
if ds.Credentials != nil { if ds.Credentials != nil {
return ds.Credentials, nil return ds.Credentials, nil
} }
if ds.CredentialsJSON != nil { if len(ds.CredentialsJSON) > 0 {
return credentialsFromJSON(ctx, ds.CredentialsJSON, ds) return credentialsFromJSON(ctx, ds.CredentialsJSON, ds)
} }
if ds.CredentialsFile != "" { if ds.CredentialsFile != "" {

View file

@ -126,7 +126,7 @@ func (ds *DialSettings) Validate() error {
if ds.Credentials != nil { if ds.Credentials != nil {
nCreds++ nCreds++
} }
if ds.CredentialsJSON != nil { if len(ds.CredentialsJSON) > 0 {
nCreds++ nCreds++
} }
if ds.CredentialsFile != "" { if ds.CredentialsFile != "" {

View file

@ -5,4 +5,4 @@
package internal package internal
// Version is the current tagged release of the library. // Version is the current tagged release of the library.
const Version = "0.187.0" const Version = "0.188.0"

View file

@ -388,9 +388,9 @@ type AnywhereCache struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *AnywhereCache) MarshalJSON() ([]byte, error) { func (s AnywhereCache) MarshalJSON() ([]byte, error) {
type NoMethod AnywhereCache type NoMethod AnywhereCache
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// AnywhereCaches: A list of Anywhere Caches. // AnywhereCaches: A list of Anywhere Caches.
@ -420,9 +420,9 @@ type AnywhereCaches struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *AnywhereCaches) MarshalJSON() ([]byte, error) { func (s AnywhereCaches) MarshalJSON() ([]byte, error) {
type NoMethod AnywhereCaches type NoMethod AnywhereCaches
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// Bucket: A bucket. // Bucket: A bucket.
@ -548,9 +548,9 @@ type Bucket struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *Bucket) MarshalJSON() ([]byte, error) { func (s Bucket) MarshalJSON() ([]byte, error) {
type NoMethod Bucket type NoMethod Bucket
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketAutoclass: The bucket's Autoclass configuration. // BucketAutoclass: The bucket's Autoclass configuration.
@ -580,9 +580,9 @@ type BucketAutoclass struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketAutoclass) MarshalJSON() ([]byte, error) { func (s BucketAutoclass) MarshalJSON() ([]byte, error) {
type NoMethod BucketAutoclass type NoMethod BucketAutoclass
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketBilling: The bucket's billing configuration. // BucketBilling: The bucket's billing configuration.
@ -602,9 +602,9 @@ type BucketBilling struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketBilling) MarshalJSON() ([]byte, error) { func (s BucketBilling) MarshalJSON() ([]byte, error) {
type NoMethod BucketBilling type NoMethod BucketBilling
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
type BucketCors struct { type BucketCors struct {
@ -634,9 +634,9 @@ type BucketCors struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketCors) MarshalJSON() ([]byte, error) { func (s BucketCors) MarshalJSON() ([]byte, error) {
type NoMethod BucketCors type NoMethod BucketCors
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketCustomPlacementConfig: The bucket's custom placement configuration for // BucketCustomPlacementConfig: The bucket's custom placement configuration for
@ -657,9 +657,9 @@ type BucketCustomPlacementConfig struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketCustomPlacementConfig) MarshalJSON() ([]byte, error) { func (s BucketCustomPlacementConfig) MarshalJSON() ([]byte, error) {
type NoMethod BucketCustomPlacementConfig type NoMethod BucketCustomPlacementConfig
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketEncryption: Encryption configuration for a bucket. // BucketEncryption: Encryption configuration for a bucket.
@ -680,9 +680,9 @@ type BucketEncryption struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketEncryption) MarshalJSON() ([]byte, error) { func (s BucketEncryption) MarshalJSON() ([]byte, error) {
type NoMethod BucketEncryption type NoMethod BucketEncryption
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketHierarchicalNamespace: The bucket's hierarchical namespace // BucketHierarchicalNamespace: The bucket's hierarchical namespace
@ -704,9 +704,9 @@ type BucketHierarchicalNamespace struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketHierarchicalNamespace) MarshalJSON() ([]byte, error) { func (s BucketHierarchicalNamespace) MarshalJSON() ([]byte, error) {
type NoMethod BucketHierarchicalNamespace type NoMethod BucketHierarchicalNamespace
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketIamConfiguration: The bucket's IAM configuration. // BucketIamConfiguration: The bucket's IAM configuration.
@ -736,9 +736,9 @@ type BucketIamConfiguration struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketIamConfiguration) MarshalJSON() ([]byte, error) { func (s BucketIamConfiguration) MarshalJSON() ([]byte, error) {
type NoMethod BucketIamConfiguration type NoMethod BucketIamConfiguration
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketIamConfigurationBucketPolicyOnly: The bucket's uniform bucket-level // BucketIamConfigurationBucketPolicyOnly: The bucket's uniform bucket-level
@ -768,9 +768,9 @@ type BucketIamConfigurationBucketPolicyOnly struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketIamConfigurationBucketPolicyOnly) MarshalJSON() ([]byte, error) { func (s BucketIamConfigurationBucketPolicyOnly) MarshalJSON() ([]byte, error) {
type NoMethod BucketIamConfigurationBucketPolicyOnly type NoMethod BucketIamConfigurationBucketPolicyOnly
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketIamConfigurationUniformBucketLevelAccess: The bucket's uniform // BucketIamConfigurationUniformBucketLevelAccess: The bucket's uniform
@ -798,9 +798,9 @@ type BucketIamConfigurationUniformBucketLevelAccess struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketIamConfigurationUniformBucketLevelAccess) MarshalJSON() ([]byte, error) { func (s BucketIamConfigurationUniformBucketLevelAccess) MarshalJSON() ([]byte, error) {
type NoMethod BucketIamConfigurationUniformBucketLevelAccess type NoMethod BucketIamConfigurationUniformBucketLevelAccess
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketLifecycle: The bucket's lifecycle configuration. See lifecycle // BucketLifecycle: The bucket's lifecycle configuration. See lifecycle
@ -822,9 +822,9 @@ type BucketLifecycle struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketLifecycle) MarshalJSON() ([]byte, error) { func (s BucketLifecycle) MarshalJSON() ([]byte, error) {
type NoMethod BucketLifecycle type NoMethod BucketLifecycle
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
type BucketLifecycleRule struct { type BucketLifecycleRule struct {
@ -845,9 +845,9 @@ type BucketLifecycleRule struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketLifecycleRule) MarshalJSON() ([]byte, error) { func (s BucketLifecycleRule) MarshalJSON() ([]byte, error) {
type NoMethod BucketLifecycleRule type NoMethod BucketLifecycleRule
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketLifecycleRuleAction: The action to take. // BucketLifecycleRuleAction: The action to take.
@ -871,9 +871,9 @@ type BucketLifecycleRuleAction struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketLifecycleRuleAction) MarshalJSON() ([]byte, error) { func (s BucketLifecycleRuleAction) MarshalJSON() ([]byte, error) {
type NoMethod BucketLifecycleRuleAction type NoMethod BucketLifecycleRuleAction
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketLifecycleRuleCondition: The condition(s) under which the action will // BucketLifecycleRuleCondition: The condition(s) under which the action will
@ -947,9 +947,9 @@ type BucketLifecycleRuleCondition struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketLifecycleRuleCondition) MarshalJSON() ([]byte, error) { func (s BucketLifecycleRuleCondition) MarshalJSON() ([]byte, error) {
type NoMethod BucketLifecycleRuleCondition type NoMethod BucketLifecycleRuleCondition
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketLogging: The bucket's logging configuration, which defines the // BucketLogging: The bucket's logging configuration, which defines the
@ -973,9 +973,9 @@ type BucketLogging struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketLogging) MarshalJSON() ([]byte, error) { func (s BucketLogging) MarshalJSON() ([]byte, error) {
type NoMethod BucketLogging type NoMethod BucketLogging
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketObjectRetention: The bucket's object retention config. // BucketObjectRetention: The bucket's object retention config.
@ -995,9 +995,9 @@ type BucketObjectRetention struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketObjectRetention) MarshalJSON() ([]byte, error) { func (s BucketObjectRetention) MarshalJSON() ([]byte, error) {
type NoMethod BucketObjectRetention type NoMethod BucketObjectRetention
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketOwner: The owner of the bucket. This is always the project team's // BucketOwner: The owner of the bucket. This is always the project team's
@ -1020,9 +1020,9 @@ type BucketOwner struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketOwner) MarshalJSON() ([]byte, error) { func (s BucketOwner) MarshalJSON() ([]byte, error) {
type NoMethod BucketOwner type NoMethod BucketOwner
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketRetentionPolicy: The bucket's retention policy. The retention policy // BucketRetentionPolicy: The bucket's retention policy. The retention policy
@ -1058,9 +1058,9 @@ type BucketRetentionPolicy struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketRetentionPolicy) MarshalJSON() ([]byte, error) { func (s BucketRetentionPolicy) MarshalJSON() ([]byte, error) {
type NoMethod BucketRetentionPolicy type NoMethod BucketRetentionPolicy
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketSoftDeletePolicy: The bucket's soft delete policy, which defines the // BucketSoftDeletePolicy: The bucket's soft delete policy, which defines the
@ -1087,9 +1087,9 @@ type BucketSoftDeletePolicy struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketSoftDeletePolicy) MarshalJSON() ([]byte, error) { func (s BucketSoftDeletePolicy) MarshalJSON() ([]byte, error) {
type NoMethod BucketSoftDeletePolicy type NoMethod BucketSoftDeletePolicy
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketVersioning: The bucket's versioning configuration. // BucketVersioning: The bucket's versioning configuration.
@ -1109,9 +1109,9 @@ type BucketVersioning struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketVersioning) MarshalJSON() ([]byte, error) { func (s BucketVersioning) MarshalJSON() ([]byte, error) {
type NoMethod BucketVersioning type NoMethod BucketVersioning
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketWebsite: The bucket's website configuration, controlling how the // BucketWebsite: The bucket's website configuration, controlling how the
@ -1140,9 +1140,9 @@ type BucketWebsite struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketWebsite) MarshalJSON() ([]byte, error) { func (s BucketWebsite) MarshalJSON() ([]byte, error) {
type NoMethod BucketWebsite type NoMethod BucketWebsite
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketAccessControl: An access-control entry. // BucketAccessControl: An access-control entry.
@ -1199,9 +1199,9 @@ type BucketAccessControl struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketAccessControl) MarshalJSON() ([]byte, error) { func (s BucketAccessControl) MarshalJSON() ([]byte, error) {
type NoMethod BucketAccessControl type NoMethod BucketAccessControl
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketAccessControlProjectTeam: The project team associated with the entity, // BucketAccessControlProjectTeam: The project team associated with the entity,
@ -1224,9 +1224,9 @@ type BucketAccessControlProjectTeam struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketAccessControlProjectTeam) MarshalJSON() ([]byte, error) { func (s BucketAccessControlProjectTeam) MarshalJSON() ([]byte, error) {
type NoMethod BucketAccessControlProjectTeam type NoMethod BucketAccessControlProjectTeam
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketAccessControls: An access-control list. // BucketAccessControls: An access-control list.
@ -1252,9 +1252,9 @@ type BucketAccessControls struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketAccessControls) MarshalJSON() ([]byte, error) { func (s BucketAccessControls) MarshalJSON() ([]byte, error) {
type NoMethod BucketAccessControls type NoMethod BucketAccessControls
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketStorageLayout: The storage layout configuration of a bucket. // BucketStorageLayout: The storage layout configuration of a bucket.
@ -1289,9 +1289,9 @@ type BucketStorageLayout struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketStorageLayout) MarshalJSON() ([]byte, error) { func (s BucketStorageLayout) MarshalJSON() ([]byte, error) {
type NoMethod BucketStorageLayout type NoMethod BucketStorageLayout
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketStorageLayoutCustomPlacementConfig: The bucket's custom placement // BucketStorageLayoutCustomPlacementConfig: The bucket's custom placement
@ -1312,9 +1312,9 @@ type BucketStorageLayoutCustomPlacementConfig struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketStorageLayoutCustomPlacementConfig) MarshalJSON() ([]byte, error) { func (s BucketStorageLayoutCustomPlacementConfig) MarshalJSON() ([]byte, error) {
type NoMethod BucketStorageLayoutCustomPlacementConfig type NoMethod BucketStorageLayoutCustomPlacementConfig
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BucketStorageLayoutHierarchicalNamespace: The bucket's hierarchical // BucketStorageLayoutHierarchicalNamespace: The bucket's hierarchical
@ -1336,9 +1336,9 @@ type BucketStorageLayoutHierarchicalNamespace struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BucketStorageLayoutHierarchicalNamespace) MarshalJSON() ([]byte, error) { func (s BucketStorageLayoutHierarchicalNamespace) MarshalJSON() ([]byte, error) {
type NoMethod BucketStorageLayoutHierarchicalNamespace type NoMethod BucketStorageLayoutHierarchicalNamespace
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// Buckets: A list of buckets. // Buckets: A list of buckets.
@ -1368,9 +1368,9 @@ type Buckets struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *Buckets) MarshalJSON() ([]byte, error) { func (s Buckets) MarshalJSON() ([]byte, error) {
type NoMethod Buckets type NoMethod Buckets
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// BulkRestoreObjectsRequest: A bulk restore objects request. // BulkRestoreObjectsRequest: A bulk restore objects request.
@ -1409,9 +1409,9 @@ type BulkRestoreObjectsRequest struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *BulkRestoreObjectsRequest) MarshalJSON() ([]byte, error) { func (s BulkRestoreObjectsRequest) MarshalJSON() ([]byte, error) {
type NoMethod BulkRestoreObjectsRequest type NoMethod BulkRestoreObjectsRequest
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// Channel: An notification channel used to watch for resource changes. // Channel: An notification channel used to watch for resource changes.
@ -1457,9 +1457,9 @@ type Channel struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *Channel) MarshalJSON() ([]byte, error) { func (s Channel) MarshalJSON() ([]byte, error) {
type NoMethod Channel type NoMethod Channel
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// ComposeRequest: A Compose request. // ComposeRequest: A Compose request.
@ -1484,9 +1484,9 @@ type ComposeRequest struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *ComposeRequest) MarshalJSON() ([]byte, error) { func (s ComposeRequest) MarshalJSON() ([]byte, error) {
type NoMethod ComposeRequest type NoMethod ComposeRequest
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
type ComposeRequestSourceObjects struct { type ComposeRequestSourceObjects struct {
@ -1511,9 +1511,9 @@ type ComposeRequestSourceObjects struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *ComposeRequestSourceObjects) MarshalJSON() ([]byte, error) { func (s ComposeRequestSourceObjects) MarshalJSON() ([]byte, error) {
type NoMethod ComposeRequestSourceObjects type NoMethod ComposeRequestSourceObjects
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// ComposeRequestSourceObjectsObjectPreconditions: Conditions that must be met // ComposeRequestSourceObjectsObjectPreconditions: Conditions that must be met
@ -1537,9 +1537,9 @@ type ComposeRequestSourceObjectsObjectPreconditions struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *ComposeRequestSourceObjectsObjectPreconditions) MarshalJSON() ([]byte, error) { func (s ComposeRequestSourceObjectsObjectPreconditions) MarshalJSON() ([]byte, error) {
type NoMethod ComposeRequestSourceObjectsObjectPreconditions type NoMethod ComposeRequestSourceObjectsObjectPreconditions
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// Expr: Represents an expression text. Example: title: "User account presence" // Expr: Represents an expression text. Example: title: "User account presence"
@ -1573,9 +1573,9 @@ type Expr struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *Expr) MarshalJSON() ([]byte, error) { func (s Expr) MarshalJSON() ([]byte, error) {
type NoMethod Expr type NoMethod Expr
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// Folder: A folder. Only available in buckets with hierarchical namespace // Folder: A folder. Only available in buckets with hierarchical namespace
@ -1618,9 +1618,9 @@ type Folder struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *Folder) MarshalJSON() ([]byte, error) { func (s Folder) MarshalJSON() ([]byte, error) {
type NoMethod Folder type NoMethod Folder
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// FolderPendingRenameInfo: Only present if the folder is part of an ongoing // FolderPendingRenameInfo: Only present if the folder is part of an ongoing
@ -1642,9 +1642,9 @@ type FolderPendingRenameInfo struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *FolderPendingRenameInfo) MarshalJSON() ([]byte, error) { func (s FolderPendingRenameInfo) MarshalJSON() ([]byte, error) {
type NoMethod FolderPendingRenameInfo type NoMethod FolderPendingRenameInfo
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// Folders: A list of folders. // Folders: A list of folders.
@ -1674,9 +1674,9 @@ type Folders struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *Folders) MarshalJSON() ([]byte, error) { func (s Folders) MarshalJSON() ([]byte, error) {
type NoMethod Folders type NoMethod Folders
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// GoogleLongrunningListOperationsResponse: The response message for // GoogleLongrunningListOperationsResponse: The response message for
@ -1708,9 +1708,9 @@ type GoogleLongrunningListOperationsResponse struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *GoogleLongrunningListOperationsResponse) MarshalJSON() ([]byte, error) { func (s GoogleLongrunningListOperationsResponse) MarshalJSON() ([]byte, error) {
type NoMethod GoogleLongrunningListOperationsResponse type NoMethod GoogleLongrunningListOperationsResponse
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// GoogleLongrunningOperation: This resource represents a long-running // GoogleLongrunningOperation: This resource represents a long-running
@ -1760,9 +1760,9 @@ type GoogleLongrunningOperation struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *GoogleLongrunningOperation) MarshalJSON() ([]byte, error) { func (s GoogleLongrunningOperation) MarshalJSON() ([]byte, error) {
type NoMethod GoogleLongrunningOperation type NoMethod GoogleLongrunningOperation
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// GoogleRpcStatus: The "Status" type defines a logical error model that is // GoogleRpcStatus: The "Status" type defines a logical error model that is
@ -1792,9 +1792,9 @@ type GoogleRpcStatus struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *GoogleRpcStatus) MarshalJSON() ([]byte, error) { func (s GoogleRpcStatus) MarshalJSON() ([]byte, error) {
type NoMethod GoogleRpcStatus type NoMethod GoogleRpcStatus
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// HmacKey: JSON template to produce a JSON-style HMAC Key resource for Create // HmacKey: JSON template to produce a JSON-style HMAC Key resource for Create
@ -1823,9 +1823,9 @@ type HmacKey struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *HmacKey) MarshalJSON() ([]byte, error) { func (s HmacKey) MarshalJSON() ([]byte, error) {
type NoMethod HmacKey type NoMethod HmacKey
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// HmacKeyMetadata: JSON template to produce a JSON-style HMAC Key metadata // HmacKeyMetadata: JSON template to produce a JSON-style HMAC Key metadata
@ -1871,9 +1871,9 @@ type HmacKeyMetadata struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *HmacKeyMetadata) MarshalJSON() ([]byte, error) { func (s HmacKeyMetadata) MarshalJSON() ([]byte, error) {
type NoMethod HmacKeyMetadata type NoMethod HmacKeyMetadata
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// HmacKeysMetadata: A list of hmacKeys. // HmacKeysMetadata: A list of hmacKeys.
@ -1903,9 +1903,9 @@ type HmacKeysMetadata struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *HmacKeysMetadata) MarshalJSON() ([]byte, error) { func (s HmacKeysMetadata) MarshalJSON() ([]byte, error) {
type NoMethod HmacKeysMetadata type NoMethod HmacKeysMetadata
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// ManagedFolder: A managed folder. // ManagedFolder: A managed folder.
@ -1947,9 +1947,9 @@ type ManagedFolder struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *ManagedFolder) MarshalJSON() ([]byte, error) { func (s ManagedFolder) MarshalJSON() ([]byte, error) {
type NoMethod ManagedFolder type NoMethod ManagedFolder
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// ManagedFolders: A list of managed folders. // ManagedFolders: A list of managed folders.
@ -1979,9 +1979,9 @@ type ManagedFolders struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *ManagedFolders) MarshalJSON() ([]byte, error) { func (s ManagedFolders) MarshalJSON() ([]byte, error) {
type NoMethod ManagedFolders type NoMethod ManagedFolders
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// Notification: A subscription to receive Google PubSub notifications. // Notification: A subscription to receive Google PubSub notifications.
@ -2026,9 +2026,9 @@ type Notification struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *Notification) MarshalJSON() ([]byte, error) { func (s Notification) MarshalJSON() ([]byte, error) {
type NoMethod Notification type NoMethod Notification
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// Notifications: A list of notification subscriptions. // Notifications: A list of notification subscriptions.
@ -2054,9 +2054,9 @@ type Notifications struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *Notifications) MarshalJSON() ([]byte, error) { func (s Notifications) MarshalJSON() ([]byte, error) {
type NoMethod Notifications type NoMethod Notifications
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// Object: An object. // Object: An object.
@ -2196,9 +2196,9 @@ type Object struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *Object) MarshalJSON() ([]byte, error) { func (s Object) MarshalJSON() ([]byte, error) {
type NoMethod Object type NoMethod Object
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// ObjectCustomerEncryption: Metadata of customer-supplied encryption key, if // ObjectCustomerEncryption: Metadata of customer-supplied encryption key, if
@ -2221,9 +2221,9 @@ type ObjectCustomerEncryption struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *ObjectCustomerEncryption) MarshalJSON() ([]byte, error) { func (s ObjectCustomerEncryption) MarshalJSON() ([]byte, error) {
type NoMethod ObjectCustomerEncryption type NoMethod ObjectCustomerEncryption
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// ObjectOwner: The owner of the object. This will always be the uploader of // ObjectOwner: The owner of the object. This will always be the uploader of
@ -2246,9 +2246,9 @@ type ObjectOwner struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *ObjectOwner) MarshalJSON() ([]byte, error) { func (s ObjectOwner) MarshalJSON() ([]byte, error) {
type NoMethod ObjectOwner type NoMethod ObjectOwner
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// ObjectRetention: A collection of object level retention parameters. // ObjectRetention: A collection of object level retention parameters.
@ -2271,9 +2271,9 @@ type ObjectRetention struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *ObjectRetention) MarshalJSON() ([]byte, error) { func (s ObjectRetention) MarshalJSON() ([]byte, error) {
type NoMethod ObjectRetention type NoMethod ObjectRetention
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// ObjectAccessControl: An access-control entry. // ObjectAccessControl: An access-control entry.
@ -2334,9 +2334,9 @@ type ObjectAccessControl struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *ObjectAccessControl) MarshalJSON() ([]byte, error) { func (s ObjectAccessControl) MarshalJSON() ([]byte, error) {
type NoMethod ObjectAccessControl type NoMethod ObjectAccessControl
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// ObjectAccessControlProjectTeam: The project team associated with the entity, // ObjectAccessControlProjectTeam: The project team associated with the entity,
@ -2359,9 +2359,9 @@ type ObjectAccessControlProjectTeam struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *ObjectAccessControlProjectTeam) MarshalJSON() ([]byte, error) { func (s ObjectAccessControlProjectTeam) MarshalJSON() ([]byte, error) {
type NoMethod ObjectAccessControlProjectTeam type NoMethod ObjectAccessControlProjectTeam
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// ObjectAccessControls: An access-control list. // ObjectAccessControls: An access-control list.
@ -2387,9 +2387,9 @@ type ObjectAccessControls struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *ObjectAccessControls) MarshalJSON() ([]byte, error) { func (s ObjectAccessControls) MarshalJSON() ([]byte, error) {
type NoMethod ObjectAccessControls type NoMethod ObjectAccessControls
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// Objects: A list of objects. // Objects: A list of objects.
@ -2422,9 +2422,9 @@ type Objects struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *Objects) MarshalJSON() ([]byte, error) { func (s Objects) MarshalJSON() ([]byte, error) {
type NoMethod Objects type NoMethod Objects
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// Policy: A bucket/object/managedFolder IAM policy. // Policy: A bucket/object/managedFolder IAM policy.
@ -2463,9 +2463,9 @@ type Policy struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *Policy) MarshalJSON() ([]byte, error) { func (s Policy) MarshalJSON() ([]byte, error) {
type NoMethod Policy type NoMethod Policy
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
type PolicyBindings struct { type PolicyBindings struct {
@ -2535,9 +2535,9 @@ type PolicyBindings struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *PolicyBindings) MarshalJSON() ([]byte, error) { func (s PolicyBindings) MarshalJSON() ([]byte, error) {
type NoMethod PolicyBindings type NoMethod PolicyBindings
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// RewriteResponse: A rewrite response. // RewriteResponse: A rewrite response.
@ -2577,9 +2577,9 @@ type RewriteResponse struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *RewriteResponse) MarshalJSON() ([]byte, error) { func (s RewriteResponse) MarshalJSON() ([]byte, error) {
type NoMethod RewriteResponse type NoMethod RewriteResponse
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// ServiceAccount: A subscription to receive Google PubSub notifications. // ServiceAccount: A subscription to receive Google PubSub notifications.
@ -2605,9 +2605,9 @@ type ServiceAccount struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *ServiceAccount) MarshalJSON() ([]byte, error) { func (s ServiceAccount) MarshalJSON() ([]byte, error) {
type NoMethod ServiceAccount type NoMethod ServiceAccount
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
// TestIamPermissionsResponse: A // TestIamPermissionsResponse: A
@ -2656,9 +2656,9 @@ type TestIamPermissionsResponse struct {
NullFields []string `json:"-"` NullFields []string `json:"-"`
} }
func (s *TestIamPermissionsResponse) MarshalJSON() ([]byte, error) { func (s TestIamPermissionsResponse) MarshalJSON() ([]byte, error) {
type NoMethod TestIamPermissionsResponse type NoMethod TestIamPermissionsResponse
return gensupport.MarshalJSON(NoMethod(*s), s.ForceSendFields, s.NullFields) return gensupport.MarshalJSON(NoMethod(s), s.ForceSendFields, s.NullFields)
} }
type AnywhereCachesDisableCall struct { type AnywhereCachesDisableCall struct {

45
vendor/modules.txt vendored
View file

@ -4,7 +4,7 @@ cloud.google.com/go/internal
cloud.google.com/go/internal/optional cloud.google.com/go/internal/optional
cloud.google.com/go/internal/trace cloud.google.com/go/internal/trace
cloud.google.com/go/internal/version cloud.google.com/go/internal/version
# cloud.google.com/go/auth v0.6.1 # cloud.google.com/go/auth v0.7.0
## explicit; go 1.20 ## explicit; go 1.20
cloud.google.com/go/auth cloud.google.com/go/auth
cloud.google.com/go/auth/credentials cloud.google.com/go/auth/credentials
@ -20,8 +20,8 @@ cloud.google.com/go/auth/internal/credsfile
cloud.google.com/go/auth/internal/jwt cloud.google.com/go/auth/internal/jwt
cloud.google.com/go/auth/internal/transport cloud.google.com/go/auth/internal/transport
cloud.google.com/go/auth/internal/transport/cert cloud.google.com/go/auth/internal/transport/cert
# cloud.google.com/go/auth/oauth2adapt v0.2.2 # cloud.google.com/go/auth/oauth2adapt v0.2.3
## explicit; go 1.19 ## explicit; go 1.20
cloud.google.com/go/auth/oauth2adapt cloud.google.com/go/auth/oauth2adapt
# cloud.google.com/go/compute/metadata v0.4.0 # cloud.google.com/go/compute/metadata v0.4.0
## explicit; go 1.20 ## explicit; go 1.20
@ -30,7 +30,7 @@ cloud.google.com/go/compute/metadata
## explicit; go 1.20 ## explicit; go 1.20
cloud.google.com/go/iam cloud.google.com/go/iam
cloud.google.com/go/iam/apiv1/iampb cloud.google.com/go/iam/apiv1/iampb
# cloud.google.com/go/storage v1.42.0 # cloud.google.com/go/storage v1.43.0
## explicit; go 1.20 ## explicit; go 1.20
cloud.google.com/go/storage cloud.google.com/go/storage
cloud.google.com/go/storage/internal cloud.google.com/go/storage/internal
@ -115,7 +115,7 @@ github.com/VictoriaMetrics/easyproto
# github.com/VictoriaMetrics/fastcache v1.12.2 # github.com/VictoriaMetrics/fastcache v1.12.2
## explicit; go 1.13 ## explicit; go 1.13
github.com/VictoriaMetrics/fastcache github.com/VictoriaMetrics/fastcache
# github.com/VictoriaMetrics/metrics v1.34.0 # github.com/VictoriaMetrics/metrics v1.34.1
## explicit; go 1.17 ## explicit; go 1.17
github.com/VictoriaMetrics/metrics github.com/VictoriaMetrics/metrics
# github.com/VictoriaMetrics/metricsql v0.76.0 # github.com/VictoriaMetrics/metricsql v0.76.0
@ -128,7 +128,7 @@ github.com/VividCortex/ewma
# github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 # github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30
## explicit; go 1.15 ## explicit; go 1.15
github.com/alecthomas/units github.com/alecthomas/units
# github.com/aws/aws-sdk-go v1.54.13 # github.com/aws/aws-sdk-go v1.54.17
## explicit; go 1.19 ## explicit; go 1.19
github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws
github.com/aws/aws-sdk-go/aws/auth/bearer github.com/aws/aws-sdk-go/aws/auth/bearer
@ -205,10 +205,10 @@ github.com/aws/aws-sdk-go-v2/internal/timeconv
## explicit; go 1.20 ## explicit; go 1.20
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/eventstreamapi github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/eventstreamapi
# github.com/aws/aws-sdk-go-v2/config v1.27.23 # github.com/aws/aws-sdk-go-v2/config v1.27.24
## explicit; go 1.20 ## explicit; go 1.20
github.com/aws/aws-sdk-go-v2/config github.com/aws/aws-sdk-go-v2/config
# github.com/aws/aws-sdk-go-v2/credentials v1.17.23 # github.com/aws/aws-sdk-go-v2/credentials v1.17.24
## explicit; go 1.20 ## explicit; go 1.20
github.com/aws/aws-sdk-go-v2/credentials github.com/aws/aws-sdk-go-v2/credentials
github.com/aws/aws-sdk-go-v2/credentials/ec2rolecreds github.com/aws/aws-sdk-go-v2/credentials/ec2rolecreds
@ -221,7 +221,7 @@ github.com/aws/aws-sdk-go-v2/credentials/stscreds
## explicit; go 1.20 ## explicit; go 1.20
github.com/aws/aws-sdk-go-v2/feature/ec2/imds github.com/aws/aws-sdk-go-v2/feature/ec2/imds
github.com/aws/aws-sdk-go-v2/feature/ec2/imds/internal/config github.com/aws/aws-sdk-go-v2/feature/ec2/imds/internal/config
# github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.4 # github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.5
## explicit; go 1.20 ## explicit; go 1.20
github.com/aws/aws-sdk-go-v2/feature/s3/manager github.com/aws/aws-sdk-go-v2/feature/s3/manager
# github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13 # github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.13
@ -264,7 +264,7 @@ github.com/aws/aws-sdk-go-v2/service/s3/types
github.com/aws/aws-sdk-go-v2/service/sso github.com/aws/aws-sdk-go-v2/service/sso
github.com/aws/aws-sdk-go-v2/service/sso/internal/endpoints github.com/aws/aws-sdk-go-v2/service/sso/internal/endpoints
github.com/aws/aws-sdk-go-v2/service/sso/types github.com/aws/aws-sdk-go-v2/service/sso/types
# github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.1 # github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.2
## explicit; go 1.20 ## explicit; go 1.20
github.com/aws/aws-sdk-go-v2/service/ssooidc github.com/aws/aws-sdk-go-v2/service/ssooidc
github.com/aws/aws-sdk-go-v2/service/ssooidc/internal/endpoints github.com/aws/aws-sdk-go-v2/service/ssooidc/internal/endpoints
@ -504,7 +504,7 @@ github.com/prometheus/common/sigv4
github.com/prometheus/procfs github.com/prometheus/procfs
github.com/prometheus/procfs/internal/fs github.com/prometheus/procfs/internal/fs
github.com/prometheus/procfs/internal/util github.com/prometheus/procfs/internal/util
# github.com/prometheus/prometheus v0.53.0 # github.com/prometheus/prometheus v0.53.1
## explicit; go 1.21 ## explicit; go 1.21
github.com/prometheus/prometheus/config github.com/prometheus/prometheus/config
github.com/prometheus/prometheus/discovery github.com/prometheus/prometheus/discovery
@ -624,11 +624,11 @@ go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp
# go.opentelemetry.io/collector/semconv v0.104.0 # go.opentelemetry.io/collector/semconv v0.104.0
## explicit; go 1.21.0 ## explicit; go 1.21.0
go.opentelemetry.io/collector/semconv/v1.6.1 go.opentelemetry.io/collector/semconv/v1.6.1
# go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 # go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0
## explicit; go 1.21 ## explicit; go 1.21
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/internal go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/internal
# go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 # go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0
## explicit; go 1.21 ## explicit; go 1.21
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconv go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconv
@ -647,6 +647,7 @@ go.opentelemetry.io/otel/propagation
go.opentelemetry.io/otel/semconv/v1.17.0 go.opentelemetry.io/otel/semconv/v1.17.0
go.opentelemetry.io/otel/semconv/v1.20.0 go.opentelemetry.io/otel/semconv/v1.20.0
go.opentelemetry.io/otel/semconv/v1.21.0 go.opentelemetry.io/otel/semconv/v1.21.0
go.opentelemetry.io/otel/semconv/v1.24.0
# go.opentelemetry.io/otel/metric v1.28.0 # go.opentelemetry.io/otel/metric v1.28.0
## explicit; go 1.21 ## explicit; go 1.21
go.opentelemetry.io/otel/metric go.opentelemetry.io/otel/metric
@ -666,8 +667,8 @@ go.uber.org/goleak/internal/stack
# go.uber.org/multierr v1.11.0 # go.uber.org/multierr v1.11.0
## explicit; go 1.19 ## explicit; go 1.19
go.uber.org/multierr go.uber.org/multierr
# golang.org/x/crypto v0.24.0 # golang.org/x/crypto v0.25.0
## explicit; go 1.18 ## explicit; go 1.20
golang.org/x/crypto/chacha20 golang.org/x/crypto/chacha20
golang.org/x/crypto/chacha20poly1305 golang.org/x/crypto/chacha20poly1305
golang.org/x/crypto/cryptobyte golang.org/x/crypto/cryptobyte
@ -677,10 +678,10 @@ golang.org/x/crypto/internal/alias
golang.org/x/crypto/internal/poly1305 golang.org/x/crypto/internal/poly1305
golang.org/x/crypto/pkcs12 golang.org/x/crypto/pkcs12
golang.org/x/crypto/pkcs12/internal/rc2 golang.org/x/crypto/pkcs12/internal/rc2
# golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 # golang.org/x/exp v0.0.0-20240707233637-46b078467d37
## explicit; go 1.20 ## explicit; go 1.20
golang.org/x/exp/constraints golang.org/x/exp/constraints
# golang.org/x/net v0.26.0 # golang.org/x/net v0.27.0
## explicit; go 1.18 ## explicit; go 1.18
golang.org/x/net/http/httpguts golang.org/x/net/http/httpguts
golang.org/x/net/http/httpproxy golang.org/x/net/http/httpproxy
@ -706,7 +707,7 @@ golang.org/x/oauth2/jwt
## explicit; go 1.18 ## explicit; go 1.18
golang.org/x/sync/errgroup golang.org/x/sync/errgroup
golang.org/x/sync/semaphore golang.org/x/sync/semaphore
# golang.org/x/sys v0.21.0 # golang.org/x/sys v0.22.0
## explicit; go 1.18 ## explicit; go 1.18
golang.org/x/sys/cpu golang.org/x/sys/cpu
golang.org/x/sys/unix golang.org/x/sys/unix
@ -720,7 +721,7 @@ golang.org/x/text/unicode/norm
# golang.org/x/time v0.5.0 # golang.org/x/time v0.5.0
## explicit; go 1.18 ## explicit; go 1.18
golang.org/x/time/rate golang.org/x/time/rate
# google.golang.org/api v0.187.0 # google.golang.org/api v0.188.0
## explicit; go 1.20 ## explicit; go 1.20
google.golang.org/api/googleapi google.golang.org/api/googleapi
google.golang.org/api/googleapi/transport google.golang.org/api/googleapi/transport
@ -738,15 +739,15 @@ google.golang.org/api/transport
google.golang.org/api/transport/grpc google.golang.org/api/transport/grpc
google.golang.org/api/transport/http google.golang.org/api/transport/http
google.golang.org/api/transport/http/internal/propagation google.golang.org/api/transport/http/internal/propagation
# google.golang.org/genproto v0.0.0-20240701130421-f6361c86f094 # google.golang.org/genproto v0.0.0-20240709173604-40e1e62336c5
## explicit; go 1.20 ## explicit; go 1.20
google.golang.org/genproto/googleapis/type/date google.golang.org/genproto/googleapis/type/date
google.golang.org/genproto/googleapis/type/expr google.golang.org/genproto/googleapis/type/expr
# google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 # google.golang.org/genproto/googleapis/api v0.0.0-20240709173604-40e1e62336c5
## explicit; go 1.20 ## explicit; go 1.20
google.golang.org/genproto/googleapis/api google.golang.org/genproto/googleapis/api
google.golang.org/genproto/googleapis/api/annotations google.golang.org/genproto/googleapis/api/annotations
# google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 # google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5
## explicit; go 1.20 ## explicit; go 1.20
google.golang.org/genproto/googleapis/rpc/code google.golang.org/genproto/googleapis/rpc/code
google.golang.org/genproto/googleapis/rpc/errdetails google.golang.org/genproto/googleapis/rpc/errdetails