Skip to content

Commit 3080971

Browse files
committed
fix test
1 parent 3063461 commit 3080971

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

integration/user_api_bucket_test.go

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -395,9 +395,10 @@ func UploadAnObject(bucketName, fileName string) (*http.Response, error) {
395395
contentType + boundaryEnd
396396
arrayOfBytes := []byte(file)
397397
requestDataBody := bytes.NewReader(arrayOfBytes)
398+
apiURL := "http://localhost:9090/api/v1/buckets/" + bucketName + "/objects/upload"
398399
request, err := http.NewRequest(
399400
"POST",
400-
"http://localhost:9090/api/v1/buckets/"+bucketName+"/objects/upload",
401+
apiURL,
401402
requestDataBody,
402403
)
403404
if err != nil {
@@ -488,9 +489,11 @@ func PutObjectsRetentionStatus(bucketName, prefix, versionID, mode, expires stri
488489
}
489490
requestDataJSON, _ := json.Marshal(requestDataAdd)
490491
requestDataBody := bytes.NewReader(requestDataJSON)
492+
apiURL := "http://localhost:9090/api/v1/buckets/" + bucketName + "/objects/retention?prefix=" + prefix + "&version_id=" + versionID
493+
491494
request, err := http.NewRequest(
492495
"PUT",
493-
"http://localhost:9090/api/v1/buckets/"+bucketName+"/objects/retention?prefix="+prefix+"&version_id="+versionID,
496+
apiURL,
494497
requestDataBody,
495498
)
496499
if err != nil {
@@ -726,9 +729,10 @@ func PutObjectsLegalholdStatus(bucketName, prefix, status, versionID string) (*h
726729
}
727730
requestDataJSON, _ := json.Marshal(requestDataAdd)
728731
requestDataBody := bytes.NewReader(requestDataJSON)
732+
apiURL := "http://localhost:9090/api/v1/buckets/" + bucketName + "/objects/legalhold?prefix=" + prefix + "&version_id=" + versionID
729733
request, err := http.NewRequest(
730734
"PUT",
731-
"http://localhost:9090/api/v1/buckets/"+bucketName+"/objects/legalhold?prefix="+prefix+"&version_id="+versionID,
735+
apiURL,
732736
requestDataBody,
733737
)
734738
if err != nil {
@@ -747,8 +751,8 @@ func TestPutObjectsLegalholdStatus(t *testing.T) {
747751
// Variables
748752
assert := assert.New(t)
749753
bucketName := "testputobjectslegalholdstatus"
750-
fileName := "testputobjectslegalholdstatus.txt"
751-
prefix := "dGVzdHB1dG9iamVjdHNsZWdhbGhvbGRzdGF0dXMudHh0" // encoded base64
754+
objName := "testputobjectslegalholdstatus.txt" // // encoded base64 of testputobjectslegalholdstatus.txt = dGVzdHB1dG9iamVjdHNsZWdhbGhvbGRzdGF0dXMudHh0
755+
objectNameEncoded := "dGVzdHB1dG9iamVjdHNsZWdhbGhvbGRzdGF0dXMudHh0"
752756
status := "enabled"
753757

754758
// 1. Create bucket
@@ -759,7 +763,7 @@ func TestPutObjectsLegalholdStatus(t *testing.T) {
759763
// 2. Add object
760764
uploadResponse, uploadError := UploadAnObject(
761765
bucketName,
762-
fileName,
766+
objName,
763767
)
764768
assert.Nil(uploadError)
765769
if uploadError != nil {
@@ -776,7 +780,7 @@ func TestPutObjectsLegalholdStatus(t *testing.T) {
776780
}
777781

778782
// Get versionID
779-
listResponse, _ := ListObjects(bucketName, prefix, "true")
783+
listResponse, _ := ListObjects(bucketName, "", "true")
780784
bodyBytes, _ := io.ReadAll(listResponse.Body)
781785
listObjs := models.ListObjectsResponse{}
782786
err := json.Unmarshal(bodyBytes, &listObjs)
@@ -814,7 +818,7 @@ func TestPutObjectsLegalholdStatus(t *testing.T) {
814818
// 3. Put Objects Legal Status
815819
putResponse, putError := PutObjectsLegalholdStatus(
816820
bucketName,
817-
prefix,
821+
objectNameEncoded,
818822
status,
819823
tt.args.versionID,
820824
)

0 commit comments

Comments
 (0)