mirror of https://github.com/knative/client.git
upgrade to latest dependencies (#1952)
bumping golang.org/x/mod c0bdc7b...d58be1c: > d58be1c sumdb/tlog: set the hash of the empty tree according to RFC 6962 > 232e49f Revert "module: add COM0 and LPT0 to badWindowsNames" bumping golang.org/x/term 5f0bb72...c976cb1: > c976cb1 go.mod: update golang.org/x dependencies bumping golang.org/x/net 66e838c...e2310ae: > e2310ae go.mod: update golang.org/x dependencies > 77708f7 quic: skip tests which depend on unimplemented UDP functions on Plan 9 > 9617c63 http2: avoid Transport hang with Connection: close and AllowHTTP bumping knative.dev/networking 3b8764c...bab7f2a: > bab7f2a upgrade to latest dependencies (# 992) > 370ddbb Update community files (# 991) > f35497a upgrade to latest dependencies (# 990) bumping knative.dev/client-pkg 8fbea3d...18eac77: > 18eac77 Update community files (# 188) bumping knative.dev/serving 1f7cc48...fea0e7a: > fea0e7a Update net-istio nightly (# 15393) > 75310de Update TLS test matrix (# 15394) > 44a5d78 Enable cluster local TLS tests for Contour (# 15378) > 63a741d clean up certificate leases (# 15359) > 219e905 Update net-contour nightly (# 15389) > 88779ae Update net-istio nightly (# 15390) > 372a3e6 Update net-contour nightly (# 15386) > c584f0d Update net-istio nightly (# 15385) > 2156812 Update net-kourier nightly (# 15384) > 046577e Update net-contour nightly (# 15383) > 133b2fe Update net-gateway-api nightly (# 15382) > a3ee9b8 upgrade to latest dependencies (# 15381) > 306de5f Fix TestChangeDefaultDomain flake (# 15380) > ac7f585 Add startup probe support to Knative Service (# 15309) > a923915 enable system internal tls for contour (# 15374) > a310476 Update net-contour nightly (# 15377) > 9ffb3ad Update net-kourier nightly (# 15373) > b0eab7d Update net-contour nightly (# 15371) > 9b25954 Update net-istio nightly (# 15370) > 208138f Update net-gateway-api nightly (# 15372) > 4bbb7cf Fix external domain tls test setup (# 15366) > 05b60b5 Update community files (# 15369) > 75f7393 Update net-gateway-api nightly (# 15355) > af2c899 Adjust Workload HA test iterations to fit within test timeout (# 15362) > 89fdbe1 Update net-kourier nightly (# 15357) > 9873264 Update net-contour nightly (# 15363) > 6d257d8 Update net-istio nightly (# 15365) > a043ddf Drop duplicate test case - TestActivatorInRequestPathPossibly (# 15361) > 95c751a upgrade to latest dependencies (# 15353) > 25783ae Update net-contour nightly (# 15356) > b02cc68 Update net-istio nightly (# 15358) > 1dff15d feat: add defaults configurable runtimeClassName (# 15271) > 5558435 Update net-contour nightly (# 15350) > 2ac8b35 add tests to validate uptime of services during user pod deletion (# 15284) > 7193018 upgrade to latest dependencies (# 15351) > d6d8525 use wait.Interrupted (# 15342) > 48d3196 Update net-gateway-api nightly (# 15349) > 866782a Update net-istio nightly (# 15348) > 226c771 Bump ko-build/setup-ko from 0.6 to 0.7 (# 15346) > 6fa0f6d upgrade to latest dependencies (# 15344) > a5ad85b Update net-gateway-api nightly (# 15337) > b22e06c Update net-kourier nightly (# 15340) > de3b9ba upgrade to latest dependencies (# 15341) > 6d90f54 Update net-contour nightly (# 15339) > 78fd584 Update net-istio nightly (# 15338) > faf421a Update net-gateway-api nightly (# 15335) > 5a92452 Clean up job for old resources (# 15312) > 408b284 Update net-istio nightly (# 15336) > c980773 re-enable failng contour/gateway api tests (# 15334) > a4fa238 bump istio and contour for gateway api testing (# 15333) > e56319d Allow ipv6 address for sslip.io in default-domain Job (# 15328) > f464e2d upgrade to latest dependencies (# 15329) > 0b61640 Update net-kourier nightly (# 15314) > 8d768f5 Cert rotation test does not use specific ingress namespace (# 15331) bumping google.golang.org/grpc fa274d7...2da9769: > 2da9769 Change version to 1.65.0 (# 7306) > ede96b7 metadata: remove String method (# 7373) > 64be203 grpc: Readd pick first name (# 7336) (# 7341) > 25e33a6 examples: Add CSM Observability example (# 7302) (# 7318) > 04a5f46 xds/internal/xdsclient: Emit unknown for CSM Labels if not present in CDS (# 7309) (# 7317) > cff5c3e stats/opentelemetry: Add e2e testing for CSM Observability (# 7279) (# 7316) > 9b970fd dns: fix constant 30s backoff for re-resolution (# 7262) (# 7311) > 6d23620 documentation: on server, use FromIncomingContext for retrieving context and `SetHeader`, `SetTrailer` to send metadata to client (# 7238) > 7e5898e xds: unify xDS client creation APIs meant for testing (# 7268) > 5d7bd7a interop/xds: Interop client and server changes for CSM Observability (# 7280) > 1958fcb cmd/protoc-gen-go-grpc: update version for release (# 7294) > 32f6091 *: update deps (# 7282) > 02f0e77 security: remove security/authorization module (# 7281) > 8bf2b3e grpcrand: delete all of grpcrand and call the rand package directly (# 7283) > 24e9024 Fix close in use certificate providers after double `Close()` method call on wrapper object (# 7128) > 33faea8 ringhash: fix normalizeWeights (# 7156) > 0756c0d stats: Various CSM Observability bug fixes (# 7278) > fe82db4 stats/opentelemetry: Add CSM Observability API (# 7277) > f1aceb0 stats/opentelemetry: CSM Observability server side component changes (# 7264) > 8138555 testing: remove skip for otel since we no longer support Go 1.20 (# 7276) > 58cfe27 deps: update dependencies for all modules (# 7274) > 11872f1 advancedtls: add CipherSuites to Options (# 7269) > a4593c5 advancedtls: use realistic ciphersuite in test (# 7273) > 01363ac *: end support for Go v1.20 (# 7250) > 6e59dd1 examples: add example to illustrate the use of file watcher interceptor (# 7226) > 03da31a client: implement maxAttempts for retryPolicy (# 7229) > f7d3d3e stats/opentelemetry: CSM Observability client side component changes (# 7256) > 092e793 test/kokoro: Add psm-csm build config (# 7263) > 5ffe0ef advancedtls: populate verified chains when using custom buildVerifyFunc (# 7181) > 1db6590 grpc: Move Pick First Balancer to separate package (# 7255) > 1adbea2 protoc-gen-go-grpc: copy service comment to interfaces (# 7243) > a639c40 test: fix flaky test ClientSendsAGoAway (# 7224) > c822adf balancergroup: add a `ParseConfig` API and remove the `UpdateBuilder` API (# 7232) > a75dfa6 xds: change the DumpResources API to return proto message containing the resource dump (# 7240) > 48b6b11 credentials/tls: reject connections with ALPN disabled (# 7184) > 0a0abfa stats/opentelemetry: Add CSM Plugin Option (# 7205) > 2f52f9e examples: update remaining uses of grpc.Dial to NewClient (# 7248) > aea78bd grpc: Add perTargetDialOption type and global list (# 7234) > 2d2f417 advancedTLS: unset a deprecated field after copying it (# 7239) > 2174ea6 documentation: fix typo in anti-patterns.md (# 7237) > e22436a pickerwrapper: use atomic instead of locks (# 7214) > 0020ccf advancedTLS: Documentation (# 7213) > 59954c8 Change version to 1.65.0-dev (# 7220) > 3bf7e9a advancedTLS: Add in deprecated name for transitionary period (# 7221) bumping knative.dev/pkg 339c22b...4355f0c: > 4355f0c upgrade to latest dependencies (# 3075) > b4e5f07 Bump google.golang.org/grpc from 1.64.0 to 1.65.0 (# 3073) > fe204d0 Bump golang.org/x/net from 0.26.0 to 0.27.0 (# 3072) > 9dc5206 Bump golang.org/x/tools from 0.22.0 to 0.23.0 (# 3074) > 7ecd548 Update community files (# 3071) > 3f6a546 Fix rand source in name (# 3070) > ee1db86 Update linter config and address lint warnings/failures (# 3068) > 26bc7b4 Register AuthenticatableType in schema (# 3069) > 8535fcc gofumpt the repo (# 3067) > fc0720b [logstream] test polling should use a different context (# 3066) > 51dec91 drop test-infra code (# 3065) > b5bb12c drop unused OWNERS files and update script (# 3064) > 915c009 drop google/s2a-go (# 3062) > cd0e61e drop mako (# 3060) > fe2597a drop eventing kafka from downstream tests - repo is archived (# 3061) > b94232c Bump cloud.google.com/go/storage from 1.41.0 to 1.42.0 (# 3057) bumping golang.org/x/sys 673e0f9...faed7ec: > faed7ec unix: add PthreadChdir and PthreadFchdir on darwin > c892bb7 unix: fix MmapPtr test failing on OpenBSD > a0ef40a unix: fix MremapPtr test failing on NetBSD > daa2394 unix: add unsafe mmap, munmap, mremap > 7670087 windows: add GetAce Windows API > 348425a windows/svc: do not pass theService to windows.RegisterServiceCtrlHandlerEx bumping google.golang.org/genproto/googleapis/api d264139...ef581f9: > ef581f9 chore(all): update all (# 1132) > 5315273 chore(all): update all (# 1131) > a332354 chore(all): auto-regenerate .pb.go files (# 1130) Signed-off-by: Knative Automation <automation@knative.team>
This commit is contained in:
Knative Automation
GitHub
parent
eea152bbbe
commit
95a4ee17a0
30
go.mod
30
go.mod
|
|
@ -1,6 +1,6 @@
|
|||
module knative.dev/client
|
||||
|
||||
go 1.21
|
||||
go 1.22
|
||||
|
||||
require (
|
||||
github.com/google/go-cmp v0.6.0
|
||||
|
|
@ -11,8 +11,8 @@ require (
|
|||
github.com/spf13/cobra v1.7.0
|
||||
github.com/spf13/pflag v1.0.5
|
||||
github.com/spf13/viper v1.16.0
|
||||
golang.org/x/mod v0.18.0
|
||||
golang.org/x/term v0.21.0
|
||||
golang.org/x/mod v0.19.0
|
||||
golang.org/x/term v0.22.0
|
||||
gotest.tools/v3 v3.3.0
|
||||
k8s.io/api v0.29.2
|
||||
k8s.io/apiextensions-apiserver v0.29.2
|
||||
|
|
@ -20,12 +20,12 @@ require (
|
|||
k8s.io/cli-runtime v0.29.2
|
||||
k8s.io/client-go v0.29.2
|
||||
k8s.io/code-generator v0.29.2
|
||||
knative.dev/client-pkg v0.0.0-20240607132727-8fbea3d02b53
|
||||
knative.dev/eventing v0.41.1-0.20240613093107-ea8f0fda4c06
|
||||
knative.dev/hack v0.0.0-20240607132042-09143140a254
|
||||
knative.dev/networking v0.0.0-20240611072033-3b8764c0bb4c
|
||||
knative.dev/pkg v0.0.0-20240614135239-339c22b8218c
|
||||
knative.dev/serving v0.41.1-0.20240614080555-1f7cc4852a07
|
||||
knative.dev/client-pkg v0.0.0-20240704014437-18eac77f7749
|
||||
knative.dev/eventing v0.41.1-0.20240716144258-2cc0a5bedff5
|
||||
knative.dev/hack v0.0.0-20240704013904-b9799599afcf
|
||||
knative.dev/networking v0.0.0-20240716111826-bab7f2a3e556
|
||||
knative.dev/pkg v0.0.0-20240716082220-4355f0c73608
|
||||
knative.dev/serving v0.41.1-0.20240716005350-fea0e7a481ea
|
||||
sigs.k8s.io/yaml v1.4.0
|
||||
)
|
||||
|
||||
|
|
@ -39,7 +39,7 @@ require (
|
|||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
github.com/blendle/zapdriver v1.3.1 // indirect
|
||||
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
|
||||
github.com/cespare/xxhash/v2 v2.2.0 // indirect
|
||||
github.com/cespare/xxhash/v2 v2.3.0 // indirect
|
||||
github.com/cloudevents/sdk-go/sql/v2 v2.15.2 // indirect
|
||||
github.com/cloudevents/sdk-go/v2 v2.15.2 // indirect
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
|
||||
|
|
@ -104,18 +104,18 @@ require (
|
|||
go.uber.org/atomic v1.10.0 // indirect
|
||||
go.uber.org/multierr v1.11.0 // indirect
|
||||
go.uber.org/zap v1.27.0 // indirect
|
||||
golang.org/x/net v0.26.0 // indirect
|
||||
golang.org/x/net v0.27.0 // indirect
|
||||
golang.org/x/oauth2 v0.21.0 // indirect
|
||||
golang.org/x/sync v0.7.0 // indirect
|
||||
golang.org/x/sys v0.21.0 // indirect
|
||||
golang.org/x/sys v0.22.0 // indirect
|
||||
golang.org/x/text v0.16.0 // indirect
|
||||
golang.org/x/time v0.5.0 // indirect
|
||||
golang.org/x/tools v0.22.0 // indirect
|
||||
golang.org/x/tools v0.23.0 // indirect
|
||||
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
|
||||
google.golang.org/api v0.183.0 // indirect
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20240521202816-d264139d666e // indirect
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
|
||||
google.golang.org/grpc v1.64.0 // indirect
|
||||
google.golang.org/grpc v1.65.0 // indirect
|
||||
google.golang.org/protobuf v1.34.1 // indirect
|
||||
gopkg.in/inf.v0 v0.9.1 // indirect
|
||||
gopkg.in/ini.v1 v1.67.0 // indirect
|
||||
|
|
|
|||
68
go.sum
68
go.sum
|
|
@ -64,8 +64,8 @@ github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMr
|
|||
github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
|
||||
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
|
||||
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
|
||||
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
|
||||
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
|
||||
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
|
||||
|
|
@ -139,8 +139,8 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
|
|||
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
|
||||
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
|
||||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
||||
github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68=
|
||||
github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
|
||||
github.com/golang/glog v1.2.1 h1:OptwRhECazUx5ix5TTWC3EZhsZEHWcYWY4FQHTIubm4=
|
||||
github.com/golang/glog v1.2.1/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
|
||||
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
|
|
@ -229,8 +229,8 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rH
|
|||
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
|
||||
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
|
||||
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
|
||||
github.com/hashicorp/go-retryablehttp v0.6.7 h1:8/CAEZt/+F7kR7GevNHulKkUjLht3CPmn7egmhieNKo=
|
||||
github.com/hashicorp/go-retryablehttp v0.6.7/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
|
||||
github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
|
||||
github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
|
||||
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
|
||||
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
|
||||
github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c=
|
||||
|
|
@ -438,8 +438,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
|
|||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
|
||||
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||
golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
|
||||
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
|
||||
golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
|
||||
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-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
||||
|
|
@ -473,8 +473,8 @@ 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.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
|
||||
golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
||||
golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
|
||||
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-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
|
|
@ -514,8 +514,8 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx
|
|||
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
||||
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
||||
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
|
||||
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
|
||||
golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
|
||||
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-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
|
|
@ -591,13 +591,13 @@ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBc
|
|||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
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.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-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=
|
||||
golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
|
||||
golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
|
||||
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.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
|
|
@ -663,8 +663,8 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f
|
|||
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
||||
golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
||||
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
|
||||
golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
|
||||
golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
|
||||
golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
|
||||
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-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
|
|
@ -738,8 +738,8 @@ google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6D
|
|||
google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
|
||||
google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
|
||||
google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20240521202816-d264139d666e h1:SkdGTrROJl2jRGT/Fxv5QUf9jtdKCQh4KQJXbXVLAi0=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20240521202816-d264139d666e/go.mod h1:LweJcLbyVij6rCex8YunD8DYR5VDonap/jYl3ZRxcIU=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 h1:+rdxYoE3E5htTEWIe15GlN6IfvbURM//Jt0mmkmm6ZU=
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117/go.mod h1:OimBR/bc1wPO9iV4NC2bpyjy3VnAwZh5EBPQdtaE5oo=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
|
||||
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
|
||||
|
|
@ -758,8 +758,8 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
|
|||
google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
|
||||
google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
|
||||
google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
|
||||
google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY=
|
||||
google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg=
|
||||
google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
|
||||
google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
|
||||
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
|
||||
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
|
||||
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
|
||||
|
|
@ -832,18 +832,18 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A
|
|||
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
|
||||
k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
|
||||
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
|
||||
knative.dev/client-pkg v0.0.0-20240607132727-8fbea3d02b53 h1:L9LG8J5Efl0wX0Kgab2UOi40tUnQC3g/KkcCTPTVe88=
|
||||
knative.dev/client-pkg v0.0.0-20240607132727-8fbea3d02b53/go.mod h1:KK2I9/U/k24Y7l4OwmluGEtV5CWoccjewRauaTJLOr4=
|
||||
knative.dev/eventing v0.41.1-0.20240613093107-ea8f0fda4c06 h1:GYVCeO9+udWWzNfyWlBrclwB07kxzIElbhCCtFrsIRo=
|
||||
knative.dev/eventing v0.41.1-0.20240613093107-ea8f0fda4c06/go.mod h1:PQpuuOYjAl6rW74U+1CgcKP9IyKhk7XhS8aAu9zWQG0=
|
||||
knative.dev/hack v0.0.0-20240607132042-09143140a254 h1:1YFnu3U6dWZg0oxm6GU8kEdA9A+BvSWKJO7sg3N0kq8=
|
||||
knative.dev/hack v0.0.0-20240607132042-09143140a254/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
|
||||
knative.dev/networking v0.0.0-20240611072033-3b8764c0bb4c h1:Q+DdJYzvhwAVWMQtP6mbEr5dNxpr+K9HAF9RqJmZefY=
|
||||
knative.dev/networking v0.0.0-20240611072033-3b8764c0bb4c/go.mod h1:WhZLv94eOMDGHbdZiMrw6cnRfN3WEcFgpjUcV0A48pI=
|
||||
knative.dev/pkg v0.0.0-20240614135239-339c22b8218c h1:OaKrY7L6rzWTvs51JlieJajL40F6CpBbvO1aZspg2EA=
|
||||
knative.dev/pkg v0.0.0-20240614135239-339c22b8218c/go.mod h1:l7R8/SteYph0mZDsVgq3fVs4mWp1DaYx9BJJX68U6ik=
|
||||
knative.dev/serving v0.41.1-0.20240614080555-1f7cc4852a07 h1:Qcf6ytf+Ug1Xu7NBn/kFH+qtzXQ8ASoGiEmtNx53UpU=
|
||||
knative.dev/serving v0.41.1-0.20240614080555-1f7cc4852a07/go.mod h1:Z58WxiVmEynF1kX8cK4fYmNprj8IkPLl2mEHdvuP6nc=
|
||||
knative.dev/client-pkg v0.0.0-20240704014437-18eac77f7749 h1:gv7ehDLzk/D6dBfPkY7cIChuZhDkf6K3a+/9Kmj0vz0=
|
||||
knative.dev/client-pkg v0.0.0-20240704014437-18eac77f7749/go.mod h1:KK2I9/U/k24Y7l4OwmluGEtV5CWoccjewRauaTJLOr4=
|
||||
knative.dev/eventing v0.41.1-0.20240716144258-2cc0a5bedff5 h1:R2GqnGZ/pqwQH4qVnc8Luc76gsHs08h/LF5L+7eAe7E=
|
||||
knative.dev/eventing v0.41.1-0.20240716144258-2cc0a5bedff5/go.mod h1:GuJo16nQITgEy7HLt0bwX7h1lAKteF3SD0QxUTBGkAM=
|
||||
knative.dev/hack v0.0.0-20240704013904-b9799599afcf h1:n92FmZRywgtHso7pFAku7CW0qvRAs1hXtMQqO0R6eiE=
|
||||
knative.dev/hack v0.0.0-20240704013904-b9799599afcf/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
|
||||
knative.dev/networking v0.0.0-20240716111826-bab7f2a3e556 h1:9OTyJkrjiFh/burZiti3WucGv8Qtt91VJTnXfO5dC2g=
|
||||
knative.dev/networking v0.0.0-20240716111826-bab7f2a3e556/go.mod h1:1PosUDkXqoHNzYxtLIwa7LFqSsIXBShHOseAb6XBeEU=
|
||||
knative.dev/pkg v0.0.0-20240716082220-4355f0c73608 h1:BOiRzcnRS9Z5ruxlCiS/K1/Hb5bUN0X4W3xCegdcYQE=
|
||||
knative.dev/pkg v0.0.0-20240716082220-4355f0c73608/go.mod h1:M67lDZ4KbltYSon0Ox4/6qjlZNOIXW4Ldequ81yofbw=
|
||||
knative.dev/serving v0.41.1-0.20240716005350-fea0e7a481ea h1:ycB8DgulgHYRezLmvlh2Pk46OvQCf6C5UtA8Y2lM/Ls=
|
||||
knative.dev/serving v0.41.1-0.20240716005350-fea0e7a481ea/go.mod h1:kjO+YscsftZ1aJsrcYkaNMerp3Mm1PLCJhOzOG43HgY=
|
||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
||||
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
|
||||
|
|
|
|||
|
|
@ -70,3 +70,5 @@ benchstat <(go test -benchtime 500ms -count 15 -bench 'Sum64$')
|
|||
- [VictoriaMetrics](https://github.com/VictoriaMetrics/VictoriaMetrics)
|
||||
- [FreeCache](https://github.com/coocood/freecache)
|
||||
- [FastCache](https://github.com/VictoriaMetrics/fastcache)
|
||||
- [Ristretto](https://github.com/dgraph-io/ristretto)
|
||||
- [Badger](https://github.com/dgraph-io/badger)
|
||||
|
|
|
|||
|
|
@ -19,10 +19,13 @@ const (
|
|||
// Store the primes in an array as well.
|
||||
//
|
||||
// The consts are used when possible in Go code to avoid MOVs but we need a
|
||||
// contiguous array of the assembly code.
|
||||
// contiguous array for the assembly code.
|
||||
var primes = [...]uint64{prime1, prime2, prime3, prime4, prime5}
|
||||
|
||||
// Digest implements hash.Hash64.
|
||||
//
|
||||
// Note that a zero-valued Digest is not ready to receive writes.
|
||||
// Call Reset or create a Digest using New before calling other methods.
|
||||
type Digest struct {
|
||||
v1 uint64
|
||||
v2 uint64
|
||||
|
|
@ -33,19 +36,31 @@ type Digest struct {
|
|||
n int // how much of mem is used
|
||||
}
|
||||
|
||||
// New creates a new Digest that computes the 64-bit xxHash algorithm.
|
||||
// New creates a new Digest with a zero seed.
|
||||
func New() *Digest {
|
||||
return NewWithSeed(0)
|
||||
}
|
||||
|
||||
// NewWithSeed creates a new Digest with the given seed.
|
||||
func NewWithSeed(seed uint64) *Digest {
|
||||
var d Digest
|
||||
d.Reset()
|
||||
d.ResetWithSeed(seed)
|
||||
return &d
|
||||
}
|
||||
|
||||
// Reset clears the Digest's state so that it can be reused.
|
||||
// It uses a seed value of zero.
|
||||
func (d *Digest) Reset() {
|
||||
d.v1 = primes[0] + prime2
|
||||
d.v2 = prime2
|
||||
d.v3 = 0
|
||||
d.v4 = -primes[0]
|
||||
d.ResetWithSeed(0)
|
||||
}
|
||||
|
||||
// ResetWithSeed clears the Digest's state so that it can be reused.
|
||||
// It uses the given seed to initialize the state.
|
||||
func (d *Digest) ResetWithSeed(seed uint64) {
|
||||
d.v1 = seed + prime1 + prime2
|
||||
d.v2 = seed + prime2
|
||||
d.v3 = seed
|
||||
d.v4 = seed - prime1
|
||||
d.total = 0
|
||||
d.n = 0
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
package xxhash
|
||||
|
||||
// Sum64 computes the 64-bit xxHash digest of b.
|
||||
// Sum64 computes the 64-bit xxHash digest of b with a zero seed.
|
||||
//
|
||||
//go:noescape
|
||||
func Sum64(b []byte) uint64
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
package xxhash
|
||||
|
||||
// Sum64 computes the 64-bit xxHash digest of b.
|
||||
// Sum64 computes the 64-bit xxHash digest of b with a zero seed.
|
||||
func Sum64(b []byte) uint64 {
|
||||
// A simpler version would be
|
||||
// d := New()
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
package xxhash
|
||||
|
||||
// Sum64String computes the 64-bit xxHash digest of s.
|
||||
// Sum64String computes the 64-bit xxHash digest of s with a zero seed.
|
||||
func Sum64String(s string) uint64 {
|
||||
return Sum64([]byte(s))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ import (
|
|||
//
|
||||
// See https://github.com/golang/go/issues/42739 for discussion.
|
||||
|
||||
// Sum64String computes the 64-bit xxHash digest of s.
|
||||
// Sum64String computes the 64-bit xxHash digest of s with a zero seed.
|
||||
// It may be faster than Sum64([]byte(s)) by avoiding a copy.
|
||||
func Sum64String(s string) uint64 {
|
||||
b := *(*[]byte)(unsafe.Pointer(&sliceHeader{s, len(s)}))
|
||||
|
|
|
|||
|
|
@ -506,7 +506,6 @@ var badWindowsNames = []string{
|
|||
"PRN",
|
||||
"AUX",
|
||||
"NUL",
|
||||
"COM0",
|
||||
"COM1",
|
||||
"COM2",
|
||||
"COM3",
|
||||
|
|
@ -516,7 +515,6 @@ var badWindowsNames = []string{
|
|||
"COM7",
|
||||
"COM8",
|
||||
"COM9",
|
||||
"LPT0",
|
||||
"LPT1",
|
||||
"LPT2",
|
||||
"LPT3",
|
||||
|
|
|
|||
|
|
@ -827,10 +827,6 @@ func (t *Transport) newClientConn(c net.Conn, singleUse bool) (*ClientConn, erro
|
|||
cc.henc.SetMaxDynamicTableSizeLimit(t.maxEncoderHeaderTableSize())
|
||||
cc.peerMaxHeaderTableSize = initialHeaderTableSize
|
||||
|
||||
if t.AllowHTTP {
|
||||
cc.nextStreamID = 3
|
||||
}
|
||||
|
||||
if cs, ok := c.(connectionStater); ok {
|
||||
state := cs.ConnectionState()
|
||||
cc.tlsState = &state
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 shmat(id int, addr uintptr, flag int) (ret uintptr, err error)
|
||||
|
|
|
|||
|
|
@ -154,6 +154,15 @@ func Munmap(b []byte) (err error) {
|
|||
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) {
|
||||
n, err = read(fd, p)
|
||||
if raceenabled {
|
||||
|
|
|
|||
|
|
@ -760,6 +760,39 @@ var libc_sysctl_trampoline_addr uintptr
|
|||
|
||||
// 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) {
|
||||
_, _, e1 := syscall_syscall6(libc_sendfile_trampoline_addr, uintptr(infd), uintptr(outfd), uintptr(offset), uintptr(unsafe.Pointer(len)), uintptr(hdtr), uintptr(flags))
|
||||
if e1 != 0 {
|
||||
|
|
|
|||
|
|
@ -228,6 +228,16 @@ TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
|
|||
GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8
|
||||
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
|
||||
JMP libc_sendfile(SB)
|
||||
GLOBL ·libc_sendfile_trampoline_addr(SB), RODATA, $8
|
||||
|
|
|
|||
|
|
@ -760,6 +760,39 @@ var libc_sysctl_trampoline_addr uintptr
|
|||
|
||||
// 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) {
|
||||
_, _, e1 := syscall_syscall6(libc_sendfile_trampoline_addr, uintptr(infd), uintptr(outfd), uintptr(offset), uintptr(unsafe.Pointer(len)), uintptr(hdtr), uintptr(flags))
|
||||
if e1 != 0 {
|
||||
|
|
|
|||
|
|
@ -228,6 +228,16 @@ TEXT libc_sysctl_trampoline<>(SB),NOSPLIT,$0-0
|
|||
GLOBL ·libc_sysctl_trampoline_addr(SB), RODATA, $8
|
||||
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
|
||||
JMP libc_sendfile(SB)
|
||||
GLOBL ·libc_sendfile_trampoline_addr(SB), RODATA, $8
|
||||
|
|
|
|||
|
|
@ -894,7 +894,7 @@ type ACL struct {
|
|||
aclRevision byte
|
||||
sbz1 byte
|
||||
aclSize uint16
|
||||
aceCount uint16
|
||||
AceCount uint16
|
||||
sbz2 uint16
|
||||
}
|
||||
|
||||
|
|
@ -1087,6 +1087,27 @@ type EXPLICIT_ACCESS struct {
|
|||
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.
|
||||
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 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.
|
||||
func (sd *SECURITY_DESCRIPTOR) Control() (control SECURITY_DESCRIPTOR_CONTROL, revision uint32, err error) {
|
||||
|
|
|
|||
|
|
@ -91,6 +91,7 @@ var (
|
|||
procEnumServicesStatusExW = modadvapi32.NewProc("EnumServicesStatusExW")
|
||||
procEqualSid = modadvapi32.NewProc("EqualSid")
|
||||
procFreeSid = modadvapi32.NewProc("FreeSid")
|
||||
procGetAce = modadvapi32.NewProc("GetAce")
|
||||
procGetLengthSid = modadvapi32.NewProc("GetLengthSid")
|
||||
procGetNamedSecurityInfoW = modadvapi32.NewProc("GetNamedSecurityInfoW")
|
||||
procGetSecurityDescriptorControl = modadvapi32.NewProc("GetSecurityDescriptorControl")
|
||||
|
|
@ -1224,6 +1225,14 @@ func setEntriesInAcl(countExplicitEntries uint32, explicitEntries *EXPLICIT_ACCE
|
|||
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) {
|
||||
r1, _, e1 := syscall.Syscall(procSetKernelObjectSecurity.Addr(), 3, uintptr(handle), uintptr(securityInformation), uintptr(unsafe.Pointer(securityDescriptor)))
|
||||
if r1 == 0 {
|
||||
|
|
|
|||
|
|
@ -106,8 +106,21 @@ func PathEnclosingInterval(root *ast.File, start, end token.Pos) (path []ast.Nod
|
|||
|
||||
// Does augmented child strictly contain [start, end)?
|
||||
if augPos <= start && end <= augEnd {
|
||||
_, isToken := child.(tokenNode)
|
||||
return isToken || visit(child)
|
||||
if is[tokenNode](child) {
|
||||
return true
|
||||
}
|
||||
|
||||
// childrenOf elides the FuncType node beneath FuncDecl.
|
||||
// Add it back here for TypeParams, Params, Results,
|
||||
// all FieldLists). But we don't add it back for the "func" token
|
||||
// even though it is is the tree at FuncDecl.Type.Func.
|
||||
if decl, ok := node.(*ast.FuncDecl); ok {
|
||||
if fields, ok := child.(*ast.FieldList); ok && fields != decl.Recv {
|
||||
path = append(path, decl.Type)
|
||||
}
|
||||
}
|
||||
|
||||
return visit(child)
|
||||
}
|
||||
|
||||
// Does [start, end) overlap multiple children?
|
||||
|
|
@ -313,6 +326,8 @@ func childrenOf(n ast.Node) []ast.Node {
|
|||
//
|
||||
// As a workaround, we inline the case for FuncType
|
||||
// here and order things correctly.
|
||||
// We also need to insert the elided FuncType just
|
||||
// before the 'visit' recursion.
|
||||
//
|
||||
children = nil // discard ast.Walk(FuncDecl) info subtrees
|
||||
children = append(children, tok(n.Type.Func, len("func")))
|
||||
|
|
@ -632,3 +647,8 @@ func NodeDescription(n ast.Node) string {
|
|||
}
|
||||
panic(fmt.Sprintf("unexpected node type: %T", n))
|
||||
}
|
||||
|
||||
func is[T any](x any) bool {
|
||||
_, ok := x.(T)
|
||||
return ok
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ package astutil
|
|||
import "go/ast"
|
||||
|
||||
// Unparen returns e with any enclosing parentheses stripped.
|
||||
// TODO(adonovan): use go1.22's ast.Unparen.
|
||||
func Unparen(e ast.Expr) ast.Expr {
|
||||
for {
|
||||
p, ok := e.(*ast.ParenExpr)
|
||||
|
|
|
|||
|
|
@ -200,12 +200,14 @@ func (i *Invocation) runWithFriendlyError(ctx context.Context, stdout, stderr io
|
|||
return
|
||||
}
|
||||
|
||||
func (i *Invocation) run(ctx context.Context, stdout, stderr io.Writer) error {
|
||||
log := i.Logf
|
||||
if log == nil {
|
||||
log = func(string, ...interface{}) {}
|
||||
// logf logs if i.Logf is non-nil.
|
||||
func (i *Invocation) logf(format string, args ...any) {
|
||||
if i.Logf != nil {
|
||||
i.Logf(format, args...)
|
||||
}
|
||||
}
|
||||
|
||||
func (i *Invocation) run(ctx context.Context, stdout, stderr io.Writer) error {
|
||||
goArgs := []string{i.Verb}
|
||||
|
||||
appendModFile := func() {
|
||||
|
|
@ -277,7 +279,12 @@ func (i *Invocation) run(ctx context.Context, stdout, stderr io.Writer) error {
|
|||
cmd.Dir = i.WorkingDir
|
||||
}
|
||||
|
||||
defer func(start time.Time) { log("%s for %v", time.Since(start), cmdDebugStr(cmd)) }(time.Now())
|
||||
debugStr := cmdDebugStr(cmd)
|
||||
i.logf("starting %v", debugStr)
|
||||
start := time.Now()
|
||||
defer func() {
|
||||
i.logf("%s for %v", time.Since(start), debugStr)
|
||||
}()
|
||||
|
||||
return runCmdContext(ctx, cmd)
|
||||
}
|
||||
|
|
@ -514,7 +521,7 @@ func WriteOverlays(overlay map[string][]byte) (filename string, cleanup func(),
|
|||
for k, v := range overlay {
|
||||
// Use a unique basename for each file (001-foo.go),
|
||||
// to avoid creating nested directories.
|
||||
base := fmt.Sprintf("%d-%s.go", 1+len(overlays), filepath.Base(k))
|
||||
base := fmt.Sprintf("%d-%s", 1+len(overlays), filepath.Base(k))
|
||||
filename := filepath.Join(dir, base)
|
||||
err := os.WriteFile(filename, v, 0666)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ import (
|
|||
"unicode"
|
||||
"unicode/utf8"
|
||||
|
||||
"golang.org/x/sync/errgroup"
|
||||
"golang.org/x/tools/go/ast/astutil"
|
||||
"golang.org/x/tools/internal/event"
|
||||
"golang.org/x/tools/internal/gocommand"
|
||||
|
|
@ -365,9 +366,7 @@ func (p *pass) load() ([]*ImportFix, bool) {
|
|||
if p.loadRealPackageNames {
|
||||
err := p.loadPackageNames(append(imports, p.candidates...))
|
||||
if err != nil {
|
||||
if p.env.Logf != nil {
|
||||
p.env.Logf("loading package names: %v", err)
|
||||
}
|
||||
p.env.logf("loading package names: %v", err)
|
||||
return nil, false
|
||||
}
|
||||
}
|
||||
|
|
@ -563,7 +562,14 @@ func (p *pass) addCandidate(imp *ImportInfo, pkg *packageInfo) {
|
|||
|
||||
// fixImports adds and removes imports from f so that all its references are
|
||||
// satisfied and there are no unused imports.
|
||||
func fixImports(fset *token.FileSet, f *ast.File, filename string, env *ProcessEnv) error {
|
||||
//
|
||||
// This is declared as a variable rather than a function so goimports can
|
||||
// easily be extended by adding a file with an init function.
|
||||
//
|
||||
// DO NOT REMOVE: used internally at Google.
|
||||
var fixImports = fixImportsDefault
|
||||
|
||||
func fixImportsDefault(fset *token.FileSet, f *ast.File, filename string, env *ProcessEnv) error {
|
||||
fixes, err := getFixes(context.Background(), fset, f, filename, env)
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
@ -580,9 +586,7 @@ func getFixes(ctx context.Context, fset *token.FileSet, f *ast.File, filename st
|
|||
return nil, err
|
||||
}
|
||||
srcDir := filepath.Dir(abs)
|
||||
if env.Logf != nil {
|
||||
env.Logf("fixImports(filename=%q), abs=%q, srcDir=%q ...", filename, abs, srcDir)
|
||||
}
|
||||
env.logf("fixImports(filename=%q), abs=%q, srcDir=%q ...", filename, abs, srcDir)
|
||||
|
||||
// First pass: looking only at f, and using the naive algorithm to
|
||||
// derive package names from import paths, see if the file is already
|
||||
|
|
@ -1014,16 +1018,26 @@ func (e *ProcessEnv) GetResolver() (Resolver, error) {
|
|||
// already know the view type.
|
||||
if len(e.Env["GOMOD"]) == 0 && len(e.Env["GOWORK"]) == 0 {
|
||||
e.resolver = newGopathResolver(e)
|
||||
e.logf("created gopath resolver")
|
||||
} else if r, err := newModuleResolver(e, e.ModCache); err != nil {
|
||||
e.resolverErr = err
|
||||
e.logf("failed to create module resolver: %v", err)
|
||||
} else {
|
||||
e.resolver = Resolver(r)
|
||||
e.logf("created module resolver")
|
||||
}
|
||||
}
|
||||
|
||||
return e.resolver, e.resolverErr
|
||||
}
|
||||
|
||||
// logf logs if e.Logf is non-nil.
|
||||
func (e *ProcessEnv) logf(format string, args ...any) {
|
||||
if e.Logf != nil {
|
||||
e.Logf(format, args...)
|
||||
}
|
||||
}
|
||||
|
||||
// buildContext returns the build.Context to use for matching files.
|
||||
//
|
||||
// TODO(rfindley): support dynamic GOOS, GOARCH here, when doing cross-platform
|
||||
|
|
@ -1127,8 +1141,8 @@ type Resolver interface {
|
|||
// scan works with callback to search for packages. See scanCallback for details.
|
||||
scan(ctx context.Context, callback *scanCallback) error
|
||||
|
||||
// loadExports returns the set of exported symbols in the package at dir.
|
||||
// loadExports may be called concurrently.
|
||||
// loadExports returns the package name and set of exported symbols in the
|
||||
// package at dir. loadExports may be called concurrently.
|
||||
loadExports(ctx context.Context, pkg *pkg, includeTest bool) (string, []stdlib.Symbol, error)
|
||||
|
||||
// scoreImportPath returns the relevance for an import path.
|
||||
|
|
@ -1205,54 +1219,52 @@ func addExternalCandidates(ctx context.Context, pass *pass, refs references, fil
|
|||
imp *ImportInfo
|
||||
pkg *packageInfo
|
||||
}
|
||||
results := make(chan result, len(refs))
|
||||
results := make([]*result, len(refs))
|
||||
|
||||
ctx, cancel := context.WithCancel(ctx)
|
||||
var wg sync.WaitGroup
|
||||
defer func() {
|
||||
cancel()
|
||||
wg.Wait()
|
||||
}()
|
||||
var (
|
||||
firstErr error
|
||||
firstErrOnce sync.Once
|
||||
)
|
||||
for pkgName, symbols := range refs {
|
||||
wg.Add(1)
|
||||
go func(pkgName string, symbols map[string]bool) {
|
||||
defer wg.Done()
|
||||
g, ctx := errgroup.WithContext(ctx)
|
||||
|
||||
found, err := findImport(ctx, pass, found[pkgName], pkgName, symbols)
|
||||
|
||||
if err != nil {
|
||||
firstErrOnce.Do(func() {
|
||||
firstErr = err
|
||||
cancel()
|
||||
})
|
||||
return
|
||||
searcher := symbolSearcher{
|
||||
logf: pass.env.logf,
|
||||
srcDir: pass.srcDir,
|
||||
xtest: strings.HasSuffix(pass.f.Name.Name, "_test"),
|
||||
loadExports: resolver.loadExports,
|
||||
}
|
||||
|
||||
i := 0
|
||||
for pkgName, symbols := range refs {
|
||||
index := i // claim an index in results
|
||||
i++
|
||||
pkgName := pkgName
|
||||
symbols := symbols
|
||||
|
||||
g.Go(func() error {
|
||||
found, err := searcher.search(ctx, found[pkgName], pkgName, symbols)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if found == nil {
|
||||
return // No matching package.
|
||||
return nil // No matching package.
|
||||
}
|
||||
|
||||
imp := &ImportInfo{
|
||||
ImportPath: found.importPathShort,
|
||||
}
|
||||
|
||||
pkg := &packageInfo{
|
||||
name: pkgName,
|
||||
exports: symbols,
|
||||
}
|
||||
results <- result{imp, pkg}
|
||||
}(pkgName, symbols)
|
||||
results[index] = &result{imp, pkg}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
if err := g.Wait(); err != nil {
|
||||
return err
|
||||
}
|
||||
go func() {
|
||||
wg.Wait()
|
||||
close(results)
|
||||
}()
|
||||
|
||||
for result := range results {
|
||||
for _, result := range results {
|
||||
if result == nil {
|
||||
continue
|
||||
}
|
||||
// Don't offer completions that would shadow predeclared
|
||||
// names, such as github.com/coreos/etcd/error.
|
||||
if types.Universe.Lookup(result.pkg.name) != nil { // predeclared
|
||||
|
|
@ -1266,7 +1278,7 @@ func addExternalCandidates(ctx context.Context, pass *pass, refs references, fil
|
|||
}
|
||||
pass.addCandidate(result.imp, result.pkg)
|
||||
}
|
||||
return firstErr
|
||||
return nil
|
||||
}
|
||||
|
||||
// notIdentifier reports whether ch is an invalid identifier character.
|
||||
|
|
@ -1610,9 +1622,7 @@ func loadExportsFromFiles(ctx context.Context, env *ProcessEnv, dir string, incl
|
|||
fullFile := filepath.Join(dir, fi.Name())
|
||||
f, err := parser.ParseFile(fset, fullFile, nil, 0)
|
||||
if err != nil {
|
||||
if env.Logf != nil {
|
||||
env.Logf("error parsing %v: %v", fullFile, err)
|
||||
}
|
||||
env.logf("error parsing %v: %v", fullFile, err)
|
||||
continue
|
||||
}
|
||||
if f.Name.Name == "documentation" {
|
||||
|
|
@ -1648,9 +1658,7 @@ func loadExportsFromFiles(ctx context.Context, env *ProcessEnv, dir string, incl
|
|||
}
|
||||
sortSymbols(exports)
|
||||
|
||||
if env.Logf != nil {
|
||||
env.Logf("loaded exports in dir %v (package %v): %v", dir, pkgName, exports)
|
||||
}
|
||||
env.logf("loaded exports in dir %v (package %v): %v", dir, pkgName, exports)
|
||||
return pkgName, exports, nil
|
||||
}
|
||||
|
||||
|
|
@ -1660,25 +1668,39 @@ func sortSymbols(syms []stdlib.Symbol) {
|
|||
})
|
||||
}
|
||||
|
||||
// findImport searches for a package with the given symbols.
|
||||
// If no package is found, findImport returns ("", false, nil)
|
||||
func findImport(ctx context.Context, pass *pass, candidates []pkgDistance, pkgName string, symbols map[string]bool) (*pkg, error) {
|
||||
// A symbolSearcher searches for a package with a set of symbols, among a set
|
||||
// of candidates. See [symbolSearcher.search].
|
||||
//
|
||||
// The search occurs within the scope of a single file, with context captured
|
||||
// in srcDir and xtest.
|
||||
type symbolSearcher struct {
|
||||
logf func(string, ...any)
|
||||
srcDir string // directory containing the file
|
||||
xtest bool // if set, the file containing is an x_test file
|
||||
loadExports func(ctx context.Context, pkg *pkg, includeTest bool) (string, []stdlib.Symbol, error)
|
||||
}
|
||||
|
||||
// search searches the provided candidates for a package containing all
|
||||
// exported symbols.
|
||||
//
|
||||
// If successful, returns the resulting package.
|
||||
func (s *symbolSearcher) search(ctx context.Context, candidates []pkgDistance, pkgName string, symbols map[string]bool) (*pkg, error) {
|
||||
// Sort the candidates by their import package length,
|
||||
// assuming that shorter package names are better than long
|
||||
// ones. Note that this sorts by the de-vendored name, so
|
||||
// there's no "penalty" for vendoring.
|
||||
sort.Sort(byDistanceOrImportPathShortLength(candidates))
|
||||
if pass.env.Logf != nil {
|
||||
if s.logf != nil {
|
||||
for i, c := range candidates {
|
||||
pass.env.Logf("%s candidate %d/%d: %v in %v", pkgName, i+1, len(candidates), c.pkg.importPathShort, c.pkg.dir)
|
||||
s.logf("%s candidate %d/%d: %v in %v", pkgName, i+1, len(candidates), c.pkg.importPathShort, c.pkg.dir)
|
||||
}
|
||||
}
|
||||
resolver, err := pass.env.GetResolver()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Collect exports for packages with matching names.
|
||||
// Arrange rescv so that we can we can await results in order of relevance
|
||||
// and exit as soon as we find the first match.
|
||||
//
|
||||
// Search with bounded concurrency, returning as soon as the first result
|
||||
// among rescv is non-nil.
|
||||
rescv := make([]chan *pkg, len(candidates))
|
||||
for i := range candidates {
|
||||
rescv[i] = make(chan *pkg, 1)
|
||||
|
|
@ -1686,6 +1708,7 @@ func findImport(ctx context.Context, pass *pass, candidates []pkgDistance, pkgNa
|
|||
const maxConcurrentPackageImport = 4
|
||||
loadExportsSem := make(chan struct{}, maxConcurrentPackageImport)
|
||||
|
||||
// Ensure that all work is completed at exit.
|
||||
ctx, cancel := context.WithCancel(ctx)
|
||||
var wg sync.WaitGroup
|
||||
defer func() {
|
||||
|
|
@ -1693,6 +1716,7 @@ func findImport(ctx context.Context, pass *pass, candidates []pkgDistance, pkgNa
|
|||
wg.Wait()
|
||||
}()
|
||||
|
||||
// Start the search.
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
|
|
@ -1703,53 +1727,65 @@ func findImport(ctx context.Context, pass *pass, candidates []pkgDistance, pkgNa
|
|||
return
|
||||
}
|
||||
|
||||
i := i
|
||||
c := c
|
||||
wg.Add(1)
|
||||
go func(c pkgDistance, resc chan<- *pkg) {
|
||||
go func() {
|
||||
defer func() {
|
||||
<-loadExportsSem
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
if pass.env.Logf != nil {
|
||||
pass.env.Logf("loading exports in dir %s (seeking package %s)", c.pkg.dir, pkgName)
|
||||
if s.logf != nil {
|
||||
s.logf("loading exports in dir %s (seeking package %s)", c.pkg.dir, pkgName)
|
||||
}
|
||||
// If we're an x_test, load the package under test's test variant.
|
||||
includeTest := strings.HasSuffix(pass.f.Name.Name, "_test") && c.pkg.dir == pass.srcDir
|
||||
_, exports, err := resolver.loadExports(ctx, c.pkg, includeTest)
|
||||
pkg, err := s.searchOne(ctx, c, symbols)
|
||||
if err != nil {
|
||||
if pass.env.Logf != nil {
|
||||
pass.env.Logf("loading exports in dir %s (seeking package %s): %v", c.pkg.dir, pkgName, err)
|
||||
if s.logf != nil && ctx.Err() == nil {
|
||||
s.logf("loading exports in dir %s (seeking package %s): %v", c.pkg.dir, pkgName, err)
|
||||
}
|
||||
resc <- nil
|
||||
return
|
||||
pkg = nil
|
||||
}
|
||||
rescv[i] <- pkg // may be nil
|
||||
}()
|
||||
}
|
||||
}()
|
||||
|
||||
// Await the first (best) result.
|
||||
for _, resc := range rescv {
|
||||
select {
|
||||
case r := <-resc:
|
||||
if r != nil {
|
||||
return r, nil
|
||||
}
|
||||
case <-ctx.Done():
|
||||
return nil, ctx.Err()
|
||||
}
|
||||
}
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (s *symbolSearcher) searchOne(ctx context.Context, c pkgDistance, symbols map[string]bool) (*pkg, error) {
|
||||
if ctx.Err() != nil {
|
||||
return nil, ctx.Err()
|
||||
}
|
||||
// If we're considering the package under test from an x_test, load the
|
||||
// test variant.
|
||||
includeTest := s.xtest && c.pkg.dir == s.srcDir
|
||||
_, exports, err := s.loadExports(ctx, c.pkg, includeTest)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
exportsMap := make(map[string]bool, len(exports))
|
||||
for _, sym := range exports {
|
||||
exportsMap[sym.Name] = true
|
||||
}
|
||||
|
||||
// If it doesn't have the right
|
||||
// symbols, send nil to mean no match.
|
||||
for symbol := range symbols {
|
||||
if !exportsMap[symbol] {
|
||||
resc <- nil
|
||||
return
|
||||
return nil, nil // no match
|
||||
}
|
||||
}
|
||||
resc <- c.pkg
|
||||
}(c, rescv[i])
|
||||
}
|
||||
}()
|
||||
|
||||
for _, resc := range rescv {
|
||||
pkg := <-resc
|
||||
if pkg == nil {
|
||||
continue
|
||||
}
|
||||
return pkg, nil
|
||||
}
|
||||
return nil, nil
|
||||
return c.pkg, nil
|
||||
}
|
||||
|
||||
// pkgIsCandidate reports whether pkg is a candidate for satisfying the
|
||||
|
|
@ -1771,58 +1807,24 @@ func pkgIsCandidate(filename string, refs references, pkg *pkg) bool {
|
|||
}
|
||||
|
||||
// Speed optimization to minimize disk I/O:
|
||||
// the last two components on disk must contain the
|
||||
// package name somewhere.
|
||||
//
|
||||
// This permits mismatch naming like directory
|
||||
// "go-foo" being package "foo", or "pkg.v3" being "pkg",
|
||||
// or directory "google.golang.org/api/cloudbilling/v1"
|
||||
// being package "cloudbilling", but doesn't
|
||||
// permit a directory "foo" to be package
|
||||
// "bar", which is strongly discouraged
|
||||
// anyway. There's no reason goimports needs
|
||||
// to be slow just to accommodate that.
|
||||
// Use the matchesPath heuristic to filter to package paths that could
|
||||
// reasonably match a dangling reference.
|
||||
//
|
||||
// This permits mismatch naming like directory "go-foo" being package "foo",
|
||||
// or "pkg.v3" being "pkg", or directory
|
||||
// "google.golang.org/api/cloudbilling/v1" being package "cloudbilling", but
|
||||
// doesn't permit a directory "foo" to be package "bar", which is strongly
|
||||
// discouraged anyway. There's no reason goimports needs to be slow just to
|
||||
// accommodate that.
|
||||
for pkgIdent := range refs {
|
||||
lastTwo := lastTwoComponents(pkg.importPathShort)
|
||||
if strings.Contains(lastTwo, pkgIdent) {
|
||||
return true
|
||||
}
|
||||
if hasHyphenOrUpperASCII(lastTwo) && !hasHyphenOrUpperASCII(pkgIdent) {
|
||||
lastTwo = lowerASCIIAndRemoveHyphen(lastTwo)
|
||||
if strings.Contains(lastTwo, pkgIdent) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func hasHyphenOrUpperASCII(s string) bool {
|
||||
for i := 0; i < len(s); i++ {
|
||||
b := s[i]
|
||||
if b == '-' || ('A' <= b && b <= 'Z') {
|
||||
if matchesPath(pkgIdent, pkg.importPathShort) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func lowerASCIIAndRemoveHyphen(s string) (ret string) {
|
||||
buf := make([]byte, 0, len(s))
|
||||
for i := 0; i < len(s); i++ {
|
||||
b := s[i]
|
||||
switch {
|
||||
case b == '-':
|
||||
continue
|
||||
case 'A' <= b && b <= 'Z':
|
||||
buf = append(buf, b+('a'-'A'))
|
||||
default:
|
||||
buf = append(buf, b)
|
||||
}
|
||||
}
|
||||
return string(buf)
|
||||
}
|
||||
|
||||
// canUse reports whether the package in dir is usable from filename,
|
||||
// respecting the Go "internal" and "vendor" visibility rules.
|
||||
func canUse(filename, dir string) bool {
|
||||
|
|
@ -1863,19 +1865,84 @@ func canUse(filename, dir string) bool {
|
|||
return !strings.Contains(relSlash, "/vendor/") && !strings.Contains(relSlash, "/internal/") && !strings.HasSuffix(relSlash, "/internal")
|
||||
}
|
||||
|
||||
// lastTwoComponents returns at most the last two path components
|
||||
// of v, using either / or \ as the path separator.
|
||||
func lastTwoComponents(v string) string {
|
||||
// matchesPath reports whether ident may match a potential package name
|
||||
// referred to by path, using heuristics to filter out unidiomatic package
|
||||
// names.
|
||||
//
|
||||
// Specifically, it checks whether either of the last two '/'- or '\'-delimited
|
||||
// path segments matches the identifier. The segment-matching heuristic must
|
||||
// allow for various conventions around segment naming, including go-foo,
|
||||
// foo-go, and foo.v3. To handle all of these, matching considers both (1) the
|
||||
// entire segment, ignoring '-' and '.', as well as (2) the last subsegment
|
||||
// separated by '-' or '.'. So the segment foo-go matches all of the following
|
||||
// identifiers: foo, go, and foogo. All matches are case insensitive (for ASCII
|
||||
// identifiers).
|
||||
//
|
||||
// See the docstring for [pkgIsCandidate] for an explanation of how this
|
||||
// heuristic filters potential candidate packages.
|
||||
func matchesPath(ident, path string) bool {
|
||||
// Ignore case, for ASCII.
|
||||
lowerIfASCII := func(b byte) byte {
|
||||
if 'A' <= b && b <= 'Z' {
|
||||
return b + ('a' - 'A')
|
||||
}
|
||||
return b
|
||||
}
|
||||
|
||||
// match reports whether path[start:end] matches ident, ignoring [.-].
|
||||
match := func(start, end int) bool {
|
||||
ii := len(ident) - 1 // current byte in ident
|
||||
pi := end - 1 // current byte in path
|
||||
for ; pi >= start && ii >= 0; pi-- {
|
||||
pb := path[pi]
|
||||
if pb == '-' || pb == '.' {
|
||||
continue
|
||||
}
|
||||
pb = lowerIfASCII(pb)
|
||||
ib := lowerIfASCII(ident[ii])
|
||||
if pb != ib {
|
||||
return false
|
||||
}
|
||||
ii--
|
||||
}
|
||||
return ii < 0 && pi < start // all bytes matched
|
||||
}
|
||||
|
||||
// segmentEnd and subsegmentEnd hold the end points of the current segment
|
||||
// and subsegment intervals.
|
||||
segmentEnd := len(path)
|
||||
subsegmentEnd := len(path)
|
||||
|
||||
// Count slashes; we only care about the last two segments.
|
||||
nslash := 0
|
||||
for i := len(v) - 1; i >= 0; i-- {
|
||||
if v[i] == '/' || v[i] == '\\' {
|
||||
|
||||
for i := len(path) - 1; i >= 0; i-- {
|
||||
switch b := path[i]; b {
|
||||
// TODO(rfindley): we handle backlashes here only because the previous
|
||||
// heuristic handled backslashes. This is perhaps overly defensive, but is
|
||||
// the result of many lessons regarding Chesterton's fence and the
|
||||
// goimports codebase.
|
||||
//
|
||||
// However, this function is only ever called with something called an
|
||||
// 'importPath'. Is it possible that this is a real import path, and
|
||||
// therefore we need only consider forward slashes?
|
||||
case '/', '\\':
|
||||
if match(i+1, segmentEnd) || match(i+1, subsegmentEnd) {
|
||||
return true
|
||||
}
|
||||
nslash++
|
||||
if nslash == 2 {
|
||||
return v[i:]
|
||||
return false // did not match above
|
||||
}
|
||||
segmentEnd, subsegmentEnd = i, i // reset
|
||||
case '-', '.':
|
||||
if match(i+1, subsegmentEnd) {
|
||||
return true
|
||||
}
|
||||
subsegmentEnd = i
|
||||
}
|
||||
}
|
||||
}
|
||||
return v
|
||||
return match(0, segmentEnd) || match(0, subsegmentEnd)
|
||||
}
|
||||
|
||||
type visitFn func(node ast.Node) ast.Visitor
|
||||
|
|
|
|||
|
|
@ -265,9 +265,7 @@ func (r *ModuleResolver) initAllMods() error {
|
|||
return err
|
||||
}
|
||||
if mod.Dir == "" {
|
||||
if r.env.Logf != nil {
|
||||
r.env.Logf("module %v has not been downloaded and will be ignored", mod.Path)
|
||||
}
|
||||
r.env.logf("module %v has not been downloaded and will be ignored", mod.Path)
|
||||
// Can't do anything with a module that's not downloaded.
|
||||
continue
|
||||
}
|
||||
|
|
@ -766,9 +764,7 @@ func (r *ModuleResolver) scanDirForPackage(root gopathwalk.Root, dir string) dir
|
|||
}
|
||||
modPath, err := module.UnescapePath(filepath.ToSlash(matches[1]))
|
||||
if err != nil {
|
||||
if r.env.Logf != nil {
|
||||
r.env.Logf("decoding module cache path %q: %v", subdir, err)
|
||||
}
|
||||
r.env.logf("decoding module cache path %q: %v", subdir, err)
|
||||
return directoryPackageInfo{
|
||||
status: directoryScanned,
|
||||
err: fmt.Errorf("decoding module cache path %q: %v", subdir, err),
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"ErrWriteAfterClose", Var, 0},
|
||||
{"ErrWriteTooLong", Var, 0},
|
||||
{"FileInfoHeader", Func, 1},
|
||||
{"FileInfoNames", Type, 23},
|
||||
{"Format", Type, 10},
|
||||
{"FormatGNU", Const, 10},
|
||||
{"FormatPAX", Const, 10},
|
||||
|
|
@ -820,6 +821,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"(*ConnectionState).ExportKeyingMaterial", Method, 11},
|
||||
{"(*Dialer).Dial", Method, 15},
|
||||
{"(*Dialer).DialContext", Method, 15},
|
||||
{"(*ECHRejectionError).Error", Method, 23},
|
||||
{"(*QUICConn).Close", Method, 21},
|
||||
{"(*QUICConn).ConnectionState", Method, 21},
|
||||
{"(*QUICConn).HandleData", Method, 21},
|
||||
|
|
@ -827,6 +829,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"(*QUICConn).SendSessionTicket", Method, 21},
|
||||
{"(*QUICConn).SetTransportParameters", Method, 21},
|
||||
{"(*QUICConn).Start", Method, 21},
|
||||
{"(*QUICConn).StoreSession", Method, 23},
|
||||
{"(*SessionState).Bytes", Method, 21},
|
||||
{"(AlertError).Error", Method, 21},
|
||||
{"(ClientAuthType).String", Method, 15},
|
||||
|
|
@ -877,6 +880,8 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"Config.ClientSessionCache", Field, 3},
|
||||
{"Config.CurvePreferences", Field, 3},
|
||||
{"Config.DynamicRecordSizingDisabled", Field, 7},
|
||||
{"Config.EncryptedClientHelloConfigList", Field, 23},
|
||||
{"Config.EncryptedClientHelloRejectionVerify", Field, 23},
|
||||
{"Config.GetCertificate", Field, 4},
|
||||
{"Config.GetClientCertificate", Field, 8},
|
||||
{"Config.GetConfigForClient", Field, 8},
|
||||
|
|
@ -902,6 +907,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"ConnectionState", Type, 0},
|
||||
{"ConnectionState.CipherSuite", Field, 0},
|
||||
{"ConnectionState.DidResume", Field, 1},
|
||||
{"ConnectionState.ECHAccepted", Field, 23},
|
||||
{"ConnectionState.HandshakeComplete", Field, 0},
|
||||
{"ConnectionState.NegotiatedProtocol", Field, 0},
|
||||
{"ConnectionState.NegotiatedProtocolIsMutual", Field, 0},
|
||||
|
|
@ -925,6 +931,8 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"ECDSAWithP384AndSHA384", Const, 8},
|
||||
{"ECDSAWithP521AndSHA512", Const, 8},
|
||||
{"ECDSAWithSHA1", Const, 10},
|
||||
{"ECHRejectionError", Type, 23},
|
||||
{"ECHRejectionError.RetryConfigList", Field, 23},
|
||||
{"Ed25519", Const, 13},
|
||||
{"InsecureCipherSuites", Func, 14},
|
||||
{"Listen", Func, 0},
|
||||
|
|
@ -943,6 +951,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"ParseSessionState", Func, 21},
|
||||
{"QUICClient", Func, 21},
|
||||
{"QUICConfig", Type, 21},
|
||||
{"QUICConfig.EnableStoreSessionEvent", Field, 23},
|
||||
{"QUICConfig.TLSConfig", Field, 21},
|
||||
{"QUICConn", Type, 21},
|
||||
{"QUICEncryptionLevel", Type, 21},
|
||||
|
|
@ -954,16 +963,20 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"QUICEvent.Data", Field, 21},
|
||||
{"QUICEvent.Kind", Field, 21},
|
||||
{"QUICEvent.Level", Field, 21},
|
||||
{"QUICEvent.SessionState", Field, 23},
|
||||
{"QUICEvent.Suite", Field, 21},
|
||||
{"QUICEventKind", Type, 21},
|
||||
{"QUICHandshakeDone", Const, 21},
|
||||
{"QUICNoEvent", Const, 21},
|
||||
{"QUICRejectedEarlyData", Const, 21},
|
||||
{"QUICResumeSession", Const, 23},
|
||||
{"QUICServer", Func, 21},
|
||||
{"QUICSessionTicketOptions", Type, 21},
|
||||
{"QUICSessionTicketOptions.EarlyData", Field, 21},
|
||||
{"QUICSessionTicketOptions.Extra", Field, 23},
|
||||
{"QUICSetReadSecret", Const, 21},
|
||||
{"QUICSetWriteSecret", Const, 21},
|
||||
{"QUICStoreSession", Const, 23},
|
||||
{"QUICTransportParameters", Const, 21},
|
||||
{"QUICTransportParametersRequired", Const, 21},
|
||||
{"QUICWriteData", Const, 21},
|
||||
|
|
@ -1036,6 +1049,8 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"(*Certificate).Verify", Method, 0},
|
||||
{"(*Certificate).VerifyHostname", Method, 0},
|
||||
{"(*CertificateRequest).CheckSignature", Method, 5},
|
||||
{"(*OID).UnmarshalBinary", Method, 23},
|
||||
{"(*OID).UnmarshalText", Method, 23},
|
||||
{"(*RevocationList).CheckSignatureFrom", Method, 19},
|
||||
{"(CertificateInvalidError).Error", Method, 0},
|
||||
{"(ConstraintViolationError).Error", Method, 0},
|
||||
|
|
@ -1043,6 +1058,8 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"(InsecureAlgorithmError).Error", Method, 6},
|
||||
{"(OID).Equal", Method, 22},
|
||||
{"(OID).EqualASN1OID", Method, 22},
|
||||
{"(OID).MarshalBinary", Method, 23},
|
||||
{"(OID).MarshalText", Method, 23},
|
||||
{"(OID).String", Method, 22},
|
||||
{"(PublicKeyAlgorithm).String", Method, 10},
|
||||
{"(SignatureAlgorithm).String", Method, 6},
|
||||
|
|
@ -1196,6 +1213,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"ParseCertificates", Func, 0},
|
||||
{"ParseDERCRL", Func, 0},
|
||||
{"ParseECPrivateKey", Func, 1},
|
||||
{"ParseOID", Func, 23},
|
||||
{"ParsePKCS1PrivateKey", Func, 0},
|
||||
{"ParsePKCS1PublicKey", Func, 10},
|
||||
{"ParsePKCS8PrivateKey", Func, 0},
|
||||
|
|
@ -2541,6 +2559,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"PT_NOTE", Const, 0},
|
||||
{"PT_NULL", Const, 0},
|
||||
{"PT_OPENBSD_BOOTDATA", Const, 16},
|
||||
{"PT_OPENBSD_NOBTCFI", Const, 23},
|
||||
{"PT_OPENBSD_RANDOMIZE", Const, 16},
|
||||
{"PT_OPENBSD_WXNEEDED", Const, 16},
|
||||
{"PT_PAX_FLAGS", Const, 16},
|
||||
|
|
@ -3620,13 +3639,16 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"STT_COMMON", Const, 0},
|
||||
{"STT_FILE", Const, 0},
|
||||
{"STT_FUNC", Const, 0},
|
||||
{"STT_GNU_IFUNC", Const, 23},
|
||||
{"STT_HIOS", Const, 0},
|
||||
{"STT_HIPROC", Const, 0},
|
||||
{"STT_LOOS", Const, 0},
|
||||
{"STT_LOPROC", Const, 0},
|
||||
{"STT_NOTYPE", Const, 0},
|
||||
{"STT_OBJECT", Const, 0},
|
||||
{"STT_RELC", Const, 23},
|
||||
{"STT_SECTION", Const, 0},
|
||||
{"STT_SRELC", Const, 23},
|
||||
{"STT_TLS", Const, 0},
|
||||
{"STV_DEFAULT", Const, 0},
|
||||
{"STV_HIDDEN", Const, 0},
|
||||
|
|
@ -4544,11 +4566,14 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"URLEncoding", Var, 0},
|
||||
},
|
||||
"encoding/binary": {
|
||||
{"Append", Func, 23},
|
||||
{"AppendByteOrder", Type, 19},
|
||||
{"AppendUvarint", Func, 19},
|
||||
{"AppendVarint", Func, 19},
|
||||
{"BigEndian", Var, 0},
|
||||
{"ByteOrder", Type, 0},
|
||||
{"Decode", Func, 23},
|
||||
{"Encode", Func, 23},
|
||||
{"LittleEndian", Var, 0},
|
||||
{"MaxVarintLen16", Const, 0},
|
||||
{"MaxVarintLen32", Const, 0},
|
||||
|
|
@ -5308,6 +5333,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"ParenExpr.Rparen", Field, 0},
|
||||
{"ParenExpr.X", Field, 0},
|
||||
{"Pkg", Const, 0},
|
||||
{"Preorder", Func, 23},
|
||||
{"Print", Func, 0},
|
||||
{"RECV", Const, 0},
|
||||
{"RangeStmt", Type, 0},
|
||||
|
|
@ -5898,7 +5924,12 @@ var PackageSymbols = map[string][]Symbol{
|
|||
},
|
||||
"go/types": {
|
||||
{"(*Alias).Obj", Method, 22},
|
||||
{"(*Alias).Origin", Method, 23},
|
||||
{"(*Alias).Rhs", Method, 23},
|
||||
{"(*Alias).SetTypeParams", Method, 23},
|
||||
{"(*Alias).String", Method, 22},
|
||||
{"(*Alias).TypeArgs", Method, 23},
|
||||
{"(*Alias).TypeParams", Method, 23},
|
||||
{"(*Alias).Underlying", Method, 22},
|
||||
{"(*ArgumentError).Error", Method, 18},
|
||||
{"(*ArgumentError).Unwrap", Method, 18},
|
||||
|
|
@ -5943,6 +5974,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"(*Func).Pkg", Method, 5},
|
||||
{"(*Func).Pos", Method, 5},
|
||||
{"(*Func).Scope", Method, 5},
|
||||
{"(*Func).Signature", Method, 23},
|
||||
{"(*Func).String", Method, 5},
|
||||
{"(*Func).Type", Method, 5},
|
||||
{"(*Info).ObjectOf", Method, 5},
|
||||
|
|
@ -6992,6 +7024,12 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"TempFile", Func, 0},
|
||||
{"WriteFile", Func, 0},
|
||||
},
|
||||
"iter": {
|
||||
{"Pull", Func, 23},
|
||||
{"Pull2", Func, 23},
|
||||
{"Seq", Type, 23},
|
||||
{"Seq2", Type, 23},
|
||||
},
|
||||
"log": {
|
||||
{"(*Logger).Fatal", Method, 0},
|
||||
{"(*Logger).Fatalf", Method, 0},
|
||||
|
|
@ -7222,11 +7260,16 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"Writer", Type, 0},
|
||||
},
|
||||
"maps": {
|
||||
{"All", Func, 23},
|
||||
{"Clone", Func, 21},
|
||||
{"Collect", Func, 23},
|
||||
{"Copy", Func, 21},
|
||||
{"DeleteFunc", Func, 21},
|
||||
{"Equal", Func, 21},
|
||||
{"EqualFunc", Func, 21},
|
||||
{"Insert", Func, 23},
|
||||
{"Keys", Func, 23},
|
||||
{"Values", Func, 23},
|
||||
},
|
||||
"math": {
|
||||
{"Abs", Func, 0},
|
||||
|
|
@ -7617,6 +7660,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
},
|
||||
"math/rand/v2": {
|
||||
{"(*ChaCha8).MarshalBinary", Method, 22},
|
||||
{"(*ChaCha8).Read", Method, 23},
|
||||
{"(*ChaCha8).Seed", Method, 22},
|
||||
{"(*ChaCha8).Uint64", Method, 22},
|
||||
{"(*ChaCha8).UnmarshalBinary", Method, 22},
|
||||
|
|
@ -7636,6 +7680,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"(*Rand).NormFloat64", Method, 22},
|
||||
{"(*Rand).Perm", Method, 22},
|
||||
{"(*Rand).Shuffle", Method, 22},
|
||||
{"(*Rand).Uint", Method, 23},
|
||||
{"(*Rand).Uint32", Method, 22},
|
||||
{"(*Rand).Uint32N", Method, 22},
|
||||
{"(*Rand).Uint64", Method, 22},
|
||||
|
|
@ -7663,6 +7708,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"Rand", Type, 22},
|
||||
{"Shuffle", Func, 22},
|
||||
{"Source", Type, 22},
|
||||
{"Uint", Func, 23},
|
||||
{"Uint32", Func, 22},
|
||||
{"Uint32N", Func, 22},
|
||||
{"Uint64", Func, 22},
|
||||
|
|
@ -7743,6 +7789,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"(*DNSError).Error", Method, 0},
|
||||
{"(*DNSError).Temporary", Method, 0},
|
||||
{"(*DNSError).Timeout", Method, 0},
|
||||
{"(*DNSError).Unwrap", Method, 23},
|
||||
{"(*Dialer).Dial", Method, 1},
|
||||
{"(*Dialer).DialContext", Method, 7},
|
||||
{"(*Dialer).MultipathTCP", Method, 21},
|
||||
|
|
@ -7809,6 +7856,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"(*TCPConn).RemoteAddr", Method, 0},
|
||||
{"(*TCPConn).SetDeadline", Method, 0},
|
||||
{"(*TCPConn).SetKeepAlive", Method, 0},
|
||||
{"(*TCPConn).SetKeepAliveConfig", Method, 23},
|
||||
{"(*TCPConn).SetKeepAlivePeriod", Method, 2},
|
||||
{"(*TCPConn).SetLinger", Method, 0},
|
||||
{"(*TCPConn).SetNoDelay", Method, 0},
|
||||
|
|
@ -7922,6 +7970,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"DNSError.IsTimeout", Field, 0},
|
||||
{"DNSError.Name", Field, 0},
|
||||
{"DNSError.Server", Field, 0},
|
||||
{"DNSError.UnwrapErr", Field, 23},
|
||||
{"DefaultResolver", Var, 8},
|
||||
{"Dial", Func, 0},
|
||||
{"DialIP", Func, 0},
|
||||
|
|
@ -7937,6 +7986,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"Dialer.DualStack", Field, 2},
|
||||
{"Dialer.FallbackDelay", Field, 5},
|
||||
{"Dialer.KeepAlive", Field, 3},
|
||||
{"Dialer.KeepAliveConfig", Field, 23},
|
||||
{"Dialer.LocalAddr", Field, 1},
|
||||
{"Dialer.Resolver", Field, 8},
|
||||
{"Dialer.Timeout", Field, 1},
|
||||
|
|
@ -7989,10 +8039,16 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"Interfaces", Func, 0},
|
||||
{"InvalidAddrError", Type, 0},
|
||||
{"JoinHostPort", Func, 0},
|
||||
{"KeepAliveConfig", Type, 23},
|
||||
{"KeepAliveConfig.Count", Field, 23},
|
||||
{"KeepAliveConfig.Enable", Field, 23},
|
||||
{"KeepAliveConfig.Idle", Field, 23},
|
||||
{"KeepAliveConfig.Interval", Field, 23},
|
||||
{"Listen", Func, 0},
|
||||
{"ListenConfig", Type, 11},
|
||||
{"ListenConfig.Control", Field, 11},
|
||||
{"ListenConfig.KeepAlive", Field, 13},
|
||||
{"ListenConfig.KeepAliveConfig", Field, 23},
|
||||
{"ListenIP", Func, 0},
|
||||
{"ListenMulticastUDP", Func, 0},
|
||||
{"ListenPacket", Func, 0},
|
||||
|
|
@ -8081,6 +8137,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"(*Request).Context", Method, 7},
|
||||
{"(*Request).Cookie", Method, 0},
|
||||
{"(*Request).Cookies", Method, 0},
|
||||
{"(*Request).CookiesNamed", Method, 23},
|
||||
{"(*Request).FormFile", Method, 0},
|
||||
{"(*Request).FormValue", Method, 0},
|
||||
{"(*Request).MultipartReader", Method, 0},
|
||||
|
|
@ -8148,7 +8205,9 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"Cookie.HttpOnly", Field, 0},
|
||||
{"Cookie.MaxAge", Field, 0},
|
||||
{"Cookie.Name", Field, 0},
|
||||
{"Cookie.Partitioned", Field, 23},
|
||||
{"Cookie.Path", Field, 0},
|
||||
{"Cookie.Quoted", Field, 23},
|
||||
{"Cookie.Raw", Field, 0},
|
||||
{"Cookie.RawExpires", Field, 0},
|
||||
{"Cookie.SameSite", Field, 11},
|
||||
|
|
@ -8225,7 +8284,9 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"NoBody", Var, 8},
|
||||
{"NotFound", Func, 0},
|
||||
{"NotFoundHandler", Func, 0},
|
||||
{"ParseCookie", Func, 23},
|
||||
{"ParseHTTPVersion", Func, 0},
|
||||
{"ParseSetCookie", Func, 23},
|
||||
{"ParseTime", Func, 1},
|
||||
{"Post", Func, 0},
|
||||
{"PostForm", Func, 0},
|
||||
|
|
@ -8252,6 +8313,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"Request.Host", Field, 0},
|
||||
{"Request.Method", Field, 0},
|
||||
{"Request.MultipartForm", Field, 0},
|
||||
{"Request.Pattern", Field, 23},
|
||||
{"Request.PostForm", Field, 1},
|
||||
{"Request.Proto", Field, 0},
|
||||
{"Request.ProtoMajor", Field, 0},
|
||||
|
|
@ -8453,6 +8515,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"DefaultRemoteAddr", Const, 0},
|
||||
{"NewRecorder", Func, 0},
|
||||
{"NewRequest", Func, 7},
|
||||
{"NewRequestWithContext", Func, 23},
|
||||
{"NewServer", Func, 0},
|
||||
{"NewTLSServer", Func, 0},
|
||||
{"NewUnstartedServer", Func, 0},
|
||||
|
|
@ -8917,6 +8980,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"Chown", Func, 0},
|
||||
{"Chtimes", Func, 0},
|
||||
{"Clearenv", Func, 0},
|
||||
{"CopyFS", Func, 23},
|
||||
{"Create", Func, 0},
|
||||
{"CreateTemp", Func, 16},
|
||||
{"DevNull", Const, 0},
|
||||
|
|
@ -9150,6 +9214,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"IsLocal", Func, 20},
|
||||
{"Join", Func, 0},
|
||||
{"ListSeparator", Const, 0},
|
||||
{"Localize", Func, 23},
|
||||
{"Match", Func, 0},
|
||||
{"Rel", Func, 0},
|
||||
{"Separator", Const, 0},
|
||||
|
|
@ -9232,6 +9297,8 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"(Value).Pointer", Method, 0},
|
||||
{"(Value).Recv", Method, 0},
|
||||
{"(Value).Send", Method, 0},
|
||||
{"(Value).Seq", Method, 23},
|
||||
{"(Value).Seq2", Method, 23},
|
||||
{"(Value).Set", Method, 0},
|
||||
{"(Value).SetBool", Method, 0},
|
||||
{"(Value).SetBytes", Method, 0},
|
||||
|
|
@ -9314,6 +9381,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"SelectSend", Const, 1},
|
||||
{"SendDir", Const, 0},
|
||||
{"Slice", Const, 0},
|
||||
{"SliceAt", Func, 23},
|
||||
{"SliceHeader", Type, 0},
|
||||
{"SliceHeader.Cap", Field, 0},
|
||||
{"SliceHeader.Data", Field, 0},
|
||||
|
|
@ -9655,6 +9723,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"BuildSetting", Type, 18},
|
||||
{"BuildSetting.Key", Field, 18},
|
||||
{"BuildSetting.Value", Field, 18},
|
||||
{"CrashOptions", Type, 23},
|
||||
{"FreeOSMemory", Func, 1},
|
||||
{"GCStats", Type, 1},
|
||||
{"GCStats.LastGC", Field, 1},
|
||||
|
|
@ -9672,6 +9741,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"PrintStack", Func, 0},
|
||||
{"ReadBuildInfo", Func, 12},
|
||||
{"ReadGCStats", Func, 1},
|
||||
{"SetCrashOutput", Func, 23},
|
||||
{"SetGCPercent", Func, 1},
|
||||
{"SetMaxStack", Func, 2},
|
||||
{"SetMaxThreads", Func, 2},
|
||||
|
|
@ -9742,10 +9812,15 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"WithRegion", Func, 11},
|
||||
},
|
||||
"slices": {
|
||||
{"All", Func, 23},
|
||||
{"AppendSeq", Func, 23},
|
||||
{"Backward", Func, 23},
|
||||
{"BinarySearch", Func, 21},
|
||||
{"BinarySearchFunc", Func, 21},
|
||||
{"Chunk", Func, 23},
|
||||
{"Clip", Func, 21},
|
||||
{"Clone", Func, 21},
|
||||
{"Collect", Func, 23},
|
||||
{"Compact", Func, 21},
|
||||
{"CompactFunc", Func, 21},
|
||||
{"Compare", Func, 21},
|
||||
|
|
@ -9767,11 +9842,16 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"MaxFunc", Func, 21},
|
||||
{"Min", Func, 21},
|
||||
{"MinFunc", Func, 21},
|
||||
{"Repeat", Func, 23},
|
||||
{"Replace", Func, 21},
|
||||
{"Reverse", Func, 21},
|
||||
{"Sort", Func, 21},
|
||||
{"SortFunc", Func, 21},
|
||||
{"SortStableFunc", Func, 21},
|
||||
{"Sorted", Func, 23},
|
||||
{"SortedFunc", Func, 23},
|
||||
{"SortedStableFunc", Func, 23},
|
||||
{"Values", Func, 23},
|
||||
},
|
||||
"sort": {
|
||||
{"(Float64Slice).Len", Method, 0},
|
||||
|
|
@ -9936,10 +10016,14 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"TrimSpace", Func, 0},
|
||||
{"TrimSuffix", Func, 1},
|
||||
},
|
||||
"structs": {
|
||||
{"HostLayout", Type, 23},
|
||||
},
|
||||
"sync": {
|
||||
{"(*Cond).Broadcast", Method, 0},
|
||||
{"(*Cond).Signal", Method, 0},
|
||||
{"(*Cond).Wait", Method, 0},
|
||||
{"(*Map).Clear", Method, 23},
|
||||
{"(*Map).CompareAndDelete", Method, 20},
|
||||
{"(*Map).CompareAndSwap", Method, 20},
|
||||
{"(*Map).Delete", Method, 9},
|
||||
|
|
@ -9986,13 +10070,17 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"(*Bool).Store", Method, 19},
|
||||
{"(*Bool).Swap", Method, 19},
|
||||
{"(*Int32).Add", Method, 19},
|
||||
{"(*Int32).And", Method, 23},
|
||||
{"(*Int32).CompareAndSwap", Method, 19},
|
||||
{"(*Int32).Load", Method, 19},
|
||||
{"(*Int32).Or", Method, 23},
|
||||
{"(*Int32).Store", Method, 19},
|
||||
{"(*Int32).Swap", Method, 19},
|
||||
{"(*Int64).Add", Method, 19},
|
||||
{"(*Int64).And", Method, 23},
|
||||
{"(*Int64).CompareAndSwap", Method, 19},
|
||||
{"(*Int64).Load", Method, 19},
|
||||
{"(*Int64).Or", Method, 23},
|
||||
{"(*Int64).Store", Method, 19},
|
||||
{"(*Int64).Swap", Method, 19},
|
||||
{"(*Pointer).CompareAndSwap", Method, 19},
|
||||
|
|
@ -10000,18 +10088,24 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"(*Pointer).Store", Method, 19},
|
||||
{"(*Pointer).Swap", Method, 19},
|
||||
{"(*Uint32).Add", Method, 19},
|
||||
{"(*Uint32).And", Method, 23},
|
||||
{"(*Uint32).CompareAndSwap", Method, 19},
|
||||
{"(*Uint32).Load", Method, 19},
|
||||
{"(*Uint32).Or", Method, 23},
|
||||
{"(*Uint32).Store", Method, 19},
|
||||
{"(*Uint32).Swap", Method, 19},
|
||||
{"(*Uint64).Add", Method, 19},
|
||||
{"(*Uint64).And", Method, 23},
|
||||
{"(*Uint64).CompareAndSwap", Method, 19},
|
||||
{"(*Uint64).Load", Method, 19},
|
||||
{"(*Uint64).Or", Method, 23},
|
||||
{"(*Uint64).Store", Method, 19},
|
||||
{"(*Uint64).Swap", Method, 19},
|
||||
{"(*Uintptr).Add", Method, 19},
|
||||
{"(*Uintptr).And", Method, 23},
|
||||
{"(*Uintptr).CompareAndSwap", Method, 19},
|
||||
{"(*Uintptr).Load", Method, 19},
|
||||
{"(*Uintptr).Or", Method, 23},
|
||||
{"(*Uintptr).Store", Method, 19},
|
||||
{"(*Uintptr).Swap", Method, 19},
|
||||
{"(*Value).CompareAndSwap", Method, 17},
|
||||
|
|
@ -10023,6 +10117,11 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"AddUint32", Func, 0},
|
||||
{"AddUint64", Func, 0},
|
||||
{"AddUintptr", Func, 0},
|
||||
{"AndInt32", Func, 23},
|
||||
{"AndInt64", Func, 23},
|
||||
{"AndUint32", Func, 23},
|
||||
{"AndUint64", Func, 23},
|
||||
{"AndUintptr", Func, 23},
|
||||
{"Bool", Type, 19},
|
||||
{"CompareAndSwapInt32", Func, 0},
|
||||
{"CompareAndSwapInt64", Func, 0},
|
||||
|
|
@ -10038,6 +10137,11 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"LoadUint32", Func, 0},
|
||||
{"LoadUint64", Func, 0},
|
||||
{"LoadUintptr", Func, 0},
|
||||
{"OrInt32", Func, 23},
|
||||
{"OrInt64", Func, 23},
|
||||
{"OrUint32", Func, 23},
|
||||
{"OrUint64", Func, 23},
|
||||
{"OrUintptr", Func, 23},
|
||||
{"Pointer", Type, 19},
|
||||
{"StoreInt32", Func, 0},
|
||||
{"StoreInt64", Func, 0},
|
||||
|
|
@ -16200,6 +16304,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"WSAEACCES", Const, 2},
|
||||
{"WSAECONNABORTED", Const, 9},
|
||||
{"WSAECONNRESET", Const, 3},
|
||||
{"WSAENOPROTOOPT", Const, 23},
|
||||
{"WSAEnumProtocols", Func, 2},
|
||||
{"WSAID_CONNECTEX", Var, 1},
|
||||
{"WSAIoctl", Func, 0},
|
||||
|
|
@ -17284,6 +17389,7 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"Encode", Func, 0},
|
||||
{"EncodeRune", Func, 0},
|
||||
{"IsSurrogate", Func, 0},
|
||||
{"RuneLen", Func, 23},
|
||||
},
|
||||
"unicode/utf8": {
|
||||
{"AppendRune", Func, 18},
|
||||
|
|
@ -17306,6 +17412,11 @@ var PackageSymbols = map[string][]Symbol{
|
|||
{"ValidRune", Func, 1},
|
||||
{"ValidString", Func, 0},
|
||||
},
|
||||
"unique": {
|
||||
{"(Handle).Value", Method, 23},
|
||||
{"Handle", Type, 23},
|
||||
{"Make", Func, 23},
|
||||
},
|
||||
"unsafe": {
|
||||
{"Add", Func, 0},
|
||||
{"Alignof", Func, 0},
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ RPC framework that puts mobile and HTTP/2 first. For more information see the
|
|||
|
||||
## Prerequisites
|
||||
|
||||
- **[Go][]**: any one of the **three latest major** [releases][go-releases].
|
||||
- **[Go][]**: any one of the **two latest major** [releases][go-releases].
|
||||
|
||||
## Installation
|
||||
|
||||
|
|
|
|||
|
|
@ -16,25 +16,35 @@
|
|||
*
|
||||
*/
|
||||
|
||||
package grpc
|
||||
// Package pickfirst contains the pick_first load balancing policy.
|
||||
package pickfirst
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"math/rand"
|
||||
|
||||
"google.golang.org/grpc/balancer"
|
||||
"google.golang.org/grpc/connectivity"
|
||||
"google.golang.org/grpc/grpclog"
|
||||
"google.golang.org/grpc/internal"
|
||||
internalgrpclog "google.golang.org/grpc/internal/grpclog"
|
||||
"google.golang.org/grpc/internal/grpcrand"
|
||||
"google.golang.org/grpc/internal/pretty"
|
||||
"google.golang.org/grpc/resolver"
|
||||
"google.golang.org/grpc/serviceconfig"
|
||||
)
|
||||
|
||||
func init() {
|
||||
balancer.Register(pickfirstBuilder{})
|
||||
internal.ShuffleAddressListForTesting = func(n int, swap func(i, j int)) { rand.Shuffle(n, swap) }
|
||||
}
|
||||
|
||||
var logger = grpclog.Component("pick-first-lb")
|
||||
|
||||
const (
|
||||
// PickFirstBalancerName is the name of the pick_first balancer.
|
||||
PickFirstBalancerName = "pick_first"
|
||||
// Name is the name of the pick_first balancer.
|
||||
Name = "pick_first"
|
||||
logPrefix = "[pick-first-lb %p] "
|
||||
)
|
||||
|
||||
|
|
@ -47,7 +57,7 @@ func (pickfirstBuilder) Build(cc balancer.ClientConn, opt balancer.BuildOptions)
|
|||
}
|
||||
|
||||
func (pickfirstBuilder) Name() string {
|
||||
return PickFirstBalancerName
|
||||
return Name
|
||||
}
|
||||
|
||||
type pfConfig struct {
|
||||
|
|
@ -93,6 +103,12 @@ func (b *pickfirstBalancer) ResolverError(err error) {
|
|||
})
|
||||
}
|
||||
|
||||
type Shuffler interface {
|
||||
ShuffleAddressListForTesting(n int, swap func(i, j int))
|
||||
}
|
||||
|
||||
func ShuffleAddressListForTesting(n int, swap func(i, j int)) { rand.Shuffle(n, swap) }
|
||||
|
||||
func (b *pickfirstBalancer) UpdateClientConnState(state balancer.ClientConnState) error {
|
||||
if len(state.ResolverState.Addresses) == 0 && len(state.ResolverState.Endpoints) == 0 {
|
||||
// The resolver reported an empty address list. Treat it like an error by
|
||||
|
|
@ -124,7 +140,7 @@ func (b *pickfirstBalancer) UpdateClientConnState(state balancer.ClientConnState
|
|||
// within each endpoint. - A61
|
||||
if cfg.ShuffleAddressList {
|
||||
endpoints = append([]resolver.Endpoint{}, endpoints...)
|
||||
grpcrand.Shuffle(len(endpoints), func(i, j int) { endpoints[i], endpoints[j] = endpoints[j], endpoints[i] })
|
||||
internal.ShuffleAddressListForTesting.(func(int, func(int, int)))(len(endpoints), func(i, j int) { endpoints[i], endpoints[j] = endpoints[j], endpoints[i] })
|
||||
}
|
||||
|
||||
// "Flatten the list by concatenating the ordered list of addresses for each
|
||||
|
|
@ -145,7 +161,7 @@ func (b *pickfirstBalancer) UpdateClientConnState(state balancer.ClientConnState
|
|||
addrs = state.ResolverState.Addresses
|
||||
if cfg.ShuffleAddressList {
|
||||
addrs = append([]resolver.Address{}, addrs...)
|
||||
grpcrand.Shuffle(len(addrs), func(i, j int) { addrs[i], addrs[j] = addrs[j], addrs[i] })
|
||||
rand.Shuffle(len(addrs), func(i, j int) { addrs[i], addrs[j] = addrs[j], addrs[i] })
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -22,12 +22,12 @@
|
|||
package roundrobin
|
||||
|
||||
import (
|
||||
"math/rand"
|
||||
"sync/atomic"
|
||||
|
||||
"google.golang.org/grpc/balancer"
|
||||
"google.golang.org/grpc/balancer/base"
|
||||
"google.golang.org/grpc/grpclog"
|
||||
"google.golang.org/grpc/internal/grpcrand"
|
||||
)
|
||||
|
||||
// Name is the name of round_robin balancer.
|
||||
|
|
@ -60,7 +60,7 @@ func (*rrPickerBuilder) Build(info base.PickerBuildInfo) balancer.Picker {
|
|||
// Start at a random index, as the same RR balancer rebuilds a new
|
||||
// picker when SubConn states change, and we don't want to apply excess
|
||||
// load to the first server in the list.
|
||||
next: uint32(grpcrand.Intn(len(scs))),
|
||||
next: uint32(rand.Intn(len(scs))),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -198,6 +198,10 @@ func (ccb *ccBalancerWrapper) UpdateAddresses(sc balancer.SubConn, addrs []resol
|
|||
func (ccb *ccBalancerWrapper) UpdateState(s balancer.State) {
|
||||
ccb.cc.mu.Lock()
|
||||
defer ccb.cc.mu.Unlock()
|
||||
if ccb.cc.conns == nil {
|
||||
// The CC has been closed; ignore this update.
|
||||
return
|
||||
}
|
||||
|
||||
ccb.mu.Lock()
|
||||
if ccb.closed {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||
// versions:
|
||||
// protoc-gen-go v1.33.0
|
||||
// protoc-gen-go v1.34.1
|
||||
// protoc v4.25.2
|
||||
// source: grpc/binlog/v1/binarylog.proto
|
||||
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ import (
|
|||
|
||||
"google.golang.org/grpc/balancer"
|
||||
"google.golang.org/grpc/balancer/base"
|
||||
"google.golang.org/grpc/balancer/pickfirst"
|
||||
"google.golang.org/grpc/codes"
|
||||
"google.golang.org/grpc/connectivity"
|
||||
"google.golang.org/grpc/internal"
|
||||
|
|
@ -72,6 +73,8 @@ var (
|
|||
// invalidDefaultServiceConfigErrPrefix is used to prefix the json parsing error for the default
|
||||
// service config.
|
||||
invalidDefaultServiceConfigErrPrefix = "grpc: the provided default service config is invalid"
|
||||
// PickFirstBalancerName is the name of the pick_first balancer.
|
||||
PickFirstBalancerName = pickfirst.Name
|
||||
)
|
||||
|
||||
// The following errors are returned from Dial and DialContext
|
||||
|
|
@ -152,6 +155,16 @@ func NewClient(target string, opts ...DialOption) (conn *ClientConn, err error)
|
|||
for _, opt := range opts {
|
||||
opt.apply(&cc.dopts)
|
||||
}
|
||||
|
||||
// Determine the resolver to use.
|
||||
if err := cc.initParsedTargetAndResolverBuilder(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for _, opt := range globalPerTargetDialOptions {
|
||||
opt.DialOptionForTarget(cc.parsedTarget.URL).apply(&cc.dopts)
|
||||
}
|
||||
|
||||
chainUnaryClientInterceptors(cc)
|
||||
chainStreamClientInterceptors(cc)
|
||||
|
||||
|
|
@ -160,7 +173,7 @@ func NewClient(target string, opts ...DialOption) (conn *ClientConn, err error)
|
|||
}
|
||||
|
||||
if cc.dopts.defaultServiceConfigRawJSON != nil {
|
||||
scpr := parseServiceConfig(*cc.dopts.defaultServiceConfigRawJSON)
|
||||
scpr := parseServiceConfig(*cc.dopts.defaultServiceConfigRawJSON, cc.dopts.maxCallAttempts)
|
||||
if scpr.Err != nil {
|
||||
return nil, fmt.Errorf("%s: %v", invalidDefaultServiceConfigErrPrefix, scpr.Err)
|
||||
}
|
||||
|
|
@ -168,24 +181,15 @@ func NewClient(target string, opts ...DialOption) (conn *ClientConn, err error)
|
|||
}
|
||||
cc.mkp = cc.dopts.copts.KeepaliveParams
|
||||
|
||||
// Register ClientConn with channelz.
|
||||
if err = cc.initAuthority(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Register ClientConn with channelz. Note that this is only done after
|
||||
// channel creation cannot fail.
|
||||
cc.channelzRegistration(target)
|
||||
|
||||
// TODO: Ideally it should be impossible to error from this function after
|
||||
// channelz registration. This will require removing some channelz logs
|
||||
// from the following functions that can error. Errors can be returned to
|
||||
// the user, and successful logs can be emitted here, after the checks have
|
||||
// passed and channelz is subsequently registered.
|
||||
|
||||
// Determine the resolver to use.
|
||||
if err := cc.parseTargetAndFindResolver(); err != nil {
|
||||
channelz.RemoveEntry(cc.channelz.ID)
|
||||
return nil, err
|
||||
}
|
||||
if err = cc.determineAuthority(); err != nil {
|
||||
channelz.RemoveEntry(cc.channelz.ID)
|
||||
return nil, err
|
||||
}
|
||||
channelz.Infof(logger, cc.channelz, "parsed dial target is: %#v", cc.parsedTarget)
|
||||
channelz.Infof(logger, cc.channelz, "Channel authority set to %q", cc.authority)
|
||||
|
||||
cc.csMgr = newConnectivityStateManager(cc.ctx, cc.channelz)
|
||||
cc.pickerWrapper = newPickerWrapper(cc.dopts.copts.StatsHandlers)
|
||||
|
|
@ -587,11 +591,11 @@ type ClientConn struct {
|
|||
|
||||
// The following are initialized at dial time, and are read-only after that.
|
||||
target string // User's dial target.
|
||||
parsedTarget resolver.Target // See parseTargetAndFindResolver().
|
||||
authority string // See determineAuthority().
|
||||
parsedTarget resolver.Target // See initParsedTargetAndResolverBuilder().
|
||||
authority string // See initAuthority().
|
||||
dopts dialOptions // Default and user specified dial options.
|
||||
channelz *channelz.Channel // Channelz object.
|
||||
resolverBuilder resolver.Builder // See parseTargetAndFindResolver().
|
||||
resolverBuilder resolver.Builder // See initParsedTargetAndResolverBuilder().
|
||||
idlenessMgr *idle.Manager
|
||||
|
||||
// The following provide their own synchronization, and therefore don't
|
||||
|
|
@ -692,8 +696,7 @@ func (cc *ClientConn) waitForResolvedAddrs(ctx context.Context) error {
|
|||
var emptyServiceConfig *ServiceConfig
|
||||
|
||||
func init() {
|
||||
balancer.Register(pickfirstBuilder{})
|
||||
cfg := parseServiceConfig("{}")
|
||||
cfg := parseServiceConfig("{}", defaultMaxCallAttempts)
|
||||
if cfg.Err != nil {
|
||||
panic(fmt.Sprintf("impossible error parsing empty service config: %v", cfg.Err))
|
||||
}
|
||||
|
|
@ -1673,22 +1676,19 @@ func (cc *ClientConn) connectionError() error {
|
|||
return cc.lastConnectionError
|
||||
}
|
||||
|
||||
// parseTargetAndFindResolver parses the user's dial target and stores the
|
||||
// parsed target in `cc.parsedTarget`.
|
||||
// initParsedTargetAndResolverBuilder parses the user's dial target and stores
|
||||
// the parsed target in `cc.parsedTarget`.
|
||||
//
|
||||
// The resolver to use is determined based on the scheme in the parsed target
|
||||
// and the same is stored in `cc.resolverBuilder`.
|
||||
//
|
||||
// Doesn't grab cc.mu as this method is expected to be called only at Dial time.
|
||||
func (cc *ClientConn) parseTargetAndFindResolver() error {
|
||||
channelz.Infof(logger, cc.channelz, "original dial target is: %q", cc.target)
|
||||
func (cc *ClientConn) initParsedTargetAndResolverBuilder() error {
|
||||
logger.Infof("original dial target is: %q", cc.target)
|
||||
|
||||
var rb resolver.Builder
|
||||
parsedTarget, err := parseTarget(cc.target)
|
||||
if err != nil {
|
||||
channelz.Infof(logger, cc.channelz, "dial target %q parse failed: %v", cc.target, err)
|
||||
} else {
|
||||
channelz.Infof(logger, cc.channelz, "parsed dial target is: %#v", parsedTarget)
|
||||
if err == nil {
|
||||
rb = cc.getResolver(parsedTarget.URL.Scheme)
|
||||
if rb != nil {
|
||||
cc.parsedTarget = parsedTarget
|
||||
|
|
@ -1707,15 +1707,12 @@ func (cc *ClientConn) parseTargetAndFindResolver() error {
|
|||
defScheme = resolver.GetDefaultScheme()
|
||||
}
|
||||
|
||||
channelz.Infof(logger, cc.channelz, "fallback to scheme %q", defScheme)
|
||||
canonicalTarget := defScheme + ":///" + cc.target
|
||||
|
||||
parsedTarget, err = parseTarget(canonicalTarget)
|
||||
if err != nil {
|
||||
channelz.Infof(logger, cc.channelz, "dial target %q parse failed: %v", canonicalTarget, err)
|
||||
return err
|
||||
}
|
||||
channelz.Infof(logger, cc.channelz, "parsed dial target is: %+v", parsedTarget)
|
||||
rb = cc.getResolver(parsedTarget.URL.Scheme)
|
||||
if rb == nil {
|
||||
return fmt.Errorf("could not get resolver for default scheme: %q", parsedTarget.URL.Scheme)
|
||||
|
|
@ -1805,7 +1802,7 @@ func encodeAuthority(authority string) string {
|
|||
// credentials do not match the authority configured through the dial option.
|
||||
//
|
||||
// Doesn't grab cc.mu as this method is expected to be called only at Dial time.
|
||||
func (cc *ClientConn) determineAuthority() error {
|
||||
func (cc *ClientConn) initAuthority() error {
|
||||
dopts := cc.dopts
|
||||
// Historically, we had two options for users to specify the serverName or
|
||||
// authority for a channel. One was through the transport credentials
|
||||
|
|
@ -1838,6 +1835,5 @@ func (cc *ClientConn) determineAuthority() error {
|
|||
} else {
|
||||
cc.authority = encodeAuthority(endpoint)
|
||||
}
|
||||
channelz.Infof(logger, cc.channelz, "Channel authority set to %q", cc.authority)
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,9 +27,13 @@ import (
|
|||
"net/url"
|
||||
"os"
|
||||
|
||||
"google.golang.org/grpc/grpclog"
|
||||
credinternal "google.golang.org/grpc/internal/credentials"
|
||||
"google.golang.org/grpc/internal/envconfig"
|
||||
)
|
||||
|
||||
var logger = grpclog.Component("credentials")
|
||||
|
||||
// TLSInfo contains the auth information for a TLS authenticated connection.
|
||||
// It implements the AuthInfo interface.
|
||||
type TLSInfo struct {
|
||||
|
|
@ -112,6 +116,22 @@ func (c *tlsCreds) ClientHandshake(ctx context.Context, authority string, rawCon
|
|||
conn.Close()
|
||||
return nil, nil, ctx.Err()
|
||||
}
|
||||
|
||||
// The negotiated protocol can be either of the following:
|
||||
// 1. h2: When the server supports ALPN. Only HTTP/2 can be negotiated since
|
||||
// it is the only protocol advertised by the client during the handshake.
|
||||
// The tls library ensures that the server chooses a protocol advertised
|
||||
// by the client.
|
||||
// 2. "" (empty string): If the server doesn't support ALPN. ALPN is a requirement
|
||||
// for using HTTP/2 over TLS. We can terminate the connection immediately.
|
||||
np := conn.ConnectionState().NegotiatedProtocol
|
||||
if np == "" {
|
||||
if envconfig.EnforceALPNEnabled {
|
||||
conn.Close()
|
||||
return nil, nil, fmt.Errorf("credentials: cannot check peer: missing selected ALPN property")
|
||||
}
|
||||
logger.Warningf("Allowing TLS connection to server %q with ALPN disabled. TLS connections to servers with ALPN disabled will be disallowed in future grpc-go releases", cfg.ServerName)
|
||||
}
|
||||
tlsInfo := TLSInfo{
|
||||
State: conn.ConnectionState(),
|
||||
CommonAuthInfo: CommonAuthInfo{
|
||||
|
|
@ -131,8 +151,20 @@ func (c *tlsCreds) ServerHandshake(rawConn net.Conn) (net.Conn, AuthInfo, error)
|
|||
conn.Close()
|
||||
return nil, nil, err
|
||||
}
|
||||
cs := conn.ConnectionState()
|
||||
// The negotiated application protocol can be empty only if the client doesn't
|
||||
// support ALPN. In such cases, we can close the connection since ALPN is required
|
||||
// for using HTTP/2 over TLS.
|
||||
if cs.NegotiatedProtocol == "" {
|
||||
if envconfig.EnforceALPNEnabled {
|
||||
conn.Close()
|
||||
return nil, nil, fmt.Errorf("credentials: cannot check peer: missing selected ALPN property")
|
||||
} else if logger.V(2) {
|
||||
logger.Info("Allowing TLS connection from client with ALPN disabled. TLS connections with ALPN disabled will be disallowed in future grpc-go releases")
|
||||
}
|
||||
}
|
||||
tlsInfo := TLSInfo{
|
||||
State: conn.ConnectionState(),
|
||||
State: cs,
|
||||
CommonAuthInfo: CommonAuthInfo{
|
||||
SecurityLevel: PrivacyAndIntegrity,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ package grpc
|
|||
import (
|
||||
"context"
|
||||
"net"
|
||||
"net/url"
|
||||
"time"
|
||||
|
||||
"google.golang.org/grpc/backoff"
|
||||
|
|
@ -36,6 +37,11 @@ import (
|
|||
"google.golang.org/grpc/stats"
|
||||
)
|
||||
|
||||
const (
|
||||
// https://github.com/grpc/proposal/blob/master/A6-client-retries.md#limits-on-retries-and-hedges
|
||||
defaultMaxCallAttempts = 5
|
||||
)
|
||||
|
||||
func init() {
|
||||
internal.AddGlobalDialOptions = func(opt ...DialOption) {
|
||||
globalDialOptions = append(globalDialOptions, opt...)
|
||||
|
|
@ -43,6 +49,14 @@ func init() {
|
|||
internal.ClearGlobalDialOptions = func() {
|
||||
globalDialOptions = nil
|
||||
}
|
||||
internal.AddGlobalPerTargetDialOptions = func(opt any) {
|
||||
if ptdo, ok := opt.(perTargetDialOption); ok {
|
||||
globalPerTargetDialOptions = append(globalPerTargetDialOptions, ptdo)
|
||||
}
|
||||
}
|
||||
internal.ClearGlobalPerTargetDialOptions = func() {
|
||||
globalPerTargetDialOptions = nil
|
||||
}
|
||||
internal.WithBinaryLogger = withBinaryLogger
|
||||
internal.JoinDialOptions = newJoinDialOption
|
||||
internal.DisableGlobalDialOptions = newDisableGlobalDialOptions
|
||||
|
|
@ -80,6 +94,7 @@ type dialOptions struct {
|
|||
idleTimeout time.Duration
|
||||
recvBufferPool SharedBufferPool
|
||||
defaultScheme string
|
||||
maxCallAttempts int
|
||||
}
|
||||
|
||||
// DialOption configures how we set up the connection.
|
||||
|
|
@ -89,6 +104,19 @@ type DialOption interface {
|
|||
|
||||
var globalDialOptions []DialOption
|
||||
|
||||
// perTargetDialOption takes a parsed target and returns a dial option to apply.
|
||||
//
|
||||
// This gets called after NewClient() parses the target, and allows per target
|
||||
// configuration set through a returned DialOption. The DialOption will not take
|
||||
// effect if specifies a resolver builder, as that Dial Option is factored in
|
||||
// while parsing target.
|
||||
type perTargetDialOption interface {
|
||||
// DialOption returns a Dial Option to apply.
|
||||
DialOptionForTarget(parsedTarget url.URL) DialOption
|
||||
}
|
||||
|
||||
var globalPerTargetDialOptions []perTargetDialOption
|
||||
|
||||
// EmptyDialOption does not alter the dial configuration. It can be embedded in
|
||||
// another structure to build custom dial options.
|
||||
//
|
||||
|
|
@ -655,6 +683,7 @@ func defaultDialOptions() dialOptions {
|
|||
idleTimeout: 30 * time.Minute,
|
||||
recvBufferPool: nopBufferPool{},
|
||||
defaultScheme: "dns",
|
||||
maxCallAttempts: defaultMaxCallAttempts,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -712,6 +741,23 @@ func WithIdleTimeout(d time.Duration) DialOption {
|
|||
})
|
||||
}
|
||||
|
||||
// WithMaxCallAttempts returns a DialOption that configures the maximum number
|
||||
// of attempts per call (including retries and hedging) using the channel.
|
||||
// Service owners may specify a higher value for these parameters, but higher
|
||||
// values will be treated as equal to the maximum value by the client
|
||||
// implementation. This mitigates security concerns related to the service
|
||||
// config being transferred to the client via DNS.
|
||||
//
|
||||
// A value of 5 will be used if this dial option is not set or n < 2.
|
||||
func WithMaxCallAttempts(n int) DialOption {
|
||||
return newFuncDialOption(func(o *dialOptions) {
|
||||
if n < 2 {
|
||||
n = defaultMaxCallAttempts
|
||||
}
|
||||
o.maxCallAttempts = n
|
||||
})
|
||||
}
|
||||
|
||||
// WithRecvBufferPool returns a DialOption that configures the ClientConn
|
||||
// to use the provided shared buffer pool for parsing incoming messages. Depending
|
||||
// on the application's workload, this could result in reduced memory allocation.
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||
// versions:
|
||||
// protoc-gen-go v1.33.0
|
||||
// protoc-gen-go v1.34.1
|
||||
// protoc v4.25.2
|
||||
// source: grpc/health/v1/health.proto
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
|
||||
// versions:
|
||||
// - protoc-gen-go-grpc v1.3.0
|
||||
// - protoc-gen-go-grpc v1.4.0
|
||||
// - protoc v4.25.2
|
||||
// source: grpc/health/v1/health.proto
|
||||
|
||||
|
|
@ -43,6 +43,10 @@ const (
|
|||
// HealthClient is the client API for Health service.
|
||||
//
|
||||
// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
|
||||
//
|
||||
// Health is gRPC's mechanism for checking whether a server is able to handle
|
||||
// RPCs. Its semantics are documented in
|
||||
// https://github.com/grpc/grpc/blob/master/doc/health-checking.md.
|
||||
type HealthClient interface {
|
||||
// Check gets the health of the specified service. If the requested service
|
||||
// is unknown, the call will fail with status NOT_FOUND. If the caller does
|
||||
|
|
@ -126,6 +130,10 @@ func (x *healthWatchClient) Recv() (*HealthCheckResponse, error) {
|
|||
// HealthServer is the server API for Health service.
|
||||
// All implementations should embed UnimplementedHealthServer
|
||||
// for forward compatibility
|
||||
//
|
||||
// Health is gRPC's mechanism for checking whether a server is able to handle
|
||||
// RPCs. Its semantics are documented in
|
||||
// https://github.com/grpc/grpc/blob/master/doc/health-checking.md.
|
||||
type HealthServer interface {
|
||||
// Check gets the health of the specified service. If the requested service
|
||||
// is unknown, the call will fail with status NOT_FOUND. If the caller does
|
||||
|
|
|
|||
|
|
@ -25,10 +25,10 @@ package backoff
|
|||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"math/rand"
|
||||
"time"
|
||||
|
||||
grpcbackoff "google.golang.org/grpc/backoff"
|
||||
"google.golang.org/grpc/internal/grpcrand"
|
||||
)
|
||||
|
||||
// Strategy defines the methodology for backing off after a grpc connection
|
||||
|
|
@ -67,7 +67,7 @@ func (bc Exponential) Backoff(retries int) time.Duration {
|
|||
}
|
||||
// Randomize backoff delays so that if a cluster of requests start at
|
||||
// the same time, they won't operate in lockstep.
|
||||
backoff *= 1 + bc.Config.Jitter*(grpcrand.Float64()*2-1)
|
||||
backoff *= 1 + bc.Config.Jitter*(rand.Float64()*2-1)
|
||||
if backoff < 0 {
|
||||
return 0
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,6 +40,12 @@ var (
|
|||
// ALTSMaxConcurrentHandshakes is the maximum number of concurrent ALTS
|
||||
// handshakes that can be performed.
|
||||
ALTSMaxConcurrentHandshakes = uint64FromEnv("GRPC_ALTS_MAX_CONCURRENT_HANDSHAKES", 100, 1, 100)
|
||||
// EnforceALPNEnabled is set if TLS connections to servers with ALPN disabled
|
||||
// should be rejected. The HTTP/2 protocol requires ALPN to be enabled, this
|
||||
// option is present for backward compatibility. This option may be overridden
|
||||
// by setting the environment variable "GRPC_ENFORCE_ALPN_ENABLED" to "true"
|
||||
// or "false".
|
||||
EnforceALPNEnabled = boolFromEnv("GRPC_ENFORCE_ALPN_ENABLED", false)
|
||||
)
|
||||
|
||||
func boolFromEnv(envVar string, def bool) bool {
|
||||
|
|
|
|||
|
|
@ -1,100 +0,0 @@
|
|||
//go:build !go1.21
|
||||
|
||||
// TODO: when this file is deleted (after Go 1.20 support is dropped), delete
|
||||
// all of grpcrand and call the rand package directly.
|
||||
|
||||
/*
|
||||
*
|
||||
* Copyright 2018 gRPC authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
|
||||
// Package grpcrand implements math/rand functions in a concurrent-safe way
|
||||
// with a global random source, independent of math/rand's global source.
|
||||
package grpcrand
|
||||
|
||||
import (
|
||||
"math/rand"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
var (
|
||||
r = rand.New(rand.NewSource(time.Now().UnixNano()))
|
||||
mu sync.Mutex
|
||||
)
|
||||
|
||||
// Int implements rand.Int on the grpcrand global source.
|
||||
func Int() int {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
return r.Int()
|
||||
}
|
||||
|
||||
// Int63n implements rand.Int63n on the grpcrand global source.
|
||||
func Int63n(n int64) int64 {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
return r.Int63n(n)
|
||||
}
|
||||
|
||||
// Intn implements rand.Intn on the grpcrand global source.
|
||||
func Intn(n int) int {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
return r.Intn(n)
|
||||
}
|
||||
|
||||
// Int31n implements rand.Int31n on the grpcrand global source.
|
||||
func Int31n(n int32) int32 {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
return r.Int31n(n)
|
||||
}
|
||||
|
||||
// Float64 implements rand.Float64 on the grpcrand global source.
|
||||
func Float64() float64 {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
return r.Float64()
|
||||
}
|
||||
|
||||
// Uint64 implements rand.Uint64 on the grpcrand global source.
|
||||
func Uint64() uint64 {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
return r.Uint64()
|
||||
}
|
||||
|
||||
// Uint32 implements rand.Uint32 on the grpcrand global source.
|
||||
func Uint32() uint32 {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
return r.Uint32()
|
||||
}
|
||||
|
||||
// ExpFloat64 implements rand.ExpFloat64 on the grpcrand global source.
|
||||
func ExpFloat64() float64 {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
return r.ExpFloat64()
|
||||
}
|
||||
|
||||
// Shuffle implements rand.Shuffle on the grpcrand global source.
|
||||
var Shuffle = func(n int, f func(int, int)) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
r.Shuffle(n, f)
|
||||
}
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
//go:build go1.21
|
||||
|
||||
/*
|
||||
*
|
||||
* Copyright 2024 gRPC authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
|
||||
// Package grpcrand implements math/rand functions in a concurrent-safe way
|
||||
// with a global random source, independent of math/rand's global source.
|
||||
package grpcrand
|
||||
|
||||
import "math/rand"
|
||||
|
||||
// This implementation will be used for Go version 1.21 or newer.
|
||||
// For older versions, the original implementation with mutex will be used.
|
||||
|
||||
// Int implements rand.Int on the grpcrand global source.
|
||||
func Int() int {
|
||||
return rand.Int()
|
||||
}
|
||||
|
||||
// Int63n implements rand.Int63n on the grpcrand global source.
|
||||
func Int63n(n int64) int64 {
|
||||
return rand.Int63n(n)
|
||||
}
|
||||
|
||||
// Intn implements rand.Intn on the grpcrand global source.
|
||||
func Intn(n int) int {
|
||||
return rand.Intn(n)
|
||||
}
|
||||
|
||||
// Int31n implements rand.Int31n on the grpcrand global source.
|
||||
func Int31n(n int32) int32 {
|
||||
return rand.Int31n(n)
|
||||
}
|
||||
|
||||
// Float64 implements rand.Float64 on the grpcrand global source.
|
||||
func Float64() float64 {
|
||||
return rand.Float64()
|
||||
}
|
||||
|
||||
// Uint64 implements rand.Uint64 on the grpcrand global source.
|
||||
func Uint64() uint64 {
|
||||
return rand.Uint64()
|
||||
}
|
||||
|
||||
// Uint32 implements rand.Uint32 on the grpcrand global source.
|
||||
func Uint32() uint32 {
|
||||
return rand.Uint32()
|
||||
}
|
||||
|
||||
// ExpFloat64 implements rand.ExpFloat64 on the grpcrand global source.
|
||||
func ExpFloat64() float64 {
|
||||
return rand.ExpFloat64()
|
||||
}
|
||||
|
||||
// Shuffle implements rand.Shuffle on the grpcrand global source.
|
||||
var Shuffle = func(n int, f func(int, int)) {
|
||||
rand.Shuffle(n, f)
|
||||
}
|
||||
|
|
@ -106,6 +106,14 @@ var (
|
|||
// This is used in the 1.0 release of gcp/observability, and thus must not be
|
||||
// deleted or changed.
|
||||
ClearGlobalDialOptions func()
|
||||
|
||||
// AddGlobalPerTargetDialOptions adds a PerTargetDialOption that will be
|
||||
// configured for newly created ClientConns.
|
||||
AddGlobalPerTargetDialOptions any // func (opt any)
|
||||
// ClearGlobalPerTargetDialOptions clears the slice of global late apply
|
||||
// dial options.
|
||||
ClearGlobalPerTargetDialOptions func()
|
||||
|
||||
// JoinDialOptions combines the dial options passed as arguments into a
|
||||
// single dial option.
|
||||
JoinDialOptions any // func(...grpc.DialOption) grpc.DialOption
|
||||
|
|
@ -126,7 +134,8 @@ var (
|
|||
// deleted or changed.
|
||||
BinaryLogger any // func(binarylog.Logger) grpc.ServerOption
|
||||
|
||||
// SubscribeToConnectivityStateChanges adds a grpcsync.Subscriber to a provided grpc.ClientConn
|
||||
// SubscribeToConnectivityStateChanges adds a grpcsync.Subscriber to a
|
||||
// provided grpc.ClientConn.
|
||||
SubscribeToConnectivityStateChanges any // func(*grpc.ClientConn, grpcsync.Subscriber)
|
||||
|
||||
// NewXDSResolverWithConfigForTesting creates a new xds resolver builder using
|
||||
|
|
@ -184,25 +193,25 @@ var (
|
|||
|
||||
ChannelzTurnOffForTesting func()
|
||||
|
||||
// TriggerXDSResourceNameNotFoundForTesting triggers the resource-not-found
|
||||
// error for a given resource type and name. This is usually triggered when
|
||||
// the associated watch timer fires. For testing purposes, having this
|
||||
// function makes events more predictable than relying on timer events.
|
||||
TriggerXDSResourceNameNotFoundForTesting any // func(func(xdsresource.Type, string), string, string) error
|
||||
// TriggerXDSResourceNotFoundForTesting causes the provided xDS Client to
|
||||
// invoke resource-not-found error for the given resource type and name.
|
||||
TriggerXDSResourceNotFoundForTesting any // func(xdsclient.XDSClient, xdsresource.Type, string) error
|
||||
|
||||
// TriggerXDSResourceNameNotFoundClient invokes the testing xDS Client
|
||||
// singleton to invoke resource not found for a resource type name and
|
||||
// resource name.
|
||||
TriggerXDSResourceNameNotFoundClient any // func(string, string) error
|
||||
|
||||
// FromOutgoingContextRaw returns the un-merged, intermediary contents of metadata.rawMD.
|
||||
// FromOutgoingContextRaw returns the un-merged, intermediary contents of
|
||||
// metadata.rawMD.
|
||||
FromOutgoingContextRaw any // func(context.Context) (metadata.MD, [][]string, bool)
|
||||
|
||||
// UserSetDefaultScheme is set to true if the user has overridden the default resolver scheme.
|
||||
// UserSetDefaultScheme is set to true if the user has overridden the
|
||||
// default resolver scheme.
|
||||
UserSetDefaultScheme bool = false
|
||||
|
||||
// ShuffleAddressListForTesting pseudo-randomizes the order of addresses. n
|
||||
// is the number of elements. swap swaps the elements with indexes i and j.
|
||||
ShuffleAddressListForTesting any // func(n int, swap func(i, j int))
|
||||
)
|
||||
|
||||
// HealthChecker defines the signature of the client-side LB channel health checking function.
|
||||
// HealthChecker defines the signature of the client-side LB channel health
|
||||
// checking function.
|
||||
//
|
||||
// The implementation is expected to create a health checking RPC stream by
|
||||
// calling newStream(), watch for the health status of serviceName, and report
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ import (
|
|||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"math/rand"
|
||||
"net"
|
||||
"os"
|
||||
"strconv"
|
||||
|
|
@ -35,7 +36,6 @@ import (
|
|||
"google.golang.org/grpc/grpclog"
|
||||
"google.golang.org/grpc/internal/backoff"
|
||||
"google.golang.org/grpc/internal/envconfig"
|
||||
"google.golang.org/grpc/internal/grpcrand"
|
||||
"google.golang.org/grpc/internal/resolver/dns/internal"
|
||||
"google.golang.org/grpc/resolver"
|
||||
"google.golang.org/grpc/serviceconfig"
|
||||
|
|
@ -63,6 +63,8 @@ var (
|
|||
func init() {
|
||||
resolver.Register(NewBuilder())
|
||||
internal.TimeAfterFunc = time.After
|
||||
internal.TimeNowFunc = time.Now
|
||||
internal.TimeUntilFunc = time.Until
|
||||
internal.NewNetResolver = newNetResolver
|
||||
internal.AddressDialer = addressDialer
|
||||
}
|
||||
|
|
@ -209,12 +211,12 @@ func (d *dnsResolver) watcher() {
|
|||
err = d.cc.UpdateState(*state)
|
||||
}
|
||||
|
||||
var waitTime time.Duration
|
||||
var nextResolutionTime time.Time
|
||||
if err == nil {
|
||||
// Success resolving, wait for the next ResolveNow. However, also wait 30
|
||||
// seconds at the very least to prevent constantly re-resolving.
|
||||
backoffIndex = 1
|
||||
waitTime = MinResolutionInterval
|
||||
nextResolutionTime = internal.TimeNowFunc().Add(MinResolutionInterval)
|
||||
select {
|
||||
case <-d.ctx.Done():
|
||||
return
|
||||
|
|
@ -223,13 +225,13 @@ func (d *dnsResolver) watcher() {
|
|||
} else {
|
||||
// Poll on an error found in DNS Resolver or an error received from
|
||||
// ClientConn.
|
||||
waitTime = backoff.DefaultExponential.Backoff(backoffIndex)
|
||||
nextResolutionTime = internal.TimeNowFunc().Add(backoff.DefaultExponential.Backoff(backoffIndex))
|
||||
backoffIndex++
|
||||
}
|
||||
select {
|
||||
case <-d.ctx.Done():
|
||||
return
|
||||
case <-internal.TimeAfterFunc(waitTime):
|
||||
case <-internal.TimeAfterFunc(internal.TimeUntilFunc(nextResolutionTime)):
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -423,7 +425,7 @@ func chosenByPercentage(a *int) bool {
|
|||
if a == nil {
|
||||
return true
|
||||
}
|
||||
return grpcrand.Intn(100)+1 <= *a
|
||||
return rand.Intn(100)+1 <= *a
|
||||
}
|
||||
|
||||
func canaryingSC(js string) string {
|
||||
|
|
|
|||
|
|
@ -56,6 +56,17 @@ var (
|
|||
// blocked waiting for the duration to elapse.
|
||||
TimeAfterFunc func(time.Duration) <-chan time.Time
|
||||
|
||||
// TimeNowFunc is used by the DNS resolver to get the current time.
|
||||
// In non-test code, this is implemented by time.Now. In test code,
|
||||
// this can be used to control the current time for the resolver.
|
||||
TimeNowFunc func() time.Time
|
||||
|
||||
// TimeUntilFunc is used by the DNS resolver to calculate the remaining
|
||||
// wait time for re-resolution. In non-test code, this is implemented by
|
||||
// time.Until. In test code, this can be used to control the remaining
|
||||
// time for resolver to wait for re-resolution.
|
||||
TimeUntilFunc func(time.Time) time.Duration
|
||||
|
||||
// NewNetResolver returns the net.Resolver instance for the given target.
|
||||
NewNetResolver func(string) (NetResolver, error)
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ import (
|
|||
"fmt"
|
||||
"io"
|
||||
"math"
|
||||
"math/rand"
|
||||
"net"
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
|
@ -43,7 +44,6 @@ import (
|
|||
"google.golang.org/grpc/codes"
|
||||
"google.golang.org/grpc/credentials"
|
||||
"google.golang.org/grpc/internal/channelz"
|
||||
"google.golang.org/grpc/internal/grpcrand"
|
||||
"google.golang.org/grpc/internal/grpcsync"
|
||||
"google.golang.org/grpc/keepalive"
|
||||
"google.golang.org/grpc/metadata"
|
||||
|
|
@ -1440,7 +1440,7 @@ func getJitter(v time.Duration) time.Duration {
|
|||
}
|
||||
// Generate a jitter between +/- 10% of the value.
|
||||
r := int64(v / 10)
|
||||
j := grpcrand.Int63n(2*r) - r
|
||||
j := rand.Int63n(2*r) - r
|
||||
return time.Duration(j)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -90,21 +90,6 @@ func Pairs(kv ...string) MD {
|
|||
return md
|
||||
}
|
||||
|
||||
// String implements the Stringer interface for pretty-printing a MD.
|
||||
// Ordering of the values is non-deterministic as it ranges over a map.
|
||||
func (md MD) String() string {
|
||||
var sb strings.Builder
|
||||
fmt.Fprintf(&sb, "MD{")
|
||||
for k, v := range md {
|
||||
if sb.Len() > 3 {
|
||||
fmt.Fprintf(&sb, ", ")
|
||||
}
|
||||
fmt.Fprintf(&sb, "%s=[%s]", k, strings.Join(v, ", "))
|
||||
}
|
||||
fmt.Fprintf(&sb, "}")
|
||||
return sb.String()
|
||||
}
|
||||
|
||||
// Len returns the number of items in md.
|
||||
func (md MD) Len() int {
|
||||
return len(md)
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ import (
|
|||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
|
||||
"google.golang.org/grpc/balancer"
|
||||
"google.golang.org/grpc/codes"
|
||||
|
|
@ -33,35 +33,43 @@ import (
|
|||
"google.golang.org/grpc/status"
|
||||
)
|
||||
|
||||
// pickerGeneration stores a picker and a channel used to signal that a picker
|
||||
// newer than this one is available.
|
||||
type pickerGeneration struct {
|
||||
// picker is the picker produced by the LB policy. May be nil if a picker
|
||||
// has never been produced.
|
||||
picker balancer.Picker
|
||||
// blockingCh is closed when the picker has been invalidated because there
|
||||
// is a new one available.
|
||||
blockingCh chan struct{}
|
||||
}
|
||||
|
||||
// pickerWrapper is a wrapper of balancer.Picker. It blocks on certain pick
|
||||
// actions and unblock when there's a picker update.
|
||||
type pickerWrapper struct {
|
||||
mu sync.Mutex
|
||||
done bool
|
||||
blockingCh chan struct{}
|
||||
picker balancer.Picker
|
||||
// If pickerGen holds a nil pointer, the pickerWrapper is closed.
|
||||
pickerGen atomic.Pointer[pickerGeneration]
|
||||
statsHandlers []stats.Handler // to record blocking picker calls
|
||||
}
|
||||
|
||||
func newPickerWrapper(statsHandlers []stats.Handler) *pickerWrapper {
|
||||
return &pickerWrapper{
|
||||
blockingCh: make(chan struct{}),
|
||||
pw := &pickerWrapper{
|
||||
statsHandlers: statsHandlers,
|
||||
}
|
||||
pw.pickerGen.Store(&pickerGeneration{
|
||||
blockingCh: make(chan struct{}),
|
||||
})
|
||||
return pw
|
||||
}
|
||||
|
||||
// updatePicker is called by UpdateBalancerState. It unblocks all blocked pick.
|
||||
// updatePicker is called by UpdateState calls from the LB policy. It
|
||||
// unblocks all blocked pick.
|
||||
func (pw *pickerWrapper) updatePicker(p balancer.Picker) {
|
||||
pw.mu.Lock()
|
||||
if pw.done {
|
||||
pw.mu.Unlock()
|
||||
return
|
||||
}
|
||||
pw.picker = p
|
||||
// pw.blockingCh should never be nil.
|
||||
close(pw.blockingCh)
|
||||
pw.blockingCh = make(chan struct{})
|
||||
pw.mu.Unlock()
|
||||
old := pw.pickerGen.Swap(&pickerGeneration{
|
||||
picker: p,
|
||||
blockingCh: make(chan struct{}),
|
||||
})
|
||||
close(old.blockingCh)
|
||||
}
|
||||
|
||||
// doneChannelzWrapper performs the following:
|
||||
|
|
@ -98,20 +106,17 @@ func (pw *pickerWrapper) pick(ctx context.Context, failfast bool, info balancer.
|
|||
var lastPickErr error
|
||||
|
||||
for {
|
||||
pw.mu.Lock()
|
||||
if pw.done {
|
||||
pw.mu.Unlock()
|
||||
pg := pw.pickerGen.Load()
|
||||
if pg == nil {
|
||||
return nil, balancer.PickResult{}, ErrClientConnClosing
|
||||
}
|
||||
|
||||
if pw.picker == nil {
|
||||
ch = pw.blockingCh
|
||||
if pg.picker == nil {
|
||||
ch = pg.blockingCh
|
||||
}
|
||||
if ch == pw.blockingCh {
|
||||
if ch == pg.blockingCh {
|
||||
// This could happen when either:
|
||||
// - pw.picker is nil (the previous if condition), or
|
||||
// - has called pick on the current picker.
|
||||
pw.mu.Unlock()
|
||||
// - we have already called pick on the current picker.
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
var errStr string
|
||||
|
|
@ -145,9 +150,8 @@ func (pw *pickerWrapper) pick(ctx context.Context, failfast bool, info balancer.
|
|||
}
|
||||
}
|
||||
|
||||
ch = pw.blockingCh
|
||||
p := pw.picker
|
||||
pw.mu.Unlock()
|
||||
ch = pg.blockingCh
|
||||
p := pg.picker
|
||||
|
||||
pickResult, err := p.Pick(info)
|
||||
if err != nil {
|
||||
|
|
@ -197,24 +201,15 @@ func (pw *pickerWrapper) pick(ctx context.Context, failfast bool, info balancer.
|
|||
}
|
||||
|
||||
func (pw *pickerWrapper) close() {
|
||||
pw.mu.Lock()
|
||||
defer pw.mu.Unlock()
|
||||
if pw.done {
|
||||
return
|
||||
}
|
||||
pw.done = true
|
||||
close(pw.blockingCh)
|
||||
old := pw.pickerGen.Swap(nil)
|
||||
close(old.blockingCh)
|
||||
}
|
||||
|
||||
// reset clears the pickerWrapper and prepares it for being used again when idle
|
||||
// mode is exited.
|
||||
func (pw *pickerWrapper) reset() {
|
||||
pw.mu.Lock()
|
||||
defer pw.mu.Unlock()
|
||||
if pw.done {
|
||||
return
|
||||
}
|
||||
pw.blockingCh = make(chan struct{})
|
||||
old := pw.pickerGen.Swap(&pickerGeneration{blockingCh: make(chan struct{})})
|
||||
close(old.blockingCh)
|
||||
}
|
||||
|
||||
// dropError is a wrapper error that indicates the LB policy wishes to drop the
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ func (ccr *ccResolverWrapper) NewAddress(addrs []resolver.Address) {
|
|||
// ParseServiceConfig is called by resolver implementations to parse a JSON
|
||||
// representation of the service config.
|
||||
func (ccr *ccResolverWrapper) ParseServiceConfig(scJSON string) *serviceconfig.ParseResult {
|
||||
return parseServiceConfig(scJSON)
|
||||
return parseServiceConfig(scJSON, ccr.cc.dopts.maxCallAttempts)
|
||||
}
|
||||
|
||||
// addChannelzTraceEvent adds a channelz trace event containing the new
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ import (
|
|||
"time"
|
||||
|
||||
"google.golang.org/grpc/balancer"
|
||||
"google.golang.org/grpc/balancer/pickfirst"
|
||||
"google.golang.org/grpc/codes"
|
||||
"google.golang.org/grpc/internal"
|
||||
"google.golang.org/grpc/internal/balancer/gracefulswitch"
|
||||
|
|
@ -163,9 +164,11 @@ type jsonSC struct {
|
|||
}
|
||||
|
||||
func init() {
|
||||
internal.ParseServiceConfig = parseServiceConfig
|
||||
internal.ParseServiceConfig = func(js string) *serviceconfig.ParseResult {
|
||||
return parseServiceConfig(js, defaultMaxCallAttempts)
|
||||
}
|
||||
func parseServiceConfig(js string) *serviceconfig.ParseResult {
|
||||
}
|
||||
func parseServiceConfig(js string, maxAttempts int) *serviceconfig.ParseResult {
|
||||
if len(js) == 0 {
|
||||
return &serviceconfig.ParseResult{Err: fmt.Errorf("no JSON service config provided")}
|
||||
}
|
||||
|
|
@ -183,12 +186,12 @@ func parseServiceConfig(js string) *serviceconfig.ParseResult {
|
|||
}
|
||||
c := rsc.LoadBalancingConfig
|
||||
if c == nil {
|
||||
name := PickFirstBalancerName
|
||||
name := pickfirst.Name
|
||||
if rsc.LoadBalancingPolicy != nil {
|
||||
name = *rsc.LoadBalancingPolicy
|
||||
}
|
||||
if balancer.Get(name) == nil {
|
||||
name = PickFirstBalancerName
|
||||
name = pickfirst.Name
|
||||
}
|
||||
cfg := []map[string]any{{name: struct{}{}}}
|
||||
strCfg, err := json.Marshal(cfg)
|
||||
|
|
@ -218,7 +221,7 @@ func parseServiceConfig(js string) *serviceconfig.ParseResult {
|
|||
WaitForReady: m.WaitForReady,
|
||||
Timeout: (*time.Duration)(m.Timeout),
|
||||
}
|
||||
if mc.RetryPolicy, err = convertRetryPolicy(m.RetryPolicy); err != nil {
|
||||
if mc.RetryPolicy, err = convertRetryPolicy(m.RetryPolicy, maxAttempts); err != nil {
|
||||
logger.Warningf("grpc: unmarshalling service config %s: %v", js, err)
|
||||
return &serviceconfig.ParseResult{Err: err}
|
||||
}
|
||||
|
|
@ -264,7 +267,7 @@ func parseServiceConfig(js string) *serviceconfig.ParseResult {
|
|||
return &serviceconfig.ParseResult{Config: &sc}
|
||||
}
|
||||
|
||||
func convertRetryPolicy(jrp *jsonRetryPolicy) (p *internalserviceconfig.RetryPolicy, err error) {
|
||||
func convertRetryPolicy(jrp *jsonRetryPolicy, maxAttempts int) (p *internalserviceconfig.RetryPolicy, err error) {
|
||||
if jrp == nil {
|
||||
return nil, nil
|
||||
}
|
||||
|
|
@ -278,17 +281,16 @@ func convertRetryPolicy(jrp *jsonRetryPolicy) (p *internalserviceconfig.RetryPol
|
|||
return nil, nil
|
||||
}
|
||||
|
||||
if jrp.MaxAttempts < maxAttempts {
|
||||
maxAttempts = jrp.MaxAttempts
|
||||
}
|
||||
rp := &internalserviceconfig.RetryPolicy{
|
||||
MaxAttempts: jrp.MaxAttempts,
|
||||
MaxAttempts: maxAttempts,
|
||||
InitialBackoff: time.Duration(jrp.InitialBackoff),
|
||||
MaxBackoff: time.Duration(jrp.MaxBackoff),
|
||||
BackoffMultiplier: jrp.BackoffMultiplier,
|
||||
RetryableStatusCodes: make(map[codes.Code]bool),
|
||||
}
|
||||
if rp.MaxAttempts > 5 {
|
||||
// TODO(retry): Make the max maxAttempts configurable.
|
||||
rp.MaxAttempts = 5
|
||||
}
|
||||
for _, code := range jrp.RetryableStatusCodes {
|
||||
rp.RetryableStatusCodes[code] = true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ import (
|
|||
"errors"
|
||||
"io"
|
||||
"math"
|
||||
"math/rand"
|
||||
"strconv"
|
||||
"sync"
|
||||
"time"
|
||||
|
|
@ -34,7 +35,6 @@ import (
|
|||
"google.golang.org/grpc/internal/balancerload"
|
||||
"google.golang.org/grpc/internal/binarylog"
|
||||
"google.golang.org/grpc/internal/channelz"
|
||||
"google.golang.org/grpc/internal/grpcrand"
|
||||
"google.golang.org/grpc/internal/grpcutil"
|
||||
imetadata "google.golang.org/grpc/internal/metadata"
|
||||
iresolver "google.golang.org/grpc/internal/resolver"
|
||||
|
|
@ -699,7 +699,7 @@ func (a *csAttempt) shouldRetry(err error) (bool, error) {
|
|||
if max := float64(rp.MaxBackoff); cur > max {
|
||||
cur = max
|
||||
}
|
||||
dur = time.Duration(grpcrand.Int63n(int64(cur)))
|
||||
dur = time.Duration(rand.Int63n(int64(cur)))
|
||||
cs.numRetriesSincePushback++
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,4 +19,4 @@
|
|||
package grpc
|
||||
|
||||
// Version is the current grpc version.
|
||||
const Version = "1.64.0"
|
||||
const Version = "1.65.0"
|
||||
|
|
|
|||
|
|
@ -67,6 +67,9 @@ type ChannelableStatus struct {
|
|||
// resolved delivery options.
|
||||
// +optional
|
||||
DeliveryStatus `json:",inline"`
|
||||
// AppliedEventPoliciesStatus contains the list of EventPolicies which apply to this Channel
|
||||
// +optional
|
||||
AppliedEventPoliciesStatus `json:",inline"`
|
||||
}
|
||||
|
||||
var (
|
||||
|
|
|
|||
|
|
@ -81,6 +81,14 @@ type DeliverySpec struct {
|
|||
//
|
||||
// +optional
|
||||
RetryAfterMax *string `json:"retryAfterMax,omitempty"`
|
||||
|
||||
// format specifies the desired event format for the cloud event.
|
||||
// It can be one of the following values:
|
||||
// - nil: default value, no specific format required.
|
||||
// - "JSON": indicates the event should be in structured mode.
|
||||
// - "binary": indicates the event should be in binary mode.
|
||||
//+optional
|
||||
Format *FormatType `json:"format,omitempty"`
|
||||
}
|
||||
|
||||
func (ds *DeliverySpec) Validate(ctx context.Context) *apis.FieldError {
|
||||
|
|
@ -123,6 +131,15 @@ func (ds *DeliverySpec) Validate(ctx context.Context) *apis.FieldError {
|
|||
}
|
||||
}
|
||||
|
||||
if ds.Format != nil {
|
||||
switch *ds.Format {
|
||||
case DeliveryFormatBinary, DeliveryFormatJson:
|
||||
// nothing
|
||||
default:
|
||||
errs = errs.Also(apis.ErrInvalidValue(*ds.Format, "format"))
|
||||
}
|
||||
}
|
||||
|
||||
if ds.RetryAfterMax != nil {
|
||||
if feature.FromContext(ctx).IsEnabled(feature.DeliveryRetryAfter) {
|
||||
p, me := period.Parse(*ds.RetryAfterMax)
|
||||
|
|
@ -148,6 +165,14 @@ const (
|
|||
BackoffPolicyExponential BackoffPolicyType = "exponential"
|
||||
)
|
||||
|
||||
// FormatType is the type for delivery format
|
||||
type FormatType string
|
||||
|
||||
const (
|
||||
DeliveryFormatJson FormatType = "json"
|
||||
DeliveryFormatBinary FormatType = "binary"
|
||||
)
|
||||
|
||||
// DeliveryStatus contains the Status of an object supporting delivery options. This type is intended to be embedded into a status struct.
|
||||
type DeliveryStatus struct {
|
||||
// DeadLetterSink is a KReference that is the reference to the native, platform specific channel
|
||||
|
|
|
|||
|
|
@ -154,6 +154,7 @@ func (in *ChannelableStatus) DeepCopyInto(out *ChannelableStatus) {
|
|||
in.AddressStatus.DeepCopyInto(&out.AddressStatus)
|
||||
in.SubscribableStatus.DeepCopyInto(&out.SubscribableStatus)
|
||||
in.DeliveryStatus.DeepCopyInto(&out.DeliveryStatus)
|
||||
in.AppliedEventPoliciesStatus.DeepCopyInto(&out.AppliedEventPoliciesStatus)
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -200,6 +201,11 @@ func (in *DeliverySpec) DeepCopyInto(out *DeliverySpec) {
|
|||
*out = new(string)
|
||||
**out = **in
|
||||
}
|
||||
if in.Format != nil {
|
||||
in, out := &in.Format, &out.Format
|
||||
*out = new(FormatType)
|
||||
**out = **in
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ const (
|
|||
BrokerConditionFilter apis.ConditionType = "FilterReady"
|
||||
BrokerConditionAddressable apis.ConditionType = "Addressable"
|
||||
BrokerConditionDeadLetterSinkResolved apis.ConditionType = "DeadLetterSinkResolved"
|
||||
BrokerConditionEventPoliciesReady apis.ConditionType = "EventPoliciesReady"
|
||||
)
|
||||
|
||||
var brokerCondSet = apis.NewLivingConditionSet(
|
||||
|
|
@ -40,6 +41,7 @@ var brokerCondSet = apis.NewLivingConditionSet(
|
|||
BrokerConditionFilter,
|
||||
BrokerConditionAddressable,
|
||||
BrokerConditionDeadLetterSinkResolved,
|
||||
BrokerConditionEventPoliciesReady,
|
||||
)
|
||||
var brokerCondSetLock = sync.RWMutex{}
|
||||
|
||||
|
|
@ -118,3 +120,19 @@ func (bs *BrokerStatus) MarkDeadLetterSinkResolvedFailed(reason, messageFormat s
|
|||
bs.DeliveryStatus = eventingduck.DeliveryStatus{}
|
||||
bs.GetConditionSet().Manage(bs).MarkFalse(BrokerConditionDeadLetterSinkResolved, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
func (bs *BrokerStatus) MarkEventPoliciesTrue() {
|
||||
bs.GetConditionSet().Manage(bs).MarkTrue(BrokerConditionEventPoliciesReady)
|
||||
}
|
||||
|
||||
func (bs *BrokerStatus) MarkEventPoliciesTrueWithReason(reason, messageFormat string, messageA ...interface{}) {
|
||||
bs.GetConditionSet().Manage(bs).MarkTrueWithReason(BrokerConditionEventPoliciesReady, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
func (bs *BrokerStatus) MarkEventPoliciesFailed(reason, messageFormat string, messageA ...interface{}) {
|
||||
bs.GetConditionSet().Manage(bs).MarkFalse(BrokerConditionEventPoliciesReady, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
func (bs *BrokerStatus) MarkEventPoliciesUnknown(reason, messageFormat string, messageA ...interface{}) {
|
||||
bs.GetConditionSet().Manage(bs).MarkUnknown(BrokerConditionEventPoliciesReady, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ func (t testHelper) ReadyBrokerStatus() *BrokerStatus {
|
|||
URL: apis.HTTP("example.com"),
|
||||
})
|
||||
bs.MarkDeadLetterSinkResolvedSucceeded(eventingduckv1.DeliveryStatus{})
|
||||
bs.MarkEventPoliciesTrue()
|
||||
return bs
|
||||
}
|
||||
|
||||
|
|
@ -77,6 +78,7 @@ func (t testHelper) ReadyBrokerStatusWithoutDLS() *BrokerStatus {
|
|||
bs.SetAddress(&duckv1.Addressable{
|
||||
URL: apis.HTTP("example.com"),
|
||||
})
|
||||
bs.MarkEventPoliciesTrue()
|
||||
bs.MarkDeadLetterSinkNotConfigured()
|
||||
return bs
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ package v1
|
|||
import (
|
||||
"context"
|
||||
|
||||
"knative.dev/eventing/pkg/apis/feature"
|
||||
|
||||
"knative.dev/pkg/apis"
|
||||
)
|
||||
|
||||
|
|
@ -29,7 +31,7 @@ const (
|
|||
func (t *Trigger) SetDefaults(ctx context.Context) {
|
||||
withNS := apis.WithinParent(ctx, t.ObjectMeta)
|
||||
t.Spec.SetDefaults(withNS)
|
||||
setLabels(t)
|
||||
setLabels(ctx, t)
|
||||
}
|
||||
|
||||
func (ts *TriggerSpec) SetDefaults(ctx context.Context) {
|
||||
|
|
@ -42,8 +44,13 @@ func (ts *TriggerSpec) SetDefaults(ctx context.Context) {
|
|||
ts.Delivery.SetDefaults(ctx)
|
||||
}
|
||||
|
||||
func setLabels(t *Trigger) {
|
||||
if t.Spec.Broker != "" {
|
||||
func setLabels(ctx context.Context, t *Trigger) {
|
||||
if feature.FromContext(ctx).IsEnabled(feature.CrossNamespaceEventLinks) && t.Spec.BrokerRef != nil {
|
||||
if len(t.Labels) == 0 {
|
||||
t.Labels = map[string]string{}
|
||||
}
|
||||
t.Labels[brokerLabel] = t.Spec.BrokerRef.Name
|
||||
} else if t.Spec.Broker != "" {
|
||||
if len(t.Labels) == 0 {
|
||||
t.Labels = map[string]string{}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ func ValidateAttributesNames(attrs map[string]string) (errs *apis.FieldError) {
|
|||
}
|
||||
|
||||
func ValidateSubscriptionAPIFiltersList(ctx context.Context, filters []SubscriptionsAPIFilter) (errs *apis.FieldError) {
|
||||
if filters == nil || !feature.FromContext(ctx).IsEnabled(feature.NewTriggerFilters) {
|
||||
if filters == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
Copyright 2020 The Knative Authors
|
||||
Copyright 2024 The Knative Authors
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
|
|
@ -20,10 +20,12 @@ import (
|
|||
"knative.dev/pkg/apis"
|
||||
)
|
||||
|
||||
var eventPolicyCondSet = apis.NewLivingConditionSet()
|
||||
var eventPolicyCondSet = apis.NewLivingConditionSet(EventPolicyConditionAuthenticationEnabled, EventPolicyConditionSubjectsResolved)
|
||||
|
||||
const (
|
||||
EventPolicyConditionReady = apis.ConditionReady
|
||||
EventPolicyConditionAuthenticationEnabled apis.ConditionType = "AuthenticationEnabled"
|
||||
EventPolicyConditionSubjectsResolved apis.ConditionType = "SubjectsResolved"
|
||||
)
|
||||
|
||||
// GetConditionSet retrieves the condition set for this resource. Implements the KRShaped interface.
|
||||
|
|
@ -32,21 +34,41 @@ func (*EventPolicy) GetConditionSet() apis.ConditionSet {
|
|||
}
|
||||
|
||||
// GetCondition returns the condition currently associated with the given type, or nil.
|
||||
func (et *EventPolicyStatus) GetCondition(t apis.ConditionType) *apis.Condition {
|
||||
return eventPolicyCondSet.Manage(et).GetCondition(t)
|
||||
func (ep *EventPolicyStatus) GetCondition(t apis.ConditionType) *apis.Condition {
|
||||
return eventPolicyCondSet.Manage(ep).GetCondition(t)
|
||||
}
|
||||
|
||||
// IsReady returns true if the resource is ready overall.
|
||||
func (et *EventPolicyStatus) IsReady() bool {
|
||||
return et.GetTopLevelCondition().IsTrue()
|
||||
func (ep *EventPolicyStatus) IsReady() bool {
|
||||
return ep.GetTopLevelCondition().IsTrue()
|
||||
}
|
||||
|
||||
// GetTopLevelCondition returns the top level Condition.
|
||||
func (et *EventPolicyStatus) GetTopLevelCondition() *apis.Condition {
|
||||
return eventPolicyCondSet.Manage(et).GetTopLevelCondition()
|
||||
func (ep *EventPolicyStatus) GetTopLevelCondition() *apis.Condition {
|
||||
return eventPolicyCondSet.Manage(ep).GetTopLevelCondition()
|
||||
}
|
||||
|
||||
// InitializeConditions sets relevant unset conditions to Unknown state.
|
||||
func (et *EventPolicyStatus) InitializeConditions() {
|
||||
eventPolicyCondSet.Manage(et).InitializeConditions()
|
||||
func (ep *EventPolicyStatus) InitializeConditions() {
|
||||
eventPolicyCondSet.Manage(ep).InitializeConditions()
|
||||
}
|
||||
|
||||
// MarkOIDCAuthenticationEnabled sets EventPolicyConditionAuthenticationEnabled condition to true.
|
||||
func (ep *EventPolicyStatus) MarkOIDCAuthenticationEnabled() {
|
||||
eventPolicyCondSet.Manage(ep).MarkTrue(EventPolicyConditionAuthenticationEnabled)
|
||||
}
|
||||
|
||||
// MarkOIDCAuthenticationDisabled sets EventPolicyConditionAuthenticationEnabled condition to false.
|
||||
func (ep *EventPolicyStatus) MarkOIDCAuthenticationDisabled(reason, messageFormat string, messageA ...interface{}) {
|
||||
eventPolicyCondSet.Manage(ep).MarkFalse(EventPolicyConditionAuthenticationEnabled, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
// MarkSubjectsResolved sets EventPolicyConditionSubjectsResolved condition to true.
|
||||
func (ep *EventPolicyStatus) MarkSubjectsResolvedSucceeded() {
|
||||
eventPolicyCondSet.Manage(ep).MarkTrue(EventPolicyConditionSubjectsResolved)
|
||||
}
|
||||
|
||||
// MarkSubjectsNotResolved sets EventPolicyConditionSubjectsResolved condition to false.
|
||||
func (ep *EventPolicyStatus) MarkSubjectsResolvedFailed(reason, messageFormat string, messageA ...interface{}) {
|
||||
eventPolicyCondSet.Manage(ep).MarkFalse(EventPolicyConditionSubjectsResolved, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ package v1alpha1
|
|||
|
||||
import (
|
||||
"context"
|
||||
"strings"
|
||||
|
||||
"knative.dev/pkg/apis"
|
||||
)
|
||||
|
|
@ -36,6 +37,7 @@ func (ets *EventPolicySpec) Validate(ctx context.Context) *apis.FieldError {
|
|||
err = err.Also(apis.ErrMultipleOneOf("ref", "sub").ViaFieldIndex("from", i))
|
||||
}
|
||||
err = err.Also(f.Ref.Validate().ViaField("ref").ViaFieldIndex("from", i))
|
||||
err = err.Also(validateSub(f.Sub).ViaField("sub").ViaFieldIndex("from", i))
|
||||
}
|
||||
|
||||
for i, t := range ets.To {
|
||||
|
|
@ -53,6 +55,20 @@ func (ets *EventPolicySpec) Validate(ctx context.Context) *apis.FieldError {
|
|||
return err
|
||||
}
|
||||
|
||||
func validateSub(sub *string) *apis.FieldError {
|
||||
if sub == nil || len(*sub) <= 1 {
|
||||
return nil
|
||||
}
|
||||
|
||||
lastInvalidIdx := len(*sub) - 2
|
||||
firstInvalidIdx := 0
|
||||
if idx := strings.IndexRune(*sub, '*'); idx >= firstInvalidIdx && idx <= lastInvalidIdx {
|
||||
return apis.ErrInvalidValue(*sub, "", "'*' is only allowed as suffix")
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *EventPolicyFromReference) Validate() *apis.FieldError {
|
||||
if r == nil {
|
||||
return nil
|
||||
|
|
|
|||
|
|
@ -28,9 +28,6 @@ func (et *EventType) SetDefaults(ctx context.Context) {
|
|||
}
|
||||
|
||||
func (ets *EventTypeSpec) SetDefaults(ctx context.Context) {
|
||||
if ets.Reference == nil && ets.Broker == "" {
|
||||
ets.Broker = "default"
|
||||
}
|
||||
if ets.Reference != nil {
|
||||
ets.Reference.SetDefaults(ctx)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,19 +45,27 @@ func (source *EventType) ConvertTo(ctx context.Context, to apis.Convertible) err
|
|||
}
|
||||
}
|
||||
|
||||
sink.Spec.Attributes = []v1beta3.EventAttributeDefinition{}
|
||||
sink.Spec.Attributes = []v1beta3.EventAttributeDefinition{
|
||||
{
|
||||
Name: "specversion",
|
||||
Required: true,
|
||||
},
|
||||
{
|
||||
Name: "id",
|
||||
Required: true,
|
||||
},
|
||||
}
|
||||
// set all required attributes for the v1beta3 resource. if there is no value that makes sense, leave that empty
|
||||
if source.Spec.Type != "" {
|
||||
sink.Spec.Attributes = append(sink.Spec.Attributes, v1beta3.EventAttributeDefinition{
|
||||
Name: "type",
|
||||
Required: true,
|
||||
Value: source.Spec.Type,
|
||||
})
|
||||
}
|
||||
if source.Spec.Schema != nil {
|
||||
} else {
|
||||
sink.Spec.Attributes = append(sink.Spec.Attributes, v1beta3.EventAttributeDefinition{
|
||||
Name: "schemadata",
|
||||
Required: false,
|
||||
Value: source.Spec.Schema.String(),
|
||||
Name: "type",
|
||||
Required: true,
|
||||
})
|
||||
}
|
||||
if source.Spec.Source != nil {
|
||||
|
|
@ -66,6 +74,20 @@ func (source *EventType) ConvertTo(ctx context.Context, to apis.Convertible) err
|
|||
Required: true,
|
||||
Value: source.Spec.Source.String(),
|
||||
})
|
||||
} else {
|
||||
sink.Spec.Attributes = append(sink.Spec.Attributes, v1beta3.EventAttributeDefinition{
|
||||
Name: "source",
|
||||
Required: true,
|
||||
})
|
||||
}
|
||||
|
||||
// convert the schema so that we don't lose it in the conversion.
|
||||
if source.Spec.Schema != nil {
|
||||
sink.Spec.Attributes = append(sink.Spec.Attributes, v1beta3.EventAttributeDefinition{
|
||||
Name: "schemadata",
|
||||
Required: false,
|
||||
Value: source.Spec.Schema.String(),
|
||||
})
|
||||
}
|
||||
return nil
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -60,6 +60,10 @@ func (et *EventTypeStatus) MarkReferenceDoesNotExist() {
|
|||
eventTypeCondSet.Manage(et).MarkFalse(EventTypeConditionReferenceExists, "ResourceDoesNotExist", "Resource in spec.reference does not exist")
|
||||
}
|
||||
|
||||
func (et *EventTypeStatus) MarkReferenceNotSet() {
|
||||
eventTypeCondSet.Manage(et).MarkTrueWithReason(EventTypeConditionReferenceExists, "ReferenceNotSet", "spec.reference is not set")
|
||||
}
|
||||
|
||||
func (et *EventTypeStatus) MarkReferenceExistsUnknown(reason, messageFormat string, messageA ...interface{}) {
|
||||
eventTypeCondSet.Manage(et).MarkUnknown(EventTypeConditionReferenceExists, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ package feature
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"strings"
|
||||
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
|
|
@ -75,7 +76,6 @@ func newDefaults() Flags {
|
|||
DeliveryRetryAfter: Disabled,
|
||||
DeliveryTimeout: Enabled,
|
||||
KReferenceMapping: Disabled,
|
||||
NewTriggerFilters: Enabled,
|
||||
TransportEncryption: Disabled,
|
||||
OIDCAuthentication: Disabled,
|
||||
EvenTypeAutoCreate: Disabled,
|
||||
|
|
@ -186,7 +186,8 @@ func NewFlagsConfigFromMap(data map[string]string) (Flags, error) {
|
|||
} else if strings.Contains(k, NodeSelectorLabel) {
|
||||
flags[sanitizedKey] = Flag(v)
|
||||
} else {
|
||||
return flags, fmt.Errorf("cannot parse the feature flag '%s' = '%s'", k, v)
|
||||
flags[k] = Flag(v)
|
||||
log.Printf("Warning: unknown feature flag value %q=%q\n", k, v)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ const (
|
|||
DeliveryRetryAfter = "delivery-retryafter"
|
||||
DeliveryTimeout = "delivery-timeout"
|
||||
KReferenceMapping = "kreference-mapping"
|
||||
NewTriggerFilters = "new-trigger-filters"
|
||||
TransportEncryption = "transport-encryption"
|
||||
EvenTypeAutoCreate = "eventtype-auto-create"
|
||||
OIDCAuthentication = "authentication-oidc"
|
||||
|
|
|
|||
|
|
@ -40,12 +40,12 @@ func FromContext(ctx context.Context) Flags {
|
|||
}
|
||||
|
||||
// FromContextOrDefaults is like FromContext, but when no Flags is attached it
|
||||
// returns an empty Flags.
|
||||
// returns default Flags.
|
||||
func FromContextOrDefaults(ctx context.Context) Flags {
|
||||
if cfg := FromContext(ctx); cfg != nil {
|
||||
return cfg
|
||||
}
|
||||
return Flags{}
|
||||
return newDefaults()
|
||||
}
|
||||
|
||||
// ToContext attaches the provided Flags to the provided context, returning the
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ import (
|
|||
pkgduckv1 "knative.dev/pkg/apis/duck/v1"
|
||||
)
|
||||
|
||||
var pCondSet = apis.NewLivingConditionSet(ParallelConditionReady, ParallelConditionChannelsReady, ParallelConditionSubscriptionsReady, ParallelConditionAddressable)
|
||||
var pCondSet = apis.NewLivingConditionSet(ParallelConditionReady, ParallelConditionChannelsReady, ParallelConditionSubscriptionsReady, ParallelConditionAddressable, ParallelConditionEventPoliciesReady)
|
||||
|
||||
const (
|
||||
// ParallelConditionReady has status True when all subconditions below have been set to True.
|
||||
|
|
@ -42,6 +42,10 @@ const (
|
|||
// ParallelConditionAddressable has status true when this Parallel meets
|
||||
// the Addressable contract and has a non-empty hostname.
|
||||
ParallelConditionAddressable apis.ConditionType = "Addressable"
|
||||
|
||||
// ParallelConditionEventPoliciesReady has status True when applying EventPolicies for this
|
||||
// Parallel are ready or if there are no EventPolicies.
|
||||
ParallelConditionEventPoliciesReady apis.ConditionType = "EventPoliciesReady"
|
||||
)
|
||||
|
||||
// GetConditionSet retrieves the condition set for this resource. Implements the KRShaped interface.
|
||||
|
|
@ -217,3 +221,23 @@ func (ps *ParallelStatus) setAddress(address *pkgduckv1.Addressable) {
|
|||
pCondSet.Manage(ps).MarkTrue(ParallelConditionAddressable)
|
||||
}
|
||||
}
|
||||
|
||||
// MarkEventPoliciesFailed marks the ParallelConditionEventPoliciesReady as False with the given reason and message.
|
||||
func (ps *ParallelStatus) MarkEventPoliciesFailed(reason, messageFormat string, messageA ...interface{}) {
|
||||
pCondSet.Manage(ps).MarkFalse(ParallelConditionEventPoliciesReady, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
// MarkEventPoliciesUnknown marks the ParallelConditionEventPoliciesReady as Unknown with the given reason and message.
|
||||
func (ps *ParallelStatus) MarkEventPoliciesUnknown(reason, messageFormat string, messageA ...interface{}) {
|
||||
pCondSet.Manage(ps).MarkUnknown(ParallelConditionEventPoliciesReady, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
// MarkEventPoliciesTrue marks the ParallelConditionEventPoliciesReady as True.
|
||||
func (ps *ParallelStatus) MarkEventPoliciesTrue() {
|
||||
pCondSet.Manage(ps).MarkTrue(ParallelConditionEventPoliciesReady)
|
||||
}
|
||||
|
||||
// MarkEventPoliciesTrueWithReason marks the ParallelConditionEventPoliciesReady as True with the given reason and message.
|
||||
func (ps *ParallelStatus) MarkEventPoliciesTrueWithReason(reason, messageFormat string, messageA ...interface{}) {
|
||||
pCondSet.Manage(ps).MarkTrueWithReason(ParallelConditionEventPoliciesReady, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,13 @@ import (
|
|||
duckv1 "knative.dev/pkg/apis/duck/v1"
|
||||
)
|
||||
|
||||
var sCondSet = apis.NewLivingConditionSet(SequenceConditionReady, SequenceConditionChannelsReady, SequenceConditionSubscriptionsReady, SequenceConditionAddressable)
|
||||
var sCondSet = apis.NewLivingConditionSet(
|
||||
SequenceConditionReady,
|
||||
SequenceConditionChannelsReady,
|
||||
SequenceConditionSubscriptionsReady,
|
||||
SequenceConditionAddressable,
|
||||
SequenceConditionEventPoliciesReady,
|
||||
)
|
||||
|
||||
const (
|
||||
// SequenceConditionReady has status True when all subconditions below have been set to True.
|
||||
|
|
@ -45,6 +51,10 @@ const (
|
|||
// SequenceConditionAddressable has status true when this Sequence meets
|
||||
// the Addressable contract and has a non-empty hostname.
|
||||
SequenceConditionAddressable apis.ConditionType = "Addressable"
|
||||
|
||||
// SequenceConditionEventPoliciesReady has status True when all the applying EventPolicies for this
|
||||
// Sequence are ready.
|
||||
SequenceConditionEventPoliciesReady apis.ConditionType = "EventPoliciesReady"
|
||||
)
|
||||
|
||||
// GetConditionSet retrieves the condition set for this resource. Implements the KRShaped interface.
|
||||
|
|
@ -189,6 +199,22 @@ func (ss *SequenceStatus) MarkAddressableNotReady(reason, messageFormat string,
|
|||
sCondSet.Manage(ss).MarkUnknown(SequenceConditionAddressable, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
func (ss *SequenceStatus) MarkEventPoliciesFailed(reason, messageFormat string, messageA ...interface{}) {
|
||||
sCondSet.Manage(ss).MarkFalse(SequenceConditionEventPoliciesReady, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
func (ss *SequenceStatus) MarkEventPoliciesUnknown(reason, messageFormat string, messageA ...interface{}) {
|
||||
sCondSet.Manage(ss).MarkUnknown(SequenceConditionEventPoliciesReady, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
func (ss *SequenceStatus) MarkEventPoliciesTrue() {
|
||||
sCondSet.Manage(ss).MarkTrue(SequenceConditionEventPoliciesReady)
|
||||
}
|
||||
|
||||
func (ss *SequenceStatus) MarkEventPoliciesTrueWithReason(reason, messageFormat string, messageA ...interface{}) {
|
||||
sCondSet.Manage(ss).MarkTrueWithReason(SequenceConditionEventPoliciesReady, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
func (ss *SequenceStatus) setAddress(address *duckv1.Addressable) {
|
||||
if address == nil || address.URL == nil {
|
||||
ss.Address = duckv1.Addressable{}
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ var chCondSet = apis.NewLivingConditionSet(
|
|||
ChannelConditionBackingChannelReady,
|
||||
ChannelConditionAddressable,
|
||||
ChannelConditionDeadLetterSinkResolved,
|
||||
ChannelConditionEventPoliciesReady,
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
@ -45,6 +46,10 @@ const (
|
|||
// ChannelConditionDeadLetterSinkResolved has status True when there is a Dead Letter Sink ref or URI
|
||||
// defined in the Spec.Delivery, is a valid destination and its correctly resolved into a valid URI
|
||||
ChannelConditionDeadLetterSinkResolved apis.ConditionType = "DeadLetterSinkResolved"
|
||||
|
||||
// ChannelConditionEventPoliciesReady has status True when all the EventPolicies which reference this
|
||||
// Channel are Ready too.
|
||||
ChannelConditionEventPoliciesReady apis.ConditionType = "EventPoliciesReady"
|
||||
)
|
||||
|
||||
// GetConditionSet retrieves the condition set for this resource. Implements the KRShaped interface.
|
||||
|
|
@ -146,3 +151,19 @@ func (cs *ChannelStatus) MarkDeadLetterSinkResolvedFailed(reason, messageFormat
|
|||
cs.DeliveryStatus = eventingduck.DeliveryStatus{}
|
||||
chCondSet.Manage(cs).MarkFalse(ChannelConditionDeadLetterSinkResolved, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
func (cs *ChannelStatus) MarkEventPoliciesFailed(reason, messageFormat string, messageA ...interface{}) {
|
||||
chCondSet.Manage(cs).MarkFalse(ChannelConditionEventPoliciesReady, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
func (cs *ChannelStatus) MarkEventPoliciesUnknown(reason, messageFormat string, messageA ...interface{}) {
|
||||
chCondSet.Manage(cs).MarkUnknown(ChannelConditionEventPoliciesReady, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
func (cs *ChannelStatus) MarkEventPoliciesTrue() {
|
||||
chCondSet.Manage(cs).MarkTrue(ChannelConditionEventPoliciesReady)
|
||||
}
|
||||
|
||||
func (cs *ChannelStatus) MarkEventPoliciesTrueWithReason(reason, messageFormat string, messageA ...interface{}) {
|
||||
chCondSet.Manage(cs).MarkTrueWithReason(ChannelConditionEventPoliciesReady, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ var imcCondSet = apis.NewLivingConditionSet(
|
|||
InMemoryChannelConditionAddressable,
|
||||
InMemoryChannelConditionChannelServiceReady,
|
||||
InMemoryChannelConditionDeadLetterSinkResolved,
|
||||
InMemoryChannelConditionEventPoliciesReady,
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
@ -64,6 +65,10 @@ const (
|
|||
// InMemoryChannelConditionDeadLetterSinkResolved has status True when there is a Dead Letter Sink ref or URI
|
||||
// defined in the Spec.Delivery, is a valid destination and its correctly resolved into a valid URI
|
||||
InMemoryChannelConditionDeadLetterSinkResolved apis.ConditionType = "DeadLetterSinkResolved"
|
||||
|
||||
// InMemoryChannelConditionEventPoliciesReady has status True when all the applying EventPolicies for this
|
||||
// InMemoryChannel are ready.
|
||||
InMemoryChannelConditionEventPoliciesReady apis.ConditionType = "EventPoliciesReady"
|
||||
)
|
||||
|
||||
// GetConditionSet retrieves the condition set for this resource. Implements the KRShaped interface.
|
||||
|
|
@ -182,3 +187,19 @@ func (imcs *InMemoryChannelStatus) MarkDeadLetterSinkResolvedFailed(reason, mess
|
|||
imcs.DeliveryStatus = eventingduck.DeliveryStatus{}
|
||||
imcCondSet.Manage(imcs).MarkFalse(InMemoryChannelConditionDeadLetterSinkResolved, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
func (imcs *InMemoryChannelStatus) MarkEventPoliciesFailed(reason, messageFormat string, messageA ...interface{}) {
|
||||
imcCondSet.Manage(imcs).MarkFalse(InMemoryChannelConditionEventPoliciesReady, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
func (imcs *InMemoryChannelStatus) MarkEventPoliciesUnknown(reason, messageFormat string, messageA ...interface{}) {
|
||||
imcCondSet.Manage(imcs).MarkUnknown(InMemoryChannelConditionEventPoliciesReady, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
func (imcs *InMemoryChannelStatus) MarkEventPoliciesTrue() {
|
||||
imcCondSet.Manage(imcs).MarkTrue(InMemoryChannelConditionEventPoliciesReady)
|
||||
}
|
||||
|
||||
func (imcs *InMemoryChannelStatus) MarkEventPoliciesTrueWithReason(reason, messageFormat string, messageA ...interface{}) {
|
||||
imcCondSet.Manage(imcs).MarkTrueWithReason(InMemoryChannelConditionEventPoliciesReady, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,10 +73,6 @@ type InMemoryChannelSpec struct {
|
|||
type InMemoryChannelStatus struct {
|
||||
// Channel conforms to Duck type ChannelableStatus.
|
||||
eventingduckv1.ChannelableStatus `json:",inline"`
|
||||
|
||||
// AppliedEventPoliciesStatus contains the list of EventPolicies which apply to this Broker
|
||||
// +optional
|
||||
eventingduckv1.AppliedEventPoliciesStatus `json:",inline"`
|
||||
}
|
||||
|
||||
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
||||
|
|
|
|||
|
|
@ -245,7 +245,6 @@ func (in *InMemoryChannelSpec) DeepCopy() *InMemoryChannelSpec {
|
|||
func (in *InMemoryChannelStatus) DeepCopyInto(out *InMemoryChannelStatus) {
|
||||
*out = *in
|
||||
in.ChannelableStatus.DeepCopyInto(&out.ChannelableStatus)
|
||||
in.AppliedEventPoliciesStatus.DeepCopyInto(&out.AppliedEventPoliciesStatus)
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ import (
|
|||
"knative.dev/pkg/apis"
|
||||
|
||||
"knative.dev/eventing/pkg/apis/sinks"
|
||||
duckv1 "knative.dev/pkg/apis/duck/v1"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
@ -30,10 +31,15 @@ const (
|
|||
JobSinkConditionReady = apis.ConditionReady
|
||||
|
||||
JobSinkConditionAddressable apis.ConditionType = "Addressable"
|
||||
|
||||
// JobSinkConditionEventPoliciesReady has status True when all the applying EventPolicies for this
|
||||
// JobSink are ready.
|
||||
JobSinkConditionEventPoliciesReady apis.ConditionType = "EventPoliciesReady"
|
||||
)
|
||||
|
||||
var JobSinkCondSet = apis.NewLivingConditionSet(
|
||||
JobSinkConditionAddressable,
|
||||
JobSinkConditionEventPoliciesReady,
|
||||
)
|
||||
|
||||
// GetConditionSet retrieves the condition set for this resource. Implements the KRShaped interface.
|
||||
|
|
@ -71,8 +77,43 @@ func (s *JobSinkStatus) InitializeConditions() {
|
|||
JobSinkCondSet.Manage(s).InitializeConditions()
|
||||
}
|
||||
|
||||
// MarkAddressableReady marks the Addressable condition to True.
|
||||
func (s *JobSinkStatus) MarkAddressableReady() {
|
||||
JobSinkCondSet.Manage(s).MarkTrue(JobSinkConditionAddressable)
|
||||
}
|
||||
|
||||
// MarkEventPoliciesFailed marks the EventPoliciesReady condition to False with the given reason and message.
|
||||
func (s *JobSinkStatus) MarkEventPoliciesFailed(reason, messageFormat string, messageA ...interface{}) {
|
||||
JobSinkCondSet.Manage(s).MarkFalse(JobSinkConditionEventPoliciesReady, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
// MarkEventPoliciesUnknown marks the EventPoliciesReady condition to Unknown with the given reason and message.
|
||||
func (s *JobSinkStatus) MarkEventPoliciesUnknown(reason, messageFormat string, messageA ...interface{}) {
|
||||
JobSinkCondSet.Manage(s).MarkUnknown(JobSinkConditionEventPoliciesReady, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
// MarkEventPoliciesTrue marks the EventPoliciesReady condition to True.
|
||||
func (s *JobSinkStatus) MarkEventPoliciesTrue() {
|
||||
JobSinkCondSet.Manage(s).MarkTrue(JobSinkConditionEventPoliciesReady)
|
||||
}
|
||||
|
||||
// MarkEventPoliciesTrueWithReason marks the EventPoliciesReady condition to True with the given reason and message.
|
||||
func (s *JobSinkStatus) MarkEventPoliciesTrueWithReason(reason, messageFormat string, messageA ...interface{}) {
|
||||
JobSinkCondSet.Manage(s).MarkTrueWithReason(JobSinkConditionEventPoliciesReady, reason, messageFormat, messageA...)
|
||||
}
|
||||
|
||||
func (e *JobSink) SetJobStatusSelector() {
|
||||
if e.Spec.Job != nil {
|
||||
e.Status.JobStatus.Selector = fmt.Sprintf("%s=%s", sinks.JobSinkNameLabel, e.GetName())
|
||||
}
|
||||
}
|
||||
|
||||
func (s *JobSinkStatus) SetAddress(address *duckv1.Addressable) {
|
||||
s.Address = address
|
||||
if address == nil || address.URL.IsEmpty() {
|
||||
JobSinkCondSet.Manage(s).MarkFalse(JobSinkConditionAddressable, "EmptyHostname", "hostname is the empty string")
|
||||
} else {
|
||||
JobSinkCondSet.Manage(s).MarkTrue(JobSinkConditionAddressable)
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ import (
|
|||
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1"
|
||||
duckv1 "knative.dev/pkg/apis/duck/v1"
|
||||
"knative.dev/pkg/kmeta"
|
||||
)
|
||||
|
|
@ -68,6 +69,10 @@ type JobSinkStatus struct {
|
|||
|
||||
// +optional
|
||||
JobStatus JobStatus `json:"job,omitempty"`
|
||||
|
||||
// AppliedEventPoliciesStatus contains the list of EventPolicies which apply to this JobSink
|
||||
// +optional
|
||||
eventingduckv1.AppliedEventPoliciesStatus `json:",inline"`
|
||||
}
|
||||
|
||||
type JobStatus struct {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
/*
|
||||
Copyright 2024 The Knative Authors
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package v1alpha1
|
||||
|
||||
import (
|
||||
"github.com/google/go-cmp/cmp/cmpopts"
|
||||
"knative.dev/pkg/apis"
|
||||
)
|
||||
|
||||
var (
|
||||
ignoreAllButTypeAndStatus = cmpopts.IgnoreFields(
|
||||
apis.Condition{},
|
||||
"LastTransitionTime", "Message", "Reason", "Severity")
|
||||
)
|
||||
|
|
@ -114,6 +114,7 @@ func (in *JobSinkStatus) DeepCopyInto(out *JobSinkStatus) {
|
|||
in.Status.DeepCopyInto(&out.Status)
|
||||
in.AddressStatus.DeepCopyInto(&out.AddressStatus)
|
||||
out.JobStatus = in.JobStatus
|
||||
in.AppliedEventPoliciesStatus.DeepCopyInto(&out.AppliedEventPoliciesStatus)
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,12 +17,12 @@ limitations under the License.
|
|||
package apis
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"reflect"
|
||||
"sort"
|
||||
"time"
|
||||
|
||||
"fmt"
|
||||
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
)
|
||||
|
|
@ -234,7 +234,7 @@ func (r conditionsImpl) ClearCondition(t ConditionType) error {
|
|||
}
|
||||
// Terminal conditions are not handled as they can't be nil
|
||||
if r.isTerminal(t) {
|
||||
return fmt.Errorf("clearing terminal conditions not implemented")
|
||||
return errors.New("clearing terminal conditions not implemented")
|
||||
}
|
||||
cond := r.GetCondition(t)
|
||||
if cond == nil {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ func ConvertToViaProxy(
|
|||
ctx context.Context,
|
||||
source, proxy, sink Convertible,
|
||||
) error {
|
||||
|
||||
if err := source.ConvertTo(ctx, proxy); err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -38,7 +37,6 @@ func ConvertFromViaProxy(
|
|||
ctx context.Context,
|
||||
source, proxy, sink Convertible,
|
||||
) error {
|
||||
|
||||
if err := proxy.ConvertFrom(ctx, source); err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ func getPrefixedNamedFieldValues(prefix string, obj interface{}) (map[string]ref
|
|||
return fields, inlined
|
||||
}
|
||||
|
||||
for i := 0; i < objValue.NumField(); i++ {
|
||||
for i := range objValue.NumField() {
|
||||
tf := objValue.Type().Field(i)
|
||||
if v := objValue.Field(i); v.IsValid() {
|
||||
jTag := tf.Tag.Get("json")
|
||||
|
|
|
|||
|
|
@ -54,10 +54,8 @@ type Addressable struct {
|
|||
Audience *string `json:"audience,omitempty"`
|
||||
}
|
||||
|
||||
var (
|
||||
// Addressable is a Convertible type.
|
||||
_ apis.Convertible = (*Addressable)(nil)
|
||||
)
|
||||
var _ apis.Convertible = (*Addressable)(nil)
|
||||
|
||||
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
||||
|
||||
|
|
|
|||
|
|
@ -103,11 +103,11 @@ func (d *Destination) SetDefaults(ctx context.Context) {
|
|||
}
|
||||
}
|
||||
|
||||
func validateCACerts(CACert *string) *apis.FieldError {
|
||||
func validateCACerts(caCert *string) *apis.FieldError {
|
||||
// Check the object.
|
||||
var errs *apis.FieldError
|
||||
|
||||
block, err := pem.Decode([]byte(*CACert))
|
||||
block, err := pem.Decode([]byte(*caCert))
|
||||
if err != nil && block == nil {
|
||||
errs = errs.Also(apis.ErrInvalidValue("CA Cert provided is invalid", "caCert"))
|
||||
return errs
|
||||
|
|
|
|||
|
|
@ -102,7 +102,6 @@ func (kr *KReference) Validate(ctx context.Context) *apis.FieldError {
|
|||
Details: fmt.Sprintf("parent namespace: %q does not match ref: %q", parentNS, kr.Namespace),
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
return errs
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ func (t *KResource) Populate() {
|
|||
// Populate ALL fields
|
||||
Type: "Birthday",
|
||||
Status: corev1.ConditionTrue,
|
||||
LastTransitionTime: apis.VolatileTime{Inner: metav1.NewTime(time.Date(1984, 02, 28, 18, 52, 00, 00, time.UTC))},
|
||||
LastTransitionTime: apis.VolatileTime{Inner: metav1.NewTime(time.Date(1984, 2, 28, 18, 52, 0, 0, time.UTC))},
|
||||
Reason: "Celebrate",
|
||||
Message: "n3wScott, find your party hat :tada:",
|
||||
}}
|
||||
|
|
|
|||
|
|
@ -52,6 +52,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
|
|||
(&KResource{}).GetListType(),
|
||||
&AddressableType{},
|
||||
(&AddressableType{}).GetListType(),
|
||||
&AuthenticatableType{},
|
||||
(&AuthenticatableType{}).GetListType(),
|
||||
&Source{},
|
||||
(&Source{}).GetListType(),
|
||||
&WithPod{},
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ func (s *Source) Populate() {
|
|||
// Populate ALL fields
|
||||
Type: SourceConditionSinkProvided,
|
||||
Status: corev1.ConditionTrue,
|
||||
LastTransitionTime: apis.VolatileTime{Inner: metav1.NewTime(time.Date(1984, 02, 28, 18, 52, 00, 00, time.UTC))},
|
||||
LastTransitionTime: apis.VolatileTime{Inner: metav1.NewTime(time.Date(1984, 2, 28, 18, 52, 0, 0, time.UTC))},
|
||||
}}
|
||||
s.Status.SinkURI = &apis.URL{
|
||||
Scheme: "https",
|
||||
|
|
|
|||
|
|
@ -97,7 +97,6 @@ func (s *Status) ConvertTo(ctx context.Context, sink *Status, predicates ...func
|
|||
|
||||
conditions := make(apis.Conditions, 0, len(s.Conditions))
|
||||
for _, c := range s.Conditions {
|
||||
|
||||
// Copy over the "happy" condition, which is the only condition that
|
||||
// we can reliably transfer.
|
||||
if c.Type == apis.ConditionReady || c.Type == apis.ConditionSucceeded {
|
||||
|
|
|
|||
|
|
@ -167,11 +167,12 @@ func validateDestinationRef(ref corev1.ObjectReference) *apis.FieldError {
|
|||
|
||||
return errs
|
||||
}
|
||||
func validateCACerts(CACert *string) *apis.FieldError {
|
||||
|
||||
func validateCACerts(caCert *string) *apis.FieldError {
|
||||
// Check the object.
|
||||
var errs *apis.FieldError
|
||||
|
||||
block, err := pem.Decode([]byte(*CACert))
|
||||
block, err := pem.Decode([]byte(*caCert))
|
||||
if err != nil && block == nil {
|
||||
errs = errs.Also(apis.ErrInvalidValue("CA Cert provided is invalid", "caCert"))
|
||||
return errs
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ func (s *Source) Populate() {
|
|||
// Populate ALL fields
|
||||
Type: SourceConditionSinkProvided,
|
||||
Status: corev1.ConditionTrue,
|
||||
LastTransitionTime: apis.VolatileTime{Inner: metav1.NewTime(time.Date(1984, 02, 28, 18, 52, 00, 00, time.UTC))},
|
||||
LastTransitionTime: apis.VolatileTime{Inner: metav1.NewTime(time.Date(1984, 2, 28, 18, 52, 0, 0, time.UTC))},
|
||||
}}
|
||||
s.Status.SinkURI = &apis.URL{
|
||||
Scheme: "https",
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ func (t *KResource) Populate() {
|
|||
// Populate ALL fields
|
||||
Type: "Birthday",
|
||||
Status: corev1.ConditionTrue,
|
||||
LastTransitionTime: apis.VolatileTime{Inner: metav1.NewTime(time.Date(1984, 02, 28, 18, 52, 00, 00, time.UTC))},
|
||||
LastTransitionTime: apis.VolatileTime{Inner: metav1.NewTime(time.Date(1984, 2, 28, 18, 52, 0, 0, time.UTC))},
|
||||
Reason: "Celebrate",
|
||||
Message: "n3wScott, find your party hat :tada:",
|
||||
}}
|
||||
|
|
|
|||
|
|
@ -24,8 +24,10 @@ import (
|
|||
"knative.dev/pkg/kmp"
|
||||
)
|
||||
|
||||
type Implementable = ducktypes.Implementable
|
||||
type Populatable = ducktypes.Populatable
|
||||
type (
|
||||
Implementable = ducktypes.Implementable
|
||||
Populatable = ducktypes.Populatable
|
||||
)
|
||||
|
||||
// VerifyType verifies that a particular concrete resource properly implements
|
||||
// the provided Implementable duck type. It is expected that under the resource
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ limitations under the License.
|
|||
package apis
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
|
|
@ -41,7 +40,7 @@ func KindToResource(gvk schema.GroupVersionKind) schema.GroupVersionResource {
|
|||
func pluralizeKind(kind string) string {
|
||||
ret := strings.ToLower(kind)
|
||||
if strings.HasSuffix(ret, "s") {
|
||||
return fmt.Sprintf("%ses", ret)
|
||||
return ret + "es"
|
||||
}
|
||||
return fmt.Sprintf("%ss", ret)
|
||||
return ret + "s"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ limitations under the License.
|
|||
package args
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"errors"
|
||||
|
||||
"github.com/spf13/pflag"
|
||||
"k8s.io/gengo/args"
|
||||
|
|
@ -59,13 +59,13 @@ func Validate(genericArgs *args.GeneratorArgs) error {
|
|||
customArgs := genericArgs.CustomArgs.(*CustomArgs)
|
||||
|
||||
if len(genericArgs.OutputPackagePath) == 0 {
|
||||
return fmt.Errorf("output package cannot be empty")
|
||||
return errors.New("output package cannot be empty")
|
||||
}
|
||||
if len(customArgs.VersionedClientSetPackage) == 0 {
|
||||
return fmt.Errorf("versioned clientset package cannot be empty")
|
||||
return errors.New("versioned clientset package cannot be empty")
|
||||
}
|
||||
if len(customArgs.ExternalVersionsInformersPackage) == 0 {
|
||||
return fmt.Errorf("external versions informers package cannot be empty")
|
||||
return errors.New("external versions informers package cannot be empty")
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
|
|||
klog.Fatalf("Wrong CustomArgs type: %T", arguments.CustomArgs)
|
||||
}
|
||||
|
||||
versionPackagePath := filepath.Join(arguments.OutputPackagePath)
|
||||
versionPackagePath := filepath.Clean(arguments.OutputPackagePath)
|
||||
|
||||
var packageList generator.Packages
|
||||
|
||||
|
|
@ -389,8 +389,6 @@ func versionInformerPackages(basePackage string, groupPkgName string, gv clientg
|
|||
vers := make([]generator.Package, 0, 2*len(typesToGenerate))
|
||||
|
||||
for _, t := range typesToGenerate {
|
||||
// Fix for golang iterator bug.
|
||||
t := t
|
||||
packagePath := packagePath + "/" + strings.ToLower(t.Name.Name)
|
||||
typedInformerPackage := typedInformerPackage(groupPkgName, gv, customArgs.ExternalVersionsInformersPackage)
|
||||
|
||||
|
|
@ -501,7 +499,6 @@ func versionInformerPackages(basePackage string, groupPkgName string, gv clientg
|
|||
return tags.NeedsInformerInjection()
|
||||
},
|
||||
})
|
||||
|
||||
}
|
||||
return vers
|
||||
}
|
||||
|
|
@ -513,8 +510,6 @@ func reconcilerPackages(basePackage string, groupPkgName string, gv clientgentyp
|
|||
vers := make([]generator.Package, 0, 4*len(typesToGenerate))
|
||||
|
||||
for _, t := range typesToGenerate {
|
||||
// Fix for golang iterator bug.
|
||||
t := t
|
||||
extracted := extractCommentTags(t)
|
||||
reconcilerClasses, hasReconcilerClass := extractReconcilerClassesTag(extracted)
|
||||
nonNamespaced := isNonNamespaced(extracted)
|
||||
|
|
@ -677,7 +672,6 @@ func versionDuckPackages(basePackage string, groupPkgName string, gv clientgenty
|
|||
|
||||
for _, t := range typesToGenerate {
|
||||
// Fix for golang iterator bug.
|
||||
t := t
|
||||
packagePath := filepath.Join(packagePath, strings.ToLower(t.Name.Name))
|
||||
|
||||
// Impl
|
||||
|
|
|
|||
|
|
@ -31,10 +31,8 @@ const (
|
|||
ExampleChecksumAnnotation = "knative.dev/example-checksum"
|
||||
)
|
||||
|
||||
var (
|
||||
// Allows for normalizing by collapsing newlines.
|
||||
sequentialNewlines = regexp.MustCompile("(?:\r?\n)+")
|
||||
)
|
||||
var sequentialNewlines = regexp.MustCompile("(?:\r?\n)+")
|
||||
|
||||
// Checksum generates a checksum for the example value to be compared against
|
||||
// a respective annotation.
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ limitations under the License.
|
|||
package configmap
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"errors"
|
||||
"reflect"
|
||||
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
|
|
@ -58,17 +58,17 @@ func ValidateConstructor(constructor interface{}) error {
|
|||
cType := reflect.TypeOf(constructor)
|
||||
|
||||
if cType.Kind() != reflect.Func {
|
||||
return fmt.Errorf("config constructor must be a function")
|
||||
return errors.New("config constructor must be a function")
|
||||
}
|
||||
|
||||
if cType.NumIn() != 1 || cType.In(0) != reflect.TypeOf(&corev1.ConfigMap{}) {
|
||||
return fmt.Errorf("config constructor must be of the type func(*k8s.io/api/core/v1/ConfigMap) (..., error)")
|
||||
return errors.New("config constructor must be of the type func(*k8s.io/api/core/v1/ConfigMap) (..., error)")
|
||||
}
|
||||
|
||||
errorType := reflect.TypeOf((*error)(nil)).Elem()
|
||||
|
||||
if cType.NumOut() != 2 || !cType.Out(1).Implements(errorType) {
|
||||
return fmt.Errorf("config constructor must be of the type func(*k8s.io/api/core/v1/ConfigMap) (..., error)")
|
||||
return errors.New("config constructor must be of the type func(*k8s.io/api/core/v1/ConfigMap) (..., error)")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,8 +81,8 @@ func NewUntypedStore(
|
|||
name string,
|
||||
logger Logger,
|
||||
constructors Constructors,
|
||||
onAfterStore ...func(name string, value interface{})) *UntypedStore {
|
||||
|
||||
onAfterStore ...func(name string, value interface{}),
|
||||
) *UntypedStore {
|
||||
store := &UntypedStore{
|
||||
name: name,
|
||||
logger: logger,
|
||||
|
|
|
|||
|
|
@ -54,14 +54,12 @@ const (
|
|||
DefaultResyncPeriod = 10 * time.Hour
|
||||
)
|
||||
|
||||
var (
|
||||
// DefaultThreadsPerController is the number of threads to use
|
||||
// when processing the controller's workqueue. Controller binaries
|
||||
// may adjust this process-wide default. For finer control, invoke
|
||||
// Run on the controller directly.
|
||||
// TODO rename the const to Concurrency and deprecated this
|
||||
DefaultThreadsPerController = 2
|
||||
)
|
||||
var DefaultThreadsPerController = 2
|
||||
|
||||
// Reconciler is the interface that controller implementations are expected
|
||||
// to implement, so that the shared controller.Impl can drive work through it.
|
||||
|
|
@ -226,7 +224,7 @@ type Impl struct {
|
|||
|
||||
// ControllerOptions encapsulates options for creating a new controller,
|
||||
// including throttling and stats behavior.
|
||||
type ControllerOptions struct { //nolint // for backcompat.
|
||||
type ControllerOptions struct {
|
||||
WorkQueueName string
|
||||
Logger *zap.SugaredLogger
|
||||
Reporter StatsReporter
|
||||
|
|
@ -484,7 +482,7 @@ func (c *Impl) RunContext(ctx context.Context, threadiness int) error {
|
|||
|
||||
// Launch workers to process resources that get enqueued to our workqueue.
|
||||
c.logger.Info("Starting controller and workers")
|
||||
for i := 0; i < threadiness; i++ {
|
||||
for range threadiness {
|
||||
sg.Add(1)
|
||||
go func() {
|
||||
defer sg.Done()
|
||||
|
|
@ -625,7 +623,6 @@ func IsSkipKey(err error) bool {
|
|||
// Is implements the Is() interface of error. It returns whether the target
|
||||
// error can be treated as equivalent to a permanentError.
|
||||
func (skipKeyError) Is(target error) bool {
|
||||
//nolint: errorlint // This check is actually fine.
|
||||
_, ok := target.(skipKeyError)
|
||||
return ok
|
||||
}
|
||||
|
|
@ -652,7 +649,6 @@ func IsPermanentError(err error) bool {
|
|||
// Is implements the Is() interface of error. It returns whether the target
|
||||
// error can be treated as equivalent to a permanentError.
|
||||
func (permanentError) Is(target error) bool {
|
||||
//nolint: errorlint // This check is actually fine.
|
||||
_, ok := target.(permanentError)
|
||||
return ok
|
||||
}
|
||||
|
|
@ -712,7 +708,6 @@ func IsRequeueKey(err error) (bool, time.Duration) {
|
|||
// Is implements the Is() interface of error. It returns whether the target
|
||||
// error can be treated as equivalent to a requeueKeyError.
|
||||
func (requeueKeyError) Is(target error) bool {
|
||||
//nolint: errorlint // This check is actually fine.
|
||||
_, ok := target.(requeueKeyError)
|
||||
return ok
|
||||
}
|
||||
|
|
@ -728,7 +723,6 @@ type Informer interface {
|
|||
// of them to synchronize.
|
||||
func StartInformers(stopCh <-chan struct{}, informers ...Informer) error {
|
||||
for _, informer := range informers {
|
||||
informer := informer
|
||||
go informer.Run(stopCh)
|
||||
}
|
||||
|
||||
|
|
@ -746,7 +740,6 @@ func RunInformers(stopCh <-chan struct{}, informers ...Informer) (func(), error)
|
|||
var wg sync.WaitGroup
|
||||
wg.Add(len(informers))
|
||||
for _, informer := range informers {
|
||||
informer := informer
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
informer.Run(stopCh)
|
||||
|
|
@ -764,8 +757,8 @@ func RunInformers(stopCh <-chan struct{}, informers ...Informer) (func(), error)
|
|||
// WaitForCacheSyncQuick is the same as cache.WaitForCacheSync but with a much reduced
|
||||
// check-rate for the sync period.
|
||||
func WaitForCacheSyncQuick(stopCh <-chan struct{}, cacheSyncs ...cache.InformerSynced) bool {
|
||||
err := wait.PollImmediateUntil(time.Millisecond,
|
||||
func() (bool, error) {
|
||||
err := wait.PollUntilContextCancel(wait.ContextForChannel(stopCh), time.Millisecond, true,
|
||||
func(context.Context) (bool, error) {
|
||||
for _, syncFunc := range cacheSyncs {
|
||||
if !syncFunc() {
|
||||
return false, nil
|
||||
|
|
@ -773,7 +766,7 @@ func WaitForCacheSyncQuick(stopCh <-chan struct{}, cacheSyncs ...cache.InformerS
|
|||
}
|
||||
return true, nil
|
||||
},
|
||||
stopCh)
|
||||
)
|
||||
return err == nil
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -194,7 +194,6 @@ func (r *reporter) ReportReconcile(duration time.Duration, success string, key t
|
|||
tag.Insert(successTagKey, success),
|
||||
tag.Insert(NamespaceTagKey, key.Namespace),
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,7 +86,6 @@ func (c *ClientConfig) GetRESTConfig() (*rest.Config, error) {
|
|||
loadingRules,
|
||||
overrides,
|
||||
).ClientConfig()
|
||||
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to create client config: %w", err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2020 The Knative Authors
|
||||
# Copyright 2024 The Knative Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
@ -18,12 +18,6 @@ set -o errexit
|
|||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
source $(dirname "$0")/../vendor/knative.dev/hack/library.sh
|
||||
|
||||
run_go_tool knative.dev/test-infra/buoy \
|
||||
buoy float ${REPO_ROOT_DIR}/go.mod \
|
||||
--release "$1" --domain k8s.io --ruleset=Release \
|
||||
| xargs -n1 -t go get -d
|
||||
|
||||
./hack/update-deps.sh
|
||||
go run mvdan.cc/gofumpt@latest -l -w .
|
||||
|
||||
|
|
@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
|
|||
limitations under the License.
|
||||
*/
|
||||
|
||||
//nolint:fatcontext
|
||||
package injection
|
||||
|
||||
import (
|
||||
|
|
@ -93,7 +94,6 @@ func (i *impl) SetupInformers(ctx context.Context, cfg *rest.Config) (context.Co
|
|||
for _, fii := range i.GetFilteredInformers() {
|
||||
ctx, filteredinfs = fii(ctx)
|
||||
informers = append(informers, filteredinfs...)
|
||||
|
||||
}
|
||||
return ctx, informers
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ package kmeta
|
|||
|
||||
import (
|
||||
"crypto/md5" //nolint:gosec // No strong cryptography needed.
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"regexp"
|
||||
)
|
||||
|
|
@ -53,7 +54,7 @@ func ChildName(parent, suffix string) string {
|
|||
// Format the return string, if it's shorter than longest: pad with
|
||||
// beginning of the suffix. This happens, for example, when parent is
|
||||
// short, but the suffix is very long.
|
||||
ret := parent + fmt.Sprintf("%x", h)
|
||||
ret := parent + hex.EncodeToString(h[:])
|
||||
if d := longest - len(ret); d > 0 {
|
||||
ret += suffix[:d]
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue