diff --git a/.bingo/README.md b/.bingo/README.md index 70f9286037..7a5c2d4f6d 100755 --- a/.bingo/README.md +++ b/.bingo/README.md @@ -5,7 +5,8 @@ This is directory which stores Go modules with pinned buildable package that is * Run `bingo get` to install all tools having each own module file in this directory. * Run `bingo get ` to install that have own module file in this directory. * For Makefile: Make sure to put `include .bingo/Variables.mk` in your Makefile, then use $() variable where is the .bingo/.mod. -* For shell: Run `source .bingo/variables.env` to source all environment variable for each tool +* For shell: Run `source .bingo/variables.env` to source all environment variable for each tool. +* For go: Import `.bingo/variables.go` to for variable names. * See https://github.com/bwplotka/bingo or -h on how to add, remove or change binaries dependencies. ## Requirements diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk index 6211cb4877..677274d1ca 100644 --- a/.bingo/Variables.mk +++ b/.bingo/Variables.mk @@ -1,5 +1,6 @@ -# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.2.2. DO NOT EDIT. +# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.3.0. DO NOT EDIT. # All tools are designed to be build inside $GOBIN. +BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST))) GOPATH ?= $(shell go env GOPATH) GOBIN ?= $(firstword $(subst :, ,${GOPATH}))/bin GO ?= $(shell which go) @@ -17,112 +18,112 @@ GO ?= $(shell which go) # @$(ALERTMANAGER) # ALERTMANAGER := $(GOBIN)/alertmanager-v0.20.0 -$(ALERTMANAGER): .bingo/alertmanager.mod +$(ALERTMANAGER): $(BINGO_DIR)/alertmanager.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/alertmanager-v0.20.0" - @cd .bingo && $(GO) build -modfile=alertmanager.mod -o=$(GOBIN)/alertmanager-v0.20.0 "github.com/prometheus/alertmanager/cmd/alertmanager" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=alertmanager.mod -o=$(GOBIN)/alertmanager-v0.20.0 "github.com/prometheus/alertmanager/cmd/alertmanager" -BINGO := $(GOBIN)/bingo-v0.2.2 -$(BINGO): .bingo/bingo.mod +BINGO := $(GOBIN)/bingo-v0.3.0 +$(BINGO): $(BINGO_DIR)/bingo.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. - @echo "(re)installing $(GOBIN)/bingo-v0.2.2" - @cd .bingo && $(GO) build -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.2.2 "github.com/bwplotka/bingo" + @echo "(re)installing $(GOBIN)/bingo-v0.3.0" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.3.0 "github.com/bwplotka/bingo" EMBEDMD := $(GOBIN)/embedmd-v0.0.0-20181127031020-97c13d6e4160 -$(EMBEDMD): .bingo/embedmd.mod +$(EMBEDMD): $(BINGO_DIR)/embedmd.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/embedmd-v0.0.0-20181127031020-97c13d6e4160" - @cd .bingo && $(GO) build -modfile=embedmd.mod -o=$(GOBIN)/embedmd-v0.0.0-20181127031020-97c13d6e4160 "github.com/campoy/embedmd" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=embedmd.mod -o=$(GOBIN)/embedmd-v0.0.0-20181127031020-97c13d6e4160 "github.com/campoy/embedmd" FAILLINT := $(GOBIN)/faillint-v1.5.0 -$(FAILLINT): .bingo/faillint.mod +$(FAILLINT): $(BINGO_DIR)/faillint.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/faillint-v1.5.0" - @cd .bingo && $(GO) build -modfile=faillint.mod -o=$(GOBIN)/faillint-v1.5.0 "github.com/fatih/faillint" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=faillint.mod -o=$(GOBIN)/faillint-v1.5.0 "github.com/fatih/faillint" GO_BINDATA := $(GOBIN)/go-bindata-v3.1.1+incompatible -$(GO_BINDATA): .bingo/go-bindata.mod +$(GO_BINDATA): $(BINGO_DIR)/go-bindata.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/go-bindata-v3.1.1+incompatible" - @cd .bingo && $(GO) build -modfile=go-bindata.mod -o=$(GOBIN)/go-bindata-v3.1.1+incompatible "github.com/go-bindata/go-bindata/go-bindata" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=go-bindata.mod -o=$(GOBIN)/go-bindata-v3.1.1+incompatible "github.com/go-bindata/go-bindata/go-bindata" GOIMPORTS := $(GOBIN)/goimports-v0.0.0-20200526224456-8b020aee10d2 -$(GOIMPORTS): .bingo/goimports.mod +$(GOIMPORTS): $(BINGO_DIR)/goimports.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/goimports-v0.0.0-20200526224456-8b020aee10d2" - @cd .bingo && $(GO) build -modfile=goimports.mod -o=$(GOBIN)/goimports-v0.0.0-20200526224456-8b020aee10d2 "golang.org/x/tools/cmd/goimports" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=goimports.mod -o=$(GOBIN)/goimports-v0.0.0-20200526224456-8b020aee10d2 "golang.org/x/tools/cmd/goimports" GOJSONTOYAML := $(GOBIN)/gojsontoyaml-v0.0.0-20191212081931-bf2969bbd742 -$(GOJSONTOYAML): .bingo/gojsontoyaml.mod +$(GOJSONTOYAML): $(BINGO_DIR)/gojsontoyaml.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/gojsontoyaml-v0.0.0-20191212081931-bf2969bbd742" - @cd .bingo && $(GO) build -modfile=gojsontoyaml.mod -o=$(GOBIN)/gojsontoyaml-v0.0.0-20191212081931-bf2969bbd742 "github.com/brancz/gojsontoyaml" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=gojsontoyaml.mod -o=$(GOBIN)/gojsontoyaml-v0.0.0-20191212081931-bf2969bbd742 "github.com/brancz/gojsontoyaml" GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.29.0 -$(GOLANGCI_LINT): .bingo/golangci-lint.mod +$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/golangci-lint-v1.29.0" - @cd .bingo && $(GO) build -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.29.0 "github.com/golangci/golangci-lint/cmd/golangci-lint" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.29.0 "github.com/golangci/golangci-lint/cmd/golangci-lint" HUGO := $(GOBIN)/hugo-v0.80.0 -$(HUGO): .bingo/hugo.mod +$(HUGO): $(BINGO_DIR)/hugo.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/hugo-v0.80.0" - @cd .bingo && $(GO) build -modfile=hugo.mod -o=$(GOBIN)/hugo-v0.80.0 "github.com/gohugoio/hugo" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=hugo.mod -o=$(GOBIN)/hugo-v0.80.0 "github.com/gohugoio/hugo" JB := $(GOBIN)/jb-v0.4.0 -$(JB): .bingo/jb.mod +$(JB): $(BINGO_DIR)/jb.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/jb-v0.4.0" - @cd .bingo && $(GO) build -modfile=jb.mod -o=$(GOBIN)/jb-v0.4.0 "github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=jb.mod -o=$(GOBIN)/jb-v0.4.0 "github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb" JSONNET := $(GOBIN)/jsonnet-v0.16.0 -$(JSONNET): .bingo/jsonnet.mod +$(JSONNET): $(BINGO_DIR)/jsonnet.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/jsonnet-v0.16.0" - @cd .bingo && $(GO) build -modfile=jsonnet.mod -o=$(GOBIN)/jsonnet-v0.16.0 "github.com/google/go-jsonnet/cmd/jsonnet" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=jsonnet.mod -o=$(GOBIN)/jsonnet-v0.16.0 "github.com/google/go-jsonnet/cmd/jsonnet" JSONNETFMT := $(GOBIN)/jsonnetfmt-v0.16.0 -$(JSONNETFMT): .bingo/jsonnetfmt.mod +$(JSONNETFMT): $(BINGO_DIR)/jsonnetfmt.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/jsonnetfmt-v0.16.0" - @cd .bingo && $(GO) build -modfile=jsonnetfmt.mod -o=$(GOBIN)/jsonnetfmt-v0.16.0 "github.com/google/go-jsonnet/cmd/jsonnetfmt" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=jsonnetfmt.mod -o=$(GOBIN)/jsonnetfmt-v0.16.0 "github.com/google/go-jsonnet/cmd/jsonnetfmt" MINIO := $(GOBIN)/minio-v0.0.0-20200527010300-cccf2de129da -$(MINIO): .bingo/minio.mod +$(MINIO): $(BINGO_DIR)/minio.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/minio-v0.0.0-20200527010300-cccf2de129da" - @cd .bingo && $(GO) build -modfile=minio.mod -o=$(GOBIN)/minio-v0.0.0-20200527010300-cccf2de129da "github.com/minio/minio" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=minio.mod -o=$(GOBIN)/minio-v0.0.0-20200527010300-cccf2de129da "github.com/minio/minio" PROMETHEUS_ARRAY := $(GOBIN)/prometheus-v2.4.3+incompatible $(GOBIN)/prometheus-v1.8.2-0.20200724121523-657ba532e42f -$(PROMETHEUS_ARRAY): .bingo/prometheus.mod .bingo/prometheus.1.mod +$(PROMETHEUS_ARRAY): $(BINGO_DIR)/prometheus.mod $(BINGO_DIR)/prometheus.1.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/prometheus-v2.4.3+incompatible" - @cd .bingo && $(GO) build -modfile=prometheus.mod -o=$(GOBIN)/prometheus-v2.4.3+incompatible "github.com/prometheus/prometheus/cmd/prometheus" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=prometheus.mod -o=$(GOBIN)/prometheus-v2.4.3+incompatible "github.com/prometheus/prometheus/cmd/prometheus" @echo "(re)installing $(GOBIN)/prometheus-v1.8.2-0.20200724121523-657ba532e42f" - @cd .bingo && $(GO) build -modfile=prometheus.1.mod -o=$(GOBIN)/prometheus-v1.8.2-0.20200724121523-657ba532e42f "github.com/prometheus/prometheus/cmd/prometheus" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=prometheus.1.mod -o=$(GOBIN)/prometheus-v1.8.2-0.20200724121523-657ba532e42f "github.com/prometheus/prometheus/cmd/prometheus" PROMTOOL := $(GOBIN)/promtool-v1.8.2-0.20200522113006-f4dd45609a05 -$(PROMTOOL): .bingo/promtool.mod +$(PROMTOOL): $(BINGO_DIR)/promtool.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/promtool-v1.8.2-0.20200522113006-f4dd45609a05" - @cd .bingo && $(GO) build -modfile=promtool.mod -o=$(GOBIN)/promtool-v1.8.2-0.20200522113006-f4dd45609a05 "github.com/prometheus/prometheus/cmd/promtool" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=promtool.mod -o=$(GOBIN)/promtool-v1.8.2-0.20200522113006-f4dd45609a05 "github.com/prometheus/prometheus/cmd/promtool" PROMU := $(GOBIN)/promu-v0.5.0 -$(PROMU): .bingo/promu.mod +$(PROMU): $(BINGO_DIR)/promu.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/promu-v0.5.0" - @cd .bingo && $(GO) build -modfile=promu.mod -o=$(GOBIN)/promu-v0.5.0 "github.com/prometheus/promu" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=promu.mod -o=$(GOBIN)/promu-v0.5.0 "github.com/prometheus/promu" PROTOC_GEN_GOGOFAST := $(GOBIN)/protoc-gen-gogofast-v1.3.1 -$(PROTOC_GEN_GOGOFAST): .bingo/protoc-gen-gogofast.mod +$(PROTOC_GEN_GOGOFAST): $(BINGO_DIR)/protoc-gen-gogofast.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/protoc-gen-gogofast-v1.3.1" - @cd .bingo && $(GO) build -modfile=protoc-gen-gogofast.mod -o=$(GOBIN)/protoc-gen-gogofast-v1.3.1 "github.com/gogo/protobuf/protoc-gen-gogofast" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-gogofast.mod -o=$(GOBIN)/protoc-gen-gogofast-v1.3.1 "github.com/gogo/protobuf/protoc-gen-gogofast" SHFMT := $(GOBIN)/shfmt-v3.1.2 -$(SHFMT): .bingo/shfmt.mod +$(SHFMT): $(BINGO_DIR)/shfmt.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. @echo "(re)installing $(GOBIN)/shfmt-v3.1.2" - @cd .bingo && $(GO) build -modfile=shfmt.mod -o=$(GOBIN)/shfmt-v3.1.2 "mvdan.cc/sh/v3/cmd/shfmt" + @cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=shfmt.mod -o=$(GOBIN)/shfmt-v3.1.2 "mvdan.cc/sh/v3/cmd/shfmt" diff --git a/.bingo/bingo.mod b/.bingo/bingo.mod index 3489e772b8..7007d9020f 100644 --- a/.bingo/bingo.mod +++ b/.bingo/bingo.mod @@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT go 1.14 -require github.com/bwplotka/bingo v0.2.2 +require github.com/bwplotka/bingo v0.3.0 diff --git a/.bingo/golangci-lint.mod b/.bingo/golangci-lint.mod index 5343814ef0..0403520906 100644 --- a/.bingo/golangci-lint.mod +++ b/.bingo/golangci-lint.mod @@ -2,37 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT go 1.14 -require ( - github.com/Djarvur/go-err113 v0.1.0 // indirect - github.com/coreos/go-etcd v2.0.0+incompatible // indirect - github.com/cpuguy83/go-md2man v1.0.10 // indirect - github.com/gogo/protobuf v1.3.1 // indirect - github.com/golangci/golangci-lint v1.29.0 // cmd/golangci-lint - github.com/golangci/misspell v0.3.5 // indirect - github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039 // indirect - github.com/google/go-cmp v0.5.1 // indirect - github.com/gostaticanalysis/analysisutil v0.1.0 // indirect - github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect - github.com/klauspost/cpuid v1.2.0 // indirect - github.com/mitchellh/mapstructure v1.3.3 // indirect - github.com/pelletier/go-toml v1.8.0 // indirect - github.com/quasilyte/go-ruleguard v0.1.3 // indirect - github.com/quasilyte/regex/syntax v0.0.0-20200419152657-af9db7f4a3ab // indirect - github.com/securego/gosec/v2 v2.4.0 // indirect - github.com/spf13/afero v1.3.2 // indirect - github.com/spf13/cast v1.3.1 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/stretchr/objx v0.3.0 // indirect - github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b // indirect - github.com/tetafro/godot v0.4.8 // indirect - github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94 // indirect - github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 // indirect - golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1 // indirect - golang.org/x/text v0.3.3 // indirect - golang.org/x/tools v0.0.0-20200731060945-b5fad4ed8dd6 // indirect - gopkg.in/ini.v1 v1.57.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect - honnef.co/go/tools v0.0.1-2020.1.5 // indirect - mvdan.cc/unparam v0.0.0-20200501210554-b37ab49443f7 // indirect - sourcegraph.com/sqs/pbtypes v1.0.0 // indirect -) +require github.com/golangci/golangci-lint v1.29.0 // cmd/golangci-lint diff --git a/.bingo/hugo.mod b/.bingo/hugo.mod index ef71026edc..f43cb7bd5e 100644 --- a/.bingo/hugo.mod +++ b/.bingo/hugo.mod @@ -2,30 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT go 1.14 -require ( - contrib.go.opencensus.io/exporter/ocagent v0.4.12 // indirect - github.com/Azure/azure-amqp-common-go v1.1.4 // indirect - github.com/Azure/go-autorest v11.1.2+incompatible // indirect - github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 // indirect - github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect - github.com/coreos/go-etcd v2.0.0+incompatible // indirect - github.com/cpuguy83/go-md2man v1.0.10 // indirect - github.com/gobuffalo/envy v1.9.0 // indirect - // v0.74.3 This needs to match with version in netlify.toml - github.com/gohugoio/hugo v0.80.0 - github.com/golang/snappy v0.0.1 // indirect - github.com/kyokomi/emoji v2.2.1+incompatible // indirect - github.com/nicksnyder/go-i18n v1.10.0 // indirect - github.com/opentracing/opentracing-go v1.0.2 // indirect - github.com/tidwall/pretty v0.0.0-20190325153808-1166b9ac2b65 // indirect - github.com/uber-go/atomic v1.3.2 // indirect - github.com/uber/jaeger-client-go v2.15.0+incompatible // indirect - github.com/uber/jaeger-lib v1.5.0 // indirect - github.com/ugorji/go v1.1.4 // indirect - github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 // indirect - github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect - github.com/xdg/stringprep v1.0.0 // indirect - github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 // indirect - go.mongodb.org/mongo-driver v1.0.1 // indirect - pack.ag/amqp v0.11.0 // indirect -) +require github.com/gohugoio/hugo v0.80.0 diff --git a/.bingo/prometheus.1.mod b/.bingo/prometheus.1.mod index ce88bcc6dd..e4d8c4fb1d 100644 --- a/.bingo/prometheus.1.mod +++ b/.bingo/prometheus.1.mod @@ -2,8 +2,6 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT go 1.14 -require github.com/prometheus/prometheus v1.8.2-0.20200724121523-657ba532e42f // cmd/prometheus - replace ( // Mitigation for: https://github.com/Azure/go-autorest/issues/414 github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.3.0+incompatible @@ -13,3 +11,5 @@ replace ( k8s.io/klog => github.com/simonpasquier/klog-gokit v0.1.0 k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 ) + +require github.com/prometheus/prometheus v1.8.2-0.20200724121523-657ba532e42f // cmd/prometheus diff --git a/.bingo/prometheus.mod b/.bingo/prometheus.mod index 66a95eaccd..d5b879cd1d 100644 --- a/.bingo/prometheus.mod +++ b/.bingo/prometheus.mod @@ -19,52 +19,4 @@ replace ( k8s.io/klog => github.com/simonpasquier/klog-gokit v0.1.0 ) -require ( - github.com/Azure/azure-sdk-for-go v0.0.0-00010101000000-000000000000 // indirect - github.com/Azure/go-autorest v0.0.0-00010101000000-000000000000 // indirect - github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect - github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect - github.com/aws/aws-sdk-go v1.31.5 // indirect - github.com/beorn7/perks v1.0.1 // indirect - github.com/certifi/gocertifi v0.0.0-20200211180108-c7c1fbc02894 // indirect - github.com/cespare/xxhash v1.1.0 // indirect - github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292 // indirect - github.com/cockroachdb/cockroach v20.1.1+incompatible // indirect - github.com/cockroachdb/errors v1.2.4 // indirect - github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect - github.com/cockroachdb/ttycolor v0.0.0-20180709150743-a1d5aaeb377d // indirect - github.com/getsentry/raven-go v0.2.0 // indirect - github.com/go-kit/kit v0.10.0 // indirect - github.com/googleapis/gnostic v0.0.0-00010101000000-000000000000 // indirect - github.com/gophercloud/gophercloud v0.11.0 // indirect - github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect - github.com/grpc-ecosystem/grpc-gateway v1.14.6 // indirect - github.com/hashicorp/consul/api v1.4.0 // indirect - github.com/jaegertracing/jaeger v1.18.0 // indirect - github.com/jpillora/backoff v1.0.0 // indirect - github.com/julienschmidt/httprouter v1.3.0 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect - github.com/miekg/dns v1.1.29 // indirect - github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect - github.com/oklog/ulid v1.3.1 // indirect - github.com/peterbourgon/diskv v2.0.1+incompatible // indirect - github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect - github.com/prometheus/client_golang v1.6.0 // indirect - github.com/prometheus/common v0.10.0 // indirect - github.com/prometheus/prometheus v2.4.3+incompatible // cmd/prometheus - github.com/prometheus/tsdb v0.10.0 // indirect - github.com/sasha-s/go-deadlock v0.2.0 // indirect - github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect - github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd // indirect - golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2 // indirect - golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect - google.golang.org/api v0.25.0 // indirect - google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece // indirect - gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect - gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect - gopkg.in/yaml.v2 v2.3.0 // indirect - k8s.io/api v0.18.3 // indirect - k8s.io/apimachinery v0.18.3 // indirect - k8s.io/client-go v11.0.0+incompatible // indirect - k8s.io/utils v0.0.0-20200520001619-278ece378a50 // indirect -) +require github.com/prometheus/prometheus v2.4.3+incompatible // cmd/prometheus diff --git a/.bingo/promtool.mod b/.bingo/promtool.mod index 6529b2b502..b702165024 100644 --- a/.bingo/promtool.mod +++ b/.bingo/promtool.mod @@ -2,33 +2,6 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT go 1.14 -require ( - contrib.go.opencensus.io/exporter/ocagent v0.6.0 // indirect - github.com/Azure/go-autorest v11.2.8+incompatible // indirect - github.com/Azure/go-autorest/autorest v0.10.2 // indirect - github.com/Azure/go-autorest/autorest/adal v0.8.3 // indirect - github.com/Azure/go-autorest/autorest/to v0.3.0 // indirect - github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect - github.com/aws/aws-sdk-go v1.31.5 // indirect - github.com/go-kit/kit v0.10.0 // indirect - github.com/google/pprof v0.0.0-20200507031123-427632fa3b1c // indirect - github.com/gophercloud/gophercloud v0.11.0 // indirect - github.com/hashicorp/consul/api v1.4.0 // indirect - github.com/jpillora/backoff v1.0.0 // indirect - github.com/miekg/dns v1.1.29 // indirect - github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect - github.com/prometheus/client_golang v1.6.0 // indirect - github.com/prometheus/common v0.10.0 // indirect - github.com/prometheus/prometheus v1.8.2-0.20200522113006-f4dd45609a05 // cmd/promtool - github.com/prometheus/tsdb v0.10.0 // indirect - google.golang.org/api v0.25.0 // indirect - gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect - gopkg.in/yaml.v2 v2.3.0 // indirect - k8s.io/api v0.18.3 // indirect - k8s.io/client-go v11.0.0+incompatible // indirect - k8s.io/utils v0.0.0-20200520001619-278ece378a50 // indirect -) - replace ( // Mitigation for: https://github.com/Azure/go-autorest/issues/414 github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.3.0+incompatible @@ -38,3 +11,5 @@ replace ( k8s.io/klog => k8s.io/klog v0.3.1 k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 ) + +require github.com/prometheus/prometheus v1.8.2-0.20200522113006-f4dd45609a05 // cmd/promtool diff --git a/.bingo/variables.env b/.bingo/variables.env index d96e2cf88c..4a4be1288f 100644 --- a/.bingo/variables.env +++ b/.bingo/variables.env @@ -1,46 +1,46 @@ -# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.2.2. DO NOT EDIT. +# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.3.0. DO NOT EDIT. # All tools are designed to be build inside $GOBIN. # Those variables will work only until 'bingo get' was invoked, or if tools were installed via Makefile's Variables.mk. -local gobin=$(go env GOBIN) +GOBIN=${GOBIN:=$(go env GOBIN)} -if [ -z "$gobin" ]; then - gobin="$(go env GOPATH)/bin" +if [ -z "$GOBIN" ]; then + GOBIN="$(go env GOPATH)/bin" fi -ALERTMANAGER="${gobin}/alertmanager-v0.20.0" +ALERTMANAGER="${GOBIN}/alertmanager-v0.20.0" -BINGO="${gobin}/bingo-v0.2.2" +BINGO="${GOBIN}/bingo-v0.3.0" -EMBEDMD="${gobin}/embedmd-v0.0.0-20181127031020-97c13d6e4160" +EMBEDMD="${GOBIN}/embedmd-v0.0.0-20181127031020-97c13d6e4160" -FAILLINT="${gobin}/faillint-v1.5.0" +FAILLINT="${GOBIN}/faillint-v1.5.0" -GO_BINDATA="${gobin}/go-bindata-v3.1.1+incompatible" +GO_BINDATA="${GOBIN}/go-bindata-v3.1.1+incompatible" -GOIMPORTS="${gobin}/goimports-v0.0.0-20200526224456-8b020aee10d2" +GOIMPORTS="${GOBIN}/goimports-v0.0.0-20200526224456-8b020aee10d2" -GOJSONTOYAML="${gobin}/gojsontoyaml-v0.0.0-20191212081931-bf2969bbd742" +GOJSONTOYAML="${GOBIN}/gojsontoyaml-v0.0.0-20191212081931-bf2969bbd742" -GOLANGCI_LINT="${gobin}/golangci-lint-v1.29.0" +GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.29.0" -HUGO="${gobin}/hugo-v0.80.0" +HUGO="${GOBIN}/hugo-v0.80.0" -JB="${gobin}/jb-v0.4.0" +JB="${GOBIN}/jb-v0.4.0" -JSONNET="${gobin}/jsonnet-v0.16.0" +JSONNET="${GOBIN}/jsonnet-v0.16.0" -JSONNETFMT="${gobin}/jsonnetfmt-v0.16.0" +JSONNETFMT="${GOBIN}/jsonnetfmt-v0.16.0" -MINIO="${gobin}/minio-v0.0.0-20200527010300-cccf2de129da" +MINIO="${GOBIN}/minio-v0.0.0-20200527010300-cccf2de129da" -PROMETHEUS_ARRAY="${gobin}/prometheus-v2.4.3+incompatible${gobin}/prometheus-v1.8.2-0.20200724121523-657ba532e42f" +PROMETHEUS_ARRAY="${GOBIN}/prometheus-v2.4.3+incompatible ${GOBIN}/prometheus-v1.8.2-0.20200724121523-657ba532e42f" -PROMTOOL="${gobin}/promtool-v1.8.2-0.20200522113006-f4dd45609a05" +PROMTOOL="${GOBIN}/promtool-v1.8.2-0.20200522113006-f4dd45609a05" -PROMU="${gobin}/promu-v0.5.0" +PROMU="${GOBIN}/promu-v0.5.0" -PROTOC_GEN_GOGOFAST="${gobin}/protoc-gen-gogofast-v1.3.1" +PROTOC_GEN_GOGOFAST="${GOBIN}/protoc-gen-gogofast-v1.3.1" -SHFMT="${gobin}/shfmt-v3.1.2" +SHFMT="${GOBIN}/shfmt-v3.1.2"