Fix the missing "interactiveMode" field in kubeconfig generated by Ge…

…tKubeconfigForContext() API

Signed-off-by: Prem Kumar Kalle <[email protected]>

fakes/config/kubeconfig-1.yaml

@@ -42,10 +42,15 @@ users:
   - name: tanzu-cli-mytae-user
     user:
       exec:
-        apiVersion: client.authentication.k8s.io/v1beta1
+        apiVersion: client.authentication.k8s.io/v1
         args:
           - context
           - get-token
           - mytae
         command: tanzu
-        env: []
+        env:
+          - name: testEnv1
+            value: testEnv1-Value
+          - name: testEnv2
+            value: testEnv2-Value
+        interactiveMode: Never

tae/internal/kubeconfig/kubeconfig_test.go

@@ -39,9 +39,13 @@ users:
                 - context
                 - get-token
                 - mytae
-            env: []
-            apiVersion: client.authentication.k8s.io/v1beta1
-            provideClusterInfo: false
+            env:
+            - name: testEnv1
+              value: testEnv1-Value
+            - name: testEnv2
+              value: testEnv2-Value
+            interactiveMode: Never
+            apiVersion: client.authentication.k8s.io/v1
 contexts:
     - name: tanzu-cli-mytae
       context:

tae/internal/kubeconfig/types.go

@@ -13,7 +13,7 @@ package kubeconfig
 type Config struct {
 	Kind       string `json:"kind,omitempty" yaml:"kind,omitempty"`
 	APIVersion string `json:"apiVersion,omitempty" yaml:"apiVersion,omitempty"`
-	// Preferences holds general information to be use for cli interactions
+	// Preferences holds general information to be used for cli interactions
 	Preferences Preferences `json:"preferences" yaml:"preferences"`
 	// Clusters is a map of referencable names to cluster configs
 	Clusters []*Cluster `json:"clusters" yaml:"clusters"`
@@ -69,51 +69,9 @@ type Cluster struct {
 
 // AuthInfo contains information that describes identity information.  This is use to tell the kubernetes cluster who you are.
 type AuthInfo struct {
-	Name     string `json:"name" yaml:"name"`
-	AuthInfo struct {
-		// ClientCertificate is the path to a client cert file for TLS.
-		// +optional
-		ClientCertificate string `json:"client-certificate,omitempty" yaml:"client-certificate,omitempty"`
-		// ClientCertificateData contains PEM-encoded data from a client cert file for TLS. Overrides ClientCertificate
-		// +optional
-		ClientCertificateData string `json:"client-certificate-data,omitempty" yaml:"client-certificate-data,omitempty"`
-		// ClientKey is the path to a client key file for TLS.
-		// +optional
-		ClientKey string `json:"client-key,omitempty" yaml:"client-key,omitempty"`
-		// ClientKeyData contains PEM-encoded data from a client key file for TLS. Overrides ClientKey
-		// +optional
-		ClientKeyData string `json:"client-key-data,omitempty" yaml:"client-key-data,omitempty" datapolicy:"security-key"`
-		// Token is the bearer token for authentication to the kubernetes cluster.
-		// +optional
-		Token string `json:"token,omitempty" yaml:"token,omitempty" datapolicy:"token"`
-		// TokenFile is a pointer to a file that contains a bearer token (as described above).  If both Token and TokenFile are present, Token takes precedence.
-		// +optional
-		TokenFile string `json:"tokenFile,omitempty" yaml:"tokenFile,omitempty"`
-		// Impersonate is the username to act-as.
-		// +optional
-		Impersonate string `json:"act-as,omitempty" yaml:"act-as,omitempty"`
-		// ImpersonateUID is the uid to impersonate.
-		// +optional
-		ImpersonateUID string `json:"act-as-uid,omitempty" yaml:"act-as-uid,omitempty"`
-		// ImpersonateGroups is the groups to impersonate.
-		// +optional
-		ImpersonateGroups []string `json:"act-as-groups,omitempty" yaml:"act-as-groups,omitempty"`
-		// ImpersonateUserExtra contains additional information for impersonated user.
-		// +optional
-		ImpersonateUserExtra map[string][]string `json:"act-as-user-extra,omitempty" yaml:"act-as-user-extra,omitempty"`
-		// Username is the username for basic authentication to the kubernetes cluster.
-		// +optional
-		Username string `json:"username,omitempty" yaml:"username,omitempty"`
-		// Password is the password for basic authentication to the kubernetes cluster.
-		// +optional
-		Password string `json:"password,omitempty" yaml:"password,omitempty" datapolicy:"password"`
-		// AuthProvider specifies a custom authentication plugin for the kubernetes cluster.
-		// +optional
-		AuthProvider *AuthProviderConfig `json:"auth-provider,omitempty" yaml:"auth-provider,omitempty"`
-		// Exec specifies a custom exec-based authentication plugin for the kubernetes cluster.
-		// +optional
-		Exec *ExecConfig `json:"exec,omitempty" yaml:"exec,omitempty"`
-	} `json:"user" yaml:"user"`
+	Name string `json:"name" yaml:"name"`
+	// Note:!! Changed it to empty interface as runtime API is going to use the AuthInfo as is
+	AuthInfo interface{} `json:"user" yaml:"user"`
 }
 
 // Context is a tuple of references to a cluster (how do I communicate with a kubernetes cluster), a user (how do I identify myself), and a namespace (what subset of resources do I want to work with)
@@ -129,51 +87,3 @@ type Context struct {
 		Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
 	} `json:"context" yaml:"context"`
 }
-
-// AuthProviderConfig holds the configuration for a specified auth provider.
-type AuthProviderConfig struct {
-	Name string `json:"name" yaml:"name"`
-	// +optional
-	Config map[string]string `json:"config,omitempty" yaml:"config,omitempty"`
-}
-
-// ExecConfig specifies a command to provide client credentials. The command is exec'd
-// and outputs structured stdout holding credentials.
-//
-// See the client.authentication.k8s.io API group for specifications of the exact input
-// and output format
-type ExecConfig struct {
-	// Command to execute.
-	Command string `json:"command" yaml:"command"`
-	// Arguments to pass to the command when executing it.
-	// +optional
-	Args []string `json:"args" yaml:"args"`
-	// Env defines additional environment variables to expose to the process. These
-	// are unioned with the host's environment, as well as variables client-go uses
-	// to pass argument to the plugin.
-	// +optional
-	Env []ExecEnvVar `json:"env" yaml:"env"`
-
-	// Preferred input version of the ExecInfo. The returned ExecCredentials MUST use
-	// the same encoding version as the input.
-	APIVersion string `json:"apiVersion,omitempty" yaml:"apiVersion,omitempty"`
-
-	// This text is shown to the user when the executable doesn't seem to be
-	// present. For example, `brew install foo-cli` might be a good InstallHint for
-	// foo-cli on Mac OS systems.
-	InstallHint string `json:"installHint,omitempty" yaml:"installHint,omitempty"`
-
-	// ProvideClusterInfo determines whether or not to provide cluster information,
-	// which could potentially contain very large CA data, to this exec plugin as a
-	// part of the KUBERNETES_EXEC_INFO environment variable. By default, it is set
-	// to false. Package k8s.io/client-go/tools/auth/exec provides helper methods for
-	// reading this environment variable.
-	ProvideClusterInfo bool `json:"provideClusterInfo" yaml:"provideClusterInfo"`
-}
-
-// ExecEnvVar is used for setting environment variables when executing an exec-based
-// credential plugin.
-type ExecEnvVar struct {
-	Name  string `json:"name" yaml:"name"`
-	Value string `json:"value" yaml:"value"`
-}

test/compatibility/testplugins/runtime-test-plugin-latest/go.work.sum

@@ -1,21 +1,29 @@
-github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/AlecAivazis/survey/v2 v2.3.6 h1:NvTuVHISgTHEHeBFqt6BHOe4Ny/NwGZr7w+F8S9ziyw=
+github.com/briandowns/spinner v1.19.0 h1:s8aq38H+Qju89yhp89b4iIiMzMm8YN3p6vGpwyh/a8E=
+github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
+github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
+github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
 github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/juju/fslock v0.0.0-20160525022230-4d5c94c67b4b/go.mod h1:HMcgvsgd0Fjj4XXDkbjdmlbI505rUPBs6WBMYg2pXks=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
+github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
+github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
+github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
+github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
+github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
+github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
+github.com/onsi/ginkgo/v2 v2.9.2 h1:BA2GMJOtfGAfagzYtrAlufIP0lq6QERkFmHLMLPwFSU=
+github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
-github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
+go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
+go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
+golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
+golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
+golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
+golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=