chore: use dot as path default rather than absolute path (#1184)

* use '.' in flags to indicate default function path

* regen commands.txt with '.' as default path

* centralize dot expansion

* minor cleanup

* update all references to path flag

* exits should be panics

cmd/build.go

@@ -108,7 +108,7 @@ func runBuild(cmd *cobra.Command, _ []string, newClient ClientFactory) (err erro
 
 	// Check if the function has been initialized
 	if !function.Initialized() {
-		return fmt.Errorf("the given path '%v' does not contain an initialized function. Please create one at this path before deploying", config.Path)
+		return fmt.Errorf("'%v' does not contain an initialized function", config.Path)
 	}
 
 	// If a registry name was provided as a command line flag, it should be validated
@@ -234,7 +234,7 @@ type buildConfig struct {
 func newBuildConfig() buildConfig {
 	return buildConfig{
 		Image:        viper.GetString("image"),
-		Path:         viper.GetString("path"),
+		Path:         getPathFlag(),
 		Registry:     viper.GetString("registry"),
 		Verbose:      viper.GetBool("verbose"), // defined on root
 		Confirm:      viper.GetBool("confirm"),

cmd/config.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/AlecAivazis/survey/v2/terminal"
-	"github.com/ory/viper"
 	"github.com/spf13/cobra"
 
 	fn "knative.dev/kn-plugin-func"
@@ -153,8 +152,8 @@ func newConfigCmdConfig(args []string) configCmdConfig {
 		name = args[0]
 	}
 	return configCmdConfig{
-		Name: deriveName(name, viper.GetString("path")),
-		Path: viper.GetString("path"),
+		Name: deriveName(name, getPathFlag()),
+		Path: getPathFlag(),
 	}
 
 }

cmd/delete.go

@@ -110,11 +110,11 @@ func newDeleteConfig(args []string) deleteConfig {
 		name = args[0]
 	}
 	return deleteConfig{
-		Path:      viper.GetString("path"),
+		Path:      getPathFlag(),
 		Namespace: viper.GetString("namespace"),
 		DeleteAll: viper.GetBool("all"),
-		Name:      deriveName(name, viper.GetString("path")), // args[0] or derived
-		Verbose:   viper.GetBool("verbose"),                  // defined on root
+		Name:      deriveName(name, getPathFlag()), // args[0] or derived
+		Verbose:   viper.GetBool("verbose"),        // defined on root
 	}
 }
 

cmd/deploy.go

@@ -449,7 +449,7 @@ func newDeployConfig(cmd *cobra.Command) (deployConfig, error) {
 	return deployConfig{
 		buildConfig: newBuildConfig(),
 		Namespace:   viper.GetString("namespace"),
-		Path:        viper.GetString("path"),
+		Path:        getPathFlag(),
 		Verbose:     viper.GetBool("verbose"), // defined on root
 		Confirm:     viper.GetBool("confirm"),
 		BuildType:   buildType,

cmd/format.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"fmt"
 	"io"
-	"os"
 )
 
 type Format string
@@ -48,7 +47,6 @@ func write(out io.Writer, s Formatter, formatName string) {
 		err = fmt.Errorf("format not recognized: %v\n", formatName)
 	}
 	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(2)
+		panic(err)
 	}
 }

cmd/info.go

@@ -96,10 +96,10 @@ func newInfoConfig(args []string) infoConfig {
 		name = args[0]
 	}
 	return infoConfig{
-		Name:      deriveName(name, viper.GetString("path")),
+		Name:      deriveName(name, getPathFlag()),
 		Namespace: viper.GetString("namespace"),
 		Output:    viper.GetString("output"),
-		Path:      viper.GetString("path"),
+		Path:      getPathFlag(),
 		Verbose:   viper.GetBool("verbose"),
 	}
 }

cmd/invoke.go

@@ -103,7 +103,7 @@ EXAMPLES
 	}
 
 	// Flags
-	cmd.Flags().StringP("path", "p", cwd(), "Path to the function which should have its instance invoked. (Env: $FUNC_PATH)")
+	setPathFlag(cmd)
 	cmd.Flags().StringP("format", "f", "", "Format of message to send, 'http' or 'cloudevent'.  Default is to choose automatically. (Env: $FUNC_FORMAT)")
 	cmd.Flags().StringP("target", "t", "", "Function instance to invoke.  Can be 'local', 'remote' or a URL.  Defaults to auto-discovery if not provided. (Env: $FUNC_TARGET)")
 	cmd.Flags().StringP("id", "", "", "ID for the request data. (Env: $FUNC_ID)")
@@ -205,7 +205,7 @@ type invokeConfig struct {
 
 func newInvokeConfig(newClient ClientFactory) (cfg invokeConfig, err error) {
 	cfg = invokeConfig{
-		Path:        viper.GetString("path"),
+		Path:        getPathFlag(),
 		Target:      viper.GetString("target"),
 		Format:      viper.GetString("format"),
 		ID:          viper.GetString("id"),

cmd/root.go

@@ -144,16 +144,6 @@ func interactiveTerminal() bool {
 	return err == nil && ((fi.Mode() & os.ModeCharDevice) != 0)
 }
 
-// cwd returns the current working directory or exits 1 printing the error.
-func cwd() (cwd string) {
-	cwd, err := os.Getwd()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Unable to determine current working directory: %v", err)
-		os.Exit(1)
-	}
-	return cwd
-}
-
 // bindFunc which conforms to the cobra PreRunE method signature
 type bindFunc func(*cobra.Command, []string) error
 
@@ -335,7 +325,27 @@ func mergeEnvs(envs []fn.Env, envToUpdate *util.OrderedMap, envToRemove []string
 
 // setPathFlag ensures common text/wording when the --path flag is used
 func setPathFlag(cmd *cobra.Command) {
-	cmd.Flags().StringP("path", "p", cwd(), "Path to the project directory (Env: $FUNC_PATH)")
+	cmd.Flags().StringP("path", "p", ".", "Path to the project directory (Env: $FUNC_PATH)")
+}
+
+// getPathFlag returns the value of the --path flag.
+// The special value '.' is returned as the abolute path to the current
+// working directory.
+func getPathFlag() string {
+	path := viper.GetString("path")
+	if path == "." {
+		path = cwd()
+	}
+	return path
+}
+
+// cwd returns the current working directory or exits 1 printing the error.
+func cwd() (cwd string) {
+	cwd, err := os.Getwd()
+	if err != nil {
+		panic(fmt.Sprintf("Unable to determine current working directory: %v", err))
+	}
+	return cwd
 }
 
 type Version struct {

cmd/run.go

@@ -168,18 +168,18 @@ type runConfig struct {
 	Registry string
 }
 
-func newRunConfig(cmd *cobra.Command) (c runConfig, err error) {
+func newRunConfig(cmd *cobra.Command) (cfg runConfig, err error) {
 	envToUpdate, envToRemove, err := envFromCmd(cmd)
 	if err != nil {
 		return
 	}
-
-	return runConfig{
+	cfg = runConfig{
 		Build:       viper.GetString("build"),
-		Path:        viper.GetString("path"),
+		Path:        getPathFlag(),
 		Verbose:     viper.GetBool("verbose"), // defined on root
 		Registry:    viper.GetString("registry"),
 		EnvToUpdate: envToUpdate,
 		EnvToRemove: envToRemove,
-	}, nil
+	}
+	return
 }