cfengine 0.16.4__tar.gz → 0.16.6__tar.gz

{cfengine-0.16.4 → cfengine-0.16.6}/.github/workflows/lint-policy-in-other-repos.yml

@@ -44,12 +44,15 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install uv
           make install
-      - name: Run cfengine lint
+      - name: Check other repos with cfengine format and cfengine lint
         working-directory: cfengine-cli
         run: |
-          uv run cfengine lint --strict no ../masterfiles
-          uv run cfengine lint --strict no ../modules
-          uv run cfengine lint --strict no ../documentation
+          # Linting should work with no errors on all the other repos:
+          uv run cfengine lint --strict no ../masterfiles ../documentation ../modules
+          # Formatting should work with no errors on all the other repos:
+          uv run cfengine format ../masterfiles ../documentation ../modules
+          # Linting should still work after formatting:
+          uv run cfengine lint --strict no ../masterfiles ../documentation ../modules
           # TODO: Add core when ready
           # TODO: Do all of them together, with strict, when ready;
           #       uv run cfengine lint ../core ../masterfiles ../documentation ../modules

{cfengine-0.16.4 → cfengine-0.16.6}/.github/workflows/update-syntax-description.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Install cfengine
         run: |
           cf-remote --version master download --edition community ubuntu24 amd64 hub
-          sudo dpkg -i ~/.cfengine/cf-remote/packages/cfengine-community*.deb
+          sudo dpkg -i ~/.cache/cfengine/cf-remote/packages/cfengine-community*.deb
       - name: Extract new syntax-description
         run: |
           (

{cfengine-0.16.4 → cfengine-0.16.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cfengine
-Version: 0.16.4
+Version: 0.16.6
 Summary: Human-oriented CLI for interacting with CFEngine policy language, projects, and other CFEngine tools
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007

{cfengine-0.16.4 → cfengine-0.16.6}/src/cfengine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cfengine
-Version: 0.16.4
+Version: 0.16.6
 Summary: Human-oriented CLI for interacting with CFEngine policy language, projects, and other CFEngine tools
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007

{cfengine-0.16.4 → cfengine-0.16.6}/src/cfengine.egg-info/SOURCES.txt

@@ -21,6 +21,8 @@ src/cfengine.egg-info/SOURCES.txt
 src/cfengine.egg-info/dependency_links.txt
 src/cfengine.egg-info/entry_points.txt
 src/cfengine.egg-info/requires.txt
+src/cfengine.egg-info/scm_file_list.json
+src/cfengine.egg-info/scm_version.json
 src/cfengine.egg-info/top_level.txt
 src/cfengine_cli/__init__.py
 src/cfengine_cli/__main__.py

cfengine-0.16.6/src/cfengine.egg-info/scm_file_list.json

@@ -0,0 +1,153 @@
+{
+  "files": [
+    "README.md",
+    "uv.lock",
+    "Makefile",
+    ".python-version",
+    "LICENSE",
+    "pyproject.toml",
+    "HACKING.md",
+    "CLAUDE.md",
+    ".gitignore",
+    "src/cfengine_cli/changelog.py",
+    "src/cfengine_cli/shell.py",
+    "src/cfengine_cli/__init__.py",
+    "src/cfengine_cli/version.py",
+    "src/cfengine_cli/lint_yml.py",
+    "src/cfengine_cli/profile.py",
+    "src/cfengine_cli/deptool-README.md",
+    "src/cfengine_cli/utils.py",
+    "src/cfengine_cli/format.py",
+    "src/cfengine_cli/syntax-description.json",
+    "src/cfengine_cli/docs.py",
+    "src/cfengine_cli/up.py",
+    "src/cfengine_cli/lint_csv.py",
+    "src/cfengine_cli/syntax_tree.py",
+    "src/cfengine_cli/main.py",
+    "src/cfengine_cli/deptool.py",
+    "src/cfengine_cli/lint.py",
+    "src/cfengine_cli/commands.py",
+    "src/cfengine_cli/validate.py",
+    "src/cfengine_cli/__main__.py",
+    "src/cfengine_cli/paths.py",
+    "src/cfengine_cli/dev.py",
+    "src/cfengine_cli/masterfiles/check_download_matches_git.py",
+    "src/cfengine_cli/masterfiles/generate_vcf_git_checkout.py",
+    "src/cfengine_cli/masterfiles/__init__.py",
+    "src/cfengine_cli/masterfiles/download.py",
+    "src/cfengine_cli/masterfiles/analyze.py",
+    "src/cfengine_cli/masterfiles/generate_release_information.py",
+    "src/cfengine_cli/masterfiles/generate_vcf_download.py",
+    "src/cfengine_cli/masterfiles/generate_git_tags.py",
+    "ci/01-install.sh",
+    "ci/02-safe-tests.sh",
+    "ci/03-unsafe-tests.sh",
+    "tests/README.md",
+    "tests/run-shell-tests.sh",
+    "tests/run-up-validate-tests.sh",
+    "tests/run-lint-tests.sh",
+    "tests/run-format-tests.sh",
+    "tests/lint/015_macro_multi_def_bundle.cf",
+    "tests/lint/010_mutually_exclusive_types_vars.cf",
+    "tests/lint/010_mutually_exclusive_types_vars.x.cf",
+    "tests/lint/013_num_args_body.expected.txt",
+    "tests/lint/007_namespace.x.cf",
+    "tests/lint/018_nested_calls.expected.txt",
+    "tests/lint/010_mutually_exclusive_types_vars.expected.txt",
+    "tests/lint/016_half_promises.expected.txt",
+    "tests/lint/002_deprecations.x.cf",
+    "tests/lint/009_unknown_function_inside_vars.cf",
+    "tests/lint/008_bundle_shadows_function.expected.txt",
+    "tests/lint/013_num_args_bundle.x.cf",
+    "tests/lint/017_implies_body.cf",
+    "tests/lint/017_implies_body.expected.txt",
+    "tests/lint/008_bundle_shadows_function.cf",
+    "tests/lint/003_name_lowercase.x.cf",
+    "tests/lint/009_unknown_function_inside_vars.x.cf",
+    "tests/lint/004_block_type.x.cf",
+    "tests/lint/011_invalid_attributes.expected.txt",
+    "tests/lint/005_syntax_error.cf",
+    "tests/lint/013_num_args_bundle_body.cf",
+    "tests/lint/003_name_lowercase.expected.txt",
+    "tests/lint/002_deprecations.expected.txt",
+    "tests/lint/013_num_args_bundle.expected.txt",
+    "tests/lint/012_function_call_arg_count.expected.txt",
+    "tests/lint/004_block_type.cf",
+    "tests/lint/005_syntax_error.x.cf",
+    "tests/lint/015_macro_multi_def_bundle.expected.txt",
+    "tests/lint/006_empty_file.expected.txt",
+    "tests/lint/014_variadic_func_arg_count.x.cf",
+    "tests/lint/004_block_type.expected.txt",
+    "tests/lint/016_half_promises.cf",
+    "tests/lint/018_nested_calls.x.cf",
+    "tests/lint/011_invalid_attributes.x.cf",
+    "tests/lint/018_nested_calls.cf",
+    "tests/lint/014_variadic_func_arg_count.cf",
+    "tests/lint/017_implies_body.x.cf",
+    "tests/lint/012_function_call_arg_count.x.cf",
+    "tests/lint/007_namespace.expected.txt",
+    "tests/lint/015_macro_multi_def_bundle.x.cf",
+    "tests/lint/019_bundle_name_expansion.cf",
+    "tests/lint/001_hello_world.cf",
+    "tests/lint/009_unknown_function_inside_vars.expected.txt",
+    "tests/lint/007_namespace.cf",
+    "tests/lint/014_variadic_func_arg_count.expected.txt",
+    "tests/lint/012_function_call_arg_count.cf",
+    "tests/lint/008_bundle_shadows_function.x.cf",
+    "tests/lint/013_num_args_body.x.cf",
+    "tests/lint/003_name_lowercase.cf",
+    "tests/lint/005_syntax_error.expected.txt",
+    "tests/lint/006_empty_file.x.cf",
+    "tests/lint/016_half_promises.x.cf",
+    "tests/shell/001-help.sh",
+    "tests/shell/002-version.sh",
+    "tests/shell/004-format-check.sh",
+    "tests/shell/005-lint.sh",
+    "tests/shell/003-format.sh",
+    "tests/up-validate/002_version.x.yaml",
+    "tests/up-validate/004_count.x.yaml",
+    "tests/up-validate/001_complex_config.yaml",
+    "tests/up-validate/003_box.x.yaml",
+    "tests/up-validate/mocks/vagrant",
+    "tests/up-validate/mocks/cloud_config.json",
+    "tests/format/003_wrapping.input.cf",
+    "tests/format/011_macros.expected.cf",
+    "tests/format/009_single_line.input.cf",
+    "tests/format/009_single_line.expected.cf",
+    "tests/format/010_stakeholder.input.cf",
+    "tests/format/007_class_guarded_empty_lines.expected.cf",
+    "tests/format/004_comments.expected.cf",
+    "tests/format/001_hello_world.input.cf",
+    "tests/format/011_promises.expected.cf",
+    "tests/format/006_remove_empty_comments.input.cf",
+    "tests/format/005_bundle_comments.expected.cf",
+    "tests/format/002_basics.expected.cf",
+    "tests/format/005_bundle_comments.input.cf",
+    "tests/format/006_remove_empty_comments.expected.cf",
+    "tests/format/007_class_guarded_empty_lines.input.cf",
+    "tests/format/003_wrapping.expected.cf",
+    "tests/format/010_stakeholder.expected.cf",
+    "tests/format/004_comments.input.cf",
+    "tests/format/001_hello_world.expected.cf",
+    "tests/format/011_promises.input.cf",
+    "tests/format/008_long_string.expected.cf",
+    "tests/format/008_long_string.input.cf",
+    "tests/format/002_basics.input.cf",
+    "tests/format/011_macros.input.cf",
+    "tests/unit/__init__.py",
+    "tests/unit/test_version.py",
+    "tests/unit/test_deps.py",
+    "tests/unit/test_utils.py",
+    "tests/unit/test_format.py",
+    "tests/unit/test_changelog.py",
+    "tests/unit/test_lint_csv.py",
+    "tests/unit/test_lint_yml.py",
+    "tests/unit/test_paths.py",
+    ".github/dependabot.yml",
+    ".github/workflows/lint-policy-in-other-repos.yml",
+    ".github/workflows/pypi-publish.yml",
+    ".github/workflows/make-check.yml",
+    ".github/workflows/stale.yml",
+    ".github/workflows/update-syntax-description.yml"
+  ]
+}

cfengine-0.16.6/src/cfengine.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.16.6",
+  "distance": 0,
+  "node": "g3061a58921e7886d42aca895f62663654fb08a08",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-06-24"
+}

{cfengine-0.16.4 → cfengine-0.16.6}/src/cfengine_cli/format.py

@@ -236,6 +236,11 @@ def split_generic_list(
     """Split list elements into one-per-line strings, each pre-indented."""
     has_macros = _contains_macro(middle)
     elements: list[str] = []
+    # Indices of the lines that end a top-level value element. For a nested
+    # element, like a function call inside an slist, this is only the final line,
+    # outside the function call, so we do not add trailing commas into function
+    # call argument lists.
+    value_end_indices: list[int] = []
     for element in middle:
         if elements and element.type == ",":
             elements[-1] = elements[-1] + ","
@@ -243,6 +248,9 @@ def split_generic_list(
         if element.type == "macro":
             elements.append(text(element))
             continue
+        if element.type == "comment":
+            elements.append(" " * indent + text(element))
+            continue
         line = " " * indent + stringify_single_line_node(element)
         # Strict < reserves 1 char for the comma appended after this check
         if len(line) < line_length:
@@ -251,14 +259,18 @@ def split_generic_list(
             lines = split_generic_value(element, indent, line_length)
             elements.append(" " * indent + lines[0])
             elements.extend(lines[1:])
+        value_end_indices.append(len(elements) - 1)
 
-    # Adjust trailing commas: with macros, fix every non-macro element
-    # (one per branch); without, fix only the last non-comment element.
+    # Set trailing commas
     if has_macros:
-        for i, e in enumerate(elements):
-            if not e.lstrip().startswith(("@", "#")):
-                elements[i] = _set_trailing_comma(e, trailing_comma)
+        # With macros: Use the indices we counted earlier to ensure there
+        # are trailing commas at the right places (before macro, inside macro,
+        # after macros), but NOT inside the nested function calls which may
+        # be multi line
+        for i in value_end_indices:
+            elements[i] = _set_trailing_comma(elements[i], trailing_comma)
     else:
+        # No macros: Just ensure the last non-comment element has a trailing comma
         for i in reversed(range(len(elements))):
             if not elements[i].lstrip().startswith("#"):
                 elements[i] = _set_trailing_comma(elements[i], trailing_comma)
@@ -765,14 +777,17 @@ def _needs_blank_line_before(child: Node, indent: int, line_length: int) -> bool
             return True
         if parent and parent.type in {"bundle_section", "class_guarded_promises"}:
             return prev.type in {"promise", "half_promise"} | CLASS_GUARD_TYPES
-        if parent and parent.type in {"body_block_body", "promise_block_body"}:
-            next_sib = _skip_comments(child.next_named_sibling, "next")
-            if next_sib is None:
-                return False
-            # Leading comment for a class-guarded section preceded by
-            # content above it.
-            if next_sib.type in CLASS_GUARD_TYPES:
-                return prev.type in CLASS_GUARD_TYPES | {"attribute"}
+        if parent and parent.type in {
+            "body_block_body",
+            "promise_block_body",
+            "class_guarded_body_attributes",
+        }:
+            # A comment is separated by a blank line from a preceding
+            # attribute or a preceding class-guarded block, so it reads as
+            # a leading comment for what follows (or a trailing comment for
+            # the block). This mirrors how a comment after a promise is
+            # separated in bundles.
+            return prev.type == "attribute" or prev.type in CLASS_GUARD_TYPES
         return False
 
     return False

{cfengine-0.16.4 → cfengine-0.16.6}/tests/format/004_comments.expected.cf

@@ -83,11 +83,14 @@ body package_method apt
     package_list_command => "/usr/bin/dpkg -l";
     package_list_name_regex => "ii\s+([^\s]+).*";
     package_list_version_regex => "ii\s+[^\s]+\s+([^\s]+).*";
+
     # package_list_arch_regex => "none";
     package_installed_regex => ".*";
+
     # all reported are installed:
     # package_name_convention => "$(name)_$(version)_$(arch)";
     package_name_convention => "$(name)";
+
     # Use these only if not using a separate version/arch string:
     # package_version_regex => "";
     # package_name_regex => "";
@@ -95,6 +98,7 @@ body package_method apt
     package_add_command => "/usr/bin/apt-get --yes install";
     package_delete_command => "/usr/bin/apt-get --yes remove";
     package_update_command => "/usr/bin/apt-get --yes dist-upgrade";
+
     # package_verify_command => "/bin/rpm -V";
 }
 
@@ -107,6 +111,7 @@ body package_method ca
 body package_method ac
 {
   package_changes => "bulk";
+
   # bar
 }
 
@@ -114,6 +119,7 @@ body package_method cac
 {
   # foo
   package_changes => "bulk";
+
   # bar
 }
 
@@ -129,6 +135,7 @@ body package_method cgcac
   linux::
     # bar
     package_changes => "bulk";
+
     # baz
 }
 

{cfengine-0.16.4 → cfengine-0.16.6}/tests/format/011_macros.expected.cf

@@ -200,3 +200,94 @@ bundle agent test(a)
     "$(a)";
 }
 @endif
+bundle agent test_macro_call_param
+{
+  classes:
+    "a" -> { "CFE-3927" }
+      and => {
+        # The variable must be defined
+        isvariable("default:def.control_agent_environment_vars"),
+        # The length of the variable must be greater than 0 (can't be an empty list)
+        isgreaterthan(length("default:def.control_agent_environment_vars"), 0),
+        # Each element of the list must be of the form KEY=VALUE
+        every(".+=.+", "default:def.control_agent_environment_vars"),
+        # In 3.18 and greater we can validate the type of variable in use
+@if minimum_version(3.18.0)
+        regcmp(
+          "(policy slist|data array)",
+          type("default:def.control_agent_environment_vars", "true")
+        ),
+@endif
+      };
+
+    "b" -> { "CFE-3927" }
+      and => {
+        # The variable must be defined
+        isvariable("default:def.control_agent_environment_vars"),
+        isgreaterthan(length("default:def.control_agent_environment_vars"), 0),
+@if minimum_version(3.18.0)
+        regcmp(
+          "(policy slist|data array)",
+          type("default:def.control_agent_environment_vars", "true")
+        ),
+@endif
+        every(".+=.+", "default:def.control_agent_environment_vars"),
+      };
+
+    "c" -> { "CFE-3927" }
+      and => {
+        # The variable must be defined
+        isvariable("default:def.control_agent_environment_vars"),
+        isgreaterthan(length("default:def.control_agent_environment_vars"), 0),
+@if minimum_version(3.18.0)
+        regcmp(
+          "(policy slist|data array)",
+          type("default:def.control_agent_environment_vars", "true")
+        ),
+        every(".+=.+", "default:def.control_agent_environment_vars"),
+@endif
+      };
+
+    "d" -> { "CFE-3927" }
+      and => {
+@if minimum_version(3.18.0)
+        every(".+=.+", "default:def.control_agent_environment_vars"),
+@endif
+        isvariable("default:def.control_agent_environment_vars"),
+        isgreaterthan(length("default:def.control_agent_environment_vars"), 0),
+        regcmp(
+          "(policy slist|data array)",
+          type("default:def.control_agent_environment_vars", "true")
+        ),
+      };
+
+    "e" -> { "CFE-3927" }
+      and => {
+@if minimum_version(3.18.0)
+        "a",
+@endif
+        "b",
+        "c",
+        "d",
+        isgreaterthan(length("default:def.control_agent_environment_vars"), 0),
+        regcmp(
+          "(policy slist|data array)",
+          type("default:def.control_agent_environment_vars", "true")
+        ),
+      };
+
+    "f" -> { "CFE-3927" }
+      and => {
+        isgreaterthan(length("default:def.control_agent_environment_vars"), 0),
+        regcmp(
+          "(policy slist|data array)",
+          type("default:def.control_agent_environment_vars", "true")
+        ),
+        "a",
+        "b",
+        "c",
+@if minimum_version(3.18.0)
+        "d",
+@endif
+      };
+}

{cfengine-0.16.4 → cfengine-0.16.6}/tests/format/011_macros.input.cf

@@ -193,3 +193,59 @@ reports:
 "$(a)";
 }
 @endif
+
+bundle agent test_macro_call_param
+{
+classes:
+"a" -> { "CFE-3927" }
+and => {
+# The variable must be defined
+isvariable("default:def.control_agent_environment_vars"),
+# The length of the variable must be greater than 0 (can't be an empty list)
+isgreaterthan(length("default:def.control_agent_environment_vars"), 0),
+# Each element of the list must be of the form KEY=VALUE
+every(".+=.+", "default:def.control_agent_environment_vars"),
+# In 3.18 and greater we can validate the type of variable in use
+@if minimum_version(3.18.0)
+regcmp("(policy slist|data array)",type("default:def.control_agent_environment_vars", "true")),
+@endif
+};
+"b" -> { "CFE-3927" }
+and => {
+# The variable must be defined
+isvariable("default:def.control_agent_environment_vars"),isgreaterthan(length("default:def.control_agent_environment_vars"), 0),
+@if minimum_version(3.18.0)
+regcmp( "(policy slist|data array)", type("default:def.control_agent_environment_vars", "true") ),
+@endif
+every(".+=.+", "default:def.control_agent_environment_vars"),
+};
+"c" -> { "CFE-3927" }
+and => {
+# The variable must be defined
+isvariable("default:def.control_agent_environment_vars"), isgreaterthan(length("default:def.control_agent_environment_vars"), 0),
+@if minimum_version(3.18.0)
+regcmp("(policy slist|data array)",type("default:def.control_agent_environment_vars", "true")),every(".+=.+", "default:def.control_agent_environment_vars"),
+@endif
+};
+"d" -> { "CFE-3927" }
+and => {
+@if minimum_version(3.18.0)
+every(".+=.+", "default:def.control_agent_environment_vars"),
+@endif
+isvariable("default:def.control_agent_environment_vars"),isgreaterthan(length("default:def.control_agent_environment_vars"), 0),regcmp("(policy slist|data array)",type("default:def.control_agent_environment_vars", "true")),
+};
+"e" -> { "CFE-3927" }
+and => {
+@if minimum_version(3.18.0)
+"a",
+@endif
+"b","c","d",isgreaterthan(length("default:def.control_agent_environment_vars"),0),regcmp("(policy slist|data array)",type("default:def.control_agent_environment_vars", "true")),
+};
+"f" -> { "CFE-3927" }
+and => {
+isgreaterthan(length("default:def.control_agent_environment_vars"), 0),regcmp("(policy slist|data array)",type("default:def.control_agent_environment_vars", "true")),"a","b","c",
+@if minimum_version(3.18.0)
+"d",
+@endif
+};
+}

{cfengine-0.16.4 → cfengine-0.16.6}/tests/format/011_promises.expected.cf

@@ -120,6 +120,7 @@ body common control
   any::
     ignore_missing_bundles => "$(def.control_common_ignore_missing_bundles)";
     ignore_missing_inputs => "$(def.control_common_ignore_missing_inputs)";
+
     # The number of minutes after which last-seen entries are purged from cf_lastseen.lmdb
     lastseenexpireafter => "$(def.control_common_lastseenexpireafter)";