refactor extensions -> services

Signed-off-by: Christian Richter <crichter@owncloud.com>
This commit is contained in:
Christian Richter
2022-06-20 16:49:06 +02:00
parent 78064e6bab
commit f8f1320501
612 changed files with 1080 additions and 1080 deletions

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/app-provider/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/app-registry/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/audit/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/audit/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/auth-basic/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/auth-bearer/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/auth-machine/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/frontend/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/frontend/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/gateway/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/gateway/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/graph/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/graph/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/groups/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/groups/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/idm/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/idm/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/idp/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/idp/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -15,7 +15,7 @@ import (
func ListCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "list",
Usage: "list oCIS extensions running in the runtime (supervised mode)",
Usage: "list oCIS services running in the runtime (supervised mode)",
Category: "runtime",
Flags: []cli.Flag{
&cli.StringFlag{

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/nats/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/nats/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/notifications/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/notifications/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/ocdav/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/ocdav/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/ocs/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/ocs/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/proxy/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/proxy/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/search/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/search/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -14,7 +14,7 @@ import (
func Server(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "server",
Usage: "start a fullstack server (runtime and all extensions in supervised mode)",
Usage: "start a fullstack server (runtime and all services in supervised mode)",
Category: "fullstack",
Before: func(c *cli.Context) error {
if err := parser.ParseConfig(cfg, false); err != nil {

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/settings/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/settings/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/sharing/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/sharing/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/storage-shares/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/storage-system/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/storage-system/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/storage-users/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/storage-users/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/store/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/store/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/thumbnails/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/users/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/users/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/web/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/web/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -3,11 +3,11 @@ package command
import (
"fmt"
"github.com/owncloud/ocis/v2/extensions/webdav/pkg/command"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/owncloud/ocis/v2/services/webdav/pkg/command"
"github.com/urfave/cli/v2"
)

View File

@@ -15,7 +15,7 @@ func List(cfg *config.Config) *cobra.Command {
return &cobra.Command{
Use: "list",
Aliases: []string{"r"},
Short: "List running extensions",
Short: "List running services",
Run: func(cmd *cobra.Command, args []string) {
client, err := rpc.DialHTTP("tcp", net.JoinHostPort(cfg.Hostname, cfg.Port))
if err != nil {

View File

@@ -19,37 +19,37 @@ import (
"github.com/mohae/deepcopy"
"github.com/olekukonko/tablewriter"
appProvider "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/command"
appRegistry "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/command"
authbasic "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/command"
authbearer "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/command"
authmachine "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/command"
frontend "github.com/owncloud/ocis/v2/extensions/frontend/pkg/command"
gateway "github.com/owncloud/ocis/v2/extensions/gateway/pkg/command"
graphExplorer "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/command"
graph "github.com/owncloud/ocis/v2/extensions/graph/pkg/command"
groups "github.com/owncloud/ocis/v2/extensions/groups/pkg/command"
idm "github.com/owncloud/ocis/v2/extensions/idm/pkg/command"
idp "github.com/owncloud/ocis/v2/extensions/idp/pkg/command"
nats "github.com/owncloud/ocis/v2/extensions/nats/pkg/command"
notifications "github.com/owncloud/ocis/v2/extensions/notifications/pkg/command"
ocdav "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/command"
ocs "github.com/owncloud/ocis/v2/extensions/ocs/pkg/command"
proxy "github.com/owncloud/ocis/v2/extensions/proxy/pkg/command"
search "github.com/owncloud/ocis/v2/extensions/search/pkg/command"
settings "github.com/owncloud/ocis/v2/extensions/settings/pkg/command"
sharing "github.com/owncloud/ocis/v2/extensions/sharing/pkg/command"
storagepublic "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/command"
storageshares "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/command"
storageSystem "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/command"
storageusers "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/command"
store "github.com/owncloud/ocis/v2/extensions/store/pkg/command"
thumbnails "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/command"
users "github.com/owncloud/ocis/v2/extensions/users/pkg/command"
web "github.com/owncloud/ocis/v2/extensions/web/pkg/command"
webdav "github.com/owncloud/ocis/v2/extensions/webdav/pkg/command"
ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
appProvider "github.com/owncloud/ocis/v2/services/app-provider/pkg/command"
appRegistry "github.com/owncloud/ocis/v2/services/app-registry/pkg/command"
authbasic "github.com/owncloud/ocis/v2/services/auth-basic/pkg/command"
authbearer "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/command"
authmachine "github.com/owncloud/ocis/v2/services/auth-machine/pkg/command"
frontend "github.com/owncloud/ocis/v2/services/frontend/pkg/command"
gateway "github.com/owncloud/ocis/v2/services/gateway/pkg/command"
graphExplorer "github.com/owncloud/ocis/v2/services/graph-explorer/pkg/command"
graph "github.com/owncloud/ocis/v2/services/graph/pkg/command"
groups "github.com/owncloud/ocis/v2/services/groups/pkg/command"
idm "github.com/owncloud/ocis/v2/services/idm/pkg/command"
idp "github.com/owncloud/ocis/v2/services/idp/pkg/command"
nats "github.com/owncloud/ocis/v2/services/nats/pkg/command"
notifications "github.com/owncloud/ocis/v2/services/notifications/pkg/command"
ocdav "github.com/owncloud/ocis/v2/services/ocdav/pkg/command"
ocs "github.com/owncloud/ocis/v2/services/ocs/pkg/command"
proxy "github.com/owncloud/ocis/v2/services/proxy/pkg/command"
search "github.com/owncloud/ocis/v2/services/search/pkg/command"
settings "github.com/owncloud/ocis/v2/services/settings/pkg/command"
sharing "github.com/owncloud/ocis/v2/services/sharing/pkg/command"
storagepublic "github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/command"
storageshares "github.com/owncloud/ocis/v2/services/storage-shares/pkg/command"
storageSystem "github.com/owncloud/ocis/v2/services/storage-system/pkg/command"
storageusers "github.com/owncloud/ocis/v2/services/storage-users/pkg/command"
store "github.com/owncloud/ocis/v2/services/store/pkg/command"
thumbnails "github.com/owncloud/ocis/v2/services/thumbnails/pkg/command"
users "github.com/owncloud/ocis/v2/services/users/pkg/command"
web "github.com/owncloud/ocis/v2/services/web/pkg/command"
webdav "github.com/owncloud/ocis/v2/services/webdav/pkg/command"
"github.com/rs/zerolog"
"github.com/thejerf/suture/v4"
"go-micro.dev/v4/logger"