Better static_datastore cmd test

Author: byo

.vscode/settings.json

@@ -19,6 +19,7 @@
         "fsys",
         "goveralls",
         "Hasher",
+        "homefile",
         "jbenet",
         "protobuf",
         "securefifo",

cmd/static_datastore_builder/main.go

@@ -1,5 +1,5 @@
 /*
-Copyright © 2022 Bartłomiej Święcki (byo)
+Copyright © 2023 Bartłomiej Święcki (byo)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,8 +16,15 @@ limitations under the License.
 
 package main
 
-import "github.com/cinode/go/pkg/cmd/static_datastore"
+import (
+	"context"
+	"log"
+
+	"github.com/cinode/go/pkg/cmd/static_datastore"
+)
 
 func main() {
-	static_datastore.Execute()
+	if err := static_datastore.Execute(context.Background()); err != nil {
+		log.Fatal(err.Error())
+	}
 }

pkg/cmd/static_datastore/compile.go

@@ -46,40 +46,41 @@ func compileCmd() *cobra.Command {
 			"a content with static files that can then be used to serve through a",
 			"simple http server.",
 		}, "\n"),
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			if o.srcDir == "" || o.dstLocation == "" {
-				cmd.Help()
-				return
+				return cmd.Help()
 			}
 
-			enc := json.NewEncoder(os.Stdout)
+			enc := json.NewEncoder(cmd.OutOrStdout())
 			enc.SetIndent("", "  ")
 
-			fatalResult := func(format string, args ...interface{}) {
+			fatalResult := func(format string, args ...interface{}) error {
 				msg := fmt.Sprintf(format, args...)
 
 				enc.Encode(map[string]string{
 					"result": "ERROR",
 					"msg":    msg,
 				})
 
-				log.Fatalf(msg)
+				cmd.SilenceUsage = true
+				cmd.SilenceErrors = true
+				return errors.New(msg)
 			}
 
 			if len(rootWriterInfoFile) > 0 {
 				data, err := os.ReadFile(rootWriterInfoFile)
 				if err != nil {
-					fatalResult("Couldn't read data from the writer info file at '%s': %v", rootWriterInfoFile, err)
+					return fatalResult("Couldn't read data from the writer info file at '%s': %v", rootWriterInfoFile, err)
 				}
 				if len(data) == 0 {
-					fatalResult("Writer info file at '%s' is empty", rootWriterInfoFile)
+					return fatalResult("Writer info file at '%s' is empty", rootWriterInfoFile)
 				}
 				rootWriterInfoStr = string(data)
 			}
 			if len(rootWriterInfoStr) > 0 {
 				wi, err := cinodefs.WriterInfoFromString(rootWriterInfoStr)
 				if err != nil {
-					fatalResult("Couldn't parse writer info: %v", err)
+					return fatalResult("Couldn't parse writer info: %v", err)
 				}
 				o.writerInfo = wi
 			}
@@ -91,7 +92,7 @@ func compileCmd() *cobra.Command {
 
 			ep, wi, err := compileFS(cmd.Context(), o)
 			if err != nil {
-				fatalResult("%s", err)
+				return fatalResult("%s", err)
 			}
 
 			result := map[string]string{
@@ -104,6 +105,7 @@ func compileCmd() *cobra.Command {
 			enc.Encode(result)
 
 			log.Println("DONE")
+			return nil
 		},
 	}
 

pkg/cmd/static_datastore/root.go

@@ -1,5 +1,5 @@
 /*
-Copyright © 2022 Bartłomiej Święcki (byo)
+Copyright © 2023 Bartłomiej Święcki (byo)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,8 +17,7 @@ limitations under the License.
 package static_datastore
 
 import (
-	"fmt"
-	"os"
+	"context"
 
 	"github.com/spf13/cobra"
 )
@@ -50,9 +49,6 @@ node is stored in a plaintext in a file called 'entrypoint.txt'.
 
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
-func Execute() {
-	if err := rootCmd().Execute(); err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
+func Execute(ctx context.Context) error {
+	return rootCmd().ExecuteContext(ctx)
 }