From b5280ba243edc5bb81ddb7c963ee9cc51074aae7 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Fri, 28 Dec 2018 14:04:39 -0800 Subject: [PATCH] Migrate to Go version 1.11.4 (#7026) --- .travis.yml | 6 +++--- Makefile | 4 ++-- cmd/crypto/header_test.go | 4 ++-- cmd/crypto/metadata_test.go | 6 +++--- cmd/postpolicyform.go | 16 ++++++++-------- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index c21ceb2f5..f572829e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,19 +16,19 @@ matrix: sudo: required env: - ARCH=x86_64 - go: 1.10.4 + go: 1.11.4 script: - make - diff -au <(gofmt -s -d cmd) <(printf "") - diff -au <(gofmt -s -d pkg) <(printf "") - - make test GOFLAGS="-timeout 15m -race -v" + - for d in $(go list ./... | grep -v browser); do go test -v -race --timeout 15m "$d"; done - make verify - make coverage - cd browser && yarn && yarn test && cd .. - os: windows env: - ARCH=x86_64 - go: 1.10.4 + go: 1.11.4 script: - go build --ldflags="$(go run buildscripts/gen-ldflags.go)" -o %GOPATH%\bin\minio.exe - for d in $(go list ./... | grep -v browser); do go test -v -race --timeout 20m "$d"; done diff --git a/Makefile b/Makefile index be86ed41b..16214a543 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ spelling: check: test test: verifiers build @echo "Running unit tests" - @go test $(GOFLAGS) -tags kqueue ./... + @go test -tags kqueue ./... verify: build @echo "Verifying build" @@ -73,7 +73,7 @@ coverage: build # Builds minio locally. build: checks @echo "Building minio binary to './minio'" - @CGO_ENABLED=0 go build -tags kqueue --ldflags $(BUILD_LDFLAGS) -o $(PWD)/minio + @GOFLAGS="" CGO_ENABLED=0 go build -tags kqueue --ldflags $(BUILD_LDFLAGS) -o $(PWD)/minio docker: build @docker build -t $(TAG) . -f Dockerfile.dev diff --git a/cmd/crypto/header_test.go b/cmd/crypto/header_test.go index 9d1eb9ed9..ba4f9b3b0 100644 --- a/cmd/crypto/header_test.go +++ b/cmd/crypto/header_test.go @@ -95,7 +95,7 @@ var ssecIsRequestedTests = []struct { Header http.Header Expected bool }{ - {Header: http.Header{}, Expected: false}, // 0 + {Header: http.Header{}, Expected: false}, // 0 {Header: http.Header{"X-Amz-Server-Side-Encryption-Customer-Algorithm": []string{"AES256"}}, Expected: true}, // 1 {Header: http.Header{"X-Amz-Server-Side-Encryption-Customer-Key": []string{"MzJieXRlc2xvbmdzZWNyZXRrZXltdXN0cHJvdmlkZWQ="}}, Expected: true}, // 2 {Header: http.Header{"X-Amz-Server-Side-Encryption-Customer-Key-Md5": []string{"7PpPLAK26ONlVUGOWlusfg=="}}, Expected: true}, // 3 @@ -137,7 +137,7 @@ var ssecCopyIsRequestedTests = []struct { Header http.Header Expected bool }{ - {Header: http.Header{}, Expected: false}, // 0 + {Header: http.Header{}, Expected: false}, // 0 {Header: http.Header{"X-Amz-Copy-Source-Server-Side-Encryption-Customer-Algorithm": []string{"AES256"}}, Expected: true}, // 1 {Header: http.Header{"X-Amz-Copy-Source-Server-Side-Encryption-Customer-Key": []string{"MzJieXRlc2xvbmdzZWNyZXRrZXltdXN0cHJvdmlkZWQ="}}, Expected: true}, // 2 {Header: http.Header{"X-Amz-Copy-Source-Server-Side-Encryption-Customer-Key-Md5": []string{"7PpPLAK26ONlVUGOWlusfg=="}}, Expected: true}, // 3 diff --git a/cmd/crypto/metadata_test.go b/cmd/crypto/metadata_test.go index ed73988a9..d93f64752 100644 --- a/cmd/crypto/metadata_test.go +++ b/cmd/crypto/metadata_test.go @@ -370,9 +370,9 @@ var isETagSealedTests = []struct { ETag string IsSealed bool }{ - {ETag: "", IsSealed: false}, // 0 - {ETag: "90682b8e8cc7609c4671e1d64c73fc30", IsSealed: false}, // 1 - {ETag: "f201040c9dc593e39ea004dc1323699bcd", IsSealed: true}, // 2 not valid ciphertext but looks like sealed ETag + {ETag: "", IsSealed: false}, // 0 + {ETag: "90682b8e8cc7609c4671e1d64c73fc30", IsSealed: false}, // 1 + {ETag: "f201040c9dc593e39ea004dc1323699bcd", IsSealed: true}, // 2 not valid ciphertext but looks like sealed ETag {ETag: "20000f00fba2ee2ae4845f725964eeb9e092edfabc7ab9f9239e8344341f769a51ce99b4801b0699b92b16a72fa94972", IsSealed: true}, // 3 } diff --git a/cmd/postpolicyform.go b/cmd/postpolicyform.go index d4356433b..8c8c1719d 100644 --- a/cmd/postpolicyform.go +++ b/cmd/postpolicyform.go @@ -29,14 +29,14 @@ import ( // startWithConds - map which indicates if a given condition supports starts-with policy operator var startsWithConds = map[string]bool{ - "$acl": true, - "$bucket": false, - "$cache-control": true, - "$content-type": true, - "$content-disposition": true, - "$content-encoding": true, - "$expires": true, - "$key": true, + "$acl": true, + "$bucket": false, + "$cache-control": true, + "$content-type": true, + "$content-disposition": true, + "$content-encoding": true, + "$expires": true, + "$key": true, "$success_action_redirect": true, "$redirect": true, "$success_action_status": false,