Merge pull request #378 from fmount/modernize

openshift-merge-bot[bot] · web-flow · commit 97fbf518bd30 · 2025-09-26T12:36:42.000Z
Modernize Go code with latest style conventions
diff --git a/controllers/designate_common.go b/controllers/designate_common.go
@@ -26,7 +26,7 @@ import (
 
 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 {
diff --git a/controllers/designate_controller.go b/controllers/designate_controller.go
@@ -795,10 +795,7 @@ func (r *DesignateReconciler) reconcileNormal(ctx context.Context, instance *des
 
 	// Handle Mdns predictable IPs configmap
 	// We cannot have 0 mDNS pods so even though the CRD validation allows 0, don't allow it.
-	mdnsReplicaCount := int(*instance.Spec.DesignateMdns.Replicas)
-	if mdnsReplicaCount < 1 {
-		mdnsReplicaCount = 1
-	}
+	mdnsReplicaCount := max(int(*instance.Spec.DesignateMdns.Replicas), 1)
 	var mdnsNames []string
 	for i := 0; i < mdnsReplicaCount; i++ {
 		mdnsNames = append(mdnsNames, fmt.Sprintf("mdns_address_%d", i))
@@ -826,7 +823,7 @@ func (r *DesignateReconciler) reconcileNormal(ctx context.Context, instance *des
 	// value is a byob case. Something to think about.
 	bindReplicaCount := int(*instance.Spec.DesignateBackendbind9.Replicas)
 	var bindNames []string
-	for i := 0; i < bindReplicaCount; i++ {
+	for i := range bindReplicaCount {
 		bindNames = append(bindNames, fmt.Sprintf("bind_address_%d", i))
 	}
 
@@ -1334,7 +1331,7 @@ func (r *DesignateReconciler) generateServiceConfigMaps(
 		}
 		newKeysMap := make(map[string][]byte)
 
-		for i := 0; i < replicas; i++ {
+		for i := range replicas {
 			keyName := fmt.Sprintf("%s-%v", designate.DesignateRndcKey, i)
 
 			if key, exists := secret.Data[keyName]; exists {
@@ -1379,7 +1376,7 @@ func (r *DesignateReconciler) generateServiceConfigMaps(
 
 	// We only need a minimal 00-config.conf that is only used by db-sync job,
 	// hence only passing the database related parameters
-	templateParameters := map[string]interface{}{
+	templateParameters := map[string]any{
 		"MinimalConfig": true, // This tells the template to generate a minimal config
 		"DatabaseConnection": fmt.Sprintf("mysql+pymysql://%s:%s@%s/%s?read_default_file=/etc/my.cnf",
 			databaseAccount.Spec.UserName,
@@ -1515,7 +1512,7 @@ func (r *DesignateReconciler) createHashOfInputHashes(
 	instance *designatev1beta1.Designate,
 	hashType string,
 	envVars map[string]env.Setter,
-	additionalConfigmaps []interface{},
+	additionalConfigmaps []any,
 ) (string, bool, error) {
 	Log := r.GetLogger(ctx)
 
diff --git a/controllers/designateapi_controller.go b/controllers/designateapi_controller.go
@@ -1148,16 +1148,16 @@ func (r *DesignateAPIReconciler) generateServiceConfigMaps(
 
 	customData[common.CustomServiceConfigFileName] = instance.Spec.CustomServiceConfig
 
-	templateParameters := map[string]interface{}{
+	templateParameters := map[string]any{
 		"KeystoneInternalURL": keystoneInternalURL,
 		"KeystonePublicURL":   keystonePublicURL,
 		"TimeOut":             instance.Spec.APITimeout,
 	}
 
 	// 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", designate.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) {
diff --git a/controllers/designatebackendbind9_controller.go b/controllers/designatebackendbind9_controller.go
@@ -405,7 +405,7 @@ func (r *DesignateBackendbind9Reconciler) reconcileNormal(ctx context.Context, i
 	// TODO(beagles): we really should create a single point of truth for what things are named or
 	// what the names will be based on.
 	serviceCount := min(int(*instance.Spec.Replicas), len(instance.Spec.Override.Services))
-	for i := 0; i < serviceCount; i++ {
+	for i := range serviceCount {
 		svc, err := designate.CreateDNSService(
 			fmt.Sprintf("designate-backendbind9-%d", i),
 			instance.Namespace,
@@ -765,7 +765,7 @@ func (r *DesignateBackendbind9Reconciler) generateServiceConfigMaps(
 			err))
 		return err
 	}
-	templateParameters := make(map[string]interface{})
+	templateParameters := make(map[string]any)
 	if nadInfo.IPAM.CIDR.Addr().Is4() {
 		templateParameters["IPVersion"] = "4"
 	} else {
diff --git a/controllers/designatecentral_controller.go b/controllers/designatecentral_controller.go
@@ -666,7 +666,7 @@ func (r *DesignateCentralReconciler) generateServiceConfigMaps(
 		"my.cnf":                           db.GetDatabaseClientConfig(tlsCfg), //(oschwart) for now just get the default my.cnf
 	}
 
-	templateParameters := map[string]interface{}{}
+	templateParameters := map[string]any{}
 	cms := []util.Template{
 		// Custom ConfigMap
 		{
diff --git a/controllers/designatemdns_controller.go b/controllers/designatemdns_controller.go
@@ -532,7 +532,7 @@ func (r *DesignateMdnsReconciler) reconcileNormal(ctx context.Context, instance
 	}
 
 	serviceCount := min(int(*instance.Spec.Replicas), len(instance.Spec.Override.Services))
-	for i := 0; i < serviceCount; i++ {
+	for i := range serviceCount {
 		svc, err := designate.CreateDNSService(
 			fmt.Sprintf("designate-mdns-%d", i),
 			instance.Namespace,
@@ -850,7 +850,7 @@ func (r *DesignateMdnsReconciler) generateServiceConfigMaps(
 			Type:          util.TemplateTypeConfig,
 			InstanceType:  instance.Kind,
 			CustomData:    customData,
-			ConfigOptions: make(map[string]interface{}),
+			ConfigOptions: make(map[string]any),
 			Labels:        cmLabels,
 		},
 		{
diff --git a/controllers/designateproducer_controller.go b/controllers/designateproducer_controller.go
@@ -804,7 +804,7 @@ func (r *DesignateProducerReconciler) generateServiceConfigMaps(
 		"my.cnf":                           db.GetDatabaseClientConfig(tlsCfg), //(oschwart) for now just get the default my.cnf
 	}
 
-	templateParameters := map[string]interface{}{}
+	templateParameters := map[string]any{}
 
 	cms := []util.Template{
 		// Custom ConfigMap
diff --git a/controllers/designateunbound_controller.go b/controllers/designateunbound_controller.go
@@ -19,6 +19,7 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"maps"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -282,7 +283,7 @@ func (r *UnboundReconciler) reconcileNormal(ctx context.Context, instance *desig
 	}
 
 	serviceCount := min(int(*instance.Spec.Replicas), len(instance.Spec.Override.Services))
-	for i := 0; i < serviceCount; i++ {
+	for i := range serviceCount {
 		svc, err := designate.CreateDNSService(
 			fmt.Sprintf("designate-unbound-%d", i),
 			instance.Namespace,
@@ -539,11 +540,9 @@ func (r *UnboundReconciler) generateServiceConfigMaps(
 	Log.Info("Generating service config map")
 	cmLabels := labels.GetLabels(instance, labels.GetGroupLabel(designateunbound.Component), map[string]string{})
 	customData := map[string]string{common.CustomServiceConfigFileName: instance.Spec.CustomServiceConfig}
-	for key, data := range instance.Spec.DefaultConfigOverwrite {
-		customData[key] = data
-	}
+	maps.Copy(customData, instance.Spec.DefaultConfigOverwrite)
 
-	templateParameters := make(map[string]interface{})
+	templateParameters := make(map[string]any)
 
 	stubZoneData := make([]StubZoneTmplRec, len(instance.Spec.StubZones))
 	if len(instance.Spec.StubZones) > 0 {
diff --git a/controllers/designateworker_controller.go b/controllers/designateworker_controller.go
@@ -814,7 +814,7 @@ func (r *DesignateWorkerReconciler) generateServiceConfigMaps(
 			Type:          util.TemplateTypeConfig,
 			InstanceType:  instance.Kind,
 			CustomData:    customData,
-			ConfigOptions: make(map[string]interface{}),
+			ConfigOptions: make(map[string]any),
 			Labels:        cmLabels,
 		},
 		{
diff --git a/pkg/designate/bind_ctrl_network.go b/pkg/designate/bind_ctrl_network.go
@@ -27,7 +27,7 @@ func GetPredictableIPAM(networkParameters *NetworkParameters) (*NADIpam, error)
 	predParams.CIDR = networkParameters.CIDR
 	predParams.RangeStart = networkParameters.ProviderAllocationEnd.Next()
 	endRange := predParams.RangeStart
-	for i := 0; i < BindProvPredictablePoolSize; i++ {
+	for range BindProvPredictablePoolSize {
 		if !predParams.CIDR.Contains(endRange) {
 			return nil, fmt.Errorf("%w: %d IP addresses in %s", ErrPredictableIPAllocation, BindProvPredictablePoolSize, predParams.CIDR)
 		}
diff --git a/pkg/designate/generate_bind9_pools_yaml.go b/pkg/designate/generate_bind9_pools_yaml.go
@@ -105,7 +105,7 @@ func GeneratePoolsYamlDataAndHash(BindMap, MdnsMap map[string]string, nsRecords
 
 	targets := make([]Target, len(bindIPs))
 	nameservers := make([]Nameserver, len(bindIPs))
-	for i := 0; i < len(bindIPs); i++ {
+	for i := range bindIPs {
 		masters := make([]Master, len(masterHosts))
 		for j, masterHost := range masterHosts {
 			masters[j] = Master{
diff --git a/pkg/designate/network_parameters.go b/pkg/designate/network_parameters.go
@@ -76,7 +76,7 @@ func GetNetworkParametersFromNAD(
 	// RangeEnd.
 	networkParameters.ProviderAllocationStart = nadConfig.IPAM.RangeEnd.Next()
 	end := networkParameters.ProviderAllocationStart
-	for i := 0; i < BindProvPredictablePoolSize; i++ {
+	for range BindProvPredictablePoolSize {
 		if !networkParameters.CIDR.Contains(end) {
 			return nil, fmt.Errorf("%w: %d IP addresses in %s", ErrCannotAllocateIPAddresses, BindProvPredictablePoolSize, networkParameters.CIDR)
 		}
diff --git a/pkg/designate/volumes.go b/pkg/designate/volumes.go
@@ -63,7 +63,7 @@ func ProcessVolumes(volumeDefs []VolumeMapping) ([]corev1.Volume, []corev1.Volum
 		ConfigMount: 0640,
 		MergeMount:  0,
 	}
-	for i := 0; i < len(volumeDefs); i++ {
+	for i := range volumeDefs {
 		v := &volumeDefs[i]
 		accessMode := modeMap[v.Type]
 		var newVolume corev1.Volume
diff --git a/tests/functional/base_test.go b/tests/functional/base_test.go
diff --git a/tests/functional/designate_controller_test.go b/tests/functional/designate_controller_test.go
diff --git a/tests/functional/designateapi_controller_test.go b/tests/functional/designateapi_controller_test.go
diff --git a/tests/functional/designatebackendbind9_controller_test.go b/tests/functional/designatebackendbind9_controller_test.go
diff --git a/tests/functional/designatecentral_controller_test.go b/tests/functional/designatecentral_controller_test.go
diff --git a/tests/functional/designateproducer_controller_test.go b/tests/functional/designateproducer_controller_test.go

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`
`27`	`27`	`type conditionUpdater interface {`
`28`	`28`	`Set(c *condition.Condition)`
`29`		`- MarkTrue(t condition.Type, messageFormat string, messageArgs ...interface{})`
	`29`	`+ MarkTrue(t condition.Type, messageFormat string, messageArgs ...any)`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`type topologyHandler interface {`
Original file line number	Diff line number	Diff line change
`@@ -666,7 +666,7 @@ func (r *DesignateCentralReconciler) generateServiceConfigMaps(`
`666`	`666`	`"my.cnf": db.GetDatabaseClientConfig(tlsCfg), //(oschwart) for now just get the default my.cnf`
`667`	`667`	`}`
`668`	`668`
`669`		`- templateParameters := map[string]interface{}{}`
	`669`	`+ templateParameters := map[string]any{}`
`670`	`670`	`cms := []util.Template{`
`671`	`671`	`// Custom ConfigMap`
`672`	`672`	`{`
Original file line number	Diff line number	Diff line change
`@@ -804,7 +804,7 @@ func (r *DesignateProducerReconciler) generateServiceConfigMaps(`
`804`	`804`	`"my.cnf": db.GetDatabaseClientConfig(tlsCfg), //(oschwart) for now just get the default my.cnf`
`805`	`805`	`}`
`806`	`806`
`807`		`- templateParameters := map[string]interface{}{}`
	`807`	`+ templateParameters := map[string]any{}`
`808`	`808`
`809`	`809`	`cms := []util.Template{`
`810`	`810`	`// Custom ConfigMap`
Original file line number	Diff line number	Diff line change
`@@ -814,7 +814,7 @@ func (r *DesignateWorkerReconciler) generateServiceConfigMaps(`
`814`	`814`	`Type: util.TemplateTypeConfig,`
`815`	`815`	`InstanceType: instance.Kind,`
`816`	`816`	`CustomData: customData,`
`817`		`- ConfigOptions: make(map[string]interface{}),`
	`817`	`+ ConfigOptions: make(map[string]any),`
`818`	`818`	`Labels: cmLabels,`
`819`	`819`	`},`
`820`	`820`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func GetPredictableIPAM(networkParameters NetworkParameters) (NADIpam, error)`
`27`	`27`	`predParams.CIDR = networkParameters.CIDR`
`28`	`28`	`predParams.RangeStart = networkParameters.ProviderAllocationEnd.Next()`
`29`	`29`	`endRange := predParams.RangeStart`
`30`		`- for i := 0; i < BindProvPredictablePoolSize; i++ {`
	`30`	`+ for range BindProvPredictablePoolSize {`
`31`	`31`	`if !predParams.CIDR.Contains(endRange) {`
`32`	`32`	`return nil, fmt.Errorf("%w: %d IP addresses in %s", ErrPredictableIPAllocation, BindProvPredictablePoolSize, predParams.CIDR)`
`33`	`33`	`}`