chore(mongodbflex): move nil checks in outputResult into pretty print function, change version and flavorId to value type

Author: SerseusWasTaken

internal/cmd/mongodbflex/backup/describe/describe.go

@@ -119,10 +119,10 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *mongodbflex
 }
 
 func outputResult(p *print.Printer, outputFormat, restoreStatus string, backup *mongodbflex.Backup) error {
-	if backup == nil {
-		return fmt.Errorf("API response is nil")
-	}
 	return p.OutputResult(outputFormat, backup, func() error {
+		if backup == nil {
+			return fmt.Errorf("API response is nil")
+		}
 		table := tables.NewTable()
 		table.AddRow("ID", utils.PtrString(backup.Id))
 		table.AddSeparator()

internal/cmd/mongodbflex/instance/create/create.go

@@ -54,12 +54,12 @@ type inputModel struct {
 	InstanceName   string
 	ACL            []string
 	BackupSchedule string
-	FlavorId       *string
+	FlavorId       string
 	CPU            *int32
 	RAM            *int32
 	StorageClass   *string
 	StorageSize    *int64
-	Version        *string
+	Version        string
 	Type           *string
 }
 
@@ -107,12 +107,12 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 			}
 
 			// Fill in version, if needed
-			if model.Version == nil {
+			if model.Version == "" {
 				version, err := mongodbflexUtils.GetLatestMongoDBVersion(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region)
 				if err != nil {
 					return fmt.Errorf("get latest MongoDB version: %w", err)
 				}
-				model.Version = &version
+				model.Version = version
 			}
 
 			// Call API
@@ -168,16 +168,16 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 
 	storageSize := flags.FlagWithDefaultToInt64Value(p, cmd, storageSizeFlag)
 
-	flavorId := flags.FlagToStringPointer(p, cmd, flavorIdFlag)
+	flavorId := flags.FlagToStringValue(p, cmd, flavorIdFlag)
 	cpu := flags.FlagToInt32Pointer(p, cmd, cpuFlag)
 	ram := flags.FlagToInt32Pointer(p, cmd, ramFlag)
 
-	if flavorId == nil && (cpu == nil || ram == nil) {
+	if flavorId == "" && (cpu == nil || ram == nil) {
 		return nil, &cliErr.DatabaseInputFlavorError{
 			Cmd: cmd,
 		}
 	}
-	if flavorId != nil && (cpu != nil || ram != nil) {
+	if flavorId != "" && (cpu != nil || ram != nil) {
 		return nil, &cliErr.DatabaseInputFlavorError{
 			Cmd: cmd,
 		}
@@ -193,7 +193,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 		RAM:             ram,
 		StorageClass:    utils.Ptr(flags.FlagWithDefaultToStringValue(p, cmd, storageClassFlag)),
 		StorageSize:     &storageSize,
-		Version:         flags.FlagToStringPointer(p, cmd, versionFlag),
+		Version:         flags.FlagToStringValue(p, cmd, versionFlag),
 		Type:            typeFlag.Ptr(),
 	}
 
@@ -210,36 +210,37 @@ type MongoDBFlexClient interface {
 func buildRequest(ctx context.Context, model *inputModel, apiClient MongoDBFlexClient) (mongodbflex.ApiCreateInstanceRequest, error) {
 	req := apiClient.CreateInstance(ctx, model.ProjectId, model.Region)
 
-	var flavorId *string
+	var flavorId string
 	var err error
 
 	flavors, err := apiClient.ListFlavors(ctx, model.ProjectId, model.Region).Execute()
 	if err != nil {
 		return req, fmt.Errorf("get MongoDB Flex flavors: %w", err)
 	}
 
-	if model.FlavorId == nil {
-		flavorId, err = mongodbflexUtils.LoadFlavorId(*model.CPU, *model.RAM, &flavors.Flavors)
+	if model.FlavorId == "" {
+		foundFlavorId, err := mongodbflexUtils.LoadFlavorId(*model.CPU, *model.RAM, &flavors.Flavors)
 		if err != nil {
 			var dsaInvalidPlanError *cliErr.DSAInvalidPlanError
 			if !errors.As(err, &dsaInvalidPlanError) {
 				return req, fmt.Errorf("load flavor ID: %w", err)
 			}
 			return req, err
 		}
+		flavorId = *foundFlavorId
 	} else {
-		err := mongodbflexUtils.ValidateFlavorId(*model.FlavorId, flavors.Flavors)
+		err := mongodbflexUtils.ValidateFlavorId(model.FlavorId, flavors.Flavors)
 		if err != nil {
 			return req, err
 		}
 		flavorId = model.FlavorId
 	}
 
-	storages, err := apiClient.ListStorages(ctx, model.ProjectId, *flavorId, model.Region).Execute()
+	storages, err := apiClient.ListStorages(ctx, model.ProjectId, flavorId, model.Region).Execute()
 	if err != nil {
 		return req, fmt.Errorf("get MongoDB Flex storages: %w", err)
 	}
-	err = mongodbflexUtils.ValidateStorage(model.StorageClass, model.StorageSize, storages, *flavorId)
+	err = mongodbflexUtils.ValidateStorage(model.StorageClass, model.StorageSize, storages, flavorId)
 	if err != nil {
 		return req, err
 	}
@@ -253,13 +254,13 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient MongoDBFlexC
 		Name:           model.InstanceName,
 		Acl:            mongodbflex.ACL{Items: model.ACL},
 		BackupSchedule: model.BackupSchedule,
-		FlavorId:       *flavorId,
+		FlavorId:       flavorId,
 		Replicas:       replicas,
 		Storage: mongodbflex.Storage{
 			Class: model.StorageClass,
 			Size:  model.StorageSize,
 		},
-		Version: *model.Version,
+		Version: model.Version,
 		Options: map[string]string{
 			"type": *model.Type,
 		},

internal/cmd/mongodbflex/instance/create/create_test.go

@@ -80,10 +80,10 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 		InstanceName:   "example-name",
 		ACL:            []string{"0.0.0.0/0"},
 		BackupSchedule: "0 0/6 * * *",
-		FlavorId:       utils.Ptr(testFlavorId),
+		FlavorId:       testFlavorId,
 		StorageClass:   utils.Ptr("premium-perf4-mongodb"),
 		StorageSize:    utils.Ptr(int64(10)),
-		Version:        utils.Ptr("6.0"),
+		Version:        "6.0",
 		Type:           utils.Ptr("Replica"),
 	}
 	for _, mod := range mods {
@@ -156,7 +156,7 @@ func TestParseInput(t *testing.T) {
 			}),
 			isValid: true,
 			expectedModel: fixtureInputModel(func(model *inputModel) {
-				model.FlavorId = nil
+				model.FlavorId = ""
 				model.CPU = utils.Ptr(int32(2))
 				model.RAM = utils.Ptr(int32(4))
 			}),
@@ -216,7 +216,7 @@ func TestParseInput(t *testing.T) {
 			}),
 			isValid: true,
 			expectedModel: fixtureInputModel(func(model *inputModel) {
-				model.Version = nil
+				model.Version = ""
 			}),
 		},
 		{
@@ -294,7 +294,7 @@ func TestBuildRequest(t *testing.T) {
 			description: "with CPU and RAM",
 			model: fixtureInputModel(
 				func(model *inputModel) {
-					model.FlavorId = nil
+					model.FlavorId = ""
 					model.CPU = utils.Ptr(int32(2))
 					model.RAM = utils.Ptr(int32(4))
 				},
@@ -383,7 +383,7 @@ func TestBuildRequest(t *testing.T) {
 			description: "get flavors fails",
 			model: fixtureInputModel(
 				func(model *inputModel) {
-					model.FlavorId = nil
+					model.FlavorId = ""
 					model.CPU = utils.Ptr(int32(2))
 					model.RAM = utils.Ptr(int32(4))
 				},
@@ -397,7 +397,7 @@ func TestBuildRequest(t *testing.T) {
 			description: "flavor id not found",
 			model: fixtureInputModel(
 				func(model *inputModel) {
-					model.FlavorId = nil
+					model.FlavorId = ""
 					model.CPU = utils.Ptr(int32(5))
 					model.RAM = utils.Ptr(int32(9))
 				},
@@ -424,7 +424,7 @@ func TestBuildRequest(t *testing.T) {
 			description: "get storages fails",
 			model: fixtureInputModel(
 				func(model *inputModel) {
-					model.FlavorId = nil
+					model.FlavorId = ""
 					model.CPU = utils.Ptr(int32(2))
 					model.RAM = utils.Ptr(int32(4))
 				},

internal/cmd/mongodbflex/instance/describe/describe.go

@@ -92,11 +92,10 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *mongodbflex
 }
 
 func outputResult(p *print.Printer, outputFormat string, instance *mongodbflex.Instance) error {
-	if instance == nil {
-		return fmt.Errorf("instance is nil")
-	}
-
 	return p.OutputResult(outputFormat, instance, func() error {
+		if instance == nil {
+			return fmt.Errorf("instance is nil")
+		}
 		var instanceType string
 		if instance.HasReplicas() {
 			var err error