Merge pull request #1332 from justincormack/go-1.10

Update to Go 1.10.1
notaryproject · Apr 9, 2018 · a57c5a7 · a57c5a7
2 parents c30d5e3 + 20a1f24
commit a57c5a7
Show file tree

Hide file tree

Showing 145 changed files with 31,400 additions and 6,147 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.4
+FROM golang:1.10.1
 
 RUN apt-get update && apt-get install -y \
 	curl \

diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ GOOSES = darwin linux windows
 NOTARY_BUILDTAGS ?= pkcs11
 NOTARYDIR := /go/src/github.com/theupdateframework/notary
 
-GO_VERSION := $(shell go version | grep "1\.[7-9]\(\.[0-9]+\)*\|devel")
+GO_VERSION := $(shell go version | grep "1\.\(7\|8\|9\|10\)\(\.[0-9]+\)*\|devel")
 # check to make sure we have the right version. development versions of Go are
 # not officially supported, but allowed for building
 

diff --git a/client/changelist/change.go b/client/changelist/change.go
@@ -82,8 +82,8 @@ func (c TUFChange) Content() []byte {
 // unexpected race conditions between humans modifying the same delegation
 type TUFDelegation struct {
 	NewName       data.RoleName `json:"new_name,omitempty"`
-	NewThreshold  int           `json:"threshold, omitempty"`
-	AddKeys       data.KeyList  `json:"add_keys, omitempty"`
+	NewThreshold  int           `json:"threshold,omitempty"`
+	AddKeys       data.KeyList  `json:"add_keys,omitempty"`
 	RemoveKeys    []string      `json:"remove_keys,omitempty"`
 	AddPaths      []string      `json:"add_paths,omitempty"`
 	RemovePaths   []string      `json:"remove_paths,omitempty"`

diff --git a/cross.Dockerfile b/cross.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.4
+FROM golang:1.10.1
 
 RUN apt-get update && apt-get install -y \
 	curl \

diff --git a/escrow.Dockerfile b/escrow.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.4-alpine
+FROM golang:1.10.1-alpine
 
 ENV NOTARYPKG github.com/theupdateframework/notary
 

diff --git a/server.Dockerfile b/server.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.4-alpine
+FROM golang:1.10.1-alpine
 
 RUN apk add --update git gcc libc-dev
 

diff --git a/server.minimal.Dockerfile b/server.minimal.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.4-alpine AS build-env
+FROM golang:1.10.1-alpine AS build-env
 RUN apk add --update git gcc libc-dev
 # Pin to the specific v3.0.0 version
 RUN go get -tags 'mysql postgres file' github.com/mattes/migrate/cli && mv /go/bin/cli /go/bin/migrate

diff --git a/server/storage/memory.go b/server/storage/memory.go
@@ -224,7 +224,7 @@ func (st *MemStorage) GetChanges(changeID string, records int, filterName string
 	} else {
 		id, err = strconv.ParseInt(changeID, 10, 32)
 		if err != nil {
-			return nil, ErrBadQuery{msg: fmt.Sprintf("change ID expected to be integer, provided ID was: %d", changeID)}
+			return nil, ErrBadQuery{msg: fmt.Sprintf("change ID expected to be integer, provided ID was: %s", changeID)}
 		}
 	}
 	var (

diff --git a/server/storage/sqldb.go b/server/storage/sqldb.go
@@ -281,7 +281,7 @@ func (db *SQLStorage) GetChanges(changeID string, records int, filterName string
 	} else {
 		id, err = strconv.ParseInt(changeID, 10, 32)
 		if err != nil {
-			return nil, ErrBadQuery{msg: fmt.Sprintf("change ID expected to be integer, provided ID was: %d", changeID)}
+			return nil, ErrBadQuery{msg: fmt.Sprintf("change ID expected to be integer, provided ID was: %s", changeID)}
 		}
 	}
 

diff --git a/signer.Dockerfile b/signer.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.4-alpine
+FROM golang:1.10.1-alpine
 
 RUN apk add --update git gcc libc-dev
 

diff --git a/signer.minimal.Dockerfile b/signer.minimal.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.9.4-alpine AS build-env
+FROM golang:1.10.1-alpine AS build-env
 RUN apk add --update git gcc libc-dev
 # Pin to the specific v3.0.0 version
 RUN go get -tags 'mysql postgres file' github.com/mattes/migrate/cli && mv /go/bin/cli /go/bin/migrate

diff --git a/vendor.conf b/vendor.conf
@@ -55,5 +55,6 @@ github.com/cenk/backoff             32cd0c5b3aef12c76ed64aaf678f6c79736be7dc  #
 
 # Testing requirements
 github.com/stretchr/testify                     089c7181b8c728499929ff09b62d3fdd8df8adff
-github.com/cloudflare/cfssl                     7fb22c8cba7ecaf98e4082d22d65800cf45e042a
-github.com/google/certificate-transparency      0f6e3d1d1ba4d03fdaab7cd716f36255c2e48341
+github.com/cloudflare/cfssl                     4e2dcbde500472449917533851bf4bae9bdff562 # v1.3.1
+github.com/google/certificate-transparency-go   5ab67e519c93568ac3ee50fd6772a5bcf8aa460d
+github.com/gogo/protobuf                        1adfc126b41513cc696b209667c8656ea7aac67c # v1.0.0