From ccb01b59d686dce967e4d2f0d22a3ab62d81f3dd Mon Sep 17 00:00:00 2001 From: "j. Emrys Landivar (docmerlin)" Date: Thu, 5 Aug 2021 16:17:31 -0500 Subject: [PATCH 01/10] chore: upload binaries to github as releases --- .circleci/config.yml | 1 + build.py | 5 +++-- go.mod | 5 +++-- go.sum | 39 +++++++++++++++++++++++++++++++-------- tools.go | 3 +++ 5 files changed, 41 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d438dd329..edaccca01 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,6 +10,7 @@ commands: name: Deploy Release Packages command: | ./build.sh --debug --clean --generate --package --package-udfs --upload --bucket=dl.influxdata.com/kapacitor/releases --platform=all --arch=all --release + ghr -p4 -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} -replace ./build/ run_tests: description: > diff --git a/build.py b/build.py index 2a5d64027..07af2583e 100755 --- a/build.py +++ b/build.py @@ -158,11 +158,12 @@ def run_generate(): """Run 'go generate' to rebuild any static assets. """ logging.info("Running generate...") - run("""go install -mod=mod + run("""go install -mod=mod \ github.com/golang/protobuf/protoc-gen-go \ github.com/benbjohnson/tmpl \ github.com/mailru/easyjson/easyjson \ - github.com/influxdata/pkg-config""") + github.com/influxdata/pkg-config \ + github.com/tcnksm/ghr""") try: subprocess.check_output(["go", "generate", "./..."]) except subprocess.CalledProcessError as exc: diff --git a/go.mod b/go.mod index 2b3a26347..9cabf87d5 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/geoffgarside/ber v0.0.0-20170306085127-854377f11dfb // indirect github.com/ghodss/yaml v1.0.0 github.com/golang-jwt/jwt v3.2.2+incompatible - github.com/golang/protobuf v1.4.3 + github.com/golang/protobuf v1.5.2 github.com/google/btree v1.0.0 github.com/google/go-cmp v0.5.5 github.com/google/gofuzz v1.2.0 // indirect @@ -63,12 +63,13 @@ require ( github.com/shurcooL/go v0.0.0-20170331015642-20b4b0a35211 // indirect github.com/shurcooL/markdownfmt v0.0.0-20170214213350-10aae0a270ab github.com/stretchr/testify v1.7.0 + github.com/tcnksm/ghr v0.14.0 github.com/uber/jaeger-client-go v2.28.0+incompatible github.com/urfave/cli/v2 v2.3.0 go.etcd.io/bbolt v1.3.5 go.uber.org/zap v1.14.1 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad - google.golang.org/protobuf v1.25.0 + google.golang.org/protobuf v1.26.0 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/gomail.v2 v2.0.0-20150902115704-41f357289737 diff --git a/go.sum b/go.sum index cc855f960..c5f8a7a62 100644 --- a/go.sum +++ b/go.sum @@ -123,6 +123,8 @@ github.com/SAP/go-hdb v0.14.1 h1:hkw4ozGZ/i4eak7ZuGkY5e0hxiXFdNUBNhr4AvZVNFE= github.com/SAP/go-hdb v0.14.1/go.mod h1:7fdQLVC2lER3urZLjZCm0AuMQfApof92n3aylBPEkMo= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/Songmu/retry v0.1.0 h1:hPA5xybQsksLR/ry/+t/7cFajPW+dqjmjhzZhioBILA= +github.com/Songmu/retry v0.1.0/go.mod h1:7sXIW7eseB9fq0FUvigRcQMVLR9tuHI0Scok+rkpAuA= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/Waterdrips/jwt-go v3.2.1-0.20200915121943-f6506928b72e+incompatible h1:2v2bayIp0qe5893oRu3/jGHEPyc2mLCSYLeL3ecu4T0= github.com/Waterdrips/jwt-go v3.2.1-0.20200915121943-f6506928b72e+incompatible/go.mod h1:wk3RCbTKyKexJpL5CPBnS/xvNvTHGnpOLt1Qp48kCes= @@ -512,8 +514,10 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= @@ -540,8 +544,9 @@ github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4r github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-jsonnet v0.14.0 h1:as/sAfmjOHqY/OMBR4mv9I8ZY0/jNuqN3u44AicwxPs= github.com/google/go-jsonnet v0.14.0/go.mod h1:zPGC9lj/TbjkBtUACIvYR/ILHrFqKRhxeEA+bLyeMnY= -github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= +github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= @@ -641,6 +646,8 @@ github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2I github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.3.0 h1:McDWVJIU/y+u1BRV06dPaLfLCaT7fUTJLp5r04x7iNw= +github.com/hashicorp/go-version v1.3.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= @@ -820,8 +827,9 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= -github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.13 h1:qdl+GuBjcsKKDco5BsxPJlId98mSWNKqYA+Co0SC1yA= +github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54= @@ -843,6 +851,8 @@ github.com/mileusna/useragent v0.0.0-20190129205925-3e331f0949a5 h1:pXqZHmHOz6LN github.com/mileusna/useragent v0.0.0-20190129205925-3e331f0949a5/go.mod h1:JWhYAp2EXqUtsxTKdeGlY8Wp44M7VxThC9FEoNGi2IE= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= +github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ= +github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw= github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -1125,7 +1135,13 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tcnksm/ghr v0.14.0 h1:3iCanOmn2xDgLnbbTy3ifzHiJ8/gCzYv6K5YWW+1P1s= +github.com/tcnksm/ghr v0.14.0/go.mod h1:6FdZv7a1yCKqJGwA4srq5ZtqGzEUnSCtRQOfGuuzSd4= +github.com/tcnksm/go-gitconfig v0.1.2 h1:iiDhRitByXAEyjgBqsKi9QU4o2TNtv9kPP3RgPgXBPw= +github.com/tcnksm/go-gitconfig v0.1.2/go.mod h1:/8EhP4H7oJZdIPyT+/UIsG87kTzrzM4UsLGSItWYCpE= github.com/tcnksm/go-input v0.0.0-20180404061846-548a7d7a8ee8/go.mod h1:IlWNj9v/13q7xFbaK4mbyzMNwrZLaWSHx/aibKIZuIg= +github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e h1:IWllFTiDjjLIf2oeKxpIUmtiDV5sn71VgeQgg6vcE7k= +github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e/go.mod h1:d7u6HkTYKSv5m6MCKkOQlHwaShTMl3HjqSGW3XtVhXM= github.com/testcontainers/testcontainers-go v0.0.0-20190108154635-47c0da630f72 h1:3dsrMloqeog2f5ZoQCWJbTPR/tKIDFePkB0zg3GLjY8= github.com/testcontainers/testcontainers-go v0.0.0-20190108154635-47c0da630f72/go.mod h1:wt/nMz68+kIO4RoguOZzsdv1B3kTYw+SuIKyJYRQpgE= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= @@ -1342,8 +1358,9 @@ golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210324051636-2c4c8ecb7826 h1:lNRDRnwZWawoPHDS50ebYHTOHjctRMLSrUSQFcAHiW4= golang.org/x/net v0.0.0-20210324051636-2c4c8ecb7826/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q= +golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1355,8 +1372,9 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558 h1:D7nTwh4J0i+5mW4Zjzn5omvlr6YBcWywE6KOcatyNxY= golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c h1:pkQiBZBvdos9qq4wBAHqlzuZHEXo07pqV06ef90u1WI= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1450,8 +1468,10 @@ golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210314195730-07df6a141424/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210324051608-47abb6519492 h1:Paq34FxTluEPvVyayQqMPgHm+vTOrIifmcYxFBx9TLg= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -1462,8 +1482,9 @@ golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5f golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1667,8 +1688,10 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= diff --git a/tools.go b/tools.go index 5e335cbd7..55f314ec8 100644 --- a/tools.go +++ b/tools.go @@ -12,4 +12,7 @@ import ( // so we can use the rust dependencies of flux _ "github.com/influxdata/pkg-config" _ "github.com/mailru/easyjson/easyjson" + + // for github release binary uploading + _ "github.com/tcnksm/ghr" ) From 3dbed953594623cbac406aa7036a6ced38bb270a Mon Sep 17 00:00:00 2001 From: "j. Emrys Landivar (docmerlin)" Date: Thu, 5 Aug 2021 16:27:36 -0500 Subject: [PATCH 02/10] chore: upload binaries to github as releases, using the GHR binary --- .circleci/config.yml | 5 ++++- build.py | 5 ++--- go.mod | 5 ++--- go.sum | 39 ++++++++------------------------------- tools.go | 3 --- 5 files changed, 16 insertions(+), 41 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index edaccca01..d51bf5c24 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,8 +9,11 @@ commands: - run: name: Deploy Release Packages command: | + GHR_VERSION = v0.14.0 + wget https://github.com/tcnksm/ghr/releases/download/${GHR_VERSION}/ghr_${GHR_VERSION}_linux_amd64.tar.gz + tar -xzf ghr_${GHR_VERSION}_linux_amd64.tar.gz ./build.sh --debug --clean --generate --package --package-udfs --upload --bucket=dl.influxdata.com/kapacitor/releases --platform=all --arch=all --release - ghr -p4 -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} -replace ./build/ + ./ghr_${GHR_VERSION}_linux_amd64/ghr -p4 -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} -replace ./build/ run_tests: description: > diff --git a/build.py b/build.py index 07af2583e..2a5d64027 100755 --- a/build.py +++ b/build.py @@ -158,12 +158,11 @@ def run_generate(): """Run 'go generate' to rebuild any static assets. """ logging.info("Running generate...") - run("""go install -mod=mod \ + run("""go install -mod=mod github.com/golang/protobuf/protoc-gen-go \ github.com/benbjohnson/tmpl \ github.com/mailru/easyjson/easyjson \ - github.com/influxdata/pkg-config \ - github.com/tcnksm/ghr""") + github.com/influxdata/pkg-config""") try: subprocess.check_output(["go", "generate", "./..."]) except subprocess.CalledProcessError as exc: diff --git a/go.mod b/go.mod index 9cabf87d5..2b3a26347 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/geoffgarside/ber v0.0.0-20170306085127-854377f11dfb // indirect github.com/ghodss/yaml v1.0.0 github.com/golang-jwt/jwt v3.2.2+incompatible - github.com/golang/protobuf v1.5.2 + github.com/golang/protobuf v1.4.3 github.com/google/btree v1.0.0 github.com/google/go-cmp v0.5.5 github.com/google/gofuzz v1.2.0 // indirect @@ -63,13 +63,12 @@ require ( github.com/shurcooL/go v0.0.0-20170331015642-20b4b0a35211 // indirect github.com/shurcooL/markdownfmt v0.0.0-20170214213350-10aae0a270ab github.com/stretchr/testify v1.7.0 - github.com/tcnksm/ghr v0.14.0 github.com/uber/jaeger-client-go v2.28.0+incompatible github.com/urfave/cli/v2 v2.3.0 go.etcd.io/bbolt v1.3.5 go.uber.org/zap v1.14.1 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad - google.golang.org/protobuf v1.26.0 + google.golang.org/protobuf v1.25.0 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/gomail.v2 v2.0.0-20150902115704-41f357289737 diff --git a/go.sum b/go.sum index c5f8a7a62..cc855f960 100644 --- a/go.sum +++ b/go.sum @@ -123,8 +123,6 @@ github.com/SAP/go-hdb v0.14.1 h1:hkw4ozGZ/i4eak7ZuGkY5e0hxiXFdNUBNhr4AvZVNFE= github.com/SAP/go-hdb v0.14.1/go.mod h1:7fdQLVC2lER3urZLjZCm0AuMQfApof92n3aylBPEkMo= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/Songmu/retry v0.1.0 h1:hPA5xybQsksLR/ry/+t/7cFajPW+dqjmjhzZhioBILA= -github.com/Songmu/retry v0.1.0/go.mod h1:7sXIW7eseB9fq0FUvigRcQMVLR9tuHI0Scok+rkpAuA= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/Waterdrips/jwt-go v3.2.1-0.20200915121943-f6506928b72e+incompatible h1:2v2bayIp0qe5893oRu3/jGHEPyc2mLCSYLeL3ecu4T0= github.com/Waterdrips/jwt-go v3.2.1-0.20200915121943-f6506928b72e+incompatible/go.mod h1:wk3RCbTKyKexJpL5CPBnS/xvNvTHGnpOLt1Qp48kCes= @@ -514,10 +512,8 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= @@ -544,9 +540,8 @@ github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4r github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-jsonnet v0.14.0 h1:as/sAfmjOHqY/OMBR4mv9I8ZY0/jNuqN3u44AicwxPs= github.com/google/go-jsonnet v0.14.0/go.mod h1:zPGC9lj/TbjkBtUACIvYR/ILHrFqKRhxeEA+bLyeMnY= +github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= -github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= -github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= @@ -646,8 +641,6 @@ github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2I github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go-version v1.3.0 h1:McDWVJIU/y+u1BRV06dPaLfLCaT7fUTJLp5r04x7iNw= -github.com/hashicorp/go-version v1.3.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= @@ -827,9 +820,8 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= +github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.13 h1:qdl+GuBjcsKKDco5BsxPJlId98mSWNKqYA+Co0SC1yA= -github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54= @@ -851,8 +843,6 @@ github.com/mileusna/useragent v0.0.0-20190129205925-3e331f0949a5 h1:pXqZHmHOz6LN github.com/mileusna/useragent v0.0.0-20190129205925-3e331f0949a5/go.mod h1:JWhYAp2EXqUtsxTKdeGlY8Wp44M7VxThC9FEoNGi2IE= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ= -github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw= github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -1135,13 +1125,7 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tcnksm/ghr v0.14.0 h1:3iCanOmn2xDgLnbbTy3ifzHiJ8/gCzYv6K5YWW+1P1s= -github.com/tcnksm/ghr v0.14.0/go.mod h1:6FdZv7a1yCKqJGwA4srq5ZtqGzEUnSCtRQOfGuuzSd4= -github.com/tcnksm/go-gitconfig v0.1.2 h1:iiDhRitByXAEyjgBqsKi9QU4o2TNtv9kPP3RgPgXBPw= -github.com/tcnksm/go-gitconfig v0.1.2/go.mod h1:/8EhP4H7oJZdIPyT+/UIsG87kTzrzM4UsLGSItWYCpE= github.com/tcnksm/go-input v0.0.0-20180404061846-548a7d7a8ee8/go.mod h1:IlWNj9v/13q7xFbaK4mbyzMNwrZLaWSHx/aibKIZuIg= -github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e h1:IWllFTiDjjLIf2oeKxpIUmtiDV5sn71VgeQgg6vcE7k= -github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e/go.mod h1:d7u6HkTYKSv5m6MCKkOQlHwaShTMl3HjqSGW3XtVhXM= github.com/testcontainers/testcontainers-go v0.0.0-20190108154635-47c0da630f72 h1:3dsrMloqeog2f5ZoQCWJbTPR/tKIDFePkB0zg3GLjY8= github.com/testcontainers/testcontainers-go v0.0.0-20190108154635-47c0da630f72/go.mod h1:wt/nMz68+kIO4RoguOZzsdv1B3kTYw+SuIKyJYRQpgE= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= @@ -1358,9 +1342,8 @@ golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210324051636-2c4c8ecb7826 h1:lNRDRnwZWawoPHDS50ebYHTOHjctRMLSrUSQFcAHiW4= golang.org/x/net v0.0.0-20210324051636-2c4c8ecb7826/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= -golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q= -golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1372,9 +1355,8 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558 h1:D7nTwh4J0i+5mW4Zjzn5omvlr6YBcWywE6KOcatyNxY= golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c h1:pkQiBZBvdos9qq4wBAHqlzuZHEXo07pqV06ef90u1WI= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1468,10 +1450,8 @@ golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210314195730-07df6a141424/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210324051608-47abb6519492 h1:Paq34FxTluEPvVyayQqMPgHm+vTOrIifmcYxFBx9TLg= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -1482,9 +1462,8 @@ golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5f golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1688,10 +1667,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= diff --git a/tools.go b/tools.go index 55f314ec8..5e335cbd7 100644 --- a/tools.go +++ b/tools.go @@ -12,7 +12,4 @@ import ( // so we can use the rust dependencies of flux _ "github.com/influxdata/pkg-config" _ "github.com/mailru/easyjson/easyjson" - - // for github release binary uploading - _ "github.com/tcnksm/ghr" ) From 226aa8c852a926d1370dc76c9201a2f1a692ca94 Mon Sep 17 00:00:00 2001 From: "j. Emrys Landivar (docmerlin)" Date: Thu, 5 Aug 2021 17:56:50 -0500 Subject: [PATCH 03/10] build: add test to possible tags for releases --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d51bf5c24..ce9c4399c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -80,7 +80,7 @@ workflows: - build filters: tags: - only: /^v[0-9]+(\.[0-9]+){2}(-(rc|beta)[0-9]+)?/ + only: /^v[0-9]+(\.[0-9]+){2}(-(rc|beta|test)[0-9]+)?/ branches: ignore: /.*/ From bd8cce67c34c90af1b3cc461fa87796e59b8a53f Mon Sep 17 00:00:00 2001 From: "j. Emrys Landivar (docmerlin)" Date: Fri, 6 Aug 2021 01:07:25 -0500 Subject: [PATCH 04/10] build: add test to possible tags for releases --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ce9c4399c..07464ba67 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ commands: - run: name: Deploy Release Packages command: | - GHR_VERSION = v0.14.0 + GHR_VERSION=v0.14.0 wget https://github.com/tcnksm/ghr/releases/download/${GHR_VERSION}/ghr_${GHR_VERSION}_linux_amd64.tar.gz tar -xzf ghr_${GHR_VERSION}_linux_amd64.tar.gz ./build.sh --debug --clean --generate --package --package-udfs --upload --bucket=dl.influxdata.com/kapacitor/releases --platform=all --arch=all --release From 7fa3fcbffcaf62bbf0f41fa07790c5abbf441c88 Mon Sep 17 00:00:00 2001 From: "j. Emrys Landivar (docmerlin)" Date: Fri, 6 Aug 2021 13:39:21 -0500 Subject: [PATCH 05/10] build: remove -p from ghr --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 07464ba67..3cd7a4cb3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ commands: wget https://github.com/tcnksm/ghr/releases/download/${GHR_VERSION}/ghr_${GHR_VERSION}_linux_amd64.tar.gz tar -xzf ghr_${GHR_VERSION}_linux_amd64.tar.gz ./build.sh --debug --clean --generate --package --package-udfs --upload --bucket=dl.influxdata.com/kapacitor/releases --platform=all --arch=all --release - ./ghr_${GHR_VERSION}_linux_amd64/ghr -p4 -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} -replace ./build/ + ./ghr_${GHR_VERSION}_linux_amd64/ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} -replace ./build/ run_tests: description: > From a3f64e01d68985cd9f2e5fcb4e6a05ac0e03cd6b Mon Sep 17 00:00:00 2001 From: "j. Emrys Landivar (docmerlin)" Date: Fri, 6 Aug 2021 15:09:17 -0500 Subject: [PATCH 06/10] build: fix ghr command --- .circleci/config.yml | 5 ++++- Dockerfile_build_ubuntu64 | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3cd7a4cb3..dd529ab93 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ commands: wget https://github.com/tcnksm/ghr/releases/download/${GHR_VERSION}/ghr_${GHR_VERSION}_linux_amd64.tar.gz tar -xzf ghr_${GHR_VERSION}_linux_amd64.tar.gz ./build.sh --debug --clean --generate --package --package-udfs --upload --bucket=dl.influxdata.com/kapacitor/releases --platform=all --arch=all --release - ./ghr_${GHR_VERSION}_linux_amd64/ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} -replace ./build/ + ./ghr_${GHR_VERSION}_linux_amd64/ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete -replace ${CIRCLE_TAG} ./build/ run_tests: description: > @@ -41,6 +41,9 @@ jobs: working_directory: ~/kapacitor steps: - checkout + - restore_cache: # restores saved cache if no changes are detected since last run + keys: + - go-mod-{{ checksum "go.sum" }} - setup_remote_docker: docker_layer_caching: true - run_tests diff --git a/Dockerfile_build_ubuntu64 b/Dockerfile_build_ubuntu64 index 9f7e7aef4..ba0ed8a1a 100644 --- a/Dockerfile_build_ubuntu64 +++ b/Dockerfile_build_ubuntu64 @@ -49,7 +49,6 @@ RUN wget -q https://github.com/google/protobuf/releases/download/v${PROTO_VERSIO && rm -rf /protobuf-${PROTO_VERSION} protobuf-python-${PROTO_VERSION}.tar.gz ENV PROJECT_DIR $GOPATH/src/github.com/influxdata/kapacitor -#ENV PKG_CONFIG $PROJECT_DIR/pkg-config.sh ENV PATH $GOPATH/bin:$PATH RUN mkdir -p $PROJECT_DIR WORKDIR $PROJECT_DIR From 6579252fbcb464a0e2c374a82a414f6c3ca58634 Mon Sep 17 00:00:00 2001 From: "j. Emrys Landivar (docmerlin)" Date: Mon, 9 Aug 2021 17:06:35 -0500 Subject: [PATCH 07/10] build: add some caching and fix broken nightlies --- .circleci/config.yml | 28 ++++++++++++++++++++++++++-- Dockerfile_build_ubuntu64 | 2 +- build.sh | 34 ++++++++++++++++++++++++++-------- gobuild.sh | 18 ------------------ 4 files changed, 53 insertions(+), 29 deletions(-) delete mode 100755 gobuild.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index dd529ab93..da30f385a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,6 +23,7 @@ commands: name: Running Kapacitor Tests no_output_timeout: 30m command: | + mkdir -p /go ./circle-test.sh deploy_nightly: description: > @@ -38,25 +39,40 @@ jobs: docker: - image: nathanielc/docker-client parallelism: 2 + resource_class: large working_directory: ~/kapacitor steps: - checkout - restore_cache: # restores saved cache if no changes are detected since last run keys: - - go-mod-{{ checksum "go.sum" }} + - v0-go-mod-{{ checksum "go.sum" }} + - v0-go-mod- - setup_remote_docker: docker_layer_caching: true - run_tests + - save_cache: + key: v0-go-mod-{{ checksum "go.sum" }} + paths: + - "/go/pkg/mod" release: docker: - image: nathanielc/docker-client working_directory: ~/kapacitor + resource_class: large steps: - checkout + - restore_cache: # restores saved cache if no changes are detected since last run + keys: + - v0-go-mod-{{ checksum "go.sum" }} + - v0-go-mod- - setup_remote_docker: docker_layer_caching: true - deploy_release_packages + - save_cache: + key: v0-go-mod-{{ checksum "go.sum" }} + paths: + - "/go/pkg/mod" nightly-build: docker: @@ -64,9 +80,17 @@ jobs: working_directory: ~/kapacitor steps: - checkout + - restore_cache: # restores saved cache if no changes are detected since last run + keys: + - v0-go-mod-{{ checksum "go.sum" }} + - v0-go-mod- - setup_remote_docker: docker_layer_caching: true - run_tests + - save_cache: + key: v0-go-mod-{{ checksum "go.sum" }} + paths: + - "/go/pkg/mod" - deploy_nightly @@ -96,4 +120,4 @@ workflows: only: - master jobs: - - nightly-build + - nightly-build \ No newline at end of file diff --git a/Dockerfile_build_ubuntu64 b/Dockerfile_build_ubuntu64 index ba0ed8a1a..8626db9cd 100644 --- a/Dockerfile_build_ubuntu64 +++ b/Dockerfile_build_ubuntu64 @@ -36,7 +36,7 @@ RUN gem install fpm # Install protobuf3 protoc binary ENV PROTO_VERSION 3.11.1 RUN wget -q https://github.com/google/protobuf/releases/download/v${PROTO_VERSION}/protoc-${PROTO_VERSION}-linux-x86_64.zip \ - && unzip -j protoc-${PROTO_VERSION}-linux-x86_64.zip bin/protoc -d /bin \ + && unzip -oj protoc-${PROTO_VERSION}-linux-x86_64.zip bin/protoc -d /bin \ rm protoc-${PROTO_VERSION}-linux-x86_64.zip # Install protobuf3 python library diff --git a/build.sh b/build.sh index 467c58ca5..4b1fecf25 100755 --- a/build.sh +++ b/build.sh @@ -23,24 +23,42 @@ docker build -f Dockerfile_build_ubuntu64 -t $imagename --build-arg GO_VERSION=$ # Build new docker image docker build -f Dockerfile_build_ubuntu64 -t influxdata/kapacitor-builder --build-arg GO_VERSION=${GO_VERSION} $DIR -# Create data volume with code docker create \ - --name $dataname \ - -v "/go/src/github.com/influxdata/kapacitor" \ - $imagename /bin/true + --name $dataname \ + -v "/go/src/github.com/influxdata/kapacitor" \ + $imagename /bin/true docker cp "$DIR/" "$dataname:/go/src/github.com/influxdata/" echo "Running build.py" -# Run docker -docker run \ +if [ $GOPATH ];then + docker run \ + --rm \ + -v "$GOPATH"/pkg/mod:/go/pkg/mod + --volumes-from $dataname \ + -e AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID" \ + -e AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY" \ + $imagename \ + "$@" +elif [ -d "/go/pkg/mod" ];then + docker run \ --rm \ + -v "/go/pkg/mod:/go/pkg/mod" --volumes-from $dataname \ -e AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID" \ -e AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY" \ $imagename \ "$@" +else + docker run \ + --rm \ + --volumes-from $dataname \ + -e AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID" \ + -e AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY" \ + $imagename \ + "$@" +fi +# Run docker -docker cp "$dataname:/go/src/github.com/influxdata/kapacitor/build" \ - ./ +docker cp "$dataname:/go/src/github.com/influxdata/kapacitor/build" ./ docker rm -v $dataname diff --git a/gobuild.sh b/gobuild.sh deleted file mode 100755 index 9a96e7e9b..000000000 --- a/gobuild.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# This script run inside the Dockerfile_build_ubuntu64_git container and -# gets the latests Go source code and compiles it. -# Then passes control over to the normal build.py script - -set -e - -cd /go/src -git fetch --all -git checkout $GO_CHECKOUT -# Merge in recent changes if we are on a branch -# if we checked out a tag just ignore the error -git pull || true -./make.bash - -# Run normal build.py -cd "$PROJECT_DIR" -exec ./build.py "$@" From 331eb8b71756950848f40d64f282a74a9d7e43aa Mon Sep 17 00:00:00 2001 From: "j. Emrys Landivar (docmerlin)" Date: Wed, 11 Aug 2021 14:55:45 -0500 Subject: [PATCH 08/10] tests: make TestPipelineImplemented respect modules --- Gopkg.lock | 1159 ------------------------------------ Gopkg.toml | 79 --- pipeline/tick/tick_test.go | 23 +- 3 files changed, 13 insertions(+), 1248 deletions(-) delete mode 100644 Gopkg.lock delete mode 100644 Gopkg.toml diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index 7ec540378..000000000 --- a/Gopkg.lock +++ /dev/null @@ -1,1159 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - digest = "1:9a7a1f8cd0991a7c3549700b57c4ea1c213dadf7eb94d69e59ad3600490f81bc" - name = "cloud.google.com/go" - packages = [ - "compute/metadata", - "internal", - ] - pruneopts = "NUT" - revision = "2e6a95edb1071d750f6d7db777bf66cd2997af6c" - version = "v0.7.0" - -[[projects]] - digest = "1:253580c3e9e495538385a96f276a0e06f3ba90c73421df1258de8a8375ff4b09" - name = "github.com/Azure/azure-sdk-for-go" - packages = [ - "arm/compute", - "arm/network", - ] - pruneopts = "NUT" - revision = "bd73d950fa4440dae889bd9917bff7cef539f86e" - -[[projects]] - digest = "1:401dd46323a9f30c7cc9adef35f4961714caf74f61f8e8666f956bc158de9bba" - name = "github.com/Azure/go-autorest" - packages = [ - "autorest", - "autorest/azure", - "autorest/date", - "autorest/to", - "autorest/validation", - ] - pruneopts = "NUT" - revision = "a2fdd780c9a50455cecd249b00bdc3eb73a78e31" - -[[projects]] - digest = "1:be3ccd9f881604e4dd6d15cccfa126aa309232f0ba075ae5f92d3ef729a62758" - name = "github.com/BurntSushi/toml" - packages = ["."] - pruneopts = "NUT" - revision = "a368813c5e648fee92e5f6c30e3944ff9d5e8895" - -[[projects]] - digest = "1:d8ebbd207f3d3266d4423ce4860c9f3794956306ded6c7ba312ecc69cdfbf04c" - name = "github.com/PuerkitoBio/purell" - packages = ["."] - pruneopts = "NUT" - revision = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4" - version = "v1.1.0" - -[[projects]] - branch = "master" - digest = "1:8098cd40cd09879efbf12e33bcd51ead4a66006ac802cd563a66c4f3373b9727" - name = "github.com/PuerkitoBio/urlesc" - packages = ["."] - pruneopts = "NUT" - revision = "bbf7a2afc14f93e1e0a5c06df524fbd75e5031e5" - -[[projects]] - digest = "1:44c7344434890241dde2d0d70d2e47355a1e012549e28ccf06f925aa6f8271ff" - name = "github.com/Sirupsen/logrus" - packages = ["."] - pruneopts = "NUT" - revision = "ba1b36c82c5e05c4f912a88eab0dcd91a171688f" - version = "v0.11.5" - -[[projects]] - digest = "1:e3c230a3e97de27d6b74712ae4745be2c5400f0a6c4b9e348f5800be26f30a76" - name = "github.com/aws/aws-sdk-go" - packages = [ - "aws", - "aws/awserr", - "aws/awsutil", - "aws/client", - "aws/client/metadata", - "aws/corehandlers", - "aws/credentials", - "aws/credentials/ec2rolecreds", - "aws/credentials/endpointcreds", - "aws/credentials/stscreds", - "aws/defaults", - "aws/ec2metadata", - "aws/endpoints", - "aws/request", - "aws/session", - "aws/signer/v4", - "private/protocol", - "private/protocol/ec2query", - "private/protocol/query", - "private/protocol/query/queryutil", - "private/protocol/rest", - "private/protocol/xml/xmlutil", - "service/autoscaling", - "service/ec2", - "service/sts", - ] - pruneopts = "NUT" - revision = "f6ea558f30e0a983d529b32c741e4caed17c7df0" - version = "v1.8.16" - -[[projects]] - branch = "master" - digest = "1:bfe817c134f8681840c8d6c02606982ea29a19fd48086e89aaa8dff7c5d837dc" - name = "github.com/benbjohnson/tmpl" - packages = ["."] - pruneopts = "NUT" - revision = "8e77bc5fc07968736bb74f4b40b4c577028a61b6" - -[[projects]] - branch = "master" - digest = "1:cb0535f5823b47df7dcb9768ebb6c000b79ad115472910c70efe93c9ed9b2315" - name = "github.com/beorn7/perks" - packages = ["quantile"] - pruneopts = "NUT" - revision = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9" - -[[projects]] - digest = "1:aba270497eb2d49f5cba6f4162d524b9a1195a24cbce8be20bf56a0051f47deb" - name = "github.com/blang/semver" - packages = ["."] - pruneopts = "NUT" - revision = "b38d23b8782a487059e8fc8773e9a5b228a77cb6" - version = "v3.5.0" - -[[projects]] - digest = "1:4c7a379d06f493d3cf4301a08667d9b83011a92b1d9defc7ec58a10ade19e796" - name = "github.com/boltdb/bolt" - packages = ["."] - pruneopts = "NUT" - revision = "583e8937c61f1af6513608ccc75c97b6abdf4ff9" - version = "v1.3.0" - -[[projects]] - digest = "1:60488563e453e4bbf9f5387fe94c9dd3d28372dc993c5f89104b8396c3593b21" - name = "github.com/cenkalti/backoff" - packages = ["."] - pruneopts = "NUT" - revision = "32cd0c5b3aef12c76ed64aaf678f6c79736be7dc" - version = "v1.0.0" - -[[projects]] - branch = "master" - digest = "1:4c313de62fe9184560948eaa94714403a73d3026777a0da276550b7379cf6c80" - name = "github.com/coreos/go-oidc" - packages = [ - "http", - "jose", - "key", - "oauth2", - "oidc", - ] - pruneopts = "NUT" - revision = "be73733bb8cc830d0205609b95d125215f8e9c70" - -[[projects]] - digest = "1:e2c6ad2e212c0c9a8b13e5d1d52a6cd3a42411b636fcea10d286f7b6fc13fea0" - name = "github.com/coreos/pkg" - packages = [ - "health", - "httputil", - "timeutil", - ] - pruneopts = "NUT" - revision = "3ac0863d7acf3bc44daf49afef8919af12f704ef" - version = "v3" - -[[projects]] - branch = "master" - digest = "1:a2c1d0e43bd3baaa071d1b9ed72c27d78169b2b269f71c105ac4ba34b1be4a39" - name = "github.com/davecgh/go-spew" - packages = ["spew"] - pruneopts = "NUT" - revision = "346938d642f2ec3594ed81d874461961cd0faa76" - -[[projects]] - digest = "1:bfebf84ecf0c67e060f1e92cfcf3d4cbf4428a26a8b3cc258a64d7330f4de31b" - name = "github.com/dgrijalva/jwt-go" - packages = ["."] - pruneopts = "NUT" - revision = "d2709f9f1f31ebcda9651b03077758c1f3a0018c" - version = "v3.0.0" - -[[projects]] - digest = "1:516dc8a4003a0ad8aaf2b07d41bafb3c9772557ee8c819b36c28536cc30d0ac2" - name = "github.com/docker/distribution" - packages = [ - "digest", - "reference", - ] - pruneopts = "NUT" - revision = "a25b9ef0c9fe242ac04bb20d3a028442b7d266b6" - version = "v2.6.1" - -[[projects]] - digest = "1:740dc3cccfcdb302c323d17da5f4f2dfa65f7b8c666e0a9ac8bc64f560fb2974" - name = "github.com/docker/docker" - packages = [ - "api/types", - "api/types/blkiodev", - "api/types/container", - "api/types/filters", - "api/types/mount", - "api/types/network", - "api/types/registry", - "api/types/strslice", - "api/types/swarm", - "api/types/versions", - ] - pruneopts = "NUT" - revision = "092cba3727bb9b4a2f0e922cd6c0f93ea270e363" - version = "v1.13.1" - -[[projects]] - digest = "1:be0211ba62c6b44e36a747047b55d45ad23288920799edda7e8b59da852cbc2c" - name = "github.com/docker/go-connections" - packages = ["nat"] - pruneopts = "NUT" - revision = "990a1a1a70b0da4c4cb70e117971a4f0babfbf1a" - version = "v0.2.1" - -[[projects]] - digest = "1:cb9111a5f582f106b83203d29e92e28a02d1eba0e6ea20f61d67ae54b6a8dbfe" - name = "github.com/docker/go-units" - packages = ["."] - pruneopts = "NUT" - revision = "f2d77a61e3c169b43402a0a1e84f06daf29b8190" - version = "v0.3.1" - -[[projects]] - branch = "master" - digest = "1:3f451047834b63dcc35c5dc54d707440606cfd5b53c730a5f03bebd04d8e6af5" - name = "github.com/dustin/go-humanize" - packages = ["."] - pruneopts = "NUT" - revision = "259d2a102b871d17f30e3cd9881a642961a1e486" - -[[projects]] - digest = "1:492d2263bad08c906b12d9b7bb31213698d801dd01d033081139bd60d9009ca4" - name = "github.com/eclipse/paho.mqtt.golang" - packages = [ - ".", - "packets", - ] - pruneopts = "NUT" - revision = "45f9b18f4864c81d49c3ed01e5faec9eeb05de31" - version = "v1.0.0" - -[[projects]] - digest = "1:11652d24c6b9574c5f4a94370c0e23cbb46aec620f13f0c4f4bdc4635c2989e8" - name = "github.com/emicklei/go-restful" - packages = [ - ".", - "log", - "swagger", - ] - pruneopts = "NUT" - revision = "777bb3f19bcafe2575ffb2a3e46af92509ae9594" - version = "v1.2" - -[[projects]] - branch = "master" - digest = "1:df767c6ddf21aad6abd0da659e246cad6843e78ced90fb019a1625a12e571465" - name = "github.com/evanphx/json-patch" - packages = ["."] - pruneopts = "NUT" - revision = "30afec6a1650c11c861dc1fb58e100cd5219e490" - -[[projects]] - branch = "master" - digest = "1:a546bd0e6ce4ebdcf79507110d9498f697e154e5624e5e84dd2ca2efc776ae32" - name = "github.com/geoffgarside/ber" - packages = ["."] - pruneopts = "NUT" - revision = "854377f11dfb81f04121879829bc53487e377739" - -[[projects]] - branch = "master" - digest = "1:81466b4218bf6adddac2572a30ac733a9255919bc2f470b4827a317bd4ee1756" - name = "github.com/ghodss/yaml" - packages = ["."] - pruneopts = "NUT" - revision = "04f313413ffd65ce25f2541bfd2b2ceec5c0908c" - -[[projects]] - digest = "1:27b47997dc05f1af7b96d113754bd86ab1e7983d544cfd3bc7f48ec3e31ea3f5" - name = "github.com/go-ini/ini" - packages = ["."] - pruneopts = "NUT" - revision = "e7fea39b01aea8d5671f6858f0532f56e8bff3a5" - version = "v1.27.0" - -[[projects]] - branch = "master" - digest = "1:260f7ebefc63024c8dfe2c9f1a2935a89fa4213637a1f522f592f80c001cc441" - name = "github.com/go-openapi/jsonpointer" - packages = ["."] - pruneopts = "NUT" - revision = "779f45308c19820f1a69e9a4cd965f496e0da10f" - -[[projects]] - branch = "master" - digest = "1:98abd61947ff5c7c6fcfec5473d02a4821ed3a2dd99a4fbfdb7925b0dd745546" - name = "github.com/go-openapi/jsonreference" - packages = ["."] - pruneopts = "NUT" - revision = "36d33bfe519efae5632669801b180bf1a245da3b" - -[[projects]] - branch = "master" - digest = "1:ec09a363ecf22580db64d27f9d2c2604cea79e69bace2e50d66af15a492f82c1" - name = "github.com/go-openapi/spec" - packages = ["."] - pruneopts = "NUT" - revision = "e51c28f07047ad90caff03f6450908720d337e0c" - -[[projects]] - branch = "master" - digest = "1:dd9842008e1f630db0d091aa3774103b16bc972cf989492b71f734a03ebd6b5c" - name = "github.com/go-openapi/swag" - packages = ["."] - pruneopts = "NUT" - revision = "24ebf76d720bab64f62824d76bced3184a65490d" - -[[projects]] - digest = "1:a6afc27b2a73a5506832f3c5a1c19a30772cb69e7bd1ced4639eb36a55db224f" - name = "github.com/gogo/protobuf" - packages = [ - "proto", - "sortkeys", - ] - pruneopts = "NUT" - revision = "100ba4e885062801d56799d78530b73b178a78f3" - version = "v0.4" - -[[projects]] - branch = "master" - digest = "1:e2b86e41f3d669fc36b50d31d32d22c8ac656c75aa5ea89717ce7177e134ff2a" - name = "github.com/golang/glog" - packages = ["."] - pruneopts = "NUT" - revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" - -[[projects]] - branch = "master" - digest = "1:065785c3265dc118dda15e31fb57e6ceface395a94b09cce8cd2c8fa8ce7b974" - name = "github.com/golang/protobuf" - packages = [ - "proto", - "protoc-gen-go", - "protoc-gen-go/descriptor", - "protoc-gen-go/generator", - "protoc-gen-go/grpc", - "protoc-gen-go/plugin", - ] - pruneopts = "NUT" - revision = "2bba0603135d7d7f5cb73b2125beeda19c09f4ef" - -[[projects]] - branch = "master" - digest = "1:9413ddbde906f91f062fda0dfa9a7cff43458cd1b2282c0fa25c61d89300b116" - name = "github.com/golang/snappy" - packages = ["."] - pruneopts = "NUT" - revision = "553a641470496b2327abcac10b36396bd98e45c9" - -[[projects]] - digest = "1:c32382738658c8f0e5c8e488967cc4cf1c795481ec8c62505b8976d2a8ad0c42" - name = "github.com/google/go-cmp" - packages = [ - "cmp", - "cmp/cmpopts", - "cmp/internal/diff", - "cmp/internal/function", - "cmp/internal/value", - ] - pruneopts = "NUT" - revision = "8099a9787ce5dc5984ed879a3bda47dc730a8e97" - version = "v0.1.0" - -[[projects]] - branch = "master" - digest = "1:f9425215dccf1c63f659ec781ca46bc81804341821d0cd8d2459c5b58f8bd067" - name = "github.com/google/gofuzz" - packages = ["."] - pruneopts = "NUT" - revision = "44d81051d367757e1c7c6a5a86423ece9afcf63c" - -[[projects]] - branch = "master" - digest = "1:1ab18cf8c2084968d6dca0dd46fbda9efba08664ecd7957b63c7ca57bb2455df" - name = "github.com/google/uuid" - packages = ["."] - pruneopts = "NUT" - revision = "6a5e28554805e78ea6141142aba763936c4761c0" - -[[projects]] - branch = "master" - digest = "1:b394d36f2403ca6e55d6de105ad73522c58919d19e31b0505f05c5afaa302ca7" - name = "github.com/googleapis/gax-go" - packages = ["."] - pruneopts = "NUT" - revision = "9af46dd5a1713e8b5cd71106287eba3cefdde50b" - -[[projects]] - branch = "master" - digest = "1:b60e505ed8574c018837ba28d824a9c2172f8a2837c79dda6c32e70e2e596d1c" - name = "github.com/gorhill/cronexpr" - packages = ["."] - pruneopts = "NUT" - revision = "88b0669f7d75f171bd612b874e52b95c190218df" - -[[projects]] - digest = "1:064c7f0ccdb4036791092fb93ec214a6f09119711801b9e587b6d1e76acc55de" - name = "github.com/hashicorp/consul" - packages = ["api"] - pruneopts = "NUT" - revision = "e9ca44d0a1757ac9aecc6785904a701936c10e4a" - version = "v0.8.1" - -[[projects]] - branch = "master" - digest = "1:7b699584752575e81e3f4e8b00cfb3e5d6fa5419d5d212ef925e02c798847464" - name = "github.com/hashicorp/go-cleanhttp" - packages = ["."] - pruneopts = "NUT" - revision = "3573b8b52aa7b37b9358d966a898feb387f62437" - -[[projects]] - branch = "master" - digest = "1:cdb5ce76cd7af19e3d2d5ba9b6458a2ee804f0d376711215dd3df5f51100d423" - name = "github.com/hashicorp/go-rootcerts" - packages = ["."] - pruneopts = "NUT" - revision = "6bb64b370b90e7ef1fa532be9e591a81c3493e00" - -[[projects]] - digest = "1:0dd7b7b01769f9df356dc99f9e4144bdbabf6c79041ea7c0892379c5737f3c44" - name = "github.com/hashicorp/serf" - packages = ["coordinate"] - pruneopts = "NUT" - revision = "d6574a5bb1226678d7010325fb6c985db20ee458" - version = "v0.8.1" - -[[projects]] - digest = "1:4b32a332c32e1626280df4aceecc6b9eeaa8aa11e5083926ed41b89409ec40b6" - name = "github.com/influxdata/influxdb" - packages = [ - ".", - "client", - "client/v2", - "influxql", - "influxql/internal", - "influxql/neldermead", - "models", - "monitor/diagnostics", - "pkg/escape", - "pkg/limiter", - "services/collectd", - "services/graphite", - "services/meta", - "services/meta/internal", - "services/opentsdb", - "services/udp", - "toml", - "tsdb", - "tsdb/internal", - "uuid", - ] - pruneopts = "NUT" - revision = "e4628bb69266dbd624dc27d674b52705ce0dcbf2" - version = "v1.1.4" - -[[projects]] - branch = "master" - digest = "1:a6411d501f20aa4325c2cef806205a4b4802aec94b296f495db662c6ef46c787" - name = "github.com/influxdata/usage-client" - packages = ["v1"] - pruneopts = "NUT" - revision = "6d3895376368aa52a3a81d2a16e90f0f52371967" - -[[projects]] - branch = "master" - digest = "1:61187cdf67a554f26a184342401d2d7f40cb7064a77de4b52b099a4bc8368290" - name = "github.com/influxdata/wlog" - packages = ["."] - pruneopts = "NUT" - revision = "7c63b0a71ef8300adc255344d275e10e5c3a71ec" - -[[projects]] - digest = "1:7c818eb119c69fc685573449e8f799596ba81827074b006ff0cb71052424f254" - name = "github.com/jmespath/go-jmespath" - packages = ["."] - pruneopts = "NUT" - revision = "3433f3ea46d9f8019119e7dd41274e112a2359a9" - version = "0.2.2" - -[[projects]] - digest = "1:6b1eae4bb93e5ccd23cb09d1e005ecb391316d27701b7a5264f8555a6e2f3d87" - name = "github.com/jonboulle/clockwork" - packages = ["."] - pruneopts = "NUT" - revision = "2eee05ed794112d45db504eb05aa693efd2b8b09" - version = "v0.1.0" - -[[projects]] - branch = "master" - digest = "1:57719b5d47a6adf438ed209107c10d0da22e993916b326df3a41fcb6c9bad533" - name = "github.com/juju/ratelimit" - packages = ["."] - pruneopts = "NUT" - revision = "acf38b000a03e4ab89e40f20f1e548f4e6ac7f72" - -[[projects]] - digest = "1:3a32e9d6c50f433ce5a8a65106c882ec0734a39863bdde6efa1f33c4d3e66acf" - name = "github.com/k-sone/snmpgo" - packages = ["."] - pruneopts = "NUT" - revision = "de09377ff34857b08afdc16ea8c7c2929eb1fc6e" - version = "v3.2.0" - -[[projects]] - digest = "1:805127e5bf73d46bf81aeb8eab8a28697880045761fa28d483308247c2898290" - name = "github.com/kimor79/gollectd" - packages = ["."] - pruneopts = "NUT" - revision = "b5dddb1667dcc1e6355b9305e2c1608a2db6983c" - version = "v1.0.0" - -[[projects]] - digest = "1:9ab29968625f38dd39ab1dbd50797549313de7881782a32be6f2ca664c99dd08" - name = "github.com/mailru/easyjson" - packages = [ - ".", - "bootstrap", - "buffer", - "easyjson", - "gen", - "jlexer", - "jwriter", - "parser", - ] - pruneopts = "NUT" - revision = "3fdea8d05856a0c8df22ed4bc71b3219245e4485" - -[[projects]] - digest = "1:cb591533458f6eb6e2c1065ff3eac6b50263d7847deb23fc9f79b25bc608970e" - name = "github.com/mattn/go-runewidth" - packages = ["."] - pruneopts = "NUT" - revision = "9e777a8366cce605130a531d2cd6363d07ad7317" - version = "v0.0.2" - -[[projects]] - digest = "1:5985ef4caf91ece5d54817c11ea25f182697534f8ae6521eadcd628c142ac4b6" - name = "github.com/matttproud/golang_protobuf_extensions" - packages = ["pbutil"] - pruneopts = "NUT" - revision = "3247c84500bff8d9fb6d579d800f20b3e091582c" - version = "v1.0.0" - -[[projects]] - branch = "master" - digest = "1:bdff96d801b156a076211f2218e9a3d6ce942e087a8a5fb345b7a088bd65473f" - name = "github.com/miekg/dns" - packages = ["."] - pruneopts = "NUT" - revision = "6ebcb714d36901126ee2807031543b38c56de963" - -[[projects]] - branch = "master" - digest = "1:c16945365aa2772ae7347e8d944ff38abd385bf217a75852f4b490e1af06b1aa" - name = "github.com/mitchellh/copystructure" - packages = ["."] - pruneopts = "NUT" - revision = "f81071c9d77b7931f78c90b416a074ecdc50e959" - -[[projects]] - branch = "master" - digest = "1:b62c4f18ad6eb454ac5253e7791ded3d7867330015ca4b37b6336e57f514585e" - name = "github.com/mitchellh/go-homedir" - packages = ["."] - pruneopts = "NUT" - revision = "b8bc1bf767474819792c23f32d8286a45736f1c6" - -[[projects]] - branch = "master" - digest = "1:77ae0dd3bf0743d1baf1918b01858d423cf578826d70c8b59092ab52e4b9dfb9" - name = "github.com/mitchellh/mapstructure" - packages = ["."] - pruneopts = "NUT" - revision = "5a0325d7fafaac12dda6e7fb8bd222ec1b69875e" - -[[projects]] - branch = "master" - digest = "1:08893d896360bc28ab00692d16a1df1bea0bc8f52da93a8bea7b4d46e141c5c6" - name = "github.com/mitchellh/reflectwalk" - packages = ["."] - pruneopts = "NUT" - revision = "417edcfd99a4d472c262e58f22b4bfe97580f03e" - -[[projects]] - digest = "1:c7754aaef62e30fefcc59727dcd71aea29e3c3868df0bd316bfe62e05131fafb" - name = "github.com/pborman/uuid" - packages = ["."] - pruneopts = "NUT" - revision = "a97ce2ca70fa5a848076093f05e639a89ca34d06" - version = "v1.0" - -[[projects]] - digest = "1:5cf3f025cbee5951a4ee961de067c8a89fc95a5adabead774f82822efabab121" - name = "github.com/pkg/errors" - packages = ["."] - pruneopts = "NUT" - revision = "645ef00459ed84a119197bfb8d8205042c6df63d" - version = "v0.8.0" - -[[projects]] - digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe" - name = "github.com/pmezard/go-difflib" - packages = ["difflib"] - pruneopts = "NUT" - revision = "792786c7400a136282c1664665ae0a8db921c6c2" - version = "v1.0.0" - -[[projects]] - digest = "1:3e5fd795ebf6a9e13e67d644da76130af7a6003286531f9573f8074c228b66a3" - name = "github.com/prometheus/client_golang" - packages = ["prometheus"] - pruneopts = "NUT" - revision = "c5b7fccd204277076155f10851dad72b76a49317" - version = "v0.8.0" - -[[projects]] - branch = "master" - digest = "1:32d10bdfa8f09ecf13598324dba86ab891f11db3c538b6a34d1c3b5b99d7c36b" - name = "github.com/prometheus/client_model" - packages = ["go"] - pruneopts = "NUT" - revision = "6f3806018612930941127f2a7c6c453ba2c527d2" - -[[projects]] - branch = "master" - digest = "1:4f7ffe5f45a74be4c6b116a0ff2e435edce68d639becebc1ecaaa22487e177bb" - name = "github.com/prometheus/common" - packages = [ - "expfmt", - "internal/bitbucket.org/ww/goautoneg", - "log", - "model", - "version", - ] - pruneopts = "NUT" - revision = "9e0844febd9e2856f839c9cb974fbd676d1755a8" - -[[projects]] - branch = "master" - digest = "1:2a011811c4dae8274c3ced565b10f30ab9f43cb799e5a425607464c0c585c1c3" - name = "github.com/prometheus/procfs" - packages = [ - ".", - "xfs", - ] - pruneopts = "NUT" - revision = "6ac8c5d890d415025dd5aae7595bcb2a6e7e2fad" - -[[projects]] - branch = "logger-targetmanager-wait" - digest = "1:2aa5c16ddde403c807c8e4ddba9b3e31faac62ec86e2df6afafe032419f7d055" - name = "github.com/prometheus/prometheus" - packages = [ - "config", - "discovery", - "discovery/azure", - "discovery/consul", - "discovery/dns", - "discovery/ec2", - "discovery/file", - "discovery/gce", - "discovery/kubernetes", - "discovery/marathon", - "discovery/triton", - "discovery/zookeeper", - "relabel", - "retrieval", - "storage", - "storage/local", - "storage/local/chunk", - "storage/local/codable", - "storage/local/index", - "storage/metric", - "util/flock", - "util/httputil", - "util/strutil", - "util/testutil", - "util/treecache", - ] - pruneopts = "NUT" - revision = "58298e738211f46cdab48c404e5514a544774579" - source = "github.com/goller/prometheus" - -[[projects]] - digest = "1:118f00f400c10c1dd21a267fd04697c758dbe9a38cf5fa3fab3bb3625af9efe7" - name = "github.com/russross/blackfriday" - packages = ["."] - pruneopts = "NUT" - revision = "0b647d0506a698cca42caca173e55559b12a69f2" - version = "v1.4" - -[[projects]] - branch = "master" - digest = "1:142520cf3c9bb85449dd0000f820b8c604531587ee654793c54909be7dabadac" - name = "github.com/samuel/go-zookeeper" - packages = ["zk"] - pruneopts = "NUT" - revision = "1d7be4effb13d2d908342d349d71a284a7542693" - -[[projects]] - digest = "1:b1184e4b8e474f452b201392428a78f93471ec90a7ef72fd00bf2b11a2511b30" - name = "github.com/segmentio/kafka-go" - packages = [ - ".", - "sasl", - ] - pruneopts = "NUT" - revision = "9a956db8bd00245835f16007fbfe8ec58b31b8b9" - version = "v0.3.5" - -[[projects]] - branch = "master" - digest = "1:e700de914d366e75d5711582669407619dd26746cb80b0f6bd2cb0e8f0ec18c1" - name = "github.com/serenize/snaker" - packages = ["."] - pruneopts = "NUT" - revision = "543781d2b79bd95c51ffe70e70a55c946ca211ff" - -[[projects]] - branch = "master" - digest = "1:da6203ec5679b8d7af6fe2dbcd694694b9af883a6bae7f702ec5a11815301e94" - name = "github.com/shurcooL/go" - packages = ["indentwriter"] - pruneopts = "NUT" - revision = "20b4b0a352116a106a505a8c528b6513e7e0d5c2" - -[[projects]] - branch = "master" - digest = "1:81fc235daf173fbcabfda91e1d5d1d918a057f33e30b57dc72fa6091047ac718" - name = "github.com/shurcooL/markdownfmt" - packages = ["markdown"] - pruneopts = "NUT" - revision = "10aae0a270abfb5d929ae6ca59c4b0ac0fa8f237" - -[[projects]] - branch = "master" - digest = "1:400359f0b394fb168f4aee9621d42cc005810c6e462009d5fc76055d5e96dcf3" - name = "github.com/shurcooL/sanitized_anchor_name" - packages = ["."] - pruneopts = "NUT" - revision = "1dba4b3954bc059efc3991ec364f9f9a35f597d2" - -[[projects]] - branch = "master" - digest = "1:75d8ef7fd5eb922263b8c8f30aae17ddd6876ed3bc52c17d8406553d123f8770" - name = "github.com/spf13/pflag" - packages = ["."] - pruneopts = "NUT" - revision = "2300d0f8576fe575f71aaa5b9bbe4e1b0dc2eb51" - -[[projects]] - digest = "1:b5c8b4a0ad5f65a85eb2a9f89e30c638ef8b99f8a3f078467cea778869757666" - name = "github.com/stretchr/testify" - packages = ["assert"] - pruneopts = "NUT" - revision = "69483b4bd14f5845b5a1e55bca19e954e827f1d0" - version = "v1.1.4" - -[[projects]] - branch = "master" - digest = "1:9137e62a44c92cd9fe7d563b8480a6fbb2cd97815ef194a37696d9635a6a4056" - name = "github.com/syndtr/goleveldb" - packages = [ - "leveldb", - "leveldb/cache", - "leveldb/comparer", - "leveldb/errors", - "leveldb/filter", - "leveldb/iterator", - "leveldb/journal", - "leveldb/memdb", - "leveldb/opt", - "leveldb/storage", - "leveldb/table", - "leveldb/util", - ] - pruneopts = "NUT" - revision = "8c81ea47d4c41a385645e133e15510fc6a2a74b4" - -[[projects]] - branch = "master" - digest = "1:af13b22439d69b477caf532439fdcbb3e2a18bde35d3135003f8be46bb8d8967" - name = "github.com/ugorji/go" - packages = ["codec"] - pruneopts = "NUT" - revision = "708a42d246822952f38190a8d8c4e6b16a0e600c" - -[[projects]] - branch = "master" - digest = "1:95100f4ac20072567aa10607f61c66ff28965659f77f6ba807bd875a685710d9" - name = "golang.org/x/crypto" - packages = [ - "bcrypt", - "blowfish", - ] - pruneopts = "NUT" - revision = "0242f07995e684be54f2a2776327141acf1cef91" - -[[projects]] - branch = "master" - digest = "1:9c7239e01cf1289afb7460a80b820bcaa5638add06e5cf55e676950b414c817d" - name = "golang.org/x/net" - packages = [ - "context", - "context/ctxhttp", - "http2", - "http2/hpack", - "idna", - "internal/timeseries", - "lex/httplex", - "trace", - "websocket", - ] - pruneopts = "NUT" - revision = "d212a1ef2de2f5d441c327b8f26cf3ea3ea9f265" - -[[projects]] - branch = "master" - digest = "1:da311e132160fec8dfc9e659915b8f942e5563c27bbf3c45d2c9e67a1434ef65" - name = "golang.org/x/oauth2" - packages = [ - ".", - "google", - "internal", - "jws", - "jwt", - ] - pruneopts = "NUT" - revision = "a6bd8cefa1811bd24b86f8902872e4e8225f74c4" - -[[projects]] - branch = "master" - digest = "1:49763f4a63eaef31cde11bc013e9d250e294fb5fc8b02b9c93807fc430106cf9" - name = "golang.org/x/sys" - packages = [ - "unix", - "windows", - "windows/registry", - "windows/svc/eventlog", - ] - pruneopts = "NUT" - revision = "f3918c30c5c2cb527c0b071a27c35120a6c0719a" - -[[projects]] - branch = "master" - digest = "1:35e546e3d2af2735e23a5698e0d5c87f7b0ca5683b3fbc25a10bcf397e032d19" - name = "golang.org/x/text" - packages = [ - "internal/gen", - "internal/triegen", - "internal/ucd", - "secure/bidirule", - "transform", - "unicode/bidi", - "unicode/cldr", - "unicode/norm", - "unicode/rangetable", - "width", - ] - pruneopts = "NUT" - revision = "a9a820217f98f7c8a207ec1e45a874e1fe12c478" - -[[projects]] - branch = "master" - digest = "1:9f32afa47f2da74cef7fd3ace0c5b8bf7476f432e4a1c7163ecdd22cf17154b8" - name = "google.golang.org/api" - packages = [ - "compute/v1", - "gensupport", - "googleapi", - "googleapi/internal/uritemplates", - ] - pruneopts = "NUT" - revision = "fbbaff1827317122a8a0e1b24de25df8417ce87b" - -[[projects]] - digest = "1:7206d98ec77c90c72ec2c405181a1dcf86965803b6dbc4f98ceab7a5047c37a9" - name = "google.golang.org/appengine" - packages = [ - ".", - "internal", - "internal/app_identity", - "internal/base", - "internal/datastore", - "internal/log", - "internal/modules", - "internal/remote_api", - "internal/urlfetch", - "urlfetch", - ] - pruneopts = "NUT" - revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a" - version = "v1.0.0" - -[[projects]] - digest = "1:73ac483b9160d55bbdaa4ca261234e391bd14ac69cfb172bead53e421197a0f0" - name = "google.golang.org/grpc" - packages = [ - ".", - "codes", - "credentials", - "grpclog", - "internal", - "keepalive", - "metadata", - "naming", - "peer", - "stats", - "tap", - "transport", - ] - pruneopts = "NUT" - revision = "8050b9cbc271307e5a716a9d782803d09b0d6f2d" - version = "v1.2.1" - -[[projects]] - branch = "v3" - digest = "1:1244a9b3856f70d5ffb74bbfd780fc9d47f93f2049fa265c6fb602878f507bf8" - name = "gopkg.in/alexcesaro/quotedprintable.v3" - packages = ["."] - pruneopts = "NUT" - revision = "2caba252f4dc53eaf6b553000885530023f54623" - -[[projects]] - digest = "1:c970218a20933dd0a2eb2006de922217fa9276f57d25009b2a934eb1c50031cc" - name = "gopkg.in/fsnotify.v1" - packages = ["."] - pruneopts = "NUT" - revision = "629574ca2a5df945712d3079857300b5e4da0236" - source = "git@github.com:fsnotify/fsnotify" - -[[projects]] - digest = "1:d852dd703c644c976246382fe1539e8585cc20d642d3e68d3dff8de952237497" - name = "gopkg.in/gomail.v2" - packages = ["."] - pruneopts = "NUT" - revision = "41f3572897373c5538c50a2402db15db079fa4fd" - version = "2.0.0" - -[[projects]] - digest = "1:ef72505cf098abdd34efeea032103377bec06abb61d8a06f002d5d296a4b1185" - name = "gopkg.in/inf.v0" - packages = ["."] - pruneopts = "NUT" - revision = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4" - version = "v0.9.0" - -[[projects]] - branch = "v2" - digest = "1:ad6f94355d292690137613735965bd3688844880fdab90eccf66321910344942" - name = "gopkg.in/yaml.v2" - packages = ["."] - pruneopts = "NUT" - revision = "a5b47d31c556af34a302ce5d659e6fea44d90de0" - -[[projects]] - digest = "1:250d6f7f059d3ebceea5e6deed3561878b0c9807d5c17d58f7ca1890e4193f88" - name = "k8s.io/client-go" - packages = [ - "1.5/discovery", - "1.5/kubernetes", - "1.5/kubernetes/typed/apps/v1alpha1", - "1.5/kubernetes/typed/authentication/v1beta1", - "1.5/kubernetes/typed/authorization/v1beta1", - "1.5/kubernetes/typed/autoscaling/v1", - "1.5/kubernetes/typed/batch/v1", - "1.5/kubernetes/typed/certificates/v1alpha1", - "1.5/kubernetes/typed/core/v1", - "1.5/kubernetes/typed/extensions/v1beta1", - "1.5/kubernetes/typed/policy/v1alpha1", - "1.5/kubernetes/typed/rbac/v1alpha1", - "1.5/kubernetes/typed/storage/v1beta1", - "1.5/pkg/api", - "1.5/pkg/api/errors", - "1.5/pkg/api/install", - "1.5/pkg/api/meta", - "1.5/pkg/api/meta/metatypes", - "1.5/pkg/api/resource", - "1.5/pkg/api/unversioned", - "1.5/pkg/api/v1", - "1.5/pkg/api/validation/path", - "1.5/pkg/apimachinery", - "1.5/pkg/apimachinery/announced", - "1.5/pkg/apimachinery/registered", - "1.5/pkg/apis/apps", - "1.5/pkg/apis/apps/install", - "1.5/pkg/apis/apps/v1alpha1", - "1.5/pkg/apis/authentication", - "1.5/pkg/apis/authentication/install", - "1.5/pkg/apis/authentication/v1beta1", - "1.5/pkg/apis/authorization", - "1.5/pkg/apis/authorization/install", - "1.5/pkg/apis/authorization/v1beta1", - "1.5/pkg/apis/autoscaling", - "1.5/pkg/apis/autoscaling/install", - "1.5/pkg/apis/autoscaling/v1", - "1.5/pkg/apis/batch", - "1.5/pkg/apis/batch/install", - "1.5/pkg/apis/batch/v1", - "1.5/pkg/apis/batch/v2alpha1", - "1.5/pkg/apis/certificates", - "1.5/pkg/apis/certificates/install", - "1.5/pkg/apis/certificates/v1alpha1", - "1.5/pkg/apis/extensions", - "1.5/pkg/apis/extensions/install", - "1.5/pkg/apis/extensions/v1beta1", - "1.5/pkg/apis/policy", - "1.5/pkg/apis/policy/install", - "1.5/pkg/apis/policy/v1alpha1", - "1.5/pkg/apis/rbac", - "1.5/pkg/apis/rbac/install", - "1.5/pkg/apis/rbac/v1alpha1", - "1.5/pkg/apis/storage", - "1.5/pkg/apis/storage/install", - "1.5/pkg/apis/storage/v1beta1", - "1.5/pkg/auth/user", - "1.5/pkg/conversion", - "1.5/pkg/conversion/queryparams", - "1.5/pkg/fields", - "1.5/pkg/genericapiserver/openapi/common", - "1.5/pkg/labels", - "1.5/pkg/runtime", - "1.5/pkg/runtime/serializer", - "1.5/pkg/runtime/serializer/json", - "1.5/pkg/runtime/serializer/protobuf", - "1.5/pkg/runtime/serializer/recognizer", - "1.5/pkg/runtime/serializer/streaming", - "1.5/pkg/runtime/serializer/versioning", - "1.5/pkg/selection", - "1.5/pkg/third_party/forked/golang/reflect", - "1.5/pkg/types", - "1.5/pkg/util", - "1.5/pkg/util/cert", - "1.5/pkg/util/clock", - "1.5/pkg/util/errors", - "1.5/pkg/util/flowcontrol", - "1.5/pkg/util/framer", - "1.5/pkg/util/integer", - "1.5/pkg/util/intstr", - "1.5/pkg/util/json", - "1.5/pkg/util/labels", - "1.5/pkg/util/net", - "1.5/pkg/util/parsers", - "1.5/pkg/util/rand", - "1.5/pkg/util/runtime", - "1.5/pkg/util/sets", - "1.5/pkg/util/uuid", - "1.5/pkg/util/validation", - "1.5/pkg/util/validation/field", - "1.5/pkg/util/wait", - "1.5/pkg/util/yaml", - "1.5/pkg/version", - "1.5/pkg/watch", - "1.5/pkg/watch/versioned", - "1.5/plugin/pkg/client/auth", - "1.5/plugin/pkg/client/auth/gcp", - "1.5/plugin/pkg/client/auth/oidc", - "1.5/rest", - "1.5/tools/cache", - "1.5/tools/clientcmd/api", - "1.5/tools/metrics", - "1.5/transport", - ] - pruneopts = "NUT" - revision = "1195e3a8ee1a529d53eed7c624527a68555ddf1f" - version = "v1.5.1" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/BurntSushi/toml", - "github.com/aws/aws-sdk-go/aws", - "github.com/aws/aws-sdk-go/aws/awserr", - "github.com/aws/aws-sdk-go/aws/credentials", - "github.com/aws/aws-sdk-go/aws/session", - "github.com/aws/aws-sdk-go/service/autoscaling", - "github.com/benbjohnson/tmpl", - "github.com/boltdb/bolt", - "github.com/cenkalti/backoff", - "github.com/davecgh/go-spew/spew", - "github.com/dgrijalva/jwt-go", - "github.com/docker/docker/api/types", - "github.com/docker/docker/api/types/swarm", - "github.com/dustin/go-humanize", - "github.com/eclipse/paho.mqtt.golang", - "github.com/evanphx/json-patch", - "github.com/ghodss/yaml", - "github.com/golang/protobuf/proto", - "github.com/golang/protobuf/protoc-gen-go", - "github.com/google/go-cmp/cmp", - "github.com/google/go-cmp/cmp/cmpopts", - "github.com/google/uuid", - "github.com/gorhill/cronexpr", - "github.com/influxdata/influxdb", - "github.com/influxdata/influxdb/client", - "github.com/influxdata/influxdb/client/v2", - "github.com/influxdata/influxdb/influxql", - "github.com/influxdata/influxdb/models", - "github.com/influxdata/influxdb/services/collectd", - "github.com/influxdata/influxdb/services/graphite", - "github.com/influxdata/influxdb/services/meta", - "github.com/influxdata/influxdb/services/opentsdb", - "github.com/influxdata/influxdb/services/udp", - "github.com/influxdata/influxdb/toml", - "github.com/influxdata/influxdb/uuid", - "github.com/influxdata/usage-client/v1", - "github.com/influxdata/wlog", - "github.com/k-sone/snmpgo", - "github.com/mailru/easyjson", - "github.com/mailru/easyjson/easyjson", - "github.com/mailru/easyjson/jlexer", - "github.com/mailru/easyjson/jwriter", - "github.com/mitchellh/copystructure", - "github.com/mitchellh/mapstructure", - "github.com/mitchellh/reflectwalk", - "github.com/pkg/errors", - "github.com/prometheus/common/log", - "github.com/prometheus/common/model", - "github.com/prometheus/prometheus/config", - "github.com/prometheus/prometheus/discovery", - "github.com/prometheus/prometheus/discovery/azure", - "github.com/prometheus/prometheus/discovery/consul", - "github.com/prometheus/prometheus/discovery/dns", - "github.com/prometheus/prometheus/discovery/ec2", - "github.com/prometheus/prometheus/discovery/file", - "github.com/prometheus/prometheus/discovery/gce", - "github.com/prometheus/prometheus/discovery/marathon", - "github.com/prometheus/prometheus/discovery/triton", - "github.com/prometheus/prometheus/discovery/zookeeper", - "github.com/prometheus/prometheus/retrieval", - "github.com/prometheus/prometheus/storage", - "github.com/segmentio/kafka-go", - "github.com/serenize/snaker", - "github.com/shurcooL/markdownfmt/markdown", - "github.com/stretchr/testify/assert", - "gopkg.in/gomail.v2", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index da62fa112..000000000 --- a/Gopkg.toml +++ /dev/null @@ -1,79 +0,0 @@ -required = [ - "github.com/benbjohnson/tmpl", - "github.com/golang/protobuf/protoc-gen-go", - "github.com/mailru/easyjson/easyjson", -] - -[prune] - unused-packages = true - go-tests = true - non-go = true - -[[constraint]] - branch = "master" - name = "github.com/davecgh/go-spew" - -[[constraint]] - branch = "master" - name = "github.com/mailru/easyjson" - -[[constraint]] - branch = "master" - name = "github.com/evanphx/json-patch" - -[[constraint]] - branch = "master" - name = "github.com/ghodss/yaml" - -[[constraint]] - branch = "master" - name = "github.com/google/uuid" - -[[constraint]] - name = "github.com/influxdata/influxdb" - version = "~1.1.0" - -[[constraint]] - branch = "master" - name = "github.com/mitchellh/mapstructure" - -[[constraint]] - branch = "logger-targetmanager-wait" - name = "github.com/prometheus/prometheus" - source = "github.com/goller/prometheus" - -[[constraint]] - branch = "master" - name = "github.com/shurcooL/markdownfmt" - -[[constraint]] - name = "github.com/eclipse/paho.mqtt.golang" - version = "~1.0.0" - -[[constraint]] - name = "github.com/gorhill/cronexpr" - branch = "master" - -# Pin BurntSushi/toml to the same version used in influxdb -# This also avoids using a version with the WTFPL license -[[constraint]] - name= "github.com/BurntSushi/toml" - revision = "a368813c5e648fee92e5f6c30e3944ff9d5e8895" - -# Force the Azure projects to be a specific older version that Prometheus needs -[[override]] - name = "github.com/Azure/azure-sdk-for-go" - revision = "bd73d950fa4440dae889bd9917bff7cef539f86e" - -[[override]] - name = "github.com/Azure/go-autorest" - revision = "a2fdd780c9a50455cecd249b00bdc3eb73a78e31" - -[[override]] - name= "gopkg.in/fsnotify.v1" - revision = "629574ca2a5df945712d3079857300b5e4da0236" - source = "git@github.com:fsnotify/fsnotify" - -[[override]] - name= "github.com/mailru/easyjson" - revision = "3fdea8d05856a0c8df22ed4bc71b3219245e4485" diff --git a/pipeline/tick/tick_test.go b/pipeline/tick/tick_test.go index 984dd214c..e98ab3502 100644 --- a/pipeline/tick/tick_test.go +++ b/pipeline/tick/tick_test.go @@ -2,7 +2,7 @@ package tick_test import ( "bytes" - "go/importer" + "go/token" "go/types" "strings" "testing" @@ -12,6 +12,7 @@ import ( "github.com/influxdata/kapacitor/pipeline" "github.com/influxdata/kapacitor/pipeline/tick" "github.com/influxdata/kapacitor/tick/stateful" + "golang.org/x/tools/go/packages" ) // TestPipelineImplemented checks if all nodes in the pipeline package @@ -20,19 +21,21 @@ import ( // If you get a test error here, then you need to implement // a conversion node from pipeline node to the ast node. func TestPipelineImplemented(t *testing.T) { - tickPkg, err := importer.For("source", nil).Import("github.com/influxdata/kapacitor/pipeline/tick") - if err != nil { - t.Fatalf("error importing github.com/influxdata/kapacitor/pipeline: %v", err) + loadConf := &packages.Config{ + Mode: packages.LoadMode(-1), // load all stuff + Fset: token.NewFileSet(), } - // tickScope lists all the types in the tick package - tickScope := tickPkg.Scope() - - pipelinePkg, err := importer.For("source", nil).Import("github.com/influxdata/kapacitor/pipeline") + pkgs, err := packages.Load(loadConf, + "github.com/influxdata/kapacitor/pipeline/tick", + "github.com/influxdata/kapacitor/pipeline") if err != nil { - t.Fatalf("error importing github.com/influxdata/kapacitor/pipeline: %v; perhaps kapacitor is not in $GOPATH/src/influxdata/kapacitor?", err) + t.Fatalf("error importing github.com/influxdata/kapacitor/pipeline/tick or github.com/influxdata/kapacitor/pipeline: %v", err) } - + tickPkg := pkgs[1].Types + tickScope := tickPkg.Scope() + pipelinePkg := pkgs[0].Types pipelineScope := pipelinePkg.Scope() + node := pipelineScope.Lookup("Node") if node == nil { t.Fatalf("%s.Node not found", pipelinePkg.Path()) From 9a571360b8afea2cadd98db3313c942a89c6ac5a Mon Sep 17 00:00:00 2001 From: "j. Emrys Landivar (docmerlin)" Date: Wed, 11 Aug 2021 16:00:19 -0500 Subject: [PATCH 09/10] chore: go mod tidy --- go.mod | 1 + 1 file changed, 1 insertion(+) diff --git a/go.mod b/go.mod index 2b3a26347..bc031e390 100644 --- a/go.mod +++ b/go.mod @@ -68,6 +68,7 @@ require ( go.etcd.io/bbolt v1.3.5 go.uber.org/zap v1.14.1 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad + golang.org/x/tools v0.1.0 google.golang.org/protobuf v1.25.0 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect From be362045e6dfe455507124e4c2ecae4fcef45141 Mon Sep 17 00:00:00 2001 From: "J. Emrys Landivar" Date: Mon, 20 Sep 2021 08:18:41 -0500 Subject: [PATCH 10/10] chore: Add blank line at end --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index da30f385a..b4a268797 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -120,4 +120,4 @@ workflows: only: - master jobs: - - nightly-build \ No newline at end of file + - nightly-build