diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index ea06983..dc4fde9 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -12,12 +12,27 @@ Build image contains all the tools required to create local builds. To publish a new `storjup/build` image: - 0. `go install github.com/magefile/mage@v1.11.0` - 1. `mage dockerBaseBuild` (only build) - 2. `mage dockerBasePublish` (build and publish) + 0. `go install github.com/magefile/mage` + 1. `mage dockerBuildBuild` (only build) + 2. `mage dockerBuildPublish` (build and publish) 3. New tag is saved to `build.last`. Please commit that file with your PR. 4. Use the new tag in `edge.Dockerfile` and `storj.Dockerfile` Note: This process is assuming that you already authorized yourself with `img.dev.storj.io` with `docker login`. -Note: publishing base image is very similar \ No newline at end of file +Note: publishing base image is very similar + +## Update Storj image + +Storj image contains all the binaries required to run the satellite. + +To publish a new `storjup/storj` image: + +0. `go install github.com/magefile/mage` +1. `mage DockerStorj ` (only build) +2. `mage DockerStorj ` (build and publish) +3. Use the new tag in recipe files + +Note: This process is assuming that you already authorized yourself with `img.dev.storj.io` with `docker login`. + +Note: publishing edge image is very similar \ No newline at end of file diff --git a/Earthfile b/Earthfile index 60d0948..38bd25a 100644 --- a/Earthfile +++ b/Earthfile @@ -1,5 +1,5 @@ VERSION 0.6 -FROM golang:1.18 +FROM golang:1.19 WORKDIR /go/storj-up lint: @@ -43,7 +43,7 @@ test: integration: FROM earthly/dind:ubuntu RUN apt-get update && apt-get install -y docker-compose-plugin gcc - RUN bash -c "curl --fail -L https://go.dev/dl/go1.18.10.linux-amd64.tar.gz | tar -C /usr/local -xz && cp /usr/local/go/bin/go /usr/local/bin/go" + RUN bash -c "curl --fail -L https://go.dev/dl/go1.19.1.linux-amd64.tar.gz | tar -C /usr/local -xz && cp /usr/local/go/bin/go /usr/local/bin/go" RUN go install github.com/rclone/rclone@v1.59.1 RUN go install storj.io/storj/cmd/uplink@latest RUN go install storj.io/storjscan/cmd/storjscan@latest diff --git a/base.last b/base.last index 3ea11c4..bfe3b30 100644 --- a/base.last +++ b/base.last @@ -1 +1 @@ -20230616-1 \ No newline at end of file +20230804-1 \ No newline at end of file diff --git a/go.mod b/go.mod index 497132e..3388542 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module storj.io/storj-up -go 1.18 +go 1.19 require ( github.com/compose-spec/compose-go v1.0.3 diff --git a/magefile.go b/magefile.go index b3002ee..f0364e3 100644 --- a/magefile.go +++ b/magefile.go @@ -11,7 +11,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "net/http" "os" "sort" @@ -348,7 +347,7 @@ func doOnMissing(containerName string, repoName string, action func(string, stri // writeDockerTag persist the last used docker tag to a file. func writeDockerTag(tagFile string, tag string) error { - return ioutil.WriteFile(tagFile, []byte(tag), 0o644) + return os.WriteFile(tagFile, []byte(tag), 0o644) } // ListVersions prints out the available container / release versions. diff --git a/pkg/config/gen/go.mod b/pkg/config/gen/go.mod index d05441e..86492c7 100644 --- a/pkg/config/gen/go.mod +++ b/pkg/config/gen/go.mod @@ -1,18 +1,19 @@ module gen -go 1.18 +go 1.19 require ( github.com/stretchr/testify v1.8.2 github.com/zeebo/errs v1.3.0 - storj.io/gateway-mt v1.55.1 - storj.io/storj v1.79.4 + storj.io/gateway-mt v1.58.1 + storj.io/storj v1.83.2 storj.io/storj-up v1.0.0 - storj.io/storjscan v1.0.2 + storj.io/storjscan v1.0.3 ) require ( - cloud.google.com/go/compute v1.10.0 // indirect + cloud.google.com/go/compute v1.19.0 // indirect + cloud.google.com/go/compute/metadata v0.2.3 // indirect git.apache.org/thrift.git v0.13.0 // indirect github.com/Azure/azure-pipeline-go v0.2.2 // indirect github.com/Azure/azure-storage-blob-go v0.10.0 // indirect @@ -66,15 +67,16 @@ require ( github.com/golang-jwt/jwt v3.2.1+incompatible // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/gomodule/redigo v1.8.3 // indirect github.com/google/flatbuffers v1.12.1 // indirect github.com/google/go-cmp v0.5.9 // indirect - github.com/google/pprof v0.0.0-20211108044417-e9b028704de0 // indirect + github.com/google/pprof v0.0.0-20221103000818-d260c55eee4c // indirect + github.com/google/s2a-go v0.1.4 // indirect github.com/google/uuid v1.3.0 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect - github.com/googleapis/gax-go/v2 v2.6.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect + github.com/googleapis/gax-go/v2 v2.8.0 // indirect github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/mux v1.8.0 // indirect github.com/gorilla/schema v1.2.0 // indirect @@ -86,15 +88,12 @@ require ( github.com/hashicorp/raft v1.3.10 // indirect github.com/holiman/uint256 v1.2.0 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/jackc/chunkreader/v2 v2.0.1 // indirect - github.com/jackc/pgconn v1.13.0 // indirect github.com/jackc/pgerrcode v0.0.0-20201024163028-a0d42d470451 // indirect github.com/jackc/pgio v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgproto3/v2 v2.3.1 // indirect - github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect - github.com/jackc/pgtype v1.12.0 // indirect - github.com/jackc/pgx/v4 v4.17.1 // indirect + github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect + github.com/jackc/pgtype v1.14.0 // indirect + github.com/jackc/pgx/v5 v5.4.1 // indirect github.com/jcmturner/gofork v1.0.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -198,25 +197,25 @@ require ( github.com/zeebo/incenc v0.0.0-20180505221441-0d92902eec54 // indirect github.com/zeebo/mwc v0.0.4 // indirect github.com/zyedidia/generic v1.2.1 // indirect - go.opencensus.io v0.23.0 // indirect + go.opencensus.io v0.24.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.23.0 // indirect - golang.org/x/crypto v0.6.0 // indirect + golang.org/x/crypto v0.9.0 // indirect golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect - golang.org/x/mod v0.6.0 // indirect - golang.org/x/net v0.6.0 // indirect - golang.org/x/oauth2 v0.3.0 // indirect + golang.org/x/mod v0.8.0 // indirect + golang.org/x/net v0.10.0 // indirect + golang.org/x/oauth2 v0.7.0 // indirect golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.7.0 // indirect - golang.org/x/text v0.7.0 // indirect + golang.org/x/sys v0.8.0 // indirect + golang.org/x/text v0.9.0 // indirect golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect - golang.org/x/tools v0.2.0 // indirect - google.golang.org/api v0.100.0 // indirect + golang.org/x/tools v0.6.0 // indirect + google.golang.org/api v0.118.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55 // indirect - google.golang.org/grpc v1.50.1 // indirect - google.golang.org/protobuf v1.28.1 // indirect + google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect + google.golang.org/grpc v1.55.0 // indirect + google.golang.org/protobuf v1.30.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect gopkg.in/jcmturner/dnsutils.v1 v1.0.1 // indirect @@ -227,15 +226,13 @@ require ( gopkg.in/webhelp.v1 v1.0.0-20170530084242-3f30213e4c49 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - storj.io/common v0.0.0-20230602145716-d6ea82d58b3d // indirect + storj.io/common v0.0.0-20230719104100-cb5eec2edc30 // indirect storj.io/dotworld v0.0.0-20210324183515-0d11aeccd840 // indirect storj.io/drpc v0.0.33 // indirect - storj.io/minio v0.0.0-20230509071714-0cbc90f649b1 // indirect + storj.io/minio v0.0.0-20230627070725-370d887aacde // indirect storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 // indirect storj.io/picobuf v0.0.1 // indirect - storj.io/private v0.0.0-20230504144224-245360dc8212 // indirect - storj.io/uplink v1.10.1-0.20230602205250-0fac01fa40c8 // indirect + storj.io/private v0.0.0-20230707205547-3f3b667f6ac0 // indirect + storj.io/uplink v1.10.1-0.20230628184638-0e6829c81f5c // indirect storj.io/zipper v0.0.0-20220124122551-2ac2d53a46f6 // indirect ) - -replace google.golang.org/grpc => google.golang.org/grpc v1.29.0 diff --git a/pkg/config/gen/go.sum b/pkg/config/gen/go.sum index 0769c8b..804d7c6 100644 --- a/pkg/config/gen/go.sum +++ b/pkg/config/gen/go.sum @@ -1,3 +1,4 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo= @@ -30,8 +31,8 @@ cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2Z cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= -cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= +cloud.google.com/go v0.110.2 h1:sdFPBr6xG9/wkBbfhmUz/JmZC7X6LavQgcrVINrKiVA= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -67,8 +68,11 @@ cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6m cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= -cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= +cloud.google.com/go/compute v1.19.0 h1:+9zda3WGgW1ZSTlVppLCYFIr48Pa35q1uG2N1itbCEQ= +cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU= +cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4= cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0= @@ -110,6 +114,7 @@ cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= +cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= @@ -216,8 +221,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= -github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/Shopify/sarama v1.27.2 h1:1EyY1dsxNDUQEv0O/4TsjosHI2CgB1uo9H/v56xzTxc= github.com/Shopify/sarama v1.27.2/go.mod h1:g5s5osgELxgM+Md9Qni9rzo7Rbt+vvFQI4bt/Mc93II= github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= @@ -293,6 +298,7 @@ github.com/calebcase/tmpfile v1.0.3 h1:BZrOWZ79gJqQ3XbAQlihYZf/YCV0H4KPIdM5K5oMp github.com/calebcase/tmpfile v1.0.3/go.mod h1:UAUc01aHeC+pudPagY/lWvt2qS9ZO5Zzof6/tIUzqeI= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= 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= @@ -305,10 +311,18 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudfoundry/gosigar v1.1.0 h1:V/dVCzhKOdIU3WRB5inQU20s4yIgL9Dxx/Mhi0SF8eM= github.com/cloudfoundry/gosigar v1.1.0/go.mod h1:3qLfc2GlfmwOx2+ZDaRGH3Y9fwQ0sQeaAleo2GV5pH0= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/errors v1.9.1 h1:yFVvsI0VxmRShfawbt/laCIDy/mtTqqnvoNgiy5bEV8= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= @@ -364,7 +378,15 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP github.com/eclipse/paho.mqtt.golang v1.3.0 h1:MU79lqr3FKNKbSrGN7d7bNYqh8MwWW7Zcx0iG+VIw9I= github.com/eclipse/paho.mqtt.golang v1.3.0/go.mod h1:eTzb4gxwwyWpqBUHGQZ4ABAV7+Jgm1PklsYT/eo8Hcc= github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ethereum/go-ethereum v1.11.5 h1:3M1uan+LAUvdn+7wCEFrcMM4LJTeuxDrPTg/f31a5QQ= github.com/ethereum/go-ethereum v1.11.5/go.mod h1:it7x0DWnTDMfVFdXcU6Ti4KEFQynLHVRarcSlPr0HBo= @@ -421,7 +443,6 @@ github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8Wd github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= -github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -436,6 +457,7 @@ github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -462,8 +484,9 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +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/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= @@ -516,17 +539,21 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20211008130755-947d60d73cc0/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= -github.com/google/pprof v0.0.0-20211108044417-e9b028704de0 h1:rsq1yB2xiFLDYYaYdlGBsSkwVzsCo500wMhxvW5A/bk= github.com/google/pprof v0.0.0-20211108044417-e9b028704de0/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= +github.com/google/pprof v0.0.0-20221103000818-d260c55eee4c h1:lvddKcYTQ545ADhBujtIJmqQrZBDsGo7XIMbAQe/sNY= +github.com/google/pprof v0.0.0-20221103000818-d260c55eee4c/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= +github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= -github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= +github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k= +github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -537,8 +564,9 @@ github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/Oth github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= -github.com/googleapis/gax-go/v2 v2.6.0 h1:SXk3ABtQYDT/OH8jAyvEOQ58mgawq5C4o/4/89qN2ZU= github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= +github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK67vJZc= +github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -607,6 +635,7 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/influxdata/influxdb v1.8.3 h1:WEypI1BQFTT4teLM+1qkEcvUi0dAvopAI/ir0vAiBg8= github.com/influxdata/influxdb-client-go/v2 v2.4.0 h1:HGBfZYStlx3Kqvsv1h2pJixbCl/jhnFtxpKFAv9Tu5k= github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 h1:vilfsDSy7TDxedi9gyBkMvAirat/oRcL0lFdJBf6tdM= +github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= @@ -618,17 +647,16 @@ github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfG github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= github.com/jackc/pgconn v1.13.0 h1:3L1XMNV2Zvca/8BYhzcRFS70Lr0WlDg16Di6SFGAbys= -github.com/jackc/pgconn v1.13.0/go.mod h1:AnowpAqO4CMIIJNZl2VJp+KrkAZciAkhEl0W0JIobpI= github.com/jackc/pgerrcode v0.0.0-20201024163028-a0d42d470451 h1:WAvSpGf7MsFuzAtK4Vk7R4EVe+liW4x83r4oWu0WHKw= github.com/jackc/pgerrcode v0.0.0-20201024163028-a0d42d470451/go.mod h1:a/s9Lp5W7n/DD0VrVoyJ00FbP2ytTPDVOivvn2bMlds= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c= -github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc= github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A= github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= @@ -636,26 +664,26 @@ github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvW github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.3.1 h1:nwj7qwf0S+Q7ISFfBndqeLwSwxs+4DPsbRFjECT1Y4Y= -github.com/jackc/pgproto3/v2 v2.3.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= +github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0= github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= -github.com/jackc/pgtype v1.12.0 h1:Dlq8Qvcch7kiehm8wPGIW0W3KsCCHJnRacKW0UM8n5w= -github.com/jackc/pgtype v1.12.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= +github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw= +github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= github.com/jackc/pgx/v4 v4.17.1 h1:tASdE79tX9LOQu3MMvioWT6YaZkf58ZhmLHhV4sv5WM= -github.com/jackc/pgx/v4 v4.17.1/go.mod h1:lcxIZN44yMIrWI78a5CpucdD14hX0SBDbNRvjDBItsw= +github.com/jackc/pgx/v5 v5.4.1 h1:oKfB/FhuVtit1bBM3zNRRsZ925ZkMN3HXL+LgLUM9lE= +github.com/jackc/pgx/v5 v5.4.1/go.mod h1:q6iHT8uDNXWiFNOlRqJzBTaSH3+2xCXkokxHZC5qWFY= github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= github.com/jcmturner/gofork v1.0.0 h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8= github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= @@ -1019,6 +1047,7 @@ github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 h1:RC6RW7j+ github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572/go.mod h1:w0SWMsp6j9O/dk4/ZpIhL+3CkG8ofA2vuv7k+ltqUMc= github.com/spacemonkeygo/tlshowdy v0.0.0-20160207005338-8fa2cec1d7cd h1:1DS6oRTNvEIlcFDVe4OU/LKlrkRB/wx85GHJthitXw0= github.com/spacemonkeygo/tlshowdy v0.0.0-20160207005338-8fa2cec1d7cd/go.mod h1:MF7JYJoS2y353JlawNbpcLA0HAh4FzC4G+XrSIRP78c= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= @@ -1056,6 +1085,7 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stripe/stripe-go/v72 v72.90.0 h1:fvJ/aL1rHHWRj5buuayb/2ufJued1UR1HEVavsoZoFs= @@ -1162,7 +1192,7 @@ github.com/zeebo/mwc v0.0.4 h1:9dNXNLtUB4lUXoXgyhy3YrKoV0OD7oRiu907YMS0nl0= github.com/zeebo/mwc v0.0.4/go.mod h1:qNHfgp/ZCpQNcJHwKcO5EP3VgaBrW6DPohsK4QfyxxE= github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo= github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= -github.com/zeebo/structs v1.0.2 h1:kvcd7s2LqXuO9cdV5LqrGHCOAfCBXaZpKCA3jD9SJIc= +github.com/zeebo/structs v1.0.3-0.20230601144555-f2db46069602 h1:nMxsvi3pTJapmPpdShLdCO8sbCqd8XkjKYMssSJrfiM= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= github.com/zyedidia/generic v1.2.1 h1:Zv5KS/N2m0XZZiuLS82qheRG4X1o5gsWreGb0hR7XDc= github.com/zyedidia/generic v1.2.1/go.mod h1:ly2RBz4mnz1yeuVbQA/VFwGjK3mnHGRj1JuoG336Bis= @@ -1177,8 +1207,10 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= @@ -1234,10 +1266,10 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= -golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= +golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= +golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= 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= @@ -1252,6 +1284,8 @@ golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hP golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -1276,10 +1310,11 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I= -golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= +golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1343,8 +1378,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1373,8 +1408,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.3.0 h1:6l90koy8/LaBLmLu8jpHeHexzMwEita0zFfYlggy2F8= -golang.org/x/oauth2 v0.3.0/go.mod h1:rQrIauxkUhJ6CuwEXwymO2/eh4xz2ZWF1nBkcxS+tGk= +golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= +golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1394,6 +1429,7 @@ golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1489,8 +1525,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= -golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= 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= @@ -1504,17 +1540,20 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220922220347-f3bd1da661af h1:Yx9k8YCG3dvF87UAn2tu2HQLf2dt/eR1bXxpLMWeH+Y= golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -1579,8 +1618,8 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= -golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= +golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1590,7 +1629,6 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= @@ -1643,8 +1681,10 @@ google.golang.org/api v0.95.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaE google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= -google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= +google.golang.org/api v0.118.0 h1:FNfHq9Z2GKULxu7cEhCaB0wWQHg43UpomrrN+24ZRdE= +google.golang.org/api v0.118.0/go.mod h1:76TtD3vkgmZ66zZzp72bUUklpmQmKlhh6sYtIjYK+5E= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1654,6 +1694,7 @@ google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= @@ -1757,10 +1798,49 @@ google.golang.org/genproto v0.0.0-20220926220553-6981cbe3cfce/go.mod h1:woMGP53B google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U= google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= -google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55 h1:U1u4KB2kx6KR/aJDjQ97hZ15wQs8ZPvDcGcRynBhkvg= google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55/go.mod h1:45EK0dUbEZ2NHjCeAd2LXmyjAgGUGrpGROgjhC3ADck= -google.golang.org/grpc v1.29.0 h1:2pJjwYOdkZ9HlN4sWRYBg9ttH5bCOlsueaM+b/oYjwo= -google.golang.org/grpc v1.29.0/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= +google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +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.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= +google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= +google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= +google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= +google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= +google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= 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= @@ -1776,8 +1856,9 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1825,6 +1906,7 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -1840,32 +1922,32 @@ sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2 sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= storj.io/common v0.0.0-20211102144601-401a79f0706a/go.mod h1:a2Kw7Uipu929OFANfWKLHRoD0JfhgssikEvimd6hbSQ= storj.io/common v0.0.0-20220719163320-cd2ef8e1b9b0/go.mod h1:mCYV6Ud5+cdbuaxdPD5Zht/HYaIn0sffnnws9ErkrMQ= -storj.io/common v0.0.0-20230602145716-d6ea82d58b3d h1:AXdJxmg4Jqdz1nmogSrImKOHAU+bn8JCy8lHYnTwP0Y= -storj.io/common v0.0.0-20230602145716-d6ea82d58b3d/go.mod h1:zu2L8WdpvfIBrCbBTgPsz4qhHSArYSiDgRcV1RLlIF8= +storj.io/common v0.0.0-20230719104100-cb5eec2edc30 h1:xso8DyZExwYO2SFV0C/vt7unT/Vg3jQV2mtESiVEpUY= +storj.io/common v0.0.0-20230719104100-cb5eec2edc30/go.mod h1:zu2L8WdpvfIBrCbBTgPsz4qhHSArYSiDgRcV1RLlIF8= storj.io/dotworld v0.0.0-20210324183515-0d11aeccd840 h1:oqMwoF6vaOrCe92SKRyr8cc2WSjLYAd8fjpAHA7rNqY= storj.io/dotworld v0.0.0-20210324183515-0d11aeccd840/go.mod h1:KU9YvEgRrMMiWLvH8pzn1UkoCoxggKIPvQxmNdx7aXQ= storj.io/drpc v0.0.26/go.mod h1:ofQUDPQbbIymRDKE0tms48k8bLP5Y+dsI9CbXGv3gko= storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg= storj.io/drpc v0.0.33 h1:yCGZ26r66ZdMP0IcTYsj7WDAUIIjzXk6DJhbhvt9FHI= storj.io/drpc v0.0.33/go.mod h1:vR804UNzhBa49NOJ6HeLjd2H3MakC1j5Gv8bsOQT6N4= -storj.io/gateway-mt v1.55.1 h1:JCbugwHihhFzEizHF7oEnGZoxpkC9Hzf8M658goY82o= -storj.io/gateway-mt v1.55.1/go.mod h1:Iu9OxraohcvwLwGebIXPtyb/UUsO4U5/nAjfIx/CmBQ= -storj.io/minio v0.0.0-20230509071714-0cbc90f649b1 h1:bwaEpAEKX0p30ZnTZOdfb5KLY4CgVCTJekKXpKZSydo= -storj.io/minio v0.0.0-20230509071714-0cbc90f649b1/go.mod h1:tNaALPgx7e3WNMauIXVKw2ygXk4+o11XIR672akiI7I= +storj.io/gateway-mt v1.58.1 h1:0oMCPDOwQ5tcPezSwnEP3oc0k1FB/HUubGD1DvYOTB8= +storj.io/gateway-mt v1.58.1/go.mod h1:Cinh11DvxonQYHn3g+EJMxokT5+7kRJo4oTl6rKeTMM= +storj.io/minio v0.0.0-20230627070725-370d887aacde h1:SBSE2PD00cxcWnRBvmwGxBrYCDo6jhYtcIZh+iL1d3Q= +storj.io/minio v0.0.0-20230627070725-370d887aacde/go.mod h1:tNaALPgx7e3WNMauIXVKw2ygXk4+o11XIR672akiI7I= storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 h1:SVuEocEhZfFc13J1AmlVLitdGXTVrvmbzN4Z9C9Ms40= storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41/go.mod h1:iK+dmHZZXQlW7ahKdNSOo+raMk5BDL2wbD62FIeXLWs= storj.io/picobuf v0.0.1 h1:ekEvxSQCbEjTVIi/qxj2za13SJyfRE37yE30IBkZeT0= storj.io/picobuf v0.0.1/go.mod h1:7ZTAMs6VesgTHbbhFU79oQ9hDaJ+MD4uoFQZ1P4SEz0= -storj.io/private v0.0.0-20230504144224-245360dc8212 h1:Rcm1J7vGYo0gMbV9u37u9RWH9jC7nFLAIurxR5kmjd8= -storj.io/private v0.0.0-20230504144224-245360dc8212/go.mod h1:jyYzrgm0FX2NvrHGM48i6ihBuLRlo+Rtw2TtxW2h2qY= -storj.io/storj v1.79.4 h1:veRlzuIxIqzFSbhf7WPyYpeQfJFdwndl1uf45HY/2SE= -storj.io/storj v1.79.4/go.mod h1:MahxvS8aPu3XdRLAPn+oCIQD6Cy8eC7700K+7lvuL4U= +storj.io/private v0.0.0-20230707205547-3f3b667f6ac0 h1:4DlMbUEpzUBw/myOMNYYcMj2B0KQ4NOCRT37yhMY4yY= +storj.io/private v0.0.0-20230707205547-3f3b667f6ac0/go.mod h1:mfdHEaAcTARpd4/Hc6N5uxwB1ZG3jtPdVlle57xzQxQ= +storj.io/storj v1.83.2 h1:TNKczggGyVky0ez12m70XLw7zyitQDgTjOEhB9XXAtQ= +storj.io/storj v1.83.2/go.mod h1:MSBNX3E/L7Sg/susSMdQgvnQchQyeAGLYFcv2vl+IhQ= storj.io/storj-up v1.0.0 h1:NdAWqljnRdoFk2lWjPlljC/Q3B+zKoqtkZWvimnTNBA= storj.io/storj-up v1.0.0/go.mod h1:t0poqMqs8G7wuPjd9J0mmQPu7PQswBIbNqHpkwaoTi8= -storj.io/storjscan v1.0.2 h1:HEfvqSplsS+AieEHCoS2Pm3E4XG+Ov6DCxTZRFAhfEw= -storj.io/storjscan v1.0.2/go.mod h1:Xq1a8zb4PdcgzqyYWR26C4iekXjKQCRbpXDC+ke8390= +storj.io/storjscan v1.0.3 h1:w7O+vGTrn6lT8ELGpsbD9BowC5ngsc/CQy5hqNUBAkY= +storj.io/storjscan v1.0.3/go.mod h1:jR5GVfqrPUl4nPMS4n2srQnU7yt0Ar0tyjXRXUqfdoU= storj.io/uplink v1.7.1/go.mod h1:pKqsMpNMIAz//2TXzUGOR6tpu3iyabvXV4VWINj4jaY= -storj.io/uplink v1.10.1-0.20230602205250-0fac01fa40c8 h1:tCQuZ7vdEVeAM0w9czsjSsj44umXGascN9y3GPu985c= -storj.io/uplink v1.10.1-0.20230602205250-0fac01fa40c8/go.mod h1:cDlpDWGJykXfYE7NtO1EeArGFy12K5Xj8pV8ufpUCKE= +storj.io/uplink v1.10.1-0.20230628184638-0e6829c81f5c h1:DzxduPu8X8IvN7czwEkIyGL+6gBzisEz9E3GW1lxb3k= +storj.io/uplink v1.10.1-0.20230628184638-0e6829c81f5c/go.mod h1:cDlpDWGJykXfYE7NtO1EeArGFy12K5Xj8pV8ufpUCKE= storj.io/zipper v0.0.0-20220124122551-2ac2d53a46f6 h1:vJQmb+uAiYn8hVfkhMl6OqjnUyMWSCPnkzW8IsjF8vE= storj.io/zipper v0.0.0-20220124122551-2ac2d53a46f6/go.mod h1:MRnaO2kEXqZ+dd+InduHGg5RQy8gbrnPLaPp38CWDxg= diff --git a/pkg/config/satellite-admin.go b/pkg/config/satellite-admin.go index 9030a13..e26eda4 100644 --- a/pkg/config/satellite-admin.go +++ b/pkg/config/satellite-admin.go @@ -349,7 +349,7 @@ func satelliteadminConfig() []Option { { Name: "STORJ_METAINFO_MAX_ENCRYPTED_OBJECT_KEY_LENGTH", Description: "maximum encrypted object key length", - Default: "1750", + Default: "2000", }, { Name: "STORJ_METAINFO_MAX_SEGMENT_SIZE", @@ -406,31 +406,6 @@ func satelliteadminConfig() []Option { Description: "", Default: "", }, - { - Name: "STORJ_METAINFO_SEGMENT_LOOP_COALESCE_DURATION", - Description: "how long to wait for new observers before starting iteration", - Default: "", - }, - { - Name: "STORJ_METAINFO_SEGMENT_LOOP_RATE_LIMIT", - Description: "rate limit (default is 0 which is unlimited segments per second)", - Default: "0", - }, - { - Name: "STORJ_METAINFO_SEGMENT_LOOP_LIST_LIMIT", - Description: "how many items to query in a batch", - Default: "2500", - }, - { - Name: "STORJ_METAINFO_SEGMENT_LOOP_AS_OF_SYSTEM_INTERVAL", - Description: "as of system interval", - Default: "", - }, - { - Name: "STORJ_METAINFO_SEGMENT_LOOP_SUSPICIOUS_PROCESSED_RATIO", - Description: "ratio where to consider processed count as supicious", - Default: "0.03", - }, { Name: "STORJ_METAINFO_RATE_LIMITER_ENABLED", Description: "whether rate limiting is enabled.", @@ -471,46 +446,6 @@ func satelliteadminConfig() []Option { Description: "max bucket count for a project.", Default: "100", }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_MAX_CONCURRENCY", - Description: "maximum number of concurrent requests to storage nodes", - Default: "100", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_MAX_CONCURRENT_PIECES", - Description: "maximum number of concurrent pieces can be processed", - Default: "1000000", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_MAX_PIECES_PER_BATCH", - Description: "maximum number of pieces per batch", - Default: "5000", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_MAX_PIECES_PER_REQUEST", - Description: "maximum number pieces per single request", - Default: "1000", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_DIAL_TIMEOUT", - Description: "timeout for dialing nodes (0 means satellite default)", - Default: "3s", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_FAIL_THRESHOLD", - Description: "threshold for retrying a failed node", - Default: "", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_REQUEST_TIMEOUT", - Description: "timeout for a single delete request", - Default: "", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_DELETE_SUCCESS_THRESHOLD", - Description: "Which fraction of nodes should be contacted successfully until the delete of a batch of pieces is considered completed", - Default: ".75", - }, { Name: "STORJ_METAINFO_SERVER_SIDE_COPY", Description: "enable code for server-side copy, deprecated. please leave this to true.", @@ -711,6 +646,11 @@ func satelliteadminConfig() []Option { Description: "Treat pieces on the same network as in need of repair", Default: "false", }, + { + Name: "STORJ_CHECKER_DO_PLACEMENT_CHECK", + Description: "Treat pieces out of segment placement as in need of repair", + Default: "true", + }, { Name: "STORJ_REPAIRER_MAX_REPAIR", Description: "maximum segments that can be repaired concurrently", @@ -721,6 +661,11 @@ func satelliteadminConfig() []Option { Description: "how frequently repairer should try and repair more data", Default: "", }, + { + Name: "STORJ_REPAIRER_DIAL_TIMEOUT", + Description: "time limit for dialing storage node", + Default: "5s", + }, { Name: "STORJ_REPAIRER_TIMEOUT", Description: "time limit for uploading repaired pieces to new storage nodes", @@ -766,6 +711,11 @@ func satelliteadminConfig() []Option { Description: "repair pieces on the same network to other nodes", Default: "false", }, + { + Name: "STORJ_REPAIRER_DO_PLACEMENT_CHECK", + Description: "repair pieces out of segment placement", + Default: "true", + }, { Name: "STORJ_AUDIT_MAX_RETRIES_STAT_DB", Description: "max number of times to attempt updating a statdb batch", @@ -866,30 +816,15 @@ func satelliteadminConfig() []Option { Description: "Expiration of newly created objects in the bucket. These objects are under the prefix error-[timestamp] and store error messages.", Default: "336h", }, - { - Name: "STORJ_GARBAGE_COLLECTION_BF_INTERVAL", - Description: "the time between each garbage collection executions", - Default: "", - }, - { - Name: "STORJ_GARBAGE_COLLECTION_BF_ENABLED", - Description: "set if garbage collection bloom filters is enabled or not", - Default: "true", - }, { Name: "STORJ_GARBAGE_COLLECTION_BF_RUN_ONCE", Description: "set if garbage collection bloom filter process should only run once then exit", Default: "false", }, - { - Name: "STORJ_GARBAGE_COLLECTION_BF_USE_RANGED_LOOP", - Description: "whether to use ranged loop instead of segment loop", - Default: "false", - }, { Name: "STORJ_GARBAGE_COLLECTION_BF_USE_SYNC_OBSERVER", Description: "whether to use test GC SyncObserver with ranged loop", - Default: "false", + Default: "true", }, { Name: "STORJ_GARBAGE_COLLECTION_BF_INITIAL_PIECES", @@ -961,6 +896,11 @@ func satelliteadminConfig() []Option { Description: "how many expired objects to query in a batch", Default: "100", }, + { + Name: "STORJ_EXPIRED_DELETION_AS_OF_SYSTEM_INTERVAL", + Description: "as of system interval", + Default: "", + }, { Name: "STORJ_ZOMBIE_DELETION_INTERVAL", Description: "the time between each attempt to go through the db and clean up zombie objects", @@ -981,6 +921,11 @@ func satelliteadminConfig() []Option { Description: "after what time object will be deleted if there where no new upload activity", Default: "24h", }, + { + Name: "STORJ_ZOMBIE_DELETION_AS_OF_SYSTEM_INTERVAL", + Description: "as of system interval", + Default: "", + }, { Name: "STORJ_TALLY_INTERVAL", Description: "how frequently the tally service should run", @@ -996,19 +941,19 @@ func satelliteadminConfig() []Option { Description: "how large of batches GetBandwidthSince should process at a time", Default: "10000", }, - { - Name: "STORJ_TALLY_USE_OBJECTS_LOOP", - Description: "flag to switch between calculating bucket tallies using objects loop or custom query", - Default: "false", - }, { Name: "STORJ_TALLY_USE_RANGED_LOOP", Description: "whether to enable node tally with ranged loop", Default: "true", }, + { + Name: "STORJ_TALLY_SAVE_TALLIES_BATCH_SIZE", + Description: "how large should be insert into tallies", + Default: "10000", + }, { Name: "STORJ_TALLY_LIST_LIMIT", - Description: "how many objects to query in a batch", + Description: "how many buckets to query in a batch", Default: "2500", }, { @@ -1181,6 +1126,11 @@ func satelliteadminConfig() []Option { Description: "the maximum number of concurrent Stripe API calls in invoicing methods", Default: "10", }, + { + Name: "STORJ_PAYMENTS_STRIPE_COIN_PAYMENTS_REMOVE_EXPIRED_CREDIT", + Description: "whether to remove expired package credit or not", + Default: "true", + }, { Name: "STORJ_PAYMENTS_STRIPE_COIN_PAYMENTS_RETRIES_INITIAL_BACKOFF", Description: "the duration of the first retry interval", @@ -1256,26 +1206,6 @@ func satelliteadminConfig() []Option { Description: "amount of percents that user will earn as bonus credits by depositing in STORJ tokens", Default: "10", }, - { - Name: "STORJ_PAYMENTS_NODE_EGRESS_BANDWIDTH_PRICE", - Description: "price node receive for storing TB of egress in cents", - Default: "2000", - }, - { - Name: "STORJ_PAYMENTS_NODE_REPAIR_BANDWIDTH_PRICE", - Description: "price node receive for storing TB of repair in cents", - Default: "1000", - }, - { - Name: "STORJ_PAYMENTS_NODE_AUDIT_BANDWIDTH_PRICE", - Description: "price node receive for storing TB of audit in cents", - Default: "1000", - }, - { - Name: "STORJ_PAYMENTS_NODE_DISK_SPACE_PRICE", - Description: "price node receive for storing disk space in cents/TB", - Default: "150", - }, { Name: "STORJ_PAYMENTS_USAGE_PRICE_OVERRIDES_OVERRIDE_MAP", Description: "", @@ -1379,7 +1309,7 @@ func satelliteadminConfig() []Option { { Name: "STORJ_CONSOLE_GATEWAY_CREDENTIALS_REQUEST_URL", Description: "url link for gateway credentials requests", - Default: "https://auth.storjshare.io", + Default: "https://auth.storjsatelliteshare.io", }, { Name: "STORJ_CONSOLE_IS_BETA_SATELLITE", @@ -1423,7 +1353,12 @@ func satelliteadminConfig() []Option { }, { Name: "STORJ_CONSOLE_LINKSHARING_URL", - Description: "url link for linksharing requests", + Description: "url link for linksharing requests within the application", + Default: "https://link.storjsatelliteshare.io", + }, + { + Name: "STORJ_CONSOLE_PUBLIC_LINKSHARING_URL", + Description: "url link for linksharing requests for external sharing", Default: "https://link.storjshare.io", }, { @@ -1434,6 +1369,11 @@ func satelliteadminConfig() []Option { { Name: "STORJ_CONSOLE_ALL_PROJECTS_DASHBOARD", Description: "indicates if all projects dashboard should be used", + Default: "true", + }, + { + Name: "STORJ_CONSOLE_LIMITS_AREA_ENABLED", + Description: "indicates whether limit card section of the UI is enabled", Default: "false", }, { @@ -1461,6 +1401,21 @@ func satelliteadminConfig() []Option { Description: "whether to allow purchasing pricing packages", Default: "false", }, + { + Name: "STORJ_CONSOLE_NEW_UPLOAD_MODAL_ENABLED", + Description: "whether to show new upload modal", + Default: "false", + }, + { + Name: "STORJ_CONSOLE_GALLERY_VIEW_ENABLED", + Description: "whether to show new gallery view", + Default: "false", + }, + { + Name: "STORJ_CONSOLE_USE_VUETIFY_PROJECT", + Description: "whether to use vuetify POC project", + Default: "false", + }, { Name: "STORJ_CONSOLE_OAUTH_CODE_EXPIRY", Description: "how long oauth authorization codes are issued for", @@ -1476,6 +1431,11 @@ func satelliteadminConfig() []Option { Description: "how long oauth refresh tokens are issued for", Default: "720h", }, + { + Name: "STORJ_CONSOLE_BODY_SIZE_LIMIT", + Description: "The maximum body size allowed to be received by the API", + Default: "100.00 KB", + }, { Name: "STORJ_CONSOLE_RATE_LIMIT_DURATION", Description: "the rate at which request are allowed", @@ -1546,6 +1506,11 @@ func satelliteadminConfig() []Option { Description: "incremental duration of penalty for failed login attempts in minutes", Default: "2.0", }, + { + Name: "STORJ_CONSOLE_CONFIG_PROJECT_INVITATION_EXPIRATION", + Description: "duration that project member invitations are valid for", + Default: "168h", + }, { Name: "STORJ_CONSOLE_CONFIG_USAGE_LIMITS_STORAGE_FREE", Description: "the default free-tier storage usage limit", @@ -1716,11 +1681,6 @@ func satelliteadminConfig() []Option { Description: "maximum lifetime of unverified user account records", Default: "168h", }, - { - Name: "STORJ_CONSOLE_DBCLEANUP_MAX_PROJECT_INVITATION_AGE", - Description: "maximum lifetime of project member invitation records", - Default: "168h", - }, { Name: "STORJ_ACCOUNT_FREEZE_ENABLED", Description: "whether to run this chore.", @@ -1734,13 +1694,18 @@ func satelliteadminConfig() []Option { { Name: "STORJ_ACCOUNT_FREEZE_GRACE_PERIOD", Description: "How long to wait between a warning event and freezing an account.", - Default: "720h", + Default: "360h", }, { Name: "STORJ_ACCOUNT_FREEZE_PRICE_THRESHOLD", Description: "The failed invoice amount (in cents) beyond which an account will not be frozen", Default: "10000", }, + { + Name: "STORJ_ACCOUNT_FREEZE_EXCLUDE_STORJSCAN", + Description: "whether to exclude storjscan-paying users from automatic warn/freeze", + Default: "true", + }, { Name: "STORJ_VERSION_CLIENT_CONFIG_SERVER_ADDRESS", Description: "server address to check its version against", @@ -1946,5 +1911,10 @@ func satelliteadminConfig() []Option { Description: "the default timeout for the hubspot http client", Default: "10s", }, + { + Name: "STORJ_PIECE_TRACKER_USE_RANGED_LOOP", + Description: "whether to enable piece tracker observer with ranged loop", + Default: "true", + }, } } diff --git a/pkg/config/satellite-api.go b/pkg/config/satellite-api.go index c25c253..676393b 100644 --- a/pkg/config/satellite-api.go +++ b/pkg/config/satellite-api.go @@ -349,7 +349,7 @@ func satelliteapiConfig() []Option { { Name: "STORJ_METAINFO_MAX_ENCRYPTED_OBJECT_KEY_LENGTH", Description: "maximum encrypted object key length", - Default: "1750", + Default: "2000", }, { Name: "STORJ_METAINFO_MAX_SEGMENT_SIZE", @@ -406,31 +406,6 @@ func satelliteapiConfig() []Option { Description: "", Default: "", }, - { - Name: "STORJ_METAINFO_SEGMENT_LOOP_COALESCE_DURATION", - Description: "how long to wait for new observers before starting iteration", - Default: "", - }, - { - Name: "STORJ_METAINFO_SEGMENT_LOOP_RATE_LIMIT", - Description: "rate limit (default is 0 which is unlimited segments per second)", - Default: "0", - }, - { - Name: "STORJ_METAINFO_SEGMENT_LOOP_LIST_LIMIT", - Description: "how many items to query in a batch", - Default: "2500", - }, - { - Name: "STORJ_METAINFO_SEGMENT_LOOP_AS_OF_SYSTEM_INTERVAL", - Description: "as of system interval", - Default: "", - }, - { - Name: "STORJ_METAINFO_SEGMENT_LOOP_SUSPICIOUS_PROCESSED_RATIO", - Description: "ratio where to consider processed count as supicious", - Default: "0.03", - }, { Name: "STORJ_METAINFO_RATE_LIMITER_ENABLED", Description: "whether rate limiting is enabled.", @@ -471,46 +446,6 @@ func satelliteapiConfig() []Option { Description: "max bucket count for a project.", Default: "100", }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_MAX_CONCURRENCY", - Description: "maximum number of concurrent requests to storage nodes", - Default: "100", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_MAX_CONCURRENT_PIECES", - Description: "maximum number of concurrent pieces can be processed", - Default: "1000000", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_MAX_PIECES_PER_BATCH", - Description: "maximum number of pieces per batch", - Default: "5000", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_MAX_PIECES_PER_REQUEST", - Description: "maximum number pieces per single request", - Default: "1000", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_DIAL_TIMEOUT", - Description: "timeout for dialing nodes (0 means satellite default)", - Default: "3s", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_FAIL_THRESHOLD", - Description: "threshold for retrying a failed node", - Default: "", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_REQUEST_TIMEOUT", - Description: "timeout for a single delete request", - Default: "", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_DELETE_SUCCESS_THRESHOLD", - Description: "Which fraction of nodes should be contacted successfully until the delete of a batch of pieces is considered completed", - Default: ".75", - }, { Name: "STORJ_METAINFO_SERVER_SIDE_COPY", Description: "enable code for server-side copy, deprecated. please leave this to true.", @@ -711,6 +646,11 @@ func satelliteapiConfig() []Option { Description: "Treat pieces on the same network as in need of repair", Default: "false", }, + { + Name: "STORJ_CHECKER_DO_PLACEMENT_CHECK", + Description: "Treat pieces out of segment placement as in need of repair", + Default: "true", + }, { Name: "STORJ_REPAIRER_MAX_REPAIR", Description: "maximum segments that can be repaired concurrently", @@ -721,6 +661,11 @@ func satelliteapiConfig() []Option { Description: "how frequently repairer should try and repair more data", Default: "", }, + { + Name: "STORJ_REPAIRER_DIAL_TIMEOUT", + Description: "time limit for dialing storage node", + Default: "5s", + }, { Name: "STORJ_REPAIRER_TIMEOUT", Description: "time limit for uploading repaired pieces to new storage nodes", @@ -766,6 +711,11 @@ func satelliteapiConfig() []Option { Description: "repair pieces on the same network to other nodes", Default: "false", }, + { + Name: "STORJ_REPAIRER_DO_PLACEMENT_CHECK", + Description: "repair pieces out of segment placement", + Default: "true", + }, { Name: "STORJ_AUDIT_MAX_RETRIES_STAT_DB", Description: "max number of times to attempt updating a statdb batch", @@ -866,30 +816,15 @@ func satelliteapiConfig() []Option { Description: "Expiration of newly created objects in the bucket. These objects are under the prefix error-[timestamp] and store error messages.", Default: "336h", }, - { - Name: "STORJ_GARBAGE_COLLECTION_BF_INTERVAL", - Description: "the time between each garbage collection executions", - Default: "", - }, - { - Name: "STORJ_GARBAGE_COLLECTION_BF_ENABLED", - Description: "set if garbage collection bloom filters is enabled or not", - Default: "true", - }, { Name: "STORJ_GARBAGE_COLLECTION_BF_RUN_ONCE", Description: "set if garbage collection bloom filter process should only run once then exit", Default: "false", }, - { - Name: "STORJ_GARBAGE_COLLECTION_BF_USE_RANGED_LOOP", - Description: "whether to use ranged loop instead of segment loop", - Default: "false", - }, { Name: "STORJ_GARBAGE_COLLECTION_BF_USE_SYNC_OBSERVER", Description: "whether to use test GC SyncObserver with ranged loop", - Default: "false", + Default: "true", }, { Name: "STORJ_GARBAGE_COLLECTION_BF_INITIAL_PIECES", @@ -961,6 +896,11 @@ func satelliteapiConfig() []Option { Description: "how many expired objects to query in a batch", Default: "100", }, + { + Name: "STORJ_EXPIRED_DELETION_AS_OF_SYSTEM_INTERVAL", + Description: "as of system interval", + Default: "", + }, { Name: "STORJ_ZOMBIE_DELETION_INTERVAL", Description: "the time between each attempt to go through the db and clean up zombie objects", @@ -981,6 +921,11 @@ func satelliteapiConfig() []Option { Description: "after what time object will be deleted if there where no new upload activity", Default: "24h", }, + { + Name: "STORJ_ZOMBIE_DELETION_AS_OF_SYSTEM_INTERVAL", + Description: "as of system interval", + Default: "", + }, { Name: "STORJ_TALLY_INTERVAL", Description: "how frequently the tally service should run", @@ -996,19 +941,19 @@ func satelliteapiConfig() []Option { Description: "how large of batches GetBandwidthSince should process at a time", Default: "10000", }, - { - Name: "STORJ_TALLY_USE_OBJECTS_LOOP", - Description: "flag to switch between calculating bucket tallies using objects loop or custom query", - Default: "false", - }, { Name: "STORJ_TALLY_USE_RANGED_LOOP", Description: "whether to enable node tally with ranged loop", Default: "true", }, + { + Name: "STORJ_TALLY_SAVE_TALLIES_BATCH_SIZE", + Description: "how large should be insert into tallies", + Default: "10000", + }, { Name: "STORJ_TALLY_LIST_LIMIT", - Description: "how many objects to query in a batch", + Description: "how many buckets to query in a batch", Default: "2500", }, { @@ -1181,6 +1126,11 @@ func satelliteapiConfig() []Option { Description: "the maximum number of concurrent Stripe API calls in invoicing methods", Default: "10", }, + { + Name: "STORJ_PAYMENTS_STRIPE_COIN_PAYMENTS_REMOVE_EXPIRED_CREDIT", + Description: "whether to remove expired package credit or not", + Default: "true", + }, { Name: "STORJ_PAYMENTS_STRIPE_COIN_PAYMENTS_RETRIES_INITIAL_BACKOFF", Description: "the duration of the first retry interval", @@ -1256,26 +1206,6 @@ func satelliteapiConfig() []Option { Description: "amount of percents that user will earn as bonus credits by depositing in STORJ tokens", Default: "10", }, - { - Name: "STORJ_PAYMENTS_NODE_EGRESS_BANDWIDTH_PRICE", - Description: "price node receive for storing TB of egress in cents", - Default: "2000", - }, - { - Name: "STORJ_PAYMENTS_NODE_REPAIR_BANDWIDTH_PRICE", - Description: "price node receive for storing TB of repair in cents", - Default: "1000", - }, - { - Name: "STORJ_PAYMENTS_NODE_AUDIT_BANDWIDTH_PRICE", - Description: "price node receive for storing TB of audit in cents", - Default: "1000", - }, - { - Name: "STORJ_PAYMENTS_NODE_DISK_SPACE_PRICE", - Description: "price node receive for storing disk space in cents/TB", - Default: "150", - }, { Name: "STORJ_PAYMENTS_USAGE_PRICE_OVERRIDES_OVERRIDE_MAP", Description: "", @@ -1379,7 +1309,7 @@ func satelliteapiConfig() []Option { { Name: "STORJ_CONSOLE_GATEWAY_CREDENTIALS_REQUEST_URL", Description: "url link for gateway credentials requests", - Default: "https://auth.storjshare.io", + Default: "https://auth.storjsatelliteshare.io", }, { Name: "STORJ_CONSOLE_IS_BETA_SATELLITE", @@ -1423,7 +1353,12 @@ func satelliteapiConfig() []Option { }, { Name: "STORJ_CONSOLE_LINKSHARING_URL", - Description: "url link for linksharing requests", + Description: "url link for linksharing requests within the application", + Default: "https://link.storjsatelliteshare.io", + }, + { + Name: "STORJ_CONSOLE_PUBLIC_LINKSHARING_URL", + Description: "url link for linksharing requests for external sharing", Default: "https://link.storjshare.io", }, { @@ -1434,6 +1369,11 @@ func satelliteapiConfig() []Option { { Name: "STORJ_CONSOLE_ALL_PROJECTS_DASHBOARD", Description: "indicates if all projects dashboard should be used", + Default: "true", + }, + { + Name: "STORJ_CONSOLE_LIMITS_AREA_ENABLED", + Description: "indicates whether limit card section of the UI is enabled", Default: "false", }, { @@ -1461,6 +1401,21 @@ func satelliteapiConfig() []Option { Description: "whether to allow purchasing pricing packages", Default: "false", }, + { + Name: "STORJ_CONSOLE_NEW_UPLOAD_MODAL_ENABLED", + Description: "whether to show new upload modal", + Default: "false", + }, + { + Name: "STORJ_CONSOLE_GALLERY_VIEW_ENABLED", + Description: "whether to show new gallery view", + Default: "false", + }, + { + Name: "STORJ_CONSOLE_USE_VUETIFY_PROJECT", + Description: "whether to use vuetify POC project", + Default: "false", + }, { Name: "STORJ_CONSOLE_OAUTH_CODE_EXPIRY", Description: "how long oauth authorization codes are issued for", @@ -1476,6 +1431,11 @@ func satelliteapiConfig() []Option { Description: "how long oauth refresh tokens are issued for", Default: "720h", }, + { + Name: "STORJ_CONSOLE_BODY_SIZE_LIMIT", + Description: "The maximum body size allowed to be received by the API", + Default: "100.00 KB", + }, { Name: "STORJ_CONSOLE_RATE_LIMIT_DURATION", Description: "the rate at which request are allowed", @@ -1546,6 +1506,11 @@ func satelliteapiConfig() []Option { Description: "incremental duration of penalty for failed login attempts in minutes", Default: "2.0", }, + { + Name: "STORJ_CONSOLE_CONFIG_PROJECT_INVITATION_EXPIRATION", + Description: "duration that project member invitations are valid for", + Default: "168h", + }, { Name: "STORJ_CONSOLE_CONFIG_USAGE_LIMITS_STORAGE_FREE", Description: "the default free-tier storage usage limit", @@ -1716,11 +1681,6 @@ func satelliteapiConfig() []Option { Description: "maximum lifetime of unverified user account records", Default: "168h", }, - { - Name: "STORJ_CONSOLE_DBCLEANUP_MAX_PROJECT_INVITATION_AGE", - Description: "maximum lifetime of project member invitation records", - Default: "168h", - }, { Name: "STORJ_ACCOUNT_FREEZE_ENABLED", Description: "whether to run this chore.", @@ -1734,13 +1694,18 @@ func satelliteapiConfig() []Option { { Name: "STORJ_ACCOUNT_FREEZE_GRACE_PERIOD", Description: "How long to wait between a warning event and freezing an account.", - Default: "720h", + Default: "360h", }, { Name: "STORJ_ACCOUNT_FREEZE_PRICE_THRESHOLD", Description: "The failed invoice amount (in cents) beyond which an account will not be frozen", Default: "10000", }, + { + Name: "STORJ_ACCOUNT_FREEZE_EXCLUDE_STORJSCAN", + Description: "whether to exclude storjscan-paying users from automatic warn/freeze", + Default: "true", + }, { Name: "STORJ_VERSION_CLIENT_CONFIG_SERVER_ADDRESS", Description: "server address to check its version against", @@ -1946,5 +1911,10 @@ func satelliteapiConfig() []Option { Description: "the default timeout for the hubspot http client", Default: "10s", }, + { + Name: "STORJ_PIECE_TRACKER_USE_RANGED_LOOP", + Description: "whether to enable piece tracker observer with ranged loop", + Default: "true", + }, } } diff --git a/pkg/config/satellite-core.go b/pkg/config/satellite-core.go index da5a018..6e57677 100644 --- a/pkg/config/satellite-core.go +++ b/pkg/config/satellite-core.go @@ -349,7 +349,7 @@ func satellitecoreConfig() []Option { { Name: "STORJ_METAINFO_MAX_ENCRYPTED_OBJECT_KEY_LENGTH", Description: "maximum encrypted object key length", - Default: "1750", + Default: "2000", }, { Name: "STORJ_METAINFO_MAX_SEGMENT_SIZE", @@ -406,31 +406,6 @@ func satellitecoreConfig() []Option { Description: "", Default: "", }, - { - Name: "STORJ_METAINFO_SEGMENT_LOOP_COALESCE_DURATION", - Description: "how long to wait for new observers before starting iteration", - Default: "", - }, - { - Name: "STORJ_METAINFO_SEGMENT_LOOP_RATE_LIMIT", - Description: "rate limit (default is 0 which is unlimited segments per second)", - Default: "0", - }, - { - Name: "STORJ_METAINFO_SEGMENT_LOOP_LIST_LIMIT", - Description: "how many items to query in a batch", - Default: "2500", - }, - { - Name: "STORJ_METAINFO_SEGMENT_LOOP_AS_OF_SYSTEM_INTERVAL", - Description: "as of system interval", - Default: "", - }, - { - Name: "STORJ_METAINFO_SEGMENT_LOOP_SUSPICIOUS_PROCESSED_RATIO", - Description: "ratio where to consider processed count as supicious", - Default: "0.03", - }, { Name: "STORJ_METAINFO_RATE_LIMITER_ENABLED", Description: "whether rate limiting is enabled.", @@ -471,46 +446,6 @@ func satellitecoreConfig() []Option { Description: "max bucket count for a project.", Default: "100", }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_MAX_CONCURRENCY", - Description: "maximum number of concurrent requests to storage nodes", - Default: "100", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_MAX_CONCURRENT_PIECES", - Description: "maximum number of concurrent pieces can be processed", - Default: "1000000", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_MAX_PIECES_PER_BATCH", - Description: "maximum number of pieces per batch", - Default: "5000", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_MAX_PIECES_PER_REQUEST", - Description: "maximum number pieces per single request", - Default: "1000", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_DIAL_TIMEOUT", - Description: "timeout for dialing nodes (0 means satellite default)", - Default: "3s", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_FAIL_THRESHOLD", - Description: "threshold for retrying a failed node", - Default: "", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_REQUEST_TIMEOUT", - Description: "timeout for a single delete request", - Default: "", - }, - { - Name: "STORJ_METAINFO_PIECE_DELETION_DELETE_SUCCESS_THRESHOLD", - Description: "Which fraction of nodes should be contacted successfully until the delete of a batch of pieces is considered completed", - Default: ".75", - }, { Name: "STORJ_METAINFO_SERVER_SIDE_COPY", Description: "enable code for server-side copy, deprecated. please leave this to true.", @@ -711,6 +646,11 @@ func satellitecoreConfig() []Option { Description: "Treat pieces on the same network as in need of repair", Default: "false", }, + { + Name: "STORJ_CHECKER_DO_PLACEMENT_CHECK", + Description: "Treat pieces out of segment placement as in need of repair", + Default: "true", + }, { Name: "STORJ_REPAIRER_MAX_REPAIR", Description: "maximum segments that can be repaired concurrently", @@ -721,6 +661,11 @@ func satellitecoreConfig() []Option { Description: "how frequently repairer should try and repair more data", Default: "", }, + { + Name: "STORJ_REPAIRER_DIAL_TIMEOUT", + Description: "time limit for dialing storage node", + Default: "5s", + }, { Name: "STORJ_REPAIRER_TIMEOUT", Description: "time limit for uploading repaired pieces to new storage nodes", @@ -766,6 +711,11 @@ func satellitecoreConfig() []Option { Description: "repair pieces on the same network to other nodes", Default: "false", }, + { + Name: "STORJ_REPAIRER_DO_PLACEMENT_CHECK", + Description: "repair pieces out of segment placement", + Default: "true", + }, { Name: "STORJ_AUDIT_MAX_RETRIES_STAT_DB", Description: "max number of times to attempt updating a statdb batch", @@ -866,30 +816,15 @@ func satellitecoreConfig() []Option { Description: "Expiration of newly created objects in the bucket. These objects are under the prefix error-[timestamp] and store error messages.", Default: "336h", }, - { - Name: "STORJ_GARBAGE_COLLECTION_BF_INTERVAL", - Description: "the time between each garbage collection executions", - Default: "", - }, - { - Name: "STORJ_GARBAGE_COLLECTION_BF_ENABLED", - Description: "set if garbage collection bloom filters is enabled or not", - Default: "true", - }, { Name: "STORJ_GARBAGE_COLLECTION_BF_RUN_ONCE", Description: "set if garbage collection bloom filter process should only run once then exit", Default: "false", }, - { - Name: "STORJ_GARBAGE_COLLECTION_BF_USE_RANGED_LOOP", - Description: "whether to use ranged loop instead of segment loop", - Default: "false", - }, { Name: "STORJ_GARBAGE_COLLECTION_BF_USE_SYNC_OBSERVER", Description: "whether to use test GC SyncObserver with ranged loop", - Default: "false", + Default: "true", }, { Name: "STORJ_GARBAGE_COLLECTION_BF_INITIAL_PIECES", @@ -961,6 +896,11 @@ func satellitecoreConfig() []Option { Description: "how many expired objects to query in a batch", Default: "100", }, + { + Name: "STORJ_EXPIRED_DELETION_AS_OF_SYSTEM_INTERVAL", + Description: "as of system interval", + Default: "", + }, { Name: "STORJ_ZOMBIE_DELETION_INTERVAL", Description: "the time between each attempt to go through the db and clean up zombie objects", @@ -981,6 +921,11 @@ func satellitecoreConfig() []Option { Description: "after what time object will be deleted if there where no new upload activity", Default: "24h", }, + { + Name: "STORJ_ZOMBIE_DELETION_AS_OF_SYSTEM_INTERVAL", + Description: "as of system interval", + Default: "", + }, { Name: "STORJ_TALLY_INTERVAL", Description: "how frequently the tally service should run", @@ -996,19 +941,19 @@ func satellitecoreConfig() []Option { Description: "how large of batches GetBandwidthSince should process at a time", Default: "10000", }, - { - Name: "STORJ_TALLY_USE_OBJECTS_LOOP", - Description: "flag to switch between calculating bucket tallies using objects loop or custom query", - Default: "false", - }, { Name: "STORJ_TALLY_USE_RANGED_LOOP", Description: "whether to enable node tally with ranged loop", Default: "true", }, + { + Name: "STORJ_TALLY_SAVE_TALLIES_BATCH_SIZE", + Description: "how large should be insert into tallies", + Default: "10000", + }, { Name: "STORJ_TALLY_LIST_LIMIT", - Description: "how many objects to query in a batch", + Description: "how many buckets to query in a batch", Default: "2500", }, { @@ -1181,6 +1126,11 @@ func satellitecoreConfig() []Option { Description: "the maximum number of concurrent Stripe API calls in invoicing methods", Default: "10", }, + { + Name: "STORJ_PAYMENTS_STRIPE_COIN_PAYMENTS_REMOVE_EXPIRED_CREDIT", + Description: "whether to remove expired package credit or not", + Default: "true", + }, { Name: "STORJ_PAYMENTS_STRIPE_COIN_PAYMENTS_RETRIES_INITIAL_BACKOFF", Description: "the duration of the first retry interval", @@ -1256,26 +1206,6 @@ func satellitecoreConfig() []Option { Description: "amount of percents that user will earn as bonus credits by depositing in STORJ tokens", Default: "10", }, - { - Name: "STORJ_PAYMENTS_NODE_EGRESS_BANDWIDTH_PRICE", - Description: "price node receive for storing TB of egress in cents", - Default: "2000", - }, - { - Name: "STORJ_PAYMENTS_NODE_REPAIR_BANDWIDTH_PRICE", - Description: "price node receive for storing TB of repair in cents", - Default: "1000", - }, - { - Name: "STORJ_PAYMENTS_NODE_AUDIT_BANDWIDTH_PRICE", - Description: "price node receive for storing TB of audit in cents", - Default: "1000", - }, - { - Name: "STORJ_PAYMENTS_NODE_DISK_SPACE_PRICE", - Description: "price node receive for storing disk space in cents/TB", - Default: "150", - }, { Name: "STORJ_PAYMENTS_USAGE_PRICE_OVERRIDES_OVERRIDE_MAP", Description: "", @@ -1379,7 +1309,7 @@ func satellitecoreConfig() []Option { { Name: "STORJ_CONSOLE_GATEWAY_CREDENTIALS_REQUEST_URL", Description: "url link for gateway credentials requests", - Default: "https://auth.storjshare.io", + Default: "https://auth.storjsatelliteshare.io", }, { Name: "STORJ_CONSOLE_IS_BETA_SATELLITE", @@ -1423,7 +1353,12 @@ func satellitecoreConfig() []Option { }, { Name: "STORJ_CONSOLE_LINKSHARING_URL", - Description: "url link for linksharing requests", + Description: "url link for linksharing requests within the application", + Default: "https://link.storjsatelliteshare.io", + }, + { + Name: "STORJ_CONSOLE_PUBLIC_LINKSHARING_URL", + Description: "url link for linksharing requests for external sharing", Default: "https://link.storjshare.io", }, { @@ -1434,6 +1369,11 @@ func satellitecoreConfig() []Option { { Name: "STORJ_CONSOLE_ALL_PROJECTS_DASHBOARD", Description: "indicates if all projects dashboard should be used", + Default: "true", + }, + { + Name: "STORJ_CONSOLE_LIMITS_AREA_ENABLED", + Description: "indicates whether limit card section of the UI is enabled", Default: "false", }, { @@ -1461,6 +1401,21 @@ func satellitecoreConfig() []Option { Description: "whether to allow purchasing pricing packages", Default: "false", }, + { + Name: "STORJ_CONSOLE_NEW_UPLOAD_MODAL_ENABLED", + Description: "whether to show new upload modal", + Default: "false", + }, + { + Name: "STORJ_CONSOLE_GALLERY_VIEW_ENABLED", + Description: "whether to show new gallery view", + Default: "false", + }, + { + Name: "STORJ_CONSOLE_USE_VUETIFY_PROJECT", + Description: "whether to use vuetify POC project", + Default: "false", + }, { Name: "STORJ_CONSOLE_OAUTH_CODE_EXPIRY", Description: "how long oauth authorization codes are issued for", @@ -1476,6 +1431,11 @@ func satellitecoreConfig() []Option { Description: "how long oauth refresh tokens are issued for", Default: "720h", }, + { + Name: "STORJ_CONSOLE_BODY_SIZE_LIMIT", + Description: "The maximum body size allowed to be received by the API", + Default: "100.00 KB", + }, { Name: "STORJ_CONSOLE_RATE_LIMIT_DURATION", Description: "the rate at which request are allowed", @@ -1546,6 +1506,11 @@ func satellitecoreConfig() []Option { Description: "incremental duration of penalty for failed login attempts in minutes", Default: "2.0", }, + { + Name: "STORJ_CONSOLE_CONFIG_PROJECT_INVITATION_EXPIRATION", + Description: "duration that project member invitations are valid for", + Default: "168h", + }, { Name: "STORJ_CONSOLE_CONFIG_USAGE_LIMITS_STORAGE_FREE", Description: "the default free-tier storage usage limit", @@ -1716,11 +1681,6 @@ func satellitecoreConfig() []Option { Description: "maximum lifetime of unverified user account records", Default: "168h", }, - { - Name: "STORJ_CONSOLE_DBCLEANUP_MAX_PROJECT_INVITATION_AGE", - Description: "maximum lifetime of project member invitation records", - Default: "168h", - }, { Name: "STORJ_ACCOUNT_FREEZE_ENABLED", Description: "whether to run this chore.", @@ -1734,13 +1694,18 @@ func satellitecoreConfig() []Option { { Name: "STORJ_ACCOUNT_FREEZE_GRACE_PERIOD", Description: "How long to wait between a warning event and freezing an account.", - Default: "720h", + Default: "360h", }, { Name: "STORJ_ACCOUNT_FREEZE_PRICE_THRESHOLD", Description: "The failed invoice amount (in cents) beyond which an account will not be frozen", Default: "10000", }, + { + Name: "STORJ_ACCOUNT_FREEZE_EXCLUDE_STORJSCAN", + Description: "whether to exclude storjscan-paying users from automatic warn/freeze", + Default: "true", + }, { Name: "STORJ_VERSION_CLIENT_CONFIG_SERVER_ADDRESS", Description: "server address to check its version against", @@ -1946,5 +1911,10 @@ func satellitecoreConfig() []Option { Description: "the default timeout for the hubspot http client", Default: "10s", }, + { + Name: "STORJ_PIECE_TRACKER_USE_RANGED_LOOP", + Description: "whether to enable piece tracker observer with ranged loop", + Default: "true", + }, } } diff --git a/pkg/config/storagenode.go b/pkg/config/storagenode.go index 9aea76e..c39ad05 100644 --- a/pkg/config/storagenode.go +++ b/pkg/config/storagenode.go @@ -121,6 +121,21 @@ func storagenodeConfig() []Option { Description: "how frequently the node contact chore should run", Default: "", }, + { + Name: "STORJ_CONTACT_TAGS_TAGS", + Description: "", + Default: "", + }, + { + Name: "STORJ_CONTACT_TAGS_XXX_UNRECOGNIZED", + Description: "", + Default: "", + }, + { + Name: "STORJ_CONTACT_TAGS_XXX_SIZECACHE", + Description: "", + Default: "", + }, { Name: "STORJ_OPERATOR_EMAIL", Description: "operator email address", diff --git a/pkg/files/docker/edge.Dockerfile b/pkg/files/docker/edge.Dockerfile index 1832bd0..1088752 100644 --- a/pkg/files/docker/edge.Dockerfile +++ b/pkg/files/docker/edge.Dockerfile @@ -33,7 +33,7 @@ RUN --mount=type=cache,target=/var/lib/storj/go/pkg/mod,mode=777,uid=1000 \ --mount=type=cache,target=/var/lib/storj/.cache/go-build,mode=777,uid=1000 \ go install ./cmd/... -FROM img.dev.storj.io/storjup/base:20230616-1 AS final +FROM img.dev.storj.io/storjup/base:20230804-1 AS final COPY --from=binaries /var/lib/storj/go/bin /var/lib/storj/go/bin COPY --from=binaries /var/lib/storj/gateway-mt/pkg/linksharing/web /var/lib/storj/pkg/linksharing/web diff --git a/pkg/files/docker/storj.Dockerfile b/pkg/files/docker/storj.Dockerfile index 158b305..92a0cad 100644 --- a/pkg/files/docker/storj.Dockerfile +++ b/pkg/files/docker/storj.Dockerfile @@ -41,7 +41,7 @@ RUN --mount=type=cache,target=/var/lib/storj/go/pkg/mod,mode=777,uid=1000 \ --mount=type=cache,target=/var/lib/storj/.cache/go-build,mode=777,uid=1000 \ go install ./cmd/... -FROM --platform=$TARGETPLATFORM img.dev.storj.io/storjup/base:20230616-1 AS final +FROM --platform=$TARGETPLATFORM img.dev.storj.io/storjup/base:20230804-1 AS final ENV STORJ_ADMIN_STATIC_DIR=/var/lib/storj/storj/satellite/admin/ui/build ENV STORJ_CONSOLE_STATIC_DIR=/var/lib/storj/storj/web/satellite/ ENV STORJ_MAIL_TEMPLATE_PATH=/var/lib/storj/storj/web/satellite/static/emails diff --git a/pkg/recipe/admin.yaml b/pkg/recipe/admin.yaml index 0e0a53e..2004c03 100644 --- a/pkg/recipe/admin.yaml +++ b/pkg/recipe/admin.yaml @@ -5,7 +5,7 @@ add: label: - storj - core - image: img.dev.storj.io/storjup/storj:1.79.4 + image: img.dev.storj.io/storjup/storj:1.83.2 command: - satellite - run diff --git a/pkg/recipe/billing.yaml b/pkg/recipe/billing.yaml index e8d57f8..ab1e3da 100644 --- a/pkg/recipe/billing.yaml +++ b/pkg/recipe/billing.yaml @@ -4,7 +4,7 @@ add: - name: storjscan label: - storjscan - image: img.dev.storj.io/storjup/storjscan:1.0.2 + image: img.dev.storj.io/storjup/storjscan:1.0.3 command: - storjscan - run diff --git a/pkg/recipe/core.yaml b/pkg/recipe/core.yaml index 06a0de3..b1a2212 100644 --- a/pkg/recipe/core.yaml +++ b/pkg/recipe/core.yaml @@ -5,7 +5,7 @@ add: label: - storj - core - image: img.dev.storj.io/storjup/storj:1.79.4 + image: img.dev.storj.io/storjup/storj:1.83.2 command: - satellite - run diff --git a/pkg/recipe/edge.yaml b/pkg/recipe/edge.yaml index 8c578ff..0959e0f 100644 --- a/pkg/recipe/edge.yaml +++ b/pkg/recipe/edge.yaml @@ -5,8 +5,7 @@ add: label: - storj - edge - - - image: img.dev.storj.io/storjup/edge:1.50.0 + image: img.dev.storj.io/storjup/edge:1.58.1 command: - gateway-mt - run @@ -26,7 +25,7 @@ add: label: - storj - edge - image: img.dev.storj.io/storjup/edge:1.50.0 + image: img.dev.storj.io/storjup/edge:1.58.1 command: - authservice - run @@ -46,7 +45,7 @@ add: label: - storj - edge - image: img.dev.storj.io/storjup/edge:1.50.0 + image: img.dev.storj.io/storjup/edge:1.58.1 command: - linksharing - run diff --git a/pkg/recipe/gc.yaml b/pkg/recipe/gc.yaml index e0238ef..8097cc0 100644 --- a/pkg/recipe/gc.yaml +++ b/pkg/recipe/gc.yaml @@ -5,7 +5,7 @@ add: label: - storj - core - image: img.dev.storj.io/storjup/storj:1.79.4 + image: img.dev.storj.io/storjup/storj:1.83.2 command: - satellite - run @@ -29,7 +29,7 @@ add: label: - storj - core - image: img.dev.storj.io/storjup/storj:1.79.4 + image: img.dev.storj.io/storjup/storj:1.83.2 command: - satellite - run diff --git a/pkg/recipe/minimal.yaml b/pkg/recipe/minimal.yaml index c213a33..8763954 100644 --- a/pkg/recipe/minimal.yaml +++ b/pkg/recipe/minimal.yaml @@ -5,7 +5,7 @@ add: label: - storj - core - image: img.dev.storj.io/storjup/storj:1.79.4 + image: img.dev.storj.io/storjup/storj:1.83.2 command: - satellite - run @@ -49,7 +49,7 @@ add: - storj - core instance: 10 - image: img.dev.storj.io/storjup/storj:1.79.4 + image: img.dev.storj.io/storjup/storj:1.83.2 command: - storagenode - run diff --git a/pkg/recipe/rangedloop.yaml b/pkg/recipe/rangedloop.yaml index 72a00a6..47270bb 100644 --- a/pkg/recipe/rangedloop.yaml +++ b/pkg/recipe/rangedloop.yaml @@ -5,7 +5,7 @@ add: label: - storj - core - image: img.dev.storj.io/storjup/storj:1.79.4 + image: img.dev.storj.io/storjup/storj:1.83.2 command: - satellite - run