Modernize Go code with latest style conventions

Applied automated modernization using gopls modernize tool to update:
- Replace interface{} with any type alias (Go 1.18+)
- Update range loops to use idiomatic range syntax
- Replace fmt.Sprintf with fmt.Appendf where appropriate

These changes improve code readability and align with current Go best
practices.

Co-Authored-By: Claude <[email protected]>
Signed-off-by: Francesco Pantano <[email protected]>

Author: fmount

modules/ansible/inventory.go

@@ -21,23 +21,23 @@ import "gopkg.in/yaml.v3"
 // Host represents ansible host
 type Host struct {
 	name string
-	Vars map[string]interface{} `yaml:",inline"`
+	Vars map[string]any `yaml:",inline"`
 }
 
 // MakeHost instatiates an Host object
 func MakeHost(name string) Host {
 	return Host{
 		name: name,
-		Vars: make(map[string]interface{}),
+		Vars: make(map[string]any),
 	}
 }
 
 // Group represents ansible group
 type Group struct {
 	name     string
-	Vars     map[string]interface{} `yaml:",omitempty"`
-	Hosts    map[string]Host        `yaml:",omitempty"`
-	Children map[string]Group       `yaml:",omitempty"`
+	Vars     map[string]any   `yaml:",omitempty"`
+	Hosts    map[string]Host  `yaml:",omitempty"`
+	Children map[string]Group `yaml:",omitempty"`
 }
 
 // AddHost adds a host to the current group
@@ -51,7 +51,7 @@ func (group Group) AddHost(name string) Host {
 func MakeGroup(name string) Group {
 	return Group{
 		name:     name,
-		Vars:     make(map[string]interface{}),
+		Vars:     make(map[string]any),
 		Hosts:    make(map[string]Host),
 		Children: make(map[string]Group),
 	}

modules/certmanager/test/helpers/certmanager.go

@@ -75,15 +75,15 @@ func (tc *TestHelper) AssertIssuerDoesNotExist(name types.NamespacedName) {
 //
 //	cm := th.CreateIssuer(types.NamespacedName{Namespace: "default", Name: "example-configmap"})
 func (tc *TestHelper) CreateIssuer(name types.NamespacedName) client.Object {
-	raw := map[string]interface{}{
+	raw := map[string]any{
 		"apiVersion": "cert-manager.io/v1",
 		"kind":       "Issuer",
-		"metadata": map[string]interface{}{
+		"metadata": map[string]any{
 			"name":      name.Name,
 			"namespace": name.Namespace,
 		},
-		"spec": map[string]interface{}{
-			"ca": map[string]interface{}{
+		"spec": map[string]any{
+			"ca": map[string]any{
 				"secretName": name.Name,
 			},
 		},

modules/common/condition/funcs.go

@@ -125,17 +125,17 @@ func (conditions *Conditions) Has(t Type) bool {
 }
 
 // MarkTrue sets Status=True for the condition with the given type.
-func (conditions *Conditions) MarkTrue(t Type, messageFormat string, messageArgs ...interface{}) {
+func (conditions *Conditions) MarkTrue(t Type, messageFormat string, messageArgs ...any) {
 	conditions.Set(TrueCondition(t, messageFormat, messageArgs...))
 }
 
 // MarkFalse sets Status=False for the condition with the given type.
-func (conditions *Conditions) MarkFalse(t Type, reason Reason, severity Severity, messageFormat string, messageArgs ...interface{}) {
+func (conditions *Conditions) MarkFalse(t Type, reason Reason, severity Severity, messageFormat string, messageArgs ...any) {
 	conditions.Set(FalseCondition(t, reason, severity, messageFormat, messageArgs...))
 }
 
 // MarkUnknown sets Status=Unknown for the condition with the given type.
-func (conditions *Conditions) MarkUnknown(t Type, reason Reason, messageFormat string, messageArgs ...interface{}) {
+func (conditions *Conditions) MarkUnknown(t Type, reason Reason, messageFormat string, messageArgs ...any) {
 	conditions.Set(UnknownCondition(t, reason, messageFormat, messageArgs...))
 }
 
@@ -225,7 +225,7 @@ func HasSameState(i, j *Condition) bool {
 }
 
 // TrueCondition returns a condition with Status=True and the given type.
-func TrueCondition(t Type, messageFormat string, messageArgs ...interface{}) *Condition {
+func TrueCondition(t Type, messageFormat string, messageArgs ...any) *Condition {
 	return &Condition{
 		Type:     t,
 		Status:   corev1.ConditionTrue,
@@ -236,7 +236,7 @@ func TrueCondition(t Type, messageFormat string, messageArgs ...interface{}) *Co
 }
 
 // FalseCondition returns a condition with Status=False and the given type.
-func FalseCondition(t Type, reason Reason, severity Severity, messageFormat string, messageArgs ...interface{}) *Condition {
+func FalseCondition(t Type, reason Reason, severity Severity, messageFormat string, messageArgs ...any) *Condition {
 	return &Condition{
 		Type:     t,
 		Status:   corev1.ConditionFalse,
@@ -247,7 +247,7 @@ func FalseCondition(t Type, reason Reason, severity Severity, messageFormat stri
 }
 
 // UnknownCondition returns a condition with Status=Unknown and the given type.
-func UnknownCondition(t Type, reason Reason, messageFormat string, messageArgs ...interface{}) *Condition {
+func UnknownCondition(t Type, reason Reason, messageFormat string, messageArgs ...any) *Condition {
 	return &Condition{
 		Type:     t,
 		Status:   corev1.ConditionUnknown,

modules/common/condition/funcs_test.go

@@ -687,7 +687,7 @@ type conditionsMatcher struct {
 	Expected Conditions
 }
 
-func (matcher *conditionsMatcher) Match(actual interface{}) (success bool, err error) {
+func (matcher *conditionsMatcher) Match(actual any) (success bool, err error) {
 	actualConditions, ok := actual.(Conditions)
 	if !ok {
 		return false, errors.New("Value should be a conditions list")
@@ -705,11 +705,11 @@ func (matcher *conditionsMatcher) Match(actual interface{}) (success bool, err e
 	return true, nil
 }
 
-func (matcher *conditionsMatcher) FailureMessage(actual interface{}) (message string) {
+func (matcher *conditionsMatcher) FailureMessage(actual any) (message string) {
 	return format.Message(actual, "to have the same conditions of", matcher.Expected)
 }
 
-func (matcher *conditionsMatcher) NegatedFailureMessage(actual interface{}) (message string) {
+func (matcher *conditionsMatcher) NegatedFailureMessage(actual any) (message string) {
 	return format.Message(actual, "not to have the same conditions of", matcher.Expected)
 }
 
@@ -724,7 +724,7 @@ type conditionMatcher struct {
 	Expected *Condition
 }
 
-func (matcher *conditionMatcher) Match(actual interface{}) (success bool, err error) {
+func (matcher *conditionMatcher) Match(actual any) (success bool, err error) {
 	actualCondition, ok := actual.(*Condition)
 	if !ok {
 		return false, errors.New("value should be a condition")
@@ -733,10 +733,10 @@ func (matcher *conditionMatcher) Match(actual interface{}) (success bool, err er
 	return HasSameState(actualCondition, matcher.Expected), nil
 }
 
-func (matcher *conditionMatcher) FailureMessage(actual interface{}) (message string) {
+func (matcher *conditionMatcher) FailureMessage(actual any) (message string) {
 	return format.Message(actual, "to have the same state of", matcher.Expected)
 }
 
-func (matcher *conditionMatcher) NegatedFailureMessage(actual interface{}) (message string) {
+func (matcher *conditionMatcher) NegatedFailureMessage(actual any) (message string) {
 	return format.Message(actual, "not to have the same state of", matcher.Expected)
 }

modules/common/helper/helper.go

@@ -157,7 +157,7 @@ func (h *Helper) calculateChanges(after client.Object) (map[string]bool, error)
 	}
 
 	// Unmarshal patch data into a local map.
-	patchDiff := map[string]interface{}{}
+	patchDiff := map[string]any{}
 	if err := json.Unmarshal(diff, &patchDiff); err != nil {
 		return nil, errors.Wrapf(err, "failed to unmarshal patch data into a map")
 	}

modules/common/helper/helper_test.go

@@ -54,13 +54,13 @@ func TestToUnstructured(t *testing.T) {
 		g := NewWithT(t)
 
 		obj := &unstructured.Unstructured{
-			Object: map[string]interface{}{
+			Object: map[string]any{
 				"apiVersion": "test.x.y.z/v1",
-				"metadata": map[string]interface{}{
+				"metadata": map[string]any{
 					"name":      "keystone",
 					"namespace": "openstack",
 				},
-				"spec": map[string]interface{}{
+				"spec": map[string]any{
 					"databaseHostname": "dbhost",
 				},
 			},

modules/common/networkattachment/networkattachment.go

@@ -157,7 +157,7 @@ func EnsureNetworksAnnotation(
 		gatewayReq := []net.IP{}
 		if nad.Spec.Config != "" {
 
-			var data interface{}
+			var data any
 			if err := json.Unmarshal([]byte(nad.Spec.Config), &data); err != nil {
 				return nil, fmt.Errorf("failed to unmarshal JSON data: %w", err)
 			}
@@ -213,7 +213,7 @@ func EnsureNetworksAnnotation(
 // if the NAD has no config, an empty string is returned.
 // The jsonPath must be in the format e.g. ".ipam"
 func GetJSONPathFromConfig(netAtt networkv1.NetworkAttachmentDefinition, path string) (string, error) {
-	var data interface{}
+	var data any
 	buf := new(bytes.Buffer)
 
 	if netAtt.Spec.Config == "" {

modules/common/object/metadata.go

@@ -53,7 +53,7 @@ func PatchOwnerRef(
 	owner client.Object,
 	object client.Object,
 	scheme *runtime.Scheme,
-) (map[string]interface{}, client.Patch, error) {
+) (map[string]any, client.Patch, error) {
 	beforeObject := object.DeepCopyObject().(client.Object)
 
 	// add owner ref to the object
@@ -70,7 +70,7 @@ func PatchOwnerRef(
 	}
 
 	// Unmarshal patch data into a local map for logging
-	patchDiff := map[string]interface{}{}
+	patchDiff := map[string]any{}
 	if err := json.Unmarshal(diff, &patchDiff); err != nil {
 		return nil, nil, err
 	}

modules/common/ocp/ocp.go

@@ -37,7 +37,7 @@ func IsFipsCluster(ctx context.Context, h *helper.Helper) (bool, error) {
 		return false, err
 	}
 
-	var installConfig map[string]interface{}
+	var installConfig map[string]any
 	installConfigYAML := configMap.Data["install-config"]
 	err = yaml.Unmarshal([]byte(installConfigYAML), &installConfig)
 	if err != nil {

modules/common/test/functional/object_test.go

@@ -45,7 +45,7 @@ var _ = Describe("object package", func() {
 			Name:      "test-cm",
 		}
 
-		cm := th.CreateConfigMap(cmName, map[string]interface{}{})
+		cm := th.CreateConfigMap(cmName, map[string]any{})
 
 		err := object.EnsureOwnerRef(th.Ctx, h, cm, cm)
 		Expect(err).ShouldNot(HaveOccurred())
@@ -59,14 +59,14 @@ var _ = Describe("object package", func() {
 			Namespace: namespace,
 			Name:      "test-owner",
 		}
-		ownerCM := th.CreateConfigMap(owner, map[string]interface{}{})
+		ownerCM := th.CreateConfigMap(owner, map[string]any{})
 
 		// create target obj we add the owner ref to
 		cmName := types.NamespacedName{
 			Namespace: namespace,
 			Name:      "test-cm",
 		}
-		cm := th.CreateConfigMap(cmName, map[string]interface{}{})
+		cm := th.CreateConfigMap(cmName, map[string]any{})
 
 		err := object.EnsureOwnerRef(th.Ctx, h, ownerCM, cm)
 		Expect(err).ShouldNot(HaveOccurred())