Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Go to 1.14.1 #1543

Merged
merged 3 commits into from
Apr 3, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.15
FROM golang:1.14.1

RUN apt-get update && apt-get install -y \
curl \
4 changes: 2 additions & 2 deletions buildscripts/circle-validate-vendor.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

go_version=1.12.15
go_version=1.14.1

docker run --rm --env GO111MODULE=on -w /notary --volume ${PWD}:/notary \
golang:${go_version}-alpine \
sh -c "apk update && apk add bash git && buildscripts/validate-vendor.sh"
sh -c "apk update && apk add bash git && buildscripts/validate-vendor.sh"
2 changes: 1 addition & 1 deletion escrow.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.15-alpine
FROM golang:1.14.1-alpine

ENV NOTARYPKG github.com/theupdateframework/notary
ENV GO111MODULE=on
2 changes: 1 addition & 1 deletion server.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.15-alpine
FROM golang:1.14.1-alpine

RUN apk add --update git gcc libc-dev

2 changes: 1 addition & 1 deletion server.minimal.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.15-alpine AS build-env
FROM golang:1.14.1-alpine AS build-env

RUN apk add --update git gcc libc-dev

2 changes: 1 addition & 1 deletion signer.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.15-alpine
FROM golang:1.14.1-alpine

RUN apk add --update git gcc libc-dev

2 changes: 1 addition & 1 deletion signer.minimal.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12.15-alpine AS build-env
FROM golang:1.14.1-alpine AS build-env

RUN apk add --update git gcc libc-dev

4 changes: 2 additions & 2 deletions storage/httpstore_test.go
Original file line number Diff line number Diff line change
@@ -393,7 +393,7 @@ func TestNetworkError(t *testing.T) {
Err: errors.New("abc%3Adef%3Aghi"),
}
networkErr := NetworkError{Wrapped: err}
require.Equal(t, http.MethodGet+" https://auth.docker.io: abc:def:ghi", networkErr.Error())
require.Equal(t, http.MethodGet+" \"https://auth.docker.io\": abc:def:ghi", networkErr.Error())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wondering why success in the past?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah these were weird it looks like the error message printing changed in Go 1.14, I mean checking exact error messages is always risky.


// expect QueryUnescape error because the last '%' is not
// followed by two hexadecimal digits
@@ -403,7 +403,7 @@ func TestNetworkError(t *testing.T) {
Err: errors.New("abc%3Adef%GAghi"),
}
networkErr2 := NetworkError{Wrapped: err2}
require.Equal(t, http.MethodGet+" https://auth.docker.io: abc%3Adef%GAghi", networkErr2.Error())
require.Equal(t, http.MethodGet+" \"https://auth.docker.io\": abc%3Adef%GAghi", networkErr2.Error())

err3 := errors.New("CPU usage 90%3A")
networkErr3 := NetworkError{Wrapped: err3}

This file was deleted.

This file was deleted.

74 changes: 0 additions & 74 deletions vendor/github.com/lib/pq/oid/gen.go

This file was deleted.

61 changes: 0 additions & 61 deletions vendor/golang.org/x/sys/unix/mkasm_darwin.go

This file was deleted.

106 changes: 0 additions & 106 deletions vendor/golang.org/x/sys/unix/mkpost.go

This file was deleted.

402 changes: 0 additions & 402 deletions vendor/golang.org/x/sys/unix/mksyscall.go

This file was deleted.

404 changes: 0 additions & 404 deletions vendor/golang.org/x/sys/unix/mksyscall_aix_ppc.go

This file was deleted.

602 changes: 0 additions & 602 deletions vendor/golang.org/x/sys/unix/mksyscall_aix_ppc64.go

This file was deleted.

335 changes: 0 additions & 335 deletions vendor/golang.org/x/sys/unix/mksyscall_solaris.go

This file was deleted.

190 changes: 0 additions & 190 deletions vendor/golang.org/x/sys/unix/mksysnum.go

This file was deleted.

236 changes: 0 additions & 236 deletions vendor/golang.org/x/sys/unix/types_aix.go

This file was deleted.

277 changes: 0 additions & 277 deletions vendor/golang.org/x/sys/unix/types_darwin.go

This file was deleted.

263 changes: 0 additions & 263 deletions vendor/golang.org/x/sys/unix/types_dragonfly.go

This file was deleted.

356 changes: 0 additions & 356 deletions vendor/golang.org/x/sys/unix/types_freebsd.go

This file was deleted.

289 changes: 0 additions & 289 deletions vendor/golang.org/x/sys/unix/types_netbsd.go

This file was deleted.

276 changes: 0 additions & 276 deletions vendor/golang.org/x/sys/unix/types_openbsd.go

This file was deleted.

266 changes: 0 additions & 266 deletions vendor/golang.org/x/sys/unix/types_solaris.go

This file was deleted.

82 changes: 41 additions & 41 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
@@ -14,42 +14,42 @@ github.com/bugsnag/panicwrap
# github.com/cenkalti/backoff v1.0.0
github.com/cenkalti/backoff
# github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004
github.com/cloudflare/cfssl/auth
github.com/cloudflare/cfssl/certdb
github.com/cloudflare/cfssl/config
github.com/cloudflare/cfssl/crypto/pkcs7
github.com/cloudflare/cfssl/csr
github.com/cloudflare/cfssl/errors
github.com/cloudflare/cfssl/helpers
github.com/cloudflare/cfssl/helpers/derhelpers
github.com/cloudflare/cfssl/info
github.com/cloudflare/cfssl/initca
github.com/cloudflare/cfssl/signer
github.com/cloudflare/cfssl/signer/local
github.com/cloudflare/cfssl/auth
github.com/cloudflare/cfssl/errors
github.com/cloudflare/cfssl/log
github.com/cloudflare/cfssl/ocsp/config
github.com/cloudflare/cfssl/crypto/pkcs7
github.com/cloudflare/cfssl/helpers/derhelpers
github.com/cloudflare/cfssl/certdb
github.com/cloudflare/cfssl/info
github.com/cloudflare/cfssl/signer
github.com/cloudflare/cfssl/signer/local
# github.com/davecgh/go-spew v1.1.1
github.com/davecgh/go-spew/spew
# github.com/docker/distribution v2.7.1+incompatible
github.com/docker/distribution/uuid
github.com/docker/distribution/registry/client/auth
github.com/docker/distribution/registry/client/auth/challenge
github.com/docker/distribution/registry/client/transport
github.com/docker/distribution
github.com/docker/distribution/context
github.com/docker/distribution/digestset
github.com/docker/distribution/health
github.com/docker/distribution/registry/auth/htpasswd
github.com/docker/distribution/registry/auth/token
github.com/docker/distribution/metrics
github.com/docker/distribution/reference
github.com/docker/distribution/registry/api/errcode
github.com/docker/distribution/registry/api/v2
github.com/docker/distribution/registry/auth
github.com/docker/distribution/context
github.com/docker/distribution/registry/client
github.com/docker/distribution/registry/auth/htpasswd
github.com/docker/distribution/registry/auth/silly
github.com/docker/distribution
github.com/docker/distribution/reference
github.com/docker/distribution/registry/api/v2
github.com/docker/distribution/registry/auth/token
github.com/docker/distribution/registry/client
github.com/docker/distribution/registry/client/auth
github.com/docker/distribution/registry/client/auth/challenge
github.com/docker/distribution/registry/client/transport
github.com/docker/distribution/registry/storage/cache
github.com/docker/distribution/registry/storage/cache/memory
github.com/docker/distribution/digestset
github.com/docker/distribution/metrics
github.com/docker/distribution/uuid
# github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c
github.com/docker/go/canonical/json
# github.com/docker/go-connections v0.4.0
@@ -73,19 +73,19 @@ github.com/go-sql-driver/mysql
github.com/gogo/protobuf/proto
# github.com/golang/protobuf v0.0.0-20160727172617-c3cefd437628
github.com/golang/protobuf/proto
github.com/golang/protobuf/ptypes/empty
github.com/golang/protobuf/ptypes
github.com/golang/protobuf/ptypes/any
github.com/golang/protobuf/ptypes/duration
github.com/golang/protobuf/ptypes/empty
github.com/golang/protobuf/ptypes/timestamp
# github.com/google/certificate-transparency-go v1.0.10-0.20180222191210-5ab67e519c93
github.com/google/certificate-transparency-go
github.com/google/certificate-transparency-go/tls
github.com/google/certificate-transparency-go/asn1
github.com/google/certificate-transparency-go/client
github.com/google/certificate-transparency-go/client/configpb
github.com/google/certificate-transparency-go/jsonclient
github.com/google/certificate-transparency-go/tls
github.com/google/certificate-transparency-go/x509
github.com/google/certificate-transparency-go/asn1
github.com/google/certificate-transparency-go/client/configpb
github.com/google/certificate-transparency-go/x509/pkix
# github.com/gorilla/mux v1.7.0
github.com/gorilla/mux
@@ -119,8 +119,8 @@ github.com/mitchellh/mapstructure
# github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420
github.com/opencontainers/go-digest
# github.com/opencontainers/image-spec v1.0.1
github.com/opencontainers/image-spec/specs-go/v1
github.com/opencontainers/image-spec/specs-go
github.com/opencontainers/image-spec/specs-go/v1
# github.com/pkg/errors v0.8.1
github.com/pkg/errors
# github.com/pmezard/go-difflib v1.0.0
@@ -132,13 +132,13 @@ github.com/prometheus/client_golang/prometheus/promhttp
github.com/prometheus/client_model/go
# github.com/prometheus/common v0.0.0-20180110214958-89604d197083
github.com/prometheus/common/expfmt
github.com/prometheus/common/model
github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
github.com/prometheus/common/model
# github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7
github.com/prometheus/procfs
github.com/prometheus/procfs/internal/util
github.com/prometheus/procfs/nfs
github.com/prometheus/procfs/xfs
github.com/prometheus/procfs/internal/util
# github.com/sirupsen/logrus v1.4.1
github.com/sirupsen/logrus
# github.com/spf13/cast v0.0.0-20150508191742-4d07383ffe94
@@ -152,45 +152,45 @@ github.com/spf13/pflag
# github.com/spf13/viper v0.0.0-20150530192845-be5ff3e4840c
github.com/spf13/viper
# github.com/stretchr/testify v1.4.0
github.com/stretchr/testify/require
github.com/stretchr/testify/assert
github.com/stretchr/testify/require
# golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c
golang.org/x/crypto/ssh/terminal
golang.org/x/crypto/ed25519
golang.org/x/crypto/pbkdf2
golang.org/x/crypto/bcrypt
golang.org/x/crypto/ed25519/internal/edwards25519
golang.org/x/crypto/blowfish
golang.org/x/crypto/cryptobyte
golang.org/x/crypto/cryptobyte/asn1
golang.org/x/crypto/ed25519
golang.org/x/crypto/ed25519/internal/edwards25519
golang.org/x/crypto/ocsp
golang.org/x/crypto/pbkdf2
golang.org/x/crypto/pkcs12
golang.org/x/crypto/pkcs12/internal/rc2
golang.org/x/crypto/cryptobyte
golang.org/x/crypto/cryptobyte/asn1
golang.org/x/crypto/ssh/terminal
# golang.org/x/net v0.0.0-20160726221601-6a513affb38d
golang.org/x/net/context
golang.org/x/net/context/ctxhttp
golang.org/x/net/http2
golang.org/x/net/trace
golang.org/x/net/http2/hpack
golang.org/x/net/lex/httplex
golang.org/x/net/internal/timeseries
golang.org/x/net/context/ctxhttp
golang.org/x/net/lex/httplex
golang.org/x/net/trace
# golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a
golang.org/x/sys/unix
golang.org/x/sys/windows
# google.golang.org/grpc v1.0.5
google.golang.org/grpc
google.golang.org/grpc/codes
google.golang.org/grpc/credentials
google.golang.org/grpc/grpclog
google.golang.org/grpc/health
google.golang.org/grpc/health/grpc_health_v1
google.golang.org/grpc/codes
google.golang.org/grpc/grpclog
google.golang.org/grpc/internal
google.golang.org/grpc/metadata
google.golang.org/grpc/naming
google.golang.org/grpc/peer
google.golang.org/grpc/stats
google.golang.org/grpc/tap
google.golang.org/grpc/transport
google.golang.org/grpc/peer
# gopkg.in/fatih/pool.v2 v2.0.0-20150325163252-cba550ebf9bc
gopkg.in/fatih/pool.v2
# gopkg.in/gorethink/gorethink.v3 v3.0.5