Backported cfengine format and lint changes (3.27)

.github/workflows/cfengine_cli.yml

@@ -0,0 +1,23 @@
+name: Lint policy and check formatting with CFEngine CLI
+on:
+  workflow_call:
+permissions:
+  contents: read
+jobs:
+  lint:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.14"
+      - name: Checkout masterfiles
+        uses: actions/checkout@v7
+      - name: Install CFEngine CLI
+        run: pipx install cfengine
+      - name: Run cfengine lint
+        run: |
+          cfengine lint --strict no ./
+      - name: Run cfengine format --check
+        run: |
+          cfengine format --check

.github/workflows/ci.yml

@@ -7,7 +7,10 @@ on:
     branches: [ master, 3.27.x, 3.24.x ]
 
 jobs:
+  cfengine_cli:
+    uses: ./.github/workflows/cfengine_cli.yml
   unit_tests:
+    needs: cfengine_cli
     uses: ./.github/workflows/unit_tests.yml
   shellcheck_tests:
     uses: ./.github/workflows/shellcheck.yml

.github/workflows/stale.yml

@@ -4,23 +4,21 @@ name: Label and close stale pull requests
 
 on:
   schedule:
-  - cron: '31 19 * * *'
+    - cron: "31 19 * * *"
   workflow_dispatch:
 
 jobs:
   stale:
-
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
 
     steps:
-    - uses: actions/stale@v5
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-pr-message: 'Marking this PR as stale due to inactivity; it will be closed in 7 days.'
-        stale-pr-label: 'stale'
-        days-before-stale: 30
-        days-before-close: 7
-        close-pr-message: "Closing PR due to inactivity. Feel free to open a new PR if necessary."
-
+      - uses: actions/stale@v5
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          stale-pr-message: "Marking this PR as stale due to inactivity; it will be closed in 7 days."
+          stale-pr-label: "stale"
+          days-before-stale: 30
+          days-before-close: 7
+          close-pr-message: "Closing PR due to inactivity. Feel free to open a new PR if necessary."

contrib/cf-doc/example_cf-doc.cf

@@ -1,17 +1,19 @@
 #!/var/cfengine/bin/cf-agent -f-
 bundle agent example_cf_doc
 {
-    meta:
-      "inventory" string => "Example: This bundle does Inventory";
-      "config"    string => "Example: This bundle configures /tmp/example.txt";
+  meta:
+    "inventory" string => "Example: This bundle does Inventory";
+    "config" string => "Example: This bundle configures /tmp/example.txt";
 
-    vars:
-      "h"
-        string => "$(sys.fqhost)",
-        meta => { "docinv=Fully Qualified Hostname according to CFEngine" };
+  vars:
+    "h"
+      string => "$(sys.fqhost)",
+      meta => { "docinv=Fully Qualified Hostname according to CFEngine" };
 
-    files:
-      "/tmp/example.txt"
-       create => 'true',
-       meta => { "docconfig=Make sure the important file /tmp/example.txt exists" };
+  files:
+    "/tmp/example.txt"
+      create => 'true',
+      meta => {
+        "docconfig=Make sure the important file /tmp/example.txt exists"
+      };
 }

contrib/cf-profile/tests/lib/namespace/ns1.cf

@@ -1,14 +1,17 @@
-body file control {
-	namespace => "ns1";
-	inputs => { "$(ns1:d.dir)/ns2.cf" };
+body file control
+{
+  namespace => "ns1";
+  inputs => { "$(ns1:d.dir)/ns2.cf" };
 }
 
-bundle common d {
-	vars:
-		"dir" string => "$(this.promise_dirname)";
+bundle common d
+{
+  vars:
+    "dir" string => "$(this.promise_dirname)";
 }
 
-bundle agent ns1 {
-	methods:
-		"c" usebundle => ns2:ns2;
+bundle agent ns1
+{
+  methods:
+    "c" usebundle => ns2:ns2;
 }

contrib/cf-profile/tests/lib/namespace/ns2.cf

@@ -1,7 +1,10 @@
-body file control {
-	namespace => "ns2";
+body file control
+{
+  namespace => "ns2";
 }
-bundle agent ns2 {
-	commands:
-		"/bin/sleep 2";
+
+bundle agent ns2
+{
+  commands:
+    "/bin/sleep 2";
 }

contrib/cf-profile/tests/namespace.cf

@@ -1,20 +1,24 @@
-body common control {
-	bundlesequence => { "main" };
-	inputs => { "$(d.dir)/lib/namespace/ns1.cf" };
+body common control
+{
+  bundlesequence => { "main" };
+  inputs => { "$(d.dir)/lib/namespace/ns1.cf" };
 }
 
-bundle common d {
-	vars:
-		"dir" string => "$(this.promise_dirname)";
+bundle common d
+{
+  vars:
+    "dir" string => "$(this.promise_dirname)";
 }
 
-bundle agent main {
-	methods:
-		"a" usebundle => ns1:ns1;
-		"b" usebundle => ns1;
+bundle agent main
+{
+  methods:
+    "a" usebundle => ns1:ns1;
+    "b" usebundle => ns1;
 }
 
-bundle agent ns1 {
-	commands:
-		"/bin/sleep 3";
+bundle agent ns1
+{
+  commands:
+    "/bin/sleep 3";
 }

contrib/cf-profile/tests/promises.cf

@@ -1,33 +1,41 @@
-body common control {
-	bundlesequence => { "main1", "main2" };
+body common control
+{
+  bundlesequence => { "main1", "main2" };
 }
 
-bundle agent main1 {
+bundle agent main1
+{
+  commands:
+    "/bin/sleep 1";
 
-	commands:
-		"/bin/sleep 1";
-
-	methods:
-		"a" usebundle => a("arg1 somevalue", "arg2 somevalue", "arg3 somevalue");
-		"b" usebundle => b("arg4 somevalue", "arg5 somevalue", "arg6 somevalue");
+  methods:
+    "a" usebundle => a("arg1 somevalue", "arg2 somevalue", "arg3 somevalue");
+    "b" usebundle => b("arg4 somevalue", "arg5 somevalue", "arg6 somevalue");
 }
 
-bundle agent a (a1, a2, a3) {
-	commands:
-		"/bin/echo $(this.bundle):$(a1),$(a2),$(a3)";
+bundle agent a(a1, a2, a3)
+{
+  commands:
+    "/bin/echo $(this.bundle):$(a1),$(a2),$(a3)";
 }
-bundle agent b (a1, a2, a3) {
-	methods:
-		"c" usebundle => c("arg7 somevalue", "arg8 somevalue", "arg9 somevalue");
-	commands:
-		"/bin/echo $(this.bundle):$(a1),$(a2),$(a3)";
+
+bundle agent b(a1, a2, a3)
+{
+  methods:
+    "c" usebundle => c("arg7 somevalue", "arg8 somevalue", "arg9 somevalue");
+
+  commands:
+    "/bin/echo $(this.bundle):$(a1),$(a2),$(a3)";
 }
-bundle agent c (a1, a2, a3) {
-	commands:
-		"/bin/echo $(this.bundle):$(a1),$(a2),$(a3)";
+
+bundle agent c(a1, a2, a3)
+{
+  commands:
+    "/bin/echo $(this.bundle):$(a1),$(a2),$(a3)";
 }
 
-bundle agent main2 {
-	commands:
-		"/bin/sleep 2";
+bundle agent main2
+{
+  commands:
+    "/bin/sleep 2";
 }