remove any micro v2 occurences from the project
This commit is contained in:
committed by
Jörn Friedrich Dreyer
parent
54c4331479
commit
7e505fbd9f
@@ -4,17 +4,12 @@ import (
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"github.com/owncloud/ocis/ocis-pkg/registry"
|
||||
|
||||
"github.com/micro/go-micro/v2"
|
||||
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis/ocis-pkg/log"
|
||||
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
"github.com/owncloud/ocis/ocis/pkg/flagset"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
"github.com/owncloud/ocis/ocis/pkg/runtime"
|
||||
"github.com/owncloud/ocis/ocis/pkg/version"
|
||||
"github.com/spf13/viper"
|
||||
)
|
||||
@@ -49,13 +44,13 @@ func Execute() error {
|
||||
)
|
||||
}
|
||||
|
||||
r := *registry.GetRegistry()
|
||||
//r := *registry.GetRegistry()
|
||||
|
||||
opts := micro.Options{
|
||||
Registry: r,
|
||||
}
|
||||
//opts := micro.Options{
|
||||
// Registry: r,
|
||||
//}
|
||||
|
||||
runtime.AddMicroPlatform(app, opts)
|
||||
//runtime.AddMicroPlatform(app, opts)
|
||||
|
||||
cli.HelpFlag = &cli.BoolFlag{
|
||||
Name: "help,h",
|
||||
|
||||
@@ -4,8 +4,8 @@ import (
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
mreg "github.com/asim/go-micro/v3/registry"
|
||||
"github.com/micro/cli/v2"
|
||||
mreg "github.com/micro/go-micro/v2/registry"
|
||||
tw "github.com/olekukonko/tablewriter"
|
||||
"github.com/owncloud/ocis/ocis-pkg/registry"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
|
||||
@@ -7,11 +7,8 @@ import (
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/micro/go-micro/v2"
|
||||
"github.com/owncloud/ocis/ocis/pkg/config"
|
||||
|
||||
cli "github.com/micro/cli/v2"
|
||||
|
||||
"github.com/micro/micro/v2/client/api"
|
||||
"github.com/micro/micro/v2/service/registry"
|
||||
|
||||
@@ -144,13 +141,13 @@ func RunService(client *rpc.Client, service string) int {
|
||||
}
|
||||
|
||||
// AddMicroPlatform adds the micro subcommands to the cli app
|
||||
func AddMicroPlatform(app *cli.App, opts micro.Options) {
|
||||
setDefaults()
|
||||
|
||||
app.Commands = append(app.Commands, api.Commands(micro.Registry(opts.Registry))...)
|
||||
//app.Commands = append(app.Commands, web.Commands(micro.Registry(opts.Registry))...)
|
||||
app.Commands = append(app.Commands, registry.Commands(micro.Registry(opts.Registry))...)
|
||||
}
|
||||
//func AddMicroPlatform(app *cli.App, opts micro.Options) {
|
||||
// setDefaults()
|
||||
//
|
||||
// app.Commands = append(app.Commands, api.Commands(micro.Registry(opts.Registry))...)
|
||||
// //app.Commands = append(app.Commands, web.Commands(micro.Registry(opts.Registry))...)
|
||||
// app.Commands = append(app.Commands, registry.Commands(micro.Registry(opts.Registry))...)
|
||||
//}
|
||||
|
||||
// provide a config.Config with default values?
|
||||
func setDefaults() {
|
||||
|
||||
Reference in New Issue
Block a user