Skip to content

Commit

Permalink
Remove dependancy on go-micro/v3/store package (#1481)
Browse files Browse the repository at this point in the history 
* Remove dependancy on go-micro/v3/store package

* add cockroach plugin

* Fix imports
  • Loading branch information
@ben-toogood
ben-toogood committed Oct 14, 2020
1 parent cf2b7d3 commit 097dd92
Show file tree
Hide file tree
Showing 59 changed files with 3,772 additions and 124 deletions.
1 change: 1 addition & 0 deletions .github/workflows/integration-k8s.yml
View file
Expand Up @@ -54,6 +54,7 @@ jobs:
cp -R . /tmp/micro
cd /tmp/micro
go mod edit -replace github.com/micro/micro/plugin/etcd/v3=./plugin/etcd
go mod edit -replace github.com/micro/micro/plugin/cockroach/v3=./plugin/cockroach
go mod edit -replace github.com/micro/micro/plugin/prometheus/v3=./plugin/prometheus
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
Expand Down
6 changes: 3 additions & 3 deletions cmd/cmd.go
View file
Expand Up @@ -13,8 +13,6 @@ import (
"strings"
"time"

"github.com/micro/micro/v3/service/registry"
"github.com/micro/go-micro/v3/store"
"github.com/micro/micro/v3/client/cli/util"
uconf "github.com/micro/micro/v3/internal/config"
"github.com/micro/micro/v3/internal/helper"
Expand All @@ -32,7 +30,9 @@ import (
configCli "github.com/micro/micro/v3/service/config/client"
storeConf "github.com/micro/micro/v3/service/config/store"
"github.com/micro/micro/v3/service/logger"
"github.com/micro/micro/v3/service/registry"
"github.com/micro/micro/v3/service/server"
"github.com/micro/micro/v3/service/store"
"github.com/urfave/cli/v2"

muregistry "github.com/micro/micro/v3/service/registry"
Expand Down Expand Up @@ -515,7 +515,7 @@ func (c *command) Before(ctx *cli.Context) error {
}

// Setup store options
storeOpts := []store.Option{}
storeOpts := []store.StoreOption{}
if len(ctx.String("store_address")) > 0 {
storeOpts = append(storeOpts, store.Nodes(strings.Split(ctx.String("store_address"), ",")...))
}
Expand Down
4 changes: 4 additions & 0 deletions cmd/defaults.go
View file
Expand Up @@ -21,6 +21,8 @@ import (
routerSrv "github.com/micro/micro/v3/service/router/client"
"github.com/micro/micro/v3/service/server"
grpcSvr "github.com/micro/micro/v3/service/server/grpc"
"github.com/micro/micro/v3/service/store"
storeSrv "github.com/micro/micro/v3/service/store/client"
)

// setupDefaults sets the default auth, broker etc implementations incase they arent configured by
Expand All @@ -38,4 +40,6 @@ func setupDefaults() {
events.DefaultStream = eventsSrv.NewStream()
registry.DefaultRegistry = registrySrv.NewRegistry()
router.DefaultRouter = routerSrv.NewRouter()
store.DefaultStore = storeSrv.NewStore()
store.DefaultBlobStore = storeSrv.NewBlobStore()
}
4 changes: 4 additions & 0 deletions go.mod
View file
Expand Up @@ -12,6 +12,7 @@ require (
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect
github.com/cloudflare/cloudflare-go v0.10.9 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/davecgh/go-spew v1.1.1
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/dustin/go-humanize v1.0.0
github.com/evanphx/json-patch/v5 v5.0.0
Expand All @@ -26,8 +27,10 @@ require (
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/kr/pretty v0.2.0
github.com/micro/go-micro/v3 v3.0.0-beta.3.0.20201013135405-1a962e46fd3a
github.com/miekg/dns v1.1.27
github.com/minio/minio-go/v7 v7.0.5
github.com/olekukonko/tablewriter v0.0.4
github.com/onsi/ginkgo v1.12.0 // indirect
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c
Expand All @@ -38,6 +41,7 @@ require (
github.com/stretchr/testify v1.6.1
github.com/urfave/cli/v2 v2.2.0
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca
go.etcd.io/bbolt v1.3.5
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
golang.org/x/net v0.0.0-20200707034311-ab3426394381
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013
Expand Down
14 changes: 12 additions & 2 deletions go.sum
View file
Expand Up @@ -218,8 +218,10 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht
github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/juju/fslock v0.0.0-20160525022230-4d5c94c67b4b h1:FQ7+9fxhyp82ks9vAuyPzG0/vVbWwMwLJ+P6yJI5FN8=
github.com/juju/fslock v0.0.0-20160525022230-4d5c94c67b4b/go.mod h1:HMcgvsgd0Fjj4XXDkbjdmlbI505rUPBs6WBMYg2pXks=
Expand Down Expand Up @@ -253,22 +255,26 @@ github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+tw
github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/micro/go-micro v1.18.0 h1:gP70EZVHpJuUIT0YWth192JmlIci+qMOEByHm83XE9E=
github.com/micro/go-micro/v3 v3.0.0-beta.3.0.20201013135405-1a962e46fd3a h1:wuoj1zDdq0rAkJ2q+JaJuJd7eOTVsvhfcjPoTRQY0+k=
github.com/micro/go-micro/v3 v3.0.0-beta.3.0.20201013135405-1a962e46fd3a/go.mod h1:DiwYchJ8kCWOZVXMsZwuFcNDAdSCS6aEbYfEni4LvK4=
github.com/micro/micro v1.18.0 h1:v+xiQOXbT9xxotLwu1nJM81t4FbruBxZSSyIdhUfujM=
github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
github.com/miekg/dns v1.1.27 h1:aEH/kqUzUxGJ/UHcEKdJY+ugH6WEzsEBBSPa8zuy1aM=
github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
github.com/minio/md5-simd v1.1.0 h1:QPfiOqlZH+Cj9teu0t9b1nTBfPbyTl16Of5MeuShdK4=
github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw=
github.com/minio/minio-go/v7 v7.0.5 h1:I2NIJ2ojwJqD/YByemC1M59e1b4FW9kS7NlOar7HPV4=
github.com/minio/minio-go/v7 v7.0.5/go.mod h1:TA0CQCjJZHM5SJj9IjqR0NmpmQJ6bCbXifAJ3mUU6Hw=
github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU=
github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed/go.mod h1:3rdaFaCv4AyBgu5ALFM0+tSuHrBh6v692nyQe3ikrq0=
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
Expand Down Expand Up @@ -337,6 +343,7 @@ github.com/rhysd/go-github-selfupdate v1.2.2 h1:G+mNzkc1wEtpmM6sFS/Ghkeq+ad4Yp6E
github.com/rhysd/go-github-selfupdate v1.2.2/go.mod h1:khesvSyKcXDUxeySCedFh621iawCks0dS/QnHPcpCws=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc=
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
Expand All @@ -350,7 +357,9 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs=
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
Expand Down Expand Up @@ -577,6 +586,7 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy
gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE=
gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/ini.v1 v1.44.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/ini.v1 v1.57.0 h1:9unxIsFcTt4I55uWluz+UmL95q4kdJ0buvQ1ZIqVQww=
gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/ns1/ns1-go.v2 v2.0.0-20190730140822-b51389932cbc/go.mod h1:VV+3haRsgDiVLxyifmMBrBIuCWFBPYKbRssXB9z67Hw=
gopkg.in/resty.v1 v1.9.1/go.mod h1:vo52Hzryw9PnPHcJfPsBiFW62XhNx5OczbV9y+IMpgc=
Expand Down
2 changes: 1 addition & 1 deletion internal/api/server/acme/certmagic/storage.go
View file
Expand Up @@ -26,7 +26,7 @@ import (
"time"

"github.com/caddyserver/certmagic"
"github.com/micro/go-micro/v3/store"
"github.com/micro/micro/v3/service/store"
"github.com/micro/go-micro/v3/sync"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/auth/token/basic/basic.go
View file
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"github.com/google/uuid"
"github.com/micro/go-micro/v3/store"
"github.com/micro/micro/v3/service/store"
"github.com/micro/micro/v3/internal/auth/token"
"github.com/micro/micro/v3/service/auth"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/auth/token/basic/basic_test.go
View file
Expand Up @@ -19,7 +19,7 @@ package basic
import (
"testing"

"github.com/micro/go-micro/v3/store/memory"
"github.com/micro/micro/v3/service/store/memory"
"github.com/micro/micro/v3/internal/auth/token"
"github.com/micro/micro/v3/service/auth"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/auth/token/options.go
View file
Expand Up @@ -19,7 +19,7 @@ package token
import (
"time"

"github.com/micro/go-micro/v3/store"
"github.com/micro/micro/v3/service/store"
)

type Options struct {
Expand Down

0 comments on commit 097dd92

Please sign in to comment.