Test cleanup cherry-picks (3.27)

ci/install.sh

@@ -18,3 +18,4 @@ if [ ! -n "$TERMUX_VERSION" ]; then
 fi
 
 $GAINROOT make install
+$GAINROOT /var/cfengine/bin/cf-key # to generate the hostkey

contrib/masterfiles/git-failsafe.cf

@@ -247,7 +247,7 @@ bundle agent git_update
              perms => u_m("755"),
       depth_search => u_recurse_basedir("inf"),
             action => u_immediate,
-        ifvarclass => "hpux";
+                if => "hpux";
 
    "/usr/local/bin"
            comment => "Ensure cfengine binaries were copied to /usr/local/bin",

examples/augment.cf

@@ -2,8 +2,9 @@ bundle common def
 {
   vars:
     # Only define this variable if it is not yet defined.
-    "example_augment_string_override"
-      unless => isvariable("example_augment_string_override");
+    "example_augment_string"
+      string => "fallback value when not defined in def.json",
+      unless => isvariable("example_augment_string");
 
     # Define this variable regardless if it has been set in def.json
     "example_augment_list_override"
@@ -18,16 +19,16 @@ bundle agent main
   reports:
     "Def var: '$(def_vars)'";
 
-    "def.example_augment_string_override = '$(def.example_augment_string_override)'";
+    "def.example_augment_string = '$(def.example_augment_string)'";
     "def.example_augment_list_override = '$(def.example_augment_list_override)'";
     "def.example_augment_structured_override[key1] = '$(def.example_augment_structured_override[key1])'";
 }
 #+begin_src example_output
 #@ ```
 #@ R: Def var: 'default:def.example_augment_structured_override'
-#@ R: Def var: 'default:def.example_augment_string_override'
+#@ R: Def var: 'default:def.example_augment_string'
 #@ R: Def var: 'default:def.example_augment_list_override'
-#@ R: def.example_augment_string_override = 'defined in def.json'
+#@ R: def.example_augment_string = 'defined in def.json'
 #@ R: def.example_augment_list_override = 'defined'
 #@ R: def.example_augment_list_override = 'in'
 #@ R: def.example_augment_list_override = 'bundle'

examples/classfilterdata_array_of_objects.cf

@@ -7,13 +7,13 @@ bundle agent __main__
   vars:
       "original"
         data => '[
-            { "file": "/tmp/foo", "ifvarclass": "role_1"          },
-            { "file": "/tmp/bar", "ifvarclass": "role_2"          },
-            { "file": "/tmp/baz", "ifvarclass": "(role_1|role_2)" }
+            { "file": "/tmp/foo", "if": "role_1"          },
+            { "file": "/tmp/bar", "if": "role_2"          },
+            { "file": "/tmp/baz", "if": "(role_1|role_2)" }
           ]';
 
       "filtered"
-        data => classfilterdata("original", "array_of_objects", "ifvarclass");
+        data => classfilterdata("original", "array_of_objects", "if");
 
   reports:
       "Filtered data: $(with)"
@@ -26,11 +26,11 @@ bundle agent __main__
 #@ R: Filtered data: [
 #@   {
 #@     "file": "/tmp/bar",
-#@     "ifvarclass": "role_2"
+#@     "if": "role_2"
 #@   },
 #@   {
 #@     "file": "/tmp/baz",
-#@     "ifvarclass": "(role_1|role_2)"
+#@     "if": "(role_1|role_2)"
 #@   }
 #@ ]
 #@ ```

examples/classfilterdata_object_of_objects.cf

@@ -7,13 +7,13 @@ bundle agent __main__
   vars:
       "original"
         data => '{
-            "/tmp/foo": { "ifvarclass":          "role_1" },
-            "/tmp/bar": { "ifvarclass":          "role_2" },
-            "/tmp/baz": { "ifvarclass": "(role_1|role_2)" }
+            "/tmp/foo": { "if":          "role_1" },
+            "/tmp/bar": { "if":          "role_2" },
+            "/tmp/baz": { "if": "(role_1|role_2)" }
           }';
 
       "filtered"
-        data => classfilterdata("original", "object_of_objects", "ifvarclass");
+        data => classfilterdata("original", "object_of_objects", "if");
 
   reports:
       "Filtered data: $(with)"
@@ -25,10 +25,10 @@ bundle agent __main__
 #@ ```
 #@ R: Filtered data: {
 #@   "/tmp/bar": {
-#@     "ifvarclass": "role_2"
+#@     "if": "role_2"
 #@   },
 #@   "/tmp/baz": {
-#@     "ifvarclass": "(role_1|role_2)"
+#@     "if": "(role_1|role_2)"
 #@   }
 #@ }
 #@ ```

tests/acceptance/00_basics/01_compiler/001.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
@@ -63,4 +63,3 @@ bundle agent check
     !ok::
       "$(this.promise_filename) FAIL";
 }
-

tests/acceptance/00_basics/01_compiler/002.x.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }

tests/acceptance/00_basics/01_compiler/003.x.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }

tests/acceptance/00_basics/01_compiler/004.x.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
@@ -56,4 +56,3 @@ bundle agent check
     !ok::
       "$(this.promise_filename) FAIL";
 }
-

tests/acceptance/00_basics/01_compiler/007.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }

tests/acceptance/00_basics/01_compiler/008.x.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
@@ -55,4 +55,3 @@ bundle agent check
     !ok::
       "$(this.promise_filename) FAIL";
 }
-

tests/acceptance/00_basics/01_compiler/013.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }

tests/acceptance/00_basics/01_compiler/014.x.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
@@ -55,4 +55,3 @@ bundle agent check
     !ok::
       "$(this.promise_filename) FAIL";
 }
-

tests/acceptance/00_basics/01_compiler/019.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }

tests/acceptance/00_basics/01_compiler/020.x.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
@@ -55,4 +55,3 @@ bundle agent check
     !ok::
       "$(this.promise_filename) FAIL";
 }
-

tests/acceptance/00_basics/01_compiler/025.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }

tests/acceptance/00_basics/01_compiler/026.x.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
@@ -55,4 +55,3 @@ bundle agent check
     !ok::
       "$(this.promise_filename) FAIL";
 }
-

tests/acceptance/00_basics/01_compiler/031.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }

tests/acceptance/00_basics/01_compiler/032.x.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
@@ -49,4 +49,3 @@ bundle agent check
     !ok::
       "$(this.promise_filename) FAIL";
 }
-

tests/acceptance/00_basics/01_compiler/033.x.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
@@ -52,4 +52,3 @@ bundle agent check
     !ok::
       "$(this.promise_filename) FAIL";
 }
-

tests/acceptance/00_basics/01_compiler/034.x.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
@@ -49,4 +49,3 @@ bundle agent check
     !ok::
       "$(this.promise_filename) FAIL";
 }
-

tests/acceptance/00_basics/01_compiler/037.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }

tests/acceptance/00_basics/01_compiler/038.x.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
@@ -53,4 +53,3 @@ bundle agent check
     !ok::
       "$(this.promise_filename) FAIL";
 }
-

tests/acceptance/00_basics/01_compiler/040.x.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };   
       version => "1.0";
 }

tests/acceptance/00_basics/01_compiler/041.x.cf

@@ -8,7 +8,7 @@
 
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { init, test("banana"), check };   
       version => "1.0";
 }

tests/acceptance/00_basics/01_compiler/042.x.cf

@@ -8,7 +8,7 @@
 
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { init, test("banana"), check };   
       version => "1.0";
 }

tests/acceptance/00_basics/01_compiler/044.x.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };   
       version => "1.0";
 }

tests/acceptance/00_basics/01_compiler/045.x.cf

@@ -5,7 +5,7 @@
 #####################################################
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };   
       version => "1.0";
 }

tests/acceptance/00_basics/01_compiler/100.cf

@@ -6,7 +6,7 @@
 
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }
@@ -47,4 +47,3 @@ bundle agent check
     DEBUG::
       "$(test.subout)";
 }
-

tests/acceptance/00_basics/01_compiler/101.cf

@@ -6,7 +6,7 @@
 
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }

tests/acceptance/00_basics/01_compiler/102.x.cf

@@ -1,6 +1,6 @@
 body common control
 {
-      inputs => { "../../default.cf.sub" };
+      inputs => { "../../default.sub.cf" };
       bundlesequence  => { default("$(this.promise_filename)") };
       version => "1.0";
 }