From 3273e56bbc16711ec6bcee0265fe32ebf75ca8d7 Mon Sep 17 00:00:00 2001 From: Bo Du Date: Fri, 20 Mar 2020 17:03:32 -0400 Subject: [PATCH 01/43] [build] upgrade golang and builder --- docker/m3dbnode/Dockerfile | 6 ++++-- docker/m3dbnode/Dockerfile-setcap | 4 ++-- docker/m3dbnode/development.Dockerfile | 4 ++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docker/m3dbnode/Dockerfile b/docker/m3dbnode/Dockerfile index d883f05f38..9a823e025e 100644 --- a/docker/m3dbnode/Dockerfile +++ b/docker/m3dbnode/Dockerfile @@ -3,7 +3,7 @@ # dependency tool we have. Until we migrate to a new version of glide or go # modules, we need to use this older base image. # https://github.com/m3db/m3/issues/628 -FROM golang:1.12-alpine3.9 AS builder +FROM golang:1.14-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " # Install Glide @@ -19,9 +19,11 @@ RUN cd /go/src/github.com/m3db/m3/ && \ make m3dbnode-linux-amd64 # Stage 2: lightweight "release" -FROM alpine:latest +FROM alpine:3.11 LABEL maintainer="The M3DB Authors " +ENV GODEBUG madvdontneed=1 + EXPOSE 2379/tcp 2380/tcp 7201/tcp 7203/tcp 9000-9004/tcp RUN apk add --no-cache curl jq diff --git a/docker/m3dbnode/Dockerfile-setcap b/docker/m3dbnode/Dockerfile-setcap index d8a48521b1..8d5e0261e2 100644 --- a/docker/m3dbnode/Dockerfile-setcap +++ b/docker/m3dbnode/Dockerfile-setcap @@ -1,5 +1,5 @@ # stage 1: build -FROM golang:1.12-alpine3.9 AS builder +FROM golang:1.14-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " # Install Glide @@ -15,7 +15,7 @@ RUN cd /go/src/github.com/m3db/m3/ && \ make m3dbnode-linux-amd64 # Stage 2: lightweight "release" -FROM alpine:latest +FROM alpine:3.11 LABEL maintainer="The M3DB Authors " EXPOSE 2379/tcp 2380/tcp 7201/tcp 7203/tcp 9000-9004/tcp diff --git a/docker/m3dbnode/development.Dockerfile b/docker/m3dbnode/development.Dockerfile index bd5af11e59..e19984b0da 100644 --- a/docker/m3dbnode/development.Dockerfile +++ b/docker/m3dbnode/development.Dockerfile @@ -1,4 +1,8 @@ +<<<<<<< Updated upstream FROM alpine:latest +======= +FROM alpine:3.11 +>>>>>>> Stashed changes LABEL maintainer="The M3DB Authors " RUN apk add --no-cache curl jq From 4ad123dfac2c4d446a17ac368c32e0cb6ee2f166 Mon Sep 17 00:00:00 2001 From: Bo Du Date: Fri, 20 Mar 2020 17:03:58 -0400 Subject: [PATCH 02/43] [development] fix vagrant script kubeconfig location. --- scripts/vagrant/provision/setup_unprivileged.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vagrant/provision/setup_unprivileged.sh b/scripts/vagrant/provision/setup_unprivileged.sh index 1df2308450..0e1638f8a1 100755 --- a/scripts/vagrant/provision/setup_unprivileged.sh +++ b/scripts/vagrant/provision/setup_unprivileged.sh @@ -23,4 +23,4 @@ mv ${HOME}/go/bin/kind ${HOME}/bin # Setup kubectl to use the kind config echo '' >> ${HOME}/.bashrc -echo 'export KUBECONFIG=${HOME}/.kube/kind-config-kind' >> ${HOME}/.bashrc +echo 'export KUBECONFIG=${HOME}/.kube/config' >> ${HOME}/.bashrc From ebff2da906d95e82cbebd498b7d76e1500e5f9ea Mon Sep 17 00:00:00 2001 From: Bo Du Date: Wed, 1 Apr 2020 11:33:01 -0400 Subject: [PATCH 03/43] Unify docker image go/alpine versions. --- docker/m3aggregator/Dockerfile | 4 ++-- docker/m3aggregator/development.Dockerfile | 2 +- docker/m3collector/Dockerfile | 4 ++-- docker/m3collector/development.Dockerfile | 2 +- docker/m3coordinator/Dockerfile | 4 ++-- docker/m3coordinator/development.Dockerfile | 2 +- docker/m3dbnode/development.Dockerfile | 4 ---- docker/m3nsch/Dockerfile | 4 ++-- docker/m3query/Dockerfile | 4 ++-- docker/m3query/development.Dockerfile | 2 +- docker/sysctl-setter/Dockerfile | 2 +- 11 files changed, 15 insertions(+), 19 deletions(-) diff --git a/docker/m3aggregator/Dockerfile b/docker/m3aggregator/Dockerfile index 56cdc1e4a0..3cc13d6039 100644 --- a/docker/m3aggregator/Dockerfile +++ b/docker/m3aggregator/Dockerfile @@ -1,5 +1,5 @@ # stage 1: build -FROM golang:1.12-alpine3.9 AS builder +FROM golang:1.14-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " # Install Glide @@ -15,7 +15,7 @@ RUN cd /go/src/github.com/m3db/m3/ && \ make m3aggregator-linux-amd64 # stage 2: lightweight "release" -FROM alpine:latest +FROM alpine:3.11 LABEL maintainer="The M3DB Authors " EXPOSE 5000/tcp 6000/tcp 6001/tcp diff --git a/docker/m3aggregator/development.Dockerfile b/docker/m3aggregator/development.Dockerfile index eb4a40906a..ee649c4d64 100644 --- a/docker/m3aggregator/development.Dockerfile +++ b/docker/m3aggregator/development.Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.11 LABEL maintainer="The M3DB Authors " EXPOSE 5000/tcp 6000/tcp 6001/tcp diff --git a/docker/m3collector/Dockerfile b/docker/m3collector/Dockerfile index 5c81965a2c..ae74306bac 100644 --- a/docker/m3collector/Dockerfile +++ b/docker/m3collector/Dockerfile @@ -1,5 +1,5 @@ # stage 1: build -FROM golang:1.12-alpine3.9 AS builder +FROM golang:1.14-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " # Install Glide @@ -15,7 +15,7 @@ RUN cd /go/src/github.com/m3db/m3/ && \ make m3collector-linux-amd64 # stage 2: lightweight "release" -FROM alpine:latest +FROM alpine:3.11 LABEL maintainer="The M3DB Authors " EXPOSE 7206-7207/tcp diff --git a/docker/m3collector/development.Dockerfile b/docker/m3collector/development.Dockerfile index e391da0b65..47a0a6942d 100644 --- a/docker/m3collector/development.Dockerfile +++ b/docker/m3collector/development.Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.11 LABEL maintainer="The M3DB Authors " EXPOSE 7206/tcp 7207/tcp diff --git a/docker/m3coordinator/Dockerfile b/docker/m3coordinator/Dockerfile index ec15246cae..da13690108 100644 --- a/docker/m3coordinator/Dockerfile +++ b/docker/m3coordinator/Dockerfile @@ -1,5 +1,5 @@ # stage 1: build -FROM golang:1.12-alpine3.9 AS builder +FROM golang:1.14-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " # Install Glide @@ -15,7 +15,7 @@ RUN cd /go/src/github.com/m3db/m3/ && \ make m3coordinator-linux-amd64 # stage 2: lightweight "release" -FROM alpine:latest +FROM alpine:3.11 LABEL maintainer="The M3DB Authors " EXPOSE 7201/tcp 7203/tcp diff --git a/docker/m3coordinator/development.Dockerfile b/docker/m3coordinator/development.Dockerfile index 9e08aee1d7..ef519ebb6b 100644 --- a/docker/m3coordinator/development.Dockerfile +++ b/docker/m3coordinator/development.Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.11 LABEL maintainer="The M3DB Authors " EXPOSE 7201/tcp 7203/tcp diff --git a/docker/m3dbnode/development.Dockerfile b/docker/m3dbnode/development.Dockerfile index e19984b0da..fe224661a9 100644 --- a/docker/m3dbnode/development.Dockerfile +++ b/docker/m3dbnode/development.Dockerfile @@ -1,8 +1,4 @@ -<<<<<<< Updated upstream -FROM alpine:latest -======= FROM alpine:3.11 ->>>>>>> Stashed changes LABEL maintainer="The M3DB Authors " RUN apk add --no-cache curl jq diff --git a/docker/m3nsch/Dockerfile b/docker/m3nsch/Dockerfile index 7adea0104e..1ede109ec8 100644 --- a/docker/m3nsch/Dockerfile +++ b/docker/m3nsch/Dockerfile @@ -1,5 +1,5 @@ # stage 1: build -FROM golang:1.12-alpine3.9 AS builder +FROM golang:1.14-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " # Install Glide @@ -16,7 +16,7 @@ RUN cd /go/src/github.com/m3db/m3/ && \ make m3nsch_client-linux-amd64 # stage 2: lightweight "release" -FROM alpine:latest +FROM alpine:3.11 LABEL maintainer="The M3DB Authors " COPY --from=builder /go/src/github.com/m3db/m3/bin/m3nsch_server /bin/ diff --git a/docker/m3query/Dockerfile b/docker/m3query/Dockerfile index 2788256110..641846082b 100644 --- a/docker/m3query/Dockerfile +++ b/docker/m3query/Dockerfile @@ -1,5 +1,5 @@ # stage 1: build -FROM golang:1.12-alpine3.9 AS builder +FROM golang:1.14-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " # Install Glide @@ -15,7 +15,7 @@ RUN cd /go/src/github.com/m3db/m3/ && \ make m3query-linux-amd64 # stage 2: lightweight "release" -FROM alpine:latest +FROM alpine:3.11 LABEL maintainer="The M3DB Authors " EXPOSE 7201/tcp 7203/tcp diff --git a/docker/m3query/development.Dockerfile b/docker/m3query/development.Dockerfile index cd32657222..876657a355 100644 --- a/docker/m3query/development.Dockerfile +++ b/docker/m3query/development.Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.11 LABEL maintainer="The M3DB Authors " EXPOSE 7201/tcp 7203/tcp diff --git a/docker/sysctl-setter/Dockerfile b/docker/sysctl-setter/Dockerfile index 7c63bc3a3e..9a053a4fc1 100644 --- a/docker/sysctl-setter/Dockerfile +++ b/docker/sysctl-setter/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.11 LABEL maintainer="The M3DB Authors " RUN apk add --no-cache procps && echo $'#!/bin/ash\n\ From effdffea08ee787c411bb506404907e1340b3f92 Mon Sep 17 00:00:00 2001 From: Bo Du Date: Wed, 1 Apr 2020 12:05:56 -0400 Subject: [PATCH 04/43] Unify go versions for BK pipeline. --- .buildkite/pipeline.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 490570947f..9f47465a27 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -14,7 +14,7 @@ steps: command: make clean install-vendor-m3 test-all-gen env: CGO_ENABLED: 0 - GIMME_GO_VERSION: 1.12.x + GIMME_GO_VERSION: 1.14.x plugins: gopath-checkout#v1.0.1: import: github.com/m3db/m3 @@ -47,7 +47,7 @@ steps: parallelism: 2 env: CGO_ENABLED: 0 - GIMME_GO_VERSION: 1.13.x + GIMME_GO_VERSION: 1.14.x plugins: gopath-checkout#v1.0.1: import: github.com/m3db/m3 @@ -57,7 +57,7 @@ steps: parallelism: 1 env: CGO_ENABLED: 0 - GIMME_GO_VERSION: 1.13.x + GIMME_GO_VERSION: 1.14.x plugins: gopath-checkout#v1.0.1: import: github.com/m3db/m3 @@ -90,7 +90,7 @@ steps: command: make clean install-vendor-m3 docs-test env: CGO_ENABLED: 0 - GIMME_GO_VERSION: 1.12.x + GIMME_GO_VERSION: 1.14.x plugins: gopath-checkout#v1.0.1: import: github.com/m3db/m3 From 6d8c342f41b4702f98cfed2fff56c7d5361bf3ab Mon Sep 17 00:00:00 2001 From: Bo Du Date: Wed, 1 Apr 2020 12:49:51 -0400 Subject: [PATCH 05/43] Set go version for failing BK steps. --- .buildkite/pipeline.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 9f47465a27..6a7b48cae2 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -37,6 +37,8 @@ steps: <<: *common - name: "Services, Tools, Metalint" command: make clean install-vendor-m3 services tools metalint + env: + GIMME_GO_VERSION: 1.14.x plugins: docker-compose#v2.5.1: run: app @@ -97,6 +99,8 @@ steps: <<: *common - label: "FOSSA license scan" command: make clean install-vendor-m3 fossa + env: + GIMME_GO_VERSION: 1.14.x plugins: docker-compose#v2.5.1: run: app From a238bbfc09ad11dba429dfb0c124e3f9745f1fbf Mon Sep 17 00:00:00 2001 From: Bo Du Date: Wed, 1 Apr 2020 13:24:12 -0400 Subject: [PATCH 06/43] Set CGO opt. --- .buildkite/pipeline.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 6a7b48cae2..484064523b 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -38,6 +38,7 @@ steps: - name: "Services, Tools, Metalint" command: make clean install-vendor-m3 services tools metalint env: + CGO_ENABLED: 0 GIMME_GO_VERSION: 1.14.x plugins: docker-compose#v2.5.1: @@ -100,6 +101,7 @@ steps: - label: "FOSSA license scan" command: make clean install-vendor-m3 fossa env: + CGO_ENABLED: 0 GIMME_GO_VERSION: 1.14.x plugins: docker-compose#v2.5.1: From fc96bd7ad9146847580c9bd9836d649ee532507a Mon Sep 17 00:00:00 2001 From: Bo Du Date: Wed, 1 Apr 2020 13:45:09 -0400 Subject: [PATCH 07/43] Update docker-compose build container to 1.14. --- .buildkite/pipeline.yml | 6 ------ docker-compose.yml | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 484064523b..9f47465a27 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -37,9 +37,6 @@ steps: <<: *common - name: "Services, Tools, Metalint" command: make clean install-vendor-m3 services tools metalint - env: - CGO_ENABLED: 0 - GIMME_GO_VERSION: 1.14.x plugins: docker-compose#v2.5.1: run: app @@ -100,9 +97,6 @@ steps: <<: *common - label: "FOSSA license scan" command: make clean install-vendor-m3 fossa - env: - CGO_ENABLED: 0 - GIMME_GO_VERSION: 1.14.x plugins: docker-compose#v2.5.1: run: app diff --git a/docker-compose.yml b/docker-compose.yml index 3d4348e289..36aa185329 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ app: - image: golang:1.12-stretch + image: golang:1.14-stretch volumes: - .:/go/src/github.com/m3db/m3 - /usr/bin/buildkite-agent:/usr/bin/buildkite-agent From b955fa11739b093fee6ad798dd8caefc2ff22e9e Mon Sep 17 00:00:00 2001 From: Bo Du Date: Wed, 1 Apr 2020 14:11:41 -0400 Subject: [PATCH 08/43] Try buster --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 36aa185329..c521c7228d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ app: - image: golang:1.14-stretch + image: golang:1.14-buster volumes: - .:/go/src/github.com/m3db/m3 - /usr/bin/buildkite-agent:/usr/bin/buildkite-agent From de54ba745306cdc0e3c48db885a704fd51a708fb Mon Sep 17 00:00:00 2001 From: Rob Skillington Date: Sat, 18 Apr 2020 16:18:26 -0400 Subject: [PATCH 09/43] Use Go 1.13 and make sure using madvise=dontneed --- .buildkite/pipeline.yml | 8 ++++---- docker-compose.yml | 2 +- docker/m3aggregator/Dockerfile | 2 +- docker/m3collector/Dockerfile | 2 +- docker/m3coordinator/Dockerfile | 2 +- docker/m3dbnode/Dockerfile | 2 +- docker/m3dbnode/Dockerfile-setcap | 4 +++- docker/m3dbnode/development.Dockerfile | 2 ++ docker/m3nsch/Dockerfile | 2 +- docker/m3query/Dockerfile | 2 +- 10 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 9f47465a27..c71d836da5 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -14,7 +14,7 @@ steps: command: make clean install-vendor-m3 test-all-gen env: CGO_ENABLED: 0 - GIMME_GO_VERSION: 1.14.x + GIMME_GO_VERSION: 1.13.x plugins: gopath-checkout#v1.0.1: import: github.com/m3db/m3 @@ -47,7 +47,7 @@ steps: parallelism: 2 env: CGO_ENABLED: 0 - GIMME_GO_VERSION: 1.14.x + GIMME_GO_VERSION: 1.13.x plugins: gopath-checkout#v1.0.1: import: github.com/m3db/m3 @@ -57,7 +57,7 @@ steps: parallelism: 1 env: CGO_ENABLED: 0 - GIMME_GO_VERSION: 1.14.x + GIMME_GO_VERSION: 1.13.x plugins: gopath-checkout#v1.0.1: import: github.com/m3db/m3 @@ -90,7 +90,7 @@ steps: command: make clean install-vendor-m3 docs-test env: CGO_ENABLED: 0 - GIMME_GO_VERSION: 1.14.x + GIMME_GO_VERSION: 1.13.x plugins: gopath-checkout#v1.0.1: import: github.com/m3db/m3 diff --git a/docker-compose.yml b/docker-compose.yml index c521c7228d..5097f20e75 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ app: - image: golang:1.14-buster + image: golang:1.13-stretch volumes: - .:/go/src/github.com/m3db/m3 - /usr/bin/buildkite-agent:/usr/bin/buildkite-agent diff --git a/docker/m3aggregator/Dockerfile b/docker/m3aggregator/Dockerfile index 3cc13d6039..31057d1170 100644 --- a/docker/m3aggregator/Dockerfile +++ b/docker/m3aggregator/Dockerfile @@ -1,5 +1,5 @@ # stage 1: build -FROM golang:1.14-alpine3.11 AS builder +FROM golang:1.13-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " # Install Glide diff --git a/docker/m3collector/Dockerfile b/docker/m3collector/Dockerfile index ae74306bac..ce8435e199 100644 --- a/docker/m3collector/Dockerfile +++ b/docker/m3collector/Dockerfile @@ -1,5 +1,5 @@ # stage 1: build -FROM golang:1.14-alpine3.11 AS builder +FROM golang:1.13-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " # Install Glide diff --git a/docker/m3coordinator/Dockerfile b/docker/m3coordinator/Dockerfile index da13690108..df166f71c0 100644 --- a/docker/m3coordinator/Dockerfile +++ b/docker/m3coordinator/Dockerfile @@ -1,5 +1,5 @@ # stage 1: build -FROM golang:1.14-alpine3.11 AS builder +FROM golang:1.13-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " # Install Glide diff --git a/docker/m3dbnode/Dockerfile b/docker/m3dbnode/Dockerfile index 9a823e025e..cd9e898799 100644 --- a/docker/m3dbnode/Dockerfile +++ b/docker/m3dbnode/Dockerfile @@ -3,7 +3,7 @@ # dependency tool we have. Until we migrate to a new version of glide or go # modules, we need to use this older base image. # https://github.com/m3db/m3/issues/628 -FROM golang:1.14-alpine3.11 AS builder +FROM golang:1.13-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " # Install Glide diff --git a/docker/m3dbnode/Dockerfile-setcap b/docker/m3dbnode/Dockerfile-setcap index 8d5e0261e2..446f61018d 100644 --- a/docker/m3dbnode/Dockerfile-setcap +++ b/docker/m3dbnode/Dockerfile-setcap @@ -1,5 +1,5 @@ # stage 1: build -FROM golang:1.14-alpine3.11 AS builder +FROM golang:1.13-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " # Install Glide @@ -18,6 +18,8 @@ RUN cd /go/src/github.com/m3db/m3/ && \ FROM alpine:3.11 LABEL maintainer="The M3DB Authors " +ENV GODEBUG madvdontneed=1 + EXPOSE 2379/tcp 2380/tcp 7201/tcp 7203/tcp 9000-9004/tcp COPY --from=builder /go/src/github.com/m3db/m3/src/dbnode/config/m3dbnode-local-etcd.yml /etc/m3dbnode/m3dbnode.yml diff --git a/docker/m3dbnode/development.Dockerfile b/docker/m3dbnode/development.Dockerfile index fe224661a9..b068c3d8cd 100644 --- a/docker/m3dbnode/development.Dockerfile +++ b/docker/m3dbnode/development.Dockerfile @@ -1,6 +1,8 @@ FROM alpine:3.11 LABEL maintainer="The M3DB Authors " +ENV GODEBUG madvdontneed=1 + RUN apk add --no-cache curl jq # Add m3dbnode binary diff --git a/docker/m3nsch/Dockerfile b/docker/m3nsch/Dockerfile index 1ede109ec8..9392f110f3 100644 --- a/docker/m3nsch/Dockerfile +++ b/docker/m3nsch/Dockerfile @@ -1,5 +1,5 @@ # stage 1: build -FROM golang:1.14-alpine3.11 AS builder +FROM golang:1.13-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " # Install Glide diff --git a/docker/m3query/Dockerfile b/docker/m3query/Dockerfile index 641846082b..7589adce11 100644 --- a/docker/m3query/Dockerfile +++ b/docker/m3query/Dockerfile @@ -1,5 +1,5 @@ # stage 1: build -FROM golang:1.14-alpine3.11 AS builder +FROM golang:1.13-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " # Install Glide From 8e8c3f34269663e343d1ba738d26e7cb1faaf165 Mon Sep 17 00:00:00 2001 From: Rob Skillington Date: Fri, 1 May 2020 01:33:53 -0400 Subject: [PATCH 10/43] Always make tools path writable so can delete files after --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 947093fb42..4194368c56 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,8 @@ gopath_bin_path := $(GOPATH)/bin m3_package := github.com/m3db/m3 m3_package_path := $(gopath_prefix)/$(m3_package) mockgen_package := github.com/golang/mock/mockgen -retool_bin_path := $(m3_package_path)/_tools/bin +retool_path := $(m3_package_path)/_tools +retool_bin_path := $(retool_path)/bin combined_bin_paths := $(retool_bin_path):$(gopath_bin_path) retool_src_prefix := $(m3_package_path)/_tools/src retool_package := github.com/twitchtv/retool @@ -203,6 +204,7 @@ install-tools: install-retool @echo "Installing retool dependencies" PATH=$(PATH):$(gopath_bin_path) retool $(retool_base_args) sync PATH=$(PATH):$(gopath_bin_path) retool $(retool_base_args) build + chmod -R +w $(retool_path) @# NB(r): to ensure correct version of mock-gen is present we match the version @# of the retool installed mockgen, and if not a match in binary contents, then From afca4e43962592163c88eb282bcfe73db9f7a9c6 Mon Sep 17 00:00:00 2001 From: Rob Skillington Date: Fri, 1 May 2020 02:40:21 -0400 Subject: [PATCH 11/43] Add precheckout hook --- .buildkite/hooks/pre-checkout | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 .buildkite/hooks/pre-checkout diff --git a/.buildkite/hooks/pre-checkout b/.buildkite/hooks/pre-checkout new file mode 100755 index 0000000000..c19519b3b6 --- /dev/null +++ b/.buildkite/hooks/pre-checkout @@ -0,0 +1,6 @@ +#!/bin/bash + +set -eo pipefail + +echo "--- :git: cleaning checkout" +chmod -R +w ./_tools From 0023c673cf55a0066587a76d0fdd73fc3af8e2c8 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 16:11:15 -0400 Subject: [PATCH 12/43] noop commit From cbad057417aeef42126df992905c4d3d95bce9bb Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 16:18:03 -0400 Subject: [PATCH 13/43] clean tools on checkout if exists --- .buildkite/hooks/pre-exit | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/hooks/pre-exit b/.buildkite/hooks/pre-exit index 8b4c59cdd3..497ac79f51 100644 --- a/.buildkite/hooks/pre-exit +++ b/.buildkite/hooks/pre-exit @@ -3,4 +3,5 @@ set -eo pipefail echo "--- :git: cleaning checkout" +chmod -R +w ./_tools || true git clean -dffx From 5a7658c3b2d570883b26bd50eb0b818dd6a959e1 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 18:00:26 -0400 Subject: [PATCH 14/43] change fossa sha --- tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools.json b/tools.json index a06ecd12fa..0e2ae30bc2 100644 --- a/tools.json +++ b/tools.json @@ -22,7 +22,7 @@ }, { "Repository": "github.com/fossas/fossa-cli/cmd/fossa", - "Commit": "638f9f79fac6fd4b4fa2eb575d1faea4c5d04807" + "Commit": "09c02d600ff887c45e98ddee975a857b6e0fae6c" }, { "Repository": "github.com/pointlander/peg", From e555d8890c6eb0133e3e6830e08f942dbcbcaf4a Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 19:07:02 -0400 Subject: [PATCH 15/43] manually install x/crypto pkg --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index eead46df26..fd616a3a77 100644 --- a/Makefile +++ b/Makefile @@ -218,6 +218,7 @@ install-retool: .PHONY: install-tools install-tools: install-retool @echo "Installing retool dependencies" + GOPATH=$(retool_path) go get golang.org/x/crypto/openpgp/armor PATH=$(PATH):$(gopath_bin_path) retool $(retool_base_args) sync PATH=$(PATH):$(gopath_bin_path) retool $(retool_base_args) build chmod -R +w $(retool_path) @@ -351,11 +352,11 @@ define SUBDIR_RULES # bundle. # ifeq ($(SUBDIR), kube) -# Builds the single kube bundle from individual manifest files. +# Builds the single kube bundle from individual manifest files. # all-gen-kube: install-tools # @echo "--- Generating kube bundle" # @./kube/scripts/build_bundle.sh -# find kube -name '*.yaml' -print0 | PATH=$(combined_bin_paths):$(PATH) xargs -0 kubeval -v=1.12.0 +# find kube -name '*.yaml' -print0 | PATH=$(combined_bin_paths):$(PATH) xargs -0 kubeval -v=1.12.0 # else From 8a83d511ff2f410860c4d85533bc8a4fe2e12bf1 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 19:22:02 -0400 Subject: [PATCH 16/43] gen module --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fd616a3a77..476b19c885 100644 --- a/Makefile +++ b/Makefile @@ -388,8 +388,8 @@ asset-gen-$(SUBDIR): install-tools genny-gen-$(SUBDIR): install-tools @echo "--- Generating genny files $(SUBDIR)" @[ ! -f $(SELF_DIR)/src/$(SUBDIR)/generated-source-files.mk ] || \ - PATH=$(combined_bin_paths):$(PATH) make -f $(SELF_DIR)/src/$(SUBDIR)/generated-source-files.mk $(genny_target) - @PATH=$(combined_bin_paths):$(PATH) bash -c "source ./scripts/auto-gen-helpers.sh && gen_cleanup_dir '*_gen.go' $(SELF_DIR)/src/$(SUBDIR)/ && gen_cleanup_dir '*_gen_test.go' $(SELF_DIR)/src/$(SUBDIR)/" + PATH=$(combined_bin_paths):$(PATH) GO111MODULE=on make -f $(SELF_DIR)/src/$(SUBDIR)/generated-source-files.mk $(genny_target) + @PATH=$(combined_bin_paths):$(PATH) GO111MODULE=on bash -c "source ./scripts/auto-gen-helpers.sh && gen_cleanup_dir '*_gen.go' $(SELF_DIR)/src/$(SUBDIR)/ && gen_cleanup_dir '*_gen_test.go' $(SELF_DIR)/src/$(SUBDIR)/" .PHONY: license-gen-$(SUBDIR) license-gen-$(SUBDIR): install-tools From 4f8eefe49dcec15a0d65d0dd98fe694b9c47f69d Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 20:10:18 -0400 Subject: [PATCH 17/43] mod v0 --- Makefile | 38 ++---- go.mod | 121 ++++++++++++++++++ ...index_single_node_high_concurrency_test.go | 2 +- src/dbnode/persist/fs/commitlog/reader.go | 2 +- src/m3ninx/postings/atomic.go | 2 +- src/x/resource/lifetime_test.go | 2 +- tools.go | 14 ++ 7 files changed, 150 insertions(+), 31 deletions(-) create mode 100644 go.mod create mode 100644 tools.go diff --git a/Makefile b/Makefile index 476b19c885..6d73715f83 100644 --- a/Makefile +++ b/Makefile @@ -211,35 +211,19 @@ tools-linux-amd64: all: metalint test-ci-unit test-ci-integration services tools @echo Made all successfully -.PHONY: install-retool -install-retool: - @which retool >/dev/null || go get $(retool_package) - .PHONY: install-tools -install-tools: install-retool +install-tools: @echo "Installing retool dependencies" - GOPATH=$(retool_path) go get golang.org/x/crypto/openpgp/armor - PATH=$(PATH):$(gopath_bin_path) retool $(retool_base_args) sync - PATH=$(PATH):$(gopath_bin_path) retool $(retool_base_args) build - chmod -R +w $(retool_path) - - @# NB(r): to ensure correct version of mock-gen is present we match the version - @# of the retool installed mockgen, and if not a match in binary contents, then - @# we explicitly install at the version we desire. - @# We cannot solely use the retool binary as mock-gen requires its full source - @# code to be present in the GOPATH at runtime. - @echo "Installing mockgen" - $(eval curr_mockgen_md5=`cat $(gopath_bin_path)/mockgen | go run $(m3_package_path)/scripts/md5/md5.go`) - $(eval retool_mockgen_md5=`cat $(retool_bin_path)/mockgen | go run $(m3_package_path)/scripts/md5/md5.go`) - @test "$(curr_mockgen_md5)" = "$(retool_mockgen_md5)" && echo "Mockgen already up to date" || ( \ - echo "Installing mockgen from Retool directory" && \ - rm -rf $(gopath_prefix)/$(mockgen_package) && \ - mkdir -p $(shell dirname $(gopath_prefix)/$(mockgen_package)) && \ - cp -r $(retool_src_prefix)/$(mockgen_package) $(gopath_prefix)/$(mockgen_package) && \ - (rm $(gopath_bin_path)/mockgen || echo "No installed mockgen" > /dev/null) && \ - cp $(retool_bin_path)/mockgen $(gopath_bin_path)/mockgen && \ - echo "Installed mockgen from Retool directory" \ - ) + GOBIN=$(retool_bin_path) go install github.com/fossas/fossa-cli/cmd/fossa + GOBIN=$(retool_bin_path) go install github.com/golang/mock/mockgen + GOBIN=$(retool_bin_path) go install github.com/google/go-jsonnet/cmd/jsonnet + GOBIN=$(retool_bin_path) go install github.com/m3db/build-tools/utilities/genclean + GOBIN=$(retool_bin_path) go install github.com/m3db/tools/update-license + GOBIN=$(retool_bin_path) go install github.com/Masterminds/glide + GOBIN=$(retool_bin_path) go install github.com/mauricelam/genny + GOBIN=$(retool_bin_path) go install github.com/mjibson/esc + GOBIN=$(retool_bin_path) go install github.com/pointlander/peg + GOBIN=$(retool_bin_path) go install github.com/rakyll/statik .PHONY: install-gometalinter install-gometalinter: diff --git a/go.mod b/go.mod new file mode 100644 index 0000000000..448c5bba32 --- /dev/null +++ b/go.mod @@ -0,0 +1,121 @@ +module github.com/m3db/m3 + +go 1.13 + +require ( + github.com/MichaelTJones/pcg v0.0.0-20180122055547-df440c6ed7ed + github.com/RoaringBitmap/roaring v0.4.21 + github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d + github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a + github.com/c2h5oh/datasize v0.0.0-20171227191756-4eba002a5eae + github.com/coreos/go-semver v0.2.0 + github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b + github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea + github.com/couchbase/vellum v0.0.0-20190626091642-41f2deade2cf + github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2 + github.com/dgrijalva/jwt-go v3.0.0+incompatible + github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712 + github.com/fortytw2/leaktest v1.2.1-0.20180901000122-b433bbd6d743 + github.com/fsnotify/fsnotify v1.4.8-0.20190312181446-1485a34d5d57 + github.com/ghodss/yaml v1.0.0 + github.com/go-kit/kit v0.9.1-0.20190812174210-dc489b75b9cd + github.com/go-logfmt/logfmt v0.4.1-0.20181122015615-432dd90af233 + github.com/go-playground/locales v0.12.2-0.20190430153329-630ebbb60284 + github.com/go-playground/universal-translator v0.16.1-0.20170327191703-71201497bace + github.com/gogo/protobuf v1.3.1 + github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 + github.com/golang/mock v1.3.1-0.20190508161146-9fa652df1129 + github.com/golang/protobuf v1.3.2 + github.com/golang/snappy v0.0.0-20170215233205-553a64147049 + github.com/google/btree v0.0.0-20161005200959-925471ac9e21 + github.com/google/go-cmp v0.3.0 + github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f + github.com/gorilla/mux v1.7.3 + github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20160910222444-6b7015e65d36 + github.com/grpc-ecosystem/grpc-gateway v1.3.0 + github.com/hashicorp/hcl v1.0.1-0.20190611123218-cf7d376da96d + github.com/hydrogen18/stalecucumber v0.0.0-20151102144322-9b38526d4bdf + github.com/inconshreveable/mousetrap v1.0.0 + github.com/influxdata/influxdb v1.7.6 + github.com/jhump/protoreflect v1.6.1 + github.com/jonboulle/clockwork v0.1.0 + github.com/json-iterator/go v1.1.9 + github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 + github.com/leanovate/gopter v0.2.3-0.20181005062252-e2604588f4db + github.com/lightstep/lightstep-tracer-common v1.0.3 + github.com/lightstep/lightstep-tracer-go v0.18.1 + github.com/m3db/bitset v2.0.0+incompatible + github.com/m3db/bloom v3.0.0+incompatible + github.com/m3db/pilosa v0.0.0-20190128031222-ac8920c6e1ab + github.com/m3db/prometheus_client_golang v0.8.1 + github.com/m3db/prometheus_client_model v0.0.0-20180517145114-8b2299a4bf7d + github.com/m3db/prometheus_common v0.0.0-20180517030744-25aaa3dff79b + github.com/m3db/prometheus_procfs v0.8.1 + github.com/m3db/stackadler32 v0.0.0-20180104200216-bfebcd73ef6f + github.com/m3db/stackmurmur3 v0.0.0-20171110233611-744c0229c12e + github.com/m3db/vellum v0.0.0-20190111185746-e766292d14de + github.com/magiconair/properties v1.8.1 + github.com/matttproud/golang_protobuf_extensions v1.0.1 + github.com/mauricelam/genny v0.0.0-20180903214747-eb2c5232c885 + github.com/mitchellh/mapstructure v1.1.2 + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd + github.com/modern-go/reflect2 v1.0.1 + github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9 + github.com/opentracing/opentracing-go v1.1.0 + github.com/pborman/getopt v0.0.0-20160216163137-ec82d864f599 + github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 + github.com/pelletier/go-toml v1.5.0 + github.com/pilosa/pilosa v1.3.1-0.20190807173852-bc9747cc0f19 + github.com/pkg/errors v0.8.1 + github.com/pkg/profile v1.2.1 + github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0 + github.com/prometheus/client_golang v1.5.1 + github.com/prometheus/client_model v0.2.0 + github.com/prometheus/common v0.9.1 + github.com/prometheus/procfs v0.0.8 + github.com/prometheus/prometheus v1.8.2-0.20200420081721-18254838fbe2 + github.com/rakyll/statik v0.1.6 + github.com/satori/go.uuid v1.2.0 + github.com/sergi/go-diff v0.0.0-20170409071739-feef008d51ad + github.com/shurcooL/sanitized_anchor_name v1.0.0 + github.com/spaolacci/murmur3 v0.0.0-20170819071325-9f5d223c6079 + github.com/spf13/afero v1.2.2 + github.com/spf13/cast v1.3.1-0.20190531151931-f31dc0aaab5a + github.com/spf13/cobra v0.0.0-20160802223737-7c674d9e7201 + github.com/spf13/jwalterweatherman v1.1.0 + github.com/spf13/pflag v0.0.0-20160816180511-4f9190456aed + github.com/spf13/viper v1.6.1 + github.com/stretchr/objx v0.0.0-20140526180921-cbeaeb16a013 + github.com/stretchr/testify v1.1.4-0.20160305165446-6fe211e49392 + github.com/subosito/gotenv v1.2.1-0.20190917103637-de67a6614a4d + github.com/twotwotwo/sorts v0.0.0-20160814051341-bf5c1f2b8553 + github.com/uber-go/tally v3.3.13+incompatible + github.com/uber/jaeger-client-go v2.16.0+incompatible + github.com/uber/jaeger-lib v2.2.0+incompatible + github.com/uber/tchannel-go v1.12.0 + github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a + github.com/willf/bitset v1.1.9 + github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18 + go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738 + go.uber.org/atomic v1.5.1 + go.uber.org/config v1.4.0 + go.uber.org/multierr v1.4.0 + go.uber.org/zap v1.7.2-0.20171031232209-f85c78b1dd99 + golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44 + golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f + golang.org/x/net v0.0.0-20170721033204-ab5485076ff3 + golang.org/x/sync v0.0.0-20190423024810-112230192c58 + golang.org/x/sys v0.0.0-20191003212358-c178f38b412c + golang.org/x/text v0.0.0-20170530162606-4ee4af566555 + golang.org/x/time v0.0.0-20170420181420-c06e80d9300e + golang.org/x/tools v0.0.0-20191230220329-2aa90c603ae3 + google.golang.org/appengine v1.0.1-0.20170206203024-2e4a801b39fc + google.golang.org/genproto v0.0.0-20170731182057-09f6ed296fc6 + google.golang.org/grpc v1.7.5 + gopkg.in/alecthomas/kingpin.v2 v2.2.6 + gopkg.in/go-playground/validator.v9 v9.7.0 + gopkg.in/ini.v1 v1.51.1 + gopkg.in/validator.v2 v2.0.0-20160201165114-3e4f037f12a1 + gopkg.in/vmihailenco/msgpack.v2 v2.8.3 + gopkg.in/yaml.v2 v2.2.1 +) diff --git a/src/dbnode/integration/index_single_node_high_concurrency_test.go b/src/dbnode/integration/index_single_node_high_concurrency_test.go index 8b0e2eeaaa..5080a1a08c 100644 --- a/src/dbnode/integration/index_single_node_high_concurrency_test.go +++ b/src/dbnode/integration/index_single_node_high_concurrency_test.go @@ -37,7 +37,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/uber-go/atomic" + "go.uber.org/atomic" "go.uber.org/zap" ) diff --git a/src/dbnode/persist/fs/commitlog/reader.go b/src/dbnode/persist/fs/commitlog/reader.go index 65976dfdf3..763f0aacf7 100644 --- a/src/dbnode/persist/fs/commitlog/reader.go +++ b/src/dbnode/persist/fs/commitlog/reader.go @@ -37,7 +37,7 @@ import ( "github.com/m3db/m3/src/x/serialize" xtime "github.com/m3db/m3/src/x/time" - "github.com/uber-go/atomic" + "go.uber.org/atomic" ) var ( diff --git a/src/m3ninx/postings/atomic.go b/src/m3ninx/postings/atomic.go index 94f41faa4d..7559ac0ff8 100644 --- a/src/m3ninx/postings/atomic.go +++ b/src/m3ninx/postings/atomic.go @@ -21,7 +21,7 @@ package postings import ( - "github.com/uber-go/atomic" + "go.uber.org/atomic" ) // AtomicID is an atomic ID. diff --git a/src/x/resource/lifetime_test.go b/src/x/resource/lifetime_test.go index f6f23b122d..41290d46d7 100644 --- a/src/x/resource/lifetime_test.go +++ b/src/x/resource/lifetime_test.go @@ -25,7 +25,7 @@ import ( "time" "github.com/stretchr/testify/require" - "github.com/uber-go/atomic" + "go.uber.org/atomic" ) func TestCancellableLifetime(t *testing.T) { diff --git a/tools.go b/tools.go new file mode 100644 index 0000000000..c77a4ea77d --- /dev/null +++ b/tools.go @@ -0,0 +1,14 @@ +// +build tools + +import ( + _ "github.com/fossas/fossa-cli/cmd/fossa" + _ "github.com/golang/mock/mockgen" + _ "github.com/google/go-jsonnet/cmd/jsonnet" + _ "github.com/m3db/build-tools/utilities/genclean" + _ "github.com/m3db/tools/update-license" + _ "github.com/Masterminds/glide" + _ "github.com/mauricelam/genny" + _ "github.com/mjibson/esc" + _ "github.com/pointlander/peg" + _ "github.com/rakyll/statik" +) From b4b0774f4bd338d292b8f21fd037758b1a7ebda3 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 20:10:25 -0400 Subject: [PATCH 18/43] tidy v1 --- go.mod | 113 ++++++++++++++++++++++----------------------------------- 1 file changed, 43 insertions(+), 70 deletions(-) diff --git a/go.mod b/go.mod index 448c5bba32..d6c475e935 100644 --- a/go.mod +++ b/go.mod @@ -5,45 +5,34 @@ go 1.13 require ( github.com/MichaelTJones/pcg v0.0.0-20180122055547-df440c6ed7ed github.com/RoaringBitmap/roaring v0.4.21 - github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d - github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a + github.com/apache/thrift v0.13.0 + github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect github.com/c2h5oh/datasize v0.0.0-20171227191756-4eba002a5eae - github.com/coreos/go-semver v0.2.0 - github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b - github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea - github.com/couchbase/vellum v0.0.0-20190626091642-41f2deade2cf - github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2 - github.com/dgrijalva/jwt-go v3.0.0+incompatible - github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712 + github.com/cespare/xxhash v1.1.0 + github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f + github.com/couchbase/vellum v0.0.0-20190626091642-41f2deade2cf // indirect + github.com/davecgh/go-spew v1.1.1 github.com/fortytw2/leaktest v1.2.1-0.20180901000122-b433bbd6d743 - github.com/fsnotify/fsnotify v1.4.8-0.20190312181446-1485a34d5d57 + github.com/fsnotify/fsnotify v1.4.8-0.20190312181446-1485a34d5d57 // indirect github.com/ghodss/yaml v1.0.0 - github.com/go-kit/kit v0.9.1-0.20190812174210-dc489b75b9cd - github.com/go-logfmt/logfmt v0.4.1-0.20181122015615-432dd90af233 - github.com/go-playground/locales v0.12.2-0.20190430153329-630ebbb60284 - github.com/go-playground/universal-translator v0.16.1-0.20170327191703-71201497bace + github.com/go-kit/kit v0.10.0 + github.com/go-playground/locales v0.12.2-0.20190430153329-630ebbb60284 // indirect + github.com/go-playground/universal-translator v0.16.1-0.20170327191703-71201497bace // indirect github.com/gogo/protobuf v1.3.1 - github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 github.com/golang/mock v1.3.1-0.20190508161146-9fa652df1129 - github.com/golang/protobuf v1.3.2 - github.com/golang/snappy v0.0.0-20170215233205-553a64147049 - github.com/google/btree v0.0.0-20161005200959-925471ac9e21 - github.com/google/go-cmp v0.3.0 - github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f + github.com/golang/protobuf v1.3.3 + github.com/golang/snappy v0.0.1 + github.com/google/go-cmp v0.4.0 + github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f // indirect github.com/gorilla/mux v1.7.3 - github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20160910222444-6b7015e65d36 - github.com/grpc-ecosystem/grpc-gateway v1.3.0 - github.com/hashicorp/hcl v1.0.1-0.20190611123218-cf7d376da96d + github.com/hashicorp/hcl v1.0.1-0.20190611123218-cf7d376da96d // indirect github.com/hydrogen18/stalecucumber v0.0.0-20151102144322-9b38526d4bdf - github.com/inconshreveable/mousetrap v1.0.0 - github.com/influxdata/influxdb v1.7.6 + github.com/influxdata/influxdb v1.7.7 github.com/jhump/protoreflect v1.6.1 - github.com/jonboulle/clockwork v0.1.0 github.com/json-iterator/go v1.1.9 - github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 github.com/leanovate/gopter v0.2.3-0.20181005062252-e2604588f4db - github.com/lightstep/lightstep-tracer-common v1.0.3 - github.com/lightstep/lightstep-tracer-go v0.18.1 + github.com/lightstep/lightstep-tracer-common v1.0.3 // indirect + github.com/lightstep/lightstep-tracer-go latest github.com/m3db/bitset v2.0.0+incompatible github.com/m3db/bloom v3.0.0+incompatible github.com/m3db/pilosa v0.0.0-20190128031222-ac8920c6e1ab @@ -52,70 +41,54 @@ require ( github.com/m3db/prometheus_common v0.0.0-20180517030744-25aaa3dff79b github.com/m3db/prometheus_procfs v0.8.1 github.com/m3db/stackadler32 v0.0.0-20180104200216-bfebcd73ef6f - github.com/m3db/stackmurmur3 v0.0.0-20171110233611-744c0229c12e + github.com/m3db/stackmurmur3 v0.0.0-20171110233611-744c0229c12e // indirect github.com/m3db/vellum v0.0.0-20190111185746-e766292d14de - github.com/magiconair/properties v1.8.1 - github.com/matttproud/golang_protobuf_extensions v1.0.1 github.com/mauricelam/genny v0.0.0-20180903214747-eb2c5232c885 - github.com/mitchellh/mapstructure v1.1.2 - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd - github.com/modern-go/reflect2 v1.0.1 github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9 github.com/opentracing/opentracing-go v1.1.0 github.com/pborman/getopt v0.0.0-20160216163137-ec82d864f599 - github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 - github.com/pelletier/go-toml v1.5.0 - github.com/pilosa/pilosa v1.3.1-0.20190807173852-bc9747cc0f19 - github.com/pkg/errors v0.8.1 + github.com/pborman/uuid v1.2.0 + github.com/pelletier/go-toml v1.5.0 // indirect + github.com/pilosa/pilosa v1.3.1-0.20190807173852-bc9747cc0f19 // indirect + github.com/pkg/errors v0.9.1 github.com/pkg/profile v1.2.1 - github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0 + github.com/prashantv/protectmem v0.0.0-20171002184600-e20412882b3a // indirect github.com/prometheus/client_golang v1.5.1 - github.com/prometheus/client_model v0.2.0 github.com/prometheus/common v0.9.1 - github.com/prometheus/procfs v0.0.8 github.com/prometheus/prometheus v1.8.2-0.20200420081721-18254838fbe2 github.com/rakyll/statik v0.1.6 + github.com/russross/blackfriday v2.0.0+incompatible github.com/satori/go.uuid v1.2.0 github.com/sergi/go-diff v0.0.0-20170409071739-feef008d51ad - github.com/shurcooL/sanitized_anchor_name v1.0.0 - github.com/spaolacci/murmur3 v0.0.0-20170819071325-9f5d223c6079 - github.com/spf13/afero v1.2.2 - github.com/spf13/cast v1.3.1-0.20190531151931-f31dc0aaab5a - github.com/spf13/cobra v0.0.0-20160802223737-7c674d9e7201 - github.com/spf13/jwalterweatherman v1.1.0 - github.com/spf13/pflag v0.0.0-20160816180511-4f9190456aed + github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 + github.com/spf13/cast v1.3.1-0.20190531151931-f31dc0aaab5a // indirect + github.com/spf13/cobra v0.0.3 + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.6.1 - github.com/stretchr/objx v0.0.0-20140526180921-cbeaeb16a013 - github.com/stretchr/testify v1.1.4-0.20160305165446-6fe211e49392 - github.com/subosito/gotenv v1.2.1-0.20190917103637-de67a6614a4d + github.com/streadway/quantile v0.0.0-20150917103942-b0c588724d25 // indirect + github.com/stretchr/testify v1.4.0 + github.com/subosito/gotenv v1.2.1-0.20190917103637-de67a6614a4d // indirect github.com/twotwotwo/sorts v0.0.0-20160814051341-bf5c1f2b8553 github.com/uber-go/tally v3.3.13+incompatible github.com/uber/jaeger-client-go v2.16.0+incompatible github.com/uber/jaeger-lib v2.2.0+incompatible github.com/uber/tchannel-go v1.12.0 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a - github.com/willf/bitset v1.1.9 - github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18 + github.com/willf/bitset v1.1.10 go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738 go.uber.org/atomic v1.5.1 go.uber.org/config v1.4.0 - go.uber.org/multierr v1.4.0 - go.uber.org/zap v1.7.2-0.20171031232209-f85c78b1dd99 - golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44 - golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f - golang.org/x/net v0.0.0-20170721033204-ab5485076ff3 - golang.org/x/sync v0.0.0-20190423024810-112230192c58 - golang.org/x/sys v0.0.0-20191003212358-c178f38b412c - golang.org/x/text v0.0.0-20170530162606-4ee4af566555 - golang.org/x/time v0.0.0-20170420181420-c06e80d9300e - golang.org/x/tools v0.0.0-20191230220329-2aa90c603ae3 - google.golang.org/appengine v1.0.1-0.20170206203024-2e4a801b39fc - google.golang.org/genproto v0.0.0-20170731182057-09f6ed296fc6 - google.golang.org/grpc v1.7.5 - gopkg.in/alecthomas/kingpin.v2 v2.2.6 + go.uber.org/zap v1.13.0 + golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect + golang.org/x/net v0.0.0-20200301022130-244492dfa37a + golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e + golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 + google.golang.org/grpc v1.27.1 + gopkg.in/go-playground/assert.v1 v1.2.1 // indirect gopkg.in/go-playground/validator.v9 v9.7.0 - gopkg.in/ini.v1 v1.51.1 + gopkg.in/ini.v1 v1.51.1 // indirect gopkg.in/validator.v2 v2.0.0-20160201165114-3e4f037f12a1 gopkg.in/vmihailenco/msgpack.v2 v2.8.3 - gopkg.in/yaml.v2 v2.2.1 + gopkg.in/yaml.v2 v2.2.8 ) From d085549d4a00867fc6e7edd091c5ad6ab85d832c Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 21:01:29 -0400 Subject: [PATCH 19/43] tools complete --- Makefile | 1 - go.mod | 25 ++++++++++++++++++++++--- tools.go | 3 ++- tools.json | 45 --------------------------------------------- 4 files changed, 24 insertions(+), 50 deletions(-) delete mode 100644 tools.json diff --git a/Makefile b/Makefile index 6d73715f83..ace63ea8e4 100644 --- a/Makefile +++ b/Makefile @@ -219,7 +219,6 @@ install-tools: GOBIN=$(retool_bin_path) go install github.com/google/go-jsonnet/cmd/jsonnet GOBIN=$(retool_bin_path) go install github.com/m3db/build-tools/utilities/genclean GOBIN=$(retool_bin_path) go install github.com/m3db/tools/update-license - GOBIN=$(retool_bin_path) go install github.com/Masterminds/glide GOBIN=$(retool_bin_path) go install github.com/mauricelam/genny GOBIN=$(retool_bin_path) go install github.com/mjibson/esc GOBIN=$(retool_bin_path) go install github.com/pointlander/peg diff --git a/go.mod b/go.mod index d6c475e935..887f2c53b6 100644 --- a/go.mod +++ b/go.mod @@ -3,18 +3,25 @@ module github.com/m3db/m3 go 1.13 require ( + github.com/Masterminds/semver v1.5.0 // indirect github.com/MichaelTJones/pcg v0.0.0-20180122055547-df440c6ed7ed github.com/RoaringBitmap/roaring v0.4.21 github.com/apache/thrift v0.13.0 + github.com/apex/log v1.3.0 // indirect + github.com/bmatcuk/doublestar v1.3.1 // indirect github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect + github.com/briandowns/spinner v1.11.1 // indirect github.com/c2h5oh/datasize v0.0.0-20171227191756-4eba002a5eae github.com/cespare/xxhash v1.1.0 + github.com/cheekybits/genny v1.0.0 // indirect github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f github.com/couchbase/vellum v0.0.0-20190626091642-41f2deade2cf // indirect github.com/davecgh/go-spew v1.1.1 github.com/fortytw2/leaktest v1.2.1-0.20180901000122-b433bbd6d743 + github.com/fossas/fossa-cli v1.0.30 github.com/fsnotify/fsnotify v1.4.8-0.20190312181446-1485a34d5d57 // indirect github.com/ghodss/yaml v1.0.0 + github.com/gnewton/jargo v0.0.0-20150417131352-41f5f186a805 // indirect github.com/go-kit/kit v0.10.0 github.com/go-playground/locales v0.12.2-0.20190430153329-630ebbb60284 // indirect github.com/go-playground/universal-translator v0.16.1-0.20170327191703-71201497bace // indirect @@ -23,6 +30,7 @@ require ( github.com/golang/protobuf v1.3.3 github.com/golang/snappy v0.0.1 github.com/google/go-cmp v0.4.0 + github.com/google/go-jsonnet v0.16.0 github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f // indirect github.com/gorilla/mux v1.7.3 github.com/hashicorp/hcl v1.0.1-0.20190611123218-cf7d376da96d // indirect @@ -31,10 +39,11 @@ require ( github.com/jhump/protoreflect v1.6.1 github.com/json-iterator/go v1.1.9 github.com/leanovate/gopter v0.2.3-0.20181005062252-e2604588f4db - github.com/lightstep/lightstep-tracer-common v1.0.3 // indirect - github.com/lightstep/lightstep-tracer-go latest + github.com/lightstep/lightstep-tracer-go v0.20.0 github.com/m3db/bitset v2.0.0+incompatible github.com/m3db/bloom v3.0.0+incompatible + github.com/m3db/build-tools v0.0.0-20181013000606-edd1bdd1df8a + github.com/m3db/m3x v0.0.0-20190408051622-ebf3c7b94afd // indirect github.com/m3db/pilosa v0.0.0-20190128031222-ac8920c6e1ab github.com/m3db/prometheus_client_golang v0.8.1 github.com/m3db/prometheus_client_model v0.0.0-20180517145114-8b2299a4bf7d @@ -42,8 +51,10 @@ require ( github.com/m3db/prometheus_procfs v0.8.1 github.com/m3db/stackadler32 v0.0.0-20180104200216-bfebcd73ef6f github.com/m3db/stackmurmur3 v0.0.0-20171110233611-744c0229c12e // indirect + github.com/m3db/tools v0.0.0-20181008195521-c6ded3f34878 github.com/m3db/vellum v0.0.0-20190111185746-e766292d14de github.com/mauricelam/genny v0.0.0-20180903214747-eb2c5232c885 + github.com/mjibson/esc v0.2.0 github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9 github.com/opentracing/opentracing-go v1.1.0 github.com/pborman/getopt v0.0.0-20160216163137-ec82d864f599 @@ -52,14 +63,20 @@ require ( github.com/pilosa/pilosa v1.3.1-0.20190807173852-bc9747cc0f19 // indirect github.com/pkg/errors v0.9.1 github.com/pkg/profile v1.2.1 + github.com/pointlander/compress v1.1.0 // indirect + github.com/pointlander/jetset v1.0.0 // indirect + github.com/pointlander/peg v1.0.0 github.com/prashantv/protectmem v0.0.0-20171002184600-e20412882b3a // indirect github.com/prometheus/client_golang v1.5.1 github.com/prometheus/common v0.9.1 github.com/prometheus/prometheus v1.8.2-0.20200420081721-18254838fbe2 github.com/rakyll/statik v0.1.6 + github.com/remeh/sizedwaitgroup v1.0.0 // indirect + github.com/rhysd/go-github-selfupdate v1.2.2 // indirect github.com/russross/blackfriday v2.0.0+incompatible + github.com/rveen/ogdl v0.0.0-20200522080342-eeeda1a978e7 // indirect github.com/satori/go.uuid v1.2.0 - github.com/sergi/go-diff v0.0.0-20170409071739-feef008d51ad + github.com/sergi/go-diff v1.1.0 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 github.com/spf13/cast v1.3.1-0.20190531151931-f31dc0aaab5a // indirect github.com/spf13/cobra v0.0.3 @@ -85,9 +102,11 @@ require ( golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 google.golang.org/grpc v1.27.1 + gopkg.in/go-ini/ini.v1 v1.57.0 // indirect gopkg.in/go-playground/assert.v1 v1.2.1 // indirect gopkg.in/go-playground/validator.v9 v9.7.0 gopkg.in/ini.v1 v1.51.1 // indirect + gopkg.in/src-d/go-git.v4 v4.13.1 // indirect gopkg.in/validator.v2 v2.0.0-20160201165114-3e4f037f12a1 gopkg.in/vmihailenco/msgpack.v2 v2.8.3 gopkg.in/yaml.v2 v2.2.8 diff --git a/tools.go b/tools.go index c77a4ea77d..2fbc4a0fba 100644 --- a/tools.go +++ b/tools.go @@ -1,12 +1,13 @@ // +build tools +package tools + import ( _ "github.com/fossas/fossa-cli/cmd/fossa" _ "github.com/golang/mock/mockgen" _ "github.com/google/go-jsonnet/cmd/jsonnet" _ "github.com/m3db/build-tools/utilities/genclean" _ "github.com/m3db/tools/update-license" - _ "github.com/Masterminds/glide" _ "github.com/mauricelam/genny" _ "github.com/mjibson/esc" _ "github.com/pointlander/peg" diff --git a/tools.json b/tools.json deleted file mode 100644 index 0e2ae30bc2..0000000000 --- a/tools.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "Tools": [ - { - "Repository": "github.com/Masterminds/glide", - "Commit": "5539dc14dc6c62b10c1bb1412bbdf08e7fda85bb" - }, - { - "Repository": "github.com/m3db/build-tools/utilities/genclean", - "Commit": "edd1bdd1df8ac1a71d4783178fce9791fa363dfa" - }, - { - "Repository": "github.com/mjibson/esc", - "Commit": "58d9cde84f237ecdd89bd7f61c2de2853f4c5c6e" - }, - { - "Repository": "github.com/mauricelam/genny", - "Commit": "9d8700bcc567cd22ea2ef42ce5835a9c80296c4a" - }, - { - "Repository": "github.com/m3db/tools/update-license", - "Commit": "c6ded3f348785aa05a95e4a023fcec169828cba5" - }, - { - "Repository": "github.com/fossas/fossa-cli/cmd/fossa", - "Commit": "09c02d600ff887c45e98ddee975a857b6e0fae6c" - }, - { - "Repository": "github.com/pointlander/peg", - "Commit": "eb55cbbebc6d419fa4fcf4baa100aa0a9ee95ec0" - }, - { - "Repository": "github.com/golang/mock/mockgen", - "Commit": "51421b967af1f557f93a59e0057aaf15ca02e29c" - }, - { - "Repository": "github.com/rakyll/statik", - "Commit": "19b88da8fc15428620782ba18f68423130e7ac7d" - }, - { - "Repository": "github.com/google/go-jsonnet/cmd/jsonnet", - "Commit": "71a3e169581ece942e77bfc47840a806eb868ca8" - } - ], - "RetoolVersion": "1.3.7" -} From 0b5c38507ad5c45592acd87b14e4df9abd94df54 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 21:15:30 -0400 Subject: [PATCH 20/43] etcd and thrift --- Makefile | 2 +- go.mod | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ace63ea8e4..d7b04b7ced 100644 --- a/Makefile +++ b/Makefile @@ -106,7 +106,7 @@ setup: .PHONY: install-vendor-m3 install-vendor-m3: - [ -d $(VENDOR) ] || make install-vendor + [ -d $(VENDOR) ] || go mod vendor # See comment for "install-vendor-m3-remove-bad-dep" why required and the TODO. make install-vendor-m3-remove-bad-dep # See comment for "install-vendor-m3-remove-prometheus-vendor-dir" why required. diff --git a/go.mod b/go.mod index 887f2c53b6..08ab1c48a5 100644 --- a/go.mod +++ b/go.mod @@ -93,7 +93,7 @@ require ( github.com/uber/tchannel-go v1.12.0 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a github.com/willf/bitset v1.1.10 - go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738 + go.etcd.io/etcd v3.4.9+incompatible go.uber.org/atomic v1.5.1 go.uber.org/config v1.4.0 go.uber.org/zap v1.13.0 @@ -111,3 +111,6 @@ require ( gopkg.in/vmihailenco/msgpack.v2 v2.8.3 gopkg.in/yaml.v2 v2.2.8 ) + +// branch 0.9.3-pool-read-binary-3 +replace github.com/apache/thrift => github.com/m3db/thrift v0.0.0-20190820191926-05b5a2227fe4 From a878b8af7acd0d95c0ab32c4026901e5a424ad75 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 21:16:39 -0400 Subject: [PATCH 21/43] switch xxhash --- go.mod | 2 +- src/dbnode/client/received_blocks_new_map.go | 2 +- src/dbnode/encoding/proto/encoder.go | 2 +- src/dbnode/namespace/metadata_new_map_gen.go | 2 +- src/dbnode/persist/fs/checked_bytes_by_id_new_map_gen.go | 2 +- src/dbnode/storage/block/retriever_new_map_gen.go | 2 +- src/dbnode/storage/bootstrap/namespace_results_new_map_gen.go | 2 +- src/dbnode/storage/bootstrap/namespaces_new_map_gen.go | 2 +- src/dbnode/storage/bootstrap/result/new_map_gen.go | 2 +- src/dbnode/storage/dirty_series_new_map_gen.go | 2 +- src/dbnode/storage/index/aggregate_results_new_map.go | 2 +- src/dbnode/storage/index/aggregate_values_new_map.go | 2 +- src/dbnode/storage/index/results_new_map.go | 2 +- src/dbnode/storage/namespace_new_map_gen.go | 2 +- src/dbnode/storage/repair/new_map_gen.go | 2 +- src/dbnode/storage/shard_new_map_gen.go | 2 +- src/m3ninx/index/segment/builder/builder.go | 2 +- src/m3ninx/index/segment/builder/fields_map_new.go | 2 +- src/m3ninx/index/segment/builder/ids_map_new.go | 2 +- src/m3ninx/index/segment/builder/postings_map_new.go | 2 +- src/m3ninx/index/segment/mem/fields_map_new.go | 2 +- src/m3ninx/index/segment/mem/ids_map_new.go | 2 +- src/m3ninx/index/segment/mem/postings_map_new.go | 2 +- src/metrics/matcher/cache/elem_new_map_gen.go | 2 +- src/metrics/matcher/cache/namespace_results_new_map_gen.go | 2 +- src/metrics/matcher/namespace_rule_sets_new_map_gen.go | 2 +- src/metrics/matcher/rule_namespaces_new_map_gen.go | 2 +- src/query/models/tags.go | 2 +- src/query/models/tags_test.go | 2 +- src/x/generics/hashmap/byteskey/new_map.go | 2 +- src/x/generics/hashmap/idkey/new_map.go | 2 +- src/x/generics/hashmap/map_test.go | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/go.mod b/go.mod index 08ab1c48a5..c16bbe2b2a 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect github.com/briandowns/spinner v1.11.1 // indirect github.com/c2h5oh/datasize v0.0.0-20171227191756-4eba002a5eae - github.com/cespare/xxhash v1.1.0 + github.com/cespare/xxhash/v2 v2.1.1 github.com/cheekybits/genny v1.0.0 // indirect github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f github.com/couchbase/vellum v0.0.0-20190626091642-41f2deade2cf // indirect diff --git a/src/dbnode/client/received_blocks_new_map.go b/src/dbnode/client/received_blocks_new_map.go index 588149c610..7a32344192 100644 --- a/src/dbnode/client/received_blocks_new_map.go +++ b/src/dbnode/client/received_blocks_new_map.go @@ -24,7 +24,7 @@ import ( "github.com/m3db/m3/src/x/ident" "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) func newReceivedBlocksMap(pool pool.BytesPool) *receivedBlocksMap { diff --git a/src/dbnode/encoding/proto/encoder.go b/src/dbnode/encoding/proto/encoder.go index 30f3ebb1af..074c0bf52f 100644 --- a/src/dbnode/encoding/proto/encoder.go +++ b/src/dbnode/encoding/proto/encoder.go @@ -36,7 +36,7 @@ import ( "github.com/m3db/m3/src/x/instrument" xtime "github.com/m3db/m3/src/x/time" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" "github.com/jhump/protoreflect/desc" ) diff --git a/src/dbnode/namespace/metadata_new_map_gen.go b/src/dbnode/namespace/metadata_new_map_gen.go index 46efb9fc35..91ddfa6d07 100644 --- a/src/dbnode/namespace/metadata_new_map_gen.go +++ b/src/dbnode/namespace/metadata_new_map_gen.go @@ -28,7 +28,7 @@ import ( "github.com/m3db/m3/src/x/ident" "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // Copyright (c) 2018 Uber Technologies, Inc. diff --git a/src/dbnode/persist/fs/checked_bytes_by_id_new_map_gen.go b/src/dbnode/persist/fs/checked_bytes_by_id_new_map_gen.go index 977a475856..2393e45d5c 100644 --- a/src/dbnode/persist/fs/checked_bytes_by_id_new_map_gen.go +++ b/src/dbnode/persist/fs/checked_bytes_by_id_new_map_gen.go @@ -28,7 +28,7 @@ import ( "github.com/m3db/m3/src/x/ident" "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // Copyright (c) 2018 Uber Technologies, Inc. diff --git a/src/dbnode/storage/block/retriever_new_map_gen.go b/src/dbnode/storage/block/retriever_new_map_gen.go index 95123b98b8..fa56e28d10 100644 --- a/src/dbnode/storage/block/retriever_new_map_gen.go +++ b/src/dbnode/storage/block/retriever_new_map_gen.go @@ -28,7 +28,7 @@ import ( "github.com/m3db/m3/src/x/ident" "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // Copyright (c) 2018 Uber Technologies, Inc. diff --git a/src/dbnode/storage/bootstrap/namespace_results_new_map_gen.go b/src/dbnode/storage/bootstrap/namespace_results_new_map_gen.go index 8b02405418..b37df84484 100644 --- a/src/dbnode/storage/bootstrap/namespace_results_new_map_gen.go +++ b/src/dbnode/storage/bootstrap/namespace_results_new_map_gen.go @@ -28,7 +28,7 @@ import ( "github.com/m3db/m3/src/x/ident" "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // Copyright (c) 2018 Uber Technologies, Inc. diff --git a/src/dbnode/storage/bootstrap/namespaces_new_map_gen.go b/src/dbnode/storage/bootstrap/namespaces_new_map_gen.go index 5fb41e3e47..f3f874467d 100644 --- a/src/dbnode/storage/bootstrap/namespaces_new_map_gen.go +++ b/src/dbnode/storage/bootstrap/namespaces_new_map_gen.go @@ -28,7 +28,7 @@ import ( "github.com/m3db/m3/src/x/ident" "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // Copyright (c) 2018 Uber Technologies, Inc. diff --git a/src/dbnode/storage/bootstrap/result/new_map_gen.go b/src/dbnode/storage/bootstrap/result/new_map_gen.go index 4edad92b6d..1cca90a434 100644 --- a/src/dbnode/storage/bootstrap/result/new_map_gen.go +++ b/src/dbnode/storage/bootstrap/result/new_map_gen.go @@ -28,7 +28,7 @@ import ( "github.com/m3db/m3/src/x/ident" "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // Copyright (c) 2018 Uber Technologies, Inc. diff --git a/src/dbnode/storage/dirty_series_new_map_gen.go b/src/dbnode/storage/dirty_series_new_map_gen.go index 6e6cdb19c9..02e8cd5d2f 100644 --- a/src/dbnode/storage/dirty_series_new_map_gen.go +++ b/src/dbnode/storage/dirty_series_new_map_gen.go @@ -28,7 +28,7 @@ import ( "github.com/m3db/m3/src/x/ident" "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // dirtySeriesMapOptions provides options used when created the map. diff --git a/src/dbnode/storage/index/aggregate_results_new_map.go b/src/dbnode/storage/index/aggregate_results_new_map.go index a81a6faf72..cdb576533f 100644 --- a/src/dbnode/storage/index/aggregate_results_new_map.go +++ b/src/dbnode/storage/index/aggregate_results_new_map.go @@ -23,7 +23,7 @@ package index import ( "github.com/m3db/m3/src/x/ident" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) const ( diff --git a/src/dbnode/storage/index/aggregate_values_new_map.go b/src/dbnode/storage/index/aggregate_values_new_map.go index 7bc29d4eef..70b80e2a47 100644 --- a/src/dbnode/storage/index/aggregate_values_new_map.go +++ b/src/dbnode/storage/index/aggregate_values_new_map.go @@ -23,7 +23,7 @@ package index import ( "github.com/m3db/m3/src/x/ident" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) const ( diff --git a/src/dbnode/storage/index/results_new_map.go b/src/dbnode/storage/index/results_new_map.go index a23da161aa..6620400594 100644 --- a/src/dbnode/storage/index/results_new_map.go +++ b/src/dbnode/storage/index/results_new_map.go @@ -23,7 +23,7 @@ package index import ( "github.com/m3db/m3/src/x/ident" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) const ( diff --git a/src/dbnode/storage/namespace_new_map_gen.go b/src/dbnode/storage/namespace_new_map_gen.go index baa3983598..7cfa5a0b25 100644 --- a/src/dbnode/storage/namespace_new_map_gen.go +++ b/src/dbnode/storage/namespace_new_map_gen.go @@ -28,7 +28,7 @@ import ( "github.com/m3db/m3/src/x/ident" "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // Copyright (c) 2018 Uber Technologies, Inc. diff --git a/src/dbnode/storage/repair/new_map_gen.go b/src/dbnode/storage/repair/new_map_gen.go index 2454ef9e13..72304592e6 100644 --- a/src/dbnode/storage/repair/new_map_gen.go +++ b/src/dbnode/storage/repair/new_map_gen.go @@ -28,7 +28,7 @@ import ( "github.com/m3db/m3/src/x/ident" "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // Copyright (c) 2018 Uber Technologies, Inc. diff --git a/src/dbnode/storage/shard_new_map_gen.go b/src/dbnode/storage/shard_new_map_gen.go index 230e3cd471..4ee45e906a 100644 --- a/src/dbnode/storage/shard_new_map_gen.go +++ b/src/dbnode/storage/shard_new_map_gen.go @@ -28,7 +28,7 @@ import ( "github.com/m3db/m3/src/x/ident" "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // Copyright (c) 2018 Uber Technologies, Inc. diff --git a/src/m3ninx/index/segment/builder/builder.go b/src/m3ninx/index/segment/builder/builder.go index d560efd18c..3ec01a94a2 100644 --- a/src/m3ninx/index/segment/builder/builder.go +++ b/src/m3ninx/index/segment/builder/builder.go @@ -31,7 +31,7 @@ import ( "github.com/m3db/m3/src/m3ninx/postings" "github.com/m3db/m3/src/m3ninx/util" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) var ( diff --git a/src/m3ninx/index/segment/builder/fields_map_new.go b/src/m3ninx/index/segment/builder/fields_map_new.go index d9d4953c91..015a1e21eb 100644 --- a/src/m3ninx/index/segment/builder/fields_map_new.go +++ b/src/m3ninx/index/segment/builder/fields_map_new.go @@ -29,7 +29,7 @@ import ( "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // Copyright (c) 2018 Uber Technologies, Inc. diff --git a/src/m3ninx/index/segment/builder/ids_map_new.go b/src/m3ninx/index/segment/builder/ids_map_new.go index 9fb57a4dfa..757181e444 100644 --- a/src/m3ninx/index/segment/builder/ids_map_new.go +++ b/src/m3ninx/index/segment/builder/ids_map_new.go @@ -29,7 +29,7 @@ import ( "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // Copyright (c) 2018 Uber Technologies, Inc. diff --git a/src/m3ninx/index/segment/builder/postings_map_new.go b/src/m3ninx/index/segment/builder/postings_map_new.go index 8984fff77d..5fb871a420 100644 --- a/src/m3ninx/index/segment/builder/postings_map_new.go +++ b/src/m3ninx/index/segment/builder/postings_map_new.go @@ -29,7 +29,7 @@ import ( "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // Copyright (c) 2018 Uber Technologies, Inc. diff --git a/src/m3ninx/index/segment/mem/fields_map_new.go b/src/m3ninx/index/segment/mem/fields_map_new.go index 8330583f73..c13cc1737e 100644 --- a/src/m3ninx/index/segment/mem/fields_map_new.go +++ b/src/m3ninx/index/segment/mem/fields_map_new.go @@ -29,7 +29,7 @@ import ( "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // Copyright (c) 2018 Uber Technologies, Inc. diff --git a/src/m3ninx/index/segment/mem/ids_map_new.go b/src/m3ninx/index/segment/mem/ids_map_new.go index 78b644c16c..55c5fcd43c 100644 --- a/src/m3ninx/index/segment/mem/ids_map_new.go +++ b/src/m3ninx/index/segment/mem/ids_map_new.go @@ -23,7 +23,7 @@ package mem import ( "bytes" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // newIDsMap returns a new set of IDs. diff --git a/src/m3ninx/index/segment/mem/postings_map_new.go b/src/m3ninx/index/segment/mem/postings_map_new.go index e727f103e9..531e78c806 100644 --- a/src/m3ninx/index/segment/mem/postings_map_new.go +++ b/src/m3ninx/index/segment/mem/postings_map_new.go @@ -23,7 +23,7 @@ package mem import ( "bytes" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // newPostingsMap returns a new []bytes->postings.MutableList map. diff --git a/src/metrics/matcher/cache/elem_new_map_gen.go b/src/metrics/matcher/cache/elem_new_map_gen.go index 723ea6136e..2e1b7c9706 100644 --- a/src/metrics/matcher/cache/elem_new_map_gen.go +++ b/src/metrics/matcher/cache/elem_new_map_gen.go @@ -29,7 +29,7 @@ import ( "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // Copyright (c) 2018 Uber Technologies, Inc. diff --git a/src/metrics/matcher/cache/namespace_results_new_map_gen.go b/src/metrics/matcher/cache/namespace_results_new_map_gen.go index 96cb0e1ae1..86c9b9d035 100644 --- a/src/metrics/matcher/cache/namespace_results_new_map_gen.go +++ b/src/metrics/matcher/cache/namespace_results_new_map_gen.go @@ -29,7 +29,7 @@ import ( "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // Copyright (c) 2018 Uber Technologies, Inc. diff --git a/src/metrics/matcher/namespace_rule_sets_new_map_gen.go b/src/metrics/matcher/namespace_rule_sets_new_map_gen.go index 61c0f064c5..bb6071ff57 100644 --- a/src/metrics/matcher/namespace_rule_sets_new_map_gen.go +++ b/src/metrics/matcher/namespace_rule_sets_new_map_gen.go @@ -29,7 +29,7 @@ import ( "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // Copyright (c) 2018 Uber Technologies, Inc. diff --git a/src/metrics/matcher/rule_namespaces_new_map_gen.go b/src/metrics/matcher/rule_namespaces_new_map_gen.go index 3ac597f3d0..30fbb5668e 100644 --- a/src/metrics/matcher/rule_namespaces_new_map_gen.go +++ b/src/metrics/matcher/rule_namespaces_new_map_gen.go @@ -29,7 +29,7 @@ import ( "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) // Copyright (c) 2018 Uber Technologies, Inc. diff --git a/src/query/models/tags.go b/src/query/models/tags.go index b325044abb..260ed239f6 100644 --- a/src/query/models/tags.go +++ b/src/query/models/tags.go @@ -30,7 +30,7 @@ import ( "github.com/m3db/m3/src/query/models/strconv" "github.com/m3db/m3/src/query/util/writer" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ) var ( diff --git a/src/query/models/tags_test.go b/src/query/models/tags_test.go index 5e8a5b059f..c5fb499978 100644 --- a/src/query/models/tags_test.go +++ b/src/query/models/tags_test.go @@ -31,7 +31,7 @@ import ( "github.com/m3db/m3/src/query/util/writer" xtest "github.com/m3db/m3/src/x/test" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/src/x/generics/hashmap/byteskey/new_map.go b/src/x/generics/hashmap/byteskey/new_map.go index 2142b6ab9b..62ede699b1 100644 --- a/src/x/generics/hashmap/byteskey/new_map.go +++ b/src/x/generics/hashmap/byteskey/new_map.go @@ -25,7 +25,7 @@ import ( "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" "github.com/mauricelam/genny/generic" ) diff --git a/src/x/generics/hashmap/idkey/new_map.go b/src/x/generics/hashmap/idkey/new_map.go index 6d1e4234f6..752635f7e3 100644 --- a/src/x/generics/hashmap/idkey/new_map.go +++ b/src/x/generics/hashmap/idkey/new_map.go @@ -24,7 +24,7 @@ import ( "github.com/m3db/m3/src/x/ident" "github.com/m3db/m3/src/x/pool" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" "github.com/mauricelam/genny/generic" ) diff --git a/src/x/generics/hashmap/map_test.go b/src/x/generics/hashmap/map_test.go index a9cb64326c..b373f62bcb 100644 --- a/src/x/generics/hashmap/map_test.go +++ b/src/x/generics/hashmap/map_test.go @@ -23,7 +23,7 @@ package hashmap import ( "testing" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) From d8e3a579a1b27eae2c3ba39fcf887d78ab013aa5 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 21:18:11 -0400 Subject: [PATCH 22/43] msgpack pin --- go.mod | 2 ++ 1 file changed, 2 insertions(+) diff --git a/go.mod b/go.mod index c16bbe2b2a..63c5dfc297 100644 --- a/go.mod +++ b/go.mod @@ -114,3 +114,5 @@ require ( // branch 0.9.3-pool-read-binary-3 replace github.com/apache/thrift => github.com/m3db/thrift v0.0.0-20190820191926-05b5a2227fe4 + +replace gopkg.in/vmihailenco/msgpack.v2 => github.com/vmihailenco/msgpack v2.8.3+incompatible From ce46864d754c65e741133e212b5e34991df4cf08 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 21:29:34 -0400 Subject: [PATCH 23/43] gosumdb=off --- Makefile | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index d7b04b7ced..20e1db47fc 100644 --- a/Makefile +++ b/Makefile @@ -16,9 +16,8 @@ gopath_bin_path := $(GOPATH)/bin m3_package := github.com/m3db/m3 m3_package_path := $(gopath_prefix)/$(m3_package) mockgen_package := github.com/golang/mock/mockgen -retool_path := $(m3_package_path)/_tools -retool_bin_path := $(retool_path)/bin -combined_bin_paths := $(retool_bin_path):$(gopath_bin_path) +tools_bin_path := $(abspath ./_tools/bin) +combined_bin_paths := $(tools_bin_path):$(gopath_bin_path) retool_src_prefix := $(m3_package_path)/_tools/src retool_package := github.com/twitchtv/retool metalint_check := .ci/metalint.sh @@ -106,7 +105,7 @@ setup: .PHONY: install-vendor-m3 install-vendor-m3: - [ -d $(VENDOR) ] || go mod vendor + [ -d $(VENDOR) ] || GOSUMDB=off go mod vendor # See comment for "install-vendor-m3-remove-bad-dep" why required and the TODO. make install-vendor-m3-remove-bad-dep # See comment for "install-vendor-m3-remove-prometheus-vendor-dir" why required. @@ -213,21 +212,21 @@ all: metalint test-ci-unit test-ci-integration services tools .PHONY: install-tools install-tools: - @echo "Installing retool dependencies" - GOBIN=$(retool_bin_path) go install github.com/fossas/fossa-cli/cmd/fossa - GOBIN=$(retool_bin_path) go install github.com/golang/mock/mockgen - GOBIN=$(retool_bin_path) go install github.com/google/go-jsonnet/cmd/jsonnet - GOBIN=$(retool_bin_path) go install github.com/m3db/build-tools/utilities/genclean - GOBIN=$(retool_bin_path) go install github.com/m3db/tools/update-license - GOBIN=$(retool_bin_path) go install github.com/mauricelam/genny - GOBIN=$(retool_bin_path) go install github.com/mjibson/esc - GOBIN=$(retool_bin_path) go install github.com/pointlander/peg - GOBIN=$(retool_bin_path) go install github.com/rakyll/statik + @echo "Installing build tools" + GOBIN=$(tools_bin_path) go install github.com/fossas/fossa-cli/cmd/fossa + GOBIN=$(tools_bin_path) go install github.com/golang/mock/mockgen + GOBIN=$(tools_bin_path) go install github.com/google/go-jsonnet/cmd/jsonnet + GOBIN=$(tools_bin_path) go install github.com/m3db/build-tools/utilities/genclean + GOBIN=$(tools_bin_path) go install github.com/m3db/tools/update-license + GOBIN=$(tools_bin_path) go install github.com/mauricelam/genny + GOBIN=$(tools_bin_path) go install github.com/mjibson/esc + GOBIN=$(tools_bin_path) go install github.com/pointlander/peg + GOBIN=$(tools_bin_path) go install github.com/rakyll/statik .PHONY: install-gometalinter install-gometalinter: - @mkdir -p $(retool_bin_path) - ./scripts/install-gometalinter.sh -b $(retool_bin_path) -d $(GOMETALINT_VERSION) + @mkdir -p $(tools_bin_path) + ./scripts/install-gometalinter.sh -b $(tools_bin_path) -d $(GOMETALINT_VERSION) .PHONY: check-for-goreleaser-github-token check-for-goreleaser-github-token: @@ -299,8 +298,8 @@ site-build: .PHONY: config-gen config-gen: install-tools @echo "--- Generating configs" - $(retool_bin_path)/jsonnet -S $(m3_package_path)/config/m3db/local-etcd/m3dbnode_cmd.jsonnet > $(m3_package_path)/config/m3db/local-etcd/generated.yaml - $(retool_bin_path)/jsonnet -S $(m3_package_path)/config/m3db/clustered-etcd/m3dbnode_cmd.jsonnet > $(m3_package_path)/config/m3db/clustered-etcd/generated.yaml + $(tools_bin_path)/jsonnet -S $(m3_package_path)/config/m3db/local-etcd/m3dbnode_cmd.jsonnet > $(m3_package_path)/config/m3db/local-etcd/generated.yaml + $(tools_bin_path)/jsonnet -S $(m3_package_path)/config/m3db/clustered-etcd/m3dbnode_cmd.jsonnet > $(m3_package_path)/config/m3db/clustered-etcd/generated.yaml SUBDIR_TARGETS := \ mock-gen \ @@ -483,7 +482,7 @@ build-ui-ctl-statik-gen: build-ui-ctl-statik license-gen-ctl .PHONY: build-ui-ctl-statik build-ui-ctl-statik: build-ui-ctl install-tools mkdir -p ./src/ctl/generated/ui - $(retool_bin_path)/statik -m -f -src ./src/ctl/ui/build -dest ./src/ctl/generated/ui -p statik + $(tools_bin_path)/statik -m -f -src ./src/ctl/ui/build -dest ./src/ctl/generated/ui -p statik .PHONY: node-yarn-run node-yarn-run: @@ -507,7 +506,7 @@ endif .PHONY: metalint metalint: install-gometalinter install-linter-badtime install-linter-importorder @echo "--- metalinting src/" - @(PATH=$(retool_bin_path):$(PATH) $(metalint_check) \ + @(PATH=$(tools_bin_path):$(PATH) $(metalint_check) \ $(metalint_config) $(metalint_exclude) $(m3_package_path)/src/) # Tests that all currently generated types match their contents if they were regenerated From 99dcf3d469563f0bb62c88bfd569b46213c7951f Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 21:33:59 -0400 Subject: [PATCH 24/43] gorename --- Makefile | 1 + go.mod | 1 + tools.go | 1 + 3 files changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 20e1db47fc..4b47c4336a 100644 --- a/Makefile +++ b/Makefile @@ -221,6 +221,7 @@ install-tools: GOBIN=$(tools_bin_path) go install github.com/mauricelam/genny GOBIN=$(tools_bin_path) go install github.com/mjibson/esc GOBIN=$(tools_bin_path) go install github.com/pointlander/peg + GOBIN=$(tools_bin_path) go install github.com/prateek/gorename GOBIN=$(tools_bin_path) go install github.com/rakyll/statik .PHONY: install-gometalinter diff --git a/go.mod b/go.mod index 63c5dfc297..d7325276c1 100644 --- a/go.mod +++ b/go.mod @@ -67,6 +67,7 @@ require ( github.com/pointlander/jetset v1.0.0 // indirect github.com/pointlander/peg v1.0.0 github.com/prashantv/protectmem v0.0.0-20171002184600-e20412882b3a // indirect + github.com/prateek/gorename v0.0.0-20180424020013-52c7307cddd2 github.com/prometheus/client_golang v1.5.1 github.com/prometheus/common v0.9.1 github.com/prometheus/prometheus v1.8.2-0.20200420081721-18254838fbe2 diff --git a/tools.go b/tools.go index 2fbc4a0fba..0b9beb4ba6 100644 --- a/tools.go +++ b/tools.go @@ -11,5 +11,6 @@ import ( _ "github.com/mauricelam/genny" _ "github.com/mjibson/esc" _ "github.com/pointlander/peg" + _ "github.com/prateek/gorename" _ "github.com/rakyll/statik" ) From 9263f31d56a2a6f6a1ffae9568cdea2e482b4818 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 21:48:51 -0400 Subject: [PATCH 25/43] noop commit From 0e99a3e2a381592f2ab9dfd29324543fabdaa8e4 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 21:52:44 -0400 Subject: [PATCH 26/43] dont install gorename --- src/x/generated-source-files.mk | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/x/generated-source-files.mk b/src/x/generated-source-files.mk index 324c224308..44e186b634 100644 --- a/src/x/generated-source-files.mk +++ b/src/x/generated-source-files.mk @@ -75,7 +75,7 @@ hashmap-gen-rename-helper: key_type_alias ?= $(key_type) value_type_alias ?= $(value_type) .PHONY: hashmap-gen-rename -hashmap-gen-rename: install-gorename +hashmap-gen-rename: $(eval out_dir=$(gopath_prefix)/$(target_package)) $(eval temp_outdir=$(out_dir)$(temp_suffix)) echo $(temp_outdir) @@ -155,7 +155,7 @@ endif elem_type_alias ?= $(elem_type) .PHONY: arraypool-gen-rename -arraypool-gen-rename: install-gorename +arraypool-gen-rename: $(eval temp_outdir=$(out_dir)$(temp_suffix)) ifneq ($(rename_gen_types),) # Allow users to short circuit the generation of types.go if they don't need it. @@ -197,7 +197,7 @@ endif elem_type_alias ?= $(elem_type) .PHONY: list-gen-rename -list-gen-rename: install-gorename +list-gen-rename: $(eval temp_outdir=$(out_dir)$(temp_suffix)) ifneq ($(rename_gen_types),) # Allow users to short circuit the generation of types.go if they don't need it. @@ -213,14 +213,3 @@ endif ifneq ($(rename_gen_types),) rm $(temp_outdir)/types.go endif - -install-gorename: - $(eval gorename_dir=$(gopath_prefix)/$(gorename_package)) - @([ -d $(gorename_dir) ] && which gorename >/dev/null ) || \ - (echo "Downloading specified gorename" && \ - go get -d $(gorename_package) && \ - cd $(gopath_prefix)/$(gorename_package) && \ - git checkout $(gorename_package_version) && \ - glide install -v && go install && \ - echo "Successfully installed gorename") 2>/dev/null - @which gorename > /dev/null || (echo "gorename install failed" && exit 1) From ab816657cf7ca6c11625f8f3ff3ac5adf3c02e20 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 22:02:44 -0400 Subject: [PATCH 27/43] add gosum --- go.sum | 1032 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1032 insertions(+) create mode 100644 go.sum diff --git a/go.sum b/go.sum new file mode 100644 index 0000000000..4bbcf171cb --- /dev/null +++ b/go.sum @@ -0,0 +1,1032 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +github.com/Azure/azure-sdk-for-go v40.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest v0.10.0/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q= +github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g= +github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= +github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= +github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/CAFxX/gcnotifier v0.0.0-20190112062741-224a280d589d h1:n0G4ckjMEj7bWuGYUX0i8YlBeBBJuZ+HEHvHfyBDZtI= +github.com/CAFxX/gcnotifier v0.0.0-20190112062741-224a280d589d/go.mod h1:Rn2zM2MnHze07LwkneP48TWt6UiZhzQTwCvw6djVGfE= +github.com/DataDog/datadog-go v0.0.0-20180822151419-281ae9f2d895 h1:dmc/C8bpE5VkQn65PNbbyACDC8xw8Hpp/NEurdPmQDQ= +github.com/DataDog/datadog-go v0.0.0-20180822151419-281ae9f2d895/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= +github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= +github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/MichaelTJones/pcg v0.0.0-20180122055547-df440c6ed7ed h1:hQC4FSwvsLH6rOLJTndsHnANARF9RwW4PbrDTjks/0A= +github.com/MichaelTJones/pcg v0.0.0-20180122055547-df440c6ed7ed/go.mod h1:NQ4UMHqyfXyYVmZopcfwPRWJa0rw2aH16eDIltReVUo= +github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/RoaringBitmap/roaring v0.4.21 h1:WJ/zIlNX4wQZ9x8Ey33O1UaD9TCTakYsdLFSBcTwH+8= +github.com/RoaringBitmap/roaring v0.4.21/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo= +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/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 h1:UUppSQnhf4Yc6xGxSkoQpPhb7RVzuv5Nb1mwJ5VId9s= +github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= +github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk= +github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= +github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= +github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= +github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs= +github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= +github.com/apex/log v1.3.0 h1:1fyfbPvUwD10nMoh3hY6MXzvZShJQn9/ck7ATgAt5pA= +github.com/apex/log v1.3.0/go.mod h1:jd8Vpsr46WAe3EZSQ/IUMs2qQD/GOycT5rPWCO1yGcs= +github.com/apex/logs v0.0.4/go.mod h1:XzxuLZ5myVHDy9SAmYpamKKRNApGj54PfYLcFrXqDwo= +github.com/aphistic/golf v0.0.0-20180712155816-02c07f170c5a/go.mod h1:3NqKYiepwy8kCu4PNA+aP7WUV72eXWJeP9/r3/K9aLE= +github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3stzu0Xys= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= +github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= +github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.29.18/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= +github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= +github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= +github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/bmatcuk/doublestar v1.3.1 h1:rT8rxDPsavp9G+4ZULzqhhUSaI/OPsTZNG88Z3i0xvY= +github.com/bmatcuk/doublestar v1.3.1/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= +github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b h1:AP/Y7sqYicnjGDfD5VcY4CIfh1hRXBUavxrvELjTiOE= +github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D1fsDb3EJvhqgXRbFx7bs2wqZ10HQPeU8U/Q= +github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= +github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= +github.com/briandowns/spinner v1.11.1 h1:OixPqDEcX3juo5AjQZAnFPbeUA0jvkp2qzB5gOZJ/L0= +github.com/briandowns/spinner v1.11.1/go.mod h1:QOuQk7x+EaDASo80FEXwlwiA+j/PPIcX3FScO+3/ZPQ= +github.com/c2h5oh/datasize v0.0.0-20171227191756-4eba002a5eae h1:2Zmk+8cNvAGuY8AyvZuWpUdpQUAXwfom4ReVMe/CTIo= +github.com/c2h5oh/datasize v0.0.0-20171227191756-4eba002a5eae/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= +github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= +github.com/cenkalti/backoff v0.0.0-20181003080854-62661b46c409/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= +github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa h1:OaNxuTZr7kxeODyLWsRMC+OD03aFUH+mW6r2d+MWa5Y= +github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w= +github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazuY= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/couchbase/vellum v0.0.0-20190626091642-41f2deade2cf h1:B4yFDSyYolVT4DsKpztKYPeme6/kRdLV7iPZmAv2tEE= +github.com/couchbase/vellum v0.0.0-20190626091642-41f2deade2cf/go.mod h1:prYTC8EgTu3gwbqJihkud9zRXISvyulAplQ6exdCo1g= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +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/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dgryski/go-sip13 v0.0.0-20190329191031-25c5027a8c7b/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4 h1:qk/FSDDxo05wdJH28W+p5yivv7LuLYLRXPPD8KQCtZs= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= +github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= +github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= +github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/fortytw2/leaktest v1.2.1-0.20180901000122-b433bbd6d743 h1:QDM8xNoGxemDHdExynv+HzqkTPsFFZ8EyZdMwGElpGg= +github.com/fortytw2/leaktest v1.2.1-0.20180901000122-b433bbd6d743/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= +github.com/fossas/fossa-cli v1.0.30 h1:QVD8zvBjkwUnL4qui63TkoxDlvbp6vX4kBV/Tr7rGZE= +github.com/fossas/fossa-cli v1.0.30/go.mod h1:5K4/qTj0P2qaT1G3SccFidhmazoJ9dm/OexAAYT8lOI= +github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= +github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.8-0.20190312181446-1485a34d5d57 h1:r+AdyYQnMjCqabCiXfAES7u0tbaqXlLXuZ5FT+5OEQs= +github.com/fsnotify/fsnotify v1.4.8-0.20190312181446-1485a34d5d57/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= +github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= +github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= +github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2 h1:Ujru1hufTHVb++eG6OuNDKMxZnGIvF6o/u8q/8h2+I4= +github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= +github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 h1:gclg6gY70GLy3PbkQ1AERPfmLMMagS60DKF78eWwLn8= +github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= +github.com/gnewton/jargo v0.0.0-20150417131352-41f5f186a805 h1:rLZXvVgFIon3lI+v9IL8t1AmG9/yLMSRB5LQ0frn+6Q= +github.com/gnewton/jargo v0.0.0-20150417131352-41f5f186a805/go.mod h1:x+HLDnZexLq1FmhrdgFf4c3EWGbqhU3ITvISBFyzvRo= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.10.0 h1:dXFJfIHVvUcpSgDOV+Ne6t7jXri8Tfv2uOLHUZ2XNuo= +github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= +github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= +github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= +github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= +github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= +github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= +github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= +github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= +github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= +github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= +github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= +github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= +github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= +github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= +github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= +github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= +github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= +github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= +github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= +github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= +github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs= +github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= +github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= +github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= +github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= +github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= +github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= +github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= +github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= +github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= +github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= +github.com/go-openapi/strfmt v0.19.2/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= +github.com/go-openapi/strfmt v0.19.4/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk= +github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= +github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= +github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= +github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= +github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= +github.com/go-playground/locales v0.12.2-0.20190430153329-630ebbb60284 h1:nEqyZTmzNi/uHeBVZSTbFDZLKBdg0VDs9OA8/xbRrA8= +github.com/go-playground/locales v0.12.2-0.20190430153329-630ebbb60284/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM= +github.com/go-playground/universal-translator v0.16.1-0.20170327191703-71201497bace h1:KBq2uZbVnAcMuXpT4dlz/ebWns4k5lJTgzLYHgXBpBU= +github.com/go-playground/universal-translator v0.16.1-0.20170327191703-71201497bace/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY= +github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/gogo/protobuf v1.2.2-0.20190730201129-28a6bbf47e48/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 h1:ZgQEtGgCBiWRM39fZuwSd1LwSqqSW0hOdXCYYDX0R3I= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1-0.20190508161146-9fa652df1129 h1:tT8iWCYw4uOem71yYA3htfH+LNopJvcqZQshm56G5L4= +github.com/golang/mock v1.3.1-0.20190508161146-9fa652df1129/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-github/v30 v30.1.0 h1:VLDx+UolQICEOKu2m4uAoMti1SxuEBAl7RSEG16L+Oo= +github.com/google/go-github/v30 v30.1.0/go.mod h1:n8jBpHl45a/rlBUtRJMOG4GhNADUQFEufcolZ95JfU8= +github.com/google/go-jsonnet v0.16.0 h1:Nb4EEOp+rdeGGyB1rQ5eisgSAqrTnhf9ip+X6lzZbY0= +github.com/google/go-jsonnet v0.16.0/go.mod h1:sOcuej3UW1vpPTZOr8L7RQimqai1a57bt5j22LzGZCw= +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/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f h1:XXzyYlFbxK3kWfcmu3Wc+Tv8/QQl/VqwsWuSYF1Rj0s= +github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= +github.com/gophercloud/gophercloud v0.8.0/go.mod h1:Kc/QKr9thLKruO/dG0szY8kRIYS+iENz0ziI0hJf76A= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99 h1:twflg0XRTjwKpxb/jFExr4HGq6on2dEOmnL6FV+fgPw= +github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/handlers v1.3.0 h1:tsg9qP3mjt1h4Roxp+M1paRjrVBfPSOpBuVclh6YluI= +github.com/gorilla/handlers v1.3.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= +github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw= +github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4 h1:z53tR0945TRRQO/fLEVPI6SMv7ZflF0TEaTAoU7tOzg= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.14.1 h1:YuM9SXYy583fxvSOkzCDyBPCtY+/IMSHEG1dKFMLZsA= +github.com/grpc-ecosystem/grpc-gateway v1.14.1/go.mod h1:6CwZWGDSPRJidgKAtJVvND6soZe6fT7iteq8wDPdhb0= +github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= +github.com/hashicorp/consul/api v1.4.0/go.mod h1:xc8u05kyMa3Wjr9eEAsIAo3dg8+LywT5E/Cl7cNS5nU= +github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/consul/sdk v0.4.0/go.mod h1:fY08Y9z5SvJqevyZNy6WWPXiG3KwBPAvlcdx16zZ0fM= +github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-immutable-radix v1.0.0 h1:AKDB1HM5PWEA7i4nhcpwOrO2byshxBjXVn/J/3+z5/0= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3 h1:zKjpN5BK/P5lMYrLmBHdBULWbJ0XpYR+7NGzqkZzoD4= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= +github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.2.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 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/hcl v1.0.1-0.20190611123218-cf7d376da96d h1:r4iSf+UX1tNxFJZ64FsUoOfysT7TePSbRNz4/mYGUIE= +github.com/hashicorp/hcl v1.0.1-0.20190611123218-cf7d376da96d/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/memberlist v0.1.4 h1:gkyML/r71w3FL8gUi74Vk76avkj/9lYAY9lvg0OcoGs= +github.com/hashicorp/memberlist v0.1.4/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/hydrogen18/stalecucumber v0.0.0-20151102144322-9b38526d4bdf h1:d8mEMzY9ktqK+eVFDLIsYOcM19/yYvZlmR0kcb4MrSQ= +github.com/hydrogen18/stalecucumber v0.0.0-20151102144322-9b38526d4bdf/go.mod h1:KE5xQoh/IqNckSFoQXL5o5nEkrBiUDxatgac7TSMQ8Y= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf h1:WfD7VjIE6z8dIvMsI4/s+1qr5EL+zoIGev1BQj1eoJ8= +github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf/go.mod h1:hyb9oH7vZsitZCiBt0ZvifOrB+qc8PS5IiilCIb87rg= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/influxdata/influxdb v1.7.7 h1:UvNzAPfBrKMENVbQ4mr4ccA9sW+W1Ihl0Yh1s0BiVAg= +github.com/influxdata/influxdb v1.7.7/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= +github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jhump/protoreflect v1.6.1 h1:4/2yi5LyDPP7nN+Hiird1SAJ6YoxUm13/oxHGRnbPd8= +github.com/jhump/protoreflect v1.6.1/go.mod h1:RZQ/lnuN+zqeRVpQigTwO6o0AJUkxbnSnpuG7toUTG4= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY= +github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= +github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kylelemons/godebug v0.0.0-20160406211939-eadb3ce320cb/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= +github.com/leanovate/gopter v0.2.3-0.20181005062252-e2604588f4db h1:OIgdqANJZZBFAwpmDekbBGzwhdFptLf56fuVpMwv0Qg= +github.com/leanovate/gopter v0.2.3-0.20181005062252-e2604588f4db/go.mod h1:gNcbPWNEWRe4lm+bycKqxUYoH5uoVje5SkOJ3uoLer8= +github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743 h1:143Bb8f8DuGWck/xpNUOckBVYfFbBTnLevfRZ1aVVqo= +github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= +github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20200305213919-a88bf8de3718 h1:lrdADj7ifyBpqGJ+cT4vE5ztUoAF87uUf76+epwPViY= +github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20200305213919-a88bf8de3718/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= +github.com/lightstep/lightstep-tracer-go v0.18.1 h1:vi1F1IQ8N7hNWytK9DpJsUfQhGuNSc19z330K6vl4zk= +github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/lightstep/lightstep-tracer-go v0.20.0 h1:Kwc+Vt7N2mxTyEdLuARDfx1nUAwHILcg1s8jBAxqSIg= +github.com/lightstep/lightstep-tracer-go v0.20.0/go.mod h1:RnONwHKg89zYPmF+Uig5PpHMUcYCFgml8+r4SS53y7A= +github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= +github.com/m3db/bitset v2.0.0+incompatible h1:wMgri1Z2QSwJ8K/7ZuV7vE4feLOT7EofVC8RakIOybI= +github.com/m3db/bitset v2.0.0+incompatible/go.mod h1:X8CCqZmZxs2O6d4qHhiqtAKCin4G5mScPhiwX9rsc5c= +github.com/m3db/bloom v3.0.0+incompatible h1:cZzeDfFmgJ076MBv0zM8ZHS/soNoll7F+r5hudgxPCk= +github.com/m3db/bloom v3.0.0+incompatible/go.mod h1:W6XzpFw4t+CIYq+NGyp5c2394YsUc1P1+W/KAWty2lU= +github.com/m3db/build-tools v0.0.0-20181013000606-edd1bdd1df8a h1:CwsSHIJLeCESKdZ844jXg/3rQD3yA5azuVlJBp5w8U8= +github.com/m3db/build-tools v0.0.0-20181013000606-edd1bdd1df8a/go.mod h1:Pk9AtZeKuCO2xcAth0gxwzRNFv4lV26GPSx4I6A7DQ8= +github.com/m3db/m3x v0.0.0-20190408051622-ebf3c7b94afd h1:wzLBtXzxZM9b6IXwLSRE5crynocLTCuRDpGDaOJzyuI= +github.com/m3db/m3x v0.0.0-20190408051622-ebf3c7b94afd/go.mod h1:zLbcVb352e3Jsg62A6zzEhZ1gumeFsiamTqDs9ZmZrs= +github.com/m3db/pilosa v0.0.0-20190128031222-ac8920c6e1ab h1:osrrNq1KrYxfpT5GVr2PkEIhHU1AZ09VGAF2lGQmLW4= +github.com/m3db/pilosa v0.0.0-20190128031222-ac8920c6e1ab/go.mod h1:Zv0DgEzk1QVFw3uMlFiuQYQrY+nW8IJrBMdyMf9sHQc= +github.com/m3db/prometheus_client_golang v0.8.1 h1:t7w/tcFws81JL1j5sqmpqcOyQOpH4RDOmIe3A3fdN3w= +github.com/m3db/prometheus_client_golang v0.8.1/go.mod h1:8R/f1xYhXWq59KD/mbRqoBulXejss7vYtYzWmruNUwI= +github.com/m3db/prometheus_client_model v0.0.0-20180517145114-8b2299a4bf7d h1:BtNPRz2kmh42OAVYjsOBjty2wE0FaIh7aPVtFNPcF48= +github.com/m3db/prometheus_client_model v0.0.0-20180517145114-8b2299a4bf7d/go.mod h1:Qfsxn+LypxzF+lNhak7cF7k0zxK7uB/ynGYoj80zcD4= +github.com/m3db/prometheus_common v0.0.0-20180517030744-25aaa3dff79b h1:DEtcqizQ9PnY4xudqHyze5F89jijy33fnPYYSCCYPXY= +github.com/m3db/prometheus_common v0.0.0-20180517030744-25aaa3dff79b/go.mod h1:EBmDQaMAy4B8i+qsg1wMXAelLNVbp49i/JOeVszQ/rs= +github.com/m3db/prometheus_procfs v0.8.1 h1:LsxWzVELhDU9sLsZTaFLCeAwCn7bC7qecZcK4zobs/g= +github.com/m3db/prometheus_procfs v0.8.1/go.mod h1:N8lv8fLh3U3koZx1Bnisj60GYUMDpWb09x1R+dmMOJo= +github.com/m3db/stackadler32 v0.0.0-20180104200216-bfebcd73ef6f h1:+FWCOZjB96lBc0L7lvz6/TW1gF5fEVd6JQNQG59CpZE= +github.com/m3db/stackadler32 v0.0.0-20180104200216-bfebcd73ef6f/go.mod h1:VJQWii2dj/AE1cRKup4MXL4TKbbs5J4wZnNe5I1CZaw= +github.com/m3db/stackmurmur3 v0.0.0-20171110233611-744c0229c12e h1:B4xyv9ezWgbe30jxYzXxR45iE0Os7oZchmmyuQhGRVg= +github.com/m3db/stackmurmur3 v0.0.0-20171110233611-744c0229c12e/go.mod h1:hkR/F91aDUfPxDv5Jw55ifIXV6ZW1jzNHW0d8GP02rw= +github.com/m3db/thrift v0.0.0-20190820191926-05b5a2227fe4 h1:1x3mMuURd3wqKJ2qVjhRYOAmL9g4EA9JTagWB/y/3xo= +github.com/m3db/thrift v0.0.0-20190820191926-05b5a2227fe4/go.mod h1:xVfRinGzD3cYDRvMjy6RkIwM+iNL2KHNLZjT0VpVZT8= +github.com/m3db/tools v0.0.0-20181008195521-c6ded3f34878 h1:kww0LtVVfGrXR7Ofpbi/9bvc2EGYMQC0LCH/gQXoolE= +github.com/m3db/tools v0.0.0-20181008195521-c6ded3f34878/go.mod h1:TxroQUZzb1wzOsq+4+TfVtT7z89YTz3v2UJAYfLNfLE= +github.com/m3db/vellum v0.0.0-20190111185746-e766292d14de h1:7rDVjZrv7T2QkAlcTjt2gjgdY94IPOGV/8lN+/Pgch8= +github.com/m3db/vellum v0.0.0-20190111185746-e766292d14de/go.mod h1:8P8mbYs1lFc+HvLwT0CdvCq9Ro3o6NMHiu4n0+hkBEA= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +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-runewidth v0.0.2 h1:UnlwIPBGaTZfPQ6T1IGzPI0EkYAQmT9fAEJ/poFC63o= +github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mauricelam/genny v0.0.0-20180903214747-eb2c5232c885 h1:nCU/HIvsORu8nlebFTTkEpxao5zA/yt5Y4yQccm34bM= +github.com/mauricelam/genny v0.0.0-20180903214747-eb2c5232c885/go.mod h1:wRyVMWiOZeVj+MieWS5tIBBtJ3RtqqMbPsA5Z+t5b5U= +github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/miekg/dns v1.1.27 h1:aEH/kqUzUxGJ/UHcEKdJY+ugH6WEzsEBBSPa8zuy1aM= +github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= +github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mjibson/esc v0.2.0 h1:k96hdaR9Z+nMcnDwNrOvhdBqtjyMrbVyxLpsRCdP2mA= +github.com/mjibson/esc v0.2.0/go.mod h1:9Hw9gxxfHulMF5OJKCyhYD7PzlSdhzXyaGEBRPH1OPs= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae h1:VeRdUYdCw49yizlSbMEn2SZ+gT+3IUKx8BqxyQdz+BY= +github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= +github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= +github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= +github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= +github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= +github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= +github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= +github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5 h1:58+kh9C6jJVXYjt8IE48G2eWl6BjwU5Gj0gqY84fy78= +github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo= +github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME= +github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= +github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9 h1:QsgXACQhd9QJhEmRumbsMQQvBtmdS0mafoVEBplWXEg= +github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w= +github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= +github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= +github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= +github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pborman/getopt v0.0.0-20160216163137-ec82d864f599 h1:kpwMY/v/NNm+lnaTP5L9WVK8YEb6T3fu+XBAy+7M0kw= +github.com/pborman/getopt v0.0.0-20160216163137-ec82d864f599/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= +github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= +github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pelletier/go-toml v1.5.0 h1:5BakdOZdtKJ1FFk6QdL8iSGrMWsXgchNJcrnarjbmJQ= +github.com/pelletier/go-toml v1.5.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys= +github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= +github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ= +github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= +github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pilosa/pilosa v1.3.1-0.20190807173852-bc9747cc0f19 h1:SeNzfkSYASGG41wgg8eR23DWA550sO1neyuIbNryzio= +github.com/pilosa/pilosa v1.3.1-0.20190807173852-bc9747cc0f19/go.mod h1:57zHA92sPbJ01QsMyyEDASX2TJnf8qSM7ZdUnVzM0b8= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.2.1 h1:F++O52m40owAmADcojzM+9gyjmMOY/T4oYJkgFDH8RE= +github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= +github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +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/pointlander/compress v1.1.0 h1:5fUcQV2qEHvk0OpILH6eltwluN5VnwiYrkc1wjGUHnU= +github.com/pointlander/compress v1.1.0/go.mod h1:q5NXNGzqj5uPnVuhGkZfmgHqNUhf15VLi6L9kW0VEc0= +github.com/pointlander/jetset v1.0.0 h1:bNlaNAX7cDPID9SlcogmXlDWq0KcRJSpKwHXaAM3bGQ= +github.com/pointlander/jetset v1.0.0/go.mod h1:zY6+WHRPB10uzTajloHtybSicLW1bf6Rz0eSaU9Deng= +github.com/pointlander/peg v1.0.0 h1:rtCtA6Fu6xJpILX8WJfU+cvrcKmXgTfG/v+bkLP8NYY= +github.com/pointlander/peg v1.0.0/go.mod h1:WJTMcgeWYr6fZz4CwHnY1oWZCXew8GWCF93FaAxPrh4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/prashantv/protectmem v0.0.0-20171002184600-e20412882b3a h1:AA9vgIBDjMHPC2McaGPojgV2dcI78ZC0TLNhYCXEKH8= +github.com/prashantv/protectmem v0.0.0-20171002184600-e20412882b3a/go.mod h1:lzZQ3Noex5pfAy7mkAeCjcBDteYU85uWWnJ/y6gKU8k= +github.com/prateek/gorename v0.0.0-20180424020013-52c7307cddd2 h1:/pJs9wFXnmhD12W+dnwoNJXPtLsxa78y+vzC9i/Hs+A= +github.com/prateek/gorename v0.0.0-20180424020013-52c7307cddd2/go.mod h1:nw9dXugFBQe1pshgrdeRjyYrY+RxNZckdWkiGHX8URE= +github.com/prometheus/alertmanager v0.20.0/go.mod h1:9g2i48FAyZW6BtbsnvHtMHQXl2aVtrORKwKVCQ+nbrg= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U= +github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= +github.com/prometheus/client_golang v1.5.1 h1:bdHYieyGlH+6OLEk2YQha8THib30KP0/yD0YH9m6xcA= +github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= +github.com/prometheus/common v0.9.1 h1:KOMtN28tlbam3/7ZKEYKHhKoJZYYj3gMH4uc62x7X7U= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= +github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/prometheus/prometheus v1.8.2-0.20200420081721-18254838fbe2 h1:JtWnHSHMC1h8mb6K5GsFzmhY/WMILsxQ4slsJu+lyg8= +github.com/prometheus/prometheus v1.8.2-0.20200420081721-18254838fbe2/go.mod h1:ZnfuiMn3LNsry2q7ECmRe4WcscxmJSd2dIFpOi4w3lM= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rakyll/statik v0.1.6 h1:uICcfUXpgqtw2VopbIncslhAmE5hwc4g20TEyEENBNs= +github.com/rakyll/statik v0.1.6/go.mod h1:OEi9wJV/fMUAGx1eNjq75DKDsJVuEv1U0oYdX6GX8Zs= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/remeh/sizedwaitgroup v1.0.0 h1:VNGGFwNo/R5+MJBf6yrsr110p0m4/OX4S3DCy7Kyl5E= +github.com/remeh/sizedwaitgroup v1.0.0/go.mod h1:3j2R4OIe/SeS6YDhICBy22RWjJC5eNCJ1V+9+NVNYlo= +github.com/remyoudompheng/bigfft v0.0.0-20190321074620-2f0d2b0e0001 h1:YDeskXpkNDhPdWN3REluVa46HQOVuVkjkd2sWnrABNQ= +github.com/remyoudompheng/bigfft v0.0.0-20190321074620-2f0d2b0e0001/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= +github.com/rhysd/go-github-selfupdate v1.2.2 h1:G+mNzkc1wEtpmM6sFS/Ghkeq+ad4Yp6EZEHyp//wGEo= +github.com/rhysd/go-github-selfupdate v1.2.2/go.mod h1:khesvSyKcXDUxeySCedFh621iawCks0dS/QnHPcpCws= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/russross/blackfriday v2.0.0+incompatible h1:cBXrhZNUf9C+La9/YpS+UHpUT8YD6Td9ZMSU9APFcsk= +github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/rveen/ogdl v0.0.0-20200522080342-eeeda1a978e7 h1:Lftq+hHvm0kPWM1sDNqx1jkXAo1zw2YceoFo1hdyj7I= +github.com/rveen/ogdl v0.0.0-20200522080342-eeeda1a978e7/go.mod h1:9fqUB54wJS9u5TSXJZhRfTdh1lXVxTytDjed7t2cNdw= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= +github.com/satori/go.uuid v0.0.0-20160603004225-b111a074d5ef/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= +github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/shirou/gopsutil v2.18.12+incompatible h1:1eaJvGomDnH74/5cF4CTmTbLHAriGFsTZppLXDX93OM= +github.com/shirou/gopsutil v2.18.12+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/shirou/gopsutil v2.20.1+incompatible h1:oIq9Cq4i84Hk8uQAUOG3eNdI/29hBawGrD5YRl6JRDY= +github.com/shirou/gopsutil v2.20.1+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 h1:udFKJ0aHUL60LboW/A+DfgoHVedieIzIXE8uylPue0U= +github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= +github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= +github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/assertions v1.0.0 h1:UVQPSSmc3qtTi+zPPkCXvZX9VvW/xT/NsRvKfwY81a8= +github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= +github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/smartystreets/gunit v1.0.0/go.mod h1:qwPWnhz6pn0NnRBP++URONOVyNkPyr4SauJk4cUOwJs= +github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= +github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.3.1-0.20190531151931-f31dc0aaab5a h1:o6gDpunpOQeRPLojT1Zo6gkzwgGJWZjjtuXTZEwo6AM= +github.com/spf13/cast v1.3.1-0.20190531151931-f31dc0aaab5a/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.3.1/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk= +github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= +github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4= +github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= +github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= +github.com/streadway/quantile v0.0.0-20150917103942-b0c588724d25 h1:7z3LSn867ex6VSaahyKadf4WtSsJIgne6A1WLOAGM8A= +github.com/streadway/quantile v0.0.0-20150917103942-b0c588724d25/go.mod h1:lbP8tGiBjZ5YWIc2fzuRpTaz0b/53vT6PEs3QuAWzuU= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/subosito/gotenv v1.2.1-0.20190917103637-de67a6614a4d h1:YN4gX82mT31qsizy2jRheOCrGLCs15VF9SV5XPuBvkQ= +github.com/subosito/gotenv v1.2.1-0.20190917103637-de67a6614a4d/go.mod h1:GVSeM7r0P1RI1gOKYyN9IuNkhMmQwKGsjVf3ulDrdzo= +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/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/tinylib/msgp v1.1.0 h1:9fQd+ICuRIu/ue4vxJZu6/LzxN0HwMds2nq/0cFvxHU= +github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= +github.com/tj/assert v0.0.0-20171129193455-018094318fb0 h1:Rw8kxzWo1mr6FSaYXjQELRe88y2KdfynXdnK72rdjtA= +github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0= +github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod h1:WjeM0Oo1eNAjXGDx2yma7uG2XoyRZTq1uv3M/o7imD0= +github.com/tj/go-kinesis v0.0.0-20171128231115-08b17f58cb1b/go.mod h1:/yhzCV0xPfx6jb1bBgRFjl5lytqVqZXEaeqWP8lTEao= +github.com/tj/go-spin v1.1.0/go.mod h1:Mg1mzmePZm4dva8Qz60H2lHwmJ2loum4VIrLgVnKwh4= +github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 h1:LnC5Kc/wtumK+WB441p7ynQJzVuNRJiqddSIE3IlSEQ= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/twotwotwo/sorts v0.0.0-20160814051341-bf5c1f2b8553 h1:DRC1ubdb3ZmyyIeCSTxjZIQAnpLPfKVgYrLETQuOPjo= +github.com/twotwotwo/sorts v0.0.0-20160814051341-bf5c1f2b8553/go.mod h1:Rj7Csq/tZ/egz+Ltc2IVpsA5309AmSMEswjkTZmq2Xc= +github.com/uber-go/atomic v1.4.0 h1:yOuPqEq4ovnhEjpHmfFwsqBXDYbQeT6Nb0bwD6XnD5o= +github.com/uber-go/atomic v1.4.0/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g= +github.com/uber-go/tally v3.3.13+incompatible h1:5ic2UsDwjcWsw9jvEdWEE2XsmGCLMTt5Ukg4d74fed4= +github.com/uber-go/tally v3.3.13+incompatible/go.mod h1:YDTIBxdXyOU/sCWilKB4bgyufu1cEi0jdVnRdxvjnmU= +github.com/uber/jaeger-client-go v2.16.0+incompatible h1:Q2Pp6v3QYiocMxomCaJuwQGFt7E53bPYqEgug/AoBtY= +github.com/uber/jaeger-client-go v2.16.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= +github.com/uber/jaeger-lib v2.0.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= +github.com/uber/jaeger-lib v2.2.0+incompatible h1:MxZXOiR2JuoANZ3J6DE/U0kSFv/eJ/GfSYVCjK7dyaw= +github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= +github.com/uber/tchannel-go v1.12.0 h1:xqfXzViTPQxoA/KXBfnkXlwBn7JVpa7MVRUzWjVHMbI= +github.com/uber/tchannel-go v1.12.0/go.mod h1:Rrgz1eL8kMjW/nEzZos0t+Heq0O4LhnUJVA32OvWKHo= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok= +github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY= +github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a h1:0R4NLDRDZX6JcmhJgXi5E4b8Wg84ihbmUKp/GvSPEzc= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= +github.com/vmihailenco/msgpack v2.8.3+incompatible h1:76LCLwxS08gKHRpGA10PBxfWk72JfUH6mgzp2+URwYM= +github.com/vmihailenco/msgpack v2.8.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= +github.com/willf/bitset v1.1.10 h1:NotGKqX0KwQ72NUzqrjZq5ipPNDQex9lo3WpaS8L2sc= +github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= +github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70= +github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk= +go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= +go.etcd.io/etcd v3.4.9+incompatible h1:+1fIz+80BbHdYEy4vb78rhg3KYCPMICu27XNMxlUwSw= +go.etcd.io/etcd v3.4.9+incompatible/go.mod h1:skWido08r9w6Lq/w70DO5XYIKMu4QFu1+4VsqLQuJy8= +go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= +go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.5.1 h1:rsqfU5vBkVknbhUGbAUwQKR2H4ItV8tjJ+6kJX4cxHM= +go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/config v1.4.0 h1:upnMPpMm6WlbZtXoasNkK4f0FhxwS+W4Iqz5oNznehQ= +go.uber.org/config v1.4.0/go.mod h1:aCyrMHmUAc/s2h9sv1koP84M9ZF/4K+g2oleyESO/Ig= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.4.0 h1:f3WCSC2KzAcBXGATIxAB1E2XuCpNU255wNKZ505qi3E= +go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.13.0 h1:nR6NoDBgAf67s68NhaXbsojM+2gxp3S1hWkHDl27pVU= +go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g= +golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/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= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +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= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +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= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= +golang.org/x/tools v0.0.0-20190813034749-528a2984e271/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191104232314-dc038396d1f0/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200305205014-bc073721adb6/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b h1:zSzQJAznWxAh9fZxiPy2FZo+ZZEYoYFYYDYdOrU7AaM= +golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20200305110556-506484158171 h1:xes2Q2k+d/+YNXVw0FpZkIDJiaux4OVrRKXRAzH6A0U= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/fsnotify/fsnotify.v1 v1.4.7/go.mod h1:Fyux9zXlo4rWoMSIzpn9fDAYjalPqJ/K1qJ27s+7ltE= +gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= +gopkg.in/go-ini/ini.v1 v1.57.0 h1:e9cP3G5H9zMIwvQnUDbnD7k5SFuSbrPWdSAV8VHKxX8= +gopkg.in/go-ini/ini.v1 v1.57.0/go.mod h1:M74/hG4RTwbkZyTEZ9iQwM4v6dFD4u6QBjoqT/pM8Kg= +gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM= +gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= +gopkg.in/go-playground/validator.v9 v9.7.0 h1:FjlsYAKvSv6gNHagVRD7pgOLNgDX/nWcMAmX9XjTK8I= +gopkg.in/go-playground/validator.v9 v9.7.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.51.1 h1:GyboHr4UqMiLUybYjd22ZjQIKEJEpgtLXtuGbR21Oho= +gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg= +gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= +gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg= +gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= +gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE= +gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/validator.v2 v2.0.0-20160201165114-3e4f037f12a1 h1:1IZMbdoz1SZAQ4HMRwAP0FPSyXt7ywsiJ4q7OPTEu4A= +gopkg.in/validator.v2 v2.0.0-20160201165114-3e4f037f12a1/go.mod h1:o4V0GXN9/CAmCsvJ0oXYZvrZOe7syiDZSN1GWGZTGzc= +gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +k8s.io/api v0.17.3/go.mod h1:YZ0OTkuw7ipbe305fMpIdf3GLXZKRigjtZaV5gzC2J0= +k8s.io/apimachinery v0.17.3/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g= +k8s.io/client-go v0.17.3/go.mod h1:cLXlTMtWHkuK4tD360KpWz2gG2KtdWEr/OT02i3emRQ= +k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= +k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= +k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +modernc.org/mathutil v1.0.0 h1:93vKjrJopTPrtTNpZ8XIovER7iCIH1QU7wNbOQXC60I= +modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= +modernc.org/strutil v1.0.0 h1:XVFtQwFVwc02Wk+0L/Z/zDDXO81r5Lhe6iMKmGX3KhE= +modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= +sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= +sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= From 7bd3e972373e9379100599e2b1e01e7d73f845f2 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 22:16:54 -0400 Subject: [PATCH 28/43] fix genny --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4b47c4336a..cf63e986f5 100644 --- a/Makefile +++ b/Makefile @@ -371,8 +371,8 @@ asset-gen-$(SUBDIR): install-tools genny-gen-$(SUBDIR): install-tools @echo "--- Generating genny files $(SUBDIR)" @[ ! -f $(SELF_DIR)/src/$(SUBDIR)/generated-source-files.mk ] || \ - PATH=$(combined_bin_paths):$(PATH) GO111MODULE=on make -f $(SELF_DIR)/src/$(SUBDIR)/generated-source-files.mk $(genny_target) - @PATH=$(combined_bin_paths):$(PATH) GO111MODULE=on bash -c "source ./scripts/auto-gen-helpers.sh && gen_cleanup_dir '*_gen.go' $(SELF_DIR)/src/$(SUBDIR)/ && gen_cleanup_dir '*_gen_test.go' $(SELF_DIR)/src/$(SUBDIR)/" + PATH=$(combined_bin_paths):$(PATH) GO111MODULE=off make -f $(SELF_DIR)/src/$(SUBDIR)/generated-source-files.mk $(genny_target) + @PATH=$(combined_bin_paths):$(PATH) GO111MODULE=off bash -c "source ./scripts/auto-gen-helpers.sh && gen_cleanup_dir '*_gen.go' $(SELF_DIR)/src/$(SUBDIR)/ && gen_cleanup_dir '*_gen_test.go' $(SELF_DIR)/src/$(SUBDIR)/" .PHONY: license-gen-$(SUBDIR) license-gen-$(SUBDIR): install-tools From 758d1b7ba498f9b39cb80259fe3486bb27d65e3b Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 22:25:00 -0400 Subject: [PATCH 29/43] mod tidy --- Makefile | 13 +++++++++++++ go.mod | 2 +- go.sum | 9 --------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index cf63e986f5..9efc07f9ba 100644 --- a/Makefile +++ b/Makefile @@ -367,6 +367,8 @@ asset-gen-$(SUBDIR): install-tools @[ ! -d src/$(SUBDIR)/$(assets_rules_dir) ] || \ PATH=$(combined_bin_paths):$(PATH) PACKAGE=$(m3_package) $(auto_gen) src/$(SUBDIR)/$(assets_output_dir) src/$(SUBDIR)/$(assets_rules_dir) +# NB(schallert): gorename (used by our genny process) doesn't work with go +# modules https://github.com/golang/go/issues/34222 .PHONY: genny-gen-$(SUBDIR) genny-gen-$(SUBDIR): install-tools @echo "--- Generating genny files $(SUBDIR)" @@ -457,6 +459,17 @@ endef # of metalint and finishes faster. $(foreach SUBDIR_TARGET, $(filter-out metalint,$(SUBDIR_TARGETS)), $(eval $(SUBDIR_TARGET_RULE))) +.PHONY: go-mod-tidy +go-mod-tidy: + @echo "--- :golang: tidying modules" + go mod tidy + +.PHONY: all-gen +all-gen: \ + install-tools \ + $(foreach SUBDIR_TARGET, $(filter-out metalint all-gen,$(SUBDIR_TARGETS)), $(SUBDIR_TARGET)) \ + go-mod-tidy + .PHONY: build-ui-ctl build-ui-ctl: ifeq ($(shell ls ./src/ctl/ui/build 2>/dev/null),) diff --git a/go.mod b/go.mod index d7325276c1..0d2547ad07 100644 --- a/go.mod +++ b/go.mod @@ -39,7 +39,7 @@ require ( github.com/jhump/protoreflect v1.6.1 github.com/json-iterator/go v1.1.9 github.com/leanovate/gopter v0.2.3-0.20181005062252-e2604588f4db - github.com/lightstep/lightstep-tracer-go v0.20.0 + github.com/lightstep/lightstep-tracer-go v0.18.1 github.com/m3db/bitset v2.0.0+incompatible github.com/m3db/bloom v3.0.0+incompatible github.com/m3db/build-tools v0.0.0-20181013000606-edd1bdd1df8a diff --git a/go.sum b/go.sum index 4bbcf171cb..ed0f3ae6d7 100644 --- a/go.sum +++ b/go.sum @@ -40,8 +40,6 @@ github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWX github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 h1:UUppSQnhf4Yc6xGxSkoQpPhb7RVzuv5Nb1mwJ5VId9s= github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk= -github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs= @@ -409,12 +407,8 @@ github.com/leanovate/gopter v0.2.3-0.20181005062252-e2604588f4db h1:OIgdqANJZZBF github.com/leanovate/gopter v0.2.3-0.20181005062252-e2604588f4db/go.mod h1:gNcbPWNEWRe4lm+bycKqxUYoH5uoVje5SkOJ3uoLer8= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743 h1:143Bb8f8DuGWck/xpNUOckBVYfFbBTnLevfRZ1aVVqo= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= -github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20200305213919-a88bf8de3718 h1:lrdADj7ifyBpqGJ+cT4vE5ztUoAF87uUf76+epwPViY= -github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20200305213919-a88bf8de3718/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1 h1:vi1F1IQ8N7hNWytK9DpJsUfQhGuNSc19z330K6vl4zk= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/lightstep/lightstep-tracer-go v0.20.0 h1:Kwc+Vt7N2mxTyEdLuARDfx1nUAwHILcg1s8jBAxqSIg= -github.com/lightstep/lightstep-tracer-go v0.20.0/go.mod h1:RnONwHKg89zYPmF+Uig5PpHMUcYCFgml8+r4SS53y7A= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/m3db/bitset v2.0.0+incompatible h1:wMgri1Z2QSwJ8K/7ZuV7vE4feLOT7EofVC8RakIOybI= github.com/m3db/bitset v2.0.0+incompatible/go.mod h1:X8CCqZmZxs2O6d4qHhiqtAKCin4G5mScPhiwX9rsc5c= @@ -643,8 +637,6 @@ github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shirou/gopsutil v2.18.12+incompatible h1:1eaJvGomDnH74/5cF4CTmTbLHAriGFsTZppLXDX93OM= github.com/shirou/gopsutil v2.18.12+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/shirou/gopsutil v2.20.1+incompatible h1:oIq9Cq4i84Hk8uQAUOG3eNdI/29hBawGrD5YRl6JRDY= -github.com/shirou/gopsutil v2.20.1+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 h1:udFKJ0aHUL60LboW/A+DfgoHVedieIzIXE8uylPue0U= github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= @@ -762,7 +754,6 @@ go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= From fd87467df8d718cfe202003c89c61f129f16e4c7 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 22:42:00 -0400 Subject: [PATCH 30/43] fix esc version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0d2547ad07..cef937d0ac 100644 --- a/go.mod +++ b/go.mod @@ -54,7 +54,7 @@ require ( github.com/m3db/tools v0.0.0-20181008195521-c6ded3f34878 github.com/m3db/vellum v0.0.0-20190111185746-e766292d14de github.com/mauricelam/genny v0.0.0-20180903214747-eb2c5232c885 - github.com/mjibson/esc v0.2.0 + github.com/mjibson/esc v0.1.0 github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9 github.com/opentracing/opentracing-go v1.1.0 github.com/pborman/getopt v0.0.0-20160216163137-ec82d864f599 diff --git a/go.sum b/go.sum index ed0f3ae6d7..20b22da9a9 100644 --- a/go.sum +++ b/go.sum @@ -480,8 +480,8 @@ github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0Qu github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mjibson/esc v0.2.0 h1:k96hdaR9Z+nMcnDwNrOvhdBqtjyMrbVyxLpsRCdP2mA= -github.com/mjibson/esc v0.2.0/go.mod h1:9Hw9gxxfHulMF5OJKCyhYD7PzlSdhzXyaGEBRPH1OPs= +github.com/mjibson/esc v0.1.0 h1:5ch+murgrcwDFLOE2hwj0f7kE4xJfJhkSCAjSLY182o= +github.com/mjibson/esc v0.1.0/go.mod h1:9Hw9gxxfHulMF5OJKCyhYD7PzlSdhzXyaGEBRPH1OPs= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= From 5a6ac2a96d0e40d19f2aad05982efc872d15dc18 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 22:45:51 -0400 Subject: [PATCH 31/43] fix testify version --- go.mod | 2 ++ go.sum | 9 ++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index cef937d0ac..7ebd87eedd 100644 --- a/go.mod +++ b/go.mod @@ -117,3 +117,5 @@ require ( replace github.com/apache/thrift => github.com/m3db/thrift v0.0.0-20190820191926-05b5a2227fe4 replace gopkg.in/vmihailenco/msgpack.v2 => github.com/vmihailenco/msgpack v2.8.3+incompatible + +replace github.com/stretchr/testify => github.com/stretchr/testify v1.1.4-0.20160305165446-6fe211e49392 diff --git a/go.sum b/go.sum index 20b22da9a9..ea53a6975d 100644 --- a/go.sum +++ b/go.sum @@ -127,7 +127,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSY github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= @@ -685,15 +684,11 @@ github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3 github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/streadway/quantile v0.0.0-20150917103942-b0c588724d25 h1:7z3LSn867ex6VSaahyKadf4WtSsJIgne6A1WLOAGM8A= github.com/streadway/quantile v0.0.0-20150917103942-b0c588724d25/go.mod h1:lbP8tGiBjZ5YWIc2fzuRpTaz0b/53vT6PEs3QuAWzuU= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.1.4-0.20160305165446-6fe211e49392 h1:7ubzBW6wJ46nWdWvZQlDjtGTnupA4Z1dyHY9Xbhq3us= +github.com/stretchr/testify v1.1.4-0.20160305165446-6fe211e49392/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.2.1-0.20190917103637-de67a6614a4d h1:YN4gX82mT31qsizy2jRheOCrGLCs15VF9SV5XPuBvkQ= github.com/subosito/gotenv v1.2.1-0.20190917103637-de67a6614a4d/go.mod h1:GVSeM7r0P1RI1gOKYyN9IuNkhMmQwKGsjVf3ulDrdzo= From 5058a300867561e33b09ce66fa24f3b41e704db2 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 23:05:35 -0400 Subject: [PATCH 32/43] downgrade etcd --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7ebd87eedd..8957e20a76 100644 --- a/go.mod +++ b/go.mod @@ -94,7 +94,7 @@ require ( github.com/uber/tchannel-go v1.12.0 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a github.com/willf/bitset v1.1.10 - go.etcd.io/etcd v3.4.9+incompatible + go.etcd.io/etcd v3.4.3+incompatible go.uber.org/atomic v1.5.1 go.uber.org/config v1.4.0 go.uber.org/zap v1.13.0 diff --git a/go.sum b/go.sum index ea53a6975d..38d3d36453 100644 --- a/go.sum +++ b/go.sum @@ -742,8 +742,8 @@ go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.etcd.io/etcd v3.4.9+incompatible h1:+1fIz+80BbHdYEy4vb78rhg3KYCPMICu27XNMxlUwSw= -go.etcd.io/etcd v3.4.9+incompatible/go.mod h1:skWido08r9w6Lq/w70DO5XYIKMu4QFu1+4VsqLQuJy8= +go.etcd.io/etcd v3.4.3+incompatible h1:o7FWvxyeMTs4lLEEO2d2dasL5+8aFltVUYZsNukrjME= +go.etcd.io/etcd v3.4.3+incompatible/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= From 087961ed6f730f682ae80f079d1797821c65e47c Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Mon, 1 Jun 2020 23:13:14 -0400 Subject: [PATCH 33/43] replace grpc --- go.mod | 2 ++ go.sum | 31 ++----------------------------- 2 files changed, 4 insertions(+), 29 deletions(-) diff --git a/go.mod b/go.mod index 8957e20a76..4a5d1f7edc 100644 --- a/go.mod +++ b/go.mod @@ -119,3 +119,5 @@ replace github.com/apache/thrift => github.com/m3db/thrift v0.0.0-20190820191926 replace gopkg.in/vmihailenco/msgpack.v2 => github.com/vmihailenco/msgpack v2.8.3+incompatible replace github.com/stretchr/testify => github.com/stretchr/testify v1.1.4-0.20160305165446-6fe211e49392 + +replace google.golang.org/grpc => google.golang.org/grpc v1.7.5 diff --git a/go.sum b/go.sum index 38d3d36453..c6605125e3 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,3 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= github.com/Azure/azure-sdk-for-go v40.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= @@ -93,7 +92,6 @@ github.com/c2h5oh/datasize v0.0.0-20171227191756-4eba002a5eae/go.mod h1:S/7n9cop github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v0.0.0-20181003080854-62661b46c409/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM= @@ -105,7 +103,6 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa h1:OaNxuTZr7kxeODyLWsRMC+OD03aFUH+mW6r2d+MWa5Y= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w= @@ -147,9 +144,6 @@ github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkg github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= -github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= @@ -235,7 +229,6 @@ github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= @@ -249,7 +242,6 @@ github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 h1:ZgQEtGgCBiWRM39fZuwSd1LwSqqSW0hOdXCYYDX0R3I= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1-0.20190508161146-9fa652df1129 h1:tT8iWCYw4uOem71yYA3htfH+LNopJvcqZQshm56G5L4= github.com/golang/mock v1.3.1-0.20190508161146-9fa652df1129/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -408,7 +400,6 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1 h1:vi1F1IQ8N7hNWytK9DpJsUfQhGuNSc19z330K6vl4zk= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/m3db/bitset v2.0.0+incompatible h1:wMgri1Z2QSwJ8K/7ZuV7vE4feLOT7EofVC8RakIOybI= github.com/m3db/bitset v2.0.0+incompatible/go.mod h1:X8CCqZmZxs2O6d4qHhiqtAKCin4G5mScPhiwX9rsc5c= github.com/m3db/bloom v3.0.0+incompatible h1:cZzeDfFmgJ076MBv0zM8ZHS/soNoll7F+r5hudgxPCk= @@ -783,7 +774,6 @@ golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -797,7 +787,6 @@ golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -841,7 +830,6 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -885,11 +873,9 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -935,20 +921,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20200305110556-506484158171 h1:xes2Q2k+d/+YNXVw0FpZkIDJiaux4OVrRKXRAzH6A0U= google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.7.5 h1:0AhjqP7cn9oG7PAMkSh8hCCtUTdXdOe+85Wsbi3vhms= +google.golang.org/grpc v1.7.5/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -993,7 +967,6 @@ gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From 4dd82d535774d5a8e55bd3cd1c266ac8416bd60f Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Tue, 2 Jun 2020 00:01:08 -0400 Subject: [PATCH 34/43] finally fix etcd version --- go.mod | 4 +++- go.sum | 12 +++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 4a5d1f7edc..05e6771c38 100644 --- a/go.mod +++ b/go.mod @@ -120,4 +120,6 @@ replace gopkg.in/vmihailenco/msgpack.v2 => github.com/vmihailenco/msgpack v2.8.3 replace github.com/stretchr/testify => github.com/stretchr/testify v1.1.4-0.20160305165446-6fe211e49392 -replace google.golang.org/grpc => google.golang.org/grpc v1.7.5 +replace google.golang.org/grpc => google.golang.org/grpc v1.23.1 + +replace go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738 diff --git a/go.sum b/go.sum index c6605125e3..7c96fefd98 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,4 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= github.com/Azure/azure-sdk-for-go v40.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= @@ -103,6 +104,7 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa h1:OaNxuTZr7kxeODyLWsRMC+OD03aFUH+mW6r2d+MWa5Y= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w= @@ -242,6 +244,7 @@ github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 h1:ZgQEtGgCBiWRM39fZuwSd1LwSqqSW0hOdXCYYDX0R3I= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1-0.20190508161146-9fa652df1129 h1:tT8iWCYw4uOem71yYA3htfH+LNopJvcqZQshm56G5L4= github.com/golang/mock v1.3.1-0.20190508161146-9fa652df1129/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -732,9 +735,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.etcd.io/etcd v3.4.3+incompatible h1:o7FWvxyeMTs4lLEEO2d2dasL5+8aFltVUYZsNukrjME= -go.etcd.io/etcd v3.4.3+incompatible/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= +go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738 h1:lWF4f9Nypl1ZqSb4gLeh/DGvBYVaUYHuiB93teOmwgc= +go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= @@ -921,8 +923,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20200305110556-506484158171 h1:xes2Q2k+d/+YNXVw0FpZkIDJiaux4OVrRKXRAzH6A0U= google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/grpc v1.7.5 h1:0AhjqP7cn9oG7PAMkSh8hCCtUTdXdOe+85Wsbi3vhms= -google.golang.org/grpc v1.7.5/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.23.1 h1:q4XQuHFC6I28BKZpo6IYyb3mNO+l7lSOxRuYTCiDfXk= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From a5528a107444b67eebae335fddc049f43bd80c4b Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Tue, 2 Jun 2020 00:09:03 -0400 Subject: [PATCH 35/43] fix metalint --- Makefile | 4 +++- go.mod | 1 + go.sum | 3 +++ tools.go | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9efc07f9ba..7d27ea482c 100644 --- a/Makefile +++ b/Makefile @@ -216,6 +216,8 @@ install-tools: GOBIN=$(tools_bin_path) go install github.com/fossas/fossa-cli/cmd/fossa GOBIN=$(tools_bin_path) go install github.com/golang/mock/mockgen GOBIN=$(tools_bin_path) go install github.com/google/go-jsonnet/cmd/jsonnet + GOBIN=$(tools_bin_path) go install github.com/m3db/build-tools/linters/badtime + GOBIN=$(tools_bin_path) go install github.com/m3db/build-tools/linters/importorder GOBIN=$(tools_bin_path) go install github.com/m3db/build-tools/utilities/genclean GOBIN=$(tools_bin_path) go install github.com/m3db/tools/update-license GOBIN=$(tools_bin_path) go install github.com/mauricelam/genny @@ -518,7 +520,7 @@ else endif .PHONY: metalint -metalint: install-gometalinter install-linter-badtime install-linter-importorder +metalint: install-gometalinter install-tools @echo "--- metalinting src/" @(PATH=$(tools_bin_path):$(PATH) $(metalint_check) \ $(metalint_config) $(metalint_exclude) $(m3_package_path)/src/) diff --git a/go.mod b/go.mod index 05e6771c38..e05c7982af 100644 --- a/go.mod +++ b/go.mod @@ -102,6 +102,7 @@ require ( golang.org/x/net v0.0.0-20200301022130-244492dfa37a golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 + golang.org/x/tools v0.0.0-20200601175630-2caf76543d99 // indirect google.golang.org/grpc v1.27.1 gopkg.in/go-ini/ini.v1 v1.57.0 // indirect gopkg.in/go-playground/assert.v1 v1.2.1 // indirect diff --git a/go.sum b/go.sum index 7c96fefd98..686dbbfe25 100644 --- a/go.sum +++ b/go.sum @@ -384,6 +384,7 @@ github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -900,6 +901,8 @@ golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200305205014-bc073721adb6/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b h1:zSzQJAznWxAh9fZxiPy2FZo+ZZEYoYFYYDYdOrU7AaM= golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200601175630-2caf76543d99 h1:deddXmhOJb/bvD/4M/j2AUMrhHeh6GkqykJSCWyTNVk= +golang.org/x/tools v0.0.0-20200601175630-2caf76543d99/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= diff --git a/tools.go b/tools.go index 0b9beb4ba6..f8e74dbe2c 100644 --- a/tools.go +++ b/tools.go @@ -6,6 +6,8 @@ import ( _ "github.com/fossas/fossa-cli/cmd/fossa" _ "github.com/golang/mock/mockgen" _ "github.com/google/go-jsonnet/cmd/jsonnet" + _ "github.com/m3db/build-tools/linters/badtime" + _ "github.com/m3db/build-tools/linters/importorder" _ "github.com/m3db/build-tools/utilities/genclean" _ "github.com/m3db/tools/update-license" _ "github.com/mauricelam/genny" From b55515c39221db3792f0d1e39331be0d977d14b6 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Tue, 2 Jun 2020 11:31:25 -0400 Subject: [PATCH 36/43] specify prom common --- go.mod | 2 ++ go.sum | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index e05c7982af..d0161c24ff 100644 --- a/go.mod +++ b/go.mod @@ -124,3 +124,5 @@ replace github.com/stretchr/testify => github.com/stretchr/testify v1.1.4-0.2016 replace google.golang.org/grpc => google.golang.org/grpc v1.23.1 replace go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738 + +replace github.com/prometheus/common => github.com/prometheus/common v0.9.1 diff --git a/go.sum b/go.sum index 686dbbfe25..edd93a4d36 100644 --- a/go.sum +++ b/go.sum @@ -581,11 +581,6 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= github.com/prometheus/common v0.9.1 h1:KOMtN28tlbam3/7ZKEYKHhKoJZYYj3gMH4uc62x7X7U= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -637,7 +632,6 @@ github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJ github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= @@ -759,7 +753,6 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0 h1:nR6NoDBgAf67s68NhaXbsojM+2gxp3S1hWkHDl27pVU= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -833,7 +826,6 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= From 1e3d9f1a29087ac04a05cf10334d2aa66478f30e Mon Sep 17 00:00:00 2001 From: Rob Skillington Date: Tue, 2 Jun 2020 17:06:30 -0400 Subject: [PATCH 37/43] Remove indirect couchbase/vellum --- go.mod | 3 +-- go.sum | 6 ++---- src/m3ninx/index/segment/fst/fst_terms_iterator.go | 3 ++- src/m3ninx/index/segment/fst/fst_writer.go | 2 +- src/m3ninx/index/segment/fst/regexp/regexp.go | 2 +- src/m3ninx/index/segment/fst/segment.go | 2 +- src/m3ninx/index/types.go | 3 ++- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index d0161c24ff..be4df087e2 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,6 @@ require ( github.com/cespare/xxhash/v2 v2.1.1 github.com/cheekybits/genny v1.0.0 // indirect github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f - github.com/couchbase/vellum v0.0.0-20190626091642-41f2deade2cf // indirect github.com/davecgh/go-spew v1.1.1 github.com/fortytw2/leaktest v1.2.1-0.20180901000122-b433bbd6d743 github.com/fossas/fossa-cli v1.0.30 @@ -52,7 +51,7 @@ require ( github.com/m3db/stackadler32 v0.0.0-20180104200216-bfebcd73ef6f github.com/m3db/stackmurmur3 v0.0.0-20171110233611-744c0229c12e // indirect github.com/m3db/tools v0.0.0-20181008195521-c6ded3f34878 - github.com/m3db/vellum v0.0.0-20190111185746-e766292d14de + github.com/m3dbx/vellum v0.0.0-20200602203954-e10aaedbd934 github.com/mauricelam/genny v0.0.0-20180903214747-eb2c5232c885 github.com/mjibson/esc v0.1.0 github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9 diff --git a/go.sum b/go.sum index edd93a4d36..4f4c50f121 100644 --- a/go.sum +++ b/go.sum @@ -120,8 +120,6 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7 github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/couchbase/vellum v0.0.0-20190626091642-41f2deade2cf h1:B4yFDSyYolVT4DsKpztKYPeme6/kRdLV7iPZmAv2tEE= -github.com/couchbase/vellum v0.0.0-20190626091642-41f2deade2cf/go.mod h1:prYTC8EgTu3gwbqJihkud9zRXISvyulAplQ6exdCo1g= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= @@ -430,8 +428,8 @@ github.com/m3db/thrift v0.0.0-20190820191926-05b5a2227fe4 h1:1x3mMuURd3wqKJ2qVjh github.com/m3db/thrift v0.0.0-20190820191926-05b5a2227fe4/go.mod h1:xVfRinGzD3cYDRvMjy6RkIwM+iNL2KHNLZjT0VpVZT8= github.com/m3db/tools v0.0.0-20181008195521-c6ded3f34878 h1:kww0LtVVfGrXR7Ofpbi/9bvc2EGYMQC0LCH/gQXoolE= github.com/m3db/tools v0.0.0-20181008195521-c6ded3f34878/go.mod h1:TxroQUZzb1wzOsq+4+TfVtT7z89YTz3v2UJAYfLNfLE= -github.com/m3db/vellum v0.0.0-20190111185746-e766292d14de h1:7rDVjZrv7T2QkAlcTjt2gjgdY94IPOGV/8lN+/Pgch8= -github.com/m3db/vellum v0.0.0-20190111185746-e766292d14de/go.mod h1:8P8mbYs1lFc+HvLwT0CdvCq9Ro3o6NMHiu4n0+hkBEA= +github.com/m3dbx/vellum v0.0.0-20200602203954-e10aaedbd934 h1:INQTjUQJZlfKiHvFjACwTSTZd6TxtgoWP3am4+CmPVU= +github.com/m3dbx/vellum v0.0.0-20200602203954-e10aaedbd934/go.mod h1:DOTAUfV4bzK6Nrb0dboT/oCG0DnQuX+/n0jfZPh6xxI= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= diff --git a/src/m3ninx/index/segment/fst/fst_terms_iterator.go b/src/m3ninx/index/segment/fst/fst_terms_iterator.go index d280bb5d5c..8ebeaa5336 100644 --- a/src/m3ninx/index/segment/fst/fst_terms_iterator.go +++ b/src/m3ninx/index/segment/fst/fst_terms_iterator.go @@ -23,7 +23,8 @@ package fst import ( sgmt "github.com/m3db/m3/src/m3ninx/index/segment" xerrors "github.com/m3db/m3/src/x/errors" - "github.com/m3db/vellum" + + "github.com/m3dbx/vellum" ) type fstTermsIterOpts struct { diff --git a/src/m3ninx/index/segment/fst/fst_writer.go b/src/m3ninx/index/segment/fst/fst_writer.go index aeb46128d2..4514f860cc 100644 --- a/src/m3ninx/index/segment/fst/fst_writer.go +++ b/src/m3ninx/index/segment/fst/fst_writer.go @@ -24,7 +24,7 @@ import ( "errors" "io" - "github.com/m3db/vellum" + "github.com/m3dbx/vellum" ) var ( diff --git a/src/m3ninx/index/segment/fst/regexp/regexp.go b/src/m3ninx/index/segment/fst/regexp/regexp.go index 1166b92e46..cd21d99f9f 100644 --- a/src/m3ninx/index/segment/fst/regexp/regexp.go +++ b/src/m3ninx/index/segment/fst/regexp/regexp.go @@ -25,7 +25,7 @@ package regexp import ( "regexp/syntax" - vregexp "github.com/m3db/vellum/regexp" + vregexp "github.com/m3dbx/vellum/regexp" ) // ParseRegexp parses the provided regexp pattern into an equivalent matching automaton, and diff --git a/src/m3ninx/index/segment/fst/segment.go b/src/m3ninx/index/segment/fst/segment.go index 41dcd84c26..34944b3f49 100644 --- a/src/m3ninx/index/segment/fst/segment.go +++ b/src/m3ninx/index/segment/fst/segment.go @@ -42,7 +42,7 @@ import ( "github.com/m3db/m3/src/x/mmap" pilosaroaring "github.com/m3db/pilosa/roaring" - "github.com/m3db/vellum" + "github.com/m3dbx/vellum" ) var ( diff --git a/src/m3ninx/index/types.go b/src/m3ninx/index/types.go index 1a2fbf6beb..99a141fba6 100644 --- a/src/m3ninx/index/types.go +++ b/src/m3ninx/index/types.go @@ -28,7 +28,8 @@ import ( "github.com/m3db/m3/src/m3ninx/doc" "github.com/m3db/m3/src/m3ninx/postings" xerrors "github.com/m3db/m3/src/x/errors" - vregex "github.com/m3db/vellum/regexp" + + vregex "github.com/m3dbx/vellum/regexp" ) // ErrDocNotFound is the error returned when there is no document for a given postings ID. From f76cbf5d75b66c6c60c02b281e96688a2cbce9e1 Mon Sep 17 00:00:00 2001 From: Rob Skillington Date: Tue, 2 Jun 2020 17:27:59 -0400 Subject: [PATCH 38/43] Remove pilosa/pilosa for m3dbx/pilosa --- go.mod | 13 +++++- go.sum | 44 +++++-------------- ...i_segments_multi_key_postings_list_iter.go | 2 +- .../builder/multi_segments_terms_iter.go | 2 +- .../fst/fst_terms_postings_iterator.go | 2 +- src/m3ninx/index/segment/fst/segment.go | 2 +- src/m3ninx/postings/pilosa/codec.go | 2 +- src/m3ninx/postings/pilosa/iterator.go | 2 +- src/m3ninx/postings/pilosa/iterator_test.go | 2 +- src/m3ninx/postings/roaring/roaring.go | 2 +- .../roaring/roaring_bench_unions_test.go | 2 +- 11 files changed, 32 insertions(+), 43 deletions(-) diff --git a/go.mod b/go.mod index be4df087e2..e3e40cb241 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,17 @@ module github.com/m3db/m3 go 1.13 require ( + github.com/CAFxX/gcnotifier v0.0.0-20190112062741-224a280d589d // indirect + github.com/DataDog/datadog-go v3.7.1+incompatible // indirect github.com/Masterminds/semver v1.5.0 // indirect github.com/MichaelTJones/pcg v0.0.0-20180122055547-df440c6ed7ed github.com/RoaringBitmap/roaring v0.4.21 + github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect github.com/apache/thrift v0.13.0 github.com/apex/log v1.3.0 // indirect github.com/bmatcuk/doublestar v1.3.1 // indirect github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect + github.com/boltdb/bolt v1.3.1 // indirect github.com/briandowns/spinner v1.11.1 // indirect github.com/c2h5oh/datasize v0.0.0-20171227191756-4eba002a5eae github.com/cespare/xxhash/v2 v2.1.1 @@ -22,6 +26,7 @@ require ( github.com/ghodss/yaml v1.0.0 github.com/gnewton/jargo v0.0.0-20150417131352-41f5f186a805 // indirect github.com/go-kit/kit v0.10.0 + github.com/go-ole/go-ole v1.2.4 // indirect github.com/go-playground/locales v0.12.2-0.20190430153329-630ebbb60284 // indirect github.com/go-playground/universal-translator v0.16.1-0.20170327191703-71201497bace // indirect github.com/gogo/protobuf v1.3.1 @@ -31,6 +36,7 @@ require ( github.com/google/go-cmp v0.4.0 github.com/google/go-jsonnet v0.16.0 github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f // indirect + github.com/gorilla/handlers v1.4.2 // indirect github.com/gorilla/mux v1.7.3 github.com/hashicorp/hcl v1.0.1-0.20190611123218-cf7d376da96d // indirect github.com/hydrogen18/stalecucumber v0.0.0-20151102144322-9b38526d4bdf @@ -43,7 +49,6 @@ require ( github.com/m3db/bloom v3.0.0+incompatible github.com/m3db/build-tools v0.0.0-20181013000606-edd1bdd1df8a github.com/m3db/m3x v0.0.0-20190408051622-ebf3c7b94afd // indirect - github.com/m3db/pilosa v0.0.0-20190128031222-ac8920c6e1ab github.com/m3db/prometheus_client_golang v0.8.1 github.com/m3db/prometheus_client_model v0.0.0-20180517145114-8b2299a4bf7d github.com/m3db/prometheus_common v0.0.0-20180517030744-25aaa3dff79b @@ -51,6 +56,7 @@ require ( github.com/m3db/stackadler32 v0.0.0-20180104200216-bfebcd73ef6f github.com/m3db/stackmurmur3 v0.0.0-20171110233611-744c0229c12e // indirect github.com/m3db/tools v0.0.0-20181008195521-c6ded3f34878 + github.com/m3dbx/pilosa v0.0.0-20200602205121-7f389745e9ab github.com/m3dbx/vellum v0.0.0-20200602203954-e10aaedbd934 github.com/mauricelam/genny v0.0.0-20180903214747-eb2c5232c885 github.com/mjibson/esc v0.1.0 @@ -59,7 +65,6 @@ require ( github.com/pborman/getopt v0.0.0-20160216163137-ec82d864f599 github.com/pborman/uuid v1.2.0 github.com/pelletier/go-toml v1.5.0 // indirect - github.com/pilosa/pilosa v1.3.1-0.20190807173852-bc9747cc0f19 // indirect github.com/pkg/errors v0.9.1 github.com/pkg/profile v1.2.1 github.com/pointlander/compress v1.1.0 // indirect @@ -77,6 +82,7 @@ require ( github.com/rveen/ogdl v0.0.0-20200522080342-eeeda1a978e7 // indirect github.com/satori/go.uuid v1.2.0 github.com/sergi/go-diff v1.1.0 + github.com/shirou/gopsutil v2.20.5+incompatible // indirect github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 github.com/spf13/cast v1.3.1-0.20190531151931-f31dc0aaab5a // indirect github.com/spf13/cobra v0.0.3 @@ -87,6 +93,7 @@ require ( github.com/stretchr/testify v1.4.0 github.com/subosito/gotenv v1.2.1-0.20190917103637-de67a6614a4d // indirect github.com/twotwotwo/sorts v0.0.0-20160814051341-bf5c1f2b8553 + github.com/uber-go/atomic v0.0.0-00010101000000-000000000000 // indirect github.com/uber-go/tally v3.3.13+incompatible github.com/uber/jaeger-client-go v2.16.0+incompatible github.com/uber/jaeger-lib v2.2.0+incompatible @@ -125,3 +132,5 @@ replace google.golang.org/grpc => google.golang.org/grpc v1.23.1 replace go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738 replace github.com/prometheus/common => github.com/prometheus/common v0.9.1 + +replace github.com/uber-go/atomic => go.uber.org/atomic v1.6.0 diff --git a/go.sum b/go.sum index 4f4c50f121..1ee56bf420 100644 --- a/go.sum +++ b/go.sum @@ -19,8 +19,8 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/CAFxX/gcnotifier v0.0.0-20190112062741-224a280d589d h1:n0G4ckjMEj7bWuGYUX0i8YlBeBBJuZ+HEHvHfyBDZtI= github.com/CAFxX/gcnotifier v0.0.0-20190112062741-224a280d589d/go.mod h1:Rn2zM2MnHze07LwkneP48TWt6UiZhzQTwCvw6djVGfE= -github.com/DataDog/datadog-go v0.0.0-20180822151419-281ae9f2d895 h1:dmc/C8bpE5VkQn65PNbbyACDC8xw8Hpp/NEurdPmQDQ= -github.com/DataDog/datadog-go v0.0.0-20180822151419-281ae9f2d895/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/DataDog/datadog-go v3.7.1+incompatible h1:HmA9qHVrHIAqpSvoCYJ+c6qst0lgqEhNW6/KwfkHbS8= +github.com/DataDog/datadog-go v3.7.1+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= @@ -38,8 +38,8 @@ github.com/RoaringBitmap/roaring v0.4.21 h1:WJ/zIlNX4wQZ9x8Ey33O1UaD9TCTakYsdLFS github.com/RoaringBitmap/roaring v0.4.21/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo= 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/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 h1:UUppSQnhf4Yc6xGxSkoQpPhb7RVzuv5Nb1mwJ5VId9s= -github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= +github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk= +github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs= @@ -111,7 +111,6 @@ github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazuY= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -288,10 +287,9 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORR github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99 h1:twflg0XRTjwKpxb/jFExr4HGq6on2dEOmnL6FV+fgPw= github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/handlers v1.3.0 h1:tsg9qP3mjt1h4Roxp+M1paRjrVBfPSOpBuVclh6YluI= -github.com/gorilla/handlers v1.3.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= +github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg= +github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= @@ -410,8 +408,6 @@ github.com/m3db/build-tools v0.0.0-20181013000606-edd1bdd1df8a h1:CwsSHIJLeCESKd github.com/m3db/build-tools v0.0.0-20181013000606-edd1bdd1df8a/go.mod h1:Pk9AtZeKuCO2xcAth0gxwzRNFv4lV26GPSx4I6A7DQ8= github.com/m3db/m3x v0.0.0-20190408051622-ebf3c7b94afd h1:wzLBtXzxZM9b6IXwLSRE5crynocLTCuRDpGDaOJzyuI= github.com/m3db/m3x v0.0.0-20190408051622-ebf3c7b94afd/go.mod h1:zLbcVb352e3Jsg62A6zzEhZ1gumeFsiamTqDs9ZmZrs= -github.com/m3db/pilosa v0.0.0-20190128031222-ac8920c6e1ab h1:osrrNq1KrYxfpT5GVr2PkEIhHU1AZ09VGAF2lGQmLW4= -github.com/m3db/pilosa v0.0.0-20190128031222-ac8920c6e1ab/go.mod h1:Zv0DgEzk1QVFw3uMlFiuQYQrY+nW8IJrBMdyMf9sHQc= github.com/m3db/prometheus_client_golang v0.8.1 h1:t7w/tcFws81JL1j5sqmpqcOyQOpH4RDOmIe3A3fdN3w= github.com/m3db/prometheus_client_golang v0.8.1/go.mod h1:8R/f1xYhXWq59KD/mbRqoBulXejss7vYtYzWmruNUwI= github.com/m3db/prometheus_client_model v0.0.0-20180517145114-8b2299a4bf7d h1:BtNPRz2kmh42OAVYjsOBjty2wE0FaIh7aPVtFNPcF48= @@ -428,9 +424,10 @@ github.com/m3db/thrift v0.0.0-20190820191926-05b5a2227fe4 h1:1x3mMuURd3wqKJ2qVjh github.com/m3db/thrift v0.0.0-20190820191926-05b5a2227fe4/go.mod h1:xVfRinGzD3cYDRvMjy6RkIwM+iNL2KHNLZjT0VpVZT8= github.com/m3db/tools v0.0.0-20181008195521-c6ded3f34878 h1:kww0LtVVfGrXR7Ofpbi/9bvc2EGYMQC0LCH/gQXoolE= github.com/m3db/tools v0.0.0-20181008195521-c6ded3f34878/go.mod h1:TxroQUZzb1wzOsq+4+TfVtT7z89YTz3v2UJAYfLNfLE= +github.com/m3dbx/pilosa v0.0.0-20200602205121-7f389745e9ab h1:CpoDBrDayfBBuueJF+8c2iQwDKiZCw2JRB5yS1RFzJA= +github.com/m3dbx/pilosa v0.0.0-20200602205121-7f389745e9ab/go.mod h1:muOSChOjsONKXcQTw+pr+bqIvb4bD7tSQHAXJPlerwc= github.com/m3dbx/vellum v0.0.0-20200602203954-e10aaedbd934 h1:INQTjUQJZlfKiHvFjACwTSTZd6TxtgoWP3am4+CmPVU= github.com/m3dbx/vellum v0.0.0-20200602203954-e10aaedbd934/go.mod h1:DOTAUfV4bzK6Nrb0dboT/oCG0DnQuX+/n0jfZPh6xxI= -github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -541,8 +538,6 @@ github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pilosa/pilosa v1.3.1-0.20190807173852-bc9747cc0f19 h1:SeNzfkSYASGG41wgg8eR23DWA550sO1neyuIbNryzio= -github.com/pilosa/pilosa v1.3.1-0.20190807173852-bc9747cc0f19/go.mod h1:57zHA92sPbJ01QsMyyEDASX2TJnf8qSM7ZdUnVzM0b8= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -596,8 +591,6 @@ github.com/rakyll/statik v0.1.6/go.mod h1:OEi9wJV/fMUAGx1eNjq75DKDsJVuEv1U0oYdX6 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/remeh/sizedwaitgroup v1.0.0 h1:VNGGFwNo/R5+MJBf6yrsr110p0m4/OX4S3DCy7Kyl5E= github.com/remeh/sizedwaitgroup v1.0.0/go.mod h1:3j2R4OIe/SeS6YDhICBy22RWjJC5eNCJ1V+9+NVNYlo= -github.com/remyoudompheng/bigfft v0.0.0-20190321074620-2f0d2b0e0001 h1:YDeskXpkNDhPdWN3REluVa46HQOVuVkjkd2sWnrABNQ= -github.com/remyoudompheng/bigfft v0.0.0-20190321074620-2f0d2b0e0001/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rhysd/go-github-selfupdate v1.2.2 h1:G+mNzkc1wEtpmM6sFS/Ghkeq+ad4Yp6EZEHyp//wGEo= github.com/rhysd/go-github-selfupdate v1.2.2/go.mod h1:khesvSyKcXDUxeySCedFh621iawCks0dS/QnHPcpCws= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= @@ -622,10 +615,8 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/shirou/gopsutil v2.18.12+incompatible h1:1eaJvGomDnH74/5cF4CTmTbLHAriGFsTZppLXDX93OM= -github.com/shirou/gopsutil v2.18.12+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 h1:udFKJ0aHUL60LboW/A+DfgoHVedieIzIXE8uylPue0U= -github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= +github.com/shirou/gopsutil v2.20.5+incompatible h1:tYH07UPoQt0OCQdgWWMgYHy3/a9bcxNpBIysykNIP7I= +github.com/shirou/gopsutil v2.20.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= @@ -661,7 +652,6 @@ github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.3.1/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk= github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4= @@ -694,19 +684,15 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 h1:LnC5Kc github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/twotwotwo/sorts v0.0.0-20160814051341-bf5c1f2b8553 h1:DRC1ubdb3ZmyyIeCSTxjZIQAnpLPfKVgYrLETQuOPjo= github.com/twotwotwo/sorts v0.0.0-20160814051341-bf5c1f2b8553/go.mod h1:Rj7Csq/tZ/egz+Ltc2IVpsA5309AmSMEswjkTZmq2Xc= -github.com/uber-go/atomic v1.4.0 h1:yOuPqEq4ovnhEjpHmfFwsqBXDYbQeT6Nb0bwD6XnD5o= -github.com/uber-go/atomic v1.4.0/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g= github.com/uber-go/tally v3.3.13+incompatible h1:5ic2UsDwjcWsw9jvEdWEE2XsmGCLMTt5Ukg4d74fed4= github.com/uber-go/tally v3.3.13+incompatible/go.mod h1:YDTIBxdXyOU/sCWilKB4bgyufu1cEi0jdVnRdxvjnmU= github.com/uber/jaeger-client-go v2.16.0+incompatible h1:Q2Pp6v3QYiocMxomCaJuwQGFt7E53bPYqEgug/AoBtY= github.com/uber/jaeger-client-go v2.16.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= -github.com/uber/jaeger-lib v2.0.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/uber/jaeger-lib v2.2.0+incompatible h1:MxZXOiR2JuoANZ3J6DE/U0kSFv/eJ/GfSYVCjK7dyaw= github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/uber/tchannel-go v1.12.0 h1:xqfXzViTPQxoA/KXBfnkXlwBn7JVpa7MVRUzWjVHMbI= github.com/uber/tchannel-go v1.12.0/go.mod h1:Rrgz1eL8kMjW/nEzZos0t+Heq0O4LhnUJVA32OvWKHo= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ulikunitz/xz v0.5.5 h1:pFrO0lVpTBXLpYw+pnLj6TbvHuyjXMfjGeCwSqCVwok= github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= @@ -740,6 +726,8 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.5.1 h1:rsqfU5vBkVknbhUGbAUwQKR2H4ItV8tjJ+6kJX4cxHM= go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/config v1.4.0 h1:upnMPpMm6WlbZtXoasNkK4f0FhxwS+W4Iqz5oNznehQ= go.uber.org/config v1.4.0/go.mod h1:aCyrMHmUAc/s2h9sv1koP84M9ZF/4K+g2oleyESO/Ig= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= @@ -752,7 +740,6 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0 h1:nR6NoDBgAf67s68NhaXbsojM+2gxp3S1hWkHDl27pVU= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -793,7 +780,6 @@ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= @@ -829,7 +815,6 @@ golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -837,7 +822,6 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -976,10 +960,6 @@ k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -modernc.org/mathutil v1.0.0 h1:93vKjrJopTPrtTNpZ8XIovER7iCIH1QU7wNbOQXC60I= -modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= -modernc.org/strutil v1.0.0 h1:XVFtQwFVwc02Wk+0L/Z/zDDXO81r5Lhe6iMKmGX3KhE= -modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/src/m3ninx/index/segment/builder/multi_segments_multi_key_postings_list_iter.go b/src/m3ninx/index/segment/builder/multi_segments_multi_key_postings_list_iter.go index 328b4af3da..206be79fd3 100644 --- a/src/m3ninx/index/segment/builder/multi_segments_multi_key_postings_list_iter.go +++ b/src/m3ninx/index/segment/builder/multi_segments_multi_key_postings_list_iter.go @@ -28,7 +28,7 @@ import ( "github.com/m3db/m3/src/m3ninx/postings" "github.com/m3db/m3/src/m3ninx/postings/roaring" xerrors "github.com/m3db/m3/src/x/errors" - bitmap "github.com/m3db/pilosa/roaring" + bitmap "github.com/m3dbx/pilosa/roaring" ) var _ segment.FieldsPostingsListIterator = &multiKeyPostingsListIterator{} diff --git a/src/m3ninx/index/segment/builder/multi_segments_terms_iter.go b/src/m3ninx/index/segment/builder/multi_segments_terms_iter.go index f12eafd7a7..d27eb3ec8d 100644 --- a/src/m3ninx/index/segment/builder/multi_segments_terms_iter.go +++ b/src/m3ninx/index/segment/builder/multi_segments_terms_iter.go @@ -27,7 +27,7 @@ import ( "github.com/m3db/m3/src/m3ninx/postings" "github.com/m3db/m3/src/m3ninx/postings/roaring" xerrors "github.com/m3db/m3/src/x/errors" - bitmap "github.com/m3db/pilosa/roaring" + bitmap "github.com/m3dbx/pilosa/roaring" ) const ( diff --git a/src/m3ninx/index/segment/fst/fst_terms_postings_iterator.go b/src/m3ninx/index/segment/fst/fst_terms_postings_iterator.go index 09cf5bb58b..57e3f97936 100644 --- a/src/m3ninx/index/segment/fst/fst_terms_postings_iterator.go +++ b/src/m3ninx/index/segment/fst/fst_terms_postings_iterator.go @@ -24,7 +24,7 @@ import ( sgmt "github.com/m3db/m3/src/m3ninx/index/segment" "github.com/m3db/m3/src/m3ninx/postings" postingsroaring "github.com/m3db/m3/src/m3ninx/postings/roaring" - "github.com/m3db/pilosa/roaring" + "github.com/m3dbx/pilosa/roaring" ) // postingsIterRoaringPoolingConfig uses a configuration that avoids allocating diff --git a/src/m3ninx/index/segment/fst/segment.go b/src/m3ninx/index/segment/fst/segment.go index 34944b3f49..783d95e348 100644 --- a/src/m3ninx/index/segment/fst/segment.go +++ b/src/m3ninx/index/segment/fst/segment.go @@ -41,7 +41,7 @@ import ( xerrors "github.com/m3db/m3/src/x/errors" "github.com/m3db/m3/src/x/mmap" - pilosaroaring "github.com/m3db/pilosa/roaring" + pilosaroaring "github.com/m3dbx/pilosa/roaring" "github.com/m3dbx/vellum" ) diff --git a/src/m3ninx/postings/pilosa/codec.go b/src/m3ninx/postings/pilosa/codec.go index 89fde43b4e..8c8998f7b1 100644 --- a/src/m3ninx/postings/pilosa/codec.go +++ b/src/m3ninx/postings/pilosa/codec.go @@ -25,7 +25,7 @@ import ( "github.com/m3db/m3/src/m3ninx/postings" idxroaring "github.com/m3db/m3/src/m3ninx/postings/roaring" - "github.com/m3db/pilosa/roaring" + "github.com/m3dbx/pilosa/roaring" ) // Encoder helps serialize a Pilosa RoaringBitmap diff --git a/src/m3ninx/postings/pilosa/iterator.go b/src/m3ninx/postings/pilosa/iterator.go index 6ed651d073..eb5e06fba5 100644 --- a/src/m3ninx/postings/pilosa/iterator.go +++ b/src/m3ninx/postings/pilosa/iterator.go @@ -22,7 +22,7 @@ package pilosa import ( "github.com/m3db/m3/src/m3ninx/postings" - "github.com/m3db/pilosa/roaring" + "github.com/m3dbx/pilosa/roaring" ) // NB: need to do this to find a path into our postings list which doesn't require every diff --git a/src/m3ninx/postings/pilosa/iterator_test.go b/src/m3ninx/postings/pilosa/iterator_test.go index d39445a768..d41d045e31 100644 --- a/src/m3ninx/postings/pilosa/iterator_test.go +++ b/src/m3ninx/postings/pilosa/iterator_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/m3db/m3/src/m3ninx/postings" - "github.com/m3db/pilosa/roaring" + "github.com/m3dbx/pilosa/roaring" "github.com/stretchr/testify/require" ) diff --git a/src/m3ninx/postings/roaring/roaring.go b/src/m3ninx/postings/roaring/roaring.go index e8b2c4e671..e1f8a3d820 100644 --- a/src/m3ninx/postings/roaring/roaring.go +++ b/src/m3ninx/postings/roaring/roaring.go @@ -26,7 +26,7 @@ import ( "github.com/m3db/m3/src/m3ninx/postings" "github.com/m3db/m3/src/m3ninx/x" - "github.com/m3db/pilosa/roaring" + "github.com/m3dbx/pilosa/roaring" ) var ( diff --git a/src/m3ninx/postings/roaring/roaring_bench_unions_test.go b/src/m3ninx/postings/roaring/roaring_bench_unions_test.go index 0c86eb5c2f..60bd29afd8 100644 --- a/src/m3ninx/postings/roaring/roaring_bench_unions_test.go +++ b/src/m3ninx/postings/roaring/roaring_bench_unions_test.go @@ -24,7 +24,7 @@ import ( "math/rand" "testing" - "github.com/m3db/pilosa/roaring" + "github.com/m3dbx/pilosa/roaring" ) const ( From 5373e11526fc1392526c425c35c5d683bdcc914a Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Tue, 2 Jun 2020 17:33:51 -0400 Subject: [PATCH 39/43] clarify test failure --- scripts/docker-integration-tests/run.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/docker-integration-tests/run.sh b/scripts/docker-integration-tests/run.sh index 7bac00bd18..12f08e87bf 100755 --- a/scripts/docker-integration-tests/run.sh +++ b/scripts/docker-integration-tests/run.sh @@ -56,7 +56,10 @@ for test in "${TESTS[@]}"; do docker rm -f $(docker ps -aq) 2>/dev/null || true echo "----------------------------------------------" echo "running $test" - "$test" + if ! $test; then + echo "--- :bk-status-failed: $test FAILED" + exit 1 + fi fi ITER="$((ITER+1))" done From 703b1909f692c038e4cc878e6438add4a4a68c1f Mon Sep 17 00:00:00 2001 From: Rob Skillington Date: Tue, 2 Jun 2020 18:27:41 -0400 Subject: [PATCH 40/43] Delete glide.yaml/glide.lock --- glide.lock | 611 ----------------------------------------------------- glide.yaml | 291 ------------------------- 2 files changed, 902 deletions(-) delete mode 100644 glide.lock delete mode 100644 glide.yaml diff --git a/glide.lock b/glide.lock deleted file mode 100644 index 2fdf52b75f..0000000000 --- a/glide.lock +++ /dev/null @@ -1,611 +0,0 @@ -hash: c40afb15c4a1545819ee8878ca9568412d912b44f996fa71341d489ce91bc2b2 -updated: 2020-05-26T23:54:00.12804-04:00 -imports: -- name: github.com/alecthomas/units - version: f65c72e2690dc4b403c8bd637baf4611cd4c069b -- name: github.com/apache/thrift - version: 05b5a2227fe44056ce829fe59583126fd6478a58 - repo: https://github.com/m3db/thrift - vcs: git - subpackages: - - lib/go/thrift -- name: github.com/beorn7/perks - version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 - subpackages: - - quantile -- name: github.com/c2h5oh/datasize - version: 4eba002a5eaea69cf8d235a388fc6b65ae68d2dd -- name: github.com/cespare/xxhash - version: 3f2bc324ddd8b6aafc9a91b5aabf22ff172edafb - repo: https://github.com/m3dbx/xxhash - vcs: git - subpackages: - - v2 -- name: go.etcd.io/etcd - version: 3cf2f69b5738fb702ba1a935590f36b52b18979b - subpackages: - - auth - - auth/authpb - - client - - clientv3 - - clientv3/concurrency - - clientv3/namespace - - clientv3/naming - - embed - - etcdserver - - etcdserver/api - - etcdserver/api/etcdhttp - - etcdserver/api/v2http - - etcdserver/api/v2http/httptypes - - etcdserver/api/v3client - - etcdserver/api/v3election - - etcdserver/api/v3election/v3electionpb - - etcdserver/api/v3election/v3electionpb/gw - - etcdserver/api/v3lock - - etcdserver/api/v3lock/v3lockpb - - etcdserver/api/v3lock/v3lockpb/gw - - etcdserver/api/v3rpc - - etcdserver/api/v3rpc/rpctypes - - etcdserver/etcdserverpb - - etcdserver/etcdserverpb/gw - - integration - - lease - - lease/leasehttp - - lease/leasepb - - mvcc - - mvcc/backend - - mvcc/mvccpb - - pkg/adt - - pkg/contention - - pkg/cpuutil - - pkg/crc - - pkg/debugutil - - pkg/fileutil - - pkg/httputil - - pkg/idutil - - pkg/ioutil - - pkg/logutil - - pkg/netutil - - pkg/pathutil - - pkg/pbutil - - pkg/runtime - - pkg/schedule - - pkg/srv - - pkg/testutil - - pkg/tlsutil - - pkg/transport - - pkg/types - - pkg/wait - - proxy/grpcproxy - - proxy/grpcproxy/adapter - - proxy/grpcproxy/cache - - raft - - raft/raftpb - - version - - wal - - wal/walpb -- name: github.com/coreos/go-semver - version: 8ab6407b697782a06568d4b7f1db25550ec2e4c6 - subpackages: - - semver -- name: github.com/coreos/go-systemd - version: 48702e0da86bd25e76cfef347e2adeb434a0d0a6 - subpackages: - - journal -- name: github.com/coreos/pkg - version: 97fdf19511ea361ae1c100dd393cc47f8dcfa1e1 - subpackages: - - capnslog -- name: github.com/couchbase/vellum - version: 41f2deade2cfab59facd263e918d7c05f656c2e9 - subpackages: - - utf8 -- name: github.com/davecgh/go-spew - version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d - subpackages: - - spew -- name: github.com/dgrijalva/jwt-go - version: d2709f9f1f31ebcda9651b03077758c1f3a0018c -- name: github.com/edsrzf/mmap-go - version: 0bce6a6887123b67a60366d2c9fe2dfb74289d2e -- name: github.com/fortytw2/leaktest - version: b433bbd6d743c1854040b39062a3916ed5f78fe8 -- name: github.com/fsnotify/fsnotify - version: 1485a34d5d5723fea214f5710708e19a831720e4 -- name: github.com/ghodss/yaml - version: 0ca9ea5df5451ffdf184b4428c902747c2c11cd7 -- name: github.com/go-kit/kit - version: dc489b75b9cdbf29c739534c2aa777cabb034954 - subpackages: - - log - - log/level -- name: github.com/go-logfmt/logfmt - version: 432dd90af23366a89a611c020003fc8ba281ae5d -- name: github.com/go-playground/locales - version: 630ebbb602847eba93e75ae38bbc7bb7abcf1ff3 - subpackages: - - currency -- name: github.com/go-playground/universal-translator - version: 71201497bace774495daed26a3874fd339e0b538 -- name: github.com/gogo/protobuf - version: 5628607bb4c51c3157aacc3a50f0ab707582b805 - subpackages: - - gogoproto - - jsonpb - - proto - - protoc-gen-gogo/descriptor - - sortkeys - - types -- name: github.com/golang/groupcache - version: 02826c3e79038b59d737d3b1c0a1d937f71a4433 - subpackages: - - lru -- name: github.com/golang/mock - version: 9fa652df1129bef0e734c9cf9bf6dbae9ef3b9fa - subpackages: - - gomock -- name: github.com/golang/protobuf - version: 6c65a5562fc06764971b7c5d05c76c75e84bdbf7 - subpackages: - - jsonpb - - proto - - protoc-gen-go/descriptor - - protoc-gen-go/plugin - - ptypes - - ptypes/any - - ptypes/duration - - ptypes/empty - - ptypes/struct - - ptypes/timestamp - - ptypes/wrappers -- name: github.com/golang/snappy - version: 553a641470496b2327abcac10b36396bd98e45c9 -- name: github.com/google/btree - version: 925471ac9e2131377a91e1595defec898166fe49 -- name: github.com/google/go-cmp - version: 6f77996f0c42f7b84e5a2b252227263f93432e9b - subpackages: - - cmp - - cmp/cmpopts - - cmp/internal/diff - - cmp/internal/flags - - cmp/internal/function - - cmp/internal/value -- name: github.com/google/uuid - version: c2e93f3ae59f2904160ceaab466009f965df46d6 -- name: github.com/gorilla/mux - version: 00bdffe0f3c77e27d2cf6f5c70232a2d3e4d9c15 -- name: github.com/grpc-ecosystem/go-grpc-prometheus - version: 6b7015e65d366bf3f19b2b2a000a831940f0f7e0 -- name: github.com/grpc-ecosystem/grpc-gateway - version: 8cc3a55af3bcf171a1c23a90c4df9cf591706104 - subpackages: - - runtime - - runtime/internal - - utilities -- name: github.com/hashicorp/hcl - version: cf7d376da96d9cecec7c7483cec2735efe54a410 - subpackages: - - hcl/ast - - hcl/parser - - hcl/printer - - hcl/scanner - - hcl/strconv - - hcl/token - - json/parser - - json/scanner - - json/token -- name: github.com/hydrogen18/stalecucumber - version: 9b38526d4bdf8e197c31344777fc28f7f48d250d -- name: github.com/inconshreveable/mousetrap - version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 -- name: github.com/jhump/protoreflect - version: e0795ed1d1ada047d01e90243863def21db467fc - subpackages: - - desc - - desc/builder - - desc/internal - - desc/protoparse - - dynamic - - internal -- name: github.com/jonboulle/clockwork - version: 2eee05ed794112d45db504eb05aa693efd2b8b09 -- name: github.com/json-iterator/go - version: acfec88f7a0d5140ace3dcdbee10184e3684a9e1 -- name: github.com/kr/logfmt - version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0 -- name: github.com/leanovate/gopter - version: e2604588f4db2d2e5eb78ae75d615516f55873e3 - subpackages: - - commands - - gen - - prop -- name: github.com/lightstep/lightstep-tracer-common - version: 082dbbf1b51a87f008f51a6203c269395ac3fe54 - subpackages: - - golang/gogo/collectorpb - - golang/gogo/lightsteppb -- name: github.com/lightstep/lightstep-tracer-go - version: 95891af43e111d60f0ae6adaa39c2abe8caad401 - subpackages: - - lightstep/rand -- name: github.com/m3db/bitset - version: 07973db6b78acb62ac207d0538055e874b49d90d -- name: github.com/m3db/bloom - version: 47fe1193cdb900de7193d1f3d26ea9b2cbf6fb31 -- name: github.com/m3db/pilosa - version: ac8920c6e1abe06e2b0a3deba79a9910c39700e6 - subpackages: - - roaring -- name: github.com/m3db/prometheus_client_golang - version: 8ae269d24972b8695572fa6b2e3718b5ea82d6b4 - subpackages: - - prometheus - - prometheus/promhttp -- name: github.com/m3db/prometheus_client_model - version: 8b2299a4bf7d7fc10835527021716d4b4a6e8700 - subpackages: - - go -- name: github.com/m3db/prometheus_common - version: 25aaa3dff79bb48116615ebe1dea6a494b74ce77 - subpackages: - - expfmt - - internal/bitbucket.org/ww/goautoneg - - model -- name: github.com/m3db/prometheus_procfs - version: 1878d9fbb537119d24b21ca07effd591627cd160 -- name: github.com/m3db/stackadler32 - version: bfebcd73ef6ffe0ee30489227f0330c39064b674 -- name: github.com/m3db/stackmurmur3 - version: 744c0229c12ed0e4f8cb9d081a2692b3300bf705 -- name: github.com/m3db/vellum - version: e766292d14de216c324bb60b17320af72dee59c6 - subpackages: - - regexp -- name: github.com/magiconair/properties - version: de8848e004dd33dc07a2947b3d76f618a7fc7ef1 -- name: github.com/matttproud/golang_protobuf_extensions - version: c12348ce28de40eed0136aa2b644d0ee0650e56c - subpackages: - - pbutil -- name: github.com/mauricelam/genny - version: eb2c5232c885956af3565a20ecf48555cab2b9bc - subpackages: - - generic -- name: github.com/MichaelTJones/pcg - version: df440c6ed7ed8897ac98a408365e5e89c7becf1a -- name: github.com/mitchellh/mapstructure - version: 3536a929edddb9a5b34bd6861dc4a9647cb459fe -- name: github.com/modern-go/concurrent - version: bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 -- name: github.com/modern-go/reflect2 - version: 94122c33edd36123c84d5368cfb2b69df93a0ec8 -- name: github.com/oklog/ulid - version: e51a56f2a4c1bf73c967ca6d45d5366bade31943 -- name: github.com/opentracing-contrib/go-stdlib - version: cf7a6c988dc994e945d2715565026f3cc8718689 - subpackages: - - nethttp -- name: github.com/opentracing/opentracing-go - version: 659c90643e714681897ec2521c60567dd21da733 - subpackages: - - ext - - log - - mocktracer -- name: github.com/pborman/getopt - version: ec82d864f599c39673eef89f91b93fa5576567a1 -- name: github.com/pborman/uuid - version: adf5a7427709b9deb95d29d3fa8a2bf9cfd388f1 -- name: github.com/pelletier/go-toml - version: 8fe62057ea2d46ce44254c98e84e810044dbe197 -- name: github.com/pilosa/pilosa - version: bc9747cc0f19702d9753de7ea9375d8311dfc706 - subpackages: - - logger - - stats -- name: github.com/pkg/errors - version: ba968bfe8b2f7e042a574c888954fccecfa385b4 -- name: github.com/pkg/profile - version: 5b67d428864e92711fcbd2f8629456121a56d91f -- name: github.com/pmezard/go-difflib - version: d8ed2627bdf02c080bf22230dbb337003b7aba2d - subpackages: - - difflib -- name: github.com/prometheus/client_golang - version: aa9238db679fc02bf22cf4f2c27a980edcb5ada0 - subpackages: - - prometheus - - prometheus/promhttp -- name: github.com/prometheus/client_model - version: 7bc5445566f0fe75b15de23e6b93886e982d7bf9 - subpackages: - - go -- name: github.com/prometheus/common - version: d978bcb1309602d68bb4ba69cf3f8ed900e07308 - subpackages: - - expfmt - - internal/bitbucket.org/ww/goautoneg - - model -- name: github.com/prometheus/procfs - version: 6d489fc7f1d9cd890a250f3ea3431b1744b9623f - subpackages: - - internal/util - - nfs - - xfs -- name: github.com/prometheus/prometheus - version: 18254838fbe25dcc732c950ae05f78ed4db1292c - subpackages: - - pkg/exemplar - - pkg/labels - - pkg/textparse - - pkg/timestamp - - pkg/value - - promql - - promql/parser - - storage - - tsdb - - tsdb/chunkenc - - tsdb/chunks - - tsdb/encoding - - tsdb/errors - - tsdb/fileutil - - tsdb/goversion - - tsdb/index - - tsdb/record - - tsdb/tombstones - - tsdb/wal - - util/httputil - - util/stats - - util/strutil - - util/teststorage - - util/testutil -- name: github.com/rakyll/statik - version: 3bac566d30cdbeddef402a80f3d6305860e59f12 - subpackages: - - fs -- name: github.com/RoaringBitmap/roaring - version: 4676818d7478f72f5041418f5afbb15a5080dbb7 -- name: github.com/russross/blackfriday - version: d3b5b032dc8e8927d31a5071b56e14c89f045135 -- name: github.com/satori/go.uuid - version: f58768cc1a7a7e77a3bd49e98cdd21419399b6a3 -- name: github.com/sergi/go-diff - version: feef008d51ad2b3778f85d387ccf91735543008d - subpackages: - - diffmatchpatch -- name: github.com/shurcooL/sanitized_anchor_name - version: 7bfe4c7ecddb3666a94b053b422cdd8f5aaa3615 -- name: github.com/spaolacci/murmur3 - version: 9f5d223c60793748f04a9d5b4b4eacddfc1f755d -- name: github.com/spf13/afero - version: 588a75ec4f32903aa5e39a2619ba6a4631e28424 - subpackages: - - mem -- name: github.com/spf13/cast - version: f31dc0aaab5a2feeca5c41783abbc347731fd08e -- name: github.com/spf13/cobra - version: 7c674d9e72017ed25f6d2b5e497a1368086b6a6f - subpackages: - - cobra -- name: github.com/spf13/jwalterweatherman - version: 94f6ae3ed3bceceafa716478c5fbf8d29ca601a1 -- name: github.com/spf13/pflag - version: 4f9190456aed1c2113ca51ea9b89219747458dc1 -- name: github.com/spf13/viper - version: eabbc68a3ecd5cf8c11a2f84dbda5e7a38493b2f -- name: github.com/stretchr/objx - version: cbeaeb16a013161a98496fad62933b1d21786672 -- name: github.com/stretchr/testify - version: 6fe211e493929a8aac0469b93f28b1d0688a9a3a - subpackages: - - assert - - mock - - require - - suite -- name: github.com/subosito/gotenv - version: de67a6614a4de71ad5e380b6946e56ab957d58c5 -- name: github.com/twotwotwo/sorts - version: bf5c1f2b8553dec28372aa6ac5a8bf53a20a4c5b -- name: github.com/uber-go/atomic - version: 40ae6a40a970ef4cdbffa7b24b280e316db8accc -- name: github.com/uber-go/tally - version: 4292fb62574242de9fb0be278fc17d45defa5d33 - subpackages: - - m3 - - m3/customtransports - - m3/thrift - - m3/thriftudp - - multi - - prometheus - - thirdparty/github.com/apache/thrift/lib/go/thrift -- name: github.com/uber/jaeger-client-go - version: 2f47546e3facd43297739439600bcf43f44cce5d - subpackages: - - config - - internal/baggage - - internal/baggage/remote - - internal/spanlog - - internal/throttler - - internal/throttler/remote - - log - - log/zap - - rpcmetrics - - thrift - - thrift-gen/agent - - thrift-gen/baggage - - thrift-gen/jaeger - - thrift-gen/sampling - - thrift-gen/zipkincore - - transport - - utils -- name: github.com/uber/jaeger-lib - version: a87ae9d84fb038a8d79266298970720be7c80fcd - subpackages: - - metrics - - metrics/tally -- name: github.com/uber/tchannel-go - version: 162ecb0dc97845a0c42aae3899651dba111085e5 - subpackages: - - internal/argreader - - relay - - thrift - - thrift/gen-go/meta - - tnet - - tos - - trand - - typed -- name: github.com/valyala/tcplisten - version: ceec8f93295a060cdb565ec25e4ccf17941dbd55 -- name: github.com/willf/bitset - version: e553b05586428962bf7058d1044519d87ca72d74 -- name: github.com/xiang90/probing - version: 07dd2e8dfe18522e9c447ba95f2fe95262f63bb2 -- name: go.uber.org/atomic - version: 40ae6a40a970ef4cdbffa7b24b280e316db8accc -- name: go.uber.org/config - version: c917157c9ba905e1c93f74a2611bc4356abe94d0 - subpackages: - - internal/merge - - internal/unreachable -- name: go.uber.org/multierr - version: 824d08f79702fe5f54aca8400aa0d754318786e7 -- name: go.uber.org/zap - version: f85c78b1dd998214c5f2138155b320a4a43fbe36 - subpackages: - - buffer - - internal/bufferpool - - internal/color - - internal/exit - - zapcore -- name: golang.org/x/crypto - version: 9419663f5a44be8b34ca85f08abc5fe1be11f8a3 - subpackages: - - bcrypt - - blowfish -- name: golang.org/x/lint - version: fdd1cda4f05fd1fd86124f0ef9ce31a0b72c8448 - subpackages: - - golint -- name: golang.org/x/net - version: ab5485076ff3407ad2d02db054635913f017b0ed - repo: https://github.com/golang/net - vcs: git - subpackages: - - bpf - - context - - http2 - - http2/hpack - - idna - - internal/iana - - internal/socket - - internal/timeseries - - ipv4 - - ipv6 - - lex/httplex - - trace -- name: golang.org/x/sync - version: 112230192c580c3556b8cee6403af37a4fc5f28c - subpackages: - - errgroup -- name: golang.org/x/sys - version: c178f38b412c7b426e4e97be2e75d11ff7b8d4d4 - subpackages: - - unix -- name: golang.org/x/text - version: 4ee4af566555f5fbe026368b75596286a312663a - subpackages: - - secure/bidirule - - transform - - unicode/bidi - - unicode/norm -- name: golang.org/x/time - version: c06e80d9300e4443158a03817b8a8cb37d230320 - subpackages: - - rate -- name: golang.org/x/tools - version: 2aa90c603ae35ab89ce30e45e49d870b7e5e7698 - subpackages: - - go/ast/astutil - - go/gcexportdata - - go/internal/gcimporter -- name: google.golang.org/appengine - version: 2e4a801b39fc199db615bfca7d0b9f8cd9580599 - subpackages: - - datastore - - internal - - internal/app_identity - - internal/base - - internal/datastore - - internal/log - - internal/modules - - internal/remote_api -- name: google.golang.org/genproto - version: 09f6ed296fc66555a25fe4ce95173148778dfa85 - subpackages: - - googleapis/api/annotations - - googleapis/rpc/status - - protobuf/api - - protobuf/field_mask - - protobuf/ptype - - protobuf/source_context -- name: google.golang.org/grpc - version: 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e - subpackages: - - balancer - - codes - - connectivity - - credentials - - grpclb/grpc_lb_v1/messages - - grpclog - - health/grpc_health_v1 - - internal - - keepalive - - metadata - - naming - - peer - - reflection - - reflection/grpc_reflection_v1alpha - - resolver - - stats - - status - - tap - - transport -- name: gopkg.in/alecthomas/kingpin.v2 - version: 947dcec5ba9c011838740e680966fd7087a71d0d - repo: https://github.com/alecthomas/kingpin.git - vcs: git -- name: gopkg.in/go-playground/validator.v9 - version: a021b2ec9a8a8bb970f3f15bc42617cb520e8a64 - repo: https://github.com/go-playground/validator.git - vcs: git -- name: gopkg.in/ini.v1 - version: 94291fffe2b14f4632ec0e67c1bfecfc1287a168 -- name: gopkg.in/validator.v2 - version: 3e4f037f12a1221a0864cf0dd2e81c452ab22448 - repo: https://github.com/go-validator/validator.git - vcs: git -- name: gopkg.in/vmihailenco/msgpack.v2 - version: a1382b1ce0c749733b814157c245e02cc1f41076 - repo: https://github.com/vmihailenco/msgpack.git - vcs: git - subpackages: - - codes -- name: gopkg.in/yaml.v2 - version: 5420a8b6744d3b0345ab293f6fcba19c978f1183 - repo: https://github.com/go-yaml/yaml.git - vcs: git -- name: github.com/influxdata/influxdb - version: 01c8dd416270f424ab0c40f9291e269ac6921964 - subpackages: - - models -testImports: -- name: github.com/glycerine/go-unsnap-stream - version: 98d31706395aaac22e29676617f2ee37bee55b5a -- name: github.com/mschoch/smat - version: 90eadee771aeab36e8bf796039b8c261bebebe4f -- name: github.com/philhofer/fwd - version: bb6d471dc95d4fe11e432687f8b70ff496cf3136 -- name: github.com/tinylib/msgp - version: efe20429c9b7b2a358aba9ba2d40ad56d966ce00 - subpackages: - - msgp diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index 32b381fc11..0000000000 --- a/glide.yaml +++ /dev/null @@ -1,291 +0,0 @@ -package: github.com/m3db/m3 -import: - - package: github.com/influxdata/influxdb - version: 01c8dd416270f424ab0c40f9291e269ac6921964 - subpackages: - - models - - - package: github.com/m3db/bitset - version: 07973db6b78acb62ac207d0538055e874b49d90d - - - package: github.com/m3db/bloom - version: 47fe1193cdb900de7193d1f3d26ea9b2cbf6fb31 - - - package: github.com/m3db/stackmurmur3 - version: 744c0229c12ed0e4f8cb9d081a2692b3300bf705 - - - package: github.com/m3db/stackadler32 - version: bfebcd73ef6ffe0ee30489227f0330c39064b674 - - - package: github.com/MichaelTJones/pcg - version: df440c6ed7ed8897ac98a408365e5e89c7becf1a - - - package: github.com/willf/bitset - version: e553b05586428962bf7058d1044519d87ca72d74 - - # NB(r): This is bad.. when we upgrade to go.mod no longer needed, - # but since glide does not support "/v2" syntax and some of our deps - # depend on it we forked xxhash and explicitly copied code into "/v2" - # submodule to make this package work with glide. - - package: github.com/cespare/xxhash - version: 3f2bc324ddd8b6aafc9a91b5aabf22ff172edafb - repo: https://github.com/m3dbx/xxhash - vcs: git - - - package: go.etcd.io/etcd - version: 3.4.3 - - - package: github.com/pkg/errors - version: ^0.8 - - - package: github.com/apache/thrift - version: 0.9.3-pool-read-binary-3 - subpackages: - - lib/go/thrift - repo: https://github.com/m3db/thrift - vcs: git - - - package: github.com/golang/mock - version: ^1 - subpackages: - - gomock - - - package: github.com/golang/protobuf - version: ^1.1.0 - subpackages: - - proto - - ptypes/timestamp - - jsonpb - - - package: github.com/gogo/protobuf - version: ^1 - - - package: github.com/jhump/protoreflect - version: e0795ed1d1ada047d01e90243863def21db467fc - - - package: go.uber.org/zap - version: f85c78b1dd998214c5f2138155b320a4a43fbe36 - - - package: github.com/spaolacci/murmur3 - version: 9f5d223c60793748f04a9d5b4b4eacddfc1f755d - - - package: github.com/uber/tchannel-go - version: v1.12.0 - subpackages: - - thrift - - - package: gopkg.in/vmihailenco/msgpack.v2 - version: a1382b1ce0c749733b814157c245e02cc1f41076 - repo: https://github.com/vmihailenco/msgpack.git - vcs: git - - - package: github.com/uber-go/tally - version: ^3.3.10 - - - package: golang.org/x/net - version: ab5485076ff3407ad2d02db054635913f017b0ed - repo: https://github.com/golang/net - vcs: git - - - package: google.golang.org/appengine/datastore - version: 2e4a801b39fc199db615bfca7d0b9f8cd9580599 - - - package: github.com/pborman/getopt - version: ec82d864f599c39673eef89f91b93fa5576567a1 - - - package: github.com/spf13/cobra - version: 7c674d9e72017ed25f6d2b5e497a1368086b6a6f - subpackages: - - cobra - - - package: github.com/spf13/pflag - version: 4f9190456aed1c2113ca51ea9b89219747458dc1 - - - package: github.com/spf13/viper - version: ^1.0.0 - - - package: github.com/RoaringBitmap/roaring - version: ^0.4 - - - package: github.com/uber-go/atomic - version: ^1.2.0 - - - package: github.com/satori/go.uuid - version: ^1.2.0 - - # NB(r): make sure to use the master commit for vellum - # once all upstream changes are complete in github.com/m3db/vellum. - - package: github.com/m3db/vellum - version: e766292d14de216c324bb60b17320af72dee59c6 - - - package: github.com/edsrzf/mmap-go # un-used but required for a compile time dep from vellum - version: 0bce6a6887123b67a60366d2c9fe2dfb74289d2e - - # NB(r): make sure to use the master commit for pilosa - # once all upstream changes are complete in github.com/pilosa/pilosa. - - package: github.com/m3db/pilosa/roaring - version: ac8920c6e1abe06e2b0a3deba79a9910c39700e6 - - # NB(prateek): ideally, the following dependencies would be under testImport, but - # Glide doesn't like that. https://github.com/Masterminds/glide/issues/564 - - package: github.com/stretchr/testify - version: 6fe211e493929a8aac0469b93f28b1d0688a9a3a - subpackages: - - require - - - package: github.com/fortytw2/leaktest - version: b433bbd6d743c1854040b39062a3916ed5f78fe8 - - - package: github.com/sergi/go-diff - version: feef008d51ad2b3778f85d387ccf91735543008d - - - package: github.com/golang/snappy - version: 553a641470496b2327abcac10b36396bd98e45c9 - - - package: github.com/gorilla/mux - version: ^1.6.0 - - - package: github.com/pborman/uuid - version: ^1.1.0 - - - package: gopkg.in/alecthomas/kingpin.v2 - version: ^2.2.6 - repo: https://github.com/alecthomas/kingpin.git - vcs: git - - - package: github.com/pkg/profile - version: 5b67d428864e92711fcbd2f8629456121a56d91f - - - package: golang.org/x/sync - subpackages: - - errgroup - - - package: github.com/google/go-cmp - version: 0.3 - subpackages: - - cmp - - - package: github.com/hydrogen18/stalecucumber - version: 9b38526d4bdf8e197c31344777fc28f7f48d250d - - - package: github.com/c2h5oh/datasize - version: 4eba002a5eaea69cf8d235a388fc6b65ae68d2dd - - # START_PROMETHEUS_DEPS - - package: github.com/prometheus/prometheus - version: ~2.17.2 - - # To avoid prometheus/prometheus dependencies from breaking, - # pin the transitive dependencies. See go.mod in - # github.com/prometheus/prometheus for which versions to set for - # relevant prometheus release pinned to above. - - package: github.com/prometheus/common - version: ~0.9.1 - - - package: github.com/prometheus/client_golang - version: ~1.5.1 - - - package: github.com/prometheus/client_model - version: ~0.2.0 - - - package: github.com/prometheus/procfs - version: ~0.0.8 - # END_PROMETHEUS_DEPS - - # START_TALLY_PROMETHEUS_DEPS - - package: github.com/m3db/prometheus_client_golang - version: 8ae269d24972b8695572fa6b2e3718b5ea82d6b4 - - - package: github.com/m3db/prometheus_client_model - version: 8b2299a4bf7d7fc10835527021716d4b4a6e8700 - - - package: github.com/m3db/prometheus_common - version: 25aaa3dff79bb48116615ebe1dea6a494b74ce77 - - - package: github.com/m3db/prometheus_procfs - version: 1878d9fbb537119d24b21ca07effd591627cd160 - # END_PROMETHEUS_DEPS - - - package: github.com/coreos/pkg - version: 4 - subpackages: - - capnslog - - # START_TRACING_DEPS - - package: github.com/opentracing/opentracing-go - version: ^1.1.0 - - - package: github.com/uber/jaeger-lib - version: ^2.0.0 - - - package: github.com/uber/jaeger-client-go - version: ~2.16.0 - - - package: github.com/lightstep/lightstep-tracer-go - version: ~v0.18.0 - - - package: github.com/lightstep/lightstep-tracer-common - version: ~1.0.3 - - - package: github.com/opentracing-contrib/go-stdlib - # Pin this on recommendation of the repo (no stable release yet). Still arguably better than rewriting - # the same code. - version: cf7a6c988dc994e945d2715565026f3cc8718689 - - # END_TRACING_DEPS - - # To avoid conflicting packages not resolving the latest GRPC - - package: google.golang.org/grpc - version: 1.7.5 - subpackages: - - codes - - - package: gopkg.in/validator.v2 - version: 3e4f037f12a1221a0864cf0dd2e81c452ab22448 - repo: https://github.com/go-validator/validator.git - vcs: git - - - package: gopkg.in/go-playground/validator.v9 - version: a021b2ec9a8a8bb970f3f15bc42617cb520e8a64 - repo: https://github.com/go-playground/validator.git - vcs: git - - - package: github.com/go-playground/universal-translator - version: 71201497bace774495daed26a3874fd339e0b538 - - - package: gopkg.in/yaml.v2 - version: 5420a8b6744d3b0345ab293f6fcba19c978f1183 - repo: https://github.com/go-yaml/yaml.git - vcs: git - - - package: github.com/russross/blackfriday - version: ^2.0.1 - - - package: github.com/mauricelam/genny - version: eb2c5232c885956af3565a20ecf48555cab2b9bc - - - package: github.com/leanovate/gopter - version: e2604588f4db2d2e5eb78ae75d615516f55873e3 - - - package: github.com/rakyll/statik - version: ^0.1.6 - - - package: golang.org/x/sys - subpackages: - - unix - version: c178f38b412c7b426e4e97be2e75d11ff7b8d4d4 - - - package: go.uber.org/config - version: ^1.3.1 - - - package: github.com/twotwotwo/sorts - version: bf5c1f2b8553dec28372aa6ac5a8bf53a20a4c5b - - - package: github.com/valyala/tcplisten - version: ceec8f93295a060cdb565ec25e4ccf17941dbd55 - - - package: github.com/json-iterator/go - version: ^1.1.9 - - - package: github.com/go-kit/kit - version: ^0.10.0 From 1a19a1ea10670b0fbb9561e614a0a65f92180c8e Mon Sep 17 00:00:00 2001 From: Rob Skillington Date: Tue, 2 Jun 2020 18:37:00 -0400 Subject: [PATCH 41/43] Removing all remaining references to glide --- .gitignore | 4 ++-- docker/m3aggregator/Dockerfile | 4 ++-- docker/m3collector/Dockerfile | 4 ++-- docker/m3coordinator/Dockerfile | 4 ++-- docker/m3dbnode/Dockerfile | 10 +++------- docker/m3dbnode/Dockerfile-setcap | 4 ++-- docker/m3nsch/Dockerfile | 4 ++-- docker/m3query/Dockerfile | 4 ++-- docs/operational_guide/monitoring.md | 4 ++-- docs/overview/roadmap.md | 1 - src/query/README.md | 1 - 11 files changed, 19 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 7abeb9ea0b..14d98dc9a2 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ .DS_Store test.log -# glide manages this +# go modules manages this vendor/ # Build binaries @@ -52,7 +52,7 @@ yarn-error.log* # Used to serve m3db.io site !m3db.io/**/*.html !m3db.io/**/*.xml -# glide does not manage this +# go modules does not manage this !m3db.io/**/vendor # Automatically populated from asset sources m3db.io/openapi diff --git a/docker/m3aggregator/Dockerfile b/docker/m3aggregator/Dockerfile index 31057d1170..b637388c29 100644 --- a/docker/m3aggregator/Dockerfile +++ b/docker/m3aggregator/Dockerfile @@ -2,8 +2,8 @@ FROM golang:1.13-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " -# Install Glide -RUN apk add --update glide git make bash +# Install deps +RUN apk add --update git make bash # Add source code RUN mkdir -p /go/src/github.com/m3db/m3 diff --git a/docker/m3collector/Dockerfile b/docker/m3collector/Dockerfile index ce8435e199..f0e55b9930 100644 --- a/docker/m3collector/Dockerfile +++ b/docker/m3collector/Dockerfile @@ -2,8 +2,8 @@ FROM golang:1.13-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " -# Install Glide -RUN apk add --update glide git make bash +# Install deps +RUN apk add --update git make bash # Add source code RUN mkdir -p /go/src/github.com/m3db/m3 diff --git a/docker/m3coordinator/Dockerfile b/docker/m3coordinator/Dockerfile index df166f71c0..675183b68d 100644 --- a/docker/m3coordinator/Dockerfile +++ b/docker/m3coordinator/Dockerfile @@ -2,8 +2,8 @@ FROM golang:1.13-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " -# Install Glide -RUN apk add --update glide git make bash +# Install deps +RUN apk add --update git make bash # Add source code RUN mkdir -p /go/src/github.com/m3db/m3 diff --git a/docker/m3dbnode/Dockerfile b/docker/m3dbnode/Dockerfile index 35b1a9937f..de6ca6e830 100644 --- a/docker/m3dbnode/Dockerfile +++ b/docker/m3dbnode/Dockerfile @@ -1,13 +1,9 @@ -# stage 1: build. We have to use an older version of alpine, as git 2.22 removes -# the '-x' flag to a submodule command which in turn breaks glide, the old AF -# dependency tool we have. Until we migrate to a new version of glide or go -# modules, we need to use this older base image. -# https://github.com/m3db/m3/issues/628 +# stage 1: build FROM golang:1.13-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " -# Install Glide -RUN apk add --update glide git make bash +# Install deps +RUN apk add --update git make bash # Add source code RUN mkdir -p /go/src/github.com/m3db/m3 diff --git a/docker/m3dbnode/Dockerfile-setcap b/docker/m3dbnode/Dockerfile-setcap index 1d4114a92e..a2b7463d27 100644 --- a/docker/m3dbnode/Dockerfile-setcap +++ b/docker/m3dbnode/Dockerfile-setcap @@ -2,8 +2,8 @@ FROM golang:1.13-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " -# Install Glide -RUN apk add --update glide git make bash +# Install deps +RUN apk add --update git make bash # Add source code RUN mkdir -p /go/src/github.com/m3db/m3 diff --git a/docker/m3nsch/Dockerfile b/docker/m3nsch/Dockerfile index 9392f110f3..92101f109e 100644 --- a/docker/m3nsch/Dockerfile +++ b/docker/m3nsch/Dockerfile @@ -2,8 +2,8 @@ FROM golang:1.13-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " -# Install Glide -RUN apk add --update glide git make bash +# Install deps +RUN apk add --update git make bash # Add source code RUN mkdir -p /go/src/github.com/m3db/m3 diff --git a/docker/m3query/Dockerfile b/docker/m3query/Dockerfile index 7589adce11..58a6d8fe8a 100644 --- a/docker/m3query/Dockerfile +++ b/docker/m3query/Dockerfile @@ -2,8 +2,8 @@ FROM golang:1.13-alpine3.11 AS builder LABEL maintainer="The M3DB Authors " -# Install Glide -RUN apk add --update glide git make bash +# Install deps +RUN apk add --update git make bash # Add source code RUN mkdir -p /go/src/github.com/m3db/m3 diff --git a/docs/operational_guide/monitoring.md b/docs/operational_guide/monitoring.md index 2827785b50..b527eb5beb 100644 --- a/docs/operational_guide/monitoring.md +++ b/docs/operational_guide/monitoring.md @@ -65,8 +65,8 @@ If you'd like additional backends, we'd love to support them! File an issue against M3 and we can work with you on how best to add the backend. The first time's going to be a little rough--opentracing unfortunately doesn't support Go plugins (yet--see -https://github.com/opentracing/opentracing-go/issues/133), and `glide`'s -update model means that adding dependencies directly will update +https://github.com/opentracing/opentracing-go/issues/133), and Go's dependency +model means that adding dependencies directly will update *everything*, which isn't ideal for an isolated dependency change. These problems are all solvable though, and we'll work with you to make it happen! diff --git a/docs/overview/roadmap.md b/docs/overview/roadmap.md index 15d1388f8b..c38e3e8d4e 100644 --- a/docs/overview/roadmap.md +++ b/docs/overview/roadmap.md @@ -10,5 +10,4 @@ Short: - Add design documentation of aggregator Medium: -- Upgrade from glide to go modules - Plan what a v1.0 release looks like diff --git a/src/query/README.md b/src/query/README.md index 173879856b..db14974813 100644 --- a/src/query/README.md +++ b/src/query/README.md @@ -60,7 +60,6 @@ Setup GCP for m3coordinator: 1. Make sure you select a base image with Docker pre-installed 2. Follow steps 1-5 from the above section (clone `m3coordinator` instead of `m3db`) - - Depending on the status of https://github.com/m3db/m3/pull/452, you may need to update the version of m3db (6874b8af8e9ec682551d49ad3e3250dfb4f4ae1f) and m3x (7ea8c2f35f9fa0f52bd189e44b11113d708acada) in `glide.yaml` 3. The config file, which is located at `m3coordinator/benchmark/configs/benchmark.yml` will need the same config topology as the m3db config 4. Run m3coordinator - you should see this message with the number of hosts you specified: `[I] successfully updated topology to 3 hosts` with no other warning or error messsages $ ./bin/m3coordinator --config.file benchmark/configs/benchmark.yml From 9bd4eee46c7079aa75f93e0d9bb6d41788522ced Mon Sep 17 00:00:00 2001 From: Rob Skillington Date: Tue, 2 Jun 2020 20:00:10 -0400 Subject: [PATCH 42/43] Remove install hacks for glide no longer required --- Makefile | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/Makefile b/Makefile index 7d27ea482c..697165495c 100644 --- a/Makefile +++ b/Makefile @@ -32,8 +32,6 @@ assets_rules_dir := generated/assets thrift_output_dir := generated/thrift/rpc thrift_rules_dir := generated/thrift vendor_prefix := vendor -bad_trace_dep := go.etcd.io/etcd/vendor/golang.org/x/net/trace -bad_prom_vendor_dir := github.com/prometheus/prometheus/vendor cache_policy ?= recently_read genny_target ?= genny-all @@ -106,40 +104,6 @@ setup: .PHONY: install-vendor-m3 install-vendor-m3: [ -d $(VENDOR) ] || GOSUMDB=off go mod vendor - # See comment for "install-vendor-m3-remove-bad-dep" why required and the TODO. - make install-vendor-m3-remove-bad-dep - # See comment for "install-vendor-m3-remove-prometheus-vendor-dir" why required. - make install-vendor-m3-remove-prometheus-vendor-dir - -# Some deps were causing panics when using GRPC and etcd libraries were used. -# See issue: https://github.com/etcd-io/etcd/issues/9357 -# TODO: Move M3 to go mod to avoid the issue entirely instead of this hack -# (which is bad and we should feel bad). -# $ go test -v -# panic: /debug/requests is already registered. You may have two independent -# copies of golang.org/x/net/trace in your binary, trying to maintain separate -# state. This may involve a vendored copy of golang.org/x/net/trace. -# -# goroutine 1 [running]: -# github.com/m3db/m3/vendor/go.etcd.io/etcd/vendor/golang.org/x/net/trace.init.0() -# /Users/r/go/src/github.com/m3db/m3/vendor/go.etcd.io/etcd/vendor/golang.org/x/net/trace/trace.go:123 +0x1cd -# exit status 2 -# FAIL github.com/m3db/m3/src/query/remote 0.024s -.PHONY: install-vendor-m3-remove-bad-dep -install-vendor-m3-remove-bad-dep: - ([ -d $(VENDOR)/$(bad_trace_dep) ] && rm -rf $(VENDOR)/$(bad_trace_dep)) || (echo "No bad trace dep" > /dev/null) - -# Note: Prometheus has an entire copy of all vendored code which makes -# it impossible to pass sub-dependencies on it since you'll get errors like: -# have MustRegister(... vendor/github.com/prometheus/client_golang/prometheus.Collector) -# want MustRegister(... vendor/github.com/prometheus/prometheus/vendor/github.com/prometheus/client_golang/prometheus -# Even if you have the same deps as prometheus you can't pass the dep types to -# it since it depends on the concrete subdirectory vendored code import path. -# Therefore we delete the vendored code and make it rely on our own dependencies -# we install. -.PHONY: install-vendor-m3-remove-prometheus-vendor-dir -install-vendor-m3-remove-prometheus-vendor-dir: - ([ -d $(VENDOR)/$(bad_prom_vendor_dir) ] && rm -rf $(VENDOR)/$(bad_prom_vendor_dir)) || (echo "No bad prom vendor dir" > /dev/null) .PHONY: docker-dev-prep docker-dev-prep: From ac8651ed66f91e83b6250d67cd7c30ca08144989 Mon Sep 17 00:00:00 2001 From: Rob Skillington Date: Tue, 2 Jun 2020 20:43:09 -0400 Subject: [PATCH 43/43] Up integraiton test timeout --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 697165495c..6dfceeb4a5 100644 --- a/Makefile +++ b/Makefile @@ -288,7 +288,7 @@ test-ci-big-unit: test-big-base .PHONY: test-ci-integration test-ci-integration: - INTEGRATION_TIMEOUT=4m TEST_SERIES_CACHE_POLICY=$(cache_policy) make test-base-ci-integration + INTEGRATION_TIMEOUT=10m TEST_SERIES_CACHE_POLICY=$(cache_policy) make test-base-ci-integration $(process_coverfile) $(coverfile) define SUBDIR_RULES @@ -396,7 +396,7 @@ test-ci-big-unit-$(SUBDIR): .PHONY: test-ci-integration-$(SUBDIR) test-ci-integration-$(SUBDIR): @echo "--- test-ci-integration $(SUBDIR)" - SRC_ROOT=./src/$(SUBDIR) PANIC_ON_INVARIANT_VIOLATED=true INTEGRATION_TIMEOUT=4m TEST_SERIES_CACHE_POLICY=$(cache_policy) make test-base-ci-integration + SRC_ROOT=./src/$(SUBDIR) PANIC_ON_INVARIANT_VIOLATED=true INTEGRATION_TIMEOUT=10m TEST_SERIES_CACHE_POLICY=$(cache_policy) make test-base-ci-integration @echo "--- uploading coverage report" $(codecov_push) -f $(coverfile) -F $(SUBDIR)