fix: sprintf floats & cname const

newrelic · Jan 28, 2020 · 4b77e22 · 4b77e22
1 parent 49a1ca7
commit 4b77e22
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/internal/discovery/discovery.go b/internal/discovery/discovery.go
@@ -316,7 +316,7 @@ func runConfigLookup(dockerClient *client.Client, containers *[]types.Container,
 						if findContainerTarget(discoveryConfig, container, foundTargetContainerIds) {
 
 							switch discoveryConfig["tt"].(string) {
-							case "cname", load.TypeContainer:
+							case load.TypeCname, load.TypeContainer:
 								load.Logrus.Debug(fmt.Sprintf("discovery: %v cfg lookup matched %v %v - %v", container.ID, container.Names, cd.Target, cd.FileName))
 							case load.Img, load.Image:
 								load.Logrus.Debug(fmt.Sprintf("discovery: %v cfg lookup matched %v %v - %v", container.ID, container.Image, cd.Target, cd.FileName))
@@ -612,7 +612,7 @@ func findContainerTarget(discoveryConfig map[string]interface{}, container types
 	switch discoveryConfig["tt"].(type) {
 	case string:
 		switch discoveryConfig["tt"].(string) {
-		case "cname", load.TypeContainer:
+		case load.TypeCname, load.TypeContainer:
 			for _, containerName := range container.Names {
 				checkContainerName := strings.TrimPrefix(containerName, "/") // docker adds a / in front
 				if checkContainerName != "" && formatter.KvFinder(discoveryConfig["tm"].(string), checkContainerName, discoveryConfig["t"].(string)) {

diff --git a/internal/discovery/fargate.go b/internal/discovery/fargate.go
@@ -99,7 +99,7 @@ func determineDynamicFargateConfigs(configs *[]load.Config, TaskMetadata load.Ta
 
 func checkContainerMatch(container load.Container, containerDiscovery load.ContainerDiscovery) bool {
 	switch containerDiscovery.Type {
-	case "cname", load.TypeContainer:
+	case load.TypeCname, load.TypeContainer:
 		if formatter.KvFinder(containerDiscovery.Mode, container.Name, containerDiscovery.Target) {
 			return true
 		}

diff --git a/internal/load/load.go b/internal/load/load.go
@@ -120,6 +120,7 @@ const (
 	Img                = "img"
 	Image              = "image"
 	TypeContainer      = "container"
+	TypeCname          = "cname"
 	TypeJSON           = "json"
 	TypeXML            = "xml"
 	TypeColumns        = "columns"

diff --git a/internal/processor/lookups.go b/internal/processor/lookups.go
@@ -12,6 +12,15 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
+func cleanValue(v *interface{}) string {
+	switch val := (*v).(type) {
+	case float32, float64:
+		return fmt.Sprintf("%f", val)
+	default:
+		return fmt.Sprintf("%v", val)
+	}
+}
+
 // StoreLookups if key is found (using regex), store the values in the lookupStore as the defined lookupStoreKey for later use
 func StoreLookups(storeLookups map[string]string, key *string, lookupStore *map[string]map[string]struct{}, v *interface{}) {
 	for lookupStoreKey, lookupFindKey := range storeLookups {
@@ -32,10 +41,10 @@ func StoreLookups(storeLookups map[string]string, key *string, lookupStore *map[
 				}).Debug("splitting array")
 
 				for _, dataKey := range data {
-					(*lookupStore)[lookupStoreKey][fmt.Sprintf("%v", dataKey)] = struct{}{}
+					(*lookupStore)[lookupStoreKey][cleanValue(&dataKey)] = struct{}{}
 				}
 			default:
-				(*lookupStore)[lookupStoreKey][fmt.Sprintf("%v", *v)] = struct{}{}
+				(*lookupStore)[lookupStoreKey][cleanValue(v)] = struct{}{}
 			}
 		}
 	}
@@ -48,7 +57,7 @@ func VariableLookups(variableLookups map[string]string, key *string, variableSto
 			if (*variableStore) == nil {
 				(*variableStore) = map[string]string{}
 			}
-			(*variableStore)[variableStoreKey] = fmt.Sprintf("%v", *v)
+			(*variableStore)[variableStoreKey] = cleanValue(v)
 		}
 	}
 }