fixed filters so plugin won't include hosts where filter values are undefined

Author: dgulinobw

import_inventory_to_fact.py

@@ -38,7 +38,8 @@ def main(argv, stdout, environ):
                     "groups": groups}
         with open('fact.import.json', 'w') as output_file:
             output_file.write(json.dumps(dog_fact))
-    # http POST https://$DOG:8443/api/V2/fact @fact.import.json -A bearer -a $TOKEN
+    #Then add to dog:
+    # curl -H 'Content-Type: application/json' -H "Authorization: Bearer $TF_VAR_dog_api_token_qa" -X POST https://dog-qa.relaydev.sh:8443/api/V2/fact --data @fact.import.json
 
 
 if __name__ == "__main__":

plugins/inventory/dog_inventory.py

@@ -223,18 +223,28 @@ def _populate(self, client):
         #sys.exit()
         for host in hosts:
             break_flag = False
-            for filter in self.filters:
-                key = filter.get("key")
-                expected_value = filter.get("value")
+            for filter_config in self.filters:
+                key = filter_config.get("key")
+                expected_value = filter_config.get("value")
                 try:
-                    value = self._compose(key, host)
-                    if value != expected_value:
+                    actual_value = self._compose(key, host)
+                    # Key is defined, and we have its actual_value
+                    if actual_value != expected_value:
+                        break_flag = True  # Value mismatch, so host fails this filter
+                        break
+                    # If actual_value == expected_value, this filter is matched. Continue to next filter.
+                except (jinja2.exceptions.UndefinedError, ansible.errors.AnsibleUndefinedVariable):
+                    # Key is undefined in the host data.
+                    # Check if the filter expected it to be undefined.
+                    # We assume 'None' (from YAML null) in the filter's 'value' means "should be undefined".
+                    if expected_value is None:
+                        # Filter expects key to be undefined, and it is. This filter is matched.
+                        # Continue to the next filter for this host.
+                        pass
+                    else:
+                        # Filter expects a concrete value, but key is undefined. This filter is NOT matched.
                         break_flag = True
                         break
-                except jinja2.exceptions.UndefinedError:
-                    break
-                except ansible.errors.AnsibleUndefinedVariable:
-                    break
 
             if break_flag is True:
                 continue