make --remote and --s as default for istioctl version command (istio#…

…13389)

* make remote and short as default

* fix lint

istioctl/cmd/istioctl/main.go

@@ -103,7 +103,7 @@ func init() {
 
 	cmd.AddFlags(rootCmd)
 
-	rootCmd.AddCommand(version.CobraCommandWithOptions(version.CobraOptions{GetRemoteVersion: getRemoteInfo}))
+	rootCmd.AddCommand(newVersionCommand())
 	rootCmd.AddCommand(gendeployment.Command(&istioNamespace))
 
 	experimentalCmd.AddCommand(install.NewVerifyCommand(&istioNamespace))

istioctl/cmd/istioctl/version.go

@@ -0,0 +1,30 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+
+	istioVersion "istio.io/istio/pkg/version"
+)
+
+func newVersionCommand() *cobra.Command {
+	versionCmd := istioVersion.CobraCommandWithOptions(istioVersion.CobraOptions{GetRemoteVersion: getRemoteInfo})
+	versionCmd.Flags().VisitAll(func(flag *pflag.Flag) {
+		if flag.Name == "short" {
+			err := flag.Value.Set("true")
+			if err != nil {
+				fmt.Fprint(os.Stdout, fmt.Sprintf("set flag %q as true failed due to error %v", flag.Name, err))
+			}
+		}
+		if flag.Name == "remote" {
+			err := flag.Value.Set("true")
+			if err != nil {
+				fmt.Fprint(os.Stdout, fmt.Sprintf("set flag %q as true failed due to error %v", flag.Name, err))
+			}
+		}
+	})
+	return versionCmd
+}

istioctl/cmd/istioctl/version_test.go

@@ -73,7 +73,7 @@ func TestVersion(t *testing.T) {
 	cases := []testCase{
 		{ // case 0 client-side only, normal output
 			configs: []model.Config{},
-			args:    strings.Split("version --remote=false", " "),
+			args:    strings.Split("version --remote=false --short=false", " "),
 			expectedRegexp: regexp.MustCompile("version.BuildInfo{Version:\"unknown\", GitRevision:\"unknown\", " +
 				"User:\"unknown\", Host:\"unknown\", GolangVersion:\"go1.([0-9+?(\\.)?]+)(rc[0-9]?)?\", " +
 				"DockerHub:\"unknown\", BuildStatus:\"unknown\", GitTag:\"unknown\"}"),