refactor(rabbitmq): refactor pointer flags to be value instead

Author: SerseusWasTaken

internal/cmd/rabbitmq/instance/create/create.go

@@ -45,7 +45,7 @@ type inputModel struct {
 	PlanName string
 	Version  string
 
-	InstanceName         *string
+	InstanceName         string
 	EnableMonitoring     *bool
 	Graphite             *string
 	MetricsFrequency     *int32
@@ -173,7 +173,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 
 	model := inputModel{
 		GlobalFlagModel:      globalFlags,
-		InstanceName:         flags.FlagToStringPointer(p, cmd, instanceNameFlag),
+		InstanceName:         flags.FlagToStringValue(p, cmd, instanceNameFlag),
 		EnableMonitoring:     flags.FlagToBoolPointer(p, cmd, enableMonitoringFlag),
 		MonitoringInstanceId: flags.FlagToStringPointer(p, cmd, monitoringInstanceIdFlag),
 		Graphite:             flags.FlagToStringPointer(p, cmd, graphiteFlag),
@@ -199,7 +199,7 @@ type rabbitMQClient interface {
 func buildRequest(ctx context.Context, model *inputModel, apiClient rabbitMQClient) (rabbitmq.ApiCreateInstanceRequest, error) {
 	req := apiClient.CreateInstance(ctx, model.ProjectId, model.Region)
 
-	var planId *string
+	var planId string
 	var err error
 
 	offerings, err := apiClient.ListOfferings(ctx, model.ProjectId, model.Region).Execute()
@@ -208,20 +208,21 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient rabbitMQClie
 	}
 
 	if model.PlanId == nil {
-		planId, err = rabbitmqUtils.LoadPlanId(model.PlanName, model.Version, offerings)
+		foundPlanId, err := rabbitmqUtils.LoadPlanId(model.PlanName, model.Version, offerings)
 		if err != nil {
 			var dsaInvalidPlanError *cliErr.DSAInvalidPlanError
 			if !errors.As(err, &dsaInvalidPlanError) {
 				return req, fmt.Errorf("load plan ID: %w", err)
 			}
 			return req, err
 		}
+		planId = *foundPlanId
 	} else {
 		err := rabbitmqUtils.ValidatePlanId(*model.PlanId, offerings)
 		if err != nil {
 			return req, err
 		}
-		planId = model.PlanId
+		planId = *model.PlanId
 	}
 
 	var sgwAcl *string
@@ -230,7 +231,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient rabbitMQClie
 	}
 
 	req = req.CreateInstancePayload(rabbitmq.CreateInstancePayload{
-		InstanceName: *model.InstanceName,
+		InstanceName: model.InstanceName,
 		Parameters: &rabbitmq.InstanceParameters{
 			EnableMonitoring:     model.EnableMonitoring,
 			Graphite:             model.Graphite,
@@ -241,7 +242,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient rabbitMQClie
 			SgwAcl:               sgwAcl,
 			Syslog:               model.Syslog,
 		},
-		PlanId: *planId,
+		PlanId: planId,
 	})
 	return req, nil
 }

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

@@ -41,7 +41,7 @@ func newAPIMock(settings mockSettings) rabbitmq.DefaultAPI {
 var testProjectId = uuid.NewString()
 var testPlanId = uuid.NewString()
 var testMonitoringInstanceId = uuid.NewString()
-var testInstanceName = utils.Ptr("instance")
+var testInstanceName = "instance"
 
 const testRegion = "eu01"
 
@@ -73,7 +73,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 			Region:    testRegion,
 			Verbosity: globalflags.VerbosityDefault,
 		},
-		InstanceName:         utils.Ptr("example-name"),
+		InstanceName:         "example-name",
 		EnableMonitoring:     utils.Ptr(true),
 		Graphite:             utils.Ptr("example-graphite"),
 		MetricsFrequency:     utils.Ptr(int32(100)),
@@ -161,7 +161,7 @@ func TestParseInput(t *testing.T) {
 					ProjectId: testProjectId,
 					Verbosity: globalflags.VerbosityDefault,
 				},
-				InstanceName: utils.Ptr("example-name"),
+				InstanceName: "example-name",
 				PlanId:       utils.Ptr(testPlanId),
 			},
 		},
@@ -183,7 +183,7 @@ func TestParseInput(t *testing.T) {
 					Verbosity: globalflags.VerbosityDefault,
 				},
 				PlanId:           utils.Ptr(testPlanId),
-				InstanceName:     utils.Ptr(""),
+				InstanceName:     "",
 				EnableMonitoring: utils.Ptr(false),
 				Graphite:         utils.Ptr(""),
 				MetricsFrequency: utils.Ptr(int32(0)),
@@ -299,7 +299,6 @@ func TestBuildRequest(t *testing.T) {
 		isValid           bool
 	}{
 		{
-			//TODO: nil pointer due to plugins in model
 			description:     "base",
 			model:           fixtureInputModel(),
 			expectedRequest: fixtureRequest(),
@@ -402,7 +401,7 @@ func TestBuildRequest(t *testing.T) {
 				},
 			},
 			expectedRequest: testClient.DefaultAPI.CreateInstance(testCtx, testProjectId, testRegion).
-				CreateInstancePayload(rabbitmq.CreateInstancePayload{InstanceName: *testInstanceName, PlanId: testPlanId, Parameters: &rabbitmq.InstanceParameters{}}),
+				CreateInstancePayload(rabbitmq.CreateInstancePayload{InstanceName: testInstanceName, PlanId: testPlanId, Parameters: &rabbitmq.InstanceParameters{}}),
 		},
 	}
 

internal/pkg/services/rabbitmq/utils/utils.go

@@ -62,20 +62,15 @@ func LoadPlanId(planName, version string, offerings *rabbitmq.ListOfferingsRespo
 	}
 }
 
-type RabbitMQClient interface {
-	GetInstance(ctx context.Context, projectId, region, instanceId string) rabbitmq.ApiGetInstanceRequest
-	GetCredentials(ctx context.Context, projectId, region, instanceId, credentialsId string) rabbitmq.ApiGetCredentialsRequest
-}
-
-func GetInstanceName(ctx context.Context, apiClient RabbitMQClient, projectId, region, instanceId string) (string, error) {
+func GetInstanceName(ctx context.Context, apiClient rabbitmq.DefaultAPI, projectId, region, instanceId string) (string, error) {
 	resp, err := apiClient.GetInstance(ctx, projectId, region, instanceId).Execute()
 	if err != nil {
 		return "", fmt.Errorf("get RabbitMQ instance: %w", err)
 	}
 	return resp.Name, nil
 }
 
-func GetCredentialsUsername(ctx context.Context, apiClient RabbitMQClient, projectId, region, instanceId, credentialsId string) (string, error) {
+func GetCredentialsUsername(ctx context.Context, apiClient rabbitmq.DefaultAPI, projectId, region, instanceId, credentialsId string) (string, error) {
 	resp, err := apiClient.GetCredentials(ctx, projectId, region, instanceId, credentialsId).Execute()
 	if err != nil {
 		return "", fmt.Errorf("get RabbitMQ credentials: %w", err)