cmd/pkg: support Project and get/delete/describe/apply resource with --project

Author: weizhouapache

Development.md

@@ -108,6 +108,13 @@ The controller creates/migrates its database tables on startup and listens on `:
 ```bash
 ./cloudstackctl apply -f application.yaml
 ./cloudstackctl get Application
+
+# Get/describe CloudStack resources (standalone or controller mode)
+./cloudstackctl get Project                          # list all projects
+./cloudstackctl get VirtualMachine -p my-project     # VMs in a project
+./cloudstackctl get VirtualMachine -P                # VMs across all projects
+./cloudstackctl get VirtualMachine -A                # all VMs incl. unmanaged (controller only)
+./cloudstackctl describe Network my-net -p my-project
 ```
 
 ---

README.md

@@ -52,6 +52,7 @@ There are two supported mode:
 | AffinityGroup | ✅ | ✅ |
 | SSHKey | ✅ | ✅ |
 | UserData | ✅ | ✅ |
+| Project | ✅ | ✅ |
 | Application | ❌ | ✅ |
 | Component | ❌ | ✅ |
 | VirtualMachineSpec | ❌ | ✅ |
@@ -72,6 +73,7 @@ There are two supported mode:
 | **UserData**           | userdata, ud, uds                        | User data scripts for VM initialization | create, update, delete, get, describe                                                                     | ConfigMap / Secret                       |
 | **AffinityGroup**      | ag, affinitygroup, affinitygroups        | Host/VM affinity or anti-affinity       | create, update, delete, get, describe                                                                     | PodAffinity / PodAntiAffinity            |
 | **SecurityGroup**      | sg, sgs, securitygroup, securitygroups   | Firewall rules for VMs                  | create, update, delete, get, describe                                                                     | NetworkPolicy                            |
+| **Project**            | proj, projs, project, projects           | CloudStack project (resource boundary)  | create, delete, get, describe                                                                             | Namespace                                |
 
 ---
 
@@ -210,7 +212,9 @@ Usage notes:
 
 | Flag | Short | Description |
 |---|---|---|
-| `--all` | `-A` | (Controller mode, VirtualMachine only) List all VMs from CloudStack including unmanaged ones. Without this flag only DB-managed VMs are returned. |
+| `--all-vms` | `-A` | (Controller mode, VirtualMachine only) List all VMs from CloudStack including unmanaged ones. Without this flag only DB-managed VMs are returned. |
+| `--all-projects` | `-P` | List resources across all CloudStack projects (and resources not in any project). |
+| `--project` | `-p` | Filter results to a specific CloudStack project by name. |
 | `--application` | `-a` | Filter results by application name. Applies to `Application`, `Component`, and `VirtualMachine` resources in controller mode. |
 
 Examples:
@@ -222,11 +226,43 @@ Examples:
 # List all VMs from CloudStack (including unmanaged)
 ./cloudstackctl get VirtualMachine -A
 
+# List VMs in a specific project
+./cloudstackctl get VirtualMachine -p my-project
+
+# List VMs across all projects
+./cloudstackctl get VirtualMachine -P
+
+# List all projects
+./cloudstackctl get Project
+
 # List components belonging to a specific application
 ./cloudstackctl get Component -a my-app
 ```
 
-### `reconcile` command
+### `describe` command flags
+
+| Flag | Short | Description |
+|---|---|---|
+| `--all-vms` | `-A` | (Controller mode, VirtualMachine only) Describe a VM directly from CloudStack rather than from the DB. |
+| `--project` | `-p` | Look up the resource within a specific CloudStack project by name. |
+
+Examples:
+
+```bash
+# Describe a managed VM from the DB
+./cloudstackctl describe VirtualMachine my-vm
+
+# Describe a VM directly from CloudStack
+./cloudstackctl describe VirtualMachine my-vm -A
+
+# Describe a network inside a project
+./cloudstackctl describe Network my-net -p my-project
+
+# Describe a project
+./cloudstackctl describe Project my-project
+```
+
+### `reconcile` command (TODO)
 
 Trigger on-demand reconciliation for a resource in controller mode:
 
@@ -345,7 +381,6 @@ Choose the option that fits your environment — full step-by-step instructions
 
 * CLI: Support resource update via YAML file
 * CLI: Support Rolling updates
-* CLI: Support CloudStack users and projects
 * CLI: Multi-zone deployments
 * CLI: Security group improvements
 * CLI: Support UserData details

apis/v1/types.go

@@ -12,6 +12,7 @@ const APIVersion = "cloudstackctl/v1"
 // Metadata contains resource metadata (name/labels/annotations)
 type Metadata struct {
 	Name        string            `json:"name" yaml:"name"`
+	Project     string            `json:"project,omitempty" yaml:"project,omitempty" gorm:"column:metadata_project"`
 	Labels      map[string]string `json:"labels,omitempty" yaml:"labels,omitempty" gorm:"serializer:json"`
 	Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty" gorm:"serializer:json"`
 }

cmd/cli/delete.go

@@ -20,6 +20,7 @@ var deleteCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		// file flag support (delete -f <yaml>)
 		filePath, _ := cmd.Flags().GetString("file")
+		projectFlag, _ := cmd.Flags().GetString("project")
 		var name string
 		var resourceType string
 		if filePath != "" {
@@ -54,16 +55,26 @@ var deleteCmd = &cobra.Command{
 				meta := docs[i]
 				kind, _ := meta["kind"].(string)
 				name = ""
+				project := ""
 				if m, ok := meta["metadata"].(map[string]interface{}); ok {
 					if n, ok := m["name"].(string); ok {
 						name = n
 					}
+					if p, ok := m["project"].(string); ok {
+						project = p
+					}
+				}
+				if project == "" && projectFlag != "" {
+					project = projectFlag
 				}
 				if kind == "" || name == "" {
 					log.Fatalf("each YAML doc must contain kind and metadata.name")
 				}
 				resourceType = kind
-				payload := map[string]string{"kind": resourceType, "name": name}
+				payload := map[string]interface{}{"kind": resourceType, "name": name}
+				if project != "" {
+					payload["project"] = project
+				}
 				rawPayload, _ := json.Marshal(payload)
 
 				if standalone {
@@ -108,7 +119,10 @@ var deleteCmd = &cobra.Command{
 		resourceType = normalizeResourceType(args[0])
 		name = args[1]
 
-		payload := map[string]string{"kind": resourceType, "name": name}
+		payload := map[string]interface{}{"kind": resourceType, "name": name}
+		if projectFlag != "" {
+			payload["project"] = projectFlag
+		}
 		rawPayload, _ := json.Marshal(payload)
 
 		if standalone {
@@ -147,4 +161,5 @@ var deleteCmd = &cobra.Command{
 func init() {
 	rootCmd.AddCommand(deleteCmd)
 	deleteCmd.Flags().StringP("file", "f", "", "Path to YAML configuration file to delete")
+	deleteCmd.Flags().StringP("project", "p", "", "Delete resource within a specific CloudStack project")
 }

cmd/cli/describe.go

@@ -26,11 +26,17 @@ var describeCmd = &cobra.Command{
 
 		// Certain managed kinds are only supported via the controller
 		if standalone {
+			if describeAllVMs {
+				log.Fatal("--all-vms/-A is supported in controller mode only")
+			}
 			if resourceType == "Application" || resourceType == "Component" || resourceType == "VirtualMachineSpec" {
 				log.Fatalf("'%s' is not supported in standalone mode", resourceType)
 			}
 			// Standalone: use local describe wrapper
-			payload := map[string]string{"kind": resourceType, "name": name}
+			payload := map[string]interface{}{"kind": resourceType, "name": name}
+			if describeProject != "" {
+				payload["project"] = describeProject
+			}
 			raw, _ := json.Marshal(payload)
 			if respAny, err := handlers.DescribeCloudStackResource(raw); err != nil {
 				log.Fatalf("Local describe failed: %v", err)
@@ -54,8 +60,11 @@ var describeCmd = &cobra.Command{
 		q := url.Values{}
 		q.Set("kind", resourceType)
 		q.Set("name", name)
-		if describeAll {
-			q.Set("all", "true")
+		if describeProject != "" {
+			q.Set("project", describeProject)
+		}
+		if describeAllVMs && resourceType == "VirtualMachine" {
+			q.Set("all-vms", "true")
 		}
 		path := "/describe?" + q.Encode()
 		body, err := ControllerRequest("GET", path, nil)
@@ -81,8 +90,10 @@ func init() {
 	rootCmd.AddCommand(describeCmd)
 }
 
-var describeAll bool
+var describeAllVMs bool
+var describeProject string
 
 func init() {
-	describeCmd.Flags().BoolVarP(&describeAll, "all", "A", false, "Describe a VM from CloudStack (controller mode only)")
+	describeCmd.Flags().BoolVarP(&describeAllVMs, "all-vms", "A", false, "Describe a VM directly from CloudStack (controller mode only)")
+	describeCmd.Flags().StringVarP(&describeProject, "project", "p", "", "Look up resource within a specific CloudStack project")
 }

cmd/cli/get.go

@@ -39,16 +39,25 @@ var getCmd = &cobra.Command{
 		// Standalone: call local handler wrapper. If any requested kind is
 		// managed by the controller, fail in standalone mode.
 		if standalone {
+			if getAllVMs {
+				log.Fatal("--all-vms/-A is supported in controller mode only")
+			}
 			for _, resourceType := range kinds {
 				if resourceType == "Application" || resourceType == "Component" || resourceType == "VirtualMachineSpec" {
 					log.Fatalf("'%s' is not supported in standalone mode", resourceType)
 				}
 			}
 			for i, resourceType := range kinds {
-				payload := map[string]string{"kind": resourceType}
+				payload := map[string]interface{}{"kind": resourceType}
 				if name != "" {
 					payload["name"] = name
 				}
+				if getProject != "" {
+					payload["project"] = getProject
+				}
+				if getAllProjects {
+					payload["allProjects"] = true
+				}
 				raw, _ := json.Marshal(payload)
 				if resp, err := handlers.GetCloudStackResource(raw); err != nil {
 					log.Fatalf("Local get failed: %v", err)
@@ -67,13 +76,19 @@ var getCmd = &cobra.Command{
 		for i, resourceType := range kinds {
 			var endpoint = "/list"
 			q := url.Values{}
-			if getAll && resourceType == "VirtualMachine" {
-				q.Set("all", "true")
-			}
 			q.Set("kind", resourceType)
 			if name != "" {
 				q.Set("name", name)
 			}
+			if getProject != "" {
+				q.Set("project", getProject)
+			}
+			if getAllProjects {
+				q.Set("all-projects", "true")
+			}
+			if getAllVMs && resourceType == "VirtualMachine" {
+				q.Set("all-vms", "true")
+			}
 			if getApplication != "" && (resourceType == "Application" || resourceType == "Component" || resourceType == "VirtualMachine") {
 				q.Set("application", getApplication)
 			}
@@ -87,8 +102,9 @@ var getCmd = &cobra.Command{
 				fmt.Printf("\n")
 			}
 
-			// If controller returned VM objects from DB, pretty-print them
-			if resourceType == "VirtualMachine" && !getAll {
+			// DB-backed VMs are shown in controller mode unless CloudStack-scoped
+			// VM listing is explicitly requested.
+			if resourceType == "VirtualMachine" && !getAllVMs && getProject == "" && !getAllProjects {
 				var vms []v1.VirtualMachine
 				if err := json.Unmarshal(body, &vms); err == nil {
 					handlers.PrintVMsFromController(vms)
@@ -136,11 +152,15 @@ func init() {
 	rootCmd.AddCommand(getCmd)
 }
 
-var getAll bool
+var getAllVMs bool
+var getAllProjects bool
+var getProject string
 var getApplication string
 
 func init() {
-	getCmd.Flags().BoolVarP(&getAll, "all", "A", false, "Show all VMs from CloudStack (include unmanaged) — controller mode only")
+	getCmd.Flags().BoolVarP(&getAllVMs, "all-vms", "A", false, "Show all VMs from CloudStack (include unmanaged) - controller mode only")
+	getCmd.Flags().BoolVarP(&getAllProjects, "all-projects", "P", false, "List resources across all projects (and no project)")
+	getCmd.Flags().StringVarP(&getProject, "project", "p", "", "Filter results by project name")
 	getCmd.Flags().StringVarP(&getApplication, "application", "a", "", "Filter Application/Component/VirtualMachine results by application name")
 }
 
@@ -199,6 +219,12 @@ func tryDecodeAndPrint(resourceType string, body []byte) bool {
 			handlers.PrintCloudStackResource(resourceType, &resp)
 			return true
 		}
+	case "Project":
+		var resp cs.ListProjectsResponse
+		if err := json.Unmarshal(body, &resp); err == nil {
+			handlers.PrintCloudStackResource(resourceType, &resp)
+			return true
+		}
 	}
 	return false
 }

cmd/cli/utils.go

@@ -33,6 +33,8 @@ func normalizeResourceType(s string) string {
 		return "AffinityGroup"
 	case "sg", "sgs", "securitygroup", "securitygroups":
 		return "SecurityGroup"
+	case "proj", "projs", "project", "projects":
+		return "Project"
 	default:
 		return s
 	}