vespa config get prints all options

2 files changed, 17 insertions, 7 deletions

diff --git a/client/go/cmd/config.go b/client/go/cmd/config.go
index f03b0a16606..d62e2b20e5a 100644
--- a/client/go/cmd/config.go
+++ b/client/go/cmd/config.go
@@ -58,19 +58,27 @@ var getConfigCmd = &cobra.Command{
 	Use:     "get option",
 	Short:   "Get a configuration option",
 	Example: "$ vespa config get target",
-	Args:    cobra.ExactArgs(1),
+	Args:    cobra.MaximumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
-		option := args[0]
-		value, err := getOption(option)
-		if err != nil {
-			value = color.Faint("<unset>").String()
+		if len(args) == 0 { // Print all values
+			printOption(targetFlag)
+			printOption(applicationFlag)
 		} else {
-			value = color.Cyan(value).String()
+			printOption(args[0])
 		}
-		log.Printf("%s = %s", option, value)
 	},
 }
 
+func printOption(option string) {
+	value, err := getOption(option)
+	if err != nil {
+		value = color.Faint("<unset>").String()
+	} else {
+		value = color.Cyan(value).String()
+	}
+	log.Printf("%s = %s", option, value)
+}
+
 func configDir(application string) (string, error) {
 	home := os.Getenv("VESPA_CLI_HOME")
 	if home == "" {
diff --git a/client/go/cmd/config_test.go b/client/go/cmd/config_test.go
index a9849d105bb..ff97157ba07 100644
--- a/client/go/cmd/config_test.go
+++ b/client/go/cmd/config_test.go
@@ -20,4 +20,6 @@ func TestConfig(t *testing.T) {
 	assert.Equal(t, "application = <unset>\n", executeCommand(t, nil, []string{"config", "get", "application"}, nil))
 	assert.Equal(t, "", executeCommand(t, nil, []string{"config", "set", "application", "t1.a1.i1"}, nil))
 	assert.Equal(t, "application = t1.a1.i1\n", executeCommand(t, nil, []string{"config", "get", "application"}, nil))
+
+	assert.Equal(t, "target = https://127.0.0.1\napplication = t1.a1.i1\n", executeCommand(t, nil, []string{"config", "get"}, nil))
 }