From e7b35381f22e2ab84ded156b062d284b4da5c93e Mon Sep 17 00:00:00 2001 From: Andrew Harding Date: Wed, 25 Jan 2023 13:34:47 -0700 Subject: [PATCH] mod: bump common and uplink deps Change-Id: Ie2d87f517b57a8760f50ac5c9f1b8b0448f5b3b5 --- cmd/uplink/cmd_share.go | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- scripts/test-wasm-size.sh | 2 +- testsuite/storjscan/go.mod | 4 ++-- testsuite/storjscan/go.sum | 9 ++++----- testsuite/ui/go.mod | 4 ++-- testsuite/ui/go.sum | 9 ++++----- 8 files changed, 20 insertions(+), 22 deletions(-) diff --git a/cmd/uplink/cmd_share.go b/cmd/uplink/cmd_share.go index 267b2d389..4b5fddfd7 100644 --- a/cmd/uplink/cmd_share.go +++ b/cmd/uplink/cmd_share.go @@ -204,7 +204,7 @@ func RegisterAccess(ctx context.Context, access *uplink.Access, authService stri if strings.HasPrefix(authService, "insecure://") { authService = strings.TrimPrefix(authService, "insecure://") - edgeConfig.InsecureSkipVerify = true + edgeConfig.InsecureUnencryptedConnection = true } // preserve compatibility with previous https service authService = strings.TrimPrefix(authService, "https://") diff --git a/go.mod b/go.mod index 59cc8802e..d1b7079e9 100644 --- a/go.mod +++ b/go.mod @@ -52,11 +52,11 @@ require ( golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e gopkg.in/segmentio/analytics-go.v3 v3.1.0 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 - storj.io/common v0.0.0-20230124141033-6d40840eac7d + storj.io/common v0.0.0-20230125172029-ac90a56db6dd storj.io/drpc v0.0.32 storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 storj.io/private v0.0.0-20221108123115-3a27297f0b78 - storj.io/uplink v1.10.0 + storj.io/uplink v1.10.1-0.20230125195524-beab4fa36cf1 ) require ( diff --git a/go.sum b/go.sum index 576ec7cd9..d96597e4d 100644 --- a/go.sum +++ b/go.sum @@ -951,13 +951,13 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= storj.io/common v0.0.0-20220719163320-cd2ef8e1b9b0/go.mod h1:mCYV6Ud5+cdbuaxdPD5Zht/HYaIn0sffnnws9ErkrMQ= -storj.io/common v0.0.0-20230124141033-6d40840eac7d h1:r3Y4e3/7d9vL4Oq/gVu3G0GmbUe8Juh/oav26wXu6yI= -storj.io/common v0.0.0-20230124141033-6d40840eac7d/go.mod h1:409lZ7v1XYNwdpe8sRKG6m+5Z3wgbo1PXDFcgZtkLhQ= +storj.io/common v0.0.0-20230125172029-ac90a56db6dd h1:am7/43fWA+LwxF+lPfrVH3OBtfOhLkLOAkuZWsOns90= +storj.io/common v0.0.0-20230125172029-ac90a56db6dd/go.mod h1:409lZ7v1XYNwdpe8sRKG6m+5Z3wgbo1PXDFcgZtkLhQ= storj.io/drpc v0.0.32 h1:5p5ZwsK/VOgapaCu+oxaPVwO6UwIs+iwdMiD50+R4PI= storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg= 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/private v0.0.0-20221108123115-3a27297f0b78 h1:kHJEx5AAASp+zGaBPwBJyqZ5zFkde6nLyELGlxdZmiM= storj.io/private v0.0.0-20221108123115-3a27297f0b78/go.mod h1:hc63X333SVJ3UrOxXpGN4VnwqnmbWgAHln3wYJ8AroI= -storj.io/uplink v1.10.0 h1:3hS0hszupHSxEoC4DsMpljaRy0uNoijEPVF6siIE28Q= -storj.io/uplink v1.10.0/go.mod h1:gJIQumB8T3tBHPRive51AVpbc+v2xe+P/goFNMSRLG4= +storj.io/uplink v1.10.1-0.20230125195524-beab4fa36cf1 h1:UrnuA+dMgn3e9c8k15a1hyN2W+IqqBrt+cXJGV6+7qk= +storj.io/uplink v1.10.1-0.20230125195524-beab4fa36cf1/go.mod h1:fYTIRgr06karY5t3ZHaVi5TYABLnQJThpVMZkObU+J4= diff --git a/scripts/test-wasm-size.sh b/scripts/test-wasm-size.sh index e39aa05ac..756541c6e 100755 --- a/scripts/test-wasm-size.sh +++ b/scripts/test-wasm-size.sh @@ -10,7 +10,7 @@ trap cleanup EXIT cd satellite/console/wasm && pwd && GOOS=js GOARCH=wasm go build -o main.wasm . BUILD_SIZE=$(stat -c %s main.wasm) -CURRENT_SIZE=10140488 +CURRENT_SIZE=10158655 if [ $BUILD_SIZE -gt $CURRENT_SIZE ]; then echo "Wasm size is too big, was $CURRENT_SIZE but now it is $BUILD_SIZE" exit 1 diff --git a/testsuite/storjscan/go.mod b/testsuite/storjscan/go.mod index 163d03499..d7d4ce675 100644 --- a/testsuite/storjscan/go.mod +++ b/testsuite/storjscan/go.mod @@ -10,11 +10,11 @@ require ( github.com/zeebo/errs v1.3.0 go.uber.org/zap v1.21.0 golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde - storj.io/common v0.0.0-20230124141033-6d40840eac7d + storj.io/common v0.0.0-20230125172029-ac90a56db6dd storj.io/private v0.0.0-20221108123115-3a27297f0b78 storj.io/storj v1.63.1 storj.io/storjscan v0.0.0-20220926140643-1623c3b391b0 - storj.io/uplink v1.10.0 + storj.io/uplink v1.10.1-0.20230125195524-beab4fa36cf1 ) require ( diff --git a/testsuite/storjscan/go.sum b/testsuite/storjscan/go.sum index d463d0f83..43141ff90 100644 --- a/testsuite/storjscan/go.sum +++ b/testsuite/storjscan/go.sum @@ -1262,9 +1262,8 @@ storj.io/common v0.0.0-20220719163320-cd2ef8e1b9b0/go.mod h1:mCYV6Ud5+cdbuaxdPD5 storj.io/common v0.0.0-20220802175255-aae0c09ec9d4/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= storj.io/common v0.0.0-20220829171748-14b0a3c9565e/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= storj.io/common v0.0.0-20220915180246-7826900e2b06/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= -storj.io/common v0.0.0-20221123115229-fed3e6651b63/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= -storj.io/common v0.0.0-20230124141033-6d40840eac7d h1:r3Y4e3/7d9vL4Oq/gVu3G0GmbUe8Juh/oav26wXu6yI= -storj.io/common v0.0.0-20230124141033-6d40840eac7d/go.mod h1:409lZ7v1XYNwdpe8sRKG6m+5Z3wgbo1PXDFcgZtkLhQ= +storj.io/common v0.0.0-20230125172029-ac90a56db6dd h1:am7/43fWA+LwxF+lPfrVH3OBtfOhLkLOAkuZWsOns90= +storj.io/common v0.0.0-20230125172029-ac90a56db6dd/go.mod h1:409lZ7v1XYNwdpe8sRKG6m+5Z3wgbo1PXDFcgZtkLhQ= storj.io/drpc v0.0.32 h1:5p5ZwsK/VOgapaCu+oxaPVwO6UwIs+iwdMiD50+R4PI= storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg= storj.io/monkit-jaeger v0.0.0-20220726162929-c3a9898b5bca/go.mod h1:iK+dmHZZXQlW7ahKdNSOo+raMk5BDL2wbD62FIeXLWs= @@ -1275,5 +1274,5 @@ storj.io/private v0.0.0-20221108123115-3a27297f0b78 h1:kHJEx5AAASp+zGaBPwBJyqZ5z storj.io/private v0.0.0-20221108123115-3a27297f0b78/go.mod h1:hc63X333SVJ3UrOxXpGN4VnwqnmbWgAHln3wYJ8AroI= storj.io/storjscan v0.0.0-20220926140643-1623c3b391b0 h1:pSfGf9E9OlUd17W7LSpL4tTONIyFji6dz8I2iTDd8BY= storj.io/storjscan v0.0.0-20220926140643-1623c3b391b0/go.mod h1:5nLgAOl1KTDVyqORAhvrp+167PtShEuS1L3pJgXPjwo= -storj.io/uplink v1.10.0 h1:3hS0hszupHSxEoC4DsMpljaRy0uNoijEPVF6siIE28Q= -storj.io/uplink v1.10.0/go.mod h1:gJIQumB8T3tBHPRive51AVpbc+v2xe+P/goFNMSRLG4= +storj.io/uplink v1.10.1-0.20230125195524-beab4fa36cf1 h1:UrnuA+dMgn3e9c8k15a1hyN2W+IqqBrt+cXJGV6+7qk= +storj.io/uplink v1.10.1-0.20230125195524-beab4fa36cf1/go.mod h1:fYTIRgr06karY5t3ZHaVi5TYABLnQJThpVMZkObU+J4= diff --git a/testsuite/ui/go.mod b/testsuite/ui/go.mod index 68304c6b2..886caa563 100644 --- a/testsuite/ui/go.mod +++ b/testsuite/ui/go.mod @@ -10,7 +10,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 go.uber.org/zap v1.17.0 - storj.io/common v0.0.0-20230124141033-6d40840eac7d + storj.io/common v0.0.0-20230125172029-ac90a56db6dd storj.io/gateway-mt v1.18.1-0.20211210081136-cada9a567d31 storj.io/private v0.0.0-20221108123115-3a27297f0b78 storj.io/storj v0.12.1-0.20221125175451-ef4b564b82f7 @@ -228,5 +228,5 @@ require ( storj.io/gateway v1.4.1 // indirect storj.io/minio v0.0.0-20211007171754-df6c27823c8a // indirect storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 // indirect - storj.io/uplink v1.10.0 // indirect + storj.io/uplink v1.10.1-0.20230125195524-beab4fa36cf1 // indirect ) diff --git a/testsuite/ui/go.sum b/testsuite/ui/go.sum index 043ffd437..74189564d 100644 --- a/testsuite/ui/go.sum +++ b/testsuite/ui/go.sum @@ -1501,9 +1501,8 @@ storj.io/common v0.0.0-20210916151047-6aaeb34bb916/go.mod h1:objobGrIWQwhmTSpSm6 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-20220915180246-7826900e2b06/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= -storj.io/common v0.0.0-20221123115229-fed3e6651b63/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= -storj.io/common v0.0.0-20230124141033-6d40840eac7d h1:r3Y4e3/7d9vL4Oq/gVu3G0GmbUe8Juh/oav26wXu6yI= -storj.io/common v0.0.0-20230124141033-6d40840eac7d/go.mod h1:409lZ7v1XYNwdpe8sRKG6m+5Z3wgbo1PXDFcgZtkLhQ= +storj.io/common v0.0.0-20230125172029-ac90a56db6dd h1:am7/43fWA+LwxF+lPfrVH3OBtfOhLkLOAkuZWsOns90= +storj.io/common v0.0.0-20230125172029-ac90a56db6dd/go.mod h1:409lZ7v1XYNwdpe8sRKG6m+5Z3wgbo1PXDFcgZtkLhQ= storj.io/dotworld v0.0.0-20210324183515-0d11aeccd840/go.mod h1:KU9YvEgRrMMiWLvH8pzn1UkoCoxggKIPvQxmNdx7aXQ= storj.io/drpc v0.0.11/go.mod h1:TiFc2obNjL9/3isMW1Rpxjy8V9uE0B2HMeMFGiiI7Iw= storj.io/drpc v0.0.24/go.mod h1:ofQUDPQbbIymRDKE0tms48k8bLP5Y+dsI9CbXGv3gko= @@ -1524,5 +1523,5 @@ storj.io/private v0.0.0-20221108123115-3a27297f0b78 h1:kHJEx5AAASp+zGaBPwBJyqZ5z storj.io/private v0.0.0-20221108123115-3a27297f0b78/go.mod h1:hc63X333SVJ3UrOxXpGN4VnwqnmbWgAHln3wYJ8AroI= storj.io/uplink v1.7.0/go.mod h1:zqj/LFDxa6RMaSRSHOmukg3mMgesOry0iHSjNldDMGo= storj.io/uplink v1.7.1-0.20211103104100-a785482780d8/go.mod h1:pKqsMpNMIAz//2TXzUGOR6tpu3iyabvXV4VWINj4jaY= -storj.io/uplink v1.10.0 h1:3hS0hszupHSxEoC4DsMpljaRy0uNoijEPVF6siIE28Q= -storj.io/uplink v1.10.0/go.mod h1:gJIQumB8T3tBHPRive51AVpbc+v2xe+P/goFNMSRLG4= +storj.io/uplink v1.10.1-0.20230125195524-beab4fa36cf1 h1:UrnuA+dMgn3e9c8k15a1hyN2W+IqqBrt+cXJGV6+7qk= +storj.io/uplink v1.10.1-0.20230125195524-beab4fa36cf1/go.mod h1:fYTIRgr06karY5t3ZHaVi5TYABLnQJThpVMZkObU+J4=