Skip to content

Commit

Permalink
Merge branch 'master' into exclude-folders-flag
Browse files Browse the repository at this point in the history
  • Loading branch information
zveinn authored Nov 2, 2023
2 parents 8b8fd59 + 9f2fb2b commit cea87f3
Show file tree
Hide file tree
Showing 9 changed files with 306 additions and 39 deletions.
321 changes: 292 additions & 29 deletions CREDITS

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cmd/admin-replicate-add.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func mainAdminReplicateAdd(ctx *cli.Context) error {
})
}

res, e := client.SiteReplicationAdd(globalContext, ps)
res, e := client.SiteReplicationAdd(globalContext, ps, madmin.SRAddOptions{})
fatalIf(probe.NewError(e).Trace(args...), "Unable to add sites for replication")

printMsg(successMessage(res))
Expand Down
2 changes: 1 addition & 1 deletion cmd/admin-replicate-update.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func mainAdminReplicateUpdate(ctx *cli.Context) error {
Endpoint: ep,
SyncState: madmin.SyncStatus(syncState),
DefaultBandwidth: bwDefaults,
})
}, madmin.SREditOptions{})
fatalIf(probe.NewError(e).Trace(args...), "Unable to edit cluster replication site endpoint")

printMsg(updateSuccessMessage(res))
Expand Down
2 changes: 1 addition & 1 deletion cmd/client-fs.go
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ func (f *fsClient) listInRoutine(contentCh chan<- *ClientContent) {
switch fst.Mode().IsDir() {
case true:
files, e := readDir(fpath)
if err != nil {
if e != nil {
contentCh <- &ClientContent{Err: probe.NewError(e)}
return
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/cp-url.go
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ func prepareCopyURLsTypeD(ctx context.Context, cc copyURLsContent, o prepareCopy
}
}(ctx, cc, o)

go func(ctx context.Context, cc copyURLsContent, o prepareCopyURLsOpts) {
go func() {
defer close(copyURLsCh)
filter := make(map[string]struct{})
for cpURLs := range copyURLsFilterCh {
Expand All @@ -301,7 +301,7 @@ func prepareCopyURLsTypeD(ctx context.Context, cc copyURLsContent, o prepareCopy
copyURLsCh <- cpURLs
}
}
}(ctx, cc, o)
}()

return copyURLsCh
}
Expand Down
3 changes: 2 additions & 1 deletion cmd/support-diag.go
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,8 @@ func fetchServerDiagInfo(ctx *cli.Context, client *madmin.AdminClient) (interfac
}

// Fetch info of all servers (cluster or single server)
resp, version, e := client.ServerHealthInfo(cont, *opts, ctx.Duration("deadline"))
// TODO: allow configurable "anonymize" inputs
resp, version, e := client.ServerHealthInfo(cont, *opts, ctx.Duration("deadline"), "standard")
if e != nil {
cancel()
return nil, "", e
Expand Down
2 changes: 1 addition & 1 deletion cmd/tofu.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func promptTrustSelfSignedCert(ctx context.Context, endpoint, alias string) (*x5
return nil, nil
}

if te != nil && !strings.Contains(te.Error(), "certificate signed by unknown authority") &&
if !strings.Contains(te.Error(), "certificate signed by unknown authority") &&
!strings.Contains(te.Error(), "certificate is not trusted") /* darwin specific error message */ {
return nil, probe.NewError(te)
}
Expand Down
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ require (
github.com/gdamore/tcell/v2 v2.6.0
github.com/golang-jwt/jwt/v4 v4.5.0
github.com/juju/ratelimit v1.0.2
github.com/minio/madmin-go/v3 v3.0.21
github.com/minio/madmin-go/v3 v3.0.29
github.com/minio/pkg/v2 v2.0.2
github.com/muesli/reflow v0.3.0
github.com/navidys/tvxwidgets v0.3.0
Expand All @@ -65,6 +65,7 @@ require (
github.com/kr/pretty v0.3.1 // indirect
github.com/minio/mux v1.9.0 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/safchain/ethtool v0.3.0 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb // indirect
Expand Down
6 changes: 4 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ github.com/minio/colorjson v1.0.6 h1:m7TUvpvt0u7FBmVIEQNIa0T4NBQlxrcMBp4wJKsg2Ik
github.com/minio/colorjson v1.0.6/go.mod h1:LUXwS5ZGNb6Eh9f+t+3uJiowD3XsIWtsvTriUBeqgYs=
github.com/minio/filepath v1.0.0 h1:fvkJu1+6X+ECRA6G3+JJETj4QeAYO9sV43I79H8ubDY=
github.com/minio/filepath v1.0.0/go.mod h1:/nRZA2ldl5z6jT9/KQuvZcQlxZIMQoFFQPvEXx9T/Bw=
github.com/minio/madmin-go/v3 v3.0.21 h1:54LroTtjkn60nvDMBHmCEMGcFQ3k3Yel74RaEu9n2cY=
github.com/minio/madmin-go/v3 v3.0.21/go.mod h1:B2EgtEGrfWx+AkXv+OAcS6IHwoIJcd1p75QfDPSPd6Q=
github.com/minio/madmin-go/v3 v3.0.29 h1:3bNLArtxIFud5wyb5/DnF5DGLBvcSJyzCA44EclX1Ow=
github.com/minio/madmin-go/v3 v3.0.29/go.mod h1:4QN2NftLSV7MdlT50dkrenOMmNVHluxTvlqJou3hte8=
github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
github.com/minio/minio-go/v7 v7.0.63 h1:GbZ2oCvaUdgT5640WJOpyDhhDxvknAJU2/T3yurwcbQ=
Expand Down Expand Up @@ -212,6 +212,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
github.com/safchain/ethtool v0.3.0 h1:gimQJpsI6sc1yIqP/y8GYgiXn/NjgvpM0RNoWLVVmP0=
github.com/safchain/ethtool v0.3.0/go.mod h1:SA9BwrgyAqNo7M+uaL6IYbxpm5wk3L7Mm6ocLW+CJUs=
github.com/secure-io/sio-go v0.3.1 h1:dNvY9awjabXTYGsTF1PiCySl9Ltofk9GA3VdWlo7rRc=
github.com/secure-io/sio-go v0.3.1/go.mod h1:+xbkjDzPjwh4Axd07pRKSNriS9SCiYksWnZqdnfpQxs=
github.com/shirou/gopsutil/v3 v3.23.8 h1:xnATPiybo6GgdRoC4YoGnxXZFRc3dqQTGi73oLvvBrE=
Expand Down

0 comments on commit cea87f3

Please sign in to comment.