Skip to content

Commit 72a1e5e

Browse files
bexsoftbexsoft
authored
Changed response type for Add bucket (#2721)
Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>
1 parent f20fa0b commit 72a1e5e

File tree

9 files changed

+204
-69
lines changed

9 files changed

+204
-69
lines changed

‎integration/user_api_bucket_test.go

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ func TestPutObjectsLegalholdStatus(t *testing.T) {
752752
status := "enabled"
753753

754754
// 1. Create bucket
755-
if !setupBucket(bucketName, true, true, nil, nil, assert, 201) {
755+
if !setupBucket(bucketName, true, true, nil, nil, assert, 200) {
756756
return
757757
}
758758

@@ -839,7 +839,7 @@ func TestGetBucketQuota(t *testing.T) {
839839
validBucket := "testgetbucketquota"
840840

841841
// 1. Create bucket
842-
if !setupBucket(validBucket, true, true, nil, nil, assert, 201) {
842+
if !setupBucket(validBucket, true, true, nil, nil, assert, 200) {
843843
return
844844
}
845845

@@ -916,7 +916,7 @@ func TestPutBucketQuota(t *testing.T) {
916916
validBucket := "testputbucketquota"
917917

918918
// 1. Create bucket
919-
if !setupBucket(validBucket, true, true, nil, nil, assert, 201) {
919+
if !setupBucket(validBucket, true, true, nil, nil, assert, 200) {
920920
return
921921
}
922922

@@ -975,7 +975,7 @@ func TestListBucketEvents(t *testing.T) {
975975
validBucket := "testlistbucketevents"
976976

977977
// 1. Create bucket
978-
if !setupBucket(validBucket, true, true, nil, nil, assert, 201) {
978+
if !setupBucket(validBucket, true, true, nil, nil, assert, 200) {
979979
return
980980
}
981981

@@ -1033,7 +1033,7 @@ func TestDeleteObjectsRetentionStatus(t *testing.T) {
10331033
validPrefix := encodeBase64(fileName)
10341034

10351035
// 1. Create bucket
1036-
if !setupBucket(bucketName, true, true, nil, nil, assert, 201) {
1036+
if !setupBucket(bucketName, true, true, nil, nil, assert, 200) {
10371037
return
10381038
}
10391039

@@ -1140,7 +1140,7 @@ func TestBucketSetPolicy(t *testing.T) {
11401140
validBucketName := "testbucketsetpolicy"
11411141

11421142
// 1. Create bucket
1143-
if !setupBucket(validBucketName, true, true, nil, nil, assert, 201) {
1143+
if !setupBucket(validBucketName, true, true, nil, nil, assert, 200) {
11441144
return
11451145
}
11461146

@@ -1201,7 +1201,7 @@ func TestRestoreObjectToASelectedVersion(t *testing.T) {
12011201
validPrefix := encodeBase64(fileName)
12021202

12031203
// 1. Create bucket
1204-
if !setupBucket(bucketName, true, true, nil, nil, assert, 201) {
1204+
if !setupBucket(bucketName, true, true, nil, nil, assert, 200) {
12051205
return
12061206
}
12071207

@@ -1289,7 +1289,7 @@ func TestPutBucketsTags(t *testing.T) {
12891289
// 1. Create the bucket
12901290
assert := assert.New(t)
12911291
validBucketName := "testputbuckettags1"
1292-
if !setupBucket(validBucketName, false, false, nil, nil, assert, 201) {
1292+
if !setupBucket(validBucketName, false, false, nil, nil, assert, 200) {
12931293
return
12941294
}
12951295

@@ -1347,7 +1347,7 @@ func TestGetsTheMetadataOfAnObject(t *testing.T) {
13471347
tags["tag"] = "testputobjecttagbucketonetagone"
13481348

13491349
// 1. Create the bucket
1350-
if !setupBucket(bucketName, false, false, nil, nil, assert, 201) {
1350+
if !setupBucket(bucketName, false, false, nil, nil, assert, 200) {
13511351
return
13521352
}
13531353

@@ -1418,7 +1418,7 @@ func TestPutObjectsRetentionStatus(t *testing.T) {
14181418
prefix := encodeBase64(fileName)
14191419

14201420
// 1. Create bucket
1421-
if !setupBucket(bucketName, true, true, nil, nil, assert, 201) {
1421+
if !setupBucket(bucketName, true, true, nil, nil, assert, 200) {
14221422
return
14231423
}
14241424

@@ -1516,7 +1516,7 @@ func TestShareObjectOnURL(t *testing.T) {
15161516
versionID := "null"
15171517

15181518
// 1. Create the bucket
1519-
if !setupBucket(bucketName, false, false, nil, nil, assert, 201) {
1519+
if !setupBucket(bucketName, false, false, nil, nil, assert, 200) {
15201520
return
15211521
}
15221522

@@ -1590,7 +1590,7 @@ func TestListObjects(t *testing.T) {
15901590
fileName := "testlistobjecttobucket1.txt"
15911591

15921592
// 1. Create the bucket
1593-
if !setupBucket(bucketName, false, false, nil, nil, assert, 201) {
1593+
if !setupBucket(bucketName, false, false, nil, nil, assert, 200) {
15941594
return
15951595
}
15961596

@@ -1638,7 +1638,7 @@ func TestDeleteObject(t *testing.T) {
16381638
numberOfFiles := 2
16391639

16401640
// 1. Create bucket
1641-
if !setupBucket(bucketName, true, true, nil, nil, assert, 201) {
1641+
if !setupBucket(bucketName, true, true, nil, nil, assert, 200) {
16421642
return
16431643
}
16441644

@@ -1704,7 +1704,7 @@ func TestUploadObjectToBucket(t *testing.T) {
17041704
fileName := "sample.txt"
17051705

17061706
// 1. Create the bucket
1707-
if !setupBucket(bucketName, false, false, nil, nil, assert, 201) {
1707+
if !setupBucket(bucketName, false, false, nil, nil, assert, 200) {
17081708
return
17091709
}
17101710

@@ -1739,7 +1739,7 @@ func TestDownloadObject(t *testing.T) {
17391739
}
17401740

17411741
// 1. Create the bucket
1742-
if !setupBucket(bucketName, true, true, nil, nil, assert, 201) {
1742+
if !setupBucket(bucketName, true, true, nil, nil, assert, 200) {
17431743
return
17441744
}
17451745

@@ -1801,7 +1801,7 @@ func TestDeleteMultipleObjects(t *testing.T) {
18011801
fileName := "testdeletemultipleobjs"
18021802

18031803
// 1. Create a bucket for this particular test
1804-
if !setupBucket(bucketName, false, false, nil, nil, assert, 201) {
1804+
if !setupBucket(bucketName, false, false, nil, nil, assert, 200) {
18051805
return
18061806
}
18071807

@@ -1878,7 +1878,7 @@ func TestPutObjectTag(t *testing.T) {
18781878
versionID := "null"
18791879

18801880
// 1. Create the bucket
1881-
if !setupBucket(bucketName, false, false, nil, nil, assert, 201) {
1881+
if !setupBucket(bucketName, false, false, nil, nil, assert, 200) {
18821882
return
18831883
}
18841884

@@ -1952,7 +1952,7 @@ func TestBucketRetention(t *testing.T) {
19521952
retention["mode"] = "compliance"
19531953
retention["unit"] = "years"
19541954
retention["validity"] = 2
1955-
if !setupBucket("setbucketretention1", true, true, nil, retention, assert, 201) {
1955+
if !setupBucket("setbucketretention1", true, true, nil, retention, assert, 200) {
19561956
return
19571957
}
19581958

@@ -2003,7 +2003,7 @@ func TestBucketInformationGenericErrorResponse(t *testing.T) {
20032003

20042004
// 1. Create the bucket
20052005
assert := assert.New(t)
2006-
if !setupBucket("bucketinformation2", false, false, nil, nil, assert, 201) {
2006+
if !setupBucket("bucketinformation2", false, false, nil, nil, assert, 200) {
20072007
return
20082008
}
20092009

@@ -2048,7 +2048,7 @@ func TestBucketInformationSuccessfulResponse(t *testing.T) {
20482048

20492049
// 1. Create the bucket
20502050
assert := assert.New(t)
2051-
if !setupBucket("bucketinformation1", false, false, nil, nil, assert, 201) {
2051+
if !setupBucket("bucketinformation1", false, false, nil, nil, assert, 200) {
20522052
return
20532053
}
20542054

@@ -2161,7 +2161,7 @@ func TestListBuckets(t *testing.T) {
21612161
// 1. Create buckets
21622162
numberOfBuckets := 3
21632163
for i := 1; i <= numberOfBuckets; i++ {
2164-
if !setupBucket("testlistbuckets"+strconv.Itoa(i), false, false, nil, nil, assert, 201) {
2164+
if !setupBucket("testlistbuckets"+strconv.Itoa(i), false, false, nil, nil, assert, 200) {
21652165
return
21662166
}
21672167
}
@@ -2277,7 +2277,7 @@ func TestBucketVersioning(t *testing.T) {
22772277

22782278
requestDataBody := bytes.NewReader(requestDataJSON)
22792279

2280-
if !setupBucket("test2", true, false, nil, nil, assert, 201) {
2280+
if !setupBucket("test2", true, false, nil, nil, assert, 200) {
22812281
return
22822282
}
22832283

@@ -2314,7 +2314,7 @@ func TestBucketVersioning(t *testing.T) {
23142314
if distributedSystem {
23152315
assert.Equal(200, response.StatusCode, "Versioning test Status Code is incorrect - bucket failed to create")
23162316
} else {
2317-
assert.NotEqual(201, response.StatusCode, "Versioning test Status Code is incorrect - versioned bucket created on non-distributed system")
2317+
assert.NotEqual(200, response.StatusCode, "Versioning test Status Code is incorrect - versioned bucket created on non-distributed system")
23182318
}
23192319

23202320
request, error := http.NewRequest("DELETE", "http://localhost:9090/api/v1/buckets/test2", requestDataBody)
@@ -2345,7 +2345,7 @@ func TestSetBucketTags(t *testing.T) {
23452345
}
23462346

23472347
// put bucket
2348-
if !setupBucket("test4", false, false, nil, nil, assert, 201) {
2348+
if !setupBucket("test4", false, false, nil, nil, assert, 200) {
23492349
return
23502350
}
23512351

@@ -2412,7 +2412,7 @@ func TestGetBucket(t *testing.T) {
24122412
Timeout: 2 * time.Second,
24132413
}
24142414

2415-
if !setupBucket("test3", false, false, nil, nil, assert, 201) {
2415+
if !setupBucket("test3", false, false, nil, nil, assert, 200) {
24162416
return
24172417
}
24182418

@@ -2450,7 +2450,7 @@ func TestAddBucket(t *testing.T) {
24502450
}{
24512451
{
24522452
name: "Add Bucket with valid name",
2453-
expectedStatus: 201,
2453+
expectedStatus: 200,
24542454
args: args{
24552455
bucketName: "test1",
24562456
},
@@ -3050,7 +3050,7 @@ func TestSetBucketVersioning(t *testing.T) {
30503050
versioning := true
30513051

30523052
// 1. Create bucket with versioning as true and locking as false
3053-
if !setupBucket(bucket, locking, versioning, nil, nil, assert, 201) {
3053+
if !setupBucket(bucket, locking, versioning, nil, nil, assert, 200) {
30543054
return
30553055
}
30563056

@@ -3133,7 +3133,7 @@ func TestEnableBucketEncryption(t *testing.T) {
31333133
kmsKeyID := ""
31343134

31353135
// 1. Add bucket
3136-
if !setupBucket(bucketName, locking, versioning, nil, nil, assert, 201) {
3136+
if !setupBucket(bucketName, locking, versioning, nil, nil, assert, 200) {
31373137
return
31383138
}
31393139

@@ -3402,7 +3402,7 @@ func TestBucketLifeCycle(t *testing.T) {
34023402
var noncurrentversionExpirationDays int64
34033403

34043404
// 1. Add bucket
3405-
if !setupBucket(bucketName, locking, versioning, nil, nil, assert, 201) {
3405+
if !setupBucket(bucketName, locking, versioning, nil, nil, assert, 200) {
34063406
return
34073407
}
34083408

@@ -3612,7 +3612,7 @@ func TestAccessRule(t *testing.T) {
36123612
access := "readonly"
36133613

36143614
// 1. Add bucket
3615-
if !setupBucket(bucketName, locking, versioning, nil, nil, assert, 201) {
3615+
if !setupBucket(bucketName, locking, versioning, nil, nil, assert, 200) {
36163616
return
36173617
}
36183618

@@ -3856,13 +3856,13 @@ func TestAddRemoteBucket(t *testing.T) {
38563856
fmt.Println("targetBucket: ", targetBucket)
38573857

38583858
// 1. Create bucket
3859-
if !setupBucket("source", true, true, nil, nil, assert, 201) {
3859+
if !setupBucket("source", true, true, nil, nil, assert, 200) {
38603860
return
38613861
}
38623862
// 1.1. Create target bucket
38633863
targetEndpoint := "http://localhost:9092"
38643864
targetToken := getTokenForEndpoint(targetEndpoint)
3865-
if !setupBucketForEndpoint(targetBucket, true, true, nil, nil, assert, 201, &targetEndpoint, &targetToken) {
3865+
if !setupBucketForEndpoint(targetBucket, true, true, nil, nil, assert, 200, &targetEndpoint, &targetToken) {
38663866
log.Println("bucket already exists")
38673867
}
38683868
_, err := SetBucketVersioning(targetBucket, false, &targetURL, &targetToken)
@@ -3915,13 +3915,13 @@ func TestDeleteRemoteBucket(t *testing.T) {
39153915
fmt.Println("targetBucket: ", targetBucket)
39163916

39173917
// 1. Create bucket
3918-
if !setupBucket("deletesource", true, true, nil, nil, assert, 201) {
3918+
if !setupBucket("deletesource", true, true, nil, nil, assert, 200) {
39193919
return
39203920
}
39213921
// 1.1. Create target bucket
39223922
targetEndpoint := "http://localhost:9092"
39233923
targetToken := getTokenForEndpoint(targetEndpoint)
3924-
if !setupBucketForEndpoint(targetBucket, true, true, nil, nil, assert, 201, &targetEndpoint, &targetToken) {
3924+
if !setupBucketForEndpoint(targetBucket, true, true, nil, nil, assert, 200, &targetEndpoint, &targetToken) {
39253925
log.Println("bucket already exists")
39263926
}
39273927
_, err := SetBucketVersioning(targetBucket, false, &targetURL, &targetToken)

‎models/make_buckets_response.go

Lines changed: 67 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎portal-ui/src/api/consoleApi.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,10 @@ export interface AddBucketReplication {
430430
destination_bucket?: string;
431431
}
432432

433+
export interface MakeBucketsResponse {
434+
bucketName?: string;
435+
}
436+
433437
export interface ListBucketEventsResponse {
434438
events?: NotificationConfig[];
435439
/**
@@ -1927,12 +1931,13 @@ export class Api<
19271931
* @secure
19281932
*/
19291933
makeBucket: (body: MakeBucketRequest, params: RequestParams = {}) =>
1930-
this.request<void, Error>({
1934+
this.request<MakeBucketsResponse, Error>({
19311935
path: `/buckets`,
19321936
method: "POST",
19331937
body: body,
19341938
secure: true,
19351939
type: ContentType.Json,
1940+
format: "json",
19361941
...params,
19371942
}),
19381943

0 commit comments

Comments
 (0)