Skip to content

Commit

Permalink
uplink: bump storj.io/common
Browse files Browse the repository at this point in the history
Change-Id: I7bf7a07244ad4e9f615d2a47360b4933eed28d72
  • Loading branch information
jtolio committed Feb 17, 2022
1 parent 9e00d72 commit cd3c642
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 7 deletions.
5 changes: 5 additions & 0 deletions config.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ func (config Config) getDialer(ctx context.Context) (_ rpc.Dialer, err error) {
dialContext = socket.BackgroundDialer().DialContext
}

// N.B.: It is okay to use NewDefaultTCPConnector here because we explicitly don't want
// NewHybridConnector. NewHybridConnector would not be able to use the user-provided
// DialContext.
//lint:ignore SA1019 deprecated okay,
//nolint:staticcheck // deprecated okay.
dialer.Connector = rpc.NewDefaultTCPConnector(&rpc.ConnectorAdapter{DialContext: dialContext})
}

Expand Down
4 changes: 3 additions & 1 deletion edge/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ type Config struct {
}

func (config *Config) createDialer() rpc.Dialer {
//lint:ignore SA1019 deprecated okay,
//nolint:staticcheck // deprecated okay.
connector := rpc.NewDefaultTCPConnector(nil)
connector.SendDRPCMuxHeader = false
connector.SetSendDRPCMuxHeader(false)

dialer := rpc.NewDefaultDialer(nil)
dialer.Connector = connector
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/vivint/infectious v0.0.0-20200605153912-25a574ae18a3
github.com/zeebo/errs v1.2.2
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
storj.io/common v0.0.0-20220203111346-5c3b59fd0b9b
storj.io/common v0.0.0-20220215191549-ee3a77cfa9eb
)

require (
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
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-20220203111346-5c3b59fd0b9b h1:9+egWAMDv0vEoKmERP+NYEM3Mtmn/dV34Orj58czbls=
storj.io/common v0.0.0-20220203111346-5c3b59fd0b9b/go.mod h1:xW3PPPGBo4bdMtEP9GREnmxQptmJNuDg1tEHcA4zqog=
storj.io/common v0.0.0-20220215191549-ee3a77cfa9eb h1:FljLFBKn1qBrdwKaR0k5U4GhXfA/BUWVd9VuhvEFRpM=
storj.io/common v0.0.0-20220215191549-ee3a77cfa9eb/go.mod h1:xW3PPPGBo4bdMtEP9GREnmxQptmJNuDg1tEHcA4zqog=
storj.io/drpc v0.0.29 h1:Ihd4ls/JQFr0lctefie3iu+3QM4duccCKr9uMzf4sKY=
storj.io/drpc v0.0.29/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg=
2 changes: 1 addition & 1 deletion testsuite/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/vivint/infectious v0.0.0-20200605153912-25a574ae18a3
github.com/zeebo/errs v1.2.2
go.uber.org/zap v1.16.0
storj.io/common v0.0.0-20220203111346-5c3b59fd0b9b
storj.io/common v0.0.0-20220215191549-ee3a77cfa9eb
storj.io/drpc v0.0.29
storj.io/storj v0.12.1-0.20220201095529-2ae78db66060
storj.io/uplink v1.7.2-0.20220131124001-c1db742c840d
Expand Down
4 changes: 2 additions & 2 deletions testsuite/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -804,8 +804,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-20220131120956-e74f624a3d55/go.mod h1:m0489td5+rKDdoiYOzCkh3CfGW/cLyntZiYfso+QfMs=
storj.io/common v0.0.0-20220203111346-5c3b59fd0b9b h1:9+egWAMDv0vEoKmERP+NYEM3Mtmn/dV34Orj58czbls=
storj.io/common v0.0.0-20220203111346-5c3b59fd0b9b/go.mod h1:xW3PPPGBo4bdMtEP9GREnmxQptmJNuDg1tEHcA4zqog=
storj.io/common v0.0.0-20220215191549-ee3a77cfa9eb h1:FljLFBKn1qBrdwKaR0k5U4GhXfA/BUWVd9VuhvEFRpM=
storj.io/common v0.0.0-20220215191549-ee3a77cfa9eb/go.mod h1:xW3PPPGBo4bdMtEP9GREnmxQptmJNuDg1tEHcA4zqog=
storj.io/drpc v0.0.29 h1:Ihd4ls/JQFr0lctefie3iu+3QM4duccCKr9uMzf4sKY=
storj.io/drpc v0.0.29/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg=
storj.io/monkit-jaeger v0.0.0-20220131130547-dc4cb5a0d97a h1:qads+aZlFKm5gUxobfF9s2x8/byPaPPLe2Mz+J82R+k=
Expand Down

0 comments on commit cd3c642

Please sign in to comment.