From 166d34dc0f87d8f9b9b2059aa6c1bda50eb85ffb Mon Sep 17 00:00:00 2001 From: Kevin Petremann Date: Tue, 18 Jul 2023 18:47:03 +0200 Subject: [PATCH] feat: add version flag --- cmd/salt-exporter/config.go | 13 ++++++++++++- cmd/salt-exporter/main.go | 4 ++-- cmd/salt-live/main.go | 11 +++++++++-- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/cmd/salt-exporter/config.go b/cmd/salt-exporter/config.go index d732b62..6ff2da2 100644 --- a/cmd/salt-exporter/config.go +++ b/cmd/salt-exporter/config.go @@ -4,6 +4,7 @@ import ( "errors" "flag" "fmt" + "os" "path/filepath" "strings" @@ -48,8 +49,8 @@ type Config struct { func parseFlags() bool { // flags + versionCmd := flag.Bool("version", false, "print version") flag.String("log-level", defaultLogLevel, "log level (debug, info, warn, error, fatal, panic, disabled)") - flag.String("host", "", "listen address") flag.Int("port", defaultPort, "listen port") flag.String("ipc-file", listener.DefaultIPCFilepath, "file location of the salt-master event bus") @@ -68,6 +69,16 @@ func parseFlags() bool { "[DEPRECATED] apply filter on states to monitor, separated by a comma") flag.Parse() + if *versionCmd { + if version == "unknown" { + version = fmt.Sprintf("v%s", version) + } + fmt.Println("Version:", version) + fmt.Println("Build date:", date) + fmt.Println("Commit:", commit) + os.Exit(0) + } + return *healthMinions } diff --git a/cmd/salt-exporter/main.go b/cmd/salt-exporter/main.go index 3640d61..d116db9 100644 --- a/cmd/salt-exporter/main.go +++ b/cmd/salt-exporter/main.go @@ -20,8 +20,8 @@ import ( const configFileName = "config.yml" var ( - version = "" - commit = "" + version = "unknown" + commit = "unknown" date = "unknown" ) diff --git a/cmd/salt-live/main.go b/cmd/salt-live/main.go index 52b48fa..bf07c35 100644 --- a/cmd/salt-live/main.go +++ b/cmd/salt-live/main.go @@ -17,10 +17,17 @@ import ( tea "github.com/charmbracelet/bubbletea" ) -var version = "development" +var version = "unknown" +var commit = "unknown" +var date = "unknown" func printVersion() { - fmt.Println("Version: ", version) + if version == "unknown" { + version = fmt.Sprintf("v%s", version) + } + fmt.Println("Version:", version) + fmt.Println("Build date:", date) + fmt.Println("Commit:", commit) } func main() {