diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index f53b3fad0..c83d2e84b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -40,7 +40,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -53,7 +53,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -66,6 +66,6 @@ jobs: # ./location_of_script_within_repo/buildscript.sh - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 652684e8e..8059176c6 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -10,15 +10,15 @@ jobs: test: strategy: matrix: - go-version: [1.19.x, 1.21.x] + go-version: [1.19.x, 1.22.x] os: [ubuntu-latest] runs-on: ${{ matrix.os }} steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} cache: true @@ -38,12 +38,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: - go-version: 1.21.x + go-version: 1.22.x cache: true - name: Install openssl @@ -60,12 +60,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: - go-version: 1.21.x + go-version: 1.22.x cache: true - name: Lint diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 48d010307..c76d41cc0 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -10,13 +10,13 @@ jobs: test: strategy: matrix: - go-version: [1.18.x, 1.20.x] + go-version: [1.18.x, 1.22.x] # add macos-12 when runners are available on github. os: [macos-11] runs-on: ${{ matrix.os }} steps: - name: Set up Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} diff --git a/go.mod b/go.mod index 1c5d23178..7d22842a8 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 golang.org/x/term v0.15.0 golang.org/x/text v0.14.0 - v.io/x/lib v0.1.17 + v.io/x/lib v0.1.19 v.io/x/ref/internal/logger v0.1.1 v.io/x/ref/lib/flags/sitedefaults v0.1.1 v.io/x/ref/test/compatibility/modules/simple v0.0.0-20220116222041-f948f3a44e0d diff --git a/v23/flow/errors.go b/v23/flow/errors.go index 4d708beda..f99eb5b9c 100644 --- a/v23/flow/errors.go +++ b/v23/flow/errors.go @@ -11,13 +11,13 @@ import "v.io/v23/verror" // These were previously defined in errors.vdl using the ID values // below rather than the more conventional Err. var ( - ErrAuth = verror.NewID("Auth") - ErrNotTrusted = verror.NewID("NotTrusted") - ErrNetwork = verror.NewID("Network") - ErrDialFailed = verror.NewID("DialFailed") - ErrResolveFailed = verror.NewID("ResolveFailed") - ErrProxy = verror.NewID("Proxy") - ErrBadArg = verror.NewID("BadArg") - ErrBadState = verror.NewID("BadState") - ErrAborted = verror.NewID("Aborted") + ErrAuth = verror.NewID("v.io/v23/flow.Auth") + ErrNotTrusted = verror.NewID("v.io/v23/flow.NotTrusted") + ErrNetwork = verror.NewID("v.io/v23/flow.Network") + ErrDialFailed = verror.NewID("v.io/v23/flow.DialFailed") + ErrResolveFailed = verror.NewID("v.io/v23/flow.ResolveFailed") + ErrProxy = verror.NewID("v.io/v23/flow.Proxy") + ErrBadArg = verror.NewID("v.io/v23/flow.BadArg") + ErrBadState = verror.NewID("v.io/v23/flow.BadState") + ErrAborted = verror.NewID("v.io/v23/flow.Aborted") ) diff --git a/v23/flow/message/errors.go b/v23/flow/message/errors.go index 8d016b45a..74878e75a 100644 --- a/v23/flow/message/errors.go +++ b/v23/flow/message/errors.go @@ -12,10 +12,10 @@ import ( ) var ( - ErrInvalidMsg = verror.NewID("InvalidMsg") - ErrInvalidSetupOption = verror.NewID("InvalidSetupOption") - ErrUnknownMsg = verror.NewID("UnknownMsg") - ErrMissingBlessings = verror.NewID("MissingBlessings") + ErrInvalidMsg = verror.NewID("v.io/v23/flow/messages.InvalidMsg") + ErrInvalidSetupOption = verror.NewID("v.io/v23/flow/messages.InvalidSetupOption") + ErrUnknownMsg = verror.NewID("v.io/v23/flow/messages.UnknownMsg") + ErrMissingBlessings = verror.NewID("v.io/v23/flow/messages.MissingBlessings") ) // NewErrInvalidMsg creates an instance ErrInvalidMsg with the specified parameters which can be diff --git a/v23/naming/model.go b/v23/naming/model.go index 54be7cca0..ce0275465 100644 --- a/v23/naming/model.go +++ b/v23/naming/model.go @@ -13,11 +13,11 @@ const ( ) var ( - ErrNameExists = verror.NewID("nameExists") - ErrNoSuchName = verror.NewID("nameDoesntExist") - ErrNoSuchNameRoot = verror.NewID("rootNameDoesntExist") - ErrResolutionDepthExceeded = verror.NewID("resolutionDepthExceeded") - ErrNoMountTable = verror.NewID("noMounttable") + ErrNameExists = verror.NewID("v.io/v23/naming.nameExists") + ErrNoSuchName = verror.NewID("v.io/v23/naming.nameDoesntExist") + ErrNoSuchNameRoot = verror.NewID("v.io/v23/naming.rootNameDoesntExist") + ErrResolutionDepthExceeded = verror.NewID("v.io/v23/naming.resolutionDepthExceeded") + ErrNoMountTable = verror.NewID("v.io/v23/naming.noMounttable") ) // Names returns the servers represented by MountEntry as names, including diff --git a/v23/verror/pkgpath.go b/v23/verror/pkgpath.go index b921f83a1..687994f69 100644 --- a/v23/verror/pkgpath.go +++ b/v23/verror/pkgpath.go @@ -110,8 +110,12 @@ func ensurePackagePath(id ID) ID { if strings.Contains(sid, ".") && sid[0] != '.' { return id } - _, file, _, _ := runtime.Caller(2) + _, file, _, ok := runtime.Caller(2) pkg := pkgPathCache.pkgPath(file) + if ok && file == "" { + // See https://github.com/golang/go/issues/64520 + panic("verror.NewID was called to initialize a global variable, specify the full package path in the ID or move the call to NewID to an init function\nNOTE that the stack trace shown below is not useful since its incorrect contents are the cause of the problem, see https://github.com/golang/go/issues/64520") + } if len(pkg) == 0 { return id } diff --git a/v23/vom/dump.go b/v23/vom/dump.go index a163a45a4..252617826 100644 --- a/v23/vom/dump.go +++ b/v23/vom/dump.go @@ -15,10 +15,14 @@ import ( ) var ( - errDumperClosed = verror.NewID("errDumperClosed") - errDumperFlushed = verror.NewID("errDumperFlushed") + errDumperClosed, errDumperFlushed verror.IDAction ) +func init() { + errDumperClosed = verror.NewID("errDumperClosed") + errDumperFlushed = verror.NewID("errDumperFlushed") +} + // Dump returns a human-readable dump of the given vom data, in the default // string format. func Dump(data []byte) (string, error) { diff --git a/x/ref/aws/go.mod b/x/ref/aws/go.mod index b70a72dfc..39e573734 100644 --- a/x/ref/aws/go.mod +++ b/x/ref/aws/go.mod @@ -9,26 +9,26 @@ require ( require ( github.com/andybalholm/brotli v1.1.0 // indirect - github.com/aws/aws-sdk-go v1.50.6 // indirect - github.com/golang/protobuf v1.5.3 // indirect - github.com/google/uuid v1.4.0 // indirect + github.com/aws/aws-sdk-go v1.50.38 // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect - github.com/klauspost/compress v1.17.5 // indirect + github.com/klauspost/compress v1.17.7 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasthttp v1.51.0 // indirect + github.com/valyala/fasthttp v1.52.0 // indirect github.com/vanadium/go-mdns-sd v0.0.0-20230219002252-724533cf06f5 // indirect github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect - golang.org/x/crypto v0.18.0 // indirect - golang.org/x/net v0.20.0 // indirect - golang.org/x/sys v0.16.0 // indirect - golang.org/x/term v0.16.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/sys v0.18.0 // indirect + golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect - google.golang.org/grpc v1.61.0 // indirect - google.golang.org/protobuf v1.32.0 // indirect - v.io/x/lib v0.1.18 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 // indirect + google.golang.org/grpc v1.62.1 // indirect + google.golang.org/protobuf v1.33.0 // indirect + v.io/x/lib v0.1.19 // indirect v.io/x/ref/internal/logger v0.1.1 // indirect v.io/x/ref/lib/flags/sitedefaults v0.1.1 // indirect ) diff --git a/x/ref/aws/go.sum b/x/ref/aws/go.sum index 372293bd1..dfbdffe0e 100644 --- a/x/ref/aws/go.sum +++ b/x/ref/aws/go.sum @@ -1,39 +1,17 @@ github.com/DATA-DOG/go-sqlmock v1.4.1 h1:ThlnYciV1iM/V0OSF/dtkqWb6xo5qITT1TJBG1MRDJM= -github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= -github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= -github.com/aws/aws-sdk-go v1.44.324 h1:/uja9PtgeeqrZCPOJTenjMLNpciIMuzaRKooq+erG4A= -github.com/aws/aws-sdk-go v1.44.324/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= -github.com/aws/aws-sdk-go v1.46.4 h1:48tKgtm9VMPkb6y7HuYlsfhQmoIRAsTEXTsWLVlty4M= -github.com/aws/aws-sdk-go v1.46.4/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= -github.com/aws/aws-sdk-go v1.49.4 h1:qiXsqEeLLhdLgUIyfr5ot+N/dGPWALmtM1SetRmbUlY= -github.com/aws/aws-sdk-go v1.49.4/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= -github.com/aws/aws-sdk-go v1.49.5 h1:y2yfBlwjPDi3/sBVKeznYEdDy6wIhjA2L5NCBMLUIYA= -github.com/aws/aws-sdk-go v1.49.5/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= -github.com/aws/aws-sdk-go v1.49.13 h1:f4mGztsgnx2dR9r8FQYa9YW/RsKb+N7bgef4UGrOW1Y= -github.com/aws/aws-sdk-go v1.49.13/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= -github.com/aws/aws-sdk-go v1.50.6 h1:FaXvNwHG3Ri1paUEW16Ahk9zLVqSAdqa1M3phjZR35Q= -github.com/aws/aws-sdk-go v1.50.6/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= -github.com/aws/aws-xray-sdk-go v1.8.1 h1:O4pXV+hnCskaamGsZnFpzHyAmgPGusBMN6i7nnsy0Fo= -github.com/aws/aws-xray-sdk-go v1.8.1/go.mod h1:wMmVYzej3sykAttNBkXQHK/+clAPWTOrPiajEk7Cp3A= -github.com/aws/aws-xray-sdk-go v1.8.2 h1:PVxNWnQG+rAYjxsmhEN97DTO57Dipg6VS0wsu6bXUB0= -github.com/aws/aws-xray-sdk-go v1.8.2/go.mod h1:wMmVYzej3sykAttNBkXQHK/+clAPWTOrPiajEk7Cp3A= +github.com/aws/aws-sdk-go v1.50.38 h1:h8wxaLin7sFGK4sKassc1VpNcDbgAAEQJ5PHjqLAvXQ= +github.com/aws/aws-sdk-go v1.50.38/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-xray-sdk-go v1.8.3 h1:S8GdgVncBRhzbNnNUgTPwhEqhwt2alES/9rLASyhxjU= github.com/aws/aws-xray-sdk-go v1.8.3/go.mod h1:tv8uLMOSCABolrIF8YCcp3ghyswArsan8dfLCA1ZATk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= @@ -41,14 +19,8 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= -github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= -github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= -github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= +github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -58,110 +30,38 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.48.0 h1:oJWvHb9BIZToTQS3MuQ2R3bJZiNSa2KiNdeI8A+79Tc= -github.com/valyala/fasthttp v1.48.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= -github.com/valyala/fasthttp v1.50.0 h1:H7fweIlBm0rXLs2q0XbalvJ6r0CUPFWK3/bB4N13e9M= -github.com/valyala/fasthttp v1.50.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= -github.com/valyala/fasthttp v1.51.0 h1:8b30A5JlZ6C7AS81RsWjYMQmrZG6feChmgAolCl1SqA= -github.com/valyala/fasthttp v1.51.0/go.mod h1:oI2XroL+lI7vdXyYoQk03bXBThfFl2cVdIA3Xl7cH8g= +github.com/valyala/fasthttp v1.52.0 h1:wqBQpxH71XW0e2g+Og4dzQM8pk34aFYlA1Ga8db7gU0= +github.com/valyala/fasthttp v1.52.0/go.mod h1:hf5C4QnVMkNXMspnsUlfM3WitlgYflyhHYoKol/szxQ= github.com/vanadium/go-mdns-sd v0.0.0-20230219002252-724533cf06f5 h1:QPlkzUCbajbvYHj5Kzxj3E/vCsjWWA0L4QfgcYclWSQ= github.com/vanadium/go-mdns-sd v0.0.0-20230219002252-724533cf06f5/go.mod h1:bsbZ2pPLNCp5PK64xirPh9POI6LXH30ZS0M5Ar+FfI8= github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a h1:fZHgsYlfvtyqToslyjUt3VOPF4J7aK/3MPcK7xp3PDk= github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/R083muKhosV54bj5niojjWZvU8xrevuH4= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.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.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= -golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 h1:lv6/DhyiFFGsmzxbsUUTOkN29II+zeWHxvT8Lpdxsv0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b h1:ZlWIi1wSK56/8hn4QcBp/j9M7Gt3U/3hZw3mC7vDICo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 h1:/jFB8jK5R3Sq3i/lmeZO0cATSzFfZaJq1J2Euan3XKU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0/go.mod h1:FUoWkonphQm3RhTS+kOEhF8h0iDpm4tdXolVCeZ9KKA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 h1:6G8oQ016D88m1xAKljMlBOOGWDZkes4kMhgGFlf8WcQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917/go.mod h1:xtjpI3tXFPP051KaWnhvxkiubL/6dJ18vLVf7q2pTOU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe h1:bQnxqljG/wqi4NTXu2+DJ3n7APcEA882QZ1JvhQAq9o= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= -google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= -google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= -google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= -google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= -google.golang.org/grpc v1.60.0 h1:6FQAR0kM31P6MRdeluor2w2gPaS4SVNrD/DNTxrQ15k= -google.golang.org/grpc v1.60.0/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= -google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= -google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= -google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= -google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 h1:8EeVk1VKMD+GD/neyEHGmz7pFblqPjHoi+PGQIlLx2s= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -169,14 +69,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= v.io v0.2.0 h1:ZkuugtTT7gzXPK/yehK08ysFSNW8QqlVxQcgAxVuhRk= v.io v0.2.0/go.mod h1:cbYlOXtCT+mmKr1mMdRUHLrdTN+4omjAULjpixRCg1A= v.io/x/lib v0.1.6/go.mod h1:aLm+mPXyXf4Vd/n+1f4LcSQFFgqNhNzwQvHYfXoOLlE= -v.io/x/lib v0.1.15 h1:zSqCzGmABaFcL0ZDMkCeVaOwAa/Miiym7MvhERdU0oI= -v.io/x/lib v0.1.15/go.mod h1:L2bJWOQoSaAZ9aS2AtD6x9eipa91gTR0ZsIaUrWa0Yc= -v.io/x/lib v0.1.16 h1:51OtWUAJtRhiwi3Ug3tv4WMjev9nlzHbYO5nz7zCdmo= -v.io/x/lib v0.1.16/go.mod h1:GiRiI83Rg3GMJPjD6KtvX4FtnMqyJxWGVAoH6cflQ0Q= -v.io/x/lib v0.1.17 h1:idQNidOA9rxinRO0lgNA5633FjkIOpMfQrcbsHnhAN0= -v.io/x/lib v0.1.17/go.mod h1:p+bOWzLs7abf+ONXTwIccdFlO10gkvKXEn0erWDMhMY= -v.io/x/lib v0.1.18 h1:WLdxdvYKC5boIYtClQZefZ70J85dRw0hae6XNqR9Zsg= -v.io/x/lib v0.1.18/go.mod h1:oDWVbZUuSOBRD5Xkxwe2qBD98oQGjJe1u7Z3CUzGDpE= +v.io/x/lib v0.1.19 h1:mVwqJavQ9IiXM0iINGC7mz5Zqihu2eI2iyCEeg429Hs= +v.io/x/lib v0.1.19/go.mod h1:ZOuZt/RoE9VePtg2o/ikeR3AGVcjzWSO2BGADoGZd5c= v.io/x/ref/internal/logger v0.1.1 h1:FZwqC6myQ4xMTgz6jIgZwQlIpuy/PtwTHY95qQFEzso= v.io/x/ref/internal/logger v0.1.1/go.mod h1:00nuJdZEVCzMOn9y474jZ+e6B9R/ydLW7d6IQFl/NHU= v.io/x/ref/lib/flags/sitedefaults v0.1.1 h1:jAeEpnfOK5ddeqjqJPi2X5WgbeYkCA+ogawkJyDgZMI= diff --git a/x/ref/examples/go.mod b/x/ref/examples/go.mod index 62883db2e..cbd152122 100644 --- a/x/ref/examples/go.mod +++ b/x/ref/examples/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/creack/pty v1.1.21 v.io v0.2.0 - v.io/x/lib v0.1.18 + v.io/x/lib v0.1.19 v.io/x/ref/internal/logger v0.1.1 ) @@ -14,9 +14,9 @@ require ( github.com/gorilla/websocket v1.5.1 // indirect github.com/vanadium/go-mdns-sd v0.0.0-20230219002252-724533cf06f5 // indirect github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect - golang.org/x/crypto v0.18.0 // indirect - golang.org/x/net v0.20.0 // indirect - golang.org/x/sys v0.16.0 // indirect - golang.org/x/term v0.16.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/sys v0.18.0 // indirect + golang.org/x/term v0.18.0 // indirect v.io/x/ref/lib/flags/sitedefaults v0.1.1 // indirect ) diff --git a/x/ref/examples/go.sum b/x/ref/examples/go.sum index ecf79dda3..5e9dfe641 100644 --- a/x/ref/examples/go.sum +++ b/x/ref/examples/go.sum @@ -1,18 +1,8 @@ -github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= -github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/creack/pty v1.1.21 h1:1/QdRyBaHHJP61QkWMXlOIBfsgdDeeKfK8SYVUWJKf0= github.com/creack/pty v1.1.21/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= -github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= -github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= @@ -23,59 +13,27 @@ github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= -golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= -golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= -golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= -golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= -golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= -golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= v.io v0.2.0 h1:ZkuugtTT7gzXPK/yehK08ysFSNW8QqlVxQcgAxVuhRk= v.io v0.2.0/go.mod h1:cbYlOXtCT+mmKr1mMdRUHLrdTN+4omjAULjpixRCg1A= v.io/x/lib v0.1.6/go.mod h1:aLm+mPXyXf4Vd/n+1f4LcSQFFgqNhNzwQvHYfXoOLlE= -v.io/x/lib v0.1.15 h1:zSqCzGmABaFcL0ZDMkCeVaOwAa/Miiym7MvhERdU0oI= -v.io/x/lib v0.1.15/go.mod h1:L2bJWOQoSaAZ9aS2AtD6x9eipa91gTR0ZsIaUrWa0Yc= -v.io/x/lib v0.1.16 h1:51OtWUAJtRhiwi3Ug3tv4WMjev9nlzHbYO5nz7zCdmo= -v.io/x/lib v0.1.16/go.mod h1:GiRiI83Rg3GMJPjD6KtvX4FtnMqyJxWGVAoH6cflQ0Q= -v.io/x/lib v0.1.17 h1:idQNidOA9rxinRO0lgNA5633FjkIOpMfQrcbsHnhAN0= -v.io/x/lib v0.1.17/go.mod h1:p+bOWzLs7abf+ONXTwIccdFlO10gkvKXEn0erWDMhMY= -v.io/x/lib v0.1.18 h1:WLdxdvYKC5boIYtClQZefZ70J85dRw0hae6XNqR9Zsg= -v.io/x/lib v0.1.18/go.mod h1:oDWVbZUuSOBRD5Xkxwe2qBD98oQGjJe1u7Z3CUzGDpE= +v.io/x/lib v0.1.19 h1:mVwqJavQ9IiXM0iINGC7mz5Zqihu2eI2iyCEeg429Hs= +v.io/x/lib v0.1.19/go.mod h1:ZOuZt/RoE9VePtg2o/ikeR3AGVcjzWSO2BGADoGZd5c= v.io/x/ref/internal/logger v0.1.1 h1:FZwqC6myQ4xMTgz6jIgZwQlIpuy/PtwTHY95qQFEzso= v.io/x/ref/internal/logger v0.1.1/go.mod h1:00nuJdZEVCzMOn9y474jZ+e6B9R/ydLW7d6IQFl/NHU= v.io/x/ref/lib/flags/sitedefaults v0.1.1 h1:jAeEpnfOK5ddeqjqJPi2X5WgbeYkCA+ogawkJyDgZMI= diff --git a/x/ref/internal/logger/go.mod b/x/ref/internal/logger/go.mod index fc8a61beb..ecd3fe75e 100644 --- a/x/ref/internal/logger/go.mod +++ b/x/ref/internal/logger/go.mod @@ -2,4 +2,4 @@ module v.io/x/ref/internal/logger go 1.18 -require v.io/x/lib v0.1.18 +require v.io/x/lib v0.1.19 diff --git a/x/ref/internal/logger/go.sum b/x/ref/internal/logger/go.sum index 2f506d5d5..51392feaa 100644 --- a/x/ref/internal/logger/go.sum +++ b/x/ref/internal/logger/go.sum @@ -1,8 +1,2 @@ -v.io/x/lib v0.1.15 h1:zSqCzGmABaFcL0ZDMkCeVaOwAa/Miiym7MvhERdU0oI= -v.io/x/lib v0.1.15/go.mod h1:L2bJWOQoSaAZ9aS2AtD6x9eipa91gTR0ZsIaUrWa0Yc= -v.io/x/lib v0.1.16 h1:51OtWUAJtRhiwi3Ug3tv4WMjev9nlzHbYO5nz7zCdmo= -v.io/x/lib v0.1.16/go.mod h1:GiRiI83Rg3GMJPjD6KtvX4FtnMqyJxWGVAoH6cflQ0Q= -v.io/x/lib v0.1.17 h1:idQNidOA9rxinRO0lgNA5633FjkIOpMfQrcbsHnhAN0= -v.io/x/lib v0.1.17/go.mod h1:p+bOWzLs7abf+ONXTwIccdFlO10gkvKXEn0erWDMhMY= -v.io/x/lib v0.1.18 h1:WLdxdvYKC5boIYtClQZefZ70J85dRw0hae6XNqR9Zsg= -v.io/x/lib v0.1.18/go.mod h1:oDWVbZUuSOBRD5Xkxwe2qBD98oQGjJe1u7Z3CUzGDpE= +v.io/x/lib v0.1.19 h1:mVwqJavQ9IiXM0iINGC7mz5Zqihu2eI2iyCEeg429Hs= +v.io/x/lib v0.1.19/go.mod h1:ZOuZt/RoE9VePtg2o/ikeR3AGVcjzWSO2BGADoGZd5c= diff --git a/x/ref/lib/security/principal.go b/x/ref/lib/security/principal.go index 62f7dad88..2ec790546 100644 --- a/x/ref/lib/security/principal.go +++ b/x/ref/lib/security/principal.go @@ -17,9 +17,9 @@ import ( var ( // ErrBadPassphrase is a possible return error from LoadPersistentPrincipal() - ErrBadPassphrase = verror.NewID("errBadPassphrase") + ErrBadPassphrase = verror.NewID("v.io/x/ref/lib/security.errBadPassphrase") // ErrPassphraseRequired is a possible return error from LoadPersistentPrincipal() - ErrPassphraseRequired = verror.NewID("errPassphraseRequired") + ErrPassphraseRequired = verror.NewID("v.io/x/ref/lib/security.errPassphraseRequired") ) // NewPrincipal mints a new private (ecdsa) key and generates a principal diff --git a/x/ref/runtime/internal/flow/conn/errors.go b/x/ref/runtime/internal/flow/conn/errors.go index a83cfce9a..cefd7d5f6 100644 --- a/x/ref/runtime/internal/flow/conn/errors.go +++ b/x/ref/runtime/internal/flow/conn/errors.go @@ -9,28 +9,28 @@ import "v.io/v23/verror" // These were previously defined in errors.vdl using the ID values // below rather than the more conventional Err. var ( - ErrMissingSetupOption = verror.NewID("MissingSetupOption") - ErrUnexpectedMsg = verror.NewID("UnexpectedMsg") - ErrConnectionClosed = verror.NewID("ConnectionClosed") - ErrRemoteError = verror.NewID("RemoteError") - ErrSend = verror.NewID("Send") - ErrRecv = verror.NewID("Recv") - ErrCounterOverflow = verror.NewID("CounterOverflow") - ErrBlessingsFlowClosed = verror.NewID("BlessingsFlowClosed") - ErrInvalidChannelBinding = verror.NewID("InvalidChannelBinding") - ErrNoPublicKey = verror.NewID("NoPublicKey") - ErrDialingNonServer = verror.NewID("DialingNonServer") - ErrAcceptorBlessingsMissing = verror.NewID("AcceptorBlessingsMissing") - ErrDialerBlessingsMissing = verror.NewID("DialerBlessingsMissing") - ErrBlessingsNotBound = verror.NewID("BlessingsNotBound") - ErrInvalidPeerFlow = verror.NewID("InvalidPeerFlow") - ErrChannelTimeout = verror.NewID("ChannelTimeout") - ErrCannotDecryptBlessings = verror.NewID("CannotDecryptBlessings") - ErrCannotDecryptDischarges = verror.NewID("CannotDecryptDischarges") - ErrCannotEncryptBlessings = verror.NewID("CannotEncryptBlessings") - ErrCannotEncryptDischarges = verror.NewID("CannotEncryptDischarges") - ErrNoCrypter = verror.NewID("NoCrypter") - ErrNoPrivateKey = verror.NewID("NoPrivateKey") - ErrIdleConnKilled = verror.NewID("IdleConnKilled") - ErrRPCVersionMismatch = verror.NewID("RPCVersionMismatch") + ErrMissingSetupOption = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.MissingSetupOption") + ErrUnexpectedMsg = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.UnexpectedMsg") + ErrConnectionClosed = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.ConnectionClosed") + ErrRemoteError = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.RemoteError") + ErrSend = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.Send") + ErrRecv = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.Recv") + ErrCounterOverflow = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.CounterOverflow") + ErrBlessingsFlowClosed = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.BlessingsFlowClosed") + ErrInvalidChannelBinding = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.InvalidChannelBinding") + ErrNoPublicKey = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.NoPublicKey") + ErrDialingNonServer = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.DialingNonServer") + ErrAcceptorBlessingsMissing = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.AcceptorBlessingsMissing") + ErrDialerBlessingsMissing = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.DialerBlessingsMissing") + ErrBlessingsNotBound = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.BlessingsNotBound") + ErrInvalidPeerFlow = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.InvalidPeerFlow") + ErrChannelTimeout = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.ChannelTimeout") + ErrCannotDecryptBlessings = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.CannotDecryptBlessings") + ErrCannotDecryptDischarges = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.CannotDecryptDischarges") + ErrCannotEncryptBlessings = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.CannotEncryptBlessings") + ErrCannotEncryptDischarges = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.CannotEncryptDischarges") + ErrNoCrypter = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.NoCrypter") + ErrNoPrivateKey = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.NoPrivateKey") + ErrIdleConnKilled = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.IdleConnKilled") + ErrRPCVersionMismatch = verror.NewID("v.io/x/ref/runtime/internal/flow/conn.RPCVersionMismatch") ) diff --git a/x/ref/runtime/internal/flow/manager/errors.go b/x/ref/runtime/internal/flow/manager/errors.go index b4cac9645..ba4ed9635 100644 --- a/x/ref/runtime/internal/flow/manager/errors.go +++ b/x/ref/runtime/internal/flow/manager/errors.go @@ -9,14 +9,27 @@ import "v.io/v23/verror" var ( // These were defined in errors.vdl using the ID values // below rather than the more conventional Err. - errUnknownProtocol = verror.NewID("UnknownProtocol") - errManagerClosed = verror.NewID("ManagerClosed") - errAcceptFailed = verror.NewID("AcceptFailed") - errCacheClosed = verror.NewID("CacheClosed") - errConnKilledToFreeResources = verror.NewID("ConnKilledToFreeResources") - errInvalidProxyResponse = verror.NewID("InvalidProxyResponse") - errListeningWithNullRid = verror.NewID("ListeningWithNullRid") - errProxyResponse = verror.NewID("ProxyResponse") - errNoBlessingsForPeer = verror.NewID("NoBlessingsForPeer") - errConnNotInCache = verror.NewID("ConnNotInCache") + errUnknownProtocol verror.IDAction + errManagerClosed verror.IDAction + errAcceptFailed verror.IDAction + errCacheClosed verror.IDAction + errConnKilledToFreeResources verror.IDAction + errInvalidProxyResponse verror.IDAction + errListeningWithNullRid verror.IDAction + errProxyResponse verror.IDAction + errNoBlessingsForPeer verror.IDAction + errConnNotInCache verror.IDAction ) + +func init() { + errUnknownProtocol = verror.NewID("UnknownProtocol") + errManagerClosed = verror.NewID("ManagerClosed") + errAcceptFailed = verror.NewID("AcceptFailed") + errCacheClosed = verror.NewID("CacheClosed") + errConnKilledToFreeResources = verror.NewID("ConnKilledToFreeResources") + errInvalidProxyResponse = verror.NewID("InvalidProxyResponse") + errListeningWithNullRid = verror.NewID("ListeningWithNullRid") + errProxyResponse = verror.NewID("ProxyResponse") + errNoBlessingsForPeer = verror.NewID("NoBlessingsForPeer") + errConnNotInCache = verror.NewID("ConnNotInCache") +} diff --git a/x/ref/runtime/internal/naming/namespace/resolve.go b/x/ref/runtime/internal/naming/namespace/resolve.go index fb1a26f8a..edb50874e 100644 --- a/x/ref/runtime/internal/naming/namespace/resolve.go +++ b/x/ref/runtime/internal/naming/namespace/resolve.go @@ -17,9 +17,11 @@ import ( "v.io/v23/verror" ) -var ( +var errNoServers verror.IDAction + +func init() { errNoServers = verror.NewIDAction("errNoServers", verror.NoRetry) -) +} // resolveAgainstMountTable asks each server in e.Servers that might be a mounttable to resolve e.Name. The requests // are parallelized by the client rpc code. diff --git a/x/ref/runtime/internal/rpc/benchmark/go.mod b/x/ref/runtime/internal/rpc/benchmark/go.mod index 0c045fede..b28444797 100644 --- a/x/ref/runtime/internal/rpc/benchmark/go.mod +++ b/x/ref/runtime/internal/rpc/benchmark/go.mod @@ -3,9 +3,9 @@ module v.io/x/ref/runtime/internal/rpc/benchmark go 1.18 require ( - google.golang.org/protobuf v1.32.0 + google.golang.org/protobuf v1.33.0 v.io v0.2.0 - v.io/x/lib v0.1.18 + v.io/x/lib v0.1.19 ) require ( @@ -13,10 +13,10 @@ require ( github.com/gorilla/websocket v1.5.1 // indirect github.com/vanadium/go-mdns-sd v0.0.0-20230219002252-724533cf06f5 // indirect github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect - golang.org/x/crypto v0.18.0 // indirect - golang.org/x/net v0.20.0 // indirect - golang.org/x/sys v0.16.0 // indirect - golang.org/x/term v0.16.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/sys v0.18.0 // indirect + golang.org/x/term v0.18.0 // indirect v.io/x/ref/internal/logger v0.1.1 // indirect v.io/x/ref/lib/flags/sitedefaults v0.1.1 // indirect ) diff --git a/x/ref/runtime/internal/rpc/benchmark/go.sum b/x/ref/runtime/internal/rpc/benchmark/go.sum index 3d9b8927b..73b9d1d1a 100644 --- a/x/ref/runtime/internal/rpc/benchmark/go.sum +++ b/x/ref/runtime/internal/rpc/benchmark/go.sum @@ -1,17 +1,7 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= -github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= -github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= @@ -22,66 +12,30 @@ github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= -golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= -golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= -golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= -golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= -golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= -golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= v.io v0.2.0 h1:ZkuugtTT7gzXPK/yehK08ysFSNW8QqlVxQcgAxVuhRk= v.io v0.2.0/go.mod h1:cbYlOXtCT+mmKr1mMdRUHLrdTN+4omjAULjpixRCg1A= v.io/x/lib v0.1.6/go.mod h1:aLm+mPXyXf4Vd/n+1f4LcSQFFgqNhNzwQvHYfXoOLlE= -v.io/x/lib v0.1.15 h1:zSqCzGmABaFcL0ZDMkCeVaOwAa/Miiym7MvhERdU0oI= -v.io/x/lib v0.1.15/go.mod h1:L2bJWOQoSaAZ9aS2AtD6x9eipa91gTR0ZsIaUrWa0Yc= -v.io/x/lib v0.1.16 h1:51OtWUAJtRhiwi3Ug3tv4WMjev9nlzHbYO5nz7zCdmo= -v.io/x/lib v0.1.16/go.mod h1:GiRiI83Rg3GMJPjD6KtvX4FtnMqyJxWGVAoH6cflQ0Q= -v.io/x/lib v0.1.17 h1:idQNidOA9rxinRO0lgNA5633FjkIOpMfQrcbsHnhAN0= -v.io/x/lib v0.1.17/go.mod h1:p+bOWzLs7abf+ONXTwIccdFlO10gkvKXEn0erWDMhMY= -v.io/x/lib v0.1.18 h1:WLdxdvYKC5boIYtClQZefZ70J85dRw0hae6XNqR9Zsg= -v.io/x/lib v0.1.18/go.mod h1:oDWVbZUuSOBRD5Xkxwe2qBD98oQGjJe1u7Z3CUzGDpE= +v.io/x/lib v0.1.19 h1:mVwqJavQ9IiXM0iINGC7mz5Zqihu2eI2iyCEeg429Hs= +v.io/x/lib v0.1.19/go.mod h1:ZOuZt/RoE9VePtg2o/ikeR3AGVcjzWSO2BGADoGZd5c= v.io/x/ref/internal/logger v0.1.1 h1:FZwqC6myQ4xMTgz6jIgZwQlIpuy/PtwTHY95qQFEzso= v.io/x/ref/internal/logger v0.1.1/go.mod h1:00nuJdZEVCzMOn9y474jZ+e6B9R/ydLW7d6IQFl/NHU= v.io/x/ref/lib/flags/sitedefaults v0.1.1 h1:jAeEpnfOK5ddeqjqJPi2X5WgbeYkCA+ogawkJyDgZMI= diff --git a/x/ref/runtime/internal/rpc/client.go b/x/ref/runtime/internal/rpc/client.go index a99d0a215..e4d221038 100644 --- a/x/ref/runtime/internal/rpc/client.go +++ b/x/ref/runtime/internal/rpc/client.go @@ -35,21 +35,38 @@ const ( ) var ( - errClientCloseAlreadyCalled = verror.NewID("errCloseAlreadyCalled") + errClientCloseAlreadyCalled verror.IDAction + errClientFinishAlreadyCalled verror.IDAction + errRequestEncoding verror.IDAction + errArgEncoding verror.IDAction + errResponseDecoding verror.IDAction + errResultDecoding verror.IDAction + errRemainingStreamResults verror.IDAction + errPeerAuthorizeFailed verror.IDAction + errTypeFlowFailure verror.IDAction + + // These were originally defined in vdl and hence the same IDs that + // vdl would generate must be used here to ensure backwards compatibility. + errBadNumInputArgs verror.IDAction + errBadInputArg verror.IDAction +) + +func init() { + errClientCloseAlreadyCalled = verror.NewID("errCloseAlreadyCalled") errClientFinishAlreadyCalled = verror.NewID("errFinishAlreadyCalled") - errRequestEncoding = verror.NewID("errRequestEncoding") - errArgEncoding = verror.NewID("errArgEncoding") - errResponseDecoding = verror.NewID("errResponseDecoding") - errResultDecoding = verror.NewID("errResultDecoding") - errRemainingStreamResults = verror.NewID("errRemaingStreamResults") - errPeerAuthorizeFailed = verror.NewID("errPeerAuthorizedFailed") - errTypeFlowFailure = verror.NewID("errTypeFlowFailure") + errRequestEncoding = verror.NewID("errRequestEncoding") + errArgEncoding = verror.NewID("errArgEncoding") + errResponseDecoding = verror.NewID("errResponseDecoding") + errResultDecoding = verror.NewID("errResultDecoding") + errRemainingStreamResults = verror.NewID("errRemaingStreamResults") + errPeerAuthorizeFailed = verror.NewID("errPeerAuthorizedFailed") + errTypeFlowFailure = verror.NewID("errTypeFlowFailure") // These were originally defined in vdl and hence the same IDs that // vdl would generate must be used here to ensure backwards compatibility. errBadNumInputArgs = verror.NewID("badNumInputArgs") - errBadInputArg = verror.NewID("badInputArg") -) + errBadInputArg = verror.NewID("badInputArg") +} func preferNonTimeout(curr, prev error) error { if prev != nil && errors.Is(curr, verror.ErrTimeout) { diff --git a/x/ref/runtime/internal/rpc/sort_endpoints.go b/x/ref/runtime/internal/rpc/sort_endpoints.go index cd6d52cf0..5ed3d0c76 100644 --- a/x/ref/runtime/internal/rpc/sort_endpoints.go +++ b/x/ref/runtime/internal/rpc/sort_endpoints.go @@ -18,10 +18,14 @@ import ( ) var ( - errNoCompatibleServers = verror.NewID("errNoComaptibleServers") + errNoCompatibleServers verror.IDAction defaultPreferredProtocolOrder = mkProtocolRankMap([]string{"unixfd", "wsh", "tcp4", "tcp", "*"}) ) +func init() { + errNoCompatibleServers = verror.NewID("errNoComaptibleServers") +} + type serverLocality int const ( diff --git a/x/ref/runtime/internal/rpc/test/retry_test.go b/x/ref/runtime/internal/rpc/test/retry_test.go index 36f4b64d3..ba5626da0 100644 --- a/x/ref/runtime/internal/rpc/test/retry_test.go +++ b/x/ref/runtime/internal/rpc/test/retry_test.go @@ -16,7 +16,11 @@ import ( "v.io/x/ref/test" ) -var errRetryThis = verror.NewIDAction("retry_test.retryThis", verror.RetryBackoff) +var errRetryThis verror.IDAction + +func init() { + errRetryThis = verror.NewIDAction("retry_test.retryThis", verror.RetryBackoff) +} type retryServer struct { called int // number of times TryAgain has been called