add Region and private IP to machine list, add Region to machine status

superfly · Apr 22, 2022 · 96d5c4b · 96d5c4b
1 parent 143add5
commit 96d5c4b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/api/types.go b/api/types.go
@@ -1218,6 +1218,8 @@ type V1Machine struct {
 
 	State string `json:"state"`
 
+	Region string `json:"region"`
+
 	ImageRef machineImageRef `json:"image_ref"`
 
 	// InstanceID is unique for each version of the machine

diff --git a/internal/cli/internal/command/machine/list.go b/internal/cli/internal/command/machine/list.go
@@ -90,10 +90,13 @@ func runMachineList(ctx context.Context) (err error) {
 				fmt.Sprintf("%s:%s", machine.ImageRef.Repository, machine.ImageRef.Tag),
 				machine.CreatedAt,
 				machine.State,
+				machine.Region,
 				machine.Name,
+				machine.PrivateIP,
 			})
 		}
-		_ = render.Table(io.Out, appName, rows, "ID", "Image", "Created", "State", "Name")
+
+		_ = render.Table(io.Out, appName, rows, "ID", "Image", "Created", "State", "Region", "Name", "IP Address")
 	}
 	return nil
 }
diff --git a/internal/cli/internal/command/machine/status.go b/internal/cli/internal/command/machine/status.go
@@ -77,6 +77,7 @@ func runMachineStatus(ctx context.Context) error {
 	fmt.Fprintf(io.Out, " Machine ID: %s\n", machine.ID)
 	fmt.Fprintf(io.Out, " Instance ID: %s\n", machine.InstanceID)
 	fmt.Fprintf(io.Out, " State: %s\n", machine.State)
+	fmt.Fprintf(io.Out, " Region: %s\n", machine.Region)
 	fmt.Fprintf(io.Out, " Image: %s\n", machine.Config.Image)
 
 	return nil