Merge pull request #109 from olehermanse/next

cfengine lint: Added check for wrong promise block type

Author: olehermanse

src/cfengine_cli/lint.py

@@ -609,6 +609,11 @@ def _lint_block_type(node: Node, state: State, location: str, syntax_data: Synta
             f"Error: Bundle type must be one of ({', '.join(syntax_data.BUILTIN_BUNDLE_TYPES)}), not '{_text(node)}' {location}",
             node,
         )
+    if node.type == "promise_block_type" and _text(node) != "agent":
+        raise ValidationError(
+            f"Error: Promise type must be 'agent', not '{_text(node)}' {location}",
+            node,
+        )
 
 
 def _lint_block_name(node: Node, state: State, location: str, syntax_data: SyntaxData):

tests/lint/004_block_type.cf

@@ -0,0 +1,11 @@
+bundle common my_bundle
+{
+  vars:
+    "x" string => "value";
+}
+
+promise agent my_promise_type
+{
+  path => "/bin/true";
+  interpreter => "/bin/bash";
+}

tests/lint/004_block_type.expected.txt

@@ -0,0 +1,11 @@
+
+bundle notavalidtype my_bundle
+       ^-----------^
+Error: Bundle type must be one of (agent, common, edit_line, edit_xml, monitor, server), not 'notavalidtype' at tests/lint/004_block_type.x.cf:1:8
+
+
+promise server my_promise_type
+        ^----^
+Error: Promise type must be 'agent', not 'server' at tests/lint/004_block_type.x.cf:7:9
+FAIL: tests/lint/004_block_type.x.cf (2 errors)
+Failure, 2 errors in total.

tests/lint/004_block_type.x.cf

@@ -0,0 +1,11 @@
+bundle notavalidtype my_bundle
+{
+  reports:
+    "Hello";
+}
+
+promise server my_promise_type
+{
+  path => "/bin/true";
+  interpreter => "/bin/bash";
+}