enhancement: allow skipping service listing

This commit is contained in:
Florian Schade committed 2024-02-08 15:24:40 +01:00
1 parent b058934d4c
commit 46e3499a47
2 files changed
+30 -7

No files matched your search

@@ -0,0 +1,7 @@
Enhancement: allow to skip service listing
The ocis version cmd listed all services by default. This is not always intended,
so we allow to skip the listing of the services by using the --skip-services flag.
https://github.com/owncloud/ocis/pull/8408
https://github.com/owncloud/ocis/issues/8070
+23 -7
View File
@@ -5,29 +5,45 @@ import (
"os"
tw "github.com/olekukonko/tablewriter"
"github.com/urfave/cli/v2"
mreg "go-micro.dev/v4/registry"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
"github.com/owncloud/ocis/v2/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/owncloud/ocis/v2/ocis/pkg/register"
"github.com/urfave/cli/v2"
mreg "go-micro.dev/v4/registry"
)
const (
_skipServiceListingFlagName = "skip-services"
)
// VersionCommand is the entrypoint for the version command.
func VersionCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "version",
Usage: "print the version of this binary and all running service instances",
Name: "version",
Usage: "print the version of this binary and all running service instances",
Flags: []cli.Flag{
&cli.BoolFlag{
Name: _skipServiceListingFlagName,
Usage: "skip service listing",
},
},
Category: "info",
Action: func(c *cli.Context) error {
fmt.Println("Version: " + version.GetString())
fmt.Printf("Compiled: %s\n", version.Compiled())
fmt.Println("")
if c.Bool(_skipServiceListingFlagName) {
return nil
}
fmt.Print("\n")
reg := registry.GetRegistry()
serviceList, err := reg.ListServices()
if err != nil {
fmt.Println(fmt.Errorf("could not list services: %v", err))
fmt.Printf("could not list services: %v\n", err)
return err
}
@@ -35,7 +51,7 @@ func VersionCommand(cfg *config.Config) *cli.Command {
for _, s := range serviceList {
s, err := reg.GetService(s.Name)
if err != nil {
fmt.Println(fmt.Errorf("could not get service: %v", err))
fmt.Printf("could not get service: %v\n", err)
return err
}
services = append(services, s...)