From 393306de124b16ba22f965a9504a53133cc81f16 Mon Sep 17 00:00:00 2001
From: Paul Payne <paul@payne.io>
Date: Tue, 14 Oct 2025 21:04:40 +0000
Subject: [PATCH] Instance-namespace utility endpoints.

---
 cmd/operation.go | 13 +++++++++----
 cmd/utility.go   |  7 ++++++-
 cmd/version.go   | 15 +++++++++------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/cmd/operation.go b/cmd/operation.go
index 2a246ed..baab78e 100644
--- a/cmd/operation.go
+++ b/cmd/operation.go
@@ -26,7 +26,7 @@ var operationGetCmd = &cobra.Command{
 			return err
 		}
 
-		resp, err := apiClient.Get(fmt.Sprintf("/api/v1/operations/%s?instance=%s", args[0], inst))
+		resp, err := apiClient.Get(fmt.Sprintf("/api/v1/instances/%s/operations/%s", inst, args[0]))
 		if err != nil {
 			return err
 		}
@@ -43,7 +43,12 @@ var operationListCmd = &cobra.Command{
 	Use:   "list",
 	Short: "List operations",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		resp, err := apiClient.Get("/api/v1/operations")
+		inst, err := getInstanceName()
+		if err != nil {
+			return err
+		}
+
+		resp, err := apiClient.Get(fmt.Sprintf("/api/v1/instances/%s/operations", inst))
 		if err != nil {
 			return err
 		}
@@ -90,7 +95,7 @@ func streamOperationOutput(opID string) error {
 	}
 
 	// Connect to SSE stream
-	url := fmt.Sprintf("%s/api/v1/operations/%s/stream?instance=%s", baseURL, opID, inst)
+	url := fmt.Sprintf("%s/api/v1/instances/%s/operations/%s/stream", baseURL, inst, opID)
 	client := sse.NewClient(url)
 	events := make(chan *sse.Event)
 
@@ -105,7 +110,7 @@ func streamOperationOutput(opID string) error {
 		ticker := time.NewTicker(500 * time.Millisecond)
 		defer ticker.Stop()
 		for range ticker.C {
-			resp, err := apiClient.Get(fmt.Sprintf("/api/v1/operations/%s?instance=%s", opID, inst))
+			resp, err := apiClient.Get(fmt.Sprintf("/api/v1/instances/%s/operations/%s", inst, opID))
 			if err == nil {
 				status := resp.GetString("status")
 				if status == "completed" || status == "failed" {
diff --git a/cmd/utility.go b/cmd/utility.go
index e07aad5..5bd9d10 100644
--- a/cmd/utility.go
+++ b/cmd/utility.go
@@ -72,7 +72,12 @@ var nodeIPCmd = &cobra.Command{
 	Use:   "node-ip",
 	Short: "Get control plane IP",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		resp, err := apiClient.Get("/api/v1/utilities/controlplane/ip")
+		inst, err := getInstanceName()
+		if err != nil {
+			return err
+		}
+
+		resp, err := apiClient.Get(fmt.Sprintf("/api/v1/instances/%s/utilities/controlplane/ip", inst))
 		if err != nil {
 			return err
 		}
diff --git a/cmd/version.go b/cmd/version.go
index eabec61..0fe3c12 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -24,13 +24,16 @@ var versionCmd = &cobra.Command{
 
 		// If connected to daemon, show cluster versions
 		if apiClient != nil {
-			resp, err := apiClient.Get("/api/v1/utilities/version")
+			inst, err := getInstanceName()
 			if err == nil {
-				if k8s, ok := resp.Data["kubernetes"].(string); ok {
-					fmt.Printf("Kubernetes: %s\n", k8s)
-				}
-				if talos, ok := resp.Data["talos"].(string); ok && talos != "" {
-					fmt.Printf("Talos: %s\n", talos)
+				resp, err := apiClient.Get(fmt.Sprintf("/api/v1/instances/%s/utilities/version", inst))
+				if err == nil {
+					if k8s, ok := resp.Data["kubernetes"].(string); ok {
+						fmt.Printf("Kubernetes: %s\n", k8s)
+					}
+					if talos, ok := resp.Data["talos"].(string); ok && talos != "" {
+						fmt.Printf("Talos: %s\n", talos)
+					}
 				}
 			}
 		}