fix version info

owncloud · Jun 13, 2022 · 68a6f43 · 68a6f43
1 parent 588293f
commit 68a6f43
Show file tree

Hide file tree

Showing 93 changed files with 112 additions and 102 deletions.
diff --git a/changelog/unreleased/fix-version-info b/changelog/unreleased/fix-version-info
@@ -0,0 +1,10 @@
+Bugfix: Fix version info
+
+We've fixed the version info that is displayed when you run:
+
+- `ocis version`
+- `ocis <extension name> version`
+
+Since #2918, these commands returned an empty version only.
+
+https://github.com/owncloud/ocis/pull/3953
diff --git a/extensions/app-provider/pkg/command/server.go b/extensions/app-provider/pkg/command/server.go
@@ -85,7 +85,7 @@ func Server(cfg *config.Config) *cli.Command {
 				cfg.GRPC.Namespace+"."+cfg.Service.Name,
 				uuid.Must(uuid.NewV4()).String(),
 				cfg.GRPC.Addr,
-				version.String,
+				version.GetString(),
 				logger,
 			); err != nil {
 				logger.Fatal().Err(err).Msg("failed to register the grpc endpoint")

diff --git a/extensions/app-provider/pkg/command/version.go b/extensions/app-provider/pkg/command/version.go
@@ -19,7 +19,7 @@ func Version(cfg *config.Config) *cli.Command {
 		Usage:    "print the version of this binary and the running extension instances",
 		Category: "info",
 		Action: func(c *cli.Context) error {
-			fmt.Println("Version: " + version.String)
+			fmt.Println("Version: " + version.GetString())
 			fmt.Printf("Compiled: %s\n", version.Compiled())
 			fmt.Println("")
 

diff --git a/extensions/app-provider/pkg/server/debug/server.go b/extensions/app-provider/pkg/server/debug/server.go
@@ -16,7 +16,7 @@ func Server(opts ...Option) (*http.Server, error) {
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
-		debug.Version(version.String),
+		debug.Version(version.GetString()),
 		debug.Address(options.Config.Debug.Addr),
 		debug.Token(options.Config.Debug.Token),
 		debug.Pprof(options.Config.Debug.Pprof),

diff --git a/extensions/app-registry/pkg/command/server.go b/extensions/app-registry/pkg/command/server.go
@@ -80,7 +80,7 @@ func Server(cfg *config.Config) *cli.Command {
 				cfg.GRPC.Namespace+"."+cfg.Service.Name,
 				uuid.Must(uuid.NewV4()).String(),
 				cfg.GRPC.Addr,
-				version.String,
+				version.GetString(),
 				logger,
 			); err != nil {
 				logger.Fatal().Err(err).Msg("failed to register the grpc endpoint")

diff --git a/extensions/app-registry/pkg/command/version.go b/extensions/app-registry/pkg/command/version.go
@@ -19,7 +19,7 @@ func Version(cfg *config.Config) *cli.Command {
 		Usage:    "print the version of this binary and the running extension instances",
 		Category: "info",
 		Action: func(c *cli.Context) error {
-			fmt.Println("Version: " + version.String)
+			fmt.Println("Version: " + version.GetString())
 			fmt.Printf("Compiled: %s\n", version.Compiled())
 			fmt.Println("")
 

diff --git a/extensions/app-registry/pkg/server/debug/server.go b/extensions/app-registry/pkg/server/debug/server.go
@@ -16,7 +16,7 @@ func Server(opts ...Option) (*http.Server, error) {
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
-		debug.Version(version.String),
+		debug.Version(version.GetString()),
 		debug.Address(options.Config.Debug.Addr),
 		debug.Token(options.Config.Debug.Token),
 		debug.Pprof(options.Config.Debug.Pprof),

diff --git a/extensions/auth-basic/pkg/command/server.go b/extensions/auth-basic/pkg/command/server.go
@@ -98,7 +98,7 @@ func Server(cfg *config.Config) *cli.Command {
 				cfg.GRPC.Namespace+"."+cfg.Service.Name,
 				uuid.Must(uuid.NewV4()).String(),
 				cfg.GRPC.Addr,
-				version.String,
+				version.GetString(),
 				logger,
 			); err != nil {
 				logger.Fatal().Err(err).Msg("failed to register the grpc endpoint")

diff --git a/extensions/auth-basic/pkg/command/version.go b/extensions/auth-basic/pkg/command/version.go
@@ -19,7 +19,7 @@ func Version(cfg *config.Config) *cli.Command {
 		Usage:    "print the version of this binary and the running extension instances",
 		Category: "info",
 		Action: func(c *cli.Context) error {
-			fmt.Println("Version: " + version.String)
+			fmt.Println("Version: " + version.GetString())
 			fmt.Printf("Compiled: %s\n", version.Compiled())
 			fmt.Println("")
 

diff --git a/extensions/auth-basic/pkg/server/debug/server.go b/extensions/auth-basic/pkg/server/debug/server.go
@@ -16,7 +16,7 @@ func Server(opts ...Option) (*http.Server, error) {
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
-		debug.Version(version.String),
+		debug.Version(version.GetString()),
 		debug.Address(options.Config.Debug.Addr),
 		debug.Token(options.Config.Debug.Token),
 		debug.Pprof(options.Config.Debug.Pprof),

diff --git a/extensions/auth-bearer/pkg/command/server.go b/extensions/auth-bearer/pkg/command/server.go
@@ -85,7 +85,7 @@ func Server(cfg *config.Config) *cli.Command {
 				cfg.GRPC.Namespace+"."+cfg.Service.Name,
 				uuid.Must(uuid.NewV4()).String(),
 				cfg.GRPC.Addr,
-				version.String,
+				version.GetString(),
 				logger,
 			); err != nil {
 				logger.Fatal().Err(err).Msg("failed to register the grpc endpoint")

diff --git a/extensions/auth-bearer/pkg/command/version.go b/extensions/auth-bearer/pkg/command/version.go
@@ -19,7 +19,7 @@ func Version(cfg *config.Config) *cli.Command {
 		Usage:    "print the version of this binary and the running extension instances",
 		Category: "info",
 		Action: func(c *cli.Context) error {
-			fmt.Println("Version: " + version.String)
+			fmt.Println("Version: " + version.GetString())
 			fmt.Printf("Compiled: %s\n", version.Compiled())
 			fmt.Println("")
 

diff --git a/extensions/auth-bearer/pkg/server/debug/server.go b/extensions/auth-bearer/pkg/server/debug/server.go
@@ -16,7 +16,7 @@ func Server(opts ...Option) (*http.Server, error) {
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
-		debug.Version(version.String),
+		debug.Version(version.GetString()),
 		debug.Address(options.Config.Debug.Addr),
 		debug.Token(options.Config.Debug.Token),
 		debug.Pprof(options.Config.Debug.Pprof),

diff --git a/extensions/auth-machine/pkg/command/server.go b/extensions/auth-machine/pkg/command/server.go
@@ -85,7 +85,7 @@ func Server(cfg *config.Config) *cli.Command {
 				cfg.GRPC.Namespace+"."+cfg.Service.Name,
 				uuid.Must(uuid.NewV4()).String(),
 				cfg.GRPC.Addr,
-				version.String,
+				version.GetString(),
 				logger,
 			); err != nil {
 				logger.Fatal().Err(err).Msg("failed to register the grpc endpoint")

diff --git a/extensions/auth-machine/pkg/command/version.go b/extensions/auth-machine/pkg/command/version.go
@@ -19,7 +19,7 @@ func Version(cfg *config.Config) *cli.Command {
 		Usage:    "print the version of this binary and the running extension instances",
 		Category: "info",
 		Action: func(c *cli.Context) error {
-			fmt.Println("Version: " + version.String)
+			fmt.Println("Version: " + version.GetString())
 			fmt.Printf("Compiled: %s\n", version.Compiled())
 			fmt.Println("")
 

diff --git a/extensions/auth-machine/pkg/server/debug/server.go b/extensions/auth-machine/pkg/server/debug/server.go
@@ -16,7 +16,7 @@ func Server(opts ...Option) (*http.Server, error) {
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
-		debug.Version(version.String),
+		debug.Version(version.GetString()),
 		debug.Address(options.Config.Debug.Addr),
 		debug.Token(options.Config.Debug.Token),
 		debug.Pprof(options.Config.Debug.Pprof),

diff --git a/extensions/frontend/pkg/command/server.go b/extensions/frontend/pkg/command/server.go
@@ -85,7 +85,7 @@ func Server(cfg *config.Config) *cli.Command {
 				cfg.HTTP.Namespace+"."+cfg.Service.Name,
 				uuid.Must(uuid.NewV4()).String(),
 				cfg.HTTP.Addr,
-				version.String,
+				version.GetString(),
 				logger,
 			); err != nil {
 				logger.Fatal().Err(err).Msg("failed to register the http endpoint")

diff --git a/extensions/frontend/pkg/command/version.go b/extensions/frontend/pkg/command/version.go
@@ -19,7 +19,7 @@ func Version(cfg *config.Config) *cli.Command {
 		Usage:    "print the version of this binary and the running extension instances",
 		Category: "info",
 		Action: func(c *cli.Context) error {
-			fmt.Println("Version: " + version.String)
+			fmt.Println("Version: " + version.GetString())
 			fmt.Printf("Compiled: %s\n", version.Compiled())
 			fmt.Println("")
 

diff --git a/extensions/frontend/pkg/server/debug/server.go b/extensions/frontend/pkg/server/debug/server.go
@@ -16,7 +16,7 @@ func Server(opts ...Option) (*http.Server, error) {
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
-		debug.Version(version.String),
+		debug.Version(version.GetString()),
 		debug.Address(options.Config.Debug.Addr),
 		debug.Token(options.Config.Debug.Token),
 		debug.Pprof(options.Config.Debug.Pprof),

diff --git a/extensions/gateway/pkg/command/server.go b/extensions/gateway/pkg/command/server.go
@@ -80,7 +80,7 @@ func Server(cfg *config.Config) *cli.Command {
 				cfg.GRPC.Namespace+"."+cfg.Service.Name,
 				uuid.Must(uuid.NewV4()).String(),
 				cfg.GRPC.Addr,
-				version.String,
+				version.GetString(),
 				logger,
 			); err != nil {
 				logger.Fatal().Err(err).Msg("failed to register the grpc endpoint")

diff --git a/extensions/gateway/pkg/command/version.go b/extensions/gateway/pkg/command/version.go
@@ -19,7 +19,7 @@ func Version(cfg *config.Config) *cli.Command {
 		Usage:    "print the version of this binary and the running extension instances",
 		Category: "info",
 		Action: func(c *cli.Context) error {
-			fmt.Println("Version: " + version.String)
+			fmt.Println("Version: " + version.GetString())
 			fmt.Printf("Compiled: %s\n", version.Compiled())
 			fmt.Println("")
 

diff --git a/extensions/gateway/pkg/server/debug/server.go b/extensions/gateway/pkg/server/debug/server.go
@@ -16,7 +16,7 @@ func Server(opts ...Option) (*http.Server, error) {
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
-		debug.Version(version.String),
+		debug.Version(version.GetString()),
 		debug.Address(options.Config.Debug.Addr),
 		debug.Token(options.Config.Debug.Token),
 		debug.Pprof(options.Config.Debug.Pprof),

diff --git a/extensions/graph-explorer/pkg/command/server.go b/extensions/graph-explorer/pkg/command/server.go
@@ -50,7 +50,7 @@ func Server(cfg *config.Config) *cli.Command {
 
 			defer cancel()
 
-			mtrcs.BuildInfo.WithLabelValues(version.String).Set(1)
+			mtrcs.BuildInfo.WithLabelValues(version.GetString()).Set(1)
 
 			{
 				server, err := http.Server(

diff --git a/extensions/graph-explorer/pkg/command/version.go b/extensions/graph-explorer/pkg/command/version.go
@@ -19,7 +19,7 @@ func Version(cfg *config.Config) *cli.Command {
 		Usage:    "print the version of this binary and the running extension instances",
 		Category: "info",
 		Action: func(c *cli.Context) error {
-			fmt.Println("Version: " + version.String)
+			fmt.Println("Version: " + version.GetString())
 			fmt.Printf("Compiled: %s\n", version.Compiled())
 			fmt.Println("")
 

diff --git a/extensions/graph-explorer/pkg/server/debug/server.go b/extensions/graph-explorer/pkg/server/debug/server.go
@@ -16,7 +16,7 @@ func Server(opts ...Option) (*http.Server, error) {
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
-		debug.Version(version.String),
+		debug.Version(version.GetString()),
 		debug.Address(options.Config.Debug.Addr),
 		debug.Token(options.Config.Debug.Token),
 		debug.Pprof(options.Config.Debug.Pprof),

diff --git a/extensions/graph-explorer/pkg/server/http/server.go b/extensions/graph-explorer/pkg/server/http/server.go
@@ -17,7 +17,7 @@ func Server(opts ...Option) (http.Service, error) {
 		http.Logger(options.Logger),
 		http.Namespace(options.Namespace),
 		http.Name("graph-explorer"),
-		http.Version(version.String),
+		http.Version(version.GetString()),
 		http.Address(options.Config.HTTP.Addr),
 		http.Context(options.Context),
 		http.Flags(options.Flags...),
@@ -33,7 +33,7 @@ func Server(opts ...Option) (http.Service, error) {
 			middleware.Secure,
 			middleware.Version(
 				"graph-explorer",
-				version.String,
+				version.GetString(),
 			),
 			middleware.Logger(
 				options.Logger,

diff --git a/extensions/graph/pkg/command/server.go b/extensions/graph/pkg/command/server.go
@@ -49,7 +49,7 @@ func Server(cfg *config.Config) *cli.Command {
 
 			defer cancel()
 
-			mtrcs.BuildInfo.WithLabelValues(version.String).Set(1)
+			mtrcs.BuildInfo.WithLabelValues(version.GetString()).Set(1)
 
 			{
 				server, err := http.Server(

diff --git a/extensions/graph/pkg/command/version.go b/extensions/graph/pkg/command/version.go
@@ -19,7 +19,7 @@ func Version(cfg *config.Config) *cli.Command {
 		Usage:    "print the version of this binary and the running extension instances",
 		Category: "info",
 		Action: func(c *cli.Context) error {
-			fmt.Println("Version: " + version.String)
+			fmt.Println("Version: " + version.GetString())
 			fmt.Printf("Compiled: %s\n", version.Compiled())
 			fmt.Println("")
 

diff --git a/extensions/graph/pkg/server/debug/server.go b/extensions/graph/pkg/server/debug/server.go
@@ -16,7 +16,7 @@ func Server(opts ...Option) (*http.Server, error) {
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
-		debug.Version(version.String),
+		debug.Version(version.GetString()),
 		debug.Address(options.Config.Debug.Addr),
 		debug.Token(options.Config.Debug.Token),
 		debug.Pprof(options.Config.Debug.Pprof),

diff --git a/extensions/graph/pkg/server/http/server.go b/extensions/graph/pkg/server/http/server.go
@@ -22,7 +22,7 @@ func Server(opts ...Option) (http.Service, error) {
 		http.Logger(options.Logger),
 		http.Namespace(options.Config.HTTP.Namespace),
 		http.Name("graph"),
-		http.Version(version.String),
+		http.Version(version.GetString()),
 		http.Address(options.Config.HTTP.Addr),
 		http.Context(options.Context),
 		http.Flags(options.Flags...),
@@ -46,7 +46,7 @@ func Server(opts ...Option) (http.Service, error) {
 			chimiddleware.RequestID,
 			middleware.Version(
 				"graph",
-				version.String,
+				version.GetString(),
 			),
 			middleware.Logger(
 				options.Logger,

diff --git a/extensions/groups/pkg/command/server.go b/extensions/groups/pkg/command/server.go
@@ -98,7 +98,7 @@ func Server(cfg *config.Config) *cli.Command {
 				cfg.GRPC.Namespace+"."+cfg.Service.Name,
 				uuid.Must(uuid.NewV4()).String(),
 				cfg.GRPC.Addr,
-				version.String,
+				version.GetString(),
 				logger,
 			); err != nil {
 				logger.Fatal().Err(err).Msg("failed to register the grpc endpoint")

diff --git a/extensions/groups/pkg/command/version.go b/extensions/groups/pkg/command/version.go
@@ -19,7 +19,7 @@ func Version(cfg *config.Config) *cli.Command {
 		Usage:    "print the version of this binary and the running extension instances",
 		Category: "info",
 		Action: func(c *cli.Context) error {
-			fmt.Println("Version: " + version.String)
+			fmt.Println("Version: " + version.GetString())
 			fmt.Printf("Compiled: %s\n", version.Compiled())
 			fmt.Println("")
 

diff --git a/extensions/groups/pkg/server/debug/server.go b/extensions/groups/pkg/server/debug/server.go
@@ -16,7 +16,7 @@ func Server(opts ...Option) (*http.Server, error) {
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
-		debug.Version(version.String),
+		debug.Version(version.GetString()),
 		debug.Address(options.Config.Debug.Addr),
 		debug.Token(options.Config.Debug.Token),
 		debug.Pprof(options.Config.Debug.Pprof),

diff --git a/extensions/idm/pkg/server/debug/server.go b/extensions/idm/pkg/server/debug/server.go
@@ -16,7 +16,7 @@ func Server(opts ...Option) (*http.Server, error) {
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
-		debug.Version(version.String),
+		debug.Version(version.GetString()),
 		debug.Address(options.Config.Debug.Addr),
 		debug.Token(options.Config.Debug.Token),
 		debug.Pprof(options.Config.Debug.Pprof),

diff --git a/extensions/idp/pkg/command/server.go b/extensions/idp/pkg/command/server.go
@@ -50,7 +50,7 @@ func Server(cfg *config.Config) *cli.Command {
 
 			defer cancel()
 
-			metrics.BuildInfo.WithLabelValues(version.String).Set(1)
+			metrics.BuildInfo.WithLabelValues(version.GetString()).Set(1)
 
 			{
 				server, err := http.Server(

diff --git a/extensions/idp/pkg/command/version.go b/extensions/idp/pkg/command/version.go
@@ -19,7 +19,7 @@ func Version(cfg *config.Config) *cli.Command {
 		Usage:    "print the version of this binary and the running extension instances",
 		Category: "info",
 		Action: func(c *cli.Context) error {
-			fmt.Println("Version: " + version.String)
+			fmt.Println("Version: " + version.GetString())
 			fmt.Printf("Compiled: %s\n", version.Compiled())
 			fmt.Println("")
 

diff --git a/extensions/idp/pkg/server/debug/server.go b/extensions/idp/pkg/server/debug/server.go
@@ -19,7 +19,7 @@ func Server(opts ...Option) (*http.Server, error) {
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
-		debug.Version(version.String),
+		debug.Version(version.GetString()),
 		debug.Address(options.Config.Debug.Addr),
 		debug.Token(options.Config.Debug.Token),
 		debug.Pprof(options.Config.Debug.Pprof),

diff --git a/extensions/idp/pkg/server/http/server.go b/extensions/idp/pkg/server/http/server.go
@@ -43,7 +43,7 @@ func Server(opts ...Option) (http.Service, error) {
 		http.Logger(options.Logger),
 		http.Namespace(options.Config.HTTP.Namespace),
 		http.Name(options.Config.Service.Name),
-		http.Version(version.String),
+		http.Version(version.GetString()),
 		http.Address(options.Config.HTTP.Addr),
 		http.Context(options.Context),
 		http.Flags(options.Flags...),
@@ -61,7 +61,7 @@ func Server(opts ...Option) (http.Service, error) {
 			middleware.Secure,
 			middleware.Version(
 				options.Config.Service.Name,
-				version.String,
+				version.GetString(),
 			),
 			middleware.Logger(
 				options.Logger,

diff --git a/extensions/ocdav/pkg/command/server.go b/extensions/ocdav/pkg/command/server.go
@@ -44,7 +44,7 @@ func Server(cfg *config.Config) *cli.Command {
 			gr.Add(func() error {
 				s, err := ocdav.Service(
 					ocdav.Name(cfg.HTTP.Namespace+"."+cfg.Service.Name),
-					ocdav.Version(version.String),
+					ocdav.Version(version.GetString()),
 					ocdav.Context(ctx),
 					ocdav.Logger(logger.Logger),
 					ocdav.Address(cfg.HTTP.Addr),

diff --git a/extensions/ocdav/pkg/command/version.go b/extensions/ocdav/pkg/command/version.go
@@ -19,7 +19,7 @@ func Version(cfg *config.Config) *cli.Command {
 		Usage:    "print the version of this binary and the running extension instances",
 		Category: "info",
 		Action: func(c *cli.Context) error {
-			fmt.Println("Version: " + version.String)
+			fmt.Println("Version: " + version.GetString())
 			fmt.Printf("Compiled: %s\n", version.Compiled())
 			fmt.Println("")
 

diff --git a/extensions/ocdav/pkg/server/debug/server.go b/extensions/ocdav/pkg/server/debug/server.go
@@ -16,7 +16,7 @@ func Server(opts ...Option) (*http.Server, error) {
 	return debug.NewService(
 		debug.Logger(options.Logger),
 		debug.Name(options.Config.Service.Name),
-		debug.Version(version.String),
+		debug.Version(version.GetString()),
 		debug.Address(options.Config.Debug.Addr),
 		debug.Token(options.Config.Debug.Token),
 		debug.Pprof(options.Config.Debug.Pprof),