upgrade to go micro v4.1.0

This commit is contained in:
Willy Kloucek
2021-10-14 15:56:19 +02:00
parent ce136b4940
commit 6d5a3733ff
45 changed files with 109 additions and 100 deletions
+1 -1
View File
@@ -3,8 +3,8 @@ package proto
import (
"context"
"github.com/asim/go-micro/v3/client"
"github.com/golang/protobuf/ptypes/empty"
"go-micro.dev/v4/client"
)
// MockBundleService can be used to write tests against the bundle service.
+3 -3
View File
@@ -14,9 +14,9 @@ import (
import (
context "context"
api "github.com/asim/go-micro/v3/api"
client "github.com/asim/go-micro/v3/client"
server "github.com/asim/go-micro/v3/server"
api "go-micro.dev/v4/api"
client "go-micro.dev/v4/client"
server "go-micro.dev/v4/server"
)
// Reference imports to suppress errors if they are not otherwise used.
@@ -9,8 +9,6 @@ import (
"os"
"testing"
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"
@@ -19,6 +17,8 @@ import (
svc "github.com/owncloud/ocis/settings/pkg/service/v0"
store "github.com/owncloud/ocis/settings/pkg/store/filesystem"
"github.com/stretchr/testify/assert"
merrors "go-micro.dev/v4/errors"
"go-micro.dev/v4/metadata"
)
var (
+1 -1
View File
@@ -1,7 +1,6 @@
package http
import (
"github.com/asim/go-micro/v3"
"github.com/go-chi/chi/v5"
chimiddleware "github.com/go-chi/chi/v5/middleware"
"github.com/owncloud/ocis/ocis-pkg/account"
@@ -11,6 +10,7 @@ import (
"github.com/owncloud/ocis/settings/pkg/assets"
"github.com/owncloud/ocis/settings/pkg/proto/v0"
svc "github.com/owncloud/ocis/settings/pkg/service/v0"
"go-micro.dev/v4"
)
// Server initializes the http service and server.
+2 -2
View File
@@ -4,8 +4,6 @@ import (
"context"
"fmt"
merrors "github.com/asim/go-micro/v3/errors"
"github.com/asim/go-micro/v3/metadata"
"github.com/golang/protobuf/ptypes/empty"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/owncloud/ocis/ocis-pkg/middleware"
@@ -14,6 +12,8 @@ import (
"github.com/owncloud/ocis/settings/pkg/proto/v0"
"github.com/owncloud/ocis/settings/pkg/settings"
store "github.com/owncloud/ocis/settings/pkg/store/filesystem"
merrors "go-micro.dev/v4/errors"
"go-micro.dev/v4/metadata"
)
// Service represents a service.
+1 -1
View File
@@ -4,9 +4,9 @@ import (
"context"
"testing"
"github.com/asim/go-micro/v3/metadata"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/stretchr/testify/assert"
"go-micro.dev/v4/metadata"
)
var (