refactor(cli): add ConvertStringMapToInterfaceMap util function (#790)

Benjosh95 · web-flow · commit 472ff267cdef · 2025-06-13T12:48:00.000+02:00
diff --git a/internal/cmd/image/create/create.go b/internal/cmd/image/create/create.go
@@ -340,18 +340,10 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 }
 
 func createPayload(_ context.Context, model *inputModel) iaas.CreateImagePayload {
-	var labelsMap *map[string]any
-	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.CreateImagePayload{
 		DiskFormat:  &model.DiskFormat,
 		Name:        &model.Name,
-		Labels:      labelsMap,
+		Labels:      utils.ConvertStringMapToInterfaceMap(model.Labels),
 		MinDiskSize: model.MinDiskSize,
 		MinRam:      model.MinRam,
 		Protected:   model.Protected,
diff --git a/internal/cmd/image/update/update.go b/internal/cmd/image/update/update.go
@@ -243,17 +243,10 @@ func parseInput(p *print.Printer, cmd *cobra.Command, cliArgs []string) (*inputM
 func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiUpdateImageRequest {
 	request := apiClient.UpdateImage(ctx, model.ProjectId, model.Id)
 	payload := iaas.NewUpdateImagePayload()
-	var labelsMap *map[string]any
-	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
-		}
-	}
+
 	// Config *ImageConfig `json:"config,omitempty"`
 	payload.DiskFormat = model.DiskFormat
-	payload.Labels = labelsMap
+	payload.Labels = utils.ConvertStringMapToInterfaceMap(model.Labels)
 	payload.MinDiskSize = model.MinDiskSize
 	payload.MinRam = model.MinRam
 	payload.Name = model.Name
diff --git a/internal/cmd/key-pair/create/create.go b/internal/cmd/key-pair/create/create.go
@@ -124,18 +124,9 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
 func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiCreateKeyPairRequest {
 	req := apiClient.CreateKeyPair(ctx)
 
-	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.CreateKeyPairPayload{
 		Name:      model.Name,
-		Labels:    labelsMap,
+		Labels:    utils.ConvertStringMapToInterfaceMap(model.Labels),
 		PublicKey: model.PublicKey,
 	}
 
diff --git a/internal/cmd/key-pair/update/update.go b/internal/cmd/key-pair/update/update.go
@@ -87,16 +87,8 @@ func configureFlags(cmd *cobra.Command) {
 func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiUpdateKeyPairRequest {
 	req := apiClient.UpdateKeyPair(ctx, *model.KeyPairName)
 
-	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.UpdateKeyPairPayload{
-		Labels: labelsMap,
+		Labels: utils.ConvertStringMapToInterfaceMap(model.Labels),
 	}
 	return req.UpdateKeyPairPayload(payload)
 }
diff --git a/internal/cmd/network-area/create/create.go b/internal/cmd/network-area/create/create.go
@@ -172,18 +172,9 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 		}
 	}
 
-	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.CreateNetworkAreaPayload{
 		Name:   model.Name,
-		Labels: labelsMap,
+		Labels: utils.ConvertStringMapToInterfaceMap(model.Labels),
 		AddressFamily: &iaas.CreateAreaAddressFamily{
 			Ipv4: &iaas.CreateAreaIPv4{
 				DefaultNameservers: model.DnsNameServers,
diff --git a/internal/cmd/network-area/route/create/create.go b/internal/cmd/network-area/route/create/create.go
@@ -147,21 +147,12 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
 func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiCreateNetworkAreaRouteRequest {
 	req := apiClient.CreateNetworkAreaRoute(ctx, *model.OrganizationId, *model.NetworkAreaId)
 
-	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.CreateNetworkAreaRoutePayload{
 		Ipv4: &[]iaas.Route{
 			{
 				Prefix:  model.Prefix,
 				Nexthop: model.Nexthop,
-				Labels:  labelsMap,
+				Labels:  utils.ConvertStringMapToInterfaceMap(model.Labels),
 			},
 		},
 	}
diff --git a/internal/cmd/network-area/route/update/update.go b/internal/cmd/network-area/route/update/update.go
@@ -130,14 +130,8 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiUpdateNetworkAreaRouteRequest {
 	req := apiClient.UpdateNetworkAreaRoute(ctx, *model.OrganizationId, *model.NetworkAreaId, model.RouteId)
 
-	// convert map[string]string to map[string]interface{}
-	labelsMap := make(map[string]interface{})
-	for k, v := range *model.Labels {
-		labelsMap[k] = v
-	}
-
 	payload := iaas.UpdateNetworkAreaRoutePayload{
-		Labels: &labelsMap,
+		Labels: utils.ConvertStringMapToInterfaceMap(model.Labels),
 	}
 	req = req.UpdateNetworkAreaRoutePayload(payload)
 
diff --git a/internal/cmd/network-area/update/update.go b/internal/cmd/network-area/update/update.go
@@ -153,18 +153,9 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiPartialUpdateNetworkAreaRequest {
 	req := apiClient.PartialUpdateNetworkArea(ctx, *model.OrganizationId, model.AreaId)
 
-	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.PartialUpdateNetworkAreaPayload{
 		Name:   model.Name,
-		Labels: labelsMap,
+		Labels: utils.ConvertStringMapToInterfaceMap(model.Labels),
 		AddressFamily: &iaas.UpdateAreaAddressFamily{
 			Ipv4: &iaas.UpdateAreaIPv4{
 				DefaultNameservers: model.DnsNameServers,
diff --git a/internal/cmd/network-interface/create/create.go b/internal/cmd/network-interface/create/create.go
@@ -207,21 +207,11 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
 func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiCreateNicRequest {
 	req := apiClient.CreateNic(ctx, model.ProjectId, *model.NetworkId)
 
-	var labelsMap *map[string]interface{}
-	if model.Labels != nil && len(*model.Labels) > 0 {
-		// convert map[string]string to map[string]interface{}
-		convertedMap := make(map[string]interface{}, len(*model.Labels))
-		for k, v := range *model.Labels {
-			convertedMap[k] = v
-		}
-		labelsMap = &convertedMap
-	}
-
 	payload := iaas.CreateNicPayload{
 		AllowedAddresses: model.AllowedAddresses,
 		Ipv4:             model.Ipv4,
 		Ipv6:             model.Ipv6,
-		Labels:           labelsMap,
+		Labels:           utils.ConvertStringMapToInterfaceMap(model.Labels),
 		Name:             model.Name,
 		NicSecurity:      model.NicSecurity,
 		SecurityGroups:   model.SecurityGroups,
diff --git a/internal/cmd/network-interface/update/update.go b/internal/cmd/network-interface/update/update.go
@@ -199,19 +199,9 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiUpdateNicRequest {
 	req := apiClient.UpdateNic(ctx, model.ProjectId, *model.NetworkId, model.NicId)
 
-	var labelsMap *map[string]interface{}
-	if model.Labels != nil && len(*model.Labels) > 0 {
-		// convert map[string]string to map[string]interface{}
-		convertedMap := make(map[string]interface{}, len(*model.Labels))
-		for k, v := range *model.Labels {
-			convertedMap[k] = v
-		}
-		labelsMap = &convertedMap
-	}
-
 	payload := iaas.UpdateNicPayload{
 		AllowedAddresses: model.AllowedAddresses,
-		Labels:           labelsMap,
+		Labels:           utils.ConvertStringMapToInterfaceMap(model.Labels),
 		Name:             model.Name,
 		NicSecurity:      model.NicSecurity,
 		SecurityGroups:   model.SecurityGroups,
diff --git a/internal/cmd/network/create/create.go b/internal/cmd/network/create/create.go
@@ -229,23 +229,14 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 		}
 	}
 
-	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
-		}
-	}
-
 	routed := true
 	if model.NonRouted {
 		routed = false
 	}
 
 	payload := iaas.CreateNetworkPayload{
 		Name:   model.Name,
-		Labels: labelsMap,
+		Labels: utils.ConvertStringMapToInterfaceMap(model.Labels),
 		Routed: &routed,
 	}
 
diff --git a/internal/cmd/network/update/update.go b/internal/cmd/network/update/update.go
@@ -179,15 +179,6 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	req := apiClient.PartialUpdateNetwork(ctx, model.ProjectId, model.NetworkId)
 	addressFamily := &iaas.UpdateNetworkAddressFamily{}
 
-	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
-		}
-	}
-
 	if model.IPv6DnsNameServers != nil || model.NoIPv6Gateway || model.IPv6Gateway != nil {
 		addressFamily.Ipv6 = &iaas.UpdateNetworkIPv6Body{
 			Nameservers: model.IPv6DnsNameServers,
@@ -214,7 +205,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 
 	payload := iaas.PartialUpdateNetworkPayload{
 		Name:   model.Name,
-		Labels: labelsMap,
+		Labels: utils.ConvertStringMapToInterfaceMap(model.Labels),
 	}
 
 	if addressFamily.Ipv4 != nil || addressFamily.Ipv6 != nil {
diff --git a/internal/cmd/public-ip/create/create.go b/internal/cmd/public-ip/create/create.go
@@ -126,18 +126,9 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
 func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiCreatePublicIPRequest {
 	req := apiClient.CreatePublicIP(ctx, model.ProjectId)
 
-	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.CreatePublicIPPayload{
 		NetworkInterface: iaas.NewNullableString(model.AssociatedResourceId),
-		Labels:           labelsMap,
+		Labels:           utils.ConvertStringMapToInterfaceMap(model.Labels),
 	}
 
 	return req.CreatePublicIPPayload(payload)
diff --git a/internal/cmd/public-ip/update/update.go b/internal/cmd/public-ip/update/update.go
@@ -130,17 +130,8 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiUpdatePublicIPRequest {
 	req := apiClient.UpdatePublicIP(ctx, model.ProjectId, model.PublicIpId)
 
-	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.UpdatePublicIPPayload{
-		Labels: labelsMap,
+		Labels: utils.ConvertStringMapToInterfaceMap(model.Labels),
 	}
 
 	return req.UpdatePublicIPPayload(payload)
diff --git a/internal/cmd/security-group/create/create.go b/internal/cmd/security-group/create/create.go
@@ -127,17 +127,9 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
 func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiCreateSecurityGroupRequest {
 	request := apiClient.CreateSecurityGroup(ctx, model.ProjectId)
 
-	var labelsMap *map[string]any
-	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.CreateSecurityGroupPayload{
 		Description: model.Description,
-		Labels:      labelsMap,
+		Labels:      utils.ConvertStringMapToInterfaceMap(model.Labels),
 		Name:        model.Name,
 		Stateful:    model.Stateful,
 	}
diff --git a/internal/cmd/security-group/update/update.go b/internal/cmd/security-group/update/update.go
@@ -135,15 +135,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	request := apiClient.UpdateSecurityGroup(ctx, model.ProjectId, model.SecurityGroupId)
 	payload := iaas.NewUpdateSecurityGroupPayload()
 	payload.Description = model.Description
-	var labelsMap *map[string]any
-	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.Labels = labelsMap
+	payload.Labels = utils.ConvertStringMapToInterfaceMap(model.Labels)
 	payload.Name = model.Name
 	request = request.UpdateSecurityGroupPayload(*payload)
 
diff --git a/internal/cmd/server/create/create.go b/internal/cmd/server/create/create.go
@@ -281,14 +281,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiCreateServerRequest {
 	req := apiClient.CreateServer(ctx, model.ProjectId)
-	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
-		}
-	}
 
 	var userData *[]byte
 	if model.UserData != nil {
@@ -307,7 +299,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 		ServiceAccountMails: model.ServiceAccountMails,
 		UserData:            userData,
 		Volumes:             model.Volumes,
-		Labels:              labelsMap,
+		Labels:              utils.ConvertStringMapToInterfaceMap(model.Labels),
 	}
 
 	if model.BootVolumePerformanceClass != nil || model.BootVolumeSize != nil || model.BootVolumeDeleteOnTermination != nil || model.BootVolumeSourceId != nil || model.BootVolumeSourceType != nil {
diff --git a/internal/cmd/server/update/update.go b/internal/cmd/server/update/update.go
@@ -129,18 +129,9 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiUpdateServerRequest {
 	req := apiClient.UpdateServer(ctx, model.ProjectId, model.ServerId)
 
-	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.UpdateServerPayload{
 		Name:   model.Name,
-		Labels: labelsMap,
+		Labels: utils.ConvertStringMapToInterfaceMap(model.Labels),
 	}
 
 	return req.UpdateServerPayload(payload)
diff --git a/internal/pkg/utils/utils.go b/internal/pkg/utils/utils.go
@@ -129,3 +129,18 @@ func Base64Encode(message []byte) string {
 func UserAgentConfigOption(cliVersion string) sdkConfig.ConfigurationOption {
 	return sdkConfig.WithUserAgent(fmt.Sprintf("stackit-cli/%s", cliVersion))
 }
+
+// ConvertStringMapToInterfaceMap converts a map[string]string to a pointer to map[string]interface{}.
+// Returns nil if the input map is empty.
+//
+//nolint:gocritic // Linter wants to have a non-pointer type for the map, but this would mean a nil check has to be done before every usage of this func.
+func ConvertStringMapToInterfaceMap(m *map[string]string) *map[string]interface{} {
+	if m == nil || len(*m) == 0 {
+		return nil
+	}
+	result := make(map[string]interface{}, len(*m))
+	for k, v := range *m {
+		result[k] = v
+	}
+	return &result
+}
diff --git a/internal/pkg/utils/utils_test.go b/internal/pkg/utils/utils_test.go
