update ConvertStringMapToInterfaceMap parameter/argument

Benjosh95 · Benjosh95 · commit e8bbd0905929 · 2025-06-11T18:17:04.000+02:00
diff --git a/internal/cmd/image/create/create.go b/internal/cmd/image/create/create.go
@@ -343,7 +343,7 @@ func createPayload(_ context.Context, model *inputModel) iaas.CreateImagePayload
 	payload := iaas.CreateImagePayload{
 		DiskFormat:  &model.DiskFormat,
 		Name:        &model.Name,
-		Labels:      utils.ConvertStringMapToInterfaceMap(*model.Labels),
+		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
@@ -246,7 +246,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 
 	// Config *ImageConfig `json:"config,omitempty"`
 	payload.DiskFormat = model.DiskFormat
-	payload.Labels = utils.ConvertStringMapToInterfaceMap(*model.Labels)
+	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
@@ -126,7 +126,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 
 	payload := iaas.CreateKeyPairPayload{
 		Name:      model.Name,
-		Labels:    utils.ConvertStringMapToInterfaceMap(*model.Labels),
+		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
@@ -88,7 +88,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	req := apiClient.UpdateKeyPair(ctx, *model.KeyPairName)
 
 	payload := iaas.UpdateKeyPairPayload{
-		Labels: utils.ConvertStringMapToInterfaceMap(*model.Labels),
+		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
@@ -174,7 +174,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 
 	payload := iaas.CreateNetworkAreaPayload{
 		Name:   model.Name,
-		Labels: utils.ConvertStringMapToInterfaceMap(*model.Labels),
+		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
@@ -152,7 +152,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 			{
 				Prefix:  model.Prefix,
 				Nexthop: model.Nexthop,
-				Labels:  utils.ConvertStringMapToInterfaceMap(*model.Labels),
+				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
@@ -131,7 +131,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	req := apiClient.UpdateNetworkAreaRoute(ctx, *model.OrganizationId, *model.NetworkAreaId, model.RouteId)
 
 	payload := iaas.UpdateNetworkAreaRoutePayload{
-		Labels: utils.ConvertStringMapToInterfaceMap(*model.Labels),
+		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
@@ -155,7 +155,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 
 	payload := iaas.PartialUpdateNetworkAreaPayload{
 		Name:   model.Name,
-		Labels: utils.ConvertStringMapToInterfaceMap(*model.Labels),
+		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
@@ -211,7 +211,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 		AllowedAddresses: model.AllowedAddresses,
 		Ipv4:             model.Ipv4,
 		Ipv6:             model.Ipv6,
-		Labels:           utils.ConvertStringMapToInterfaceMap(*model.Labels),
+		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
@@ -201,7 +201,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 
 	payload := iaas.UpdateNicPayload{
 		AllowedAddresses: model.AllowedAddresses,
-		Labels:           utils.ConvertStringMapToInterfaceMap(*model.Labels),
+		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
@@ -236,7 +236,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 
 	payload := iaas.CreateNetworkPayload{
 		Name:   model.Name,
-		Labels: utils.ConvertStringMapToInterfaceMap(*model.Labels),
+		Labels: utils.ConvertStringMapToInterfaceMap(model.Labels),
 		Routed: &routed,
 	}
 
diff --git a/internal/cmd/network/update/update.go b/internal/cmd/network/update/update.go
@@ -205,7 +205,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 
 	payload := iaas.PartialUpdateNetworkPayload{
 		Name:   model.Name,
-		Labels: utils.ConvertStringMapToInterfaceMap(*model.Labels),
+		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
@@ -128,7 +128,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 
 	payload := iaas.CreatePublicIPPayload{
 		NetworkInterface: iaas.NewNullableString(model.AssociatedResourceId),
-		Labels:           utils.ConvertStringMapToInterfaceMap(*model.Labels),
+		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
@@ -131,7 +131,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	req := apiClient.UpdatePublicIP(ctx, model.ProjectId, model.PublicIpId)
 
 	payload := iaas.UpdatePublicIPPayload{
-		Labels: utils.ConvertStringMapToInterfaceMap(*model.Labels),
+		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
@@ -129,7 +129,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 
 	payload := iaas.CreateSecurityGroupPayload{
 		Description: model.Description,
-		Labels:      utils.ConvertStringMapToInterfaceMap(*model.Labels),
+		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,7 +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
-	payload.Labels = utils.ConvertStringMapToInterfaceMap(*model.Labels)
+	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
@@ -299,7 +299,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 		ServiceAccountMails: model.ServiceAccountMails,
 		UserData:            userData,
 		Volumes:             model.Volumes,
-		Labels:              utils.ConvertStringMapToInterfaceMap(*model.Labels),
+		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
@@ -131,7 +131,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 
 	payload := iaas.UpdateServerPayload{
 		Name:   model.Name,
-		Labels: utils.ConvertStringMapToInterfaceMap(*model.Labels),
+		Labels: utils.ConvertStringMapToInterfaceMap(model.Labels),
 	}
 
 	return req.UpdateServerPayload(payload)
diff --git a/internal/pkg/utils/utils.go b/internal/pkg/utils/utils.go
@@ -132,12 +132,13 @@ func UserAgentConfigOption(cliVersion string) sdkConfig.ConfigurationOption {
 
 // ConvertStringMapToInterfaceMap converts a map[string]string to a pointer to map[string]interface{}.
 // Returns nil if the input map is empty.
-func ConvertStringMapToInterfaceMap(m map[string]string) *map[string]interface{} {
-	if len(m) == 0 {
+func ConvertStringMapToInterfaceMap(m *map[string]string) *map[string]interface{} {
+	//nolint:gocritic
+	if m == nil || len(*m) == 0 {
 		return nil
 	}
-	result := make(map[string]interface{}, len(m))
-	for k, v := range m {
+	result := make(map[string]interface{}, len(*m))
+	for k, v := range *m {
 		result[k] = v
 	}
 	return &result

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ func buildRequest(ctx context.Context, model inputModel, apiClient iaas.APICli`
`126`	`126`
`127`	`127`	`payload := iaas.CreateKeyPairPayload{`
`128`	`128`	`Name: model.Name,`
`129`		`- Labels: utils.ConvertStringMapToInterfaceMap(*model.Labels),`
	`129`	`+ Labels: utils.ConvertStringMapToInterfaceMap(model.Labels),`
`130`	`130`	`PublicKey: model.PublicKey,`
`131`	`131`	`}`
`132`	`132`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func buildRequest(ctx context.Context, model inputModel, apiClient iaas.APICli`
`88`	`88`	`req := apiClient.UpdateKeyPair(ctx, *model.KeyPairName)`
`89`	`89`
`90`	`90`	`payload := iaas.UpdateKeyPairPayload{`
`91`		`- Labels: utils.ConvertStringMapToInterfaceMap(*model.Labels),`
	`91`	`+ Labels: utils.ConvertStringMapToInterfaceMap(model.Labels),`
`92`	`92`	`}`
`93`	`93`	`return req.UpdateKeyPairPayload(payload)`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ func buildRequest(ctx context.Context, model inputModel, apiClient iaas.APICli`
`152`	`152`	`{`
`153`	`153`	`Prefix: model.Prefix,`
`154`	`154`	`Nexthop: model.Nexthop,`
`155`		`- Labels: utils.ConvertStringMapToInterfaceMap(*model.Labels),`
	`155`	`+ Labels: utils.ConvertStringMapToInterfaceMap(model.Labels),`
`156`	`156`	`},`
`157`	`157`	`},`
`158`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ func buildRequest(ctx context.Context, model inputModel, apiClient iaas.APICli`
`131`	`131`	`req := apiClient.UpdateNetworkAreaRoute(ctx, model.OrganizationId, model.NetworkAreaId, model.RouteId)`
`132`	`132`
`133`	`133`	`payload := iaas.UpdateNetworkAreaRoutePayload{`
`134`		`- Labels: utils.ConvertStringMapToInterfaceMap(*model.Labels),`
	`134`	`+ Labels: utils.ConvertStringMapToInterfaceMap(model.Labels),`
`135`	`135`	`}`
`136`	`136`	`req = req.UpdateNetworkAreaRoutePayload(payload)`
`137`	`137`