diff --git a/HyperMake b/HyperMake index d8d0fd0..8222f2a 100644 --- a/HyperMake +++ b/HyperMake @@ -15,9 +15,15 @@ targets: description: placeholder for additional toolchain dependencies deps: - description: setup dependencies + description: download dependencies to local cache after: - - 'deps-*' + - toolchain + watches: + - go.mod + cmds: + - export GO111MODULE=on + - go mod download + - go mod vendor gen: description: generate source code @@ -82,16 +88,6 @@ targets: - lint - scanast - deps-kcl: - description: populate vendor packages - after: - - toolchain - watches: - - vendor/manifest - workdir: . - cmds: - - gvt restore - settings: default-targets: - ci diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..3dc4633 --- /dev/null +++ b/go.mod @@ -0,0 +1,25 @@ +module github.com/vmware/vmware-go-kcl + +require ( + github.com/asaskevich/govalidator v0.0.0-20170507183629-38ddb4612a5d // indirect + github.com/astaxie/beego v0.0.0-20170908222938-a7354d2d0840 // indirect + github.com/aws/aws-sdk-go v0.0.0-20171208220907-365b4d343694 + github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/go-ini/ini v1.42.0 // indirect + github.com/golang/protobuf v0.0.0-20170622202551-6a1fa9404c0a // indirect + github.com/google/uuid v0.0.0-20170306145142-6a5e28554805 + github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect + github.com/matryer/try v0.0.0-20150601225556-312d2599e12e + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_golang v0.0.0-20170707173355-26b897001974 + github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612 // indirect + github.com/prometheus/common v0.0.0-20170707053319-3e6a7635bac6 + github.com/prometheus/procfs v0.0.0-20170703101242-e645f4e5aaa8 // indirect + github.com/sirupsen/logrus v0.0.0-20170713115724-51dc0fc64317 + github.com/stretchr/testify v1.2.1 + golang.org/x/sys v0.0.0-20190221222158-ec7b60b042fd // indirect + gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect + gopkg.in/yaml.v2 v2.2.1 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..de8b73f --- /dev/null +++ b/go.sum @@ -0,0 +1,39 @@ +github.com/asaskevich/govalidator v0.0.0-20170507183629-38ddb4612a5d/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/astaxie/beego v0.0.0-20170908222938-a7354d2d0840/go.mod h1:0R4++1tUqERR0WYFWdfkcrsyoVBCG4DgpDGokT3yb+U= +github.com/aws/aws-sdk-go v0.0.0-20171208220907-365b4d343694 h1:TXabFUZYb1oIrmshTCd9k3gLItnCkX8DYNlzC7zT5y4= +github.com/aws/aws-sdk-go v0.0.0-20171208220907-365b4d343694/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k= +github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a h1:BtpsbiV638WQZwhA98cEZw2BsbnQJrbd0BI7tsy0W1c= +github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/go-ini/ini v1.42.0 h1:TWr1wGj35+UiWHlBA8er89seFXxzwFn11spilrrj+38= +github.com/go-ini/ini v1.42.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= +github.com/golang/protobuf v0.0.0-20170622202551-6a1fa9404c0a h1:5X905hYB5maQbwC9ltdknryvCPb4v+D0pWDQXaYQWyk= +github.com/golang/protobuf v0.0.0-20170622202551-6a1fa9404c0a/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/uuid v0.0.0-20170306145142-6a5e28554805 h1:skl44gU1qEIcRpwKjb9bhlRwjvr96wLdvpTogCBBJe8= +github.com/google/uuid v0.0.0-20170306145142-6a5e28554805/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/matryer/try v0.0.0-20150601225556-312d2599e12e h1:wEdOROHcWFFOttvgtwOkyRx5AXGm6GKYZV46vUk7RWY= +github.com/matryer/try v0.0.0-20150601225556-312d2599e12e/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs= +github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.0.0-20170707173355-26b897001974 h1:7geXN+A5WSloMJfKwHhigBJCSPW0DZOlypTpzg7Nu40= +github.com/prometheus/client_golang v0.0.0-20170707173355-26b897001974/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612 h1:13pIdM2tpaDi4OVe24fgoIS7ZTqMt0QI+bwQsX5hq+g= +github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/common v0.0.0-20170707053319-3e6a7635bac6 h1:UEgo247BhzA25ik6y8sBtRVet8xyPH5+UidPXC+E4t0= +github.com/prometheus/common v0.0.0-20170707053319-3e6a7635bac6/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/procfs v0.0.0-20170703101242-e645f4e5aaa8 h1:Kh7M6mzRpQ2de1rixoSQZr4BTINXFm8WDbeN5ttnwyE= +github.com/prometheus/procfs v0.0.0-20170703101242-e645f4e5aaa8/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/sirupsen/logrus v0.0.0-20170713115724-51dc0fc64317 h1:GpeXjjFK3fgyG/1Dd5felinm3v0XRZKO4cUtMcHGL08= +github.com/sirupsen/logrus v0.0.0-20170713115724-51dc0fc64317/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= +github.com/stretchr/testify v1.2.1 h1:52QO5WkIUcHGIR7EnGagH88x1bUzqGXTC5/1bDTUQ7U= +github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +golang.org/x/sys v0.0.0-20190221222158-ec7b60b042fd h1:JYgmSAJhrvxjUInD1uG+wLPAFAG7TmIJLOgZLI210A8= +golang.org/x/sys v0.0.0-20190221222158-ec7b60b042fd/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/support/toolchain/HyperMake b/support/toolchain/HyperMake index 40e36e7..e02ea28 100644 --- a/support/toolchain/HyperMake +++ b/support/toolchain/HyperMake @@ -25,4 +25,4 @@ settings: default-targets: - rebuild-toolchain docker: - image: 'vmware/go-kcl-toolchain:0.1.0' + image: 'vmware/go-kcl-toolchain:0.1.1' diff --git a/support/toolchain/docker/Dockerfile b/support/toolchain/docker/Dockerfile index 5c36811..eefbe9f 100644 --- a/support/toolchain/docker/Dockerfile +++ b/support/toolchain/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.10 +FROM golang:1.11 ENV PATH /go/bin:/src/bin:/root/go/bin:/usr/local/go/bin:$PATH ENV GOPATH /go:/src RUN go get -v github.com/alecthomas/gometalinter && \ diff --git a/vendor/manifest b/vendor/manifest deleted file mode 100644 index 1b8ad4e..0000000 --- a/vendor/manifest +++ /dev/null @@ -1,167 +0,0 @@ -{ - "version": 0, - "dependencies": [ - { - "importpath": "github.com/aws/aws-sdk-go", - "repository": "https://github.com/aws/aws-sdk-go", - "vcs": "git", - "revision": "365b4d34369496e650e3056b33fce4e1a25cfc72", - "branch": "master", - "notests": true - }, - { - "importpath": "github.com/asaskevich/govalidator", - "repository": "https://github.com/asaskevich/govalidator", - "vcs": "git", - "revision": "38ddb4612a5dfc2878731749ee825853d9f0aaa1", - "branch": "master", - "notests": true - }, - { - "importpath": "github.com/sirupsen/logrus", - "repository": "https://github.com/sirupsen/logrus", - "vcs": "git", - "revision": "51dc0fc64317a2861273909081f9c315786533eb", - "branch": "master", - "notests": true - }, - { - "importpath": "github.com/beorn7/perks/quantile", - "repository": "https://github.com/beorn7/perks", - "vcs": "git", - "revision": "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9", - "branch": "master", - "path": "/quantile", - "notests": true - }, - { - "importpath": "gopkg.in/gemnasium/logrus-airbrake-hook.v2", - "repository": "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2", - "vcs": "git", - "revision": "e928b033a891c0175fb643d5aa0779e86325eb12", - "branch": "master", - "notests": true - }, - { - "importpath": "github.com/matttproud/golang_protobuf_extensions/pbutil", - "repository": "https://github.com/matttproud/golang_protobuf_extensions", - "vcs": "git", - "revision": "c12348ce28de40eed0136aa2b644d0ee0650e56c", - "branch": "master", - "path": "/pbutil", - "notests": true - }, - { - "importpath": "github.com/prometheus/client_golang/prometheus", - "repository": "https://github.com/prometheus/client_golang", - "vcs": "git", - "revision": "26b897001974f2b4ee6688377873e4d6f61d533c", - "branch": "master", - "path": "prometheus", - "notests": true - }, - { - "importpath": "github.com/prometheus/client_model/go", - "repository": "https://github.com/prometheus/client_model", - "vcs": "git", - "revision": "6f3806018612930941127f2a7c6c453ba2c527d2", - "branch": "master", - "path": "/go", - "notests": true - }, - { - "importpath": "github.com/prometheus/common/expfmt", - "repository": "https://github.com/prometheus/common", - "vcs": "git", - "revision": "3e6a7635bac6573d43f49f97b47eb9bda195dba8", - "branch": "master", - "path": "/expfmt", - "notests": true - }, - { - "importpath": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg", - "repository": "https://github.com/prometheus/common", - "vcs": "git", - "revision": "3e6a7635bac6573d43f49f97b47eb9bda195dba8", - "branch": "master", - "path": "internal/bitbucket.org/ww/goautoneg", - "notests": true - }, - { - "importpath": "github.com/prometheus/common/model", - "repository": "https://github.com/prometheus/common", - "vcs": "git", - "revision": "3e6a7635bac6573d43f49f97b47eb9bda195dba8", - "branch": "master", - "path": "model", - "notests": true - }, - { - "importpath": "github.com/astaxie/beego/cache", - "repository": "https://github.com/astaxie/beego", - "vcs": "git", - "revision": "a7354d2d084003e4122d6e69f7e5ab594fd117b2", - "branch": "master", - "path": "cache", - "notests": true - }, - { - "importpath": "github.com/prometheus/procfs", - "repository": "https://github.com/prometheus/procfs", - "vcs": "git", - "revision": "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2", - "branch": "master", - "notests": true - }, - { - "importpath": "github.com/golang/protobuf/proto", - "repository": "https://github.com/golang/protobuf", - "vcs": "git", - "revision": "6a1fa9404c0aebf36c879bc50152edcc953910d2", - "branch": "master", - "path": "/proto", - "notests": true - }, - { - "importpath": "github.com/golang/protobuf/ptypes/any", - "repository": "https://github.com/golang/protobuf", - "vcs": "git", - "revision": "6a1fa9404c0aebf36c879bc50152edcc953910d2", - "branch": "master", - "path": "ptypes/any", - "notests": true - }, - { - "importpath": "github.com/google/uuid", - "repository": "https://github.com/google/uuid", - "vcs": "git", - "revision": "6a5e28554805e78ea6141142aba763936c4761c0", - "branch": "master", - "notests": true - }, - { - "importpath": "github.com/matryer/try", - "repository": "https://github.com/matryer/try", - "vcs": "git", - "revision": "312d2599e12e89ca89b52a09597394f449235d80", - "branch": "master", - "notests": true - }, - { - "importpath": "github.com/stretchr/testify", - "repository": "https://github.com/stretchr/testify", - "vcs": "git", - "revision": "12b6f73e6084dad08a7c6e575284b177ecafbc71", - "branch": "master", - "notests": true - }, - { - "importpath": "gopkg.in/yaml.v2", - "repository": "https://gopkg.in/yaml.v2", - "vcs": "git", - "revision": "5420a8b6744d3b0345ab293f6fcba19c978f1183", - "branch": "v2", - "notests": true - } - ] -}