Merge pull request #759 from fmount/modernize

Modernize Go code with latest style conventions

Author: openshift-merge-bot[bot]

controllers/autoscaling_controller.go

@@ -19,6 +19,7 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"maps"
 	"strconv"
 	"time"
 
@@ -611,9 +612,7 @@ func (r *AutoscalingReconciler) generateServiceConfig(
 		common.CustomServiceConfigFileName: instance.Spec.Aodh.CustomServiceConfig,
 		"my.cnf":                           db.GetDatabaseClientConfig(tlsCfg), //(mschuppert) for now just get the default my.cnf
 	}
-	for key, data := range instance.Spec.Aodh.DefaultConfigOverwrite {
-		customData[key] = data
-	}
+	maps.Copy(customData, instance.Spec.Aodh.DefaultConfigOverwrite)
 
 	keystoneAPI, err := keystonev1.GetKeystoneAPI(ctx, h, instance.Namespace, map[string]string{})
 	if err != nil {
@@ -638,7 +637,7 @@ func (r *AutoscalingReconciler) generateServiceConfig(
 	databaseAccount := db.GetAccount()
 	databaseSecret := db.GetSecret()
 
-	templateParameters := map[string]interface{}{
+	templateParameters := map[string]any{
 		"AodhUser":                 instance.Spec.Aodh.ServiceUser,
 		"AodhPassword":             string(ospSecret.Data[instance.Spec.Aodh.PasswordSelectors.AodhService]),
 		"KeystoneInternalURL":      keystoneInternalURL,
@@ -653,7 +652,7 @@ func (r *AutoscalingReconciler) generateServiceConfig(
 		"Timeout": instance.Spec.Aodh.APITimeout,
 	}
 
-	prometheusParams := map[string]interface{}{
+	prometheusParams := map[string]any{
 		"Host": instance.Status.PrometheusHost,
 		"Port": instance.Status.PrometheusPort,
 		"TLS":  instance.Status.PrometheusTLS,
@@ -665,9 +664,9 @@ func (r *AutoscalingReconciler) generateServiceConfig(
 	}
 	templateParameters["Prometheus"] = prometheusParams
 
-	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", autoscaling.ServiceName, endpt.String(), instance.Namespace)
 		endptConfig["TLS"] = false // default TLS to false, and set it bellow to true if enabled
 		if instance.Spec.Aodh.TLS.API.Enabled(endpt) {

controllers/ceilometer_controller.go

@@ -19,6 +19,7 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"maps"
 	"slices"
 	"sort"
 	"strings"
@@ -1193,9 +1194,7 @@ func (r *CeilometerReconciler) generateServiceConfig(
 ) error {
 	cmLabels := labels.GetLabels(instance, labels.GetGroupLabel(ceilometer.ServiceName), 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)
 
 	keystoneAPI, err := keystonev1.GetKeystoneAPI(ctx, h, instance.Namespace, map[string]string{})
 	if err != nil {
@@ -1217,7 +1216,7 @@ func (r *CeilometerReconciler) generateServiceConfig(
 		return err
 	}
 
-	templateParameters := map[string]interface{}{
+	templateParameters := map[string]any{
 		"KeystoneInternalURL": keystoneInternalURL,
 		"TransportURL":        string(transportURLSecret.Data["transport_url"]),
 		"CeilometerPassword":  string(ceilometerPasswordSecret.Data["CeilometerPassword"]),
@@ -1227,7 +1226,7 @@ func (r *CeilometerReconciler) generateServiceConfig(
 	}
 
 	// create httpd  vhost template parameters
-	endptConfig := map[string]interface{}{}
+	endptConfig := map[string]any{}
 	endptConfig["ServerName"] = fmt.Sprintf("%s-internal.%s.svc", ceilometer.ServiceName, instance.Namespace)
 	if instance.Spec.TLS.Enabled() {
 		templateParameters["TLS"] = true
@@ -1282,9 +1281,7 @@ func (r *CeilometerReconciler) generateComputeServiceConfig(
 	cmLabels := labels.GetLabels(instance, labels.GetGroupLabel(ceilometer.ComputeServiceName), map[string]string{})
 	ipmiLabels := labels.GetLabels(instance, labels.GetGroupLabel(ceilometer.IpmiServiceName), 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)
 
 	keystoneAPI, err := keystonev1.GetKeystoneAPI(ctx, h, instance.Namespace, map[string]string{})
 	if err != nil {
@@ -1306,7 +1303,7 @@ func (r *CeilometerReconciler) generateComputeServiceConfig(
 		return err
 	}
 
-	templateParameters := map[string]interface{}{
+	templateParameters := map[string]any{
 		"KeystoneInternalURL":      keystoneInternalURL,
 		"TransportURL":             string(transportURLSecret.Data["transport_url"]),
 		"CeilometerPassword":       string(ceilometerPasswordSecret.Data["CeilometerPassword"]),
@@ -1482,7 +1479,7 @@ func (r *CeilometerReconciler) generateMysqldExporterServiceConfig(
 
 	instance.Status.MysqldExporterExportedGaleras = []string{}
 
-	databases := []map[string]interface{}{}
+	databases := []map[string]any{}
 	for _, galera := range galeras.Items {
 		galeraName := galera.GetName()
 
@@ -1508,7 +1505,7 @@ func (r *CeilometerReconciler) generateMysqldExporterServiceConfig(
 		if (err != nil || result != ctrl.Result{}) {
 			return result, err
 		}
-		databaseParameters := map[string]interface{}{
+		databaseParameters := map[string]any{
 			"Name":       fmt.Sprintf("client.%s.%s.svc", galeraName, galera.GetNamespace()),
 			"Host":       hostname,
 			"User":       dbAccount.Spec.UserName,
@@ -1527,7 +1524,7 @@ func (r *CeilometerReconciler) generateMysqldExporterServiceConfig(
 
 	if len(databases) > 0 {
 		// There needs to be a section called "client" in the config
-		clientParameters := map[string]interface{}{
+		clientParameters := map[string]any{
 			"Name":       "client",
 			"Host":       databases[0]["Host"],
 			"User":       databases[0]["User"],
@@ -1536,7 +1533,7 @@ func (r *CeilometerReconciler) generateMysqldExporterServiceConfig(
 		}
 		databases = append(databases, clientParameters)
 	}
-	templateParameters := map[string]interface{}{
+	templateParameters := map[string]any{
 		"Databases": databases,
 		"TLS": map[string]string{
 			"Cert": fmt.Sprintf("/etc/pki/tls/certs/%s", tls.CertKey),

controllers/logging_controller.go

@@ -294,7 +294,7 @@ func (r *LoggingReconciler) generateComputeServiceConfig(
 		instance.Spec.RsyslogQueueType = "linkedList"
 	}
 
-	templateParameters := map[string]interface{}{
+	templateParameters := map[string]any{
 		"RsyslogAddress":   service.Annotations["metallb.universe.tf/loadBalancerIPs"],
 		"RsyslogPort":      instance.Spec.Port,
 		"RsyslogRetries":   instance.Spec.RsyslogRetries,

controllers/metricstorage_controller.go

@@ -23,6 +23,7 @@ import (
 	"net"
 	"reflect"
 	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -639,7 +640,7 @@ func (r *MetricStorageReconciler) prometheusEndpointSecret(
 	}
 
 	secret.Data = map[string][]byte{
-		metricstorage.PrometheusHost: []byte(fmt.Sprintf("%s-prometheus.%s.svc", telemetryv1.DefaultServiceName, instance.Namespace)),
+		metricstorage.PrometheusHost: fmt.Appendf(nil, "%s-prometheus.%s.svc", telemetryv1.DefaultServiceName, instance.Namespace),
 		metricstorage.PrometheusPort: []byte(strconv.Itoa(telemetryv1.DefaultPrometheusPort)),
 	}
 
@@ -1251,11 +1252,9 @@ func (r *MetricStorageReconciler) ensureWatches(
 	handler handler.EventHandler,
 ) error {
 	Log := r.GetLogger(ctx)
-	for _, item := range r.Watching {
-		if item == name {
-			// We are already watching the resource
-			return nil
-		}
+	if slices.Contains(r.Watching, name) {
+		// We are already watching the resource
+		return nil
 	}
 	u := &unstructured.Unstructured{}
 	u.SetGroupVersionKind(schema.GroupVersionKind{
@@ -1308,7 +1307,7 @@ func getComputeNodesConnectionInfo(
 			continue // Skip if the group doesn't exist in inventory
 		}
 		containsTargetService := false
-		if services, ok := nodeSetGroup.Vars["edpm_services"].([]interface{}); ok {
+		if services, ok := nodeSetGroup.Vars["edpm_services"].([]any); ok {
 			for _, svc := range services {
 				if svcStr, ok := svc.(string); ok {
 					if svcStr == telemetryServiceName {
@@ -1397,7 +1396,7 @@ func getAddressFromIPSet(
 	canonicalHostname, _ := getCanonicalHostname(item)
 	ctlplaneDNSDomain := ""
 
-	domains, ok := item.Vars["dns_search_domains"].([]interface{})
+	domains, ok := item.Vars["dns_search_domains"].([]any)
 	if ok {
 		for _, domain := range domains {
 			domainString, ok := domain.(string)

controllers/telemetry_common.go

@@ -34,7 +34,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 {

pkg/metricstorage/scrape_config.go

@@ -37,7 +37,7 @@ type LabeledTarget struct {
 func ScrapeConfig(
 	instance *telemetryv1.MetricStorage,
 	labels map[string]string,
-	targets interface{},
+	targets any,
 	tlsEnabled bool,
 ) *monv1alpha1.ScrapeConfig {
 	var scrapeInterval monv1.Duration