chore(release): Prepare for release v1.2.1

- Update CHANGELOG.md with details of the fix.
- Refactor version handling to be managed in the main package.
- Correct Makefile linker flags to properly embed version information.

Author: magifd2

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.2.1] - 2025-08-18
+
+### Fixed
+
+- Fixed an issue where the version information was not correctly embedded in the binary during the `make` build process. The build script now correctly links the Git tag, commit hash, and build date.
+
 ## [1.2.0] - 2025-08-14
 
 ### Changed
@@ -43,4 +49,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- N/A (Initial Release)
+- N/A (Initial Release)

Makefile

@@ -48,8 +48,8 @@ package: clean build
 build-macos:
 	@echo "📦 Building for macOS (Universal)..."
 	@mkdir -p ./${DIST_DIR}/macos
-	@GOOS=darwin GOARCH=amd64 $(GOBUILD) -ldflags="-X 'main.version=${VERSION}' -X 'main.commit=${GIT_COMMIT}' -X 'main.date=${BUILD_DATE}'" -o ./${DIST_DIR}/macos/${OUTPUT_NAME}_amd64 ./${SOURCE_FILE}
-	@GOOS=darwin GOARCH=arm64 $(GOBUILD) -ldflags="-X 'main.version=${VERSION}' -X 'main.commit=${GIT_COMMIT}' -X 'main.date=${BUILD_DATE}'" -o ./${DIST_DIR}/macos/${OUTPUT_NAME}_arm64 ./${SOURCE_FILE}
+	@GOOS=darwin GOARCH=amd64 $(GOBUILD) -ldflags="-X 'main.Version=${VERSION}' -X 'main.Commit=${GIT_COMMIT}' -X 'main.Date=${BUILD_DATE}'" -o ./${DIST_DIR}/macos/${OUTPUT_NAME}_amd64 ./${SOURCE_FILE}
+	@GOOS=darwin GOARCH=arm64 $(GOBUILD) -ldflags="-X 'main.Version=${VERSION}' -X 'main.Commit=${GIT_COMMIT}' -X 'main.Date=${BUILD_DATE}'" -o ./${DIST_DIR}/macos/${OUTPUT_NAME}_arm64 ./${SOURCE_FILE}
 	@lipo -create -output ./${DIST_DIR}/macos/${OUTPUT_NAME} ./${DIST_DIR}/macos/${OUTPUT_NAME}_amd64 ./${DIST_DIR}/macos/${OUTPUT_NAME}_arm64
 	@rm ./${DIST_DIR}/macos/${OUTPUT_NAME}_amd64 ./${DIST_DIR}/macos/${OUTPUT_NAME}_arm64
 	@echo "🍏 macOS build complete: ./${DIST_DIR}/macos/${OUTPUT_NAME}"
@@ -58,14 +58,14 @@ build-macos:
 build-linux:
 	@echo "📦 Building for Linux (amd64)..."
 	@mkdir -p ./${DIST_DIR}/linux
-	@GOOS=linux GOARCH=amd64 $(GOBUILD) -ldflags="-X 'main.version=${VERSION}' -X 'main.commit=${GIT_COMMIT}' -X 'main.date=${BUILD_DATE}'" -o ./${DIST_DIR}/linux/${OUTPUT_NAME} ./${SOURCE_FILE}
+	@GOOS=linux GOARCH=amd64 $(GOBUILD) -ldflags="-X 'main.Version=${VERSION}' -X 'main.Commit=${GIT_COMMIT}' -X 'main.Date=${BUILD_DATE}'" -o ./${DIST_DIR}/linux/${OUTPUT_NAME} ./${SOURCE_FILE}
 	@echo "🐧 Linux build complete: ./${DIST_DIR}/linux/${OUTPUT_NAME}"
 
 # Build for Windows (amd64)
 build-windows:
 	@echo "📦 Building for Windows (amd64)..."
 	@mkdir -p ./${DIST_DIR}/windows
-	@GOOS=windows GOARCH=amd64 $(GOBUILD) -ldflags="-X 'main.version=${VERSION}' -X 'main.commit=${GIT_COMMIT}' -X 'main.date=${BUILD_DATE}'" -o ./${DIST_DIR}/windows/${OUTPUT_NAME}.exe ./${SOURCE_FILE}
+	@GOOS=windows GOARCH=amd64 $(GOBUILD) -ldflags="-X 'main.Version=${VERSION}' -X 'main.Commit=${GIT_COMMIT}' -X 'main.Date=${BUILD_DATE}'" -o ./${DIST_DIR}/windows/${OUTPUT_NAME}.exe ./${SOURCE_FILE}
 	@echo "🪟  Windows build complete: ./${DIST_DIR}/windows/${OUTPUT_NAME}.exe"
 
 # --- Quality & Verification ---

cmd/root.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"errors"
-	"flag"
 	"fmt"
 	"os"
 	"strings"
@@ -11,26 +10,22 @@ import (
 	"splunk_cli/splunk"
 )
 
-// These variables are set by the linker.
-var (
-	Version = "dev"
-	Commit  = "none"
-	Date    = "unknown"
-)
-
 func Execute() {
-	var showVersion bool
 	var configPath string
 
-	flag.BoolVar(&showVersion, "version", false, "Print version information and exit")
-	flag.StringVar(&configPath, "config", "", "Path to a custom configuration file")
-	flag.Parse()
-
-	if showVersion {
-		fmt.Printf("splunk-cli version %s\ncommit %s\nbuilt at %s", Version, Commit, Date)
-		os.Exit(0)
+	// NOTE: We are not using flag.Parse() here at the top level anymore.
+	// Each command will be responsible for parsing its own flags.
+	// We manually check for the config flag.
+	for i, arg := range os.Args {
+		if (arg == "--config" || arg == "-config") && i+1 < len(os.Args) {
+			configPath = os.Args[i+1]
+			// Remove the flag and its value from os.Args so subcommands don't see it.
+			os.Args = append(os.Args[:i], os.Args[i+2:]...)
+			break
+		}
 	}
 
+
 	if len(os.Args) < 2 {
 		printUsage()
 		os.Exit(1)
@@ -75,4 +70,4 @@ func Execute() {
 		fmt.Fprintf(os.Stderr, "Error: %v", cmdErr)
 		os.Exit(1)
 	}
-}
+}

splunk-cli.go

@@ -1,9 +1,26 @@
 package main
 
 import (
+	"fmt"
+	"os"
 	"splunk_cli/cmd"
 )
 
+// These variables are set by the linker.
+var (
+	Version = "dev"
+	Commit  = "none"
+	Date    = "unknown"
+)
+
 func main() {
+	// Manual check for the --version flag
+	for _, arg := range os.Args {
+		if arg == "--version" {
+			fmt.Printf("splunk-cli version %s\ncommit %s\nbuilt at %s\n", Version, Commit, Date)
+			os.Exit(0)
+		}
+	}
+
 	cmd.Execute()
-}
+}