Skip to content

Commit 35451b4

Browse files
bborehambboreham
authored
Merge pull request #3742 from weaveworks/go-modules
Convert to Go modules
2 parents 1f51495 + f70f248 commit 35451b4

File tree

8,736 files changed

+69070
-2265939
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

8,736 files changed

+69070
-2265939
lines changed

‎Makefile

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SCOPE_BACKEND_BUILD_UPTODATE=.scope_backend_build.uptodate
1313
SCOPE_VERSION=$(shell git rev-parse --short HEAD)
1414
GIT_REVISION=$(shell git rev-parse HEAD)
1515
WEAVENET_VERSION=2.1.3
16-
RUNSVINIT=vendor/runsvinit/runsvinit
16+
RUNSVINIT=vendor/github.com/peterbourgon/runsvinit/runsvinit
1717
CODECGEN_DIR=vendor/github.com/ugorji/go/codec/codecgen
1818
CODECGEN_EXE=$(CODECGEN_DIR)/bin/codecgen_$(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH)
1919
CODECGEN_UID=0
@@ -23,9 +23,8 @@ RM=--rm
2323
RUN_FLAGS=-ti
2424
BUILD_IN_CONTAINER=true
2525
GO_ENV=GOGC=off
26-
GO_BUILD_INSTALL_DEPS=-i
2726
GO_BUILD_TAGS='netgo unsafe'
28-
GO_BUILD_FLAGS=$(GO_BUILD_INSTALL_DEPS) -ldflags "-extldflags \"-static\" -X main.version=$(SCOPE_VERSION) -s -w" -tags $(GO_BUILD_TAGS)
27+
GO_BUILD_FLAGS=-mod vendor -ldflags "-extldflags \"-static\" -X main.version=$(SCOPE_VERSION) -s -w" -tags $(GO_BUILD_TAGS)
2928
GOOS=$(shell go tool dist env | grep GOOS | sed -e 's/GOOS="\(.*\)"/\1/')
3029

3130
ifeq ($(GOOS),linux)
@@ -75,7 +74,7 @@ $(CLOUD_AGENT_EXPORT): docker/Dockerfile.cloud-agent docker/$(SCOPE_EXE) docker/
7574

7675
$(SCOPE_EXPORT): docker/Dockerfile.scope $(CLOUD_AGENT_EXPORT) docker/$(RUNSVINIT) docker/demo.json docker/run-app docker/run-probe docker/entrypoint.sh
7776

78-
$(RUNSVINIT): vendor/runsvinit/*.go
77+
$(RUNSVINIT): vendor/github.com/peterbourgon/runsvinit/*.go
7978

8079
$(SCOPE_EXE): $(shell find ./ -path ./vendor -prune -o -type f -name '*.go') prog/staticui/staticui.go prog/externalui/externalui.go $(CODECGEN_TARGETS)
8180

@@ -95,24 +94,16 @@ $(SCOPE_EXE) $(RUNSVINIT) lint tests shell prog/staticui/staticui.go prog/extern
9594
--net=host \
9695
-e GOARCH -e GOOS -e CIRCLECI -e CIRCLE_BUILD_NUM -e CIRCLE_NODE_TOTAL \
9796
-e CIRCLE_NODE_INDEX -e COVERDIR -e SLOW -e TESTDIRS \
98-
$(SCOPE_BACKEND_BUILD_IMAGE) SCOPE_VERSION=$(SCOPE_VERSION) GO_BUILD_INSTALL_DEPS=$(GO_BUILD_INSTALL_DEPS) CODECGEN_UID=$(CODECGEN_UID) $@
97+
$(SCOPE_BACKEND_BUILD_IMAGE) SCOPE_VERSION=$(SCOPE_VERSION) CODECGEN_UID=$(CODECGEN_UID) $@
9998

10099
else
101100

102101
$(SCOPE_EXE):
103102
time $(GO) build $(GO_BUILD_FLAGS) -o $@ ./$(@D)
104-
@strings $@ | grep cgo_stub\\\.go >/dev/null || { \
105-
rm $@; \
106-
echo "\nYour go standard library was built without the 'netgo' build tag."; \
107-
echo "To fix that, run"; \
108-
echo " sudo go clean -i net"; \
109-
echo " sudo go install -tags netgo std"; \
110-
false; \
111-
}
112103

113104
%.codecgen.go: $(CODECGEN_EXE)
114105
rm -f $@; $(GO_HOST) build $(GO_BUILD_FLAGS) ./$(@D) # workaround for https://github.com/ugorji/go/issues/145
115-
cd $(@D) && $(WITH_GO_HOST_ENV) $(shell pwd)/$(CODECGEN_EXE) -d $(CODECGEN_UID) -rt $(GO_BUILD_TAGS) -u -o $(@F) $(notdir $(call GET_CODECGEN_DEPS,$(@D)))
106+
cd $(@D) && $(WITH_GO_HOST_ENV) GO111MODULE=off $(shell pwd)/$(CODECGEN_EXE) -d $(CODECGEN_UID) -rt $(GO_BUILD_TAGS) -u -o $(@F) $(notdir $(call GET_CODECGEN_DEPS,$(@D)))
116107

117108
$(CODECGEN_EXE): $(CODECGEN_DIR)/*.go
118109
mkdir -p $(@D)

‎go.mod

Lines changed: 187 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,187 @@
1+
module github.com/weaveworks/scope
2+
3+
go 1.13
4+
5+
require (
6+
camlistore.org v0.0.0-20171230002226-a5a65f0d8b22
7+
github.com/Azure/go-autorest v9.8.1+incompatible // indirect
8+
github.com/NYTimes/gziphandler v1.0.2-0.20180227021810-5032c8878b9d
9+
github.com/PuerkitoBio/purell v1.1.1-0.20171117214151-1c4bec281e4b // indirect
10+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
11+
github.com/VividCortex/gohistogram v1.0.0 // indirect
12+
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
13+
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
14+
github.com/apache/thrift v0.0.0-20180717161949-f2867c24984a // indirect
15+
github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878
16+
github.com/armon/go-radix v0.0.0-20160115234725-4239b77079c7
17+
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
18+
github.com/aws/aws-sdk-go v1.0.5
19+
github.com/aws/aws-sdk-go-v2 v2.0.0-preview.4.0.20180612204834-f401f4e72ca1+incompatible // indirect
20+
github.com/blang/semver v3.1.0+incompatible // indirect
21+
github.com/bluele/gcache v0.0.0-20150827032927-fb6c0b0e1ff0
22+
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869
23+
github.com/bradfitz/gomemcache v0.0.0-20160117192205-fb1f79c6b65a
24+
github.com/c9s/goprocinfo v0.0.0-20151025191153-19cb9f127a9c
25+
github.com/cactus/go-statsd-client v3.1.2-0.20180516050940-5e3c483eb932+incompatible // indirect
26+
github.com/certifi/gocertifi v0.0.0-20150906030631-84c0a38a18fc
27+
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
28+
github.com/containernetworking/cni v0.3.1-0.20160725233558-c1ff202179dc // indirect
29+
github.com/coocood/freecache v0.0.0-20150903053832-a27035d5537f
30+
github.com/cpuguy83/go-md2man v1.0.4 // indirect
31+
github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b // indirect
32+
github.com/davecgh/go-spew v1.1.1
33+
github.com/dgrijalva/jwt-go v3.1.0+incompatible // indirect
34+
github.com/dimchansky/utfbom v0.0.0-20170328061312-6c6132ff69f0 // indirect
35+
github.com/docker/docker v1.4.2-0.20180827131323-0c5f8d2b9b23
36+
github.com/docker/engine-api v0.3.2-0.20160615162419-f50fbe5f9c4c // indirect
37+
github.com/docker/libcontainer v2.2.2-0.20150701164209-83a102cc68a0+incompatible // indirect
38+
github.com/docker/spdystream v0.0.0-20170912183627-bc6354cbbc29 // indirect
39+
github.com/dustin/go-humanize v0.0.0-20160923163517-bd88f87ad3a4
40+
github.com/emicklei/go-restful v2.5.0+incompatible // indirect
41+
github.com/emicklei/go-restful-swagger12 v0.0.0-20170926063155-7524189396c6 // indirect
42+
github.com/evanphx/json-patch v0.0.0-20170719203123-944e07253867 // indirect
43+
github.com/fatih/camelcase v1.0.0 // indirect
44+
github.com/fluent/fluent-logger-golang v1.2.1 // indirect
45+
github.com/fsouza/go-dockerclient v1.3.0
46+
github.com/garyburd/redigo v0.0.0-20151018180855-3d0709611e0e // indirect
47+
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680 // indirect
48+
github.com/go-ini/ini v1.8.6-0.20151216053507-467243bad6cb // indirect
49+
github.com/go-kit/kit v0.7.1-0.20180717163541-af7386548c7b // indirect
50+
github.com/go-logfmt/logfmt v0.3.0 // indirect
51+
github.com/go-openapi/jsonpointer v0.0.0-20170102174223-779f45308c19 // indirect
52+
github.com/go-openapi/jsonreference v0.0.0-20161105162150-36d33bfe519e // indirect
53+
github.com/go-openapi/spec v0.0.0-20171219195406-fa03337d7da5 // indirect
54+
github.com/go-openapi/swag v0.0.0-20180102232305-84f4bee7c0a6 // indirect
55+
github.com/go-stack/stack v1.7.0 // indirect
56+
github.com/gogo/protobuf v1.1.1
57+
github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d
58+
github.com/golang/glog v0.0.0-20150731225221-fca8c8854093 // indirect
59+
github.com/golang/groupcache v0.0.0-20171101203131-84a468cf14b4 // indirect
60+
github.com/golang/mock v0.0.0-20160127222235-bd3c8e81be01 // indirect
61+
github.com/golang/protobuf v1.2.0
62+
github.com/golang/snappy v0.0.0-20170215233205-553a64147049 // indirect
63+
github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a // indirect
64+
github.com/google/cadvisor v0.19.2 // indirect
65+
github.com/google/gofuzz v0.0.0-20150903234519-e4af62d086c3 // indirect
66+
github.com/google/gopacket v1.1.17
67+
github.com/googleapis/gax-go v0.0.0-20161107002406-da06d194a00e // indirect
68+
github.com/googleapis/gnostic v0.1.1-0.20180110061420-49e5b5b1abae // indirect
69+
github.com/gophercloud/gophercloud v0.0.0-20180123185012-4a3f5ae58624 // indirect
70+
github.com/gorilla/handlers v0.0.0-20151024084542-9a8d6fa6e647
71+
github.com/gorilla/mux v1.6.2
72+
github.com/gorilla/schema v0.0.0-20171228183507-afe77393c53b // indirect
73+
github.com/gorilla/securecookie v0.0.0-20150820082958-e95799a481bb // indirect
74+
github.com/gorilla/websocket v0.0.0-20160221213430-5c91b59efa23
75+
github.com/gregjones/httpcache v0.0.0-20171119193500-2bcd89a1743f // indirect
76+
github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20180522105215-e9c5d9645c43 // indirect
77+
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
78+
github.com/hashicorp/consul v0.6.4-0.20160227001210-2a4436075dbb
79+
github.com/hashicorp/go-cleanhttp v0.5.0
80+
github.com/hashicorp/go-version v0.0.0-20160214002439-2e7f5ea8e27b // indirect
81+
github.com/hashicorp/serf v0.7.1-0.20160225025727-b00b7b98ce2b // indirect
82+
github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c // indirect
83+
github.com/imdario/mergo v0.3.5 // indirect
84+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
85+
github.com/influxdata/influxdb v1.5.1-0.20180718194353-468497c11f25 // indirect
86+
github.com/iovisor/gobpf v0.0.0-20180826141936-4ece6c56f936 // indirect
87+
github.com/jessevdk/go-flags v1.3.1-0.20170926144705-f88afde2fa19 // indirect
88+
github.com/jmespath/go-jmespath v0.0.0-20151208071831-c01cf91b0118 // indirect
89+
github.com/json-iterator/go v1.1.5 // indirect
90+
github.com/julienschmidt/httprouter v1.2.0 // indirect
91+
github.com/k-sone/critbitgo v1.2.0
92+
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
93+
github.com/kr/pretty v0.0.0-20160823170715-cfb55aafdaf3 // indirect
94+
github.com/kr/pty v0.0.0-20151007230424-f7ee69f31298
95+
github.com/kr/text v0.0.0-20160504234017-7cafcd837844 // indirect
96+
github.com/lsegal/gucumber v0.0.0-20150609075149-e8116c9c66e6 // indirect
97+
github.com/m3db/prometheus_client_golang v0.9.0-pre1.0.20180416233856-82f5ff156b29 // indirect
98+
github.com/mailru/easyjson v0.0.0-20171120080333-32fa128f234d // indirect
99+
github.com/mattn/go-colorable v0.0.7 // indirect
100+
github.com/mattn/go-isatty v0.0.0-20161123143637-30a891c33c7c // indirect
101+
github.com/mattn/go-runewidth v0.0.2-0.20161012013512-737072b4e32b // indirect
102+
github.com/mgutz/ansi v0.0.0-20150914162238-c286dcecd19f
103+
github.com/miekg/dns v0.0.0-20160129163459-3d66e3747d22
104+
github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747 // indirect
105+
github.com/mjibson/appstats v0.0.0-20151004071057-0542d5f0e87e // indirect
106+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
107+
github.com/modern-go/reflect2 v1.0.1 // indirect
108+
github.com/mwitkow/go-grpc-middleware v1.0.1-0.20180522105215-e9c5d9645c43 // indirect
109+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
110+
github.com/nats-io/gnatsd v0.8.1-0.20160607194326-f2c17eb159e1 // indirect
111+
github.com/nats-io/nats v1.2.1-0.20160607194537-ce9cdc9addff
112+
github.com/nats-io/nuid v0.0.0-20160402145409-a5152d67cf63 // indirect
113+
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
114+
github.com/olekukonko/tablewriter v0.0.0-20160923125401-bdcc175572fd // indirect
115+
github.com/opencontainers/runc v1.0.0-rc5 // indirect
116+
github.com/openebs/k8s-snapshot-client v0.0.0-20180831100134-a6506305fb16
117+
github.com/opentracing-contrib/go-stdlib v0.0.0-20180702182724-07a764486eb1 // indirect
118+
github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947
119+
github.com/paypal/ionet v0.0.0-20130919195445-ed0aaebc5417
120+
github.com/pborman/uuid v0.0.0-20150824212802-cccd189d45f7
121+
github.com/performancecopilot/speed v3.0.1-0.20180614024626-d49dd9b77adc+incompatible // indirect
122+
github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c // indirect
123+
github.com/peterbourgon/diskv v2.0.2-0.20171120014656-2973218375c3+incompatible // indirect
124+
github.com/peterbourgon/runsvinit v2.0.0+incompatible
125+
github.com/philhofer/fwd v0.0.0-20160129035939-98c11a7a6ec8 // indirect
126+
github.com/pkg/errors v0.8.1
127+
github.com/prometheus/client_golang v0.9.2
128+
github.com/richo/GOSHOUT v0.0.0-20190205170632-a1a6db7f26e9
129+
github.com/russross/blackfriday v0.0.0-20151020174500-a18a46c9b943 // indirect
130+
github.com/sercand/kuberesolver v2.1.0+incompatible // indirect
131+
github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 // indirect
132+
github.com/shurcooL/sanitized_anchor_name v0.0.0-20150822220530-244f5ac324cb // indirect
133+
github.com/sirupsen/logrus v1.0.6
134+
github.com/spaolacci/murmur3 v0.0.0-20150829172844-0d12bf811670
135+
github.com/spf13/cobra v0.0.0-20151013225139-8b2293c74173 // indirect
136+
github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95 // indirect
137+
github.com/stretchr/objx v0.1.2-0.20180702103455-b8b73a35e983 // indirect
138+
github.com/stretchr/testify v1.3.0
139+
github.com/syndtr/goleveldb v0.0.0-20171214120811-34011bf325bc // indirect
140+
github.com/tinylib/msgp v0.0.0-20160803062324-ad0ff2e232ad // indirect
141+
github.com/tylerb/graceful v1.2.13
142+
github.com/typetypetype/conntrack v1.0.1-0.20181112022515-9d9dd841d4eb
143+
github.com/uber-go/tally v3.3.8-0.20180718230131-d0a004a77fc9+incompatible // indirect
144+
github.com/uber/jaeger-client-go v2.14.1-0.20180713190620-252d853b2a4f+incompatible // indirect
145+
github.com/uber/jaeger-lib v1.5.1-0.20180615202729-a51202d6f4a7 // indirect
146+
github.com/ugorji/go v0.0.0-20170918222552-54210f4e076c
147+
github.com/urfave/negroni v0.2.1-0.20160830030302-5d815f907a18 // indirect
148+
github.com/vishvananda/netlink v1.0.1-0.20190913165827-36d367fd76f9
149+
github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc
150+
github.com/weaveworks/billing-client v0.0.0-20180419131543-b2b68b13b5af
151+
github.com/weaveworks/common v0.0.0-20180824161429-d442d08d89b5
152+
github.com/weaveworks/go-checkpoint v0.0.0-20160428112813-62324982ab51
153+
github.com/weaveworks/go-odp v0.0.0-20151030115644-f8c8c40c1889 // indirect
154+
github.com/weaveworks/promrus v1.2.0 // indirect
155+
github.com/weaveworks/ps v0.0.0-20160725183535-70d17b2d6f76
156+
github.com/weaveworks/tcptracer-bpf v0.0.0-20200114145059-84a08fc667c0
157+
github.com/weaveworks/weave v2.3.1-0.20180427133448-4da998ab4507+incompatible
158+
github.com/willdonnelly/passwd v0.0.0-20141013001024-7935dab3074c
159+
go.uber.org/atomic v1.3.2 // indirect
160+
go.uber.org/multierr v1.1.1-0.20180122172545-ddea229ff1df // indirect
161+
go.uber.org/zap v1.9.1-0.20180719221902-55d3c264ce04 // indirect
162+
go4.org v0.0.0-20170117104548-7ce08ca145db // indirect
163+
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3
164+
golang.org/x/oauth2 v0.0.0-20170214231824-b9780ec78894 // indirect
165+
golang.org/x/sys v0.0.0-20190913121621-c3b328c6e5a7
166+
golang.org/x/text v0.3.1-0.20171227012246-e19ae1496984 // indirect
167+
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2
168+
golang.org/x/tools v0.0.0-20161205224439-ae1141fc8b3e
169+
google.golang.org/api v0.0.0-20170223235537-64485db7e8c8 // indirect
170+
google.golang.org/appengine v1.0.1-0.20171212223047-5bee14b453b4 // indirect
171+
google.golang.org/genproto v0.0.0-20180722052100-02b4e9547331 // indirect
172+
google.golang.org/grpc v1.2.1-0.20170607221526-06c984861f30
173+
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
174+
gopkg.in/check.v1 v1.0.0-20160105164936-4f90aeace3a2 // indirect
175+
gopkg.in/inf.v0 v0.9.0 // indirect
176+
gopkg.in/tylerb/graceful.v1 v1.2.13 // indirect
177+
gopkg.in/validator.v2 v2.0.0-20180514200540-135c24b11c19 // indirect
178+
gopkg.in/vmihailenco/msgpack.v2 v2.9.1 // indirect
179+
k8s.io/api v0.0.0-20181204000039-89a74a8d264d
180+
k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93
181+
k8s.io/cli-runtime v0.0.0-20181204004549-a04da5c88c07 // indirect
182+
k8s.io/client-go v10.0.0+incompatible
183+
k8s.io/klog v0.1.0 // indirect
184+
k8s.io/kube-openapi v0.0.0-20180108222231-a07b7bbb58e7 // indirect
185+
k8s.io/kubernetes v1.13.0
186+
sigs.k8s.io/yaml v1.1.0 // indirect
187+
)

0 commit comments

Comments
 (0)