diff --git a/Makefile b/Makefile index 727262274..cb5e47abc 100644 --- a/Makefile +++ b/Makefile @@ -31,6 +31,9 @@ ZITI_DEPLOY_BRANCH := $(shell if git ls-remote --heads git@bitbucket.org:netfoun VERSION_FROM_SRC := $(shell cat common/version/VERSION) VERSION := $(shell echo $(VERSION_FROM_SRC)-$$BUILD_NUMBER) +# options passed to gox for all architectures +BUILDFLAGS_COMMON := -verbose -cgo + BUILDFLAGS_DARWIN_AMD64 := -ldflags \ " -X $(ROOT_PACKAGE)/version.Version=$(VERSION)\ -X $(ROOT_PACKAGE)/version.Revision=$(REV)\ @@ -229,59 +232,59 @@ endif ziti-controller-common: $(info ============ ziti-controller-common starting ============) - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=/opt/osxcross/target/bin/o64-clang CXX=/opt/osxcross/target/bin/o64-clang++ gox -cgo -os="darwin" -arch=amd64 $(BUILDFLAGS_DARWIN_AMD64) github.com/netfoundry/ziti-cmd/ziti-controller/... - cd release; CGO_ENABLED=$(CGO_ENABLED) gox -cgo -os="linux" -arch=amd64 $(BUILDFLAGS_LINUX_AMD64) github.com/netfoundry/ziti-cmd/ziti-controller/... - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=arm-linux-gnueabihf-gcc gox -cgo -os="linux" -arch=arm $(BUILDFLAGS_LINUX_ARM) github.com/netfoundry/ziti-cmd/ziti-controller/... - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ gox -cgo -os="windows" -arch=amd64 $(BUILDFLAGS_WINDOWS_AMD64) github.com/netfoundry/ziti-cmd/ziti-controller/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=/opt/osxcross/target/bin/o64-clang CXX=/opt/osxcross/target/bin/o64-clang++ gox ${BUILDFLAGS_COMMON} -os="darwin" -arch=amd64 $(BUILDFLAGS_DARWIN_AMD64) github.com/netfoundry/ziti-cmd/ziti-controller/... + cd release; CGO_ENABLED=$(CGO_ENABLED) gox ${BUILDFLAGS_COMMON} -os="linux" -arch=amd64 $(BUILDFLAGS_LINUX_AMD64) github.com/netfoundry/ziti-cmd/ziti-controller/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=arm-linux-gnueabihf-gcc gox ${BUILDFLAGS_COMMON} -os="linux" -arch=arm $(BUILDFLAGS_LINUX_ARM) github.com/netfoundry/ziti-cmd/ziti-controller/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ gox ${BUILDFLAGS_COMMON} -os="windows" -arch=amd64 $(BUILDFLAGS_WINDOWS_AMD64) github.com/netfoundry/ziti-cmd/ziti-controller/... ziti-enroller-common: $(info ============ ziti-enroller-common starting ============) - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=/opt/osxcross/target/bin/o64-clang CXX=/opt/osxcross/target/bin/o64-clang++ gox -cgo -os="darwin" -arch=amd64 $(BUILDFLAGS_DARWIN_AMD64) github.com/netfoundry/ziti-cmd/ziti-enroller/... - cd release; CGO_ENABLED=$(CGO_ENABLED) gox -cgo -os="linux" -arch=amd64 $(BUILDFLAGS_LINUX_AMD64) github.com/netfoundry/ziti-cmd/ziti-enroller/... - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=arm-linux-gnueabihf-gcc gox -cgo -os="linux" -arch=arm $(BUILDFLAGS_LINUX_ARM) github.com/netfoundry/ziti-cmd/ziti-enroller/... - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ gox -cgo -os="windows" -arch=amd64 $(BUILDFLAGS_WINDOWS_AMD64) github.com/netfoundry/ziti-cmd/ziti-enroller/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=/opt/osxcross/target/bin/o64-clang CXX=/opt/osxcross/target/bin/o64-clang++ gox ${BUILDFLAGS_COMMON} -os="darwin" -arch=amd64 $(BUILDFLAGS_DARWIN_AMD64) github.com/netfoundry/ziti-cmd/ziti-enroller/... + cd release; CGO_ENABLED=$(CGO_ENABLED) gox ${BUILDFLAGS_COMMON} -os="linux" -arch=amd64 $(BUILDFLAGS_LINUX_AMD64) github.com/netfoundry/ziti-cmd/ziti-enroller/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=arm-linux-gnueabihf-gcc gox ${BUILDFLAGS_COMMON} -os="linux" -arch=arm $(BUILDFLAGS_LINUX_ARM) github.com/netfoundry/ziti-cmd/ziti-enroller/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ gox ${BUILDFLAGS_COMMON} -os="windows" -arch=amd64 $(BUILDFLAGS_WINDOWS_AMD64) github.com/netfoundry/ziti-cmd/ziti-enroller/... ziti-fabric-common: $(info ============ ziti-fabric-common starting ============) - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=/opt/osxcross/target/bin/o64-clang CXX=/opt/osxcross/target/bin/o64-clang++ gox -cgo -os="darwin" -arch=amd64 $(BUILDFLAGS_DARWIN_AMD64) github.com/netfoundry/ziti-cmd/ziti-fabric/... - cd release; CGO_ENABLED=$(CGO_ENABLED) gox -cgo -os="linux" -arch=amd64 $(BUILDFLAGS_LINUX_AMD64) github.com/netfoundry/ziti-cmd/ziti-fabric/... - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=arm-linux-gnueabihf-gcc gox -cgo -os="linux" -arch=arm $(BUILDFLAGS_LINUX_ARM) github.com/netfoundry/ziti-cmd/ziti-fabric/... - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ gox -cgo -os="windows" -arch=amd64 $(BUILDFLAGS_WINDOWS_AMD64) github.com/netfoundry/ziti-cmd/ziti-fabric/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=/opt/osxcross/target/bin/o64-clang CXX=/opt/osxcross/target/bin/o64-clang++ gox ${BUILDFLAGS_COMMON} -os="darwin" -arch=amd64 $(BUILDFLAGS_DARWIN_AMD64) github.com/netfoundry/ziti-cmd/ziti-fabric/... + cd release; CGO_ENABLED=$(CGO_ENABLED) gox ${BUILDFLAGS_COMMON} -os="linux" -arch=amd64 $(BUILDFLAGS_LINUX_AMD64) github.com/netfoundry/ziti-cmd/ziti-fabric/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=arm-linux-gnueabihf-gcc gox ${BUILDFLAGS_COMMON} -os="linux" -arch=arm $(BUILDFLAGS_LINUX_ARM) github.com/netfoundry/ziti-cmd/ziti-fabric/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ gox ${BUILDFLAGS_COMMON} -os="windows" -arch=amd64 $(BUILDFLAGS_WINDOWS_AMD64) github.com/netfoundry/ziti-cmd/ziti-fabric/... ziti-fabric-gw-common: $(info ============ ziti-fabric-gw-common starting ============) - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=/opt/osxcross/target/bin/o64-clang CXX=/opt/osxcross/target/bin/o64-clang++ gox -cgo -os="darwin" -arch=amd64 $(BUILDFLAGS_DARWIN_AMD64) github.com/netfoundry/ziti-cmd/ziti-fabric-gw/... - cd release; CGO_ENABLED=$(CGO_ENABLED) gox -cgo -os="linux" -arch=amd64 $(BUILDFLAGS_LINUX_AMD64) github.com/netfoundry/ziti-cmd/ziti-fabric-gw/... - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=arm-linux-gnueabihf-gcc gox -cgo -os="linux" -arch=arm $(BUILDFLAGS_LINUX_ARM) github.com/netfoundry/ziti-cmd/ziti-fabric-gw/... - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ gox -cgo -os="windows" -arch=amd64 $(BUILDFLAGS_WINDOWS_AMD64) github.com/netfoundry/ziti-cmd/ziti-fabric-gw/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=/opt/osxcross/target/bin/o64-clang CXX=/opt/osxcross/target/bin/o64-clang++ gox ${BUILDFLAGS_COMMON} -os="darwin" -arch=amd64 $(BUILDFLAGS_DARWIN_AMD64) github.com/netfoundry/ziti-cmd/ziti-fabric-gw/... + cd release; CGO_ENABLED=$(CGO_ENABLED) gox ${BUILDFLAGS_COMMON} -os="linux" -arch=amd64 $(BUILDFLAGS_LINUX_AMD64) github.com/netfoundry/ziti-cmd/ziti-fabric-gw/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=arm-linux-gnueabihf-gcc gox ${BUILDFLAGS_COMMON} -os="linux" -arch=arm $(BUILDFLAGS_LINUX_ARM) github.com/netfoundry/ziti-cmd/ziti-fabric-gw/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ gox ${BUILDFLAGS_COMMON} -os="windows" -arch=amd64 $(BUILDFLAGS_WINDOWS_AMD64) github.com/netfoundry/ziti-cmd/ziti-fabric-gw/... ziti-fabric-test-common: $(info ============ ziti-fabric-test-common starting ============) - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=/opt/osxcross/target/bin/o64-clang CXX=/opt/osxcross/target/bin/o64-clang++ gox -cgo -os="darwin" -arch=amd64 $(BUILDFLAGS_DARWIN_AMD64) github.com/netfoundry/ziti-cmd/ziti-fabric-test/... - cd release; CGO_ENABLED=$(CGO_ENABLED) gox -cgo -os="linux" -arch=amd64 $(BUILDFLAGS_LINUX_AMD64) github.com/netfoundry/ziti-cmd/ziti-fabric-test/... - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=arm-linux-gnueabihf-gcc gox -cgo -os="linux" -arch=arm $(BUILDFLAGS_LINUX_ARM) github.com/netfoundry/ziti-cmd/ziti-fabric-test/... - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ gox -cgo -os="windows" -arch=amd64 $(BUILDFLAGS_WINDOWS_AMD64) github.com/netfoundry/ziti-cmd/ziti-fabric-test/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=/opt/osxcross/target/bin/o64-clang CXX=/opt/osxcross/target/bin/o64-clang++ gox ${BUILDFLAGS_COMMON} -os="darwin" -arch=amd64 $(BUILDFLAGS_DARWIN_AMD64) github.com/netfoundry/ziti-cmd/ziti-fabric-test/... + cd release; CGO_ENABLED=$(CGO_ENABLED) gox ${BUILDFLAGS_COMMON} -os="linux" -arch=amd64 $(BUILDFLAGS_LINUX_AMD64) github.com/netfoundry/ziti-cmd/ziti-fabric-test/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=arm-linux-gnueabihf-gcc gox ${BUILDFLAGS_COMMON} -os="linux" -arch=arm $(BUILDFLAGS_LINUX_ARM) github.com/netfoundry/ziti-cmd/ziti-fabric-test/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ gox ${BUILDFLAGS_COMMON} -os="windows" -arch=amd64 $(BUILDFLAGS_WINDOWS_AMD64) github.com/netfoundry/ziti-cmd/ziti-fabric-test/... ziti-router-common: $(info ============ ziti-router-common starting ============) - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=/opt/osxcross/target/bin/o64-clang CXX=/opt/osxcross/target/bin/o64-clang++ gox -cgo -os="darwin" -arch=amd64 $(BUILDFLAGS_DARWIN_AMD64) github.com/netfoundry/ziti-cmd/ziti-router/... - cd release; CGO_ENABLED=$(CGO_ENABLED) gox -cgo -os="linux" -arch=amd64 $(BUILDFLAGS_LINUX_AMD64) github.com/netfoundry/ziti-cmd/ziti-router/... - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=arm-linux-gnueabihf-gcc gox -cgo -os="linux" -arch=arm $(BUILDFLAGS_LINUX_ARM) github.com/netfoundry/ziti-cmd/ziti-router/... - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ gox -cgo -os="windows" -arch=amd64 $(BUILDFLAGS_WINDOWS_AMD64) github.com/netfoundry/ziti-cmd/ziti-router/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=/opt/osxcross/target/bin/o64-clang CXX=/opt/osxcross/target/bin/o64-clang++ gox ${BUILDFLAGS_COMMON} -os="darwin" -arch=amd64 $(BUILDFLAGS_DARWIN_AMD64) github.com/netfoundry/ziti-cmd/ziti-router/... + cd release; CGO_ENABLED=$(CGO_ENABLED) gox ${BUILDFLAGS_COMMON} -os="linux" -arch=amd64 $(BUILDFLAGS_LINUX_AMD64) github.com/netfoundry/ziti-cmd/ziti-router/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=arm-linux-gnueabihf-gcc gox ${BUILDFLAGS_COMMON} -os="linux" -arch=arm $(BUILDFLAGS_LINUX_ARM) github.com/netfoundry/ziti-cmd/ziti-router/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ gox ${BUILDFLAGS_COMMON} -os="windows" -arch=amd64 $(BUILDFLAGS_WINDOWS_AMD64) github.com/netfoundry/ziti-cmd/ziti-router/... ziti-tunnel-common: $(info ============ ziti-tunnel-common starting ============) - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=/opt/osxcross/target/bin/o64-clang CXX=/opt/osxcross/target/bin/o64-clang++ gox -cgo -os="darwin" -arch=amd64 $(BUILDFLAGS_DARWIN_AMD64) github.com/netfoundry/ziti-cmd/ziti-tunnel/cmd/ziti-tunnel/... - cd release; CGO_ENABLED=$(CGO_ENABLED) gox -cgo -os="linux" -arch=amd64 $(BUILDFLAGS_LINUX_AMD64) github.com/netfoundry/ziti-cmd/ziti-tunnel/cmd/ziti-tunnel/... - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=arm-linux-gnueabihf-gcc gox -cgo -os="linux" -arch=arm $(BUILDFLAGS_LINUX_ARM) github.com/netfoundry/ziti-cmd/ziti-tunnel/cmd/ziti-tunnel/... - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ gox -cgo -os="windows" -arch=amd64 $(BUILDFLAGS_WINDOWS_AMD64) github.com/netfoundry/ziti-cmd/ziti-tunnel/cmd/ziti-tunnel/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=/opt/osxcross/target/bin/o64-clang CXX=/opt/osxcross/target/bin/o64-clang++ gox ${BUILDFLAGS_COMMON} -os="darwin" -arch=amd64 $(BUILDFLAGS_DARWIN_AMD64) github.com/netfoundry/ziti-cmd/ziti-tunnel/cmd/ziti-tunnel/... + cd release; CGO_ENABLED=$(CGO_ENABLED) gox ${BUILDFLAGS_COMMON} -os="linux" -arch=amd64 $(BUILDFLAGS_LINUX_AMD64) github.com/netfoundry/ziti-cmd/ziti-tunnel/cmd/ziti-tunnel/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=arm-linux-gnueabihf-gcc gox ${BUILDFLAGS_COMMON} -os="linux" -arch=arm $(BUILDFLAGS_LINUX_ARM) github.com/netfoundry/ziti-cmd/ziti-tunnel/cmd/ziti-tunnel/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ gox ${BUILDFLAGS_COMMON} -os="windows" -arch=amd64 $(BUILDFLAGS_WINDOWS_AMD64) github.com/netfoundry/ziti-cmd/ziti-tunnel/cmd/ziti-tunnel/... ziti-cli-common: $(info ============ ziti-cli-common starting ============) - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=/opt/osxcross/target/bin/o64-clang CXX=/opt/osxcross/target/bin/o64-clang++ gox -cgo -os="darwin" -arch=amd64 $(BUILDFLAGS_DARWIN_AMD64) github.com/netfoundry/ziti-cmd/ziti/... - cd release; CGO_ENABLED=$(CGO_ENABLED) gox -cgo -os="linux" -arch=amd64 $(BUILDFLAGS_LINUX_AMD64) github.com/netfoundry/ziti-cmd/ziti/... - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=arm-linux-gnueabihf-gcc gox -cgo -os="linux" -arch=arm $(BUILDFLAGS_LINUX_ARM) github.com/netfoundry/ziti-cmd/ziti/... - cd release; CGO_ENABLED=$(CGO_ENABLED) CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ gox -cgo -os="windows" -arch=amd64 $(BUILDFLAGS_WINDOWS_AMD64) github.com/netfoundry/ziti-cmd/ziti/... + cd release; ls; CGO_ENABLED=$(CGO_ENABLED) CC=/opt/osxcross/target/bin/o64-clang CXX=/opt/osxcross/target/bin/o64-clang++ gox ${BUILDFLAGS_COMMON} -os="darwin" -arch=amd64 $(BUILDFLAGS_DARWIN_AMD64) github.com/netfoundry/ziti-cmd/ziti/... + cd release; CGO_ENABLED=$(CGO_ENABLED) gox ${BUILDFLAGS_COMMON} -os="linux" -arch=amd64 $(BUILDFLAGS_LINUX_AMD64) github.com/netfoundry/ziti-cmd/ziti/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=arm-linux-gnueabihf-gcc gox ${BUILDFLAGS_COMMON} -os="linux" -arch=arm $(BUILDFLAGS_LINUX_ARM) github.com/netfoundry/ziti-cmd/ziti/... + cd release; CGO_ENABLED=$(CGO_ENABLED) CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ gox ${BUILDFLAGS_COMMON} -os="windows" -arch=amd64 $(BUILDFLAGS_WINDOWS_AMD64) github.com/netfoundry/ziti-cmd/ziti/... build-publish: jfrog rt bce ziti $(VERSION) diff --git a/go.mod b/go.mod index a20812382..95a1daa50 100644 --- a/go.mod +++ b/go.mod @@ -16,8 +16,7 @@ require ( github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.0.0-20190813191113-2be43bd0dccc - github.com/mitchellh/gox v1.0.1 // indirect - github.com/netfoundry/ziti-edge v0.0.0-20191203205045-c1d47f2cacf4 + github.com/netfoundry/ziti-edge v0.0.0-20191206152118-c8a0152d0cc7 github.com/netfoundry/ziti-fabric v0.0.0-20191203174113-af4eb6e60864 github.com/netfoundry/ziti-foundation v0.0.0-20191203170231-5c1204e0e65d github.com/pborman/uuid v1.2.0 @@ -27,7 +26,6 @@ require ( github.com/russross/blackfriday v1.5.2 github.com/shirou/gopsutil v2.19.11+incompatible github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect - github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/sirupsen/logrus v1.4.2 github.com/spf13/cobra v0.0.5 github.com/spf13/pflag v1.0.5 diff --git a/go.sum b/go.sum index d17d2546d..1b7ee7fa2 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,16 @@ 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.37.4 h1:glPeL3BQJsbF6aIIYfZizMwc5LTYz250bDMjttbBGAU= cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Jeffail/gabs v1.4.0 h1://5fYRRTq1edjfIrQGvdkcd22pkYUrHZ5YC/H2GJVAo= github.com/Jeffail/gabs v1.4.0/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= +github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= +github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nBpB11F9br+3HUrpgb+fcm5iADzXXYEw= github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= @@ -15,6 +19,7 @@ github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUW github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/achanda/go-sysctl v0.0.0-20160222034550-6be7678c45d2 h1:NYoPVh1XuUB5VBWLXRKoqzQhl4bajIxh+XuURbJ0uwc= github.com/achanda/go-sysctl v0.0.0-20160222034550-6be7678c45d2/go.mod h1:DCNKSpXhum14Y258jSbRmJvcesbzEdBPincz7yJUx3k= +github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75 h1:3ILjVyslFbc4jl1w5TWuvvslFD/nDfR2H8tVaMVLrEY= github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75/go.mod h1:uAXEEpARkRhCZfEvy/y0Jcc888f9tHCc1W7/UeEtreE= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -45,13 +50,18 @@ github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwc 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/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3 h1:tkum0XDgfR0jcVVXuTsYv/erY2NnEDqwRojbxR1rBYA= github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= 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/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo= github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= 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= @@ -60,6 +70,7 @@ 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.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -73,6 +84,7 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= 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-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gobuffalo/envy v1.7.0 h1:GlXgaiBkmrYMHco6t4j7SacKO4XUjvh5pwXh0f4uxXU= @@ -92,6 +104,7 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekf github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/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 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0= @@ -120,12 +133,12 @@ github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoA github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= 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/hashicorp/go-version v1.0.0 h1:21MVWPKDphxa7ineQQTrCU5brh7OuVVAzGOCnnCPtE8= -github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174 h1:WlZsjVhE8Af9IcZDGgJGQpNflI3+MJSBhsgT5PCtzBQ= github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= @@ -135,10 +148,12 @@ github.com/jinzhu/gorm v1.9.11 h1:gaHGvE+UnWGlbWG4Y3FUwY1EcZ5n6S9WtqBA/uySMLE= github.com/jinzhu/gorm v1.9.11/go.mod h1:bu/pK8szGZ2puuErfU0RwyeNdsf3e6nCX/noXaVxkfw= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M= github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a h1:84IpUNXj4mCR9CuCEvSiCArMbzr/TMbuPIadKDwypkI= github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= @@ -157,8 +172,11 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= github.com/konsorten/go-windows-terminal-sequences v1.0.2/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 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +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/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o= @@ -186,8 +204,8 @@ github.com/mattn/go-sqlite3 v1.11.0 h1:LDdKkqtYlom37fkvqs8rMPFKAMe8+SgjbwZ6ex1/A github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA= -github.com/mdlayher/netlink v0.0.0-20191009155606-de872b0d824b h1:W3er9pI7mt2gOqOWzwvx20iJ8Akiqz1mUMTxU6wdvl8= -github.com/mdlayher/netlink v0.0.0-20191009155606-de872b0d824b/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M= +github.com/mdlayher/netlink v1.0.0 h1:vySPY5Oxnn/8lxAPn2cK6kAzcZzYJl3KriSLO46OT18= +github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/michaelquigley/pfxlog v0.0.0-20190813191113-2be43bd0dccc h1:PQrqw9XKYcPRI9rKwoGZucMjWvfZpyfb5j8Lc13j8YY= @@ -197,30 +215,24 @@ github.com/miekg/dns v1.1.22/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKju github.com/miekg/pkcs11 v1.0.3 h1:iMwmD7I5225wv84WxIG/bmxz9AXjWvTWIbM/TYHvWtw= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/gox v1.0.1 h1:x0jD3dcHk9a9xPSDN6YEL4xL6Qz0dvNYm8yZqui5chI= -github.com/mitchellh/gox v1.0.1/go.mod h1:ED6BioOGXMswlXa2zxfh/xdd5QhwYliBFn9V18Ap4z4= -github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/netfoundry/ziti-edge v0.0.0-20191203171740-9debc34cc63a h1:8VN2KhcyN8yjNkvbu0NhiYUdpFn2lyqOTKwx9trnikY= -github.com/netfoundry/ziti-edge v0.0.0-20191203171740-9debc34cc63a/go.mod h1:vmLEvxm8egKrZbuXtUadyH9cgsrWKBPMspi+G/CD9nU= -github.com/netfoundry/ziti-edge v0.0.0-20191203174636-7a58c10c01b1 h1:5qw2xQbfmqPrSZJzRhZf8ot8arMwfbfQs3sV1zC/YA8= -github.com/netfoundry/ziti-edge v0.0.0-20191203174636-7a58c10c01b1/go.mod h1:CxNFWjGAIX4Ii3tSQG5yHsdXVZCxzsNwMUJgHFC8hso= -github.com/netfoundry/ziti-edge v0.0.0-20191203205045-c1d47f2cacf4 h1:uUhIlQ0IS7Nen/GDfyl/YSPpRcTlJCMjEBhBGx5ykZE= -github.com/netfoundry/ziti-edge v0.0.0-20191203205045-c1d47f2cacf4/go.mod h1:CxNFWjGAIX4Ii3tSQG5yHsdXVZCxzsNwMUJgHFC8hso= -github.com/netfoundry/ziti-fabric v0.0.0-20191203170918-f312601f55c9/go.mod h1:ktqE4LYK1Z4MGBpP29ylnUvEsSNwk7jXBfq2K/kq4nw= +github.com/netfoundry/ziti-edge v0.0.0-20191206152118-c8a0152d0cc7 h1:7IoGnJ1v/wYpmJU519CtltHk08qvru5AFMghKEf5s+s= +github.com/netfoundry/ziti-edge v0.0.0-20191206152118-c8a0152d0cc7/go.mod h1:BsXaKKCj1etLy3J6nyRLBnWUIztdZte44PGhkiIjgjE= github.com/netfoundry/ziti-fabric v0.0.0-20191203174113-af4eb6e60864 h1:GGMpVeTIqeN+ZFC2MJX3qQNX+V9Zkda9lquhw1Toh+k= github.com/netfoundry/ziti-fabric v0.0.0-20191203174113-af4eb6e60864/go.mod h1:ktqE4LYK1Z4MGBpP29ylnUvEsSNwk7jXBfq2K/kq4nw= -github.com/netfoundry/ziti-fabric v0.0.0-20191203180852-9bf1d607f873 h1:YGcy+1syeWIUPYSO6GcokYkdtEZJZtgyP44mc6EV4gY= github.com/netfoundry/ziti-foundation v0.0.0-20191203170231-5c1204e0e65d h1:V6VZeV8JVUipJhZgDUNUhaJ2L6bqmosAf+SNUj6C1f0= github.com/netfoundry/ziti-foundation v0.0.0-20191203170231-5c1204e0e65d/go.mod h1:27kvN9RZk7cpt2xba6owuXktNphq5hPK62CAiKnIS10= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/oleiade/reflections v1.0.0 h1:0ir4pc6v8/PJ0yw5AEtMddfXpWBXg9cnG7SgSoJuCgY= github.com/oleiade/reflections v1.0.0/go.mod h1:RbATFBbKYkVdqmSFtx13Bb/tVhR0lgOBXunWTZKeL4w= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6 h1:lNCW6THrCKBiJBpz8kbVGjC7MgdCGKwuvBgc7LoD6sw= @@ -260,14 +272,10 @@ github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -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/shirou/gopsutil v2.19.11+incompatible h1:lJHR0foqAjI4exXqWsU3DbH7bX1xvdhGdnXTIARA9W4= github.com/shirou/gopsutil v2.19.11+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/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/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= @@ -356,6 +364,7 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ 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 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180606202747-9527bec2660b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -399,6 +408,7 @@ golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -418,13 +428,16 @@ gopkg.in/Masterminds/squirrel.v1 v1.0.0-20170825200431-a6b93000bd21 h1:GmGVIcDxd gopkg.in/Masterminds/squirrel.v1 v1.0.0-20170825200431-a6b93000bd21/go.mod h1:8PH4rQjb7OdPC6OWDDuY6J/PT8iSNTiff3jmccc2m10= 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 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= 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/oleiade/reflections.v1 v1.0.0 h1:nV9NFaFd5bXKjilVvPvA+/V/tNQk1pOEEc9gGWDkj+s= gopkg.in/oleiade/reflections.v1 v1.0.0/go.mod h1:SpA8pv+LUnF0FbB2hyRxc8XSng78D6iLBZ11PDb8Z5g= gopkg.in/resty.v1 v1.12.0 h1:CuXP0Pjfw9rOuY6EP+UvtNvt5DSqHpIxILZKT/quCZI= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +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/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=