exporting more functions

asconfig/as_setconfig.go

@@ -398,7 +398,7 @@ func rearrangeConfigMap(log logr.Logger, configMap DynamicConfigMap) []string {
 					// If namespace is removed, directly add it to the final list
 					finalList = append(finalList, k)
 				} else {
-					// If namespace is added, add it after all DCs and their direct fields
+					// If namespace is added, add it after all DCs and their direct configs
 					if lastDCConfig == nil {
 						if lastDC != nil {
 							rearrangedConfigMap.InsertAfter(k, lastDC)
@@ -419,23 +419,19 @@ func rearrangeConfigMap(log logr.Logger, configMap DynamicConfigMap) []string {
 			// Handle DC direct fields
 			if tokens[len(tokens)-3] == info.ConfigDCContext {
 				var nap *list.Element
-				// Check if the key is related to 'node-address-ports'
-				isNodeAddressPortsKey := strings.HasSuffix(k, sep+keyNodeAddressPorts)
-
-				if isNodeAddressPortsKey {
+				// Check if the key is 'node-address-ports'
+				if strings.HasSuffix(k, sep+keyNodeAddressPorts) {
 					if _, ok := v[Remove]; ok {
 						dc := rearrangedConfigMap.PushFront(k)
 						if lastDC == nil {
 							lastDC = dc
 						}
 						continue
-					} else {
-						if lastDCConfig != nil {
-							// Add 'node-address-ports' after all DC direct fields
-							// There are certain fields that must be set before 'node-address-ports', for example, 'tls-name'.
-							lastDCConfig = rearrangedConfigMap.InsertAfter(k, lastDCConfig)
-							continue
-						}
+					} else if lastDCConfig != nil {
+						// Add 'node-address-ports' after all DC direct fields
+						// There are certain fields that must be set before 'node-address-ports', for example, 'tls-name'.
+						lastDCConfig = rearrangedConfigMap.InsertAfter(k, lastDCConfig)
+						continue
 					}
 				}
 

asconfig/schema.go

@@ -3,7 +3,6 @@ package asconfig
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/aerospike/aerospike-management-lib/info"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -13,6 +12,8 @@ import (
 
 	sets "github.com/deckarep/golang-set/v2"
 	"github.com/go-logr/logr"
+
+	"github.com/aerospike/aerospike-management-lib/info"
 )
 
 // map of version to schema
@@ -222,14 +223,14 @@ func IsDynamicConfig(log logr.Logger, dynamic sets.Set[string], conf string,
 		}
 	}
 
-	return dynamic.Contains(getFlatKey(tokens))
+	return dynamic.Contains(GetFlatKey(tokens))
 }
 
 // getDefaultValue returns the default value of a particular config
 func getDefaultValue(defaultMap map[string]interface{}, conf string) interface{} {
 	tokens := strings.Split(conf, ".")
 
-	return defaultMap[getFlatKey(tokens)]
+	return defaultMap[GetFlatKey(tokens)]
 }
 
 // GetDefault return the map of default values.

asconfig/utils.go

@@ -1070,7 +1070,7 @@ func getContextAndName(log logr.Logger, key, _ string) (context, name string) {
 	return strings.Trim(ctx, "/"), keys[len(keys)-1]
 }
 
-func getFlatKey(tokens []string) string {
+func GetFlatKey(tokens []string) string {
 	var key string
 
 	for _, token := range tokens {