Fix up config

cmd/config/config.go

@@ -0,0 +1,19 @@
+package config
+
+import "github.com/lyft/flytestdlib/config"
+
+//go:generate pflags Config
+
+var (
+	defaultConfig = &Config{}
+	section       = config.MustRegisterSection("root", defaultConfig)
+)
+
+type Config struct {
+	Project string `json:"project" pflag:",Specifies the project to work on."`
+	Domain  string `json:"domain" pflag:",Specified the domain to work on."`
+}
+
+func GetConfig() *Config {
+	return section.GetConfig().(*Config)
+}

cmd/root.go

@@ -3,23 +3,19 @@ package cmd
 import (
 	"context"
 
-	"github.com/lyft/flytestdlib/config"
+	"github.com/lyft/flytectl/cmd/config"
+
+	stdConfig "github.com/lyft/flytestdlib/config"
 	"github.com/lyft/flytestdlib/config/viper"
 	"github.com/spf13/cobra"
 )
 
 var (
 	cfgFile        string
-	configAccessor = viper.NewAccessor(config.Options{StrictMode: true})
+	configAccessor = viper.NewAccessor(stdConfig.Options{StrictMode: true})
 )
 
-type persistentFlags struct {
-	Project *string
-	Domain  *string
-}
-
 func newRootCmd() *cobra.Command {
-	persistentFlags := persistentFlags{}
 	rootCmd := &cobra.Command{
 		PersistentPreRunE: initConfig,
 	}
@@ -29,15 +25,20 @@ func newRootCmd() *cobra.Command {
 
 	configAccessor.InitializePflags(rootCmd.PersistentFlags())
 
-	persistentFlags.Project = rootCmd.PersistentFlags().String("project", "", "Specifies the Flyte project.")
-	persistentFlags.Domain = rootCmd.PersistentFlags().String("domain", "", "Specifies the Flyte project's domain.")
+	// Due to https://github.com/lyft/flyte/issues/341, project flag will have to be specified as
+	// --root.project, this adds a convenience on top to allow --project to be used
+	rootCmd.PersistentFlags().StringVarP(&(config.GetConfig().Project), "project", "p", "", "Specifies the Flyte project.")
+	rootCmd.PersistentFlags().StringVarP(&(config.GetConfig().Domain), "domain", "d", "", "Specifies the Flyte project's domain.")
+
+	rootCmd.AddCommand(viper.GetConfigCommand())
+	rootCmd.AddCommand(versionCmd)
+	config.GetConfig()
 
-	rootCmd.AddCommand(newTimelineCmd(persistentFlags))
 	return rootCmd
 }
 
 func initConfig(_ *cobra.Command, _ []string) error {
-	configAccessor = viper.NewAccessor(config.Options{
+	configAccessor = viper.NewAccessor(stdConfig.Options{
 		StrictMode:  true,
 		SearchPaths: []string{cfgFile},
 	})

cmd/testdata/config.yaml

@@ -1,2 +1,3 @@
 admin:
-  endpoint: dns:///flyte.lyft.net
+  endpoint: http://localhost:30082
+  insecure: true

cmd/version.go

@@ -0,0 +1,20 @@
+package cmd
+
+import (
+	"github.com/lyft/flytectl/cmd/config"
+	"github.com/lyft/flytestdlib/logger"
+	"github.com/lyft/flytestdlib/version"
+	"github.com/spf13/cobra"
+)
+
+var (
+	versionCmd = &cobra.Command{
+		Use:   "version",
+		Short: "Displays version information for the client and server.",
+		Run: func(cmd *cobra.Command, args []string) {
+			version.LogBuildInformation("flytectl")
+			logger.InfofNoCtx(config.GetConfig().Project)
+			logger.InfofNoCtx(config.GetConfig().Domain)
+		},
+	}
+)

go.mod

@@ -15,6 +15,7 @@ require (
 	github.com/lyft/flytestdlib v0.2.31
 	github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
 	github.com/spf13/cobra v0.0.5
+	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/objx v0.2.0 // indirect
 	github.com/stretchr/testify v1.4.0
 	github.com/wcharczuk/go-chart v2.0.1+incompatible