review fixes

Author: cgoetz-inovex

internal/cmd/beta/sqlserverflex/database/describe/describe.go

@@ -102,11 +102,11 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *sqlserverfl
 }
 
 func outputResult(p *print.Printer, outputFormat string, resp *sqlserverflex.GetDatabaseResponse) error {
-	if resp == nil {
-		return fmt.Errorf("database response is empty")
-	}
-
 	return p.OutputResult(outputFormat, resp, func() error {
+		if resp == nil {
+			return fmt.Errorf("database response is empty")
+		}
+
 		table := tables.NewTable()
 		table.AddRow("ID", resp.Id)
 		table.AddSeparator()

internal/cmd/beta/sqlserverflex/instance/create/create.go

@@ -50,7 +50,7 @@ type inputModel struct {
 	StorageClass   string
 	StorageSize    *int64
 	Version        string
-	RetentionDays  *int32
+	RetentionDays  int32
 }
 
 func NewCmd(params *types.CmdParams) *cobra.Command {
@@ -173,7 +173,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 		StorageClass:    flags.FlagToStringValue(p, cmd, storageClassFlag),
 		StorageSize:     flags.FlagToInt64Pointer(p, cmd, storageSizeFlag),
 		Version:         flags.FlagToStringValue(p, cmd, versionFlag),
-		RetentionDays:   flags.FlagToInt32Pointer(p, cmd, retentionDaysFlag),
+		RetentionDays:   flags.FlagWithDefaultToInt32Value(p, cmd, retentionDaysFlag),
 	}
 
 	p.DebugInputModel(model)
@@ -229,7 +229,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient sqlserverfle
 			Size:  utils.PtrValue(model.StorageSize),
 		},
 		Version:       sqlserverflex.InstanceVersion(model.Version),
-		RetentionDays: utils.PtrValue(model.RetentionDays),
+		RetentionDays: model.RetentionDays,
 	})
 	return req, nil
 }

internal/cmd/beta/sqlserverflex/instance/create/create_test.go

@@ -84,7 +84,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 		StorageClass:   "storage-class",
 		StorageSize:    utils.Ptr(int64(10)),
 		Version:        "6.0",
-		RetentionDays:  utils.Ptr(int32(32)),
+		RetentionDays:  32,
 	}
 	for _, mod := range mods {
 		mod(model)

internal/cmd/beta/sqlserverflex/instance/describe/describe.go

@@ -96,11 +96,11 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *sqlserverfl
 }
 
 func outputResult(p *print.Printer, outputFormat string, instance *sqlserverflex.GetInstanceResponse, flavor *sqlserverflex.ListFlavors) error {
-	if instance == nil {
-		return fmt.Errorf("instance response is empty")
-	}
-
 	return p.OutputResult(outputFormat, instance, func() error {
+		if instance == nil {
+			return fmt.Errorf("instance response is empty")
+		}
+
 		acls := strings.Join(instance.Network.Acl, ", ")
 
 		table := tables.NewTable()

internal/cmd/beta/sqlserverflex/user/create/create.go

@@ -87,9 +87,8 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			if err != nil {
 				return fmt.Errorf("create SQLServer Flex user: %w", err)
 			}
-			user := resp
 
-			return outputResult(params.Printer, model, instanceLabel, user)
+			return outputResult(params.Printer, model, instanceLabel, resp)
 		},
 	}
 
@@ -134,10 +133,10 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *sqlserverfl
 }
 
 func outputResult(p *print.Printer, model *inputModel, instanceLabel string, user *sqlserverflex.CreateUserResponse) error {
-	if user == nil {
-		return fmt.Errorf("user response is empty")
-	}
 	return p.OutputResult(model.OutputFormat, user, func() error {
+		if user == nil {
+			return fmt.Errorf("user response is empty")
+		}
 		p.Outputf("Created user for instance %q. User ID: %d\n\n", instanceLabel, user.Id)
 		p.Outputf("Username: %s\n", user.Username)
 		p.Outputf("Password: %s\n", user.Password)

internal/cmd/beta/sqlserverflex/user/describe/describe.go

@@ -115,11 +115,11 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *sqlserverfl
 }
 
 func outputResult(p *print.Printer, outputFormat string, user *sqlserverflex.GetUserResponse) error {
-	if user == nil {
-		return fmt.Errorf("user response is empty")
-	}
-
 	return p.OutputResult(outputFormat, user, func() error {
+		if user == nil {
+			return fmt.Errorf("user response is empty")
+		}
+
 		table := tables.NewTable()
 		table.AddRow("ID", user.Id)
 		table.AddSeparator()

internal/cmd/beta/sqlserverflex/user/reset-password/reset_password.go

@@ -128,11 +128,11 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *sqlserverfl
 }
 
 func outputResult(p *print.Printer, outputFormat, userLabel, instanceLabel string, user *sqlserverflex.ResetUserResponse) error {
-	if user == nil {
-		return fmt.Errorf("single user response is empty")
-	}
-
 	return p.OutputResult(outputFormat, user, func() error {
+		if user == nil {
+			return fmt.Errorf("single user response is empty")
+		}
+
 		p.Outputf("Reset password for user %q of instance %q\n\n", userLabel, instanceLabel)
 		p.Outputf("Username: %s\n", user.Username)
 		p.Outputf("New password: %s\n", user.Password)

internal/pkg/flags/flag_to_value.go

@@ -207,6 +207,17 @@ func FlagWithDefaultToInt64Value(p *print.Printer, cmd *cobra.Command, flag stri
 	return value
 }
 
+// Returns the int32 value set on the flag. If no value is set, returns the flag's default value.
+// Returns 0 if the flag value can not be converted to int32 or if the flag does not exist.
+func FlagWithDefaultToInt32Value(p *print.Printer, cmd *cobra.Command, flag string) int32 {
+	value, err := cmd.Flags().GetInt32(flag)
+	if err != nil {
+		p.Debug(print.ErrorLevel, "convert flag with default to Int32 value: %v", err)
+		return 0
+	}
+	return value
+}
+
 // Returns the string value set on the flag. If no value is set, returns the flag's default value.
 // Returns nil if the flag value can not be converted to string or if the flag does not exist.
 func FlagWithDefaultToStringValue(p *print.Printer, cmd *cobra.Command, flag string) string {

internal/pkg/flags/flag_to_value_test.go

@@ -185,3 +185,50 @@ func TestFlagToInt32Pointer(t *testing.T) {
 		})
 	}
 }
+
+func TestFlagWithDefaultToInt32Value(t *testing.T) {
+	const flagName = "limit"
+	tests := []struct {
+		name      string
+		flagValue *string
+		want      int32
+	}{
+		{
+			name:      "flag unset default value",
+			flagValue: nil,
+			want:      0,
+		},
+		{
+			name:      "flag value",
+			flagValue: utils.Ptr("42"),
+			want:      42,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			params := testparams.NewTestParams()
+			cmd := func() *cobra.Command {
+				cmd := &cobra.Command{
+					Use:   "greet",
+					Short: "A simple greeting command",
+					Long:  "A simple greeting command",
+					Run: func(_ *cobra.Command, _ []string) {
+						fmt.Println("Hello world")
+					},
+				}
+				cmd.Flags().Int32(flagName, 0, "limit")
+				return cmd
+			}()
+			if tt.flagValue != nil {
+				err := cmd.Flags().Set(flagName, *tt.flagValue)
+				if err != nil {
+					t.Error(err)
+				}
+			}
+
+			if got := FlagWithDefaultToInt32Value(params.Printer, cmd, flagName); got != tt.want {
+				t.Errorf("FlagWithDefaultToInt32Value() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}