oyd
/
minio
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix lint warnings (#7099)

Browse Source
master
kannappanr 6 years ago committed by GitHub
parent 6dd13e68c2
commit e0d22359e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 15 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      cmd/admin-handlers.go
  2. 28
      cmd/object-handlers_test.go

2
cmd/admin-handlers.go
Unescape View File

@ -269,7 +269,7 @@ func (a adminAPIHandlers) ServerInfoHandler(w http.ResponseWriter, r *http.Reque
} }
serverInfo := globalNotificationSys.ServerInfo(ctx) serverInfo := globalNotificationSys.ServerInfo(ctx)
// Once we have recieved all the ServerInfo from peers // Once we have received all the ServerInfo from peers
// add the local peer server info as well. // add the local peer server info as well.
serverInfo = append(serverInfo, ServerInfo{ serverInfo = append(serverInfo, ServerInfo{
Addr: thisAddr.String(), Addr: thisAddr.String(),

28
cmd/object-handlers_test.go
Unescape View File

@ -1526,7 +1526,7 @@ func testAPICopyObjectPartHandler(obj ObjectLayer, instanceType, bucketName stri
testCases := []struct { testCases := []struct {
bucketName string bucketName string
copySourceHeader string // data for "X-Amz-Copy-Source" header. Contains the object to be copied in the URL. copySourceHeader string // data for "X-Amz-Copy-Source" header. Contains the object to be copied in the URL.
copySourceVersionId string // data for "X-Amz-Copy-Source-Version-Id" header. copySourceVersionID string // data for "X-Amz-Copy-Source-Version-Id" header.
copySourceRange string // data for "X-Amz-Copy-Source-Range" header, contains the byte range offsets of data to be copied. copySourceRange string // data for "X-Amz-Copy-Source-Range" header, contains the byte range offsets of data to be copied.
uploadID string // uploadID of the transaction. uploadID string // uploadID of the transaction.
invalidPartNumber bool // Sets an invalid multipart. invalidPartNumber bool // Sets an invalid multipart.
@ -1719,7 +1719,7 @@ func testAPICopyObjectPartHandler(obj ObjectLayer, instanceType, bucketName stri
bucketName: bucketName, bucketName: bucketName,
uploadID: uploadID, uploadID: uploadID,
copySourceHeader: url.QueryEscape("/" + bucketName + "/" + objectName), copySourceHeader: url.QueryEscape("/" + bucketName + "/" + objectName),
copySourceVersionId: "null", copySourceVersionID: "null",
accessKey: credentials.AccessKey, accessKey: credentials.AccessKey,
secretKey: credentials.SecretKey, secretKey: credentials.SecretKey,
expectedRespStatus: http.StatusOK, expectedRespStatus: http.StatusOK,
@ -1729,7 +1729,7 @@ func testAPICopyObjectPartHandler(obj ObjectLayer, instanceType, bucketName stri
bucketName: bucketName, bucketName: bucketName,
uploadID: uploadID, uploadID: uploadID,
copySourceHeader: url.QueryEscape("/" + bucketName + "/" + objectName), copySourceHeader: url.QueryEscape("/" + bucketName + "/" + objectName),
copySourceVersionId: "17", copySourceVersionID: "17",
accessKey: credentials.AccessKey, accessKey: credentials.AccessKey,
secretKey: credentials.SecretKey, secretKey: credentials.SecretKey,
expectedRespStatus: http.StatusNotFound, expectedRespStatus: http.StatusNotFound,
@ -1757,8 +1757,8 @@ func testAPICopyObjectPartHandler(obj ObjectLayer, instanceType, bucketName stri
if testCase.copySourceHeader != "" { if testCase.copySourceHeader != "" {
req.Header.Set("X-Amz-Copy-Source", testCase.copySourceHeader) req.Header.Set("X-Amz-Copy-Source", testCase.copySourceHeader)
} }
if testCase.copySourceVersionId != "" { if testCase.copySourceVersionID != "" {
req.Header.Set("X-Amz-Copy-Source-Version-Id", testCase.copySourceVersionId) req.Header.Set("X-Amz-Copy-Source-Version-Id", testCase.copySourceVersionID)
} }
if testCase.copySourceRange != "" { if testCase.copySourceRange != "" {
req.Header.Set("X-Amz-Copy-Source-Range", testCase.copySourceRange) req.Header.Set("X-Amz-Copy-Source-Range", testCase.copySourceRange)
@ -1795,8 +1795,8 @@ func testAPICopyObjectPartHandler(obj ObjectLayer, instanceType, bucketName stri
if testCase.copySourceHeader != "" { if testCase.copySourceHeader != "" {
reqV2.Header.Set("X-Amz-Copy-Source", testCase.copySourceHeader) reqV2.Header.Set("X-Amz-Copy-Source", testCase.copySourceHeader)
} }
if testCase.copySourceVersionId != "" { if testCase.copySourceVersionID != "" {
reqV2.Header.Set("X-Amz-Copy-Source-Version-Id", testCase.copySourceVersionId) reqV2.Header.Set("X-Amz-Copy-Source-Version-Id", testCase.copySourceVersionID)
} }
if testCase.copySourceRange != "" { if testCase.copySourceRange != "" {
reqV2.Header.Set("X-Amz-Copy-Source-Range", testCase.copySourceRange) reqV2.Header.Set("X-Amz-Copy-Source-Range", testCase.copySourceRange)
@ -1910,7 +1910,7 @@ func testAPICopyObjectHandler(obj ObjectLayer, instanceType, bucketName string,
bucketName string bucketName string
newObjectName string // name of the newly copied object. newObjectName string // name of the newly copied object.
copySourceHeader string // data for "X-Amz-Copy-Source" header. Contains the object to be copied in the URL. copySourceHeader string // data for "X-Amz-Copy-Source" header. Contains the object to be copied in the URL.
copySourceVersionId string // data for "X-Amz-Copy-Source-Version-Id" header. copySourceVersionID string // data for "X-Amz-Copy-Source-Version-Id" header.
copyModifiedHeader string // data for "X-Amz-Copy-Source-If-Modified-Since" header copyModifiedHeader string // data for "X-Amz-Copy-Source-If-Modified-Since" header
copyUnmodifiedHeader string // data for "X-Amz-Copy-Source-If-Unmodified-Since" header copyUnmodifiedHeader string // data for "X-Amz-Copy-Source-If-Unmodified-Since" header
metadataGarbage bool metadataGarbage bool
@ -2144,7 +2144,7 @@ func testAPICopyObjectHandler(obj ObjectLayer, instanceType, bucketName string,
bucketName: bucketName, bucketName: bucketName,
newObjectName: "newObject1", newObjectName: "newObject1",
copySourceHeader: url.QueryEscape("/" + bucketName + "/" + objectName), copySourceHeader: url.QueryEscape("/" + bucketName + "/" + objectName),
copySourceVersionId: "null", copySourceVersionID: "null",
accessKey: credentials.AccessKey, accessKey: credentials.AccessKey,
secretKey: credentials.SecretKey, secretKey: credentials.SecretKey,
expectedRespStatus: http.StatusOK, expectedRespStatus: http.StatusOK,
@ -2154,7 +2154,7 @@ func testAPICopyObjectHandler(obj ObjectLayer, instanceType, bucketName string,
bucketName: bucketName, bucketName: bucketName,
newObjectName: "newObject1", newObjectName: "newObject1",
copySourceHeader: url.QueryEscape("/" + bucketName + "/" + objectName), copySourceHeader: url.QueryEscape("/" + bucketName + "/" + objectName),
copySourceVersionId: "17", copySourceVersionID: "17",
accessKey: credentials.AccessKey, accessKey: credentials.AccessKey,
secretKey: credentials.SecretKey, secretKey: credentials.SecretKey,
expectedRespStatus: http.StatusNotFound, expectedRespStatus: http.StatusNotFound,
@ -2177,8 +2177,8 @@ func testAPICopyObjectHandler(obj ObjectLayer, instanceType, bucketName string,
if testCase.copySourceHeader != "" { if testCase.copySourceHeader != "" {
req.Header.Set("X-Amz-Copy-Source", testCase.copySourceHeader) req.Header.Set("X-Amz-Copy-Source", testCase.copySourceHeader)
} }
if testCase.copySourceVersionId != "" { if testCase.copySourceVersionID != "" {
req.Header.Set("X-Amz-Copy-Source-Version-Id", testCase.copySourceVersionId) req.Header.Set("X-Amz-Copy-Source-Version-Id", testCase.copySourceVersionID)
} }
if testCase.copyModifiedHeader != "" { if testCase.copyModifiedHeader != "" {
req.Header.Set("X-Amz-Copy-Source-If-Modified-Since", testCase.copyModifiedHeader) req.Header.Set("X-Amz-Copy-Source-If-Modified-Since", testCase.copyModifiedHeader)
@ -2241,8 +2241,8 @@ func testAPICopyObjectHandler(obj ObjectLayer, instanceType, bucketName string,
if testCase.copySourceHeader != "" { if testCase.copySourceHeader != "" {
reqV2.Header.Set("X-Amz-Copy-Source", testCase.copySourceHeader) reqV2.Header.Set("X-Amz-Copy-Source", testCase.copySourceHeader)
} }
if testCase.copySourceVersionId != "" { if testCase.copySourceVersionID != "" {
reqV2.Header.Set("X-Amz-Copy-Source-Version-Id", testCase.copySourceVersionId) reqV2.Header.Set("X-Amz-Copy-Source-Version-Id", testCase.copySourceVersionID)
} }
if testCase.copyModifiedHeader != "" { if testCase.copyModifiedHeader != "" {
reqV2.Header.Set("X-Amz-Copy-Source-If-Modified-Since", testCase.copyModifiedHeader) reqV2.Header.Set("X-Amz-Copy-Source-If-Modified-Since", testCase.copyModifiedHeader)

Write Preview
Loading…
Cancel
Save