FIX: missing attribute error + tests

Author: SimonThalvorsen

src/cfengine_cli/lint.py

@@ -551,15 +551,6 @@ def _lint_node(
         )
         return 1
     if state.promise_type == "vars" and node.type == "promise":
-        attribute_nodes = [x for x in node.children if x.type == "attribute"]
-        if not attribute_nodes:
-            _highlight_range(node, lines)
-            print(
-                f"Error: Missing attribute value for promiser "
-                f"{_text(node)[:-1]} inside vars-promise type {location}"
-            )
-            return 1
-
         mutually_excl_vars_attrs = {
             "data",
             "ilist",
@@ -570,13 +561,22 @@ def _lint_node(
             "string",
         }
 
+        attribute_nodes = [x for x in node.children if x.type == "attribute"]
         promise_type_attrs = {
             _text(child): attr_node
             for attr_node in attribute_nodes
             for child in attr_node.children
             if child.type == "attribute_name"
             and _text(child) in mutually_excl_vars_attrs
         }
+        if not promise_type_attrs:
+            _highlight_range(node, lines)
+            print(
+                f"Error: Missing value type attribute for promiser "
+                f"{_text(node.children[0])} inside vars-promise type {location}"
+            )
+            return 1
+
 
         if len(promise_type_attrs) > 1:
             for n in promise_type_attrs:

tests/lint/011_mutually_exclusive_types_vars.cf

@@ -5,14 +5,6 @@ bundle agent foo
       policy => "free",
       real => "11.11";
 
-    "noerr"
-      slist => {};
-      int => "string";
-
-    "noerr"
-      slist => {}
-      int => "string";
-
     "comment"
       slist => {},
       comment => "string";

tests/lint/011_mutually_exclusive_types_vars.expected.txt

@@ -15,6 +15,11 @@ Error: Mutually exclusive attribute values ('slist', 'int', 'real') for a single
 
     "missing-error";
     ^--------------^
-Error: Missing attribute value for promiser "missing-error" inside vars-promise type at tests/lint/011_mutually_exclusive_types_vars.x.cf:18:5
-FAIL: tests/lint/011_mutually_exclusive_types_vars.x.cf (2 errors)
-Failure, 2 errors in total.
+Error: Missing value type attribute for promiser "missing-error" inside vars-promise type at tests/lint/011_mutually_exclusive_types_vars.x.cf:10:5
+
+
+    "missing-type-error";
+    ^-------------------^
+Error: Missing value type attribute for promiser "missing-type-error" inside vars-promise type at tests/lint/011_mutually_exclusive_types_vars.x.cf:12:5
+FAIL: tests/lint/011_mutually_exclusive_types_vars.x.cf (3 errors)
+Failure, 3 errors in total.

tests/lint/011_mutually_exclusive_types_vars.x.cf

@@ -7,13 +7,8 @@ bundle agent foo
       policy => "free",
       real => "0.5";
 
-    "noerr"
-      slist => {};
-      int => "string";
-
-    "noerr"
-      slist => {}
-      int => "string";
-
     "missing-error";
+
+    "missing-type-error";
+      comment => "Missing type";
 }