fix(network): show full API response in marshaled outputs (#260)

Author: kangasta

CHANGELOG.md

@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **Breaking**: In JSON and YAML output of `database list`: display the full API response. Value of `title` is not replaced with value from `name`, if `title` is empty.
 - **Breaking**: In JSON and YAML output of `database types`: display the full API response. This changes the top level datatype from list to object, where keys are the available database type, e.g., `pg` and `mysql`.
 - **Breaking**: In JSON and YAML output of `ip-address list`: display full API response. This changes `partofplan` key to `part_of_plan` and `ptrrecord` key to `ptr_record`.
+- **Breaking**: In JSON and YAML output of `network list` and `network show`: display full API response. Servers list will only contain server UUID and name. `ip_networks` contains subfield `ip_network` which in turn contains the networks.
 - In human readable output of `kubernetes show` command, show node-groups as table. Node-group details are available with `kubernetes nodegroup show` command.
 
 ## Fixed

internal/commands/network/list.go

@@ -92,14 +92,18 @@ func (s *listCommand) ExecuteWithoutArguments(exec commands.Executor) (output.Ou
 			n.Zone,
 		})
 	}
-	return output.Table{
-		Columns: []output.TableColumn{
-			{Key: "uuid", Header: "UUID", Colour: ui.DefaultUUUIDColours},
-			{Key: "name", Header: "Name"},
-			{Key: "router", Header: "Router", Colour: ui.DefaultUUUIDColours},
-			{Key: "type", Header: "Type"},
-			{Key: "zone", Header: "Zone"},
+
+	return output.MarshaledWithHumanOutput{
+		Value: upcloud.Networks{Networks: filtered},
+		Output: output.Table{
+			Columns: []output.TableColumn{
+				{Key: "uuid", Header: "UUID", Colour: ui.DefaultUUUIDColours},
+				{Key: "name", Header: "Name"},
+				{Key: "router", Header: "Router", Colour: ui.DefaultUUUIDColours},
+				{Key: "type", Header: "Type"},
+				{Key: "zone", Header: "Zone"},
+			},
+			Rows: rows,
 		},
-		Rows: rows,
 	}, nil
 }

internal/commands/network/list_test.go

@@ -87,28 +87,31 @@ func TestListCommand(t *testing.T) {
 			res, err := c.(commands.NoArgumentCommand).ExecuteWithoutArguments(commands.NewExecutor(cfg, &mService, flume.New("test")))
 
 			assert.Nil(t, err)
-			assert.Equal(t, createTable(test.expected), res)
+			assert.Equal(t, createOutput(test.expected), res)
 		})
 	}
 }
 
-func createTable(networks []upcloud.Network) output.Table {
+func createOutput(networks []upcloud.Network) output.MarshaledWithHumanOutput {
 	rows := []output.TableRow{}
 	for _, network := range networks {
 		rows = append(rows,
 			output.TableRow{network.UUID, network.Name, network.Router, network.Type, network.Zone},
 		)
 	}
 
-	return output.Table{
-		HideHeader: false,
-		Columns: []output.TableColumn{
-			{Header: "UUID", Key: "uuid", Hidden: false, Colour: ui.DefaultUUUIDColours},
-			{Header: "Name", Key: "name", Hidden: false},
-			{Header: "Router", Key: "router", Hidden: false, Colour: ui.DefaultUUUIDColours},
-			{Header: "Type", Key: "type", Hidden: false},
-			{Header: "Zone", Key: "zone", Hidden: false},
+	return output.MarshaledWithHumanOutput{
+		Value: upcloud.Networks{Networks: networks},
+		Output: output.Table{
+			HideHeader: false,
+			Columns: []output.TableColumn{
+				{Header: "UUID", Key: "uuid", Hidden: false, Colour: ui.DefaultUUUIDColours},
+				{Header: "Name", Key: "name", Hidden: false},
+				{Header: "Router", Key: "router", Hidden: false, Colour: ui.DefaultUUUIDColours},
+				{Header: "Type", Key: "type", Hidden: false},
+				{Header: "Zone", Key: "zone", Hidden: false},
+			},
+			Rows: rows,
 		},
-		Rows: rows,
 	}
 }

internal/commands/network/show.go

@@ -128,7 +128,10 @@ func (s *showCommand) Execute(exec commands.Executor, arg string) (output.Output
 		})
 	}
 
-	return combined, nil
+	return output.MarshaledWithHumanOutput{
+		Value:  network,
+		Output: combined,
+	}, nil
 }
 
 func formatShowDHCPDNS(val interface{}) (text.Colors, string, error) {