review changes

Author: h3adex

internal/cmd/network/create/create_test.go

@@ -481,6 +481,16 @@ func TestParseInput(t *testing.T) {
 			expectedModel: nil,
 			isValid:       false,
 		},
+		{
+			description: "routing-table id not set",
+			flagValues: fixtureFlagValues(func(flagValues map[string]string) {
+				delete(flagValues, routingTableIdFlag)
+			}),
+			isValid: true,
+			expectedModel: fixtureInputModel(func(model *inputModel) {
+				model.RoutingTableID = nil
+			}),
+		},
 	}
 
 	for _, tt := range tests {

internal/cmd/routingtable/create/create.go

@@ -147,15 +147,15 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 }
 
 func outputResult(p *print.Printer, outputFormat string, routingTable *iaas.RoutingTable) error {
-	if routingTable == nil {
-		return fmt.Errorf("create routing-table response is empty")
-	}
+	return p.OutputResult(outputFormat, routingTable, func() error {
+		if routingTable == nil {
+			return fmt.Errorf("create routing-table response is empty")
+		}
 
-	if routingTable.Id == nil {
-		return fmt.Errorf("routing-table Id is empty")
-	}
+		if routingTable.Id == nil {
+			return fmt.Errorf("create routing-table id is empty")
+		}
 
-	return p.OutputResult(outputFormat, routingTable, func() error {
 		var labels []string
 		if routingTable.Labels != nil && len(*routingTable.Labels) > 0 {
 			for key, value := range *routingTable.Labels {

internal/cmd/routingtable/route/update/update.go

@@ -113,14 +113,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 }
 
 func outputResult(p *print.Printer, outputFormat, routingTableId, networkAreaId string, route *iaas.Route) error {
-	if route == nil {
-		return fmt.Errorf("update route response is empty")
-	}
-
-	if route.Id == nil || *route.Id == "" {
-		return fmt.Errorf("update route response has empty id")
-	}
-
 	return p.OutputResult(outputFormat, route, func() error {
 		if route == nil {
 			return fmt.Errorf("update route response is empty")

internal/cmd/routingtable/update/update.go

@@ -134,15 +134,15 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 }
 
 func outputResult(p *print.Printer, outputFormat, networkAreaId string, routingTable *iaas.RoutingTable) error {
-	if routingTable == nil {
-		return fmt.Errorf("update routing-table response is empty")
-	}
+	return p.OutputResult(outputFormat, routingTable, func() error {
+		if routingTable == nil {
+			return fmt.Errorf("update routing-table response is empty")
+		}
 
-	if routingTable.Id == nil {
-		return fmt.Errorf("update routing-table response is empty")
-	}
+		if routingTable.Id == nil {
+			return fmt.Errorf("update routing-table id is empty")
+		}
 
-	return p.OutputResult(outputFormat, routingTable, func() error {
 		p.Outputf("Updated routing-table %q in network-area %q.", *routingTable.Id, networkAreaId)
 		return nil
 	})