fix duplicates. tmp fix

Author: jsbroks

.gitignore

@@ -4,4 +4,6 @@ test.bash
 /bin
 .idea
 .vscode
-*.test.yaml
+*.test.yaml
+
+switch.sh

cmd/ctrlc/root/api/get/get.go

@@ -1,7 +1,7 @@
 package get
 
 import (
-	"github.com/ctrlplanedev/cli/cmd/ctrlc/root/api/upsert/deploymentversion"
+	"github.com/ctrlplanedev/cli/cmd/ctrlc/root/api/get/resources"
 	"github.com/spf13/cobra"
 )
 
@@ -15,7 +15,7 @@ func NewGetCmd() *cobra.Command {
 		},
 	}
 
-	cmd.AddCommand(deploymentversion.NewUpsertDeploymentVersionCmd())
+	cmd.AddCommand(resources.NewResourcesCmd())
 
 	return cmd
 }

cmd/ctrlc/root/api/get/resources/resources.go

@@ -2,6 +2,7 @@ package resources
 
 import (
 	"fmt"
+	"net/url"
 
 	"github.com/ctrlplanedev/cli/internal/api"
 	"github.com/ctrlplanedev/cli/internal/cliutil"
@@ -13,7 +14,6 @@ func NewResourcesCmd() *cobra.Command {
 	var query string
 	var limit int
 	var offset int
-	var workspace string
 
 	cmd := &cobra.Command{
 		Use:   "resources",
@@ -22,6 +22,8 @@ func NewResourcesCmd() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			apiURL := viper.GetString("url")
 			apiKey := viper.GetString("api-key")
+			workspace := viper.GetString("workspace")
+
 			client, err := api.NewAPIKeyClientWithResponses(apiURL, apiKey)
 			if err != nil {
 				return fmt.Errorf("failed to create API client: %w", err)
@@ -37,8 +39,10 @@ func NewResourcesCmd() *cobra.Command {
 				params.Offset = &offset
 			}
 			if query != "" {
-				params.Cel = &query
+				q := url.QueryEscape(query)
+				params.Cel = &q
 			}
+			
 			resp, err := client.GetAllResources(cmd.Context(), workspaceID.String(), params)
 			if err != nil {
 				return fmt.Errorf("failed to get resources: %w", err)
@@ -51,7 +55,6 @@ func NewResourcesCmd() *cobra.Command {
 	cmd.Flags().StringVarP(&query, "query", "q", "", "CEL filter")
 	cmd.Flags().IntVarP(&limit, "limit", "l", 50, "Limit the number of results")
 	cmd.Flags().IntVarP(&offset, "offset", "o", 0, "Offset the results")
-	cmd.Flags().StringVarP(&workspace, "workspace", "w", "", "Workspace to get resources from")
 
 	cmd.MarkFlagRequired("workspace")
 

cmd/ctrlc/root/apply/cmd.go

@@ -1,51 +1,51 @@
 package apply
 
-import (
-	"context"
-	"fmt"
-
-	"github.com/spf13/cobra"
-)
-
-// NewApplyCmd creates a new apply command
-func NewApplyCmd() *cobra.Command {
-	var filePath string
-
-	cmd := &cobra.Command{
-		Use:   "apply",
-		Short: "Apply a YAML configuration file to create systems and deployments",
-		Long:  `Apply a YAML configuration file to create systems and deployments in Ctrlplane`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runApply(filePath)
-		},
-	}
-
-	cmd.Flags().StringVarP(&filePath, "file", "f", "", "Path to the YAML configuration file (required)")
-	cmd.MarkFlagRequired("file")
-
-	return cmd
-}
-
-func runApply(filePath string) error {
-	ctx := context.Background()
-
-	// Read and parse the YAML file
-	config, err := readConfigFile(filePath)
-	if err != nil {
-		return fmt.Errorf("failed to read config file: %w", err)
-	}
-
-	// Create API client
-	client, workspaceID, err := createAPIClient()
-	if err != nil {
-		return err
-	}
-
-	// Process systems and collect errors
-	processAllSystems(ctx, client, workspaceID, config.Systems)
-	processResourceProvider(ctx, client, workspaceID.String(), config.Providers)
-	processResourceRelationships(ctx, client, workspaceID.String(), config.Relationships)
-	processAllPolicies(ctx, client, workspaceID.String(), config.Policies)
-
-	return nil
-}
+// import (
+// 	"context"
+// 	"fmt"
+
+// 	"github.com/spf13/cobra"
+// )
+
+// // NewApplyCmd creates a new apply command
+// func NewApplyCmd() *cobra.Command {
+// 	var filePath string
+
+// 	cmd := &cobra.Command{
+// 		Use:   "apply",
+// 		Short: "Apply a YAML configuration file to create systems and deployments",
+// 		Long:  `Apply a YAML configuration file to create systems and deployments in Ctrlplane`,
+// 		RunE: func(cmd *cobra.Command, args []string) error {
+// 			return runApply(filePath)
+// 		},
+// 	}
+
+// 	cmd.Flags().StringVarP(&filePath, "file", "f", "", "Path to the YAML configuration file (required)")
+// 	cmd.MarkFlagRequired("file")
+
+// 	return cmd
+// }
+
+// func runApply(filePath string) error {
+// 	ctx := context.Background()
+
+// 	// Read and parse the YAML file
+// 	config, err := readConfigFile(filePath)
+// 	if err != nil {
+// 		return fmt.Errorf("failed to read config file: %w", err)
+// 	}
+
+// 	// Create API client
+// 	client, workspaceID, err := createAPIClient()
+// 	if err != nil {
+// 		return err
+// 	}
+
+// 	// Process systems and collect errors
+// 	processAllSystems(ctx, client, workspaceID, config.Systems)
+// 	processResourceProvider(ctx, client, workspaceID.String(), config.Providers)
+// 	processResourceRelationships(ctx, client, workspaceID.String(), config.Relationships)
+// 	processAllPolicies(ctx, client, workspaceID.String(), config.Policies)
+
+// 	return nil
+// }