implement review feedback

Author: marceljk

internal/cmd/beta/key-pair/update/update.go

@@ -43,10 +43,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 		),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			model, err := parseInput(p, cmd, args)
-			if err != nil {
-				return err
-			}
+			model := parseInput(p, cmd, args)
 
 			// Configure API client
 			apiClient, err := client.ConfigureClient(p)
@@ -63,13 +60,16 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			}
 
 			// Call API
-			req := buildRequest(ctx, model, apiClient)
+			req := buildRequest(ctx, &model, apiClient)
 			resp, err := req.Execute()
 			if err != nil {
 				return fmt.Errorf("update key pair: %w", err)
 			}
+			if resp == nil {
+				return fmt.Errorf("response is nil")
+			}
 
-			return outputResult(p, model, resp)
+			return outputResult(p, model, *resp)
 		},
 	}
 	configureFlags(cmd)
@@ -100,7 +100,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	return req.UpdateKeyPairPayload(payload)
 }
 
-func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
+func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) inputModel {
 	keyPairName := inputArgs[0]
 	globalFlags := globalflags.Parse(p, cmd)
 
@@ -119,17 +119,10 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 		}
 	}
 
-	return &model, nil
+	return model
 }
 
-func outputResult(p *print.Printer, model *inputModel, keyPair *iaas.Keypair) error {
-	if model == nil {
-		return fmt.Errorf("model is nil")
-	}
-	if keyPair == nil {
-		return fmt.Errorf("keyPair is nil")
-	}
-
+func outputResult(p *print.Printer, model inputModel, keyPair iaas.Keypair) error {
 	var outputFormat string
 	if model.GlobalFlagModel != nil {
 		outputFormat = model.GlobalFlagModel.OutputFormat

internal/cmd/beta/key-pair/update/update_test.go

@@ -141,18 +141,12 @@ func TestParseInput(t *testing.T) {
 				t.Fatalf("error validating args: %v", err)
 			}
 
-			model, err := parseInput(p, cmd, tt.argValues)
-			if err != nil {
-				if !tt.isValid {
-					return
-				}
-				t.Fatalf("error parsing flags: %v", err)
-			}
+			model := parseInput(p, cmd, tt.argValues)
 
 			if !tt.isValid {
 				t.Fatalf("did not fail on invalid input")
 			}
-			diff := cmp.Diff(model, tt.expectedModel)
+			diff := cmp.Diff(&model, tt.expectedModel)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
 			}
@@ -191,8 +185,8 @@ func TestBuildRequest(t *testing.T) {
 
 func Test_outputResult(t *testing.T) {
 	type args struct {
-		model   *inputModel
-		keyPair *iaas.Keypair
+		model   inputModel
+		keyPair iaas.Keypair
 	}
 	tests := []struct {
 		name    string
@@ -202,13 +196,13 @@ func Test_outputResult(t *testing.T) {
 		{
 			name:    "empty",
 			args:    args{},
-			wantErr: true,
+			wantErr: false,
 		},
 		{
 			name: "base",
 			args: args{
-				model:   &inputModel{},
-				keyPair: &iaas.Keypair{},
+				model:   inputModel{},
+				keyPair: iaas.Keypair{},
 			},
 			wantErr: false,
 		},