cluster: fix describe resources

Author: weizhouapache

Development.md

@@ -105,6 +105,27 @@ Examples:
 ./cloudstackctl apply -f application.yaml
 ```
 
+CLI flags: `--all / -A`
+------------------------
+
+Two commands support an `--all` (short `-A`) flag in cluster mode to query CloudStack directly rather than the controller DB:
+
+- `get VirtualMachine -A` — list all VMs from CloudStack (including unmanaged VMs); without `-A` the controller returns only VMs persisted in the DB (managed by cloudstackctl).
+- `describe <Kind> <name> -A` — describe the named resource by querying CloudStack directly rather than using controller-managed state.
+
+Examples:
+
+```bash
+# Cluster mode: list only managed VMs (default)
+./cloudstackctl get VirtualMachine
+
+# Cluster mode: list all VMs from CloudStack (include unmanaged)
+./cloudstackctl get VirtualMachine -A
+
+# Describe a VM from CloudStack directly
+./cloudstackctl describe VirtualMachine my-vm -A
+```
+
 ## PostgreSQL environment variables
 
 `cloudstackctl` reads the database connection from `DATABASE_DSN` if provided, or

cmd/cli/describe.go

@@ -3,6 +3,7 @@ package cli
 import (
 	"cloudstackctl/pkg/handlers"
 	"encoding/json"
+	"fmt"
 	"log"
 	"net/url"
 
@@ -31,22 +32,57 @@ var describeCmd = &cobra.Command{
 			// Standalone: use local describe wrapper
 			payload := map[string]string{"kind": resourceType, "name": name}
 			raw, _ := json.Marshal(payload)
-			if err := handlers.DescribeCloudStackResource(raw); err != nil {
+			if respAny, err := handlers.DescribeCloudStackResource(raw); err != nil {
 				log.Fatalf("Local describe failed: %v", err)
+			} else {
+				// Try to marshal the returned object into pretty JSON
+				if b, jerr := json.MarshalIndent(respAny, "", "  "); jerr == nil {
+					fmt.Println(string(b))
+				} else {
+					// Fallbacks: if it's a []byte, print string; otherwise use default fmt
+					if bs, ok := respAny.([]byte); ok {
+						fmt.Println(string(bs))
+					} else {
+						fmt.Printf("%v\n", respAny)
+					}
+				}
 			}
 			return
 		}
 
 		// Cluster mode: query controller describe endpoint
-		path := "/describe?kind=" + url.QueryEscape(resourceType) + "&name=" + url.QueryEscape(name)
+		q := url.Values{}
+		q.Set("kind", resourceType)
+		q.Set("name", name)
+		if describeAll {
+			q.Set("all", "true")
+		}
+		path := "/describe?" + q.Encode()
 		body, err := ControllerRequest("GET", path, nil)
 		if err != nil {
 			log.Fatalf("Failed to query controller: %v", err)
+		} else {
+			var obj any
+			if uerr := json.Unmarshal(body, &obj); uerr != nil {
+				// Not valid JSON? print raw.
+				fmt.Println(string(body))
+			} else {
+				if b, merr := json.MarshalIndent(obj, "", "  "); merr == nil {
+					fmt.Println(string(b))
+				} else {
+					fmt.Println(string(body))
+				}
+			}
 		}
-		println(string(body))
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(describeCmd)
 }
+
+var describeAll bool
+
+func init() {
+	describeCmd.Flags().BoolVarP(&describeAll, "all", "A", false, "Describe a VM from CloudStack (cluster mode only)")
+}

controller/controller.go

@@ -345,46 +345,19 @@ func (c *Controller) Start() {
 				return
 			}
 			switch kind {
-			case "Network":
-				params := c.csClient.Network.NewListNetworksParams()
-				params.SetName(name)
-				resp, err := c.csClient.Network.ListNetworks(params)
-				if err != nil || resp == nil || len(resp.Networks) == 0 {
-					http.Error(w, "network not found", http.StatusNotFound)
-					return
-				}
-				b, _ := json.Marshal(resp.Networks[0])
-				w.Header().Set("Content-Type", "application/json")
-				w.WriteHeader(http.StatusOK)
-				w.Write(b)
-				return
-			case "Template":
-				params := c.csClient.Template.NewListTemplatesParams("")
-				params.SetName(name)
-				params.SetTemplatefilter("all")
-				resp, err := c.csClient.Template.ListTemplates(params)
-				if err != nil || resp == nil || len(resp.Templates) == 0 {
-					http.Error(w, "template not found", http.StatusNotFound)
-					return
-				}
-				b, _ := json.Marshal(resp.Templates[0])
-				w.Header().Set("Content-Type", "application/json")
-				w.WriteHeader(http.StatusOK)
-				w.Write(b)
-				return
-			case "Volume":
-				params := c.csClient.Volume.NewListVolumesParams()
-				params.SetName(name)
-				resp, err := c.csClient.Volume.ListVolumes(params)
-				if err != nil || resp == nil || len(resp.Volumes) == 0 {
-					http.Error(w, "volume not found", http.StatusNotFound)
+			case "Network", "Volume", "SSHKey", "SecurityGroup", "AffinityGroup", "UserData":
+				// Standalone: use local describe wrapper
+				payload := map[string]string{"kind": kind, "name": name}
+				raw, _ := json.Marshal(payload)
+				if resp, err := handlers.DescribeCloudStackResource(raw); err != nil {
+					log.Fatalf("Local describe failed: %v", err)
+				} else {
+					b, _ := json.Marshal(resp)
+					w.Header().Set("Content-Type", "application/json")
+					w.WriteHeader(http.StatusOK)
+					w.Write(b)
 					return
 				}
-				b, _ := json.Marshal(resp.Volumes[0])
-				w.Header().Set("Content-Type", "application/json")
-				w.WriteHeader(http.StatusOK)
-				w.Write(b)
-				return
 			case "Application":
 				var app v1.Application
 				if db.DB == nil || db.DB.Where("metadata_name = ?", name).First(&app).Error != nil {
@@ -408,6 +381,24 @@ func (c *Controller) Start() {
 				w.Write(b)
 				return
 			case "VirtualMachine":
+				// If client asked for all, delegate to handlers which query CloudStack
+				if r.URL.Query().Get("all") == "true" {
+					payload := map[string]string{"kind": kind}
+					if name != "" {
+						payload["name"] = name
+					}
+					raw, _ := json.Marshal(payload)
+					obj, err := handlers.DescribeCloudStackResource(raw)
+					if err != nil {
+						http.Error(w, fmt.Sprintf("failed to describe %s: %v", kind, err), http.StatusInternalServerError)
+						return
+					}
+					b, _ := json.Marshal(obj)
+					w.Header().Set("Content-Type", "application/json")
+					w.WriteHeader(http.StatusOK)
+					w.Write(b)
+					return
+				}
 				var vm v1.VirtualMachine
 				if db.DB == nil || db.DB.Where("metadata_name = ?", name).First(&vm).Error != nil {
 					http.Error(w, "virtualmachine not found", http.StatusNotFound)

pkg/handlers/affinitygroup.go

@@ -1,7 +1,6 @@
 package handlers
 
 import (
-	"encoding/json"
 	"fmt"
 	"log"
 
@@ -56,24 +55,22 @@ func ListAffinityGroups(name string) (any, error) {
 	return resp, err
 }
 
-// DescribeAffinityGroup prints details for an affinity group by name.
-func DescribeAffinityGroup(name string) error {
+// DescribeAffinityGroup returns the affinity group object from CloudStack by name.
+func DescribeAffinityGroup(name string) (any, error) {
 	client, err := cloudstack.NewClient()
 	if err != nil {
-		return fmt.Errorf("failed to create CloudStack client: %w", err)
+		return nil, fmt.Errorf("failed to create CloudStack client: %w", err)
 	}
 	params := client.AffinityGroup.NewListAffinityGroupsParams()
 	params.SetName(name)
 	resp, err := client.AffinityGroup.ListAffinityGroups(params)
 	if err != nil {
-		return fmt.Errorf("cloudstack API error: %w", err)
+		return nil, fmt.Errorf("cloudstack API error: %w", err)
 	}
 	if resp == nil || len(resp.AffinityGroups) == 0 {
-		return fmt.Errorf("affinity group %s not found", name)
+		return nil, fmt.Errorf("affinity group %s not found", name)
 	}
-	b, _ := json.MarshalIndent(resp.AffinityGroups[0], "", "  ")
-	fmt.Println(string(b))
-	return nil
+	return resp.AffinityGroups[0], nil
 }
 
 // ResolveAffinityGroup returns the CloudStack affinity group ID for a given name.

pkg/handlers/network.go

@@ -1,7 +1,6 @@
 package handlers
 
 import (
-	"encoding/json"
 	"fmt"
 	"log"
 	"strconv"
@@ -51,27 +50,22 @@ func ListNetworks(name string) (any, error) {
 	return resp, err
 }
 
-// PrintNetworks prints a table of networks from the SDK slice.
-// PrintNetworks moved to print.go
-
 // DescribeNetwork prints JSON for a single network identified by name.
-func DescribeNetwork(name string) error {
+func DescribeNetwork(name string) (any, error) {
 	client, err := cloudstack.NewClient()
 	if err != nil {
-		return fmt.Errorf("failed to create CloudStack client: %w", err)
+		return nil, fmt.Errorf("failed to create CloudStack client: %w", err)
 	}
 	params := client.Network.NewListNetworksParams()
 	params.SetName(name)
 	resp, err := client.Network.ListNetworks(params)
 	if err != nil {
-		return fmt.Errorf("cloudstack API error: %w", err)
+		return nil, fmt.Errorf("cloudstack API error: %w", err)
 	}
 	if resp == nil || len(resp.Networks) == 0 {
-		return fmt.Errorf("network %s not found", name)
+		return nil, fmt.Errorf("network %s not found", name)
 	}
-	data, _ := json.MarshalIndent(resp.Networks[0], "", "  ")
-	log.Println(string(data))
-	return nil
+	return resp.Networks[0], nil
 }
 
 // DeleteNetwork deletes a network by name via CloudStack API.

pkg/handlers/securitygroup.go

@@ -1,7 +1,6 @@
 package handlers
 
 import (
-	"encoding/json"
 	"fmt"
 	"log"
 
@@ -27,22 +26,20 @@ func ListSecurityGroups(name string) (any, error) {
 	return resp, err
 }
 
-// DescribeSecurityGroup prints JSON for a security group by name.
-func DescribeSecurityGroup(name string) error {
+// DescribeSecurityGroup returns the security group object from CloudStack by name.
+func DescribeSecurityGroup(name string) (any, error) {
 	client, err := cloudstack.NewClient()
 	if err != nil {
-		return fmt.Errorf("failed to create CloudStack client: %w", err)
+		return nil, fmt.Errorf("failed to create CloudStack client: %w", err)
 	}
 	sg, _, err := client.SecurityGroup.GetSecurityGroupByName(name)
 	if err != nil {
-		return fmt.Errorf("cloudstack API error: %w", err)
+		return nil, fmt.Errorf("cloudstack API error: %w", err)
 	}
 	if sg == nil {
-		return fmt.Errorf("security group %s not found", name)
+		return nil, fmt.Errorf("security group %s not found", name)
 	}
-	data, _ := json.MarshalIndent(sg, "", "  ")
-	log.Println(string(data))
-	return nil
+	return sg, nil
 }
 
 // DeleteSecurityGroup deletes a security group by name.

pkg/handlers/snapshot.go

@@ -1,7 +1,6 @@
 package handlers
 
 import (
-	"encoding/json"
 	"fmt"
 	"log"
 	"os"
@@ -33,24 +32,22 @@ func ListSnapshots(name string) error {
 	return nil
 }
 
-// DescribeSnapshot prints JSON for a snapshot by name.
-func DescribeSnapshot(name string) error {
+// DescribeSnapshot returns the snapshot object from CloudStack by name.
+func DescribeSnapshot(name string) (any, error) {
 	client, err := cloudstack.NewClient()
 	if err != nil {
-		return fmt.Errorf("failed to create CloudStack client: %w", err)
+		return nil, fmt.Errorf("failed to create CloudStack client: %w", err)
 	}
 	params := client.Snapshot.NewListSnapshotsParams()
 	params.SetName(name)
 	resp, err := client.Snapshot.ListSnapshots(params)
 	if err != nil {
-		return fmt.Errorf("cloudstack API error: %w", err)
+		return nil, fmt.Errorf("cloudstack API error: %w", err)
 	}
 	if resp == nil || len(resp.Snapshots) == 0 {
-		return fmt.Errorf("snapshot %s not found", name)
+		return nil, fmt.Errorf("snapshot %s not found", name)
 	}
-	data, _ := json.MarshalIndent(resp.Snapshots[0], "", "  ")
-	log.Println(string(data))
-	return nil
+	return resp.Snapshots[0], nil
 }
 
 // DeleteSnapshot deletes a snapshot by name.

pkg/handlers/sshkey.go

@@ -1,7 +1,6 @@
 package handlers
 
 import (
-	"encoding/json"
 	"fmt"
 	"log"
 
@@ -26,26 +25,24 @@ func ListSSHKeys(name string) (any, error) {
 	return resp, err
 }
 
-// DescribeSSHKey prints JSON for an SSH key by name.
-func DescribeSSHKey(name string) error {
+// DescribeSSHKey returns the SSH keypair object from CloudStack by name.
+func DescribeSSHKey(name string) (any, error) {
 	client, err := cloudstack.NewClient()
 	if err != nil {
-		return fmt.Errorf("failed to create CloudStack client: %w", err)
+		return nil, fmt.Errorf("failed to create CloudStack client: %w", err)
 	}
 	params := client.SSH.NewListSSHKeyPairsParams()
 	if name != "" {
 		params.SetName(name)
 	}
 	resp, err := client.SSH.ListSSHKeyPairs(params)
 	if err != nil {
-		return fmt.Errorf("cloudstack API error: %w", err)
+		return nil, fmt.Errorf("cloudstack API error: %w", err)
 	}
 	if resp == nil || len(resp.SSHKeyPairs) == 0 {
-		return fmt.Errorf("ssh key %s not found", name)
+		return nil, fmt.Errorf("ssh key %s not found", name)
 	}
-	data, _ := json.MarshalIndent(resp.SSHKeyPairs[0], "", "  ")
-	log.Println(string(data))
-	return nil
+	return resp.SSHKeyPairs[0], nil
 }
 
 // DeleteSSHKey deletes an SSH key by name.