test

Author: asenci

functions/clean_empty.pp

@@ -4,15 +4,13 @@ function datadog_agent::clean_empty (
 ) {
   if $var.is_a(Array) {
     $_var = $var.map |$item| { datadog_agent::clean_empty($item) }
-    $result = $_var.filter |$item| { !$item.empty }
+    $_var.filter |$item| { !$item.empty }
 
   } elsif $var.is_a(Hash) {
     $_var = Hash($var.map |$key, $value| { Tuple([$key, datadog_agent::clean_empty($value)]) })
-    $result = $_var.filter |$key, $value| { !$value.empty }
+    $_var.filter |$key, $value| { !$value.empty }
 
-  } else {
-    $result = $var
+  } elsif !$var.empty {
+    $var
   }
-
-  $result
 }

manifests/integrations/http_check.pp

@@ -241,34 +241,29 @@
     $_instances = $instances
   }
 
-  $instances_array = $_instances.map |$instance| {
+  $instances_array = datadog_agent::clean_empty($_instances).map |$instance| {
     Hash($instance.map |$key, $value| {
       case $key {
         'sitename': {
           Tuple(['name', $value])
         }
 
         'data', 'headers': {
-          $_value = datadog_agent::clean_empty($value)
-          if !$_value.is_a(Array) {
-            Tuple([$key, $_value])
+          if !$value.is_a(Array) {
+            Tuple([$key, $value])
           }
 
-          $value_hash = Hash($_value.map |$item| {
-            $_item = $item.split(':')
-            $i_key = $_item[0].rstrip
-            $i_value = $_item[1, - 1].join(':').lstrip
+          $value_hash = Hash($value.map |$item| {
+            $sub_item_array = $item.split(':')
+            $sub_item_key = $sub_item_array[0].rstrip
+            $sub_item_value = $sub_item_array[1, - 1].join(':').lstrip
 
-            Tuple([$i_key, $i_value])
+            Tuple([$sub_item_key, $sub_item_value])
           })
 
           Tuple([$key, datadog_agent::clean_empty($value_hash)])
         }
 
-        'tags': {
-          Tuple([$key, datadog_agent::clean_empty($value)])
-        }
-
         default: {
           Tuple([$key, $value])
         }