Skip to content

Commit

Permalink
Upgrade Go Dependencies (#1903)
Browse files Browse the repository at this point in the history
* Upgrade Go Dependencies

Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>

---------

Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
Co-authored-by: pjuarezd <pjuarezd@users.noreply.github.com>
  • Loading branch information
dvaldivia and pjuarezd committed Dec 6, 2023
1 parent 3067975 commit 2301b55
Show file tree
Hide file tree
Showing 23 changed files with 479 additions and 1,386 deletions.
2 changes: 1 addition & 1 deletion api/admin_client_mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"io"
"time"

"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
iampolicy "github.com/minio/pkg/iam/policy"
)

Expand Down
21 changes: 3 additions & 18 deletions api/admin_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,9 @@ func GetAdminInfo(ctx context.Context, client MinioAdmin) (*UsageInfo, error) {
// we are trimming uint64 to int64 this will report an incorrect measurement for numbers greater than
// 9,223,372,036,854,775,807

var backendType string
var rrSCParity float64
var standardSCParity float64

if v, success := serverInfo.Backend.(map[string]interface{}); success {
bt, ok := v["backendType"]
if ok {
backendType = bt.(string)
}
rp, ok := v["rrSCParity"]
if ok {
rrSCParity = rp.(float64)
}
sp, ok := v["standardSCParity"]
if ok {
standardSCParity = sp.(float64)
}
}
backendType := string(serverInfo.Backend.Type)
rrSCParity := serverInfo.Backend.RRSCParity
standardSCParity := serverInfo.Backend.StandardSCParity

var usedSpace int64
// serverArray contains the serverProperties which describe the servers in the network
Expand Down
8 changes: 4 additions & 4 deletions api/client-admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"net/url"
"time"

"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
mcCmd "github.com/minio/mc/cmd"
"github.com/minio/mc/pkg/probe"
"github.com/minio/operator/pkg"
Expand Down Expand Up @@ -397,7 +397,7 @@ func (ac AdminClient) addRemoteBucket(ctx context.Context, bucket string, target

// serverHealthInfo implements mc.ServerHealthInfo - Connect to a minio server and call Health Info Management API
func (ac AdminClient) serverHealthInfo(ctx context.Context, healthDataTypes []madmin.HealthDataType, deadline time.Duration) (interface{}, string, error) {
resp, version, err := ac.Client.ServerHealthInfo(ctx, healthDataTypes, deadline)
resp, version, err := ac.Client.ServerHealthInfo(ctx, healthDataTypes, deadline, "")
if err != nil {
return nil, version, err
}
Expand Down Expand Up @@ -506,7 +506,7 @@ func (ac AdminClient) getSiteReplicationInfo(ctx context.Context) (*madmin.SiteR
}

func (ac AdminClient) addSiteReplicationInfo(ctx context.Context, sites []madmin.PeerSite) (*madmin.ReplicateAddStatus, error) {
res, err := ac.Client.SiteReplicationAdd(ctx, sites)
res, err := ac.Client.SiteReplicationAdd(ctx, sites, madmin.SRAddOptions{})
if err != nil {
return nil, err
}
Expand All @@ -520,7 +520,7 @@ func (ac AdminClient) addSiteReplicationInfo(ctx context.Context, sites []madmin
}

func (ac AdminClient) editSiteReplicationInfo(ctx context.Context, site madmin.PeerInfo) (*madmin.ReplicateEditStatus, error) {
res, err := ac.Client.SiteReplicationEdit(ctx, site)
res, err := ac.Client.SiteReplicationEdit(ctx, site, madmin.SREditOptions{})
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion api/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"strings"

"github.com/go-openapi/swag"
"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/minio-go/v7"
"github.com/minio/operator/models"
)
Expand Down
2 changes: 1 addition & 1 deletion api/operator_subnet_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"os"
"testing"

"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/operator/api/operations"
"github.com/minio/operator/api/operations/operator_api"
"github.com/minio/operator/models"
Expand Down
2 changes: 1 addition & 1 deletion api/subnet-utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"strings"
"time"

"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
mc "github.com/minio/mc/cmd"
"github.com/tidwall/gjson"
"golang.org/x/crypto/ssh/terminal"
Expand Down
2 changes: 1 addition & 1 deletion api/tenant-handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (

utils2 "github.com/minio/operator/pkg/http"

"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"

"github.com/minio/operator/api/operations/operator_api"

Expand Down
2 changes: 1 addition & 1 deletion api/tenants_2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"testing"
"time"

"github.com/minio/madmin-go/v2"
"github.com/minio/madmin-go/v3"
"github.com/minio/operator/api/operations"
"github.com/minio/operator/api/operations/operator_api"
"github.com/minio/operator/models"
Expand Down
2 changes: 1 addition & 1 deletion api/tls.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

// PrepareSTSClientTransport :
func PrepareSTSClientTransport(insecure bool) *http.Transport {
// This takes github.com/minio/madmin-go/v2/transport.go as an example
// This takes github.com/minio/madmin-go/v3/transport.go as an example
//
// DefaultTransport - this default transport is similar to
// http.DefaultTransport but with additional param DisableCompression
Expand Down

0 comments on commit 2301b55

Please sign in to comment.