mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-06 04:09:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

update micro deps to v2

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2020-02-10 17:04:40 +01:00
parent 06ef8d528b
commit c2c12fd655
31 changed files with 305 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/command/devldap.go
View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-devldap/pkg/command"
svcconfig "github.com/owncloud/ocis-devldap/pkg/config"
"github.com/owncloud/ocis-devldap/pkg/flagset"
@@ -10,8 +10,8 @@ import (
)
// DevLDAPCommand is the entrypoint for the devldap command.
func DevLDAPCommand(cfg *config.Config) cli.Command {
return cli.Command{
func DevLDAPCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "devldap",
Usage: "Start devldap server",
Category: "Extensions",

6
pkg/command/graph-explorer.go
View File

@@ -3,7 +3,7 @@
package command
import (
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-graph-explorer/pkg/command"
svcconfig "github.com/owncloud/ocis-graph-explorer/pkg/config"
"github.com/owncloud/ocis-graph-explorer/pkg/flagset"
@@ -12,8 +12,8 @@ import (
)
// GraphExplorerCommand is the entry point for the graph command.
func GraphExplorerCommand(cfg *config.Config) cli.Command {
return cli.Command{
func GraphExplorerCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "graph-explorer",
Usage: "Start graph explorer",
Category: "Extensions",

6
pkg/command/graph.go
View File

@@ -3,7 +3,7 @@
package command
import (
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-graph/pkg/command"
svcconfig "github.com/owncloud/ocis-graph/pkg/config"
"github.com/owncloud/ocis-graph/pkg/flagset"
@@ -12,8 +12,8 @@ import (
)
// GraphCommand is the entrypoint for the graph command.
func GraphCommand(cfg *config.Config) cli.Command {
return cli.Command{
func GraphCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "graph",
Usage: "Start graph server",
Category: "Extensions",

6
pkg/command/health.go
View File

@@ -4,15 +4,15 @@ import (
"fmt"
"net/http"
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/pkg/config"
"github.com/owncloud/ocis/pkg/flagset"
"github.com/owncloud/ocis/pkg/register"
)
// Health is the entrypoint for the health command.
func Health(cfg *config.Config) cli.Command {
return cli.Command{
func Health(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "health",
Usage: "Check health status",
Flags: flagset.HealthWithConfig(cfg),

6
pkg/command/hello.go
View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-hello/pkg/command"
svcconfig "github.com/owncloud/ocis-hello/pkg/config"
"github.com/owncloud/ocis-hello/pkg/flagset"
@@ -10,8 +10,8 @@ import (
)
// HelloCommand is the entrypoint for the hello command.
func HelloCommand(cfg *config.Config) cli.Command {
return cli.Command{
func HelloCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "hello",
Usage: "Start hello server",
Category: "Extensions",

6
pkg/command/konnectd.go
View File

@@ -3,7 +3,7 @@
package command
import (
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-konnectd/pkg/command"
svcconfig "github.com/owncloud/ocis-konnectd/pkg/config"
"github.com/owncloud/ocis-konnectd/pkg/flagset"
@@ -12,8 +12,8 @@ import (
)
// KonnectdCommand is the entrypoint for the konnectd command.
func KonnectdCommand(cfg *config.Config) cli.Command {
return cli.Command{
func KonnectdCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "konnectd",
Usage: "Start konnectd server",
Category: "Extensions",

6
pkg/command/ocs.go
View File

@@ -3,7 +3,7 @@
package command
import (
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-ocs/pkg/command"
svcconfig "github.com/owncloud/ocis-ocs/pkg/config"
"github.com/owncloud/ocis-ocs/pkg/flagset"
@@ -12,8 +12,8 @@ import (
)
// OCSCommand is the entrypoint for the ocs command.
func OCSCommand(cfg *config.Config) cli.Command {
return cli.Command{
func OCSCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "ocs",
Usage: "Start ocs server",
Category: "Extensions",

21
pkg/command/phoenix.go
View File

@@ -1,26 +1,33 @@
package command
import (
"github.com/micro/cli"
"strings"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-phoenix/pkg/command"
"github.com/owncloud/ocis-phoenix/pkg/flagset"
"github.com/owncloud/ocis-pkg/conversions"
"github.com/owncloud/ocis/pkg/config"
"github.com/owncloud/ocis/pkg/register"
)
// PhoenixCommand is the entrypoint for the phoenix command.
func PhoenixCommand(cfg *config.Config) cli.Command {
return cli.Command{
func PhoenixCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "phoenix",
Usage: "Start phoenix server",
Category: "Extensions",
Flags: flagset.ServerWithConfig(cfg.Phoenix),
Action: func(c *cli.Context) error {
if c.String("web-config-apps") != "" {
cfg.Phoenix.Phoenix.Config.Apps = conversions.StringToSliceString(c.String("web-config-apps"), ",")
Before: func(c *cli.Context) error {
if cfg.HTTP.Root != "/" {
cfg.HTTP.Root = strings.TrimSuffix(cfg.HTTP.Root, "/")
}
cfg.Phoenix.Phoenix.Config.Apps = c.StringSlice("web-config-app")
return nil
},
Action: func(c *cli.Context) error {
scfg := configurePhoenix(cfg)
return cli.HandleAction(

6
pkg/command/revaauthbasic.go
View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-reva/pkg/command"
svcconfig "github.com/owncloud/ocis-reva/pkg/config"
"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
)
// RevaAuthBasicCommand is the entrypoint for the reva-auth-basic command.
func RevaAuthBasicCommand(cfg *config.Config) cli.Command {
return cli.Command{
func RevaAuthBasicCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "reva-auth-basic",
Usage: "Start reva auth-basic service",
Category: "Extensions",

6
pkg/command/revaauthbearer.go
View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-reva/pkg/command"
svcconfig "github.com/owncloud/ocis-reva/pkg/config"
"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
)
// RevaAuthBearerCommand is the entrypoint for the reva-auth-bearer command.
func RevaAuthBearerCommand(cfg *config.Config) cli.Command {
return cli.Command{
func RevaAuthBearerCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "reva-auth-bearer",
Usage: "Start reva auth-bearer service",
Category: "Extensions",

6
pkg/command/revafrontend.go
View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-reva/pkg/command"
svcconfig "github.com/owncloud/ocis-reva/pkg/config"
"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
)
// RevaFrontendCommand is the entrypoint for the reva-frontend command.
func RevaFrontendCommand(cfg *config.Config) cli.Command {
return cli.Command{
func RevaFrontendCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "reva-frontend",
Usage: "Start reva frontend",
Category: "Extensions",

6
pkg/command/revagateway.go
View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-reva/pkg/command"
svcconfig "github.com/owncloud/ocis-reva/pkg/config"
"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
)
// RevaGatewayCommand is the entrypoint for the reva-gateway command.
func RevaGatewayCommand(cfg *config.Config) cli.Command {
return cli.Command{
func RevaGatewayCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "reva-gateway",
Usage: "Start reva gateway",
Category: "Extensions",

6
pkg/command/revasharing.go
View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-reva/pkg/command"
svcconfig "github.com/owncloud/ocis-reva/pkg/config"
"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
)
// RevaSharingCommand is the entrypoint for the reva-sharing command.
func RevaSharingCommand(cfg *config.Config) cli.Command {
return cli.Command{
func RevaSharingCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "reva-sharing",
Usage: "Start reva sharing service",
Category: "Extensions",

6
pkg/command/revastoragehome.go
View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-reva/pkg/command"
svcconfig "github.com/owncloud/ocis-reva/pkg/config"
"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
)
// RevaStorageHomeCommand is the entrypoint for the reva-storage-home command.
func RevaStorageHomeCommand(cfg *config.Config) cli.Command {
return cli.Command{
func RevaStorageHomeCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "reva-storage-home",
Usage: "Start reva home storage",
Category: "Extensions",

6
pkg/command/revastoragehomedata.go
View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-reva/pkg/command"
svcconfig "github.com/owncloud/ocis-reva/pkg/config"
"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
)
// RevaStorageHomeDataCommand is the entrypoint for the reva-storage-home-data command.
func RevaStorageHomeDataCommand(cfg *config.Config) cli.Command {
return cli.Command{
func RevaStorageHomeDataCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "reva-storage-home-data",
Usage: "Start reva home storage dataprovider",
Category: "Extensions",

6
pkg/command/revastorageoc.go
View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-reva/pkg/command"
svcconfig "github.com/owncloud/ocis-reva/pkg/config"
"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
)
// RevaStorageOCCommand is the entrypoint for the reva-storage-oc command.
func RevaStorageOCCommand(cfg *config.Config) cli.Command {
return cli.Command{
func RevaStorageOCCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "reva-storage-oc",
Usage: "Start reva oc storage",
Category: "Extensions",

6
pkg/command/revastorageocdata.go
View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-reva/pkg/command"
svcconfig "github.com/owncloud/ocis-reva/pkg/config"
"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
)
// RevaStorageOCDataCommand is the entrypoint for the reva-storage-oc-data command.
func RevaStorageOCDataCommand(cfg *config.Config) cli.Command {
return cli.Command{
func RevaStorageOCDataCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "reva-storage-oc-data",
Usage: "Start reva oc storage dataprovider",
Category: "Extensions",

6
pkg/command/revastorageroot.go
View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-reva/pkg/command"
svcconfig "github.com/owncloud/ocis-reva/pkg/config"
"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
)
// RevaStorageRootCommand is the entrypoint for the reva-storage-root command.
func RevaStorageRootCommand(cfg *config.Config) cli.Command {
return cli.Command{
func RevaStorageRootCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "reva-storage-root",
Usage: "Start reva root storage",
Category: "Extensions",

6
pkg/command/revausers.go
View File

@@ -1,7 +1,7 @@
package command
import (
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-reva/pkg/command"
svcconfig "github.com/owncloud/ocis-reva/pkg/config"
"github.com/owncloud/ocis-reva/pkg/flagset"
@@ -10,8 +10,8 @@ import (
)
// RevaUsersCommand is the entrypoint for the reva-users command.
func RevaUsersCommand(cfg *config.Config) cli.Command {
return cli.Command{
func RevaUsersCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "reva-users",
Usage: "Start reva users service",
Category: "Extensions",

6
pkg/command/root.go
View File

@@ -4,8 +4,8 @@ import (
"os"
"strings"
"github.com/micro/cli"
"github.com/owncloud/ocis-pkg/log"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/pkg/config"
"github.com/owncloud/ocis/pkg/flagset"
"github.com/owncloud/ocis/pkg/micro/runtime"
@@ -24,7 +24,7 @@ func Execute() error {
Usage: "ownCloud Infinite Scale Stack",
Compiled: version.Compiled(),
Authors: []cli.Author{
Authors: []*cli.Author{
{
Name: "ownCloud GmbH",
Email: "support@owncloud.com",

8
pkg/command/server.go
View File

@@ -5,8 +5,8 @@ package command
import (
"strings"
"github.com/micro/cli"
"github.com/micro/go-micro/config/cmd"
"github.com/micro/cli/v2"
"github.com/micro/go-micro/v2/config/cmd"
"github.com/owncloud/ocis/pkg/config"
"github.com/owncloud/ocis/pkg/flagset"
"github.com/owncloud/ocis/pkg/micro/runtime"
@@ -15,8 +15,8 @@ import (
)
// Server is the entrypoint for the server command.
func Server(cfg *config.Config) cli.Command {
return cli.Command{
func Server(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "server",
Usage: "Start fullstack server",
Category: "Fullstack",

8
pkg/command/server_simple.go
View File

@@ -5,8 +5,8 @@ package command
import (
"strings"
"github.com/micro/cli"
"github.com/micro/go-micro/config/cmd"
"github.com/micro/cli/v2"
"github.com/micro/go-micro/v2/config/cmd"
"github.com/owncloud/ocis/pkg/config"
"github.com/owncloud/ocis/pkg/flagset"
"github.com/owncloud/ocis/pkg/micro/runtime"
@@ -28,8 +28,8 @@ var (
)
// Simple is the entrypoint for the server command. It is the `ocis server` subcommand overloaded with a different set of services
func Simple(cfg *config.Config) cli.Command {
return cli.Command{
func Simple(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "server",
Usage: "Start fullstack server",
Category: "Fullstack",

6
pkg/command/webdav.go
View File

@@ -3,7 +3,7 @@
package command
import (
"github.com/micro/cli"
"github.com/micro/cli/v2"
"github.com/owncloud/ocis-webdav/pkg/command"
svcconfig "github.com/owncloud/ocis-webdav/pkg/config"
"github.com/owncloud/ocis-webdav/pkg/flagset"
@@ -12,8 +12,8 @@ import (
)
// WebDAVCommand is the entrypoint for the webdav command.
func WebDAVCommand(cfg *config.Config) cli.Command {
return cli.Command{
func WebDAVCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "webdav",
Usage: "Start webdav server",
Category: "Extensions",