rename users and groups extensions

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

extensions/groups/Makefile

@@ -1,5 +1,5 @@
 SHELL := bash
-NAME := user
+NAME := groups
 
 include ../../.make/recursion.mk
 

extensions/groups/cmd/groups/main.go

@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/command"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config/defaults"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/command"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config/defaults"
 )
 
 func main() {

extensions/groups/pkg/command/health.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config/parser"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/logging"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config/parser"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/logging"
 	"github.com/urfave/cli/v2"
 )
 

extensions/groups/pkg/command/root.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"os"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
 	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/thejerf/suture/v4"
@@ -48,9 +48,9 @@ type SutureService struct {
 
 // NewSutureService creates a new group.SutureService
 func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.Group.Commons = cfg.Commons
+	cfg.Groups.Commons = cfg.Commons
 	return SutureService{
-		cfg: cfg.Group,
+		cfg: cfg.Groups,
 	}
 }
 

extensions/groups/pkg/command/server.go

@@ -9,12 +9,12 @@ import (
 	"github.com/cs3org/reva/v2/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config/parser"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/logging"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/revaconfig"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/server/debug"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/tracing"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config/parser"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/logging"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/revaconfig"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/server/debug"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/tracing"
 	"github.com/owncloud/ocis/v2/ocis-pkg/ldap"
 	"github.com/owncloud/ocis/v2/ocis-pkg/service/external"
 	"github.com/owncloud/ocis/v2/ocis-pkg/sync"

extensions/groups/pkg/command/version.go

@@ -8,7 +8,7 @@ import (
 	"github.com/owncloud/ocis/v2/ocis-pkg/version"
 
 	tw "github.com/olekukonko/tablewriter"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 

extensions/groups/pkg/config/defaults/defaultconfig.go

@@ -3,7 +3,7 @@ package defaults
 import (
 	"path/filepath"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
 )
 
@@ -28,7 +28,7 @@ func DefaultConfig() *config.Config {
 			Protocol:  "tcp",
 		},
 		Service: config.Service{
-			Name: "group",
+			Name: "groups",
 		},
 		GroupMembersCacheExpiration: 5,
 		Reva: &config.Reva{

extensions/groups/pkg/config/parser/parse.go

@@ -3,8 +3,8 @@ package parser
 import (
 	"errors"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config/defaults"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config/defaults"
 	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/shared"
 

extensions/groups/pkg/logging/logging.go

@@ -1,7 +1,7 @@
 package logging
 
 import (
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
 )
 

extensions/groups/pkg/revaconfig/config.go

@@ -1,7 +1,7 @@
 package revaconfig
 
 import (
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 )
 
 // GroupsConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.

extensions/groups/pkg/server/debug/option.go

@@ -3,7 +3,7 @@ package debug
 import (
 	"context"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
 )
 

extensions/groups/pkg/server/debug/server.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/service/debug"
 	"github.com/owncloud/ocis/v2/ocis-pkg/version"
 )

extensions/groups/pkg/tracing/tracing.go

@@ -1,7 +1,7 @@
 package tracing
 
 import (
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/groups/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
 	"github.com/owncloud/ocis/v2/ocis-pkg/tracing"
 	"go.opentelemetry.io/otel/trace"

extensions/users/Makefile

@@ -1,5 +1,5 @@
 SHELL := bash
-NAME := group
+NAME := users
 
 include ../../.make/recursion.mk
 

extensions/users/cmd/user/main.go

@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/command"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config/defaults"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/command"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config/defaults"
 )
 
 func main() {

extensions/users/pkg/command/health.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config/parser"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/logging"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config/parser"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/logging"
 	"github.com/urfave/cli/v2"
 )
 

extensions/users/pkg/command/root.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"os"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
 	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/thejerf/suture/v4"
@@ -48,9 +48,9 @@ type SutureService struct {
 
 // NewSutureService creates a new user.SutureService
 func NewSutureService(cfg *ociscfg.Config) suture.Service {
-	cfg.User.Commons = cfg.Commons
+	cfg.Users.Commons = cfg.Commons
 	return SutureService{
-		cfg: cfg.User,
+		cfg: cfg.Users,
 	}
 }
 

extensions/users/pkg/command/server.go

@@ -9,12 +9,12 @@ import (
 	"github.com/cs3org/reva/v2/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config/parser"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/logging"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/revaconfig"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/server/debug"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/tracing"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config/parser"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/logging"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/revaconfig"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/server/debug"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/tracing"
 	"github.com/owncloud/ocis/v2/ocis-pkg/ldap"
 	"github.com/owncloud/ocis/v2/ocis-pkg/service/external"
 	"github.com/owncloud/ocis/v2/ocis-pkg/sync"

extensions/users/pkg/command/version.go

@@ -8,7 +8,7 @@ import (
 	"github.com/owncloud/ocis/v2/ocis-pkg/version"
 
 	tw "github.com/olekukonko/tablewriter"
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 

extensions/users/pkg/config/config.go

@@ -18,7 +18,7 @@ type Config struct {
 	TokenManager *TokenManager `yaml:"token_manager"`
 	Reva         *Reva         `yaml:"reva"`
 
-	SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token" env:"USER_SKIP_USER_GROUPS_IN_TOKEN"`
+	SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token" env:"USERS_SKIP_USER_GROUPS_IN_TOKEN"`
 
 	UsersCacheExpiration int     `yaml:"users_cache_expiration"`
 	Driver               string  `yaml:"driver"`

extensions/users/pkg/config/defaults/defaultconfig.go

@@ -3,7 +3,7 @@ package defaults
 import (
 	"path/filepath"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/defaults"
 )
 
@@ -28,7 +28,7 @@ func DefaultConfig() *config.Config {
 			Protocol:  "tcp",
 		},
 		Service: config.Service{
-			Name: "user",
+			Name: "users",
 		},
 		UsersCacheExpiration: 5,
 		Reva: &config.Reva{

extensions/users/pkg/config/parser/parse.go

@@ -3,8 +3,8 @@ package parser
 import (
 	"errors"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config/defaults"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config/defaults"
 	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/shared"
 

extensions/users/pkg/logging/logging.go

@@ -1,7 +1,7 @@
 package logging
 
 import (
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
 )
 

extensions/users/pkg/revaconfig/config.go

@@ -1,7 +1,7 @@
 package revaconfig
 
 import (
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
 )
 
 // UsersConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service.

extensions/users/pkg/server/debug/option.go

@@ -3,7 +3,7 @@ package debug
 import (
 	"context"
 
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
 )
 

extensions/users/pkg/server/debug/server.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/owncloud/ocis/v2/extensions/group/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/service/debug"
 	"github.com/owncloud/ocis/v2/ocis-pkg/version"
 )

extensions/users/pkg/tracing/tracing.go

@@ -1,7 +1,7 @@
 package tracing
 
 import (
-	"github.com/owncloud/ocis/v2/extensions/user/pkg/config"
+	"github.com/owncloud/ocis/v2/extensions/users/pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
 	"github.com/owncloud/ocis/v2/ocis-pkg/tracing"
 	"go.opentelemetry.io/otel/trace"