Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove dependancy on go-micro/v3/events package #1469

Merged
merged 6 commits into from Oct 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/integration-k8s.yml
Expand Up @@ -53,7 +53,8 @@ jobs:
mkdir /tmp/micro
cp -R . /tmp/micro
cd /tmp/micro
go mod edit -replace github.com/micro/micro/plugin/nats/v3=./plugin/nats
go mod edit -replace github.com/micro/micro/plugin/nats/broker/v3=./plugin/nats/broker
go mod edit -replace github.com/micro/micro/plugin/nats/stream/v3=./plugin/nats/stream
go mod edit -replace github.com/micro/micro/profile/platform/v3=./profile/platform
go mod edit -replace google.golang.org/grpc=google.golang.org/grpc@v1.26.0
go install
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/platform.yml
Expand Up @@ -21,7 +21,8 @@ jobs:
- name: Replace platform profile
id: replace-profile
run: |
go mod edit -replace github.com/micro/micro/plugin/nats/v3=./plugin/nats
go mod edit -replace github.com/micro/micro/plugin/nats/broker/v3=./plugin/nats/broker
go mod edit -replace github.com/micro/micro/plugin/nats/stream/v3=./plugin/nats/stream
go mod edit -replace github.com/micro/micro/profile/platform/v3=./profile/platform
go mod edit -replace google.golang.org/grpc=google.golang.org/grpc@v1.26.0

Expand Down
4 changes: 4 additions & 0 deletions cmd/defaults.go
Expand Up @@ -7,6 +7,8 @@ import (
brokerSrv "github.com/micro/micro/v3/service/broker/client"
"github.com/micro/micro/v3/service/client"
grpcCli "github.com/micro/micro/v3/service/client/grpc"
"github.com/micro/micro/v3/service/events"
eventsSrv "github.com/micro/micro/v3/service/events/client"
"github.com/micro/micro/v3/service/network"
mucpNet "github.com/micro/micro/v3/service/network/mucp"
"github.com/micro/micro/v3/service/server"
Expand All @@ -23,4 +25,6 @@ func setupDefaults() {
// setup rpc implementations after the client is configured
auth.DefaultAuth = authSrv.NewAuth()
broker.DefaultBroker = brokerSrv.NewBroker()
events.DefaultStream = eventsSrv.NewStream()
events.DefaultStore = eventsSrv.NewStore()
}
1 change: 0 additions & 1 deletion go.mod
Expand Up @@ -23,7 +23,6 @@ require (
github.com/google/uuid v1.1.2
github.com/gorilla/handlers v1.4.2
github.com/gorilla/mux v1.7.3
github.com/gosimple/slug v1.9.0
github.com/hashicorp/go-version v1.2.1
github.com/juju/fslock v0.0.0-20160525022230-4d5c94c67b4b
github.com/micro/go-micro/v3 v3.0.0-beta.3.0.20201013135405-1a962e46fd3a
Expand Down
4 changes: 0 additions & 4 deletions go.sum
Expand Up @@ -191,8 +191,6 @@ github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gosimple/slug v1.9.0 h1:r5vDcYrFz9BmfIAMC829un9hq7hKM4cHUrsv36LbEqs=
github.com/gosimple/slug v1.9.0/go.mod h1:AMZ+sOVe65uByN3kgEyf9WEBKBCSS+dJjMX9x4vDJbg=
github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
Expand Down Expand Up @@ -328,8 +326,6 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
github.com/rainycape/memcache v0.0.0-20150622160815-1031fa0ce2f2/go.mod h1:7tZKcyumwBO6qip7RNQ5r77yrssm9bfCowcLEBcU5IA=
github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be h1:ta7tUOvsPHVHGom5hKW5VXNc2xZIkfCKP8iaqOyYtUQ=
github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be/go.mod h1:MIDFMn7db1kT65GmV94GzpX9Qdi7N/pQlwb+AN8wh+Q=
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
github.com/rhysd/go-github-selfupdate v1.2.2 h1:G+mNzkc1wEtpmM6sFS/Ghkeq+ad4Yp6EZEHyp//wGEo=
github.com/rhysd/go-github-selfupdate v1.2.2/go.mod h1:khesvSyKcXDUxeySCedFh621iawCks0dS/QnHPcpCws=
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions plugin/nats/go.mod → plugin/nats/broker/go.mod
@@ -1,4 +1,4 @@
module github.com/micro/micro/plugin/nats/v3
module github.com/micro/micro/plugin/nats/broker/v3

go 1.13

Expand All @@ -11,4 +11,4 @@ require (
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c
)

replace github.com/micro/micro/v3 => ../..
replace github.com/micro/micro/v3 => ../../..
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
13 changes: 13 additions & 0 deletions plugin/nats/stream/go.mod
@@ -0,0 +1,13 @@
module github.com/micro/micro/plugin/nats/stream/v3

go 1.13

require (
github.com/google/uuid v1.1.2
github.com/micro/micro/v3 v3.0.0-beta.6
github.com/nats-io/nats.go v1.10.0
github.com/nats-io/stan.go v0.7.0
github.com/pkg/errors v0.9.1
)

replace github.com/micro/micro/v3 => ../../..