From f40baf8629d56272e0aa38026c2152afa1cbacc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Elek?= Date: Wed, 6 Sep 2023 13:15:26 +0200 Subject: [PATCH] go.mod: bump dependencies (private,uplink,common) Change-Id: I6c55735b45cadaf36697eff53e78b5b09afe9dea --- go.mod | 6 +++--- go.sum | 12 ++++++------ satellite/overlay/placement_test.go | 4 +--- satellite/repair/checker/observer_test.go | 9 ++++++--- testsuite/storjscan/go.mod | 6 +++--- testsuite/storjscan/go.sum | 12 ++++++------ testsuite/ui/go.mod | 6 +++--- testsuite/ui/go.sum | 12 ++++++------ 8 files changed, 34 insertions(+), 33 deletions(-) diff --git a/go.mod b/go.mod index 661ab4eea..c4a830f0e 100644 --- a/go.mod +++ b/go.mod @@ -60,11 +60,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.1 - storj.io/common v0.0.0-20230824112457-9233ce5adb92 + storj.io/common v0.0.0-20230906110953-ed8a53d568d8 storj.io/drpc v0.0.33 storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 - storj.io/private v0.0.0-20230703113355-ccd4db5ae659 - storj.io/uplink v1.11.0 + storj.io/private v0.0.0-20230824104110-1eac532af65a + storj.io/uplink v1.11.1-0.20230905131215-412de374f05c ) require ( diff --git a/go.sum b/go.sum index 5edd30ea0..5a602a8a0 100644 --- a/go.sum +++ b/go.sum @@ -1010,8 +1010,8 @@ 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-20230824112457-9233ce5adb92 h1:05A/0l5rLnLRM1ntubre4oMZ6SvRs544cDskYuy40GE= -storj.io/common v0.0.0-20230824112457-9233ce5adb92/go.mod h1:9evX8PZey+J3bcflXmR666E8GW4uRy5EDiVvg8iER7s= +storj.io/common v0.0.0-20230906110953-ed8a53d568d8 h1:DdgIPSCTZ2/b4hBfkTgsVKw0xI6yc1qzeBSdZZeRA1M= +storj.io/common v0.0.0-20230906110953-ed8a53d568d8/go.mod h1:9evX8PZey+J3bcflXmR666E8GW4uRy5EDiVvg8iER7s= 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= @@ -1019,7 +1019,7 @@ storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 h1:SVuEocEhZfFc13J1Aml 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-20230703113355-ccd4db5ae659 h1:J72VWwbpllfolJoCsjVMr3YnscUUOQAruzFTsivqIqY= -storj.io/private v0.0.0-20230703113355-ccd4db5ae659/go.mod h1:mfdHEaAcTARpd4/Hc6N5uxwB1ZG3jtPdVlle57xzQxQ= -storj.io/uplink v1.11.0 h1:zGmCcMx1JMRI4NlQi/pN8+z2Jzy7pVVCUDhMVTfboHw= -storj.io/uplink v1.11.0/go.mod h1:cDlpDWGJykXfYE7NtO1EeArGFy12K5Xj8pV8ufpUCKE= +storj.io/private v0.0.0-20230824104110-1eac532af65a h1:x0OnU7z801JmR0XwFrFxmEBqcq+FDDuSn5jMbFoyfBo= +storj.io/private v0.0.0-20230824104110-1eac532af65a/go.mod h1:6+MGr4KUXEBIOsOstFz1efPkA+8wVVfzsO8RpuAhhB4= +storj.io/uplink v1.11.1-0.20230905131215-412de374f05c h1:UBrHiML8mRU+8qBPTMuw2WHVwwmUjfenJ17QpO1Erp8= +storj.io/uplink v1.11.1-0.20230905131215-412de374f05c/go.mod h1:JOUmWW3FrzCkDK4wgrTonKrKTWafK7jRQA8zBb8mkxs= diff --git a/satellite/overlay/placement_test.go b/satellite/overlay/placement_test.go index dacd370ac..c02f39874 100644 --- a/satellite/overlay/placement_test.go +++ b/satellite/overlay/placement_test.go @@ -304,15 +304,13 @@ func TestPlacementFromString(t *testing.T) { filter1 := rules1.CreateFilters(placement) filter2 := rules2.CreateFilters(placement) for _, country := range testCountries { - old := placement.AllowedCountry(country) result1 := filter1.Match(&nodeselection.SelectedNode{ CountryCode: country, }) result2 := filter2.Match(&nodeselection.SelectedNode{ CountryCode: country, }) - assert.Equal(t, old, result1, "old placement doesn't match string based configuration for placement %d and country %s", placement, country) - assert.Equal(t, old, result2, "old placement doesn't match code based configuration for placement %d and country %s", placement, country) + assert.Equal(t, result1, result2, "default legacy rules do not match string based configuration for placement %d and country %s", placement, country) } } diff --git a/satellite/repair/checker/observer_test.go b/satellite/repair/checker/observer_test.go index 07895270b..e834de9d5 100644 --- a/satellite/repair/checker/observer_test.go +++ b/satellite/repair/checker/observer_test.go @@ -26,6 +26,7 @@ import ( "storj.io/storj/satellite/buckets" "storj.io/storj/satellite/metabase" "storj.io/storj/satellite/metabase/rangedloop" + "storj.io/storj/satellite/nodeselection" "storj.io/storj/satellite/overlay" "storj.io/storj/satellite/repair/checker" "storj.io/storj/satellite/repair/queue" @@ -652,7 +653,7 @@ func TestObserver_PlacementCheck(t *testing.T) { } // confirm that some pieces are out of placement - ok, err := allPiecesInPlacement(ctx, planet.Satellites[0].Overlay.Service, segments[0].Pieces, segments[0].Placement) + ok, err := allPiecesInPlacement(ctx, planet.Satellites[0].Overlay.Service, segments[0].Pieces, overlay.NewPlacementRules().CreateFilters(segments[0].Placement)) require.NoError(t, err) require.False(t, ok) @@ -675,13 +676,15 @@ func TestObserver_PlacementCheck(t *testing.T) { }) } -func allPiecesInPlacement(ctx context.Context, overlay *overlay.Service, pieces metabase.Pieces, placement storj.PlacementConstraint) (bool, error) { +func allPiecesInPlacement(ctx context.Context, overlay *overlay.Service, pieces metabase.Pieces, filter nodeselection.NodeFilter) (bool, error) { for _, piece := range pieces { nodeDossier, err := overlay.Get(ctx, piece.StorageNode) if err != nil { return false, err } - if !placement.AllowedCountry(nodeDossier.CountryCode) { + if !filter.Match(&nodeselection.SelectedNode{ + CountryCode: nodeDossier.CountryCode, + }) { return false, nil } } diff --git a/testsuite/storjscan/go.mod b/testsuite/storjscan/go.mod index 91c8f9a10..a6439f5f0 100644 --- a/testsuite/storjscan/go.mod +++ b/testsuite/storjscan/go.mod @@ -9,11 +9,11 @@ require ( github.com/zeebo/errs v1.3.0 go.uber.org/zap v1.21.0 golang.org/x/sync v0.3.0 - storj.io/common v0.0.0-20230824112457-9233ce5adb92 - storj.io/private v0.0.0-20230703113355-ccd4db5ae659 + storj.io/common v0.0.0-20230906110953-ed8a53d568d8 + storj.io/private v0.0.0-20230824104110-1eac532af65a storj.io/storj v1.63.1 storj.io/storjscan v0.0.0-20220926140643-1623c3b391b0 - storj.io/uplink v1.11.0 + storj.io/uplink v1.11.1-0.20230905131215-412de374f05c ) require ( diff --git a/testsuite/storjscan/go.sum b/testsuite/storjscan/go.sum index 242e6eadb..21cc51483 100644 --- a/testsuite/storjscan/go.sum +++ b/testsuite/storjscan/go.sum @@ -1252,8 +1252,8 @@ rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= 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-20230824112457-9233ce5adb92 h1:05A/0l5rLnLRM1ntubre4oMZ6SvRs544cDskYuy40GE= -storj.io/common v0.0.0-20230824112457-9233ce5adb92/go.mod h1:9evX8PZey+J3bcflXmR666E8GW4uRy5EDiVvg8iER7s= +storj.io/common v0.0.0-20230906110953-ed8a53d568d8 h1:DdgIPSCTZ2/b4hBfkTgsVKw0xI6yc1qzeBSdZZeRA1M= +storj.io/common v0.0.0-20230906110953-ed8a53d568d8/go.mod h1:9evX8PZey+J3bcflXmR666E8GW4uRy5EDiVvg8iER7s= 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= @@ -1261,9 +1261,9 @@ storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 h1:SVuEocEhZfFc13J1Aml 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-20230703113355-ccd4db5ae659 h1:J72VWwbpllfolJoCsjVMr3YnscUUOQAruzFTsivqIqY= -storj.io/private v0.0.0-20230703113355-ccd4db5ae659/go.mod h1:mfdHEaAcTARpd4/Hc6N5uxwB1ZG3jtPdVlle57xzQxQ= +storj.io/private v0.0.0-20230824104110-1eac532af65a h1:x0OnU7z801JmR0XwFrFxmEBqcq+FDDuSn5jMbFoyfBo= +storj.io/private v0.0.0-20230824104110-1eac532af65a/go.mod h1:6+MGr4KUXEBIOsOstFz1efPkA+8wVVfzsO8RpuAhhB4= 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.11.0 h1:zGmCcMx1JMRI4NlQi/pN8+z2Jzy7pVVCUDhMVTfboHw= -storj.io/uplink v1.11.0/go.mod h1:cDlpDWGJykXfYE7NtO1EeArGFy12K5Xj8pV8ufpUCKE= +storj.io/uplink v1.11.1-0.20230905131215-412de374f05c h1:UBrHiML8mRU+8qBPTMuw2WHVwwmUjfenJ17QpO1Erp8= +storj.io/uplink v1.11.1-0.20230905131215-412de374f05c/go.mod h1:JOUmWW3FrzCkDK4wgrTonKrKTWafK7jRQA8zBb8mkxs= diff --git a/testsuite/ui/go.mod b/testsuite/ui/go.mod index 7edaeba44..e48dcab21 100644 --- a/testsuite/ui/go.mod +++ b/testsuite/ui/go.mod @@ -10,9 +10,9 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 go.uber.org/zap v1.23.0 - storj.io/common v0.0.0-20230824112457-9233ce5adb92 + storj.io/common v0.0.0-20230906110953-ed8a53d568d8 storj.io/gateway-mt v1.51.1-0.20230417204402-7d9bb25bc297 - storj.io/private v0.0.0-20230703113355-ccd4db5ae659 + storj.io/private v0.0.0-20230824104110-1eac532af65a storj.io/storj v0.12.1-0.20221125175451-ef4b564b82f7 ) @@ -232,5 +232,5 @@ require ( storj.io/minio v0.0.0-20230118205046-c025fcc9eef3 // indirect storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 // indirect storj.io/picobuf v0.0.1 // indirect - storj.io/uplink v1.11.0 // indirect + storj.io/uplink v1.11.1-0.20230905131215-412de374f05c // indirect ) diff --git a/testsuite/ui/go.sum b/testsuite/ui/go.sum index d92aec5c7..cdb87cb18 100644 --- a/testsuite/ui/go.sum +++ b/testsuite/ui/go.sum @@ -1967,8 +1967,8 @@ sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1 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-20230824112457-9233ce5adb92 h1:05A/0l5rLnLRM1ntubre4oMZ6SvRs544cDskYuy40GE= -storj.io/common v0.0.0-20230824112457-9233ce5adb92/go.mod h1:9evX8PZey+J3bcflXmR666E8GW4uRy5EDiVvg8iER7s= +storj.io/common v0.0.0-20230906110953-ed8a53d568d8 h1:DdgIPSCTZ2/b4hBfkTgsVKw0xI6yc1qzeBSdZZeRA1M= +storj.io/common v0.0.0-20230906110953-ed8a53d568d8/go.mod h1:9evX8PZey+J3bcflXmR666E8GW4uRy5EDiVvg8iER7s= storj.io/dotworld v0.0.0-20210324183515-0d11aeccd840 h1:oqMwoF6vaOrCe92SKRyr8cc2WSjLYAd8fjpAHA7rNqY= storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg= storj.io/drpc v0.0.33 h1:yCGZ26r66ZdMP0IcTYsj7WDAUIIjzXk6DJhbhvt9FHI= @@ -1983,8 +1983,8 @@ storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 h1:SVuEocEhZfFc13J1Aml 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-20230703113355-ccd4db5ae659 h1:J72VWwbpllfolJoCsjVMr3YnscUUOQAruzFTsivqIqY= -storj.io/private v0.0.0-20230703113355-ccd4db5ae659/go.mod h1:mfdHEaAcTARpd4/Hc6N5uxwB1ZG3jtPdVlle57xzQxQ= -storj.io/uplink v1.11.0 h1:zGmCcMx1JMRI4NlQi/pN8+z2Jzy7pVVCUDhMVTfboHw= -storj.io/uplink v1.11.0/go.mod h1:cDlpDWGJykXfYE7NtO1EeArGFy12K5Xj8pV8ufpUCKE= +storj.io/private v0.0.0-20230824104110-1eac532af65a h1:x0OnU7z801JmR0XwFrFxmEBqcq+FDDuSn5jMbFoyfBo= +storj.io/private v0.0.0-20230824104110-1eac532af65a/go.mod h1:6+MGr4KUXEBIOsOstFz1efPkA+8wVVfzsO8RpuAhhB4= +storj.io/uplink v1.11.1-0.20230905131215-412de374f05c h1:UBrHiML8mRU+8qBPTMuw2WHVwwmUjfenJ17QpO1Erp8= +storj.io/uplink v1.11.1-0.20230905131215-412de374f05c/go.mod h1:JOUmWW3FrzCkDK4wgrTonKrKTWafK7jRQA8zBb8mkxs= storj.io/zipper v0.0.0-20220124122551-2ac2d53a46f6 h1:vJQmb+uAiYn8hVfkhMl6OqjnUyMWSCPnkzW8IsjF8vE=