CQRS examples update (#68)

* changed cqrs facade constructor

* cqrs cleanups

* middlewares cleanups

* changed interface methods order

* updated cqrs example

* fixed some examples

* more explicit CommandTopicGenerator and EventTopicGenerator

* update rabbit mq example

* update gomod

* added new script for gomod update

* changed restart policy for docker composes

* update cqrs example docs

* remove go 1.12 from go.mod

* adding release procedure

Makefile

@@ -23,4 +23,12 @@ test_reconnect:
 	go test -tags=reconnect ./...
 
 validate_examples:
+	go run dev/update-examples-deps/main.go
 	bash dev/validate_examples.sh
+
+generate_gomod:
+	rm go.mod go.sum
+	go install ./...
+	go get -u github.com/golang/protobuf/proto
+	sed -i '\|go |d' go.mod
+	go mod edit -fmt

RELEASE-PROCEDURE.md

@@ -0,0 +1,11 @@
+# Release procedure
+
+1. [ ] - generate clean go.mod: `make generate_gomod`
+2. [ ] - commit && push to master
+3. [ ] - update and validate examples: `make validate_examples`
+4. [ ] - update missing documentation
+5. [ ] - commit && push to master
+6. [ ] - add breaking changes to `UPGRADE-[new-version].md`
+7. [ ] - commit && push to master
+8. [ ] - wait for `master` CI build
+9. [ ] - [add release in GitHub](https://github.com/ThreeDotsLabs/watermill/releases)

_examples/cqrs-protobuf/.validate_example.sh

@@ -1,8 +1,8 @@
 # configuration for the dev/validate_example script.
 #
 # how to run the command
-CMD="go run ."
+CMD="docker-compose up"
 # how long to wait for the output 
-TIMEOUT=3
+TIMEOUT=30
 # we expect this regexp to be present in the output
-EXPECTED_OUTPUT="Already booked rooms for"
+EXPECTED_OUTPUT="beers ordered to room 3"

_examples/cqrs-protobuf/README.md

@@ -9,5 +9,5 @@ Detailed documentation for CQRS can be found in Watermill's docs: [http://waterm
 ## Running
 
 ```bash
-go run .
+docker-compose up
 ```

_examples/cqrs-protobuf/docker-compose.yml

@@ -0,0 +1,20 @@
+version: '3'
+services:
+  golang:
+    image: golang:1.12
+    restart: unless-stopped
+    ports:
+    - 8080:8080
+    depends_on:
+      - rabbitmq
+    links:
+      - rabbitmq
+    volumes:
+    - .:/app
+    - $GOPATH/pkg/mod:/go/pkg/mod
+    working_dir: /app
+    command: go run .
+
+  rabbitmq:
+    image: rabbitmq:3.7
+    restart: unless-stopped

_examples/cqrs-protobuf/go.mod

@@ -1,56 +1,7 @@
 module main.go
 
 require (
-	cloud.google.com/go v0.36.0 // indirect
-	dmitri.shuralyov.com/app/changes v0.0.0-20181114035150-5af16e21babb // indirect
-	dmitri.shuralyov.com/service/change v0.0.0-20190203163610-217368fe4577 // indirect
-	git.apache.org/thrift.git v0.12.0 // indirect
-	github.com/DataDog/zstd v1.3.5 // indirect
-	github.com/Shopify/toxiproxy v2.1.4+incompatible // indirect
-	github.com/ThreeDotsLabs/watermill v0.2.2-0.20190211093512-120551e326b8
-	github.com/coreos/go-systemd v0.0.0-20190204112023-081494f7ee4f // indirect
-	github.com/go-chi/chi v4.0.1+incompatible // indirect
-	github.com/go-logfmt/logfmt v0.4.0 // indirect
-	github.com/golang/lint v0.0.0-20181217174547-8f45f776aaf1 // indirect
-	github.com/golang/protobuf v1.2.1-0.20190205222052-c823c79ea157
-	github.com/google/pprof v0.0.0-20190208070709-b421f19a5c07 // indirect
-	github.com/googleapis/gax-go v2.0.2+incompatible // indirect
-	github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
-	github.com/gorilla/mux v1.7.0 // indirect
-	github.com/gregjones/httpcache v0.0.0-20190203031600-7a902570cb17 // indirect
-	github.com/grpc-ecosystem/grpc-gateway v1.7.0 // indirect
-	github.com/hashicorp/go-msgpack v0.5.3 // indirect
-	github.com/hashicorp/go-uuid v1.0.1 // indirect
-	github.com/microcosm-cc/bluemonday v1.0.2 // indirect
-	github.com/nats-io/gnatsd v1.4.1 // indirect
-	github.com/nats-io/nats-streaming-server v0.12.0 // indirect
-	github.com/openzipkin/zipkin-go v0.1.5 // indirect
-	github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
-	github.com/prometheus/common v0.2.0 // indirect
-	github.com/prometheus/procfs v0.0.0-20190209105433-f8d8b3f739bd // indirect
-	github.com/russross/blackfriday v2.0.0+incompatible // indirect
-	github.com/shurcooL/go v0.0.0-20190121191506-3fef8c783dec // indirect
-	github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d // indirect
-	github.com/shurcooL/highlight_diff v0.0.0-20181222201841-111da2e7d480 // indirect
-	github.com/shurcooL/highlight_go v0.0.0-20181215221002-9d8641ddf2e1 // indirect
-	github.com/shurcooL/home v0.0.0-20190204141146-5c8ae21d4240 // indirect
-	github.com/shurcooL/htmlg v0.0.0-20190120222857-1e8a37b806f3 // indirect
-	github.com/shurcooL/httpfs v0.0.0-20181222201310-74dc9339e414 // indirect
-	github.com/shurcooL/issues v0.0.0-20190120000219-08d8dadf8acb // indirect
-	github.com/shurcooL/issuesapp v0.0.0-20181229001453-b8198a402c58 // indirect
-	github.com/shurcooL/notifications v0.0.0-20181111060504-bcc2b3082a7a // indirect
-	github.com/shurcooL/octicon v0.0.0-20181222203144-9ff1a4cf27f4 // indirect
-	github.com/shurcooL/reactions v0.0.0-20181222204718-145cd5e7f3d1 // indirect
-	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
-	github.com/shurcooL/webdavfs v0.0.0-20181215192745-5988b2d638f6 // indirect
-	github.com/sirupsen/logrus v1.3.0 // indirect
-	go4.org v0.0.0-20181109185143-00e24f1b2599 // indirect
-	golang.org/x/build v0.0.0-20190208213738-77d92a99a537 // indirect
-	golang.org/x/crypto v0.0.0-20190208162236-193df9c0f06f // indirect
-	golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2 // indirect
-	golang.org/x/perf v0.0.0-20190124201629-844a5f5b46f4 // indirect
-	golang.org/x/sys v0.0.0-20190209173611-3b5209105503 // indirect
-	golang.org/x/tools v0.0.0-20190208222737-3744606dbb67 // indirect
-	honnef.co/go/tools v0.0.0-20190128043916-71123fcbb8fe // indirect
-	sourcegraph.com/sqs/pbtypes v1.0.0 // indirect
+	github.com/ThreeDotsLabs/watermill v0.2.2-0.20190509215427-f56712e7284c
+	github.com/golang/protobuf v1.3.1
+	github.com/pkg/errors v0.8.1
 )