Merge branch 'main' into fix/server-output

Author: villevsv-upcloud

CHANGELOG.md

@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `database session cancel` for cancelling an active database session
 
 ### Changed
+- **Breaking**: In JSON and YAML output of `loadbalancer list`: display full API response. This changes `state` field to `operational_state`.
+- **Breaking**: `storage list` and `storage show` JSON and YAML outputs to return full API response. This changes `servers` field to contain `server` field, which in turn contains the servers. `labels` field will not be outputted if empty.
 - **Breaking**: `server list` and `server show` JSON and YAML outputs to return full API response. This changes field `host_id` to `host`. `nics` is replaced with `networking` subfield `interfaces`. `storage` is replaced with `storage_devices`. `labels` contain subfield `label` which in turn contains the labels.
 - **Breaking**: `server firewall show` JSON and YAML outputs to return full API response. This removes fields `destination` and `source` fields in favor of `[destination|source]_address_start`, `[destination|source]_address_end`, `[destination|source]_port_start` and `[destination|source]_port_end`
 - In human readable output of `kubernetes show` command, show node-groups as table. Node-group details are available with `kubernetes nodegroup show` command.

internal/commands/account/show.go

@@ -26,7 +26,8 @@ func (s *showCommand) ExecuteWithoutArguments(exec commands.Executor) (output.Ou
 	if err != nil {
 		return nil, err
 	}
-	return output.Details{
+
+	details, err := output.Details{
 		Sections: []output.DetailSection{
 			{
 				Rows: []output.DetailRow{
@@ -80,6 +81,11 @@ func (s *showCommand) ExecuteWithoutArguments(exec commands.Executor) (output.Ou
 			},
 		},
 	}, nil
+
+	return output.MarshaledWithHumanOutput{
+		Value:  account,
+		Output: details,
+	}, err
 }
 
 func formatCredits(credits float64) string {

internal/commands/loadbalancer/list.go

@@ -38,14 +38,17 @@ func (s *listCommand) ExecuteWithoutArguments(exec commands.Executor) (output.Ou
 		})
 	}
 
-	return output.Table{
-		Columns: []output.TableColumn{
-			{Key: "uuid", Header: "UUID", Colour: ui.DefaultUUUIDColours},
-			{Key: "name", Header: "Name"},
-			{Key: "plan", Header: "Plan"},
-			{Key: "zone", Header: "Zone"},
-			{Key: "state", Header: "State", Format: format.LoadBalancerState},
+	return output.MarshaledWithHumanOutput{
+		Value: loadbalancers,
+		Output: output.Table{
+			Columns: []output.TableColumn{
+				{Key: "uuid", Header: "UUID", Colour: ui.DefaultUUUIDColours},
+				{Key: "name", Header: "Name"},
+				{Key: "plan", Header: "Plan"},
+				{Key: "zone", Header: "Zone"},
+				{Key: "operational_state", Header: "State", Format: format.LoadBalancerState},
+			},
+			Rows: rows,
 		},
-		Rows: rows,
 	}, nil
 }

internal/commands/storage/list.go

@@ -59,7 +59,7 @@ func (s *listCommand) ExecuteWithoutArguments(exec commands.Executor) (output.Ou
 	}
 
 	CachedStorages = storageList.Storages
-	var filtered []upcloud.Storage
+	filtered := make([]upcloud.Storage, 0)
 	for _, v := range storageList.Storages {
 		if s.all.Value() {
 			filtered = append(filtered, v)
@@ -109,18 +109,21 @@ func (s *listCommand) ExecuteWithoutArguments(exec commands.Executor) (output.Ou
 		})
 	}
 
-	return output.Table{
-		Columns: []output.TableColumn{
-			{Key: "uuid", Header: "UUID", Colour: ui.DefaultUUUIDColours},
-			{Key: "title", Header: "Title"},
-			{Key: "type", Header: "Type"},
-			{Key: "size", Header: "Size"},
-			{Key: "state", Header: "State", Format: format.StorageState},
-			{Key: "tier", Header: "Tier"},
-			{Key: "zone", Header: "Zone"},
-			{Key: "access", Header: "Access"},
-			{Key: "created", Header: "Created"},
+	return output.MarshaledWithHumanOutput{
+		Value: filtered,
+		Output: output.Table{
+			Columns: []output.TableColumn{
+				{Key: "uuid", Header: "UUID", Colour: ui.DefaultUUUIDColours},
+				{Key: "title", Header: "Title"},
+				{Key: "type", Header: "Type"},
+				{Key: "size", Header: "Size"},
+				{Key: "state", Header: "State", Format: format.StorageState},
+				{Key: "tier", Header: "Tier"},
+				{Key: "zone", Header: "Zone"},
+				{Key: "access", Header: "Access"},
+				{Key: "created", Header: "Created"},
+			},
+			Rows: rows,
 		},
-		Rows: rows,
 	}, nil
 }

internal/commands/storage/show.go

@@ -113,7 +113,10 @@ func (s *showCommand) Execute(exec commands.Executor, uuid string) (output.Outpu
 		})
 	}
 
-	return combined, nil
+	return output.MarshaledWithHumanOutput{
+		Value:  storage,
+		Output: combined,
+	}, nil
 }
 
 func formatShowServers(val interface{}) (text.Colors, string, error) {

internal/commands/zone/list.go

@@ -34,12 +34,15 @@ func (s *listCommand) ExecuteWithoutArguments(exec commands.Executor) (output.Ou
 		})
 	}
 
-	return output.Table{
-		Columns: []output.TableColumn{
-			{Key: "id", Header: "ID"},
-			{Key: "description", Header: "Description"},
-			{Key: "public", Header: "Public", Format: format.Boolean},
+	return output.MarshaledWithHumanOutput{
+		Value: zones,
+		Output: output.Table{
+			Columns: []output.TableColumn{
+				{Key: "id", Header: "ID"},
+				{Key: "description", Header: "Description"},
+				{Key: "public", Header: "Public", Format: format.Boolean},
+			},
+			Rows: rows,
 		},
-		Rows: rows,
 	}, nil
 }