diff --git a/.circleci/config.yml b/.circleci/config.yml index 1cdd0115..ec4cd32a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: test: docker: - - image: circleci/golang:1.10 + - image: circleci/golang:1.11 working_directory: /go/src/github.com/segmentio/chamber steps: - checkout @@ -13,7 +13,7 @@ jobs: dist: docker: - - image: circleci/golang:1.10 + - image: circleci/golang:1.11 working_directory: /go/src/github.com/segmentio/chamber steps: - checkout @@ -31,7 +31,7 @@ jobs: publish: docker: - - image: circleci/golang:1.10 + - image: circleci/golang:1.11 working_directory: /go/src/github.com/segmentio/chamber steps: - checkout diff --git a/Makefile b/Makefile index 4886e999..d5846d55 100644 --- a/Makefile +++ b/Makefile @@ -7,9 +7,8 @@ VERSION := $(shell git describe --tags --always --dirty="-dev") LDFLAGS := -ldflags='-X "main.Version=$(VERSION)"' -test: | govendor - govendor sync - go test -v ./... +test: + GO111MODULE=on go test -v ./... all: dist/chamber-$(VERSION)-darwin-amd64 dist/chamber-$(VERSION)-linux-amd64 @@ -19,15 +18,10 @@ clean: dist/: mkdir -p dist -dist/chamber-$(VERSION)-darwin-amd64: | govendor dist/ - govendor sync - GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build $(LDFLAGS) -o $@ +dist/chamber-$(VERSION)-darwin-amd64: | dist/ + GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 GO111MODULE=on go build $(LDFLAGS) -o $@ -dist/chamber-$(VERSION)-linux-amd64: | govendor dist/ - govendor sync - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build $(LDFLAGS) -o $@ +dist/chamber-$(VERSION)-linux-amd64: | dist/ + GOOS=linux GOARCH=amd64 CGO_ENABLED=0 GO111MODULE=on go build $(LDFLAGS) -o $@ -govendor: - go get -u github.com/kardianos/govendor - -.PHONY: clean all govendor +.PHONY: clean all diff --git a/go.mod b/go.mod new file mode 100644 index 00000000..706d1cf1 --- /dev/null +++ b/go.mod @@ -0,0 +1,12 @@ +module github.com/segmentio/chamber + +require ( + github.com/aws/aws-sdk-go v1.15.26 + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/magiconair/properties v1.8.0 + github.com/pkg/errors v0.8.0 + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/spf13/cobra v0.0.3 + github.com/spf13/pflag v1.0.2 // indirect + github.com/stretchr/testify v1.2.2 +) diff --git a/go.sum b/go.sum new file mode 100644 index 00000000..deb54aab --- /dev/null +++ b/go.sum @@ -0,0 +1,20 @@ +github.com/aws/aws-sdk-go v1.15.26 h1:p9fZ5yY1JnB3T0iLQQsLrFY70Pyfft6WcNANHtGOyYc= +github.com/aws/aws-sdk-go v1.15.26/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= +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.25.4 h1:Mujh4R/dH6YL8bxuISne3xX2+qcQ9p0IxKAP6ExWoUo= +github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= +github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 h1:12VvqtR6Aowv3l/EQUlocDHW2Cp4G9WJVH7uyH8QFJE= +github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +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/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/pflag v1.0.2 h1:Fy0orTDgHdbnzHcsOgfCN4LtHf0ec3wwtiwJqwvf3Gc= +github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= diff --git a/vendor/vendor.json b/vendor/vendor.json deleted file mode 100644 index 4e431320..00000000 --- a/vendor/vendor.json +++ /dev/null @@ -1,293 +0,0 @@ -{ - "comment": "", - "ignore": "test", - "package": [ - { - "checksumSHA1": "o4Kd5PNa6bw7/wOWWKVY7BR0gBY=", - "path": "github.com/aws/aws-sdk-go", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "Nb4M8Xc8+19Dg8GNV1WlzKGx1HQ=", - "path": "github.com/aws/aws-sdk-go/aws", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "Y9W+4GimK4Fuxq+vyIskVYFRnX4=", - "path": "github.com/aws/aws-sdk-go/aws/awserr", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "yyYr41HZ1Aq0hWc3J5ijXwYEcac=", - "path": "github.com/aws/aws-sdk-go/aws/awsutil", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "EwL79Cq6euk+EV/t/n2E+jzPNmU=", - "path": "github.com/aws/aws-sdk-go/aws/client", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "uEJU4I6dTKaraQKvrljlYKUZwoc=", - "path": "github.com/aws/aws-sdk-go/aws/client/metadata", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "vVSUnICaD9IaBQisCfw0n8zLwig=", - "path": "github.com/aws/aws-sdk-go/aws/corehandlers", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "925zPp8gtaXi2gkWrgZ1gAA003A=", - "path": "github.com/aws/aws-sdk-go/aws/credentials", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "JTilCBYWVAfhbKSnrxCNhE8IFns=", - "path": "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "NUJUTWlc1sV8b7WjfiYc4JZbXl0=", - "path": "github.com/aws/aws-sdk-go/aws/credentials/endpointcreds", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "JEYqmF83O5n5bHkupAzA6STm0no=", - "path": "github.com/aws/aws-sdk-go/aws/credentials/stscreds", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "eI5TmiOTCFjEUNvWeceFycs9dRU=", - "path": "github.com/aws/aws-sdk-go/aws/csm", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "6DRhqSAN7O45gYfRIpwDeuJE8j8=", - "path": "github.com/aws/aws-sdk-go/aws/defaults", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "uPkjJo+J10vbEukYYXmf0w7Cn4Q=", - "path": "github.com/aws/aws-sdk-go/aws/ec2metadata", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "Q1co3y5Y8rRIEjEXEfUZ9SwTmic=", - "path": "github.com/aws/aws-sdk-go/aws/endpoints", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "Ia/AZ2fZp7J4lMO6fpkvfLU/HGY=", - "path": "github.com/aws/aws-sdk-go/aws/request", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "zx1mZCdOwgbjBV3jMfb0kyDd//Q=", - "path": "github.com/aws/aws-sdk-go/aws/session", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "Dj9WOMBPbboyUJV4GB99PwPcO4g=", - "path": "github.com/aws/aws-sdk-go/aws/signer/v4", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "wjxQlU1PYxrDRFoL1Vek8Wch7jk=", - "path": "github.com/aws/aws-sdk-go/internal/sdkio", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "MYLldFRnsZh21TfCkgkXCT3maPU=", - "path": "github.com/aws/aws-sdk-go/internal/sdkrand", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "tQVg7Sz2zv+KkhbiXxPH0mh9spg=", - "path": "github.com/aws/aws-sdk-go/internal/sdkuri", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "04ypv4x12l4q0TksA1zEVsmgpvw=", - "path": "github.com/aws/aws-sdk-go/internal/shareddefaults", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "ZX5QHZb0PrK4UF45um2kaAEiX+8=", - "path": "github.com/aws/aws-sdk-go/private/protocol", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "stsUCJVnZ5yMrmzSExbjbYp5tZ8=", - "path": "github.com/aws/aws-sdk-go/private/protocol/eventstream", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "bOQjEfKXaTqe7dZhDDER/wZUzQc=", - "path": "github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "CTsp/h3FbFg9QizH4bH1abLwljg=", - "path": "github.com/aws/aws-sdk-go/private/protocol/json/jsonutil", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "R00RL5jJXRYq1iiK1+PGvMfvXyM=", - "path": "github.com/aws/aws-sdk-go/private/protocol/jsonrpc", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "SBBVYdLcocjdPzMWgDuR8vcOfDQ=", - "path": "github.com/aws/aws-sdk-go/private/protocol/query", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "+O6A945eTP9plLpkEMZB0lwBAcg=", - "path": "github.com/aws/aws-sdk-go/private/protocol/query/queryutil", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "uRvmEPKcEdv7qc0Ep2zn0E3Xumc=", - "path": "github.com/aws/aws-sdk-go/private/protocol/rest", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "ODo+ko8D6unAxZuN1jGzMcN4QCc=", - "path": "github.com/aws/aws-sdk-go/private/protocol/restxml", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "4dWtH/HkBpS7TnTf21+HOrE1zFc=", - "path": "github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "DmKatmbYsvm+MoCP01PCdQ6Y6Tk=", - "path": "github.com/aws/aws-sdk-go/service/s3", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "sEjQjy4nIGc5X07ds4TuYkkw6Ro=", - "path": "github.com/aws/aws-sdk-go/service/s3/s3iface", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "UfgmCQjT787z6llIfGM9ZHzuydM=", - "path": "github.com/aws/aws-sdk-go/service/ssm", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "BSPkU6D191lNsfFEX4u8ddbK3Ww=", - "path": "github.com/aws/aws-sdk-go/service/ssm/ssmiface", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "UhIVLDgQc19wjrPj8pP7Fu2UwWc=", - "path": "github.com/aws/aws-sdk-go/service/sts", - "revision": "ddfc3ca419279cf2f67b12719e51fe8500d0029d", - "revisionTime": "2018-07-25T21:42:05Z" - }, - { - "checksumSHA1": "jqSVRDK7dGg6E/NikVq1Kw6gdbA=", - "origin": "github.com/stretchr/testify/vendor/github.com/davecgh/go-spew/spew", - "path": "github.com/davecgh/go-spew/spew", - "revision": "9f9027faeb0dad515336ed2f28317f9f8f527ab4", - "revisionTime": "2016-01-29T19:31:06Z" - }, - { - "checksumSHA1": "VvZKmbuBN1QAG699KduTdmSPwA4=", - "origin": "github.com/aws/aws-sdk-go/vendor/github.com/go-ini/ini", - "path": "github.com/go-ini/ini", - "revision": "3bc643c63c6f8716320182b6842581d6c80572fa", - "revisionTime": "2017-03-23T00:38:48Z" - }, - { - "checksumSHA1": "40vJyUB4ezQSn/NSadsKEOrudMc=", - "path": "github.com/inconshreveable/mousetrap", - "revision": "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75", - "revisionTime": "2014-10-17T20:07:13Z" - }, - { - "checksumSHA1": "0ZrwvB6KoGPj2PoDNSEJwxQ6Mog=", - "origin": "github.com/aws/aws-sdk-go/vendor/github.com/jmespath/go-jmespath", - "path": "github.com/jmespath/go-jmespath", - "revision": "3bc643c63c6f8716320182b6842581d6c80572fa", - "revisionTime": "2017-03-23T00:38:48Z" - }, - { - "checksumSHA1": "8ae1DyNE/yY9NvY3PmvtQdLBJnc=", - "path": "github.com/magiconair/properties", - "revision": "49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934", - "revisionTime": "2017-10-31T21:05:36Z" - }, - { - "checksumSHA1": "ynJSWoF6v+3zMnh9R0QmmG6iGV8=", - "path": "github.com/pkg/errors", - "revision": "ff09b135c25aae272398c51a07235b90a75aa4f0", - "revisionTime": "2017-03-16T20:15:38Z" - }, - { - "checksumSHA1": "zKKp5SZ3d3ycKe4EKMNT0BqAWBw=", - "origin": "github.com/stretchr/testify/vendor/github.com/pmezard/go-difflib/difflib", - "path": "github.com/pmezard/go-difflib/difflib", - "revision": "9f9027faeb0dad515336ed2f28317f9f8f527ab4", - "revisionTime": "2016-01-29T19:31:06Z" - }, - { - "checksumSHA1": "aG5wPXVGAEu90TjPFNZFRtox2Zo=", - "path": "github.com/spf13/cobra", - "revision": "ccaecb155a2177302cb56cae929251a256d0f646", - "revisionTime": "2017-12-07T07:49:35Z" - }, - { - "checksumSHA1": "STxYqRb4gnlSr3mRpT+Igfdz/kM=", - "path": "github.com/spf13/pflag", - "revision": "e57e3eeb33f795204c1ca35f56c44f83227c6e66", - "revisionTime": "2017-05-08T18:43:26Z" - }, - { - "checksumSHA1": "Bn333k9lTndxU3D6n/G5c+GMcYY=", - "path": "github.com/stretchr/testify/assert", - "revision": "9f9027faeb0dad515336ed2f28317f9f8f527ab4", - "revisionTime": "2016-01-29T19:31:06Z" - } - ], - "rootPath": "github.com/segmentio/chamber" -}