Merge pull request #1670 from owncloud/update-go-micro-v3

Update go micro v3

settings/pkg/proto/v0/settings.mock.go

@@ -3,8 +3,8 @@ package proto
 import (
 	"context"
 
+	"github.com/asim/go-micro/v3/client"
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/micro/go-micro/v2/client"
 )
 
 // MockBundleService can be used to write tests against the bundle service.

settings/pkg/proto/v0/settings.pb.micro.go

@@ -14,9 +14,9 @@ import (
 
 import (
 	context "context"
-	api "github.com/micro/go-micro/v2/api"
-	client "github.com/micro/go-micro/v2/client"
-	server "github.com/micro/go-micro/v2/server"
+	api "github.com/asim/go-micro/v3/api"
+	client "github.com/asim/go-micro/v3/client"
+	server "github.com/asim/go-micro/v3/server"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.

settings/pkg/proto/v0/settings.pb.micro_test.go

@@ -9,8 +9,8 @@ import (
 	"os"
 	"testing"
 
-	merrors "github.com/micro/go-micro/v2/errors"
-	"github.com/micro/go-micro/v2/metadata"
+	merrors "github.com/asim/go-micro/v3/errors"
+	"github.com/asim/go-micro/v3/metadata"
 	ocislog "github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/middleware"
 	"github.com/owncloud/ocis/ocis-pkg/service/grpc"

settings/pkg/server/http/server.go

@@ -1,6 +1,7 @@
 package http
 
 import (
+	"github.com/asim/go-micro/v3"
 	"github.com/go-chi/chi"
 	"github.com/owncloud/ocis/ocis-pkg/account"
 	"github.com/owncloud/ocis/ocis-pkg/middleware"
@@ -70,13 +71,8 @@ func Server(opts ...Option) http.Service {
 		proto.RegisterPermissionServiceWeb(r, handle)
 	})
 
-	service.Handle(
-		"/",
-		mux,
-	)
+	micro.RegisterHandler(service.Server(), mux)
 
-	if err := service.Init(); err != nil {
-		panic(err)
-	}
+	service.Init()
 	return service
 }

settings/pkg/service/v0/service.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
+	merrors "github.com/asim/go-micro/v3/errors"
+	"github.com/asim/go-micro/v3/metadata"
 	"github.com/golang/protobuf/ptypes/empty"
-	merrors "github.com/micro/go-micro/v2/errors"
-	"github.com/micro/go-micro/v2/metadata"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/middleware"
 	"github.com/owncloud/ocis/ocis-pkg/roles"

settings/pkg/service/v0/service_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/micro/go-micro/v2/metadata"
+	"github.com/asim/go-micro/v3/metadata"
 	"github.com/owncloud/ocis/ocis-pkg/middleware"
 	"github.com/stretchr/testify/assert"
 )