Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

Commit

Permalink
fix: update yaml.v2 and golangci-lint for go 1.14 compatibility (#2824)
Browse files Browse the repository at this point in the history
  • Loading branch information
mboersma authored Mar 4, 2020
1 parent 7b50da7 commit e5c9dc7
Show file tree
Hide file tree
Showing 4 changed files with 96 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/Azure/aks-engine

go 1.12
go 1.14

require (
github.com/Azure/azure-sdk-for-go v36.2.0+incompatible
Expand Down
2 changes: 1 addition & 1 deletion hack/tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ $(LOCALBIN)/ginkgo:
GOBIN=$(LOCALBIN) $(GO) get github.com/onsi/ginkgo/ginkgo/...@v1.10.1

$(LOCALBIN)/golangci-lint:
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(LOCALBIN) v1.21.0
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(LOCALBIN) v1.23.7

$(LOCALBIN)/pub:
GOBIN=$(LOCALBIN) $(GO) get github.com/devigned/pub/...@v0.2.0
Expand Down
28 changes: 28 additions & 0 deletions vendor/gopkg.in/yaml.v2/encode.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 66 additions & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# github.com/Azure/azure-sdk-for-go v36.2.0+incompatible
## explicit
github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2017-03-01/apimanagement
github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization
github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2017-03-30/compute
Expand All @@ -20,66 +21,88 @@ github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2018-02-01/storage
github.com/Azure/azure-sdk-for-go/storage
github.com/Azure/azure-sdk-for-go/version
# github.com/Azure/go-autorest/autorest v0.9.2
## explicit
github.com/Azure/go-autorest/autorest
github.com/Azure/go-autorest/autorest/azure
# github.com/Azure/go-autorest/autorest/adal v0.8.0
## explicit
github.com/Azure/go-autorest/autorest/adal
# github.com/Azure/go-autorest/autorest/azure/cli v0.3.0
## explicit
github.com/Azure/go-autorest/autorest/azure/cli
# github.com/Azure/go-autorest/autorest/date v0.2.0
## explicit
github.com/Azure/go-autorest/autorest/date
# github.com/Azure/go-autorest/autorest/to v0.3.0
## explicit
github.com/Azure/go-autorest/autorest/to
# github.com/Azure/go-autorest/autorest/validation v0.2.0
## explicit
github.com/Azure/go-autorest/autorest/validation
# github.com/Azure/go-autorest/logger v0.1.0
github.com/Azure/go-autorest/logger
# github.com/Azure/go-autorest/tracing v0.5.0
github.com/Azure/go-autorest/tracing
# github.com/Jeffail/gabs v1.1.1
## explicit
github.com/Jeffail/gabs
# github.com/blang/semver v3.5.1+incompatible
## explicit
github.com/blang/semver
# github.com/davecgh/go-spew v1.1.1
## explicit
github.com/davecgh/go-spew/spew
# github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/dgrijalva/jwt-go
# github.com/dimchansky/utfbom v1.1.0
github.com/dimchansky/utfbom
# github.com/dnaeon/go-vcr v1.0.1
## explicit
# github.com/fatih/structs v1.1.0
## explicit
github.com/fatih/structs
# github.com/ghodss/yaml v1.0.0
## explicit
github.com/ghodss/yaml
# github.com/go-playground/locales v0.12.1
## explicit
github.com/go-playground/locales
github.com/go-playground/locales/currency
# github.com/go-playground/universal-translator v0.16.0
## explicit
github.com/go-playground/universal-translator
# github.com/gogo/protobuf v1.2.0
## explicit
github.com/gogo/protobuf/proto
github.com/gogo/protobuf/sortkeys
# github.com/golang/protobuf v1.3.1
## explicit
github.com/golang/protobuf/proto
github.com/golang/protobuf/ptypes
github.com/golang/protobuf/ptypes/any
github.com/golang/protobuf/ptypes/duration
github.com/golang/protobuf/ptypes/timestamp
# github.com/google/btree v1.0.0
## explicit
github.com/google/btree
# github.com/google/go-cmp v0.2.0
## explicit
github.com/google/go-cmp/cmp
github.com/google/go-cmp/cmp/internal/diff
github.com/google/go-cmp/cmp/internal/function
github.com/google/go-cmp/cmp/internal/value
# github.com/google/gofuzz v1.0.0
github.com/google/gofuzz
# github.com/google/uuid v1.1.1
## explicit
github.com/google/uuid
# github.com/googleapis/gnostic v0.2.0
## explicit
github.com/googleapis/gnostic/OpenAPIv2
github.com/googleapis/gnostic/compiler
github.com/googleapis/gnostic/extensions
# github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc
## explicit
github.com/gregjones/httpcache
github.com/gregjones/httpcache/diskcache
# github.com/hpcloud/tail v1.0.0
Expand All @@ -89,33 +112,47 @@ github.com/hpcloud/tail/util
github.com/hpcloud/tail/watch
github.com/hpcloud/tail/winfile
# github.com/imdario/mergo v0.3.6
## explicit
github.com/imdario/mergo
# github.com/inconshreveable/mousetrap v1.0.0
## explicit
github.com/inconshreveable/mousetrap
# github.com/jarcoal/httpmock v1.0.1
## explicit
github.com/jarcoal/httpmock
# github.com/json-iterator/go v1.1.7
## explicit
github.com/json-iterator/go
# github.com/konsorten/go-windows-terminal-sequences v1.0.1
github.com/konsorten/go-windows-terminal-sequences
# github.com/kr/pretty v0.1.0
## explicit
# github.com/leodido/go-urn v1.1.0
## explicit
github.com/leodido/go-urn
# github.com/leonelquinteros/gotext v1.4.0
## explicit
github.com/leonelquinteros/gotext
github.com/leonelquinteros/gotext/plurals
# github.com/mattn/go-colorable v0.0.9
## explicit
github.com/mattn/go-colorable
# github.com/mattn/go-isatty v0.0.10
## explicit
github.com/mattn/go-isatty
# github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
## explicit
github.com/mgutz/ansi
# github.com/mitchellh/go-homedir v1.1.0
## explicit
github.com/mitchellh/go-homedir
# github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421
github.com/modern-go/concurrent
# github.com/modern-go/reflect2 v1.0.1
## explicit
github.com/modern-go/reflect2
# github.com/onsi/ginkgo v1.10.3
## explicit
github.com/onsi/ginkgo
github.com/onsi/ginkgo/config
github.com/onsi/ginkgo/internal/codelocation
Expand All @@ -135,6 +172,7 @@ github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable
github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty
github.com/onsi/ginkgo/types
# github.com/onsi/gomega v1.4.3
## explicit
github.com/onsi/gomega
github.com/onsi/gomega/format
github.com/onsi/gomega/internal/assertion
Expand All @@ -148,21 +186,31 @@ github.com/onsi/gomega/matchers/support/goraph/node
github.com/onsi/gomega/matchers/support/goraph/util
github.com/onsi/gomega/types
# github.com/peterbourgon/diskv v2.0.1+incompatible
## explicit
github.com/peterbourgon/diskv
# github.com/pkg/errors v0.8.1
## explicit
github.com/pkg/errors
# github.com/satori/go.uuid v1.2.0
## explicit
github.com/satori/go.uuid
# github.com/sirupsen/logrus v1.4.1
## explicit
github.com/sirupsen/logrus
github.com/sirupsen/logrus/hooks/test
# github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337
## explicit
# github.com/spf13/cobra v0.0.3
## explicit
github.com/spf13/cobra
# github.com/spf13/pflag v1.0.3
## explicit
github.com/spf13/pflag
# github.com/x-cray/logrus-prefixed-formatter v0.5.2
## explicit
github.com/x-cray/logrus-prefixed-formatter
# golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
## explicit
golang.org/x/crypto/curve25519
golang.org/x/crypto/ed25519
golang.org/x/crypto/ed25519/internal/edwards25519
Expand All @@ -182,11 +230,14 @@ golang.org/x/net/http2
golang.org/x/net/http2/hpack
golang.org/x/net/idna
# golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
## explicit
golang.org/x/oauth2
golang.org/x/oauth2/internal
# golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4
## explicit
golang.org/x/sync/errgroup
# golang.org/x/sys v0.0.0-20191104094858-e8c54fb511f6
## explicit
golang.org/x/sys/cpu
golang.org/x/sys/unix
golang.org/x/sys/windows
Expand All @@ -210,6 +261,7 @@ golang.org/x/text/transform
golang.org/x/text/unicode/bidi
golang.org/x/text/unicode/norm
# golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0
## explicit
golang.org/x/time/rate
# google.golang.org/appengine v1.4.0
google.golang.org/appengine/internal
Expand All @@ -219,19 +271,28 @@ google.golang.org/appengine/internal/log
google.golang.org/appengine/internal/remote_api
google.golang.org/appengine/internal/urlfetch
google.golang.org/appengine/urlfetch
# gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127
## explicit
# gopkg.in/fsnotify.v1 v1.4.7
gopkg.in/fsnotify.v1
# gopkg.in/go-playground/assert.v1 v1.2.1
## explicit
# gopkg.in/go-playground/validator.v9 v9.25.0
## explicit
gopkg.in/go-playground/validator.v9
# gopkg.in/inf.v0 v0.9.1
## explicit
gopkg.in/inf.v0
# gopkg.in/ini.v1 v1.41.0
## explicit
gopkg.in/ini.v1
# gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7
gopkg.in/tomb.v1
# gopkg.in/yaml.v2 v2.2.1
# gopkg.in/yaml.v2 v2.2.2
## explicit
gopkg.in/yaml.v2
# k8s.io/api v0.0.0-20190222213804-5cb15d344471
## explicit
k8s.io/api/admissionregistration/v1alpha1
k8s.io/api/admissionregistration/v1beta1
k8s.io/api/apps/v1
Expand Down Expand Up @@ -265,6 +326,7 @@ k8s.io/api/storage/v1
k8s.io/api/storage/v1alpha1
k8s.io/api/storage/v1beta1
# k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
## explicit
k8s.io/apimachinery/pkg/api/equality
k8s.io/apimachinery/pkg/api/errors
k8s.io/apimachinery/pkg/api/meta
Expand Down Expand Up @@ -303,6 +365,7 @@ k8s.io/apimachinery/pkg/version
k8s.io/apimachinery/pkg/watch
k8s.io/apimachinery/third_party/forked/golang/reflect
# k8s.io/client-go v10.0.0+incompatible
## explicit
k8s.io/client-go/discovery
k8s.io/client-go/kubernetes
k8s.io/client-go/kubernetes/scheme
Expand Down Expand Up @@ -360,6 +423,8 @@ k8s.io/client-go/util/flowcontrol
k8s.io/client-go/util/homedir
k8s.io/client-go/util/integer
# k8s.io/klog v1.0.0
## explicit
k8s.io/klog
# sigs.k8s.io/yaml v1.1.0
## explicit
sigs.k8s.io/yaml

0 comments on commit e5c9dc7

Please sign in to comment.