Move kubeconfig saving/printing to a common package (#2121)

internal/cmd/access/access.go

@@ -1,16 +1,14 @@
 package access
 
 import (
-	"fmt"
-
 	"github.com/kyma-project/cli.v3/internal/clierror"
 	"github.com/kyma-project/cli.v3/internal/cmdcommon"
+	"github.com/kyma-project/cli.v3/internal/kube"
 	"github.com/spf13/cobra"
 	v1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/clientcmd/api"
 )
 
@@ -66,19 +64,9 @@ func runAccess(cfg *accessConfig) clierror.Error {
 		return clierror.Wrap(err, clierror.New("failed to prepare kubeconfig"))
 	}
 
-	if cfg.output != "" {
-		err = clientcmd.WriteToFile(*enrichedKubeconfig, cfg.output)
-		println("Kubeconfig saved to: " + cfg.output)
-		if err != nil {
-			return clierror.Wrap(err, clierror.New("failed to save kubeconfig to file"))
-		}
-	} else {
-		message, err := clientcmd.Write(*enrichedKubeconfig)
-		if err != nil {
-			return clierror.Wrap(err, clierror.New("failed to print kubeconfig"))
-		}
-		fmt.Println(string(message))
-
+	err = kube.SaveConfig(enrichedKubeconfig, cfg.output)
+	if err != nil {
+		return clierror.Wrap(err, clierror.New("failed to save kubeconfig"))
 	}
 
 	return nil

internal/cmd/oidc/oidc.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/kyma-project/cli.v3/internal/clierror"
 	"github.com/kyma-project/cli.v3/internal/cmdcommon"
+	"github.com/kyma-project/cli.v3/internal/kube"
 	"github.com/spf13/cobra"
-	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/clientcmd/api"
 )
 
@@ -98,18 +98,9 @@ func runOIDC(cfg *oidcConfig) clierror.Error {
 		return clierror.Wrap(err, clierror.New("failed to create kubeconfig"))
 	}
 
-	if cfg.output != "" {
-		err = clientcmd.WriteToFile(*enrichedKubeconfig, cfg.output)
-		println("Kubeconfig saved to: " + cfg.output)
-		if err != nil {
-			return clierror.Wrap(err, clierror.New("failed to save kubeconfig to file"))
-		}
-	} else {
-		message, err := clientcmd.Write(*enrichedKubeconfig)
-		if err != nil {
-			return clierror.Wrap(err, clierror.New("failed to print kubeconfig"))
-		}
-		fmt.Println(string(message))
+	err = kube.SaveConfig(enrichedKubeconfig, cfg.output)
+	if err != nil {
+		return clierror.Wrap(err, clierror.New("failed to save kubeconfig"))
 	}
 
 	return nil

internal/kube/config.go

@@ -1,6 +1,8 @@
 package kube
 
 import (
+	"fmt"
+
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
@@ -50,3 +52,21 @@ func setKubernetesDefaults(config *rest.Config) error {
 
 	return rest.SetKubernetesDefaults(config)
 }
+
+// SaveConfig saves the kubeconfig to a file or prints it to the console.
+func SaveConfig(kubeconfig *api.Config, output string) error {
+	if output != "" {
+		err := clientcmd.WriteToFile(*kubeconfig, output)
+		if err != nil {
+			return err
+		}
+		println("Kubeconfig saved to: " + output)
+		return nil
+	}
+	message, err := clientcmd.Write(*kubeconfig)
+	if err != nil {
+		return err
+	}
+	fmt.Println(string(message))
+	return nil
+}