Migrate to Go version 1.11.4 (#7026)

master
Harshavardhana 6 years ago committed by GitHub
parent 2a0e4b6f58
commit b5280ba243
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      .travis.yml
  2. 4
      Makefile
  3. 4
      cmd/crypto/header_test.go
  4. 6
      cmd/crypto/metadata_test.go
  5. 16
      cmd/postpolicyform.go

@ -16,19 +16,19 @@ matrix:
sudo: required sudo: required
env: env:
- ARCH=x86_64 - ARCH=x86_64
go: 1.10.4 go: 1.11.4
script: script:
- make - make
- diff -au <(gofmt -s -d cmd) <(printf "") - diff -au <(gofmt -s -d cmd) <(printf "")
- diff -au <(gofmt -s -d pkg) <(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 verify
- make coverage - make coverage
- cd browser && yarn && yarn test && cd .. - cd browser && yarn && yarn test && cd ..
- os: windows - os: windows
env: env:
- ARCH=x86_64 - ARCH=x86_64
go: 1.10.4 go: 1.11.4
script: script:
- go build --ldflags="$(go run buildscripts/gen-ldflags.go)" -o %GOPATH%\bin\minio.exe - 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 - for d in $(go list ./... | grep -v browser); do go test -v -race --timeout 20m "$d"; done

@ -60,7 +60,7 @@ spelling:
check: test check: test
test: verifiers build test: verifiers build
@echo "Running unit tests" @echo "Running unit tests"
@go test $(GOFLAGS) -tags kqueue ./... @go test -tags kqueue ./...
verify: build verify: build
@echo "Verifying build" @echo "Verifying build"
@ -73,7 +73,7 @@ coverage: build
# Builds minio locally. # Builds minio locally.
build: checks build: checks
@echo "Building minio binary to './minio'" @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
@docker build -t $(TAG) . -f Dockerfile.dev @docker build -t $(TAG) . -f Dockerfile.dev

@ -95,7 +95,7 @@ var ssecIsRequestedTests = []struct {
Header http.Header Header http.Header
Expected bool 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-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": []string{"MzJieXRlc2xvbmdzZWNyZXRrZXltdXN0cHJvdmlkZWQ="}}, Expected: true}, // 2
{Header: http.Header{"X-Amz-Server-Side-Encryption-Customer-Key-Md5": []string{"7PpPLAK26ONlVUGOWlusfg=="}}, Expected: true}, // 3 {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 Header http.Header
Expected bool 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-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": []string{"MzJieXRlc2xvbmdzZWNyZXRrZXltdXN0cHJvdmlkZWQ="}}, Expected: true}, // 2
{Header: http.Header{"X-Amz-Copy-Source-Server-Side-Encryption-Customer-Key-Md5": []string{"7PpPLAK26ONlVUGOWlusfg=="}}, Expected: true}, // 3 {Header: http.Header{"X-Amz-Copy-Source-Server-Side-Encryption-Customer-Key-Md5": []string{"7PpPLAK26ONlVUGOWlusfg=="}}, Expected: true}, // 3

@ -370,9 +370,9 @@ var isETagSealedTests = []struct {
ETag string ETag string
IsSealed bool IsSealed bool
}{ }{
{ETag: "", IsSealed: false}, // 0 {ETag: "", IsSealed: false}, // 0
{ETag: "90682b8e8cc7609c4671e1d64c73fc30", IsSealed: false}, // 1 {ETag: "90682b8e8cc7609c4671e1d64c73fc30", IsSealed: false}, // 1
{ETag: "f201040c9dc593e39ea004dc1323699bcd", IsSealed: true}, // 2 not valid ciphertext but looks like sealed ETag {ETag: "f201040c9dc593e39ea004dc1323699bcd", IsSealed: true}, // 2 not valid ciphertext but looks like sealed ETag
{ETag: "20000f00fba2ee2ae4845f725964eeb9e092edfabc7ab9f9239e8344341f769a51ce99b4801b0699b92b16a72fa94972", IsSealed: true}, // 3 {ETag: "20000f00fba2ee2ae4845f725964eeb9e092edfabc7ab9f9239e8344341f769a51ce99b4801b0699b92b16a72fa94972", IsSealed: true}, // 3
} }

@ -29,14 +29,14 @@ import (
// startWithConds - map which indicates if a given condition supports starts-with policy operator // startWithConds - map which indicates if a given condition supports starts-with policy operator
var startsWithConds = map[string]bool{ var startsWithConds = map[string]bool{
"$acl": true, "$acl": true,
"$bucket": false, "$bucket": false,
"$cache-control": true, "$cache-control": true,
"$content-type": true, "$content-type": true,
"$content-disposition": true, "$content-disposition": true,
"$content-encoding": true, "$content-encoding": true,
"$expires": true, "$expires": true,
"$key": true, "$key": true,
"$success_action_redirect": true, "$success_action_redirect": true,
"$redirect": true, "$redirect": true,
"$success_action_status": false, "$success_action_status": false,

Loading…
Cancel
Save