Merge pull request #386 from fmount/modernize

Modernize Go code with latest style conventions

Author: openshift-merge-bot[bot]

controllers/swift_common.go

@@ -59,7 +59,7 @@ var (
 
 type conditionUpdater interface {
 	Set(c *condition.Condition)
-	MarkTrue(t condition.Type, messageFormat string, messageArgs ...interface{})
+	MarkTrue(t condition.Type, messageFormat string, messageArgs ...any)
 }
 
 type topologyHandler interface {

pkg/swift/funcs.go

@@ -58,7 +58,7 @@ func RandomString(length int) string {
 	sample := "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 	str := make([]byte, length)
 
-	for i := 0; i < length; i++ {
+	for i := range length {
 		str[i] = sample[rand.Intn(len(sample))] //nolint:gosec // G404: Non-cryptographic use acceptable for Swift hash generation
 	}
 	return string(str)

pkg/swift/templates.go

@@ -23,7 +23,7 @@ import (
 
 // SecretTemplates creates secret templates for swift configuration
 func SecretTemplates(instance *swiftv1beta1.Swift, serviceLabels map[string]string) []util.Template {
-	templateParameters := make(map[string]interface{})
+	templateParameters := make(map[string]any)
 	templateParameters["SwiftHashPathPrefix"] = RandomString(16)
 	templateParameters["SwiftHashPathSuffix"] = RandomString(16)
 

pkg/swiftproxy/templates.go

@@ -18,6 +18,7 @@ package swiftproxy
 
 import (
 	"fmt"
+	"maps"
 
 	memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
@@ -40,7 +41,7 @@ func SecretTemplates(
 	transportURL string,
 	apiTimeout int,
 ) []util.Template {
-	templateParameters := make(map[string]interface{})
+	templateParameters := make(map[string]any)
 	templateParameters["ServiceUser"] = instance.Spec.ServiceUser
 	templateParameters["ServicePassword"] = password
 	templateParameters["KeystonePublicURL"] = keystonePublicURL
@@ -65,9 +66,9 @@ func SecretTemplates(
 	}
 
 	// create httpd  vhost template parameters
-	httpdVhostConfig := map[string]interface{}{}
+	httpdVhostConfig := map[string]any{}
 	for _, endpt := range []service.Endpoint{service.EndpointInternal, service.EndpointPublic} {
-		endptConfig := map[string]interface{}{}
+		endptConfig := map[string]any{}
 		endptConfig["ServerName"] = fmt.Sprintf("%s-%s.%s.svc", swift.ServiceName, endpt.String(), instance.Namespace)
 		endptConfig["TLS"] = false // default TLS to false, and set it bellow to true if enabled
 		if instance.Spec.TLS.API.Enabled(endpt) {
@@ -79,9 +80,7 @@ func SecretTemplates(
 	}
 	templateParameters["VHosts"] = httpdVhostConfig
 	customData := map[string]string{}
-	for key, data := range instance.Spec.DefaultConfigOverwrite {
-		customData[key] = data
-	}
+	maps.Copy(customData, instance.Spec.DefaultConfigOverwrite)
 
 	return []util.Template{
 		{

pkg/swiftring/funcs.go

@@ -107,7 +107,7 @@ func DeviceList(ctx context.Context, h *helper.Helper, instance *swiftv1beta1.Sw
 		}
 		nodeSetGroup := inventory.Groups[secret.Labels["openstackdataplanenodeset"]]
 
-		if slices.Contains(nodeSetGroup.Vars["edpm_services"].([]interface{}), "swift") {
+		if slices.Contains(nodeSetGroup.Vars["edpm_services"].([]any), "swift") {
 			// Get the global disk vars first that are used for all
 			// nodes if not set otherwise per-node
 			var globalDisks []swiftv1beta1.SwiftDisk

pkg/swiftstorage/templates.go

@@ -18,6 +18,7 @@ package swiftstorage
 
 import (
 	"fmt"
+	"maps"
 
 	memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
@@ -29,15 +30,13 @@ func ConfigMapTemplates(instance *swiftv1beta1.SwiftStorage,
 	labels map[string]string,
 	mc *memcachedv1.Memcached,
 	bindIP string) []util.Template {
-	templateParameters := make(map[string]interface{})
+	templateParameters := make(map[string]any)
 	templateParameters["MemcachedServers"] = mc.GetMemcachedServerListString()
 	templateParameters["MemcachedTLS"] = mc.GetMemcachedTLSSupport()
 	templateParameters["BindIP"] = bindIP
 
 	customData := map[string]string{}
-	for key, data := range instance.Spec.DefaultConfigOverwrite {
-		customData[key] = data
-	}
+	maps.Copy(customData, instance.Spec.DefaultConfigOverwrite)
 
 	return []util.Template{
 		{