add missing commands and unify service / namespace options

glauth/pkg/command/root.go

@@ -28,7 +28,7 @@ func Execute(cfg *config.Config) error {
 			},
 		},
 		Before: func(c *cli.Context) error {
-			cfg.Version = version.String
+			cfg.Service.Version = version.String
 			return nil
 		},
 		Commands: []*cli.Command{

glauth/pkg/command/server.go

@@ -2,7 +2,6 @@ package command
 
 import (
 	"context"
-	"strings"
 
 	glauthcfg "github.com/glauth/glauth/v2/pkg/config"
 	"github.com/oklog/run"
@@ -23,9 +22,6 @@ func Server(cfg *config.Config) *cli.Command {
 		Name:  "server",
 		Usage: "Start integrated server",
 		Before: func(ctx *cli.Context) error {
-			if cfg.HTTP.Root != "/" {
-				cfg.HTTP.Root = strings.TrimSuffix(cfg.HTTP.Root, "/")
-			}
 
 			if err := ParseConfig(ctx, cfg); err != nil {
 				return err

glauth/pkg/command/version.go

@@ -0,0 +1,47 @@
+package command
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/owncloud/ocis/ocis-pkg/registry"
+
+	tw "github.com/olekukonko/tablewriter"
+	"github.com/owncloud/ocis/glauth/pkg/config"
+	"github.com/urfave/cli/v2"
+)
+
+// PrintVersion prints the service versions of all running instances.
+func PrintVersion(cfg *config.Config) *cli.Command {
+	return &cli.Command{
+		Name:  "version",
+		Usage: "Print the versions of the running instances",
+		Before: func(c *cli.Context) error {
+			return ParseConfig(c, cfg)
+		},
+		Action: func(c *cli.Context) error {
+			reg := registry.GetRegistry()
+			services, err := reg.GetService(cfg.Ldaps.Namespace + "." + cfg.Service.Name)
+			if err != nil {
+				fmt.Println(fmt.Errorf("could not get glauth services from the registry: %v", err))
+				return err
+			}
+
+			if len(services) == 0 {
+				fmt.Println("No running glauth service found.")
+				return nil
+			}
+
+			table := tw.NewWriter(os.Stdout)
+			table.SetHeader([]string{"Version", "Address", "Id"})
+			table.SetAutoFormatHeaders(false)
+			for _, s := range services {
+				for _, n := range s.Nodes {
+					table.Append([]string{s.Version, n.Address, n.Id})
+				}
+			}
+			table.Render()
+			return nil
+		},
+	}
+}

glauth/pkg/config/config.go

@@ -17,11 +17,10 @@ type Debug struct {
 	Zpages bool   `ocisConfig:"zpages"`
 }
 
-// HTTP defines the available http configuration.
-type HTTP struct {
-	Addr      string `ocisConfig:"addr"`
-	Namespace string `ocisConfig:"namespace"`
-	Root      string `ocisConfig:"root"`
+// Service defines the available service configuration.
+type Service struct {
+	Name    string `ocisConfig:"name"`
+	Version string `ocisConfig:"version"`
 }
 
 // Tracing defines the available tracing configuration.
@@ -35,16 +34,18 @@ type Tracing struct {
 
 // Ldap defined the available LDAP configuration.
 type Ldap struct {
-	Enabled bool   `ocisConfig:"enabled"`
-	Addr    string `ocisConfig:"addr"`
+	Enabled   bool   `ocisConfig:"enabled"`
+	Addr      string `ocisConfig:"addr"`
+	Namespace string `ocisConfig:"namespace"`
 }
 
 // Ldaps defined the available LDAPS configuration.
 type Ldaps struct {
-	Addr    string `ocisConfig:"addr"`
-	Enabled bool   `ocisConfig:"enabled"`
-	Cert    string `ocisConfig:"cert"`
-	Key     string `ocisConfig:"key"`
+	Enabled   bool   `ocisConfig:"enabled"`
+	Addr      string `ocisConfig:"addr"`
+	Namespace string `ocisConfig:"namespace"`
+	Cert      string `ocisConfig:"cert"`
+	Key       string `ocisConfig:"key"`
 }
 
 // Backend defined the available backend configuration.
@@ -66,7 +67,7 @@ type Config struct {
 	File           string      `ocisConfig:"file"`
 	Log            *shared.Log `ocisConfig:"log"`
 	Debug          Debug       `ocisConfig:"debug"`
-	HTTP           HTTP        `ocisConfig:"http"`
+	Service        Service     `ocisConfig:"service"`
 	Tracing        Tracing     `ocisConfig:"tracing"`
 	Ldap           Ldap        `ocisConfig:"ldap"`
 	Ldaps          Ldaps       `ocisConfig:"ldaps"`
@@ -89,20 +90,24 @@ func DefaultConfig() *Config {
 		Debug: Debug{
 			Addr: "127.0.0.1:9129",
 		},
-		HTTP: HTTP{},
 		Tracing: Tracing{
 			Type:    "jaeger",
 			Service: "glauth",
 		},
+		Service: Service{
+			Name: "glauth",
+		},
 		Ldap: Ldap{
-			Enabled: true,
-			Addr:    "127.0.0.1:9125",
+			Enabled:   true,
+			Addr:      "127.0.0.1:9125",
+			Namespace: "com.owncloud.ldap",
 		},
 		Ldaps: Ldaps{
-			Addr:    "127.0.0.1:9126",
-			Enabled: true,
-			Cert:    path.Join(defaults.BaseDataPath(), "ldap", "ldap.crt"),
-			Key:     path.Join(defaults.BaseDataPath(), "ldap", "ldap.key"),
+			Enabled:   true,
+			Addr:      "127.0.0.1:9126",
+			Namespace: "com.owncloud.ldaps",
+			Cert:      path.Join(defaults.BaseDataPath(), "ldap", "ldap.crt"),
+			Key:       path.Join(defaults.BaseDataPath(), "ldap", "ldap.key"),
 		},
 		Backend: Backend{
 			Datastore:   "accounts",