refactor duplicate code with util func ConvertStringMapToInterfaceMap

Author: Benjosh95

internal/cmd/volume/backup/create/create.go

@@ -181,24 +181,16 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
 func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiCreateBackupRequest {
 	req := apiClient.CreateBackup(ctx, model.ProjectId)
 
-	// Convert map[string]string to map[string]interface{}
-	var labelsMap *map[string]interface{}
-	if len(model.Labels) > 0 {
-		labelsMap = utils.Ptr(map[string]interface{}{})
-		for k, v := range model.Labels {
-			(*labelsMap)[k] = v
-		}
-	}
-
-	createPayload := iaas.NewCreateBackupPayloadWithDefaults()
-	createPayload.Name = model.Name
-	createPayload.Labels = labelsMap
-	createPayload.Source = &iaas.BackupSource{
-		Id:   &model.SourceID,
-		Type: &model.SourceType,
+	payload := iaas.CreateBackupPayload{
+		Name:   model.Name,
+		Labels: utils.ConvertStringMapToInterfaceMap(utils.Ptr(model.Labels)),
+		Source: &iaas.BackupSource{
+			Id:   &model.SourceID,
+			Type: &model.SourceType,
+		},
 	}
 
-	return req.CreateBackupPayload(*createPayload)
+	return req.CreateBackupPayload(payload)
 }
 
 func outputResult(p *print.Printer, outputFormat string, async bool, sourceLabel, projectLabel string, resp *iaas.Backup) error {

internal/cmd/volume/backup/update/update.go

@@ -130,22 +130,12 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiUpdateBackupRequest {
 	req := apiClient.UpdateBackup(ctx, model.ProjectId, model.BackupId)
 
-	updatePayload := iaas.NewUpdateBackupPayloadWithDefaults()
-	if model.Name != nil {
-		updatePayload.Name = model.Name
+	payload := iaas.UpdateBackupPayload{
+		Name:   model.Name,
+		Labels: utils.ConvertStringMapToInterfaceMap(utils.Ptr(model.Labels)),
 	}
 
-	// Convert map[string]string to map[string]interface{}
-	var labelsMap *map[string]interface{}
-	if len(model.Labels) > 0 {
-		labelsMap = utils.Ptr(map[string]interface{}{})
-		for k, v := range model.Labels {
-			(*labelsMap)[k] = v
-		}
-	}
-	updatePayload.Labels = labelsMap
-
-	req = req.UpdateBackupPayload(*updatePayload)
+	req = req.UpdateBackupPayload(payload)
 	return req
 }
 

internal/cmd/volume/create/create.go

@@ -174,20 +174,11 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 		Type: model.SourceType,
 	}
 
-	var labelsMap *map[string]interface{}
-	if model.Labels != nil && len(*model.Labels) > 0 {
-		// convert map[string]string to map[string]interface{}
-		labelsMap = utils.Ptr(map[string]interface{}{})
-		for k, v := range *model.Labels {
-			(*labelsMap)[k] = v
-		}
-	}
-
 	payload := iaas.CreateVolumePayload{
 		AvailabilityZone: model.AvailabilityZone,
 		Name:             model.Name,
 		Description:      model.Description,
-		Labels:           labelsMap,
+		Labels:           utils.ConvertStringMapToInterfaceMap(model.Labels),
 		PerformanceClass: model.PerformanceClass,
 		Size:             model.Size,
 	}

internal/cmd/volume/update/update.go

@@ -135,19 +135,10 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiUpdateVolumeRequest {
 	req := apiClient.UpdateVolume(ctx, model.ProjectId, model.VolumeId)
 
-	var labelsMap *map[string]interface{}
-	if model.Labels != nil && len(*model.Labels) > 0 {
-		// convert map[string]string to map[string]interface{}
-		labelsMap = utils.Ptr(map[string]interface{}{})
-		for k, v := range *model.Labels {
-			(*labelsMap)[k] = v
-		}
-	}
-
 	payload := iaas.UpdateVolumePayload{
 		Name:        model.Name,
 		Description: model.Description,
-		Labels:      labelsMap,
+		Labels:      utils.ConvertStringMapToInterfaceMap(model.Labels),
 	}
 
 	return req.UpdateVolumePayload(payload)