fix filter in list functions

Author: rberlind

governance/third-generation/common-functions/tfconfig-functions/docs/filter_attribute_in_list.md

@@ -25,7 +25,7 @@ This function returns a map with two maps, `items` and `messages`. The `items` m
 This function prints the violation messages if the parameter, `prtmsg`, was set to `true`. Otherwise, it does not print anything.
 
 ## Examples
-Here are some examples of calling this function, assuming that the tfconfig-functions.sentinel file that contains it has been imported with the alias `plan`:
+Here are some examples of calling this function, assuming that the tfconfig-functions.sentinel file that contains it has been imported with the alias `config`:
 ```
 violatingProviders = config.filter_attribute_in_list(allProviders,
                      "name", prohibited_list, false)

governance/third-generation/common-functions/tfconfig-functions/docs/filter_attribute_not_in_list.md

@@ -25,7 +25,7 @@ This function returns a map with two maps, `items` and `messages`. The `items` m
 This function prints the violation messages if the parameter, `prtmsg`, was set to `true`. Otherwise, it does not print anything.
 
 ## Examples
-Here are some examples of calling this function, assuming that the tfconfig-functions.sentinel file that contains it has been imported with the alias `plan`:
+Here are some examples of calling this function, assuming that the tfconfig-functions.sentinel file that contains it has been imported with the alias `config`:
 ```
 violatingProviders = config.filter_attribute_not_in_list(allProviders,
                      "name", allowed_list, false)

governance/third-generation/common-functions/tfconfig-functions/tfconfig-functions.sentinel

@@ -330,25 +330,47 @@ filter_attribute_not_in_list = func(items, attr, allowed, prtmsg) {
   # Iterate over items
   for items as index, item {
     val = evaluate_attribute(item, attr) else null
-    #val = item[attr] else null
+    print("val:", val)
     # Check if the value is null
     if val is null {
       val = "null"
     }
-    # Check if the value is in the forbidden list
-    if val not in allowed {
-      # Add the item and a warning message to the violators list
-      message = to_string(index) + " has " + to_string(attr) + " with value " +
-                to_string(val) + " that is not in the allowed list: " +
-                to_string(allowed)
-      violators[index] = item
-      messages[index] = message
-      if prtmsg {
-        print(message)
-      } // end if prtmsg
-    } // end if forbidden
+    # Process lists and maps
+    if types.type_of(val) in ["list", "map"] {
+      message = ""
+      # Check each item of list or map
+      for val as i, v {
+        if v not in allowed {
+          # Add the item and a warning message to the violators list
+          message = to_string(index) + " has " + to_string(attr) + " with value " +
+                    to_string(v) + " that is not in the allowed list: " +
+                    to_string(allowed)
+        }
+        if message is not "" {
+          # Add the item and warning message to the violators list
+          violators[index] = item
+      		messages[index] = message
+          if prtmsg {
+            print(message)
+          }
+        } // end message not ""
+      } // end for
+    } else {
+      # Process single item
+      if val not in allowed {
+        # Add the item and a warning message to the violators list
+        message = to_string(index) + " has " + to_string(attr) +
+                  " with value " + to_string(val) +
+                  " that is not in the allowed list: " +
+                  to_string(allowed)
+        violators[index] = item
+        messages[index] = message
+        if prtmsg {
+          print(message)
+        }
+      } // end if single item not matches
+    } // end single item
   } // end for items
-
   return {"items":violators,"messages":messages}
 }
 
@@ -365,23 +387,46 @@ filter_attribute_in_list = func(items, attr, forbidden, prtmsg) {
   # Iterate over items
   for items as index, item {
     val = evaluate_attribute(item, attr) else null
-    #val = item[attr] else null
+    print("val:", val)
     # Check if the value is null
     if val is null {
       val = "null"
     }
-    # Check if the value is in the forbidden list
-    if val in forbidden {
-      # Add the item and a warning message to the violators list
-      message = to_string(index) + " has " + to_string(attr) + " with value " +
-                to_string(val) + " that is in the forbidden list: " +
-                to_string(forbidden)
-      violators[index] = item
-      messages[index] = message
-      if prtmsg {
-        print(message)
-      } // end if prtmsg
-    } // end if forbidden
+    # Process lists and maps
+    if types.type_of(val) in ["list", "map"] {
+      message = ""
+      # Check each item of list or map
+      for val as i, v {
+        if v in forbidden {
+          # Add the item and a warning message to the violators list
+          message = to_string(index) + " has " + to_string(attr) + " with value " +
+                    to_string(v) + " that is in the forbidden list: " +
+                    to_string(forbidden)
+        }
+        if message is not "" {
+          # Add the item and warning message to the violators list
+          violators[index] = item
+      		messages[index] = message
+          if prtmsg {
+            print(message)
+          }
+        } // end message not ""
+      } // end for
+    } else {
+      # Process single item
+      if val in forbidden {
+        # Add the item and a warning message to the violators list
+        message = to_string(index) + " has " + to_string(attr) +
+                  " with value " + to_string(val) +
+                  " that is in the forbidden list: " +
+                  to_string(forbidden)
+        violators[index] = item
+        messages[index] = message
+        if prtmsg {
+          print(message)
+        }
+      } // end if single item not matches
+    } // end single item
   } // end for items
 
   return {"items":violators,"messages":messages}