Skip to content

Commit f673f17

Browse files
harshavardhanaharshavardhana
authored
update deps for minio/minio and minio/mc (#458)
1 parent 829833f commit f673f17

File tree

9 files changed

+74
-30
lines changed

9 files changed

+74
-30
lines changed

‎.github/workflows/go.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,5 @@ jobs:
3333
run: |
3434
make verifiers
3535
make test
36+
make crosscompile
3637
make console

‎Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ fmt:
3030
@GO111MODULE=on gofmt -d cmd/
3131
@GO111MODULE=on gofmt -d cluster/
3232

33+
crosscompile:
34+
@(env bash $(PWD)/cross-compile.sh)
35+
3336
lint:
3437
@echo "Running $@ check"
3538
@GO111MODULE=on ${GOPATH}/bin/golangci-lint cache clean

‎cross-compile.sh‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/bin/bash
2+
3+
set -e
4+
# Enable tracing if set.
5+
[ -n "$BASH_XTRACEFD" ] && set -x
6+
7+
_init() {
8+
## All binaries are static make sure to disable CGO.
9+
export CGO_ENABLED=0
10+
11+
## List of architectures and OS to test coss compilation.
12+
SUPPORTED_OSARCH="linux/ppc64le linux/mips64 linux/arm64 linux/s390x darwin/amd64 freebsd/amd64 windows/amd64 linux/arm linux/386 netbsd/amd64"
13+
}
14+
15+
_build() {
16+
local osarch=$1
17+
IFS=/ read -r -a arr <<<"$osarch"
18+
os="${arr[0]}"
19+
arch="${arr[1]}"
20+
package=$(go list -f '{{.ImportPath}}' ./cmd/console)
21+
printf -- "--> %15s:%s\n" "${osarch}" "${package}"
22+
23+
# go build -trimpath to build the binary.
24+
GOOS=$os GOARCH=$arch GO111MODULE=on go build -trimpath --tags=kqueue --ldflags "-s -w" -o /dev/null ./cmd/console
25+
}
26+
27+
main() {
28+
echo "Testing builds for OS/Arch: ${SUPPORTED_OSARCH}"
29+
for each_osarch in ${SUPPORTED_OSARCH}; do
30+
_build "${each_osarch}"
31+
done
32+
}
33+
34+
_init && main "$@"

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ require (
1616
github.com/jessevdk/go-flags v1.4.0
1717
github.com/minio/cli v1.22.0
1818
github.com/minio/kes v0.11.0
19-
github.com/minio/mc v0.0.0-20201119214335-d4f9ea859d6c
20-
github.com/minio/minio v0.0.0-20201102034248-d8e07f2c41c8
21-
github.com/minio/minio-go/v7 v7.0.6-0.20201119032702-6914cb678dde
19+
github.com/minio/mc v0.0.0-20201202024448-00873e4b9326
20+
github.com/minio/minio v0.0.0-20201202000049-3ca046b40876
21+
github.com/minio/minio-go/v7 v7.0.6
2222
github.com/minio/operator v0.0.0-20201022162018-527e5c32132b
2323
github.com/mitchellh/go-homedir v1.1.0
2424
github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect

‎go.sum‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ github.com/aws/aws-sdk-go v1.31.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU
156156
github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
157157
github.com/bcicen/jstream v0.0.0-20190220045926-16c1f8af81c2 h1:M+TYzBcNIRyzPRg66ndEqUMd7oWDmhvdQmaPC6EZNwM=
158158
github.com/bcicen/jstream v0.0.0-20190220045926-16c1f8af81c2/go.mod h1:RDu/qcrnpEdJC/p8tx34+YBFqqX71lB7dOX9QE+ZC4M=
159+
github.com/bcicen/jstream v1.0.1/go.mod h1:9ielPxqFry7Y4Tg3j4BfjPocfJ3TbsRtXOAYXYmRuAQ=
159160
github.com/beevik/ntp v0.2.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NRpg=
160161
github.com/beevik/ntp v0.3.0 h1:xzVrPrE4ziasFXgBVBZJDP0Wg/KpMwk2KHJ4Ba8GrDw=
161162
github.com/beevik/ntp v0.3.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NRpg=
@@ -670,6 +671,8 @@ github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0
670671
github.com/klauspost/compress v1.10.1/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
671672
github.com/klauspost/compress v1.10.3 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eTO0Q8=
672673
github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
674+
github.com/klauspost/compress v1.11.3 h1:dB4Bn0tN3wdCzQxnS8r06kV74qN/TAfaIS0bVE8h3jc=
675+
github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
673676
github.com/klauspost/cpuid v0.0.0-20180405133222-e7e905edc00e/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
674677
github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
675678
github.com/klauspost/cpuid v1.2.2/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
@@ -679,6 +682,7 @@ github.com/klauspost/cpuid v1.3.1 h1:5JNjFYYQrZeKRJ0734q51WCEEn2huer72Dc7K+R/b6s
679682
github.com/klauspost/cpuid v1.3.1/go.mod h1:bYW4mA6ZgKPob1/Dlai2LviZJO7KGI3uoWLd42rAQw4=
680683
github.com/klauspost/pgzip v1.2.1 h1:oIPZROsWuPHpOdMVWLuJZXwgjhrW8r1yEX8UqMyeNHM=
681684
github.com/klauspost/pgzip v1.2.1/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
685+
github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
682686
github.com/klauspost/readahead v1.3.1 h1:QqXNYvm+VvqYcbrRT4LojUciM0XrznFRIDrbHiJtu/0=
683687
github.com/klauspost/readahead v1.3.1/go.mod h1:AH9juHzNH7xqdqFHrMRSHeH2Ps+vFf+kblDqzPFiLJg=
684688
github.com/klauspost/reedsolomon v1.9.9 h1:qCL7LZlv17xMixl55nq2/Oa1Y86nfO8EqDfv2GHND54=
@@ -757,18 +761,18 @@ github.com/minio/highwayhash v1.0.0 h1:iMSDhgUILCr0TNm8LWlSjF8N0ZIj2qbO8WHp6Q/J2
757761
github.com/minio/highwayhash v1.0.0/go.mod h1:xQboMTeM9nY9v/LlAOxFctujiv5+Aq2hR5dxBpaMbdc=
758762
github.com/minio/kes v0.11.0 h1:8ma6OCVSxKT50b1uYXLJro3m7PmZtCLxBaTddQexI5k=
759763
github.com/minio/kes v0.11.0/go.mod h1:mTF1Bv8YVEtQqF/B7Felp4tLee44Pp+dgI0rhCvgNg8=
760-
github.com/minio/mc v0.0.0-20201119214335-d4f9ea859d6c h1:/wGiTfC8pFOC2JzwE+XrPeH31LqFR/Dam4Lx1zX3Wag=
761-
github.com/minio/mc v0.0.0-20201119214335-d4f9ea859d6c/go.mod h1:B738ZPTRQiyp3uJ3p2W2mqk8Yp1puYASKY7GIhYyHP8=
764+
github.com/minio/mc v0.0.0-20201202024448-00873e4b9326 h1:3D4hhryynwssPvd5Q4wA03zqwRFs9oNXgKzcFNLMRfw=
765+
github.com/minio/mc v0.0.0-20201202024448-00873e4b9326/go.mod h1:bPrJ0bWZznjXPC+4I7Z4/I0nc1LJTk7nGY5KDTkqCiI=
762766
github.com/minio/md5-simd v1.1.0 h1:QPfiOqlZH+Cj9teu0t9b1nTBfPbyTl16Of5MeuShdK4=
763767
github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw=
764768
github.com/minio/minio v0.0.0-20200723003940-b9be841fd222/go.mod h1:Eu2KC2p+vW03rnYY/6R/D+QduPB7/j4kBaVA/EDLjWM=
765-
github.com/minio/minio v0.0.0-20201102034248-d8e07f2c41c8 h1:yCDFjUBUoE1uNr8dEqjHuwySdAtOyvVONchEVrPPOGQ=
766-
github.com/minio/minio v0.0.0-20201102034248-d8e07f2c41c8/go.mod h1:640kMkCwiyOX8dheptHYModdUw4HrnUFHKw3McqUXD8=
769+
github.com/minio/minio v0.0.0-20201202000049-3ca046b40876 h1:qaOfIlmmnNT2SFDI01uHVxGIPAlIi3pF0RbwlJZMG5Q=
770+
github.com/minio/minio v0.0.0-20201202000049-3ca046b40876/go.mod h1:RvC4rtbp4pykaWxcJXQGu2QirCeXiyquSyPkadJiiFQ=
767771
github.com/minio/minio-go/v7 v7.0.1/go.mod h1:dJ80Mv2HeGkYLH1sqS/ksz07ON6csH3S6JUMSQ2zAns=
768772
github.com/minio/minio-go/v7 v7.0.2/go.mod h1:dJ80Mv2HeGkYLH1sqS/ksz07ON6csH3S6JUMSQ2zAns=
769-
github.com/minio/minio-go/v7 v7.0.6-0.20200929220449-755b5633803a/go.mod h1:CSt2ETZNs+bIIhWTse0mcZKZWMGrFU7Er7RR0TmkDYk=
770-
github.com/minio/minio-go/v7 v7.0.6-0.20201119032702-6914cb678dde h1:Ag2kFFpCxct9ayux92WQUlT938y7+IbibERYOraT8dM=
771-
github.com/minio/minio-go/v7 v7.0.6-0.20201119032702-6914cb678dde/go.mod h1:HcIuq+11d/3MfavIPZiswSzfQ1VJ2Lwxp/XLtW46IWQ=
773+
github.com/minio/minio-go/v7 v7.0.6-0.20201118225257-f6869a5e2a6a/go.mod h1:HcIuq+11d/3MfavIPZiswSzfQ1VJ2Lwxp/XLtW46IWQ=
774+
github.com/minio/minio-go/v7 v7.0.6 h1:9czXaG0LEZ9s74smSqy0rm034MxngQoP6HTTuSc5GEs=
775+
github.com/minio/minio-go/v7 v7.0.6/go.mod h1:HcIuq+11d/3MfavIPZiswSzfQ1VJ2Lwxp/XLtW46IWQ=
772776
github.com/minio/operator v0.0.0-20201022162018-527e5c32132b h1:ggfD6V3nodTzhHJHCYIT1F897gscrz+hHsan0a2Wtqw=
773777
github.com/minio/operator v0.0.0-20201022162018-527e5c32132b/go.mod h1:At+++4/6W5BEXK11tN5DKIvkJKhYBZybbb5zmxb0LQI=
774778
github.com/minio/selfupdate v0.3.1 h1:BWEFSNnrZVMUWXbXIgLDNDjbejkmpAmZvy/nCz1HlEs=
@@ -873,8 +877,7 @@ github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bA
873877
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
874878
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw=
875879
github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
876-
github.com/philhofer/fwd v1.1.0 h1:PAdZw9+/BCf4gc/kA2L/PbGPkFe72Kl2GLZXTG8HpU8=
877-
github.com/philhofer/fwd v1.1.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
880+
github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
878881
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
879882
github.com/pierrec/lz4 v2.2.6+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
880883
github.com/pierrec/lz4 v2.4.0+incompatible h1:06usnXXDNcPvCHDkmPpkidf4jTc52UKld7UPfqKatY4=
@@ -957,6 +960,10 @@ github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAm
957960
github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc=
958961
github.com/shirou/gopsutil v2.20.3-0.20200314133625-53cec6b37e6a+incompatible h1:YiKUe2ZOmfpDBH4OSyxwkx/mjNqHHnNhOtZ2mPyRme8=
959962
github.com/shirou/gopsutil v2.20.3-0.20200314133625-53cec6b37e6a+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
963+
github.com/shirou/gopsutil v2.20.9+incompatible h1:msXs2frUV+O/JLva9EDLpuJ84PrFsdCTCQex8PUdtkQ=
964+
github.com/shirou/gopsutil v2.20.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
965+
github.com/shirou/gopsutil v2.20.10-0.20201015215925-32d4603d01b7+incompatible h1:4Nw/OaZkO6z7Tj2V48FQkGcVESBvJmKvj+SLKugM6x8=
966+
github.com/shirou/gopsutil v2.20.10-0.20201015215925-32d4603d01b7+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
960967
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
961968
github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
962969
github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
@@ -1043,7 +1050,6 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 h1:LnC5Kc
10431050
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
10441051
github.com/tommy-muehle/go-mnd v1.1.1/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig=
10451052
github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig=
1046-
github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q=
10471053
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
10481054
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
10491055
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=

‎restapi/client-admin.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ type MinioAdmin interface {
9393
stopProfiling(ctx context.Context) (io.ReadCloser, error)
9494
serviceTrace(ctx context.Context, allTrace, errTrace bool) <-chan madmin.ServiceTraceInfo
9595
getLogs(ctx context.Context, node string, lineCnt int, logKind string) <-chan madmin.LogInfo
96-
accountUsageInfo(ctx context.Context) (madmin.AccountUsageInfo, error)
96+
accountInfo(ctx context.Context) (madmin.AccountInfo, error)
9797
heal(ctx context.Context, bucket, prefix string, healOpts madmin.HealOpts, clientToken string,
9898
forceStart, forceStop bool) (healStart madmin.HealStartSuccess, healTaskStatus madmin.HealTaskStatus, err error)
9999
// Service Accounts
@@ -246,8 +246,8 @@ func (ac adminClient) deleteServiceAccount(ctx context.Context, serviceAccount s
246246
}
247247

248248
// implements madmin.AccountingUsageInfo()
249-
func (ac adminClient) accountUsageInfo(ctx context.Context) (madmin.AccountUsageInfo, error) {
250-
return ac.client.AccountUsageInfo(ctx)
249+
func (ac adminClient) accountInfo(ctx context.Context) (madmin.AccountInfo, error) {
250+
return ac.client.AccountInfo(ctx)
251251
}
252252

253253
func (ac adminClient) heal(ctx context.Context, bucket, prefix string, healOpts madmin.HealOpts, clientToken string,

‎restapi/operator_buckets.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func getOperatorListBucketsResponse(session *models.Principal, namespace, tenant
8080
// create a minioClient interface implementation
8181
// defining the client to be used
8282
adminClient := adminClient{client: mAdmin}
83-
buckets, err := getAccountUsageInfo(ctx, adminClient)
83+
buckets, err := getAccountInfo(ctx, adminClient)
8484
if err != nil {
8585
return nil, prepareError(err)
8686
}

‎restapi/user_buckets.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,9 @@ func getBucketVersionedResponse(session *models.Principal, bucketName string) (*
245245
return listBucketsResponse, nil
246246
}
247247

248-
// getAccountUsageInfo fetches a list of all buckets allowed to that particular client from MinIO Servers
249-
func getAccountUsageInfo(ctx context.Context, client MinioAdmin) ([]*models.Bucket, error) {
250-
info, err := client.accountUsageInfo(ctx)
248+
// getAccountInfo fetches a list of all buckets allowed to that particular client from MinIO Servers
249+
func getAccountInfo(ctx context.Context, client MinioAdmin) ([]*models.Bucket, error) {
250+
info, err := client.accountInfo(ctx)
251251
if err != nil {
252252
return []*models.Bucket{}, err
253253
}
@@ -271,7 +271,7 @@ func getListBucketsResponse(session *models.Principal) (*models.ListBucketsRespo
271271
// create a minioClient interface implementation
272272
// defining the client to be used
273273
adminClient := adminClient{client: mAdmin}
274-
buckets, err := getAccountUsageInfo(ctx, adminClient)
274+
buckets, err := getAccountInfo(ctx, adminClient)
275275
if err != nil {
276276
return nil, prepareError(err)
277277
}

‎restapi/user_buckets_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,33 +84,33 @@ func (mc minioClientMock) getBucketEncryption(ctx context.Context, bucketName st
8484
return minioGetBucketEncryptionMock(ctx, bucketName)
8585
}
8686

87-
var minioAccountUsageInfoMock func(ctx context.Context) (madmin.AccountUsageInfo, error)
87+
var minioAccountInfoMock func(ctx context.Context) (madmin.AccountInfo, error)
8888

8989
// mock function of dataUsageInfo() needed for list bucket's usage
90-
func (ac adminClientMock) accountUsageInfo(ctx context.Context) (madmin.AccountUsageInfo, error) {
91-
return minioAccountUsageInfoMock(ctx)
90+
func (ac adminClientMock) accountInfo(ctx context.Context) (madmin.AccountInfo, error) {
91+
return minioAccountInfoMock(ctx)
9292
}
9393

9494
func TestListBucket(t *testing.T) {
9595
assert := assert.New(t)
9696
adminClient := adminClientMock{}
9797
ctx := context.Background()
9898
// Test-1 : getaAcountUsageInfo() Get response from minio client with two buckets
99-
mockBucketList := madmin.AccountUsageInfo{
99+
mockBucketList := madmin.AccountInfo{
100100
AccountName: "test",
101101
Buckets: []madmin.BucketUsageInfo{
102102
{Name: "bucket-1", Created: time.Now(), Size: 1024},
103103
{Name: "bucket-2", Created: time.Now().Add(time.Hour * 1), Size: 0},
104104
},
105105
}
106106
// mock function response from listBucketsWithContext(ctx)
107-
minioAccountUsageInfoMock = func(ctx context.Context) (madmin.AccountUsageInfo, error) {
107+
minioAccountInfoMock = func(ctx context.Context) (madmin.AccountInfo, error) {
108108
return mockBucketList, nil
109109
}
110110
// get list buckets response this response should have Name, CreationDate, Size and Access
111111
// as part of of each bucket
112112
function := "getaAcountUsageInfo()"
113-
bucketList, err := getAccountUsageInfo(ctx, adminClient)
113+
bucketList, err := getAccountInfo(ctx, adminClient)
114114
if err != nil {
115115
t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
116116
}
@@ -124,10 +124,10 @@ func TestListBucket(t *testing.T) {
124124
}
125125

126126
// Test-2 : getaAcountUsageInfo() Return and see that the error is handled correctly and returned
127-
minioAccountUsageInfoMock = func(ctx context.Context) (madmin.AccountUsageInfo, error) {
128-
return madmin.AccountUsageInfo{}, errors.New("error")
127+
minioAccountInfoMock = func(ctx context.Context) (madmin.AccountInfo, error) {
128+
return madmin.AccountInfo{}, errors.New("error")
129129
}
130-
_, err = getAccountUsageInfo(ctx, adminClient)
130+
_, err = getAccountInfo(ctx, adminClient)
131131
if assert.Error(err) {
132132
assert.Equal("error", err.Error())
133133
}

0 commit comments

Comments
 (0)