rename users and groups extensions

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

ocis/pkg/command/groups.go

@@ -3,31 +3,31 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/command"
+	"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/register"
 	"github.com/urfave/cli/v2"
 )
 
-// UserCommand is the entrypoint for the User command.
-func UserCommand(cfg *config.Config) *cli.Command {
+// GroupsCommand is the entrypoint for the groups command.
+func GroupsCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
-		Name:     cfg.User.Service.Name,
-		Usage:    subcommandDescription(cfg.User.Service.Name),
+		Name:     cfg.Groups.Service.Name,
+		Usage:    subcommandDescription(cfg.Groups.Service.Name),
 		Category: "extensions",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
 				return err
 			}
-			cfg.User.Commons = cfg.Commons
+			cfg.Groups.Commons = cfg.Commons
 			return nil
 		},
-		Subcommands: command.GetCommands(cfg.User),
+		Subcommands: command.GetCommands(cfg.Groups),
 	}
 }
 
 func init() {
-	register.AddCommand(UserCommand)
+	register.AddCommand(GroupsCommand)
 }

ocis/pkg/command/users.go

@@ -3,31 +3,31 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/command"
+	"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/register"
 	"github.com/urfave/cli/v2"
 )
 
-// GroupCommand is the entrypoint for the Group command.
-func GroupCommand(cfg *config.Config) *cli.Command {
+// UsersCommand is the entrypoint for the users command.
+func UsersCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
-		Name:     cfg.Group.Service.Name,
-		Usage:    subcommandDescription(cfg.Group.Service.Name),
+		Name:     cfg.Users.Service.Name,
+		Usage:    subcommandDescription(cfg.Users.Service.Name),
 		Category: "extensions",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg); err != nil {
 				fmt.Printf("%v", err)
 				return err
 			}
-			cfg.Group.Commons = cfg.Commons
+			cfg.Users.Commons = cfg.Commons
 			return nil
 		},
-		Subcommands: command.GetCommands(cfg.Group),
+		Subcommands: command.GetCommands(cfg.Users),
 	}
 }
 
 func init() {
-	register.AddCommand(GroupCommand)
+	register.AddCommand(UsersCommand)
 }

ocis/pkg/init/init.go

@@ -70,7 +70,7 @@ type AuthbearerExtension struct {
 	AuthProviders AuthProviderSettings `yaml:"auth_providers"`
 }
 
-type UserAndGroupExtension struct {
+type UsersAndGroupsExtension struct {
 	Drivers LdapBasedExtension
 }
 
@@ -109,8 +109,8 @@ type OcisConfig struct {
 	Frontend          FrontendExtension
 	AuthBasic         AuthbasicExtension  `yaml:"auth_basic"`
 	AuthBearer        AuthbearerExtension `yaml:"auth_bearer"`
-	User              UserAndGroupExtension
-	Group             UserAndGroupExtension
+	Users             UsersAndGroupsExtension
+	Groups            UsersAndGroupsExtension
 	StorageSystem     DataProviderInsecureSettings `yaml:"storage_system"`
 	StorageUsers      DataProviderInsecureSettings `yaml:"storage_users"`
 	Ocdav             InsecureExtension
@@ -232,14 +232,14 @@ func CreateConfig(insecure, forceOverwrite bool, configPath, adminPassword strin
 				},
 			},
 		},
-		Group: UserAndGroupExtension{
+		Groups: UsersAndGroupsExtension{
 			Drivers: LdapBasedExtension{
 				Ldap: LdapSettings{
 					Bind_password: revaServicePassword,
 				},
 			},
 		},
-		User: UserAndGroupExtension{
+		Users: UsersAndGroupsExtension{
 			Drivers: LdapBasedExtension{
 				Ldap: LdapSettings{
 					Bind_password: revaServicePassword,

ocis/pkg/runtime/service/service.go

@@ -30,7 +30,7 @@ import (
 	glauth "github.com/owncloud/ocis/v2/extensions/glauth/pkg/command"
 	graphExplorer "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/command"
 	graph "github.com/owncloud/ocis/v2/extensions/graph/pkg/command"
-	group "github.com/owncloud/ocis/v2/extensions/group/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"
@@ -47,7 +47,7 @@ import (
 	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"
-	user "github.com/owncloud/ocis/v2/extensions/user/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"
@@ -124,8 +124,8 @@ func NewService(options ...Option) (*Service, error) {
 	s.ServicesRegistry[opts.Config.OCDav.Service.Name] = ocdav.NewSutureService
 	s.ServicesRegistry[opts.Config.Gateway.Service.Name] = gateway.NewSutureService
 	s.ServicesRegistry[opts.Config.AppRegistry.Service.Name] = appRegistry.NewSutureService
-	s.ServicesRegistry[opts.Config.User.Service.Name] = user.NewSutureService
-	s.ServicesRegistry[opts.Config.Group.Service.Name] = group.NewSutureService
+	s.ServicesRegistry[opts.Config.Users.Service.Name] = users.NewSutureService
+	s.ServicesRegistry[opts.Config.Groups.Service.Name] = groups.NewSutureService
 	s.ServicesRegistry[opts.Config.AuthBasic.Service.Name] = authbasic.NewSutureService
 	s.ServicesRegistry[opts.Config.AuthBearer.Service.Name] = authbearer.NewSutureService
 	s.ServicesRegistry[opts.Config.AuthMachine.Service.Name] = authmachine.NewSutureService