fix: immediately exit when given -version flag

#117 (review)
google · May 29, 2023 · c5876f3 · c5876f3
1 parent 33c2693
commit c5876f3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/cmd/yamlfmt/flags.go b/cmd/yamlfmt/flags.go
@@ -88,9 +88,6 @@ func getOperationFromFlag() command.Operation {
 	if *flagDry {
 		return command.OperationDry
 	}
-	if *flagVersion {
-		return command.OperationVersion
-	}
 	return command.OperationFormat
 }
 

diff --git a/cmd/yamlfmt/main.go b/cmd/yamlfmt/main.go
@@ -16,7 +16,9 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"log"
+	"os"
 
 	"github.com/google/yamlfmt"
 	"github.com/google/yamlfmt/command"
@@ -36,6 +38,15 @@ func run() error {
 	configureHelp()
 	flag.Parse()
 
+	if *flagVersion {
+		_, err := fmt.Printf("%s\n", version)
+		if err != nil {
+			return err
+		}
+
+		os.Exit(0)
+	}
+
 	c := &command.Command{
 		Operation: getOperationFromFlag(),
 		Registry:  getFullRegistry(),

diff --git a/command/command.go b/command/command.go
@@ -33,7 +33,6 @@ const (
 	OperationLint
 	OperationDry
 	OperationStdin
-	OperationVersion
 )
 
 type FormatterConfig struct {
@@ -161,8 +160,6 @@ func (c *Command) Run(version string) error {
 			return err
 		}
 		fmt.Print(string(out))
-	case OperationVersion:
-		fmt.Printf("%s\n", version)
 	}
 
 	return nil