Merge pull request #61 from ctrlplanedev/mleonidas/add-node-sync-and-selector-arg

feat: sync nodes and add --selector arg

Author: mleonidas

cmd/ctrlc/root/sync/kubernetes/kubernetes.go

@@ -1,75 +1,21 @@
 package kubernetes
 
 import (
-	"context"
 	"fmt"
-	"strings"
 
 	"github.com/MakeNowJust/heredoc/v2"
 	"github.com/charmbracelet/log"
 	"github.com/ctrlplanedev/cli/internal/api"
 	ctrlp "github.com/ctrlplanedev/cli/internal/common"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	appsv1 "k8s.io/api/apps/v1"
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes"
 )
 
-func processNamespace(_ context.Context, clusterName string, namespace corev1.Namespace) api.ResourceProviderResource {
-	metadata := map[string]string{}
-	for key, value := range namespace.Labels {
-		metadata[fmt.Sprintf("tags/%s", key)] = value
-	}
-
-	metadata["kubernetes/namespace"] = namespace.Name
-	metadata["namespace/id"] = string(namespace.UID)
-	metadata["namespace/api-version"] = namespace.APIVersion
-	metadata["namespace/status"] = string(namespace.Status.Phase)
-
-	return api.ResourceProviderResource{
-		Version:    "ctrlplane.dev/kubernetes/namespace/v1",
-		Kind:       "KubernetesNamespace",
-		Name:       fmt.Sprintf("%s/%s", clusterName, namespace.Name),
-		Identifier: string(namespace.UID),
-		Config: map[string]any{
-			"id":     string(namespace.UID),
-			"name":   namespace.Name,
-			"status": namespace.Status.Phase,
-		},
-		Metadata: metadata,
-	}
-}
-
-func processDeployment(_ context.Context, clusterName string, deployment appsv1.Deployment) api.ResourceProviderResource {
-	metadata := map[string]string{}
-	for key, value := range deployment.Labels {
-		metadata[fmt.Sprintf("tags/%s", key)] = value
-	}
-	metadata["deployment/name"] = deployment.Name
-	metadata["deployment/id"] = string(deployment.UID)
-	metadata["deployment/api-version"] = deployment.APIVersion
-	metadata["deployment/namespace"] = deployment.Namespace
-
-	return api.ResourceProviderResource{
-		Version:    "ctrlplane.dev/kubernetes/deployment/v1",
-		Kind:       "KubernetesDeployment",
-		Name:       fmt.Sprintf("%s/%s/%s", clusterName, deployment.Namespace, deployment.Name),
-		Identifier: string(deployment.UID),
-		Config: map[string]any{
-			"id":        string(deployment.UID),
-			"name":      deployment.Name,
-			"namespace": deployment.Namespace,
-		},
-		Metadata: metadata,
-	}
-}
-
 func NewSyncKubernetesCmd() *cobra.Command {
 	var clusterIdentifier string
 	var providerName string
 	var clusterName string
+	var selectors ResourceTypes
 
 	cmd := &cobra.Command{
 		Use:   "kubernetes",
@@ -78,7 +24,7 @@ func NewSyncKubernetesCmd() *cobra.Command {
 			$ ctrlc sync kubernetes --cluster-identifier 1234567890 --cluster-name my-cluster
 		`),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			ctx := context.Background()
+			ctx := cmd.Context()
 			log.Info("Syncing Kubernetes resources on a cluster")
 			if clusterIdentifier == "" {
 				clusterIdentifier = viper.GetString("cluster-identifier")
@@ -89,6 +35,10 @@ func NewSyncKubernetesCmd() *cobra.Command {
 				return err
 			}
 
+			if clusterName == "" {
+				clusterName = configClusterName
+			}
+
 			log.Info("Connected to cluster", "name", clusterName)
 
 			apiURL := viper.GetString("url")
@@ -99,70 +49,19 @@ func NewSyncKubernetesCmd() *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("failed to create API client: %w", err)
 			}
-
-			clusterResource, err := ctrlplaneClient.GetResourceByIdentifierWithResponse(ctx, workspaceId, clusterIdentifier)
-			if err != nil {
-				log.Warn("Failed to get cluster resource")
-			}
-			if clusterResource.StatusCode() > 499 {
-				log.Warn("Failed to get cluster resource", "status", clusterResource.StatusCode(), "identifier", clusterIdentifier, "error", err)
-				return fmt.Errorf("error access ctrlplane api: %s", clusterResource.Status())
-			}
-			if clusterResource != nil && clusterResource.JSON200 != nil {
-				log.Info("Found cluster resource", "name", clusterResource.JSON200.Name)
-				clusterName = clusterResource.JSON200.Name
-			}
-
-			if clusterName == "" {
-				clusterName = configClusterName
-			}
-
-			clientset, err := kubernetes.NewForConfig(config)
-			if err != nil {
-				return err
-			}
-
-			namespaces, err := clientset.CoreV1().Namespaces().List(ctx, metav1.ListOptions{})
+			sync := newSync(clusterIdentifier, workspaceId, ctrlplaneClient, config, clusterName)
+			resources, err := sync.process(ctx, selectors)
 			if err != nil {
 				return err
 			}
 
-			resources := []api.ResourceProviderResource{}
-			for _, namespace := range namespaces.Items {
-				resource := processNamespace(context.Background(), clusterName, namespace)
-				resources = append(resources, resource)
-			}
-
-			deployments, err := clientset.AppsV1().Deployments(metav1.NamespaceAll).List(ctx, metav1.ListOptions{})
-			if err != nil {
-				return err
-			}
-
-			for _, deployment := range deployments.Items {
-				resource := processDeployment(context.Background(), clusterName, deployment)
-				resources = append(resources, resource)
-			}
-
-			if clusterResource != nil && clusterResource.JSON200 != nil {
-				for _, resource := range resources {
-					for key, value := range clusterResource.JSON200.Metadata {
-						if strings.HasPrefix(key, "tags/") {
-							continue
-						}
-						if _, exists := resource.Metadata[key]; !exists {
-							resource.Metadata[key] = value
-						}
-					}
-					resource.Metadata["kubernetes/name"] = clusterResource.JSON200.Name
-				}
-			}
-
 			return ctrlp.UpsertResources(ctx, resources, &providerName)
 		},
 	}
 	cmd.Flags().StringVarP(&providerName, "provider", "p", "", "Name of the resource provider")
 	cmd.Flags().StringVarP(&clusterIdentifier, "cluster-identifier", "c", "", "The identifier of the parent cluster in ctrlplane (if not provided, will use the CLUSTER_IDENTIFIER environment variable)")
 	cmd.Flags().StringVarP(&clusterName, "cluster-name", "n", "", "The name of the cluster")
+	cmd.Flags().VarP(&selectors, "selector", "s", "Select resources to sync [nodes|deployments|namespaces]. Repeat the flag to select multiple resources; omit it to sync all resources.")
 
 	return cmd
 }

cmd/ctrlc/root/sync/kubernetes/resource_types.go

@@ -0,0 +1,60 @@
+package kubernetes
+
+import (
+	"fmt"
+	"slices"
+	"strings"
+)
+
+type ResourceType string
+
+const (
+	ResourceNamespace  ResourceType = "namespaces"
+	ResourceNode       ResourceType = "nodes"
+	ResourceDeployment ResourceType = "deployments"
+)
+
+func (r ResourceType) String() string {
+	return string(r)
+}
+
+func ParseResourceType(s string) (ResourceType, error) {
+	switch ResourceType(s) {
+	case ResourceNamespace, ResourceNode, ResourceDeployment:
+		return ResourceType(s), nil
+	default:
+		return "", fmt.Errorf("invalid resource type %q", s)
+	}
+}
+
+type ResourceTypes []ResourceType
+
+func (r ResourceTypes) ShouldFetch(target ResourceType) bool {
+	return slices.Contains(r, target) || len(r) == 0
+}
+
+func (r *ResourceTypes) String() string {
+	if r == nil {
+		return ""
+	}
+	out := make([]string, len(*r))
+	for i, v := range *r {
+		out[i] = v.String()
+	}
+	return strings.Join(out, ",")
+}
+
+func (s *ResourceTypes) Type() string {
+	return "resourceType"
+}
+
+func (r *ResourceTypes) Set(value string) error {
+	// supports repeated flags like:
+	// --resource namespace --resource node
+	rt, err := ParseResourceType(value)
+	if err != nil {
+		return err
+	}
+	*r = append(*r, rt)
+	return nil
+}