From 01d5e30195cbdd3df37297354fe22ce4e9583971 Mon Sep 17 00:00:00 2001 From: Warnar Boekkooi Date: Fri, 31 Jan 2020 10:23:14 +0100 Subject: [PATCH] Update to Golang 1.13 Update to using goland 1.13 with go modules. This also updates the deps to there latest version which should fix some issue we have with the latest MySQL version. --- .travis.yml | 2 +- Gopkg.lock | 386 ---------------------------------------------------- Gopkg.toml | 61 --------- Makefile | 3 +- go.mod | 36 +++++ 5 files changed, 38 insertions(+), 450 deletions(-) delete mode 100644 Gopkg.lock delete mode 100644 Gopkg.toml create mode 100644 go.mod diff --git a/.travis.yml b/.travis.yml index 4e94050..620bdd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: required language: go go: - - 1.x + - 1.13.x cache: directories: diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index 1e10198..0000000 --- a/Gopkg.lock +++ /dev/null @@ -1,386 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - digest = "1:289dd4d7abfb3ad2b5f728fbe9b1d5c1bf7d265a3eb9ef92869af1f7baba4c7a" - name = "github.com/BurntSushi/toml" - packages = ["."] - pruneopts = "" - revision = "b26d9c308763d68093482582cea63d69be07a0f0" - version = "v0.3.0" - -[[projects]] - digest = "1:b856d8248663c39265a764561c1a1a149783f6cc815feb54a1f3a591b91f6eca" - name = "github.com/Masterminds/semver" - packages = ["."] - pruneopts = "" - revision = "c7af12943936e8c39859482e61f0574c2fd7fc75" - version = "v1.4.2" - -[[projects]] - digest = "1:015ef9a11d36760d2075aa92839fd545cde0ef2ffe13ddaf849f2270eb292f1c" - name = "github.com/Masterminds/squirrel" - packages = ["."] - pruneopts = "" - revision = "a6b93000bd219143c56c16e6cb1c4b91da3f224b" - version = "v1.0" - -[[projects]] - branch = "master" - digest = "1:6b95ea5a928720ac348743d956d1e44a00800f1ab9ce0ecd6ed1833ba44c3413" - name = "github.com/corpix/uarand" - packages = ["."] - pruneopts = "" - revision = "2b8494104d86337cdd41d0a49cbed8e4583c0ab4" - -[[projects]] - digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b" - name = "github.com/davecgh/go-spew" - packages = ["spew"] - pruneopts = "" - revision = "346938d642f2ec3594ed81d874461961cd0faa76" - version = "v1.1.0" - -[[projects]] - digest = "1:9f1e571696860f2b4f8a241b43ce91c6085e7aaed849ccca53f590a4dc7b95bd" - name = "github.com/fsnotify/fsnotify" - packages = ["."] - pruneopts = "" - revision = "629574ca2a5df945712d3079857300b5e4da0236" - version = "v1.4.2" - -[[projects]] - digest = "1:24f8932912fd9331367d38715bb74be889dc2f94d401109c3aa3db8b3aa246c5" - name = "github.com/go-sql-driver/mysql" - packages = ["."] - pruneopts = "" - revision = "a0583e0143b1624142adab07e0e97fe106d99561" - version = "v1.3" - -[[projects]] - branch = "master" - digest = "1:3b760d3b93f994df8eb1d9ebfad17d3e9e37edcb7f7efaa15b427c0d7a64f4e4" - name = "github.com/golang/protobuf" - packages = ["proto"] - pruneopts = "" - revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845" - -[[projects]] - branch = "master" - digest = "1:147d671753effde6d3bcd58fc74c1d67d740196c84c280c762a5417319499972" - name = "github.com/hashicorp/hcl" - packages = [ - ".", - "hcl/ast", - "hcl/parser", - "hcl/scanner", - "hcl/strconv", - "hcl/token", - "json/parser", - "json/scanner", - "json/token", - ] - pruneopts = "" - revision = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8" - -[[projects]] - digest = "1:dbd4c71ec9d7f80fd181096692a5fdb807e972dfbe17d4ee8f23a023f3b7c3a4" - name = "github.com/hellofresh/updater-go" - packages = ["."] - pruneopts = "" - revision = "87b5934593844742d12100d72ac9ffc97356b7bd" - version = "v1.0.1" - -[[projects]] - branch = "master" - digest = "1:2b7428644b071ea038669e78b6c0dcf6b6004bfbb0abdd2bf01bece43e68a101" - name = "github.com/icrowley/fake" - packages = ["."] - pruneopts = "" - revision = "e64cc2cf92049a299f359734c6ea76073f2a8b2c" - -[[projects]] - digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" - name = "github.com/inconshreveable/mousetrap" - packages = ["."] - pruneopts = "" - revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" - version = "v1.0" - -[[projects]] - branch = "master" - digest = "1:7b1b752700b4889f6184e871b1fe02e6acbd69e21282d95143c9e1c90f71436d" - name = "github.com/lann/builder" - packages = ["."] - pruneopts = "" - revision = "f22ce00fd9394014049dad11c244859432bd6820" - -[[projects]] - branch = "master" - digest = "1:bfb195bbfe4edff0d8a078dd59d7567aae6f3c0d1a2cdf855fdcdd23c9b3bd8d" - name = "github.com/lann/ps" - packages = ["."] - pruneopts = "" - revision = "62de8c46ede02a7675c4c79c84883eb164cb71e3" - -[[projects]] - branch = "master" - digest = "1:3b5167b89f2203a949b71e29783418a0532531238ad36eb8610ec12e9c7b997f" - name = "github.com/lib/pq" - packages = [ - ".", - "oid", - ] - pruneopts = "" - revision = "83612a56d3dd153a94a629cd64925371c9adad78" - -[[projects]] - digest = "1:739b2038a38cebb50e922d18f4b042c042256320fea2db094814aeef8891e0c1" - name = "github.com/magiconair/properties" - packages = ["."] - pruneopts = "" - revision = "d419a98cdbed11a922bf76f257b7c4be79b50e73" - version = "v1.7.4" - -[[projects]] - branch = "master" - digest = "1:30a2adc78c422ebd23aac9cfece529954d5eacf9ddbe37345f2a17439f8fa849" - name = "github.com/mitchellh/mapstructure" - packages = ["."] - pruneopts = "" - revision = "06020f85339e21b2478f756a78e295255ffa4d6a" - -[[projects]] - branch = "master" - digest = "1:07723953d9e67ab619aec3f01dac3865cff27606cf828b51a44a8b568a4a44d7" - name = "github.com/palantir/stacktrace" - packages = [ - ".", - "cleanpath", - ] - pruneopts = "" - revision = "78658fd2d1772b755720ed8c44367d11ee5380d6" - -[[projects]] - digest = "1:9c740db1f7015dffa093aa5c70862d277fe49f5e92b56ca5d0d69ef0e37c01db" - name = "github.com/pelletier/go-toml" - packages = ["."] - pruneopts = "" - revision = "16398bac157da96aa88f98a2df640c7f32af1da2" - version = "v1.0.1" - -[[projects]] - digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca" - name = "github.com/pkg/errors" - packages = ["."] - pruneopts = "" - revision = "645ef00459ed84a119197bfb8d8205042c6df63d" - version = "v0.8.0" - -[[projects]] - digest = "1:256484dbbcd271f9ecebc6795b2df8cad4c458dd0f5fd82a8c2fa0c29f233411" - name = "github.com/pmezard/go-difflib" - packages = ["difflib"] - pruneopts = "" - revision = "792786c7400a136282c1664665ae0a8db921c6c2" - version = "v1.0.0" - -[[projects]] - branch = "master" - digest = "1:919d90554080947399699ff6b35b853a88b89228a45b0ce58ccf986519af86a2" - name = "github.com/shurcooL/githubv4" - packages = ["."] - pruneopts = "" - revision = "19298c78142b5fe80c2cdaa2091bc51cbc3a94fc" - -[[projects]] - branch = "master" - digest = "1:1d26fc4e0e5580c475c402aa8626c9248d7c48f860c63380283fdca488e9771a" - name = "github.com/shurcooL/go" - packages = ["ctxhttp"] - pruneopts = "" - revision = "9e1955d9fb6e1ee2345ba1f5e71669263e719e27" - -[[projects]] - branch = "master" - digest = "1:4e112cfd83d392e2712097f1d864950d9cb4c94ef88536b82b8ab25fac9d686c" - name = "github.com/shurcooL/graphql" - packages = [ - ".", - "ident", - "internal/jsonutil", - ] - pruneopts = "" - revision = "62c9ce094e75302d560f7adcdf16c06d05aaa958" - -[[projects]] - digest = "1:42a42c4bc67bed17f40fddf0f24d4403e25e7b96488456cf4248e6d16659d370" - name = "github.com/sirupsen/logrus" - packages = ["."] - pruneopts = "" - revision = "d682213848ed68c0a260ca37d6dd5ace8423f5ba" - version = "v1.0.4" - -[[projects]] - digest = "1:d1c1e5f4064b332bd90bba7bc2ab403c0afd7b36d34b7875877a45c78d24f5c1" - name = "github.com/spf13/afero" - packages = [ - ".", - "mem", - ] - pruneopts = "" - revision = "8d919cbe7e2627e417f3e45c3c0e489a5b7e2536" - version = "v1.0.0" - -[[projects]] - digest = "1:6ff9b74bfea2625f805edec59395dc37e4a06458dd3c14e3372337e3d35a2ed6" - name = "github.com/spf13/cast" - packages = ["."] - pruneopts = "" - revision = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4" - version = "v1.1.0" - -[[projects]] - digest = "1:2208a80fc3259291e43b30f42f844d18f4218036dff510f42c653ec9890d460a" - name = "github.com/spf13/cobra" - packages = ["."] - pruneopts = "" - revision = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b" - version = "v0.0.1" - -[[projects]] - branch = "master" - digest = "1:5cb42b990db5dc48b8bc23b6ee77b260713ba3244ca495cd1ed89533dc482a49" - name = "github.com/spf13/jwalterweatherman" - packages = ["."] - pruneopts = "" - revision = "12bd96e66386c1960ab0f74ced1362f66f552f7b" - -[[projects]] - digest = "1:261bc565833ef4f02121450d74eb88d5ae4bd74bfe5d0e862cddb8550ec35000" - name = "github.com/spf13/pflag" - packages = ["."] - pruneopts = "" - revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66" - version = "v1.0.0" - -[[projects]] - digest = "1:59354ad53dfe6ed1b941844cb029cd37c0377598eec3a0d49c03aee2375ef9c4" - name = "github.com/spf13/viper" - packages = ["."] - pruneopts = "" - revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7" - version = "v1.0.0" - -[[projects]] - digest = "1:3926a4ec9a4ff1a072458451aa2d9b98acd059a45b38f7335d31e06c3d6a0159" - name = "github.com/stretchr/testify" - packages = [ - "assert", - "require", - "suite", - ] - pruneopts = "" - revision = "69483b4bd14f5845b5a1e55bca19e954e827f1d0" - version = "v1.1.4" - -[[projects]] - branch = "master" - digest = "1:67b12f6fa6976db5167fccd7c79a0d3bd90d804211258887214207658aa904ac" - name = "golang.org/x/crypto" - packages = ["ssh/terminal"] - pruneopts = "" - revision = "d585fd2cc9195196078f516b69daff6744ef5e84" - -[[projects]] - branch = "master" - digest = "1:a9afbcb2b5dacde3889b77124be6abe68477a09c6da3df224cc74f5e180454e6" - name = "golang.org/x/net" - packages = [ - "context", - "context/ctxhttp", - ] - pruneopts = "" - revision = "d866cfc389cec985d6fda2859936a575a55a3ab6" - -[[projects]] - branch = "master" - digest = "1:1dadd2222ba990ba420d7c5a60375f9ff176ad3051199631eb95d61aa2b51288" - name = "golang.org/x/oauth2" - packages = [ - ".", - "internal", - ] - pruneopts = "" - revision = "0448841f0cbe9d174c6c1cedd177f583337b8e2c" - -[[projects]] - branch = "master" - digest = "1:134679482ac3fd5ecd60c1412510d52272e29e1085bf2dd2d7e79e2d1d38acc0" - name = "golang.org/x/sys" - packages = [ - "unix", - "windows", - ] - pruneopts = "" - revision = "83801418e1b59fb1880e363299581ee543af32ca" - -[[projects]] - branch = "master" - digest = "1:3b8b5047751bce517d1888063cf2f0acd91c31273c290946079c513ce78e3013" - name = "golang.org/x/text" - packages = [ - "internal/gen", - "internal/triegen", - "internal/ucd", - "transform", - "unicode/cldr", - "unicode/norm", - ] - pruneopts = "" - revision = "eb22672bea55af56d225d4e35405f4d2e9f062a0" - -[[projects]] - digest = "1:934fb8966f303ede63aa405e2c8d7f0a427a05ea8df335dfdc1833dd4d40756f" - name = "google.golang.org/appengine" - packages = [ - "internal", - "internal/base", - "internal/datastore", - "internal/log", - "internal/remote_api", - "internal/urlfetch", - "urlfetch", - ] - pruneopts = "" - revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a" - version = "v1.0.0" - -[[projects]] - branch = "v2" - digest = "1:f769ed60e075e4221612c2f4162fccc9d3795ef358fa463425e3b3d7a5debb27" - name = "gopkg.in/yaml.v2" - packages = ["."] - pruneopts = "" - revision = "287cf08546ab5e7e37d55a84f7ed3fd1db036de5" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/BurntSushi/toml", - "github.com/Masterminds/squirrel", - "github.com/go-sql-driver/mysql", - "github.com/hellofresh/updater-go", - "github.com/icrowley/fake", - "github.com/lib/pq", - "github.com/pkg/errors", - "github.com/sirupsen/logrus", - "github.com/spf13/cobra", - "github.com/spf13/viper", - "github.com/stretchr/testify/assert", - "github.com/stretchr/testify/require", - "github.com/stretchr/testify/suite", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index 64894fa..0000000 --- a/Gopkg.toml +++ /dev/null @@ -1,61 +0,0 @@ - -# Gopkg.toml example -# -# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md -# for detailed Gopkg.toml documentation. -# -# required = ["github.com/user/thing/cmd/thing"] -# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# -# [[constraint]] -# name = "github.com/user/project" -# version = "1.0.0" -# -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" -# -# [[override]] -# name = "github.com/x/y" -# version = "2.4.0" - -[[constraint]] - name = "github.com/go-sql-driver/mysql" - version = "1.3.0" - -[[constraint]] - branch = "master" - name = "github.com/lib/pq" - -[[constraint]] - branch = "master" - name = "github.com/icrowley/fake" - -[[constraint]] - name = "github.com/hellofresh/updater-go" - version = "1.0.1" - -[[constraint]] - name = "github.com/pkg/errors" - version = "0.8.0" - -[[constraint]] - name = "github.com/sirupsen/logrus" - version = "1.0.4" - -[[constraint]] - name = "github.com/spf13/cobra" - version = "0.0.1" - -[[constraint]] - name = "github.com/spf13/viper" - version = "1.0.0" - -[[constraint]] - name = "github.com/stretchr/testify" - version = "1.1.4" - -[[constraint]] - name = "github.com/Masterminds/squirrel" - version = "1.0.0" diff --git a/Makefile b/Makefile index 14bcdf3..fa56992 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,7 @@ all: clean deps build deps: @echo "$(OK_COLOR)==> Installing dependencies$(NO_COLOR)" @go get github.com/goreleaser/goreleaser - @go get -u github.com/golang/dep/cmd/dep - @dep ensure + @go mod vendor # Builds the project build: diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..d4dd37f --- /dev/null +++ b/go.mod @@ -0,0 +1,36 @@ +module github.com/hellofresh/klepto + +go 1.13 + +require ( + github.com/BurntSushi/toml v0.3.1 + github.com/Masterminds/semver v1.5.0 // indirect + github.com/Masterminds/squirrel v1.2.0 + github.com/corpix/uarand v0.1.1 // indirect + github.com/go-sql-driver/mysql v1.5.0 + github.com/golang/protobuf v1.3.3 // indirect + github.com/hellofresh/updater-go v1.0.1 + github.com/icrowley/fake v0.0.0-20180203215853-4178557ae428 + github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect + github.com/lib/pq v1.3.0 + github.com/palantir/stacktrace v0.0.0-20161112013806-78658fd2d177 + github.com/pelletier/go-toml v1.6.0 // indirect + github.com/pkg/errors v0.9.1 + github.com/shurcooL/githubv4 v0.0.0-20191127044304-8f68eb5628d0 // indirect + github.com/shurcooL/go v0.0.0-20191216061654-b114cc39af9f // indirect + github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect + github.com/sirupsen/logrus v1.4.2 + github.com/spf13/afero v1.2.2 // indirect + github.com/spf13/cast v1.3.1 // indirect + github.com/spf13/cobra v0.0.5 + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/spf13/viper v1.6.2 + github.com/stretchr/testify v1.4.0 + golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa // indirect + golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect + golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9 // indirect + google.golang.org/appengine v1.6.5 // indirect + gopkg.in/ini.v1 v1.51.1 // indirect + gopkg.in/yaml.v2 v2.2.8 // indirect +)