all: splitting up sub-modules (#2189)

BREAKING_CHANGE_OK Bump go.mod requires to future 0.15 version Updates #886
google · May 30, 2019 · bea4ab0 · bea4ab0
1 parent 39aafdc
commit bea4ab0
Show file tree

Hide file tree

Showing 20 changed files with 1,525 additions and 174 deletions.
diff --git a/allmodules b/allmodules
@@ -12,4 +12,9 @@
 internal/cmd/gocdk
 internal/contributebot
 internal/website
+pubsub/kafkapubsub
+pubsub/natspubsub
+pubsub/rabbitpubsub
+runtimevar/etcdvar
 samples
+secrets/vault
diff --git a/go.mod b/go.mod
@@ -27,66 +27,37 @@ require (
 	github.com/Azure/go-autorest v11.1.2+incompatible
 	github.com/Azure/go-autorest/tracing v0.1.0 // indirect
 	github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190418212003-6ac0b49e7197
-	github.com/Shopify/sarama v1.19.0
-	github.com/Shopify/toxiproxy v2.1.4+incompatible // indirect
 	github.com/aws/aws-sdk-go v1.19.16
-	github.com/coreos/bbolt v1.3.2 // indirect
-	github.com/coreos/etcd v3.3.13+incompatible // indirect
-	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // indirect
-	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/dimchansky/utfbom v1.1.0 // indirect
-	github.com/eapache/go-resiliency v1.1.0 // indirect
-	github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
-	github.com/eapache/queue v1.1.0 // indirect
 	github.com/fsnotify/fsnotify v1.4.7
 	github.com/go-sql-driver/mysql v1.4.1
-	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
+	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/golang/protobuf v1.3.1
+	github.com/golang/snappy v0.0.1 // indirect
 	github.com/google/go-cmp v0.3.0
 	github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible // indirect
 	github.com/google/uuid v1.1.1
 	github.com/google/wire v0.2.2
 	github.com/googleapis/gax-go v2.0.2+incompatible
-	github.com/gorilla/websocket v1.4.0 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect
-	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
-	github.com/hashicorp/vault/api v1.0.1
-	github.com/jonboulle/clockwork v0.1.0 // indirect
-	github.com/json-iterator/go v1.1.6 // indirect
+	github.com/hashicorp/golang-lru v0.5.1 // indirect
 	github.com/lib/pq v1.1.0
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
-	github.com/nats-io/gnatsd v1.4.1
-	github.com/nats-io/go-nats v1.7.2
-	github.com/nats-io/nkeys v0.0.2 // indirect
-	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/pkg/errors v0.8.1 // indirect
-	github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829 // indirect
-	github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
-	github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a // indirect
-	github.com/sirupsen/logrus v1.4.1 // indirect
-	github.com/soheilhy/cmux v0.1.4 // indirect
-	github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94
+	github.com/stretchr/testify v1.3.0 // indirect
 	github.com/tidwall/pretty v0.0.0-20190325153808-1166b9ac2b65 // indirect
-	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
 	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect
 	github.com/xdg/stringprep v1.0.0 // indirect
-	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
-	go.etcd.io/bbolt v1.3.2 // indirect
-	go.etcd.io/etcd v3.3.12+incompatible
 	go.mongodb.org/mongo-driver v1.0.1
 	go.opencensus.io v0.21.0
-	go.uber.org/multierr v1.1.0 // indirect
-	go.uber.org/zap v1.9.1 // indirect
 	golang.org/x/crypto v0.0.0-20190422183909-d864b10871cd
 	golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6
 	golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58
+	golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db // indirect
 	golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373
 	google.golang.org/api v0.5.0
 	google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8
 	google.golang.org/grpc v1.20.1
+	gopkg.in/yaml.v2 v2.2.1 // indirect
 	pack.ag/amqp v0.11.0
 )
diff --git a/go.sum b/go.sum
diff --git a/internal/cmd/gocdk/_static/init/go.mod b/internal/cmd/gocdk/_static/init/go.mod
@@ -3,5 +3,5 @@ module {{.ModulePath}}
 go 1.12
 
 require (
-	gocloud.dev v0.13.0
+	gocloud.dev v0.15.0
 )
diff --git a/internal/cmd/gocdk/go.mod b/internal/cmd/gocdk/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/google/go-cmp v0.3.0
 	github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd
 	github.com/spf13/cobra v0.0.3
-	gocloud.dev v0.13.0
+	gocloud.dev v0.15.0
 	golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58
 	golang.org/x/sys v0.0.0-20190424175732-18eb32c0e2f0

diff --git a/internal/contributebot/go.mod b/internal/contributebot/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/kr/pty v1.1.3 // indirect
 	github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829 // indirect
 	go.opencensus.io v0.21.0
-	gocloud.dev v0.13.0
+	gocloud.dev v0.15.0
 	golang.org/x/crypto v0.0.0-20190424203555-c05e17bb3b2d // indirect
 	golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a
 	golang.org/x/sys v0.0.0-20190424175732-18eb32c0e2f0

diff --git a/internal/testing/alldeps b/internal/testing/alldeps
@@ -79,7 +79,12 @@ gocloud.dev
 gocloud.dev/internal/cmd/gocdk
 gocloud.dev/internal/contributebot
 gocloud.dev/internal/website
+gocloud.dev/pubsub/kafkapubsub
+gocloud.dev/pubsub/natspubsub
+gocloud.dev/pubsub/rabbitpubsub
+gocloud.dev/runtimevar/etcdvar
 gocloud.dev/samples
+gocloud.dev/secrets/vault
 golang.org/x/crypto
 golang.org/x/net
 golang.org/x/oauth2

diff --git a/internal/website/gatherexamples/run.sh b/internal/website/gatherexamples/run.sh
@@ -16,6 +16,4 @@
 # Run gatherexamples for the project.
 
 set -eo pipefail
-cd "$(dirname "$0")"
-# TODO(#1883): Use a consolidated list of all modules.
-go run gatherexamples.go ../../..
+sed -e '/^#/d' -e '/^$/d' allmodules | xargs go run internal/website/gatherexamples/gatherexamples.go
diff --git a/pubsub/kafkapubsub/go.mod b/pubsub/kafkapubsub/go.mod
@@ -0,0 +1,27 @@
+// Copyright 2018-2019 The Go Cloud Development Kit Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+module gocloud.dev/pubsub/kafkapubsub
+
+require (
+	github.com/Shopify/sarama v1.19.0
+	github.com/Shopify/toxiproxy v2.1.4+incompatible // indirect
+	github.com/eapache/go-resiliency v1.1.0 // indirect
+	github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
+	github.com/eapache/queue v1.1.0 // indirect
+	github.com/google/go-cmp v0.3.0
+	github.com/pierrec/lz4 v2.0.7+incompatible // indirect
+	github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a // indirect
+	gocloud.dev v0.15.0
+)