Convert floats to ints after unmarshalling

When unmarshalling values from json input, all numbers are
set to floats. This has unexpected side effects when passing them to Ansible
where Ansible is expecting integers. This change ensures that all values
are decoded as integers instead of floats.

This chage uses the UseNumber() method to decode all numbers to ints:
https://pkg.go.dev/encoding/json#Decoder.UseNumber

Jira: https://issues.redhat.com/browse/OSPRH-15097
Signed-off-by: Brendan Shephard <bshephar@redhat.com>

Author: Brendan Shephard

pkg/dataplane/inventory.go

@@ -39,51 +39,76 @@ import (
 // getAnsibleVarsFrom gets ansible vars from ConfigMap/Secret
 func getAnsibleVarsFrom(ctx context.Context, helper *helper.Helper, namespace string, ansible *dataplanev1.AnsibleOpts) (map[string]interface{}, error) {
 	result := make(map[string]interface{})
-	var value interface{}
 
 	for _, dataSource := range ansible.AnsibleVarsFrom {
 		configMap, secret, err := util.GetDataSourceCmSecret(ctx, helper, namespace, dataSource)
 		if err != nil {
 			return result, err
 		}
 
-		// AnsibleVars will override AnsibleVarsFrom variables.
-		// Process AnsibleVarsFrom first then allow AnsibleVars to replace existing values.
 		if configMap != nil {
-			for k, v := range configMap.Data {
-				if len(dataSource.Prefix) > 0 {
-					k = dataSource.Prefix + k
-				}
-
-				// Attempt to unmarshal the value into json. If that fails,
-				// assume it's a plain string.
-				err := json.Unmarshal([]byte(v), &value)
-				if err != nil {
-					value = v
-				}
-				result[k] = value
+			err := processConfigMapData(configMap.Data, dataSource.Prefix, result)
+			if err != nil {
+				return result, err
 			}
 		}
 
 		if secret != nil {
-			for k, v := range secret.Data {
-				if len(dataSource.Prefix) > 0 {
-					k = dataSource.Prefix + k
-				}
-				// Attempt to unmarshal the value into json. If that fails,
-				// assume it's a plain string.
-				err := json.Unmarshal(v, &value)
-				if err != nil {
-					value = string(v)
-				}
-				result[k] = value
+			err := processSecretData(secret.Data, dataSource.Prefix, result)
+			if err != nil {
+				return result, err
 			}
 		}
-
 	}
 	return result, nil
 }
 
+// processConfigMapData processes the key-value pairs from ConfigMap and adds them to the result map.
+func processConfigMapData(data map[string]string, prefix string, result map[string]any) error {
+
+	var value any
+
+	for k, v := range data {
+		if len(prefix) > 0 {
+			k = prefix + k
+		}
+
+		decoder := json.NewDecoder(strings.NewReader(v))
+		decoder.UseNumber()
+
+		err := decoder.Decode(&value)
+		if err != nil {
+			value = v
+		}
+		result[k] = value
+	}
+
+	return nil
+}
+
+// processSecretData processes the key-value pairs from Secret and adds them to the result map.
+func processSecretData(data map[string][]byte, prefix string, result map[string]any) error {
+
+	var value any
+
+	for k, v := range data {
+		if len(prefix) > 0 {
+			k = prefix + k
+		}
+
+		decoder := json.NewDecoder(strings.NewReader(string(v[:])))
+		decoder.UseNumber()
+
+		err := decoder.Decode(&value)
+		if err != nil {
+			value = string(v)
+		}
+		result[k] = value
+	}
+
+	return nil
+}
+
 // GenerateNodeSetInventory yields a parsed Inventory for role
 func GenerateNodeSetInventory(ctx context.Context, helper *helper.Helper,
 	instance *dataplanev1.OpenStackDataPlaneNodeSet,