fix: move authentication when factory is in use.

I think there is still something I need to learn about how factory are
supposed to work and the fact that I need to panic at some point if
something does not work since I can't gracefully return an error is a
sign of that but this commit fixes @ecv report about not being able to
run `--help` and `help` command because they requires authentication.

A valid concern!

Author: gianarb

internal/client/factory.go

@@ -18,15 +18,13 @@ import (
 type DatumCloudFactory struct {
 	util.Factory
 	ConfigFlags *CustomConfigFlags
-	RestConfig  *rest.Config
 }
 
 type CustomConfigFlags struct {
 	*genericclioptions.ConfigFlags
 	Project      *string
 	Organization *string
-	restConfig   *rest.Config
-	tokenSrc     oauth2.TokenSource
+	Context      context.Context
 }
 
 func (factory *DatumCloudFactory) AddFlags(flags *pflag.FlagSet) {
@@ -36,7 +34,10 @@ func (factory *DatumCloudFactory) AddFlags(flags *pflag.FlagSet) {
 }
 
 func (c *CustomConfigFlags) ToRESTConfig() (*rest.Config, error) {
-	config := rest.CopyConfig(c.restConfig)
+	config, err := c.ConfigFlags.ToRESTConfig()
+	if err != nil {
+		return nil, err
+	}
 	if c.APIServer != nil && *c.APIServer != "" {
 		config.Host = *c.APIServer
 	}
@@ -47,8 +48,13 @@ func (c *CustomConfigFlags) ToRESTConfig() (*rest.Config, error) {
 		config.ServerName = *c.TLSServerName
 	}
 
+	tknSrc, err := authutil.GetTokenSource(c.Context)
+	if err != nil {
+		return nil, err
+	}
+
 	config.WrapTransport = func(rt http.RoundTripper) http.RoundTripper {
-		return &oauth2.Transport{Source: c.tokenSrc, Base: rt}
+		return &oauth2.Transport{Source: tknSrc, Base: rt}
 	}
 
 	apiHostname, err := authutil.GetAPIHostname()
@@ -71,19 +77,23 @@ func (c *CustomConfigFlags) ToRESTConfig() (*rest.Config, error) {
 }
 
 func (c *CustomConfigFlags) ToRawKubeConfigLoader() clientcmd.ClientConfig {
+	restConfig, err := c.ToRESTConfig()
+	if err != nil {
+		panic(err)
+	}
 	kubeConfig := &api.Config{
 		Clusters: map[string]*api.Cluster{
 			"inmemory": {
-				Server:                   c.restConfig.Host,
-				CertificateAuthorityData: c.restConfig.CAData,
-				InsecureSkipTLSVerify:    c.restConfig.Insecure,
+				Server:                   restConfig.Host,
+				CertificateAuthorityData: restConfig.CAData,
+				InsecureSkipTLSVerify:    restConfig.Insecure,
 			},
 		},
 		AuthInfos: map[string]*api.AuthInfo{
 			"inmemory": {
-				Token:                 c.restConfig.BearerToken,
-				ClientCertificateData: c.restConfig.CertData,
-				ClientKeyData:         c.restConfig.KeyData,
+				Token:                 restConfig.BearerToken,
+				ClientCertificateData: restConfig.CertData,
+				ClientKeyData:         restConfig.KeyData,
 			},
 		},
 		Contexts: map[string]*api.Context{
@@ -127,25 +137,23 @@ func (c *CustomConfigFlags) ToRawKubeConfigLoader() clientcmd.ClientConfig {
 	return clientcmd.NewDefaultClientConfig(*kubeConfig, overrides)
 }
 
-func NewDatumFactory(ctx context.Context, restConfig *rest.Config) (*DatumCloudFactory, error) {
+func NewDatumFactory(ctx context.Context) (*DatumCloudFactory, error) {
 	baseConfigFlags := genericclioptions.NewConfigFlags(true)
 	baseConfigFlags = baseConfigFlags.WithWrapConfigFn(func(*rest.Config) *rest.Config {
-		return restConfig
+		config, err := NewRestConfig(ctx)
+		if err != nil {
+			panic(err)
+		}
+		return config
 	})
 	baseConfigFlags.KubeConfig = nil
 	baseConfigFlags.CacheDir = nil
 	baseConfigFlags.KeyFile = nil
 	baseConfigFlags.CertFile = nil
 	baseConfigFlags.ClusterName = nil
 	baseConfigFlags.Context = nil
-	tknSrc, err := authutil.GetTokenSource(ctx)
-	if err != nil {
-		return nil, err
-	}
 	configFlags := &CustomConfigFlags{
 		ConfigFlags: baseConfigFlags,
-		restConfig:  restConfig,
-		tokenSrc:    tknSrc,
 		Project: func() *string {
 			m := ""
 			return &m
@@ -159,6 +167,5 @@ func NewDatumFactory(ctx context.Context, restConfig *rest.Config) (*DatumCloudF
 	return &DatumCloudFactory{
 		Factory:     f,
 		ConfigFlags: configFlags,
-		RestConfig:  restConfig,
 	}, nil
 }

internal/cmd/root.go

@@ -25,20 +25,14 @@ func RootCmd() *cobra.Command {
 		Use:   "datumctl",
 		Short: "A CLI for interacting with the Datum platform",
 	}
-
 	ioStreams := genericclioptions.IOStreams{
 		In:     rootCmd.InOrStdin(),
 		Out:    rootCmd.OutOrStdout(),
 		ErrOut: rootCmd.ErrOrStderr(),
 	}
 
 	ctx := context.Background()
-	config, err := client.NewRestConfig(ctx)
-	if err != nil {
-		panic(err)
-	}
-
-	factory, err := client.NewDatumFactory(ctx, config)
+	factory, err := client.NewDatumFactory(ctx)
 	if err != nil {
 		panic(err)
 	}