example/cmd/microctl: Set microcluster/app version

Signed-off-by: Wesley Hershberger <[email protected]>
MggMuggins · Jul 2, 2024 · 76b1917 · 76b1917
1 parent f46125b
commit 76b1917
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 10 deletions.
diff --git a/example/cmd/microctl/cluster_members.go b/example/cmd/microctl/cluster_members.go
@@ -8,6 +8,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/canonical/microcluster/client"
+	"github.com/canonical/microcluster/example/version"
 	"github.com/canonical/microcluster/microcluster"
 )
 
@@ -55,7 +56,12 @@ func (c *cmdClusterMembersList) run(cmd *cobra.Command, args []string) error {
 	}
 
 	// Get all state information for MicroCluster.
-	m, err := microcluster.App(microcluster.Args{StateDir: c.common.FlagStateDir, Verbose: c.common.FlagLogVerbose, Debug: c.common.FlagLogDebug})
+	m, err := microcluster.App(microcluster.Args{
+		StateDir: c.common.FlagStateDir,
+		Verbose:  c.common.FlagLogVerbose,
+		Debug:    c.common.FlagLogDebug,
+		Version:  version.Version,
+	})
 	if err != nil {
 		return err
 	}
@@ -114,7 +120,12 @@ func (c *cmdClusterMemberRemove) run(cmd *cobra.Command, args []string) error {
 		return cmd.Help()
 	}
 
-	m, err := microcluster.App(microcluster.Args{StateDir: c.common.FlagStateDir, Verbose: c.common.FlagLogVerbose, Debug: c.common.FlagLogDebug})
+	m, err := microcluster.App(microcluster.Args{
+		StateDir: c.common.FlagStateDir,
+		Verbose:  c.common.FlagLogVerbose,
+		Debug:    c.common.FlagLogDebug,
+		Version:  version.Version,
+	})
 	if err != nil {
 		return err
 	}

diff --git a/example/cmd/microctl/extended_cmd.go b/example/cmd/microctl/extended_cmd.go
@@ -7,6 +7,7 @@ import (
 
 	microClient "github.com/canonical/microcluster/client"
 	"github.com/canonical/microcluster/example/client"
+	"github.com/canonical/microcluster/example/version"
 	"github.com/canonical/microcluster/microcluster"
 )
 
@@ -29,7 +30,12 @@ func (c *cmdExtended) run(cmd *cobra.Command, args []string) error {
 		return cmd.Help()
 	}
 
-	m, err := microcluster.App(microcluster.Args{StateDir: c.common.FlagStateDir, Verbose: c.common.FlagLogVerbose, Debug: c.common.FlagLogDebug})
+	m, err := microcluster.App(microcluster.Args{
+		StateDir: c.common.FlagStateDir,
+		Verbose:  c.common.FlagLogVerbose,
+		Debug:    c.common.FlagLogDebug,
+		Version:  version.Version,
+	})
 	if err != nil {
 		return err
 	}

diff --git a/example/cmd/microctl/main_init.go b/example/cmd/microctl/main_init.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/canonical/microcluster/example/version"
 	"github.com/canonical/microcluster/microcluster"
 )
 
@@ -41,7 +42,12 @@ func (c *cmdInit) run(cmd *cobra.Command, args []string) error {
 		return cmd.Help()
 	}
 
-	m, err := microcluster.App(microcluster.Args{StateDir: c.common.FlagStateDir, Verbose: c.common.FlagLogVerbose, Debug: c.common.FlagLogDebug})
+	m, err := microcluster.App(microcluster.Args{
+		StateDir: c.common.FlagStateDir,
+		Verbose:  c.common.FlagLogVerbose,
+		Debug:    c.common.FlagLogDebug,
+		Version:  version.Version,
+	})
 	if err != nil {
 		return fmt.Errorf("Unable to configure MicroCluster: %w", err)
 	}

diff --git a/example/cmd/microctl/shutdown.go b/example/cmd/microctl/shutdown.go
@@ -3,6 +3,7 @@ package main
 import (
 	"github.com/spf13/cobra"
 
+	"github.com/canonical/microcluster/example/version"
 	"github.com/canonical/microcluster/microcluster"
 )
 
@@ -25,7 +26,12 @@ func (c *cmdShutdown) run(cmd *cobra.Command, args []string) error {
 		return cmd.Help()
 	}
 
-	m, err := microcluster.App(microcluster.Args{StateDir: c.common.FlagStateDir, Verbose: c.common.FlagLogVerbose, Debug: c.common.FlagLogDebug})
+	m, err := microcluster.App(microcluster.Args{
+		StateDir: c.common.FlagStateDir,
+		Verbose:  c.common.FlagLogVerbose,
+		Debug:    c.common.FlagLogDebug,
+		Version:  version.Version,
+	})
 	if err != nil {
 		return err
 	}

diff --git a/example/cmd/microctl/sql.go b/example/cmd/microctl/sql.go
@@ -7,6 +7,7 @@ import (
 	"github.com/olekukonko/tablewriter"
 	"github.com/spf13/cobra"
 
+	"github.com/canonical/microcluster/example/version"
 	"github.com/canonical/microcluster/microcluster"
 )
 
@@ -36,7 +37,12 @@ func (c *cmdSQL) run(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	m, err := microcluster.App(microcluster.Args{StateDir: c.common.FlagStateDir, Verbose: c.common.FlagLogVerbose, Debug: c.common.FlagLogDebug})
+	m, err := microcluster.App(microcluster.Args{
+		StateDir: c.common.FlagStateDir,
+		Verbose:  c.common.FlagLogVerbose,
+		Debug:    c.common.FlagLogDebug,
+		Version:  version.Version,
+	})
 	if err != nil {
 		return err
 	}

diff --git a/example/cmd/microctl/tokens.go b/example/cmd/microctl/tokens.go
@@ -7,6 +7,7 @@ import (
 	cli "github.com/canonical/lxd/shared/cmd"
 	"github.com/spf13/cobra"
 
+	"github.com/canonical/microcluster/example/version"
 	"github.com/canonical/microcluster/microcluster"
 )
 
@@ -56,7 +57,12 @@ func (c *cmdTokensAdd) run(cmd *cobra.Command, args []string) error {
 		return cmd.Help()
 	}
 
-	m, err := microcluster.App(microcluster.Args{StateDir: c.common.FlagStateDir, Verbose: c.common.FlagLogVerbose, Debug: c.common.FlagLogDebug})
+	m, err := microcluster.App(microcluster.Args{
+		StateDir: c.common.FlagStateDir,
+		Verbose:  c.common.FlagLogVerbose,
+		Debug:    c.common.FlagLogDebug,
+		Version:  version.Version,
+	})
 	if err != nil {
 		return err
 	}
@@ -90,7 +96,12 @@ func (c *cmdTokensList) run(cmd *cobra.Command, args []string) error {
 		return cmd.Help()
 	}
 
-	m, err := microcluster.App(microcluster.Args{StateDir: c.common.FlagStateDir, Verbose: c.common.FlagLogVerbose, Debug: c.common.FlagLogDebug})
+	m, err := microcluster.App(microcluster.Args{
+		StateDir: c.common.FlagStateDir,
+		Verbose:  c.common.FlagLogVerbose,
+		Debug:    c.common.FlagLogDebug,
+		Version:  version.Version,
+	})
 	if err != nil {
 		return err
 	}
@@ -130,7 +141,12 @@ func (c *cmdTokensRevoke) run(cmd *cobra.Command, args []string) error {
 		return cmd.Help()
 	}
 
-	m, err := microcluster.App(microcluster.Args{StateDir: c.common.FlagStateDir, Verbose: c.common.FlagLogVerbose, Debug: c.common.FlagLogDebug})
+	m, err := microcluster.App(microcluster.Args{
+		StateDir: c.common.FlagStateDir,
+		Verbose:  c.common.FlagLogVerbose,
+		Debug:    c.common.FlagLogDebug,
+		Version:  version.Version,
+	})
 	if err != nil {
 		return err
 	}

diff --git a/example/cmd/microctl/waitready.go b/example/cmd/microctl/waitready.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/canonical/microcluster/example/version"
 	"github.com/canonical/microcluster/microcluster"
 )
 
@@ -32,7 +33,12 @@ func (c *cmdWaitready) run(cmd *cobra.Command, args []string) error {
 		return cmd.Help()
 	}
 
-	m, err := microcluster.App(microcluster.Args{StateDir: c.common.FlagStateDir, Verbose: c.common.FlagLogVerbose, Debug: c.common.FlagLogDebug})
+	m, err := microcluster.App(microcluster.Args{
+		StateDir: c.common.FlagStateDir,
+		Verbose:  c.common.FlagLogVerbose,
+		Debug:    c.common.FlagLogDebug,
+		Version:  version.Version,
+	})
 	if err != nil {
 		return err
 	}