feat: refactor connect to use top level group

Author: wtrocki

pkg/cmd/cluster/cluster.go

@@ -0,0 +1,24 @@
+package cluster
+
+import (
+	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/cluster/connect"
+	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/cluster/info"
+	"github.com/spf13/cobra"
+)
+
+// NewServiceAccountCommand creates a new command sub-group to manage service accounts
+func NewClusterCommand() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "cluster",
+		Short: "Managed your services in OpenShift Cluster",
+		Long:  "Managed your services in OpenShift Cluster",
+		Args:  cobra.ExactArgs(1),
+	}
+
+	cmd.AddCommand(
+		info.NewInfoCommand(),
+		connect.NewConnectCommand(),
+	)
+
+	return cmd
+}

pkg/cmd/kafka/connect/connect.go pkg/cmd/cluster/connect/connect.gopkg/cmd/kafka/connect/connect.go renamed to pkg/cmd/cluster/connect/connect.go

@@ -0,0 +1,80 @@
+package info
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/fatih/color"
+
+	"github.com/spf13/cobra"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/tools/clientcmd"
+	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
+	"k8s.io/client-go/util/homedir"
+
+	// Get all auth schemes
+	_ "k8s.io/client-go/plugin/pkg/client/auth"
+)
+
+var statusMsg = `
+Namespace: %v
+`
+
+func NewInfoCommand() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "info",
+		Short: "Prints information about your OpenShift cluster connection",
+		Long:  `Prints information about your OpenShift cluster connection`,
+		Run:   runInfo,
+	}
+
+	return cmd
+}
+
+func runInfo(cmd *cobra.Command, _ []string) {
+	connectToCluster()
+}
+
+func connectToCluster() {
+	var kubeconfig string
+
+	if home := homedir.HomeDir(); home != "" {
+		kubeconfig = filepath.Join(home, ".kube", "config")
+	}
+
+	if !fileExists(kubeconfig) {
+		fmt.Fprint(os.Stderr, `
+		Command uses oc or kubectl login context file. 
+		Please make sure that you have configured access to your cluster and selected the right namespace`)
+		return
+	}
+
+	kubeClientconfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
+		&clientcmd.ClientConfigLoadingRules{ExplicitPath: kubeconfig},
+		&clientcmd.ConfigOverrides{ClusterInfo: clientcmdapi.Cluster{Server: ""}})
+
+	// use the current context in kubeconfig
+	restConfig, err := kubeClientconfig.ClientConfig()
+	if err != nil {
+		fmt.Fprint(os.Stderr, "\nFailed to load kube config file", err)
+		return
+	}
+
+	// create the clientset
+	_, err = kubernetes.NewForConfig(restConfig)
+
+	if err != nil {
+		fmt.Fprint(os.Stderr, "\nFailed to load kube config file", err)
+		return
+	}
+
+	currentNamespace, _, _ := kubeClientconfig.Namespace()
+
+	fmt.Fprintf(os.Stderr, statusMsg, color.HiGreenString(currentNamespace))
+}
+
+func fileExists(path string) bool {
+	_, err := os.Stat(path)
+	return !os.IsNotExist(err)
+}

pkg/cmd/cluster/info/info.go

@@ -5,7 +5,6 @@ package kafka
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/kafka/connect"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/kafka/create"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/kafka/delete"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/kafka/describe"
@@ -31,7 +30,6 @@ func NewKafkaCommand() *cobra.Command {
 		use.NewUseCommand(),
 		status.NewStatusCommand(),
 		topics.NewTopicsCommand(),
-		connect.NewConnectCommand())
-
+	)
 	return cmd
 }

pkg/cmd/kafka/kafka.go

@@ -2,6 +2,7 @@ package root
 
 import (
 	"github.com/MakeNowJust/heredoc"
+	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/cluster"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/completion"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/docs"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/kafka"
@@ -31,6 +32,7 @@ func NewRootCommand(version string) *cobra.Command {
 	cmd.AddCommand(kafka.NewKafkaCommand())
 	cmd.AddCommand(serviceaccount.NewServiceAccountCommand())
 	cmd.AddCommand(docs.NewDocsCommand())
+	cmd.AddCommand(cluster.NewClusterCommand())
 	cmd.AddCommand(completion.CompletionCmd)
 
 	return cmd