Skip to content

Commit 8a19bf2

Browse files
harshavardhanaharshavardhana
committed
remove all v3 references
1 parent 1d2ee3b commit 8a19bf2

39 files changed

+170
-172
lines changed

‎api-log.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (adm AdminClient) GetLogs(ctx context.Context, node string, lineCnt int, lo
104104
urlValues.Set("logType", logKind)
105105
for {
106106
reqData := requestData{
107-
relPath: adminAPIPrefixV3 + "/log",
107+
relPath: adminAPIPrefixV4 + "/log",
108108
queryValues: urlValues,
109109
}
110110
// Execute GET to call log handler

‎api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ type AdminClient struct {
7777
// Global constants.
7878
const (
7979
libraryName = "madmin-go"
80-
libraryVersion = "3.0.70"
80+
libraryVersion = "4.0.0"
8181

8282
libraryAdminURLPrefix = "/minio/admin"
8383
libraryKMSURLPrefix = "/minio/kms"

‎bandwidth.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func (adm *AdminClient) GetBucketBandwidth(ctx context.Context, buckets ...strin
5454
}
5555

5656
reqData := requestData{
57-
relPath: adminAPIPrefixV3 + "/bandwidth",
57+
relPath: adminAPIPrefixV4 + "/bandwidth",
5858
queryValues: queryValues,
5959
}
6060
resp, err := adm.executeMethod(ctx, http.MethodGet, reqData)

‎batch-job.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ type BatchJobResult struct {
204204
func (adm *AdminClient) StartBatchJob(ctx context.Context, job string) (BatchJobResult, error) {
205205
resp, err := adm.executeMethod(ctx, http.MethodPost,
206206
requestData{
207-
relPath: adminAPIPrefixV3 + "/start-job",
207+
relPath: adminAPIPrefixV4 + "/start-job",
208208
content: []byte(job),
209209
},
210210
)
@@ -237,7 +237,7 @@ func (adm *AdminClient) BatchJobStatus(ctx context.Context, jobID string) (Batch
237237

238238
resp, err := adm.executeMethod(ctx, http.MethodGet,
239239
requestData{
240-
relPath: adminAPIPrefixV3 + "/status-job",
240+
relPath: adminAPIPrefixV4 + "/status-job",
241241
queryValues: values,
242242
},
243243
)
@@ -265,7 +265,7 @@ func (adm *AdminClient) DescribeBatchJob(ctx context.Context, jobID string) (str
265265

266266
resp, err := adm.executeMethod(ctx, http.MethodGet,
267267
requestData{
268-
relPath: adminAPIPrefixV3 + "/describe-job",
268+
relPath: adminAPIPrefixV4 + "/describe-job",
269269
queryValues: values,
270270
},
271271
)
@@ -327,7 +327,7 @@ func (adm *AdminClient) ListBatchJobs(ctx context.Context, fl *ListBatchJobsFilt
327327

328328
resp, err := adm.executeMethod(ctx, http.MethodGet,
329329
requestData{
330-
relPath: adminAPIPrefixV3 + "/list-jobs",
330+
relPath: adminAPIPrefixV4 + "/list-jobs",
331331
queryValues: values,
332332
},
333333
)
@@ -356,7 +356,7 @@ func (adm *AdminClient) CancelBatchJob(ctx context.Context, jobID string) error
356356

357357
resp, err := adm.executeMethod(ctx, http.MethodDelete,
358358
requestData{
359-
relPath: adminAPIPrefixV3 + "/cancel-job",
359+
relPath: adminAPIPrefixV4 + "/cancel-job",
360360
queryValues: values,
361361
},
362362
)

‎bucket-metadata.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929

3030
// ExportBucketMetadata makes an admin call to export bucket metadata of a bucket
3131
func (adm *AdminClient) ExportBucketMetadata(ctx context.Context, bucket string) (io.ReadCloser, error) {
32-
path := adminAPIPrefixV3 + "/export-bucket-metadata"
32+
path := adminAPIPrefixV4 + "/export-bucket-metadata"
3333
queryValues := url.Values{}
3434
queryValues.Set("bucket", bucket)
3535

@@ -82,7 +82,7 @@ func (adm *AdminClient) ImportBucketMetadata(ctx context.Context, bucket string,
8282
return r, err
8383
}
8484

85-
path := adminAPIPrefixV3 + "/import-bucket-metadata"
85+
path := adminAPIPrefixV4 + "/import-bucket-metadata"
8686
queryValues := url.Values{}
8787
queryValues.Set("bucket", bucket)
8888

‎cluster-commands.go

+15-15
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func (adm *AdminClient) SiteReplicationAdd(ctx context.Context, sites []PeerSite
8888
q.Set("api-version", SiteReplAPIVersion)
8989

9090
reqData := requestData{
91-
relPath: adminAPIPrefixV3 + "/site-replication/add",
91+
relPath: adminAPIPrefixV4 + "/site-replication/add",
9292
content: encBytes,
9393
queryValues: q,
9494
}
@@ -131,7 +131,7 @@ func (adm *AdminClient) SiteReplicationInfo(ctx context.Context) (info SiteRepli
131131
q.Set("api-version", SiteReplAPIVersion)
132132

133133
reqData := requestData{
134-
relPath: adminAPIPrefixV3 + "/site-replication/info",
134+
relPath: adminAPIPrefixV4 + "/site-replication/info",
135135
queryValues: q,
136136
}
137137

@@ -209,7 +209,7 @@ func (adm *AdminClient) SRPeerJoin(ctx context.Context, r SRPeerJoinReq) error {
209209
q.Set("api-version", SiteReplAPIVersion)
210210

211211
reqData := requestData{
212-
relPath: adminAPIPrefixV3 + "/site-replication/peer/join",
212+
relPath: adminAPIPrefixV4 + "/site-replication/peer/join",
213213
content: encBuf,
214214
queryValues: q,
215215
}
@@ -261,7 +261,7 @@ func (adm *AdminClient) SRPeerBucketOps(ctx context.Context, bucket string, op B
261261

262262
reqData := requestData{
263263
queryValues: v,
264-
relPath: adminAPIPrefixV3 + "/site-replication/peer/bucket-ops",
264+
relPath: adminAPIPrefixV4 + "/site-replication/peer/bucket-ops",
265265
}
266266

267267
resp, err := adm.executeMethod(ctx, http.MethodPut, reqData)
@@ -467,7 +467,7 @@ func (adm *AdminClient) SRPeerReplicateIAMItem(ctx context.Context, item SRIAMIt
467467
q.Add("api-version", SiteReplAPIVersion)
468468

469469
reqData := requestData{
470-
relPath: adminAPIPrefixV3 + "/site-replication/peer/iam-item",
470+
relPath: adminAPIPrefixV4 + "/site-replication/peer/iam-item",
471471
content: b,
472472
queryValues: q,
473473
}
@@ -548,7 +548,7 @@ func (adm *AdminClient) SRPeerReplicateBucketMeta(ctx context.Context, item SRBu
548548
q.Set("api-version", SiteReplAPIVersion)
549549

550550
reqData := requestData{
551-
relPath: adminAPIPrefixV3 + "/site-replication/peer/bucket-meta",
551+
relPath: adminAPIPrefixV4 + "/site-replication/peer/bucket-meta",
552552
content: b,
553553
queryValues: q,
554554
}
@@ -656,7 +656,7 @@ func (adm *AdminClient) SRPeerGetIDPSettings(ctx context.Context) (info IDPSetti
656656
q.Set("api-version", SiteReplAPIVersion)
657657

658658
reqData := requestData{
659-
relPath: adminAPIPrefixV3 + "/site-replication/peer/idp-settings",
659+
relPath: adminAPIPrefixV4 + "/site-replication/peer/idp-settings",
660660
queryValues: q,
661661
}
662662

@@ -725,7 +725,7 @@ func (adm *AdminClient) SRMetaInfo(ctx context.Context, opts SRStatusOptions) (i
725725
q.Set("api-version", SiteReplAPIVersion)
726726

727727
reqData := requestData{
728-
relPath: adminAPIPrefixV3 + "/site-replication/metainfo",
728+
relPath: adminAPIPrefixV4 + "/site-replication/metainfo",
729729
queryValues: q,
730730
}
731731

@@ -967,7 +967,7 @@ func (adm *AdminClient) SRStatusInfo(ctx context.Context, opts SRStatusOptions)
967967
q.Set("api-version", SiteReplAPIVersion)
968968

969969
reqData := requestData{
970-
relPath: adminAPIPrefixV3 + "/site-replication/status",
970+
relPath: adminAPIPrefixV4 + "/site-replication/status",
971971
queryValues: q,
972972
}
973973

@@ -1020,7 +1020,7 @@ func (adm *AdminClient) SiteReplicationEdit(ctx context.Context, site PeerInfo,
10201020
q.Set("api-version", SiteReplAPIVersion)
10211021

10221022
reqData := requestData{
1023-
relPath: adminAPIPrefixV3 + "/site-replication/edit",
1023+
relPath: adminAPIPrefixV4 + "/site-replication/edit",
10241024
content: encBytes,
10251025
queryValues: q,
10261026
}
@@ -1052,7 +1052,7 @@ func (adm *AdminClient) SRPeerEdit(ctx context.Context, pi PeerInfo) error {
10521052
q.Set("api-version", SiteReplAPIVersion)
10531053

10541054
reqData := requestData{
1055-
relPath: adminAPIPrefixV3 + "/site-replication/peer/edit",
1055+
relPath: adminAPIPrefixV4 + "/site-replication/peer/edit",
10561056
content: b,
10571057
queryValues: q,
10581058
}
@@ -1082,7 +1082,7 @@ func (adm *AdminClient) SRStateEdit(ctx context.Context, state SRStateEditReq) e
10821082
q.Set("api-version", SiteReplAPIVersion)
10831083

10841084
reqData := requestData{
1085-
relPath: adminAPIPrefixV3 + "/site-replication/state/edit",
1085+
relPath: adminAPIPrefixV4 + "/site-replication/state/edit",
10861086
content: b,
10871087
queryValues: q,
10881088
}
@@ -1110,7 +1110,7 @@ func (adm *AdminClient) SiteReplicationRemove(ctx context.Context, removeReq SRR
11101110
q.Set("api-version", SiteReplAPIVersion)
11111111

11121112
reqData := requestData{
1113-
relPath: adminAPIPrefixV3 + "/site-replication/remove",
1113+
relPath: adminAPIPrefixV4 + "/site-replication/remove",
11141114
content: rmvBytes,
11151115
queryValues: q,
11161116
}
@@ -1140,7 +1140,7 @@ func (adm *AdminClient) SRPeerRemove(ctx context.Context, removeReq SRRemoveReq)
11401140
q.Set("api-version", SiteReplAPIVersion)
11411141

11421142
reqData := requestData{
1143-
relPath: adminAPIPrefixV3 + "/site-replication/peer/remove",
1143+
relPath: adminAPIPrefixV4 + "/site-replication/peer/remove",
11441144
content: reqBytes,
11451145
queryValues: q,
11461146
}
@@ -1227,7 +1227,7 @@ func (adm *AdminClient) SiteReplicationResyncOp(ctx context.Context, site PeerIn
12271227
v.Set("api-version", SiteReplAPIVersion)
12281228

12291229
reqData := requestData{
1230-
relPath: adminAPIPrefixV3 + "/site-replication/resync/op",
1230+
relPath: adminAPIPrefixV4 + "/site-replication/resync/op",
12311231
content: reqBytes,
12321232
queryValues: v,
12331233
}

‎config-commands.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ import (
2828

2929
// GetConfig - returns the config.json of a minio setup, incoming data is encrypted.
3030
func (adm *AdminClient) GetConfig(ctx context.Context) ([]byte, error) {
31-
// Execute GET on /minio/admin/v3/config to get config of a setup.
31+
// Execute GET on /minio/admin/v4/config to get config of a setup.
3232
resp, err := adm.executeMethod(ctx,
3333
http.MethodGet,
34-
requestData{relPath: adminAPIPrefixV3 + "/config"})
34+
requestData{relPath: adminAPIPrefixV4 + "/config"})
3535
defer closeResponse(resp)
3636
if err != nil {
3737
return nil, err
@@ -64,11 +64,11 @@ func (adm *AdminClient) SetConfig(ctx context.Context, config io.Reader) (err er
6464
}
6565

6666
reqData := requestData{
67-
relPath: adminAPIPrefixV3 + "/config",
67+
relPath: adminAPIPrefixV4 + "/config",
6868
content: econfigBytes,
6969
}
7070

71-
// Execute PUT on /minio/admin/v3/config to set config.
71+
// Execute PUT on /minio/admin/v4/config to set config.
7272
resp, err := adm.executeMethod(ctx, http.MethodPut, reqData)
7373

7474
defer closeResponse(resp)

‎config-help-commands.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ func (adm *AdminClient) HelpConfigKV(ctx context.Context, subSys, key string, en
6666
}
6767

6868
reqData := requestData{
69-
relPath: adminAPIPrefixV3 + "/help-config-kv",
69+
relPath: adminAPIPrefixV4 + "/help-config-kv",
7070
queryValues: v,
7171
}
7272

73-
// Execute GET on /minio/admin/v3/help-config-kv
73+
// Execute GET on /minio/admin/v4/help-config-kv
7474
resp, err := adm.executeMethod(ctx, http.MethodGet, reqData)
7575
if err != nil {
7676
return Help{}, err

‎config-history-commands.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ func (adm *AdminClient) ClearConfigHistoryKV(ctx context.Context, restoreID stri
3535
v := url.Values{}
3636
v.Set("restoreId", restoreID)
3737
reqData := requestData{
38-
relPath: adminAPIPrefixV3 + "/clear-config-history-kv",
38+
relPath: adminAPIPrefixV4 + "/clear-config-history-kv",
3939
queryValues: v,
4040
}
4141

42-
// Execute DELETE on /minio/admin/v3/clear-config-history-kv
42+
// Execute DELETE on /minio/admin/v4/clear-config-history-kv
4343
resp, err := adm.executeMethod(ctx, http.MethodDelete, reqData)
4444

4545
defer closeResponse(resp)
@@ -60,11 +60,11 @@ func (adm *AdminClient) RestoreConfigHistoryKV(ctx context.Context, restoreID st
6060
v := url.Values{}
6161
v.Set("restoreId", restoreID)
6262
reqData := requestData{
63-
relPath: adminAPIPrefixV3 + "/restore-config-history-kv",
63+
relPath: adminAPIPrefixV4 + "/restore-config-history-kv",
6464
queryValues: v,
6565
}
6666

67-
// Execute PUT on /minio/admin/v3/set-config-kv to set config key/value.
67+
// Execute PUT on /minio/admin/v4/set-config-kv to set config key/value.
6868
resp, err := adm.executeMethod(ctx, http.MethodPut, reqData)
6969

7070
defer closeResponse(resp)
@@ -100,11 +100,11 @@ func (adm *AdminClient) ListConfigHistoryKV(ctx context.Context, count int) ([]C
100100
v := url.Values{}
101101
v.Set("count", strconv.Itoa(count))
102102

103-
// Execute GET on /minio/admin/v3/list-config-history-kv
103+
// Execute GET on /minio/admin/v4/list-config-history-kv
104104
resp, err := adm.executeMethod(ctx,
105105
http.MethodGet,
106106
requestData{
107-
relPath: adminAPIPrefixV3 + "/list-config-history-kv",
107+
relPath: adminAPIPrefixV4 + "/list-config-history-kv",
108108
queryValues: v,
109109
})
110110
defer closeResponse(resp)

‎config-kv-commands.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ func (adm *AdminClient) DelConfigKV(ctx context.Context, k string) (restart bool
3333
}
3434

3535
reqData := requestData{
36-
relPath: adminAPIPrefixV3 + "/del-config-kv",
36+
relPath: adminAPIPrefixV4 + "/del-config-kv",
3737
content: econfigBytes,
3838
}
3939

40-
// Execute DELETE on /minio/admin/v3/del-config-kv to delete config key.
40+
// Execute DELETE on /minio/admin/v4/del-config-kv to delete config key.
4141
resp, err := adm.executeMethod(ctx, http.MethodDelete, reqData)
4242

4343
defer closeResponse(resp)
@@ -68,11 +68,11 @@ func (adm *AdminClient) SetConfigKV(ctx context.Context, kv string) (restart boo
6868
}
6969

7070
reqData := requestData{
71-
relPath: adminAPIPrefixV3 + "/set-config-kv",
71+
relPath: adminAPIPrefixV4 + "/set-config-kv",
7272
content: econfigBytes,
7373
}
7474

75-
// Execute PUT on /minio/admin/v3/set-config-kv to set config key/value.
75+
// Execute PUT on /minio/admin/v4/set-config-kv to set config key/value.
7676
resp, err := adm.executeMethod(ctx, http.MethodPut, reqData)
7777

7878
defer closeResponse(resp)
@@ -92,11 +92,11 @@ func (adm *AdminClient) GetConfigKV(ctx context.Context, key string) ([]byte, er
9292
v := url.Values{}
9393
v.Set("key", key)
9494

95-
// Execute GET on /minio/admin/v3/get-config-kv?key={key} to get value of key.
95+
// Execute GET on /minio/admin/v4/get-config-kv?key={key} to get value of key.
9696
resp, err := adm.executeMethod(ctx,
9797
http.MethodGet,
9898
requestData{
99-
relPath: adminAPIPrefixV3 + "/get-config-kv",
99+
relPath: adminAPIPrefixV4 + "/get-config-kv",
100100
queryValues: v,
101101
})
102102
defer closeResponse(resp)
@@ -124,11 +124,11 @@ func (adm *AdminClient) GetConfigKVWithOptions(ctx context.Context, key string,
124124
v.Set("env", "")
125125
}
126126

127-
// Execute GET on /minio/admin/v3/get-config-kv?key={key} to get value of key.
127+
// Execute GET on /minio/admin/v4/get-config-kv?key={key} to get value of key.
128128
resp, err := adm.executeMethod(ctx,
129129
http.MethodGet,
130130
requestData{
131-
relPath: adminAPIPrefixV3 + "/get-config-kv",
131+
relPath: adminAPIPrefixV4 + "/get-config-kv",
132132
queryValues: v,
133133
})
134134
defer closeResponse(resp)

‎decommission-commands.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (adm *AdminClient) DecommissionPool(ctx context.Context, pool string) error
5959
values.Set("pool", pool)
6060
resp, err := adm.executeMethod(ctx, http.MethodPost, requestData{
6161
// POST <endpoint>/<admin-API>/pools/decommission?pool=http://server{1...4}/disk{1...4}
62-
relPath: adminAPIPrefixV3 + "/pools/decommission",
62+
relPath: adminAPIPrefixV4 + "/pools/decommission",
6363
queryValues: values,
6464
})
6565
if err != nil {
@@ -79,7 +79,7 @@ func (adm *AdminClient) CancelDecommissionPool(ctx context.Context, pool string)
7979
values.Set("pool", pool)
8080
resp, err := adm.executeMethod(ctx, http.MethodPost, requestData{
8181
// POST <endpoint>/<admin-API>/pools/cancel?pool=http://server{1...4}/disk{1...4}
82-
relPath: adminAPIPrefixV3 + "/pools/cancel",
82+
relPath: adminAPIPrefixV4 + "/pools/cancel",
8383
queryValues: values,
8484
})
8585
if err != nil {
@@ -99,7 +99,7 @@ func (adm *AdminClient) StatusPool(ctx context.Context, pool string) (PoolStatus
9999
values.Set("pool", pool)
100100
resp, err := adm.executeMethod(ctx, http.MethodGet, requestData{
101101
// GET <endpoint>/<admin-API>/pools/status?pool=http://server{1...4}/disk{1...4}
102-
relPath: adminAPIPrefixV3 + "/pools/status",
102+
relPath: adminAPIPrefixV4 + "/pools/status",
103103
queryValues: values,
104104
})
105105
if err != nil {
@@ -123,7 +123,7 @@ func (adm *AdminClient) StatusPool(ctx context.Context, pool string) (PoolStatus
123123
// on the cluster.
124124
func (adm *AdminClient) ListPoolsStatus(ctx context.Context) ([]PoolStatus, error) {
125125
resp, err := adm.executeMethod(ctx, http.MethodGet, requestData{
126-
relPath: adminAPIPrefixV3 + "/pools/list", // GET <endpoint>/<admin-API>/pools/list
126+
relPath: adminAPIPrefixV4 + "/pools/list", // GET <endpoint>/<admin-API>/pools/list
127127
})
128128
if err != nil {
129129
return nil, err

0 commit comments

Comments
 (0)