Merge pull request #1852 from olehermanse/ifvarclass

CFE-3472: Replaced ifvarclass with if in MPF

Author: olehermanse

cfe_internal/core/watchdog/watchdog.cf

@@ -43,7 +43,7 @@ bundle agent cfe_internal_core_watchdog(state)
     DEBUG|DEBUG_cfe_internal_core_watchdog::
       "DEBUG $(this.bundle): Watchdog '$(state)'";
       "DEBUG $(this.bundle): Invalid state '$(state)' only enabled|disabled allowed"
-        ifvarclass => "invalid_state";
+        if => "invalid_state";
 
     !(use_cfe_internal_core_watchdog_cron_d|use_cfe_internal_core_watchdog_aix|use_cfe_internal_core_watchdog_windows)::
       "WARNING $(this.bundle): Currently only supports /etc/cron.d on systems that have pgrep in the the stdlib paths bundle, AIX and Windows hosts.";

cfe_internal/enterprise/CFE_hub_specific.cf

@@ -549,17 +549,17 @@ bundle agent cfe_internal_enterprise_maintenance
 
       "Enterprise Maintenance"
         usebundle => $(enterprise_maintenance_bundles),
-        ifvarclass => isgreaterthan( $(enterprise_maintenance_bundle_count), 0 );
+        if => isgreaterthan( $(enterprise_maintenance_bundle_count), 0 );
 
   reports:
 
     "DEBUG|DEBUG_$(this.bundle)"::
 
       "DEBUG $(this.bundle): $(enterprise_maintenance_bundle_count) CFEngine Enterprise Maintenance Bundles"
-        ifvarclass => isgreaterthan( $(enterprise_maintenance_bundle_count), 0 );
+        if => isgreaterthan( $(enterprise_maintenance_bundle_count), 0 );
 
       "DEBUG $(this.bundle): $(enterprise_maintenance_bundles) CFEngine Enterprise Maintenance Bundles"
-        ifvarclass => isgreaterthan( $(enterprise_maintenance_bundle_count), 0 );
+        if => isgreaterthan( $(enterprise_maintenance_bundle_count), 0 );
 }
 
 bundle agent cfe_internal_refresh_inventory_view

cfe_internal/enterprise/file_change.cf

@@ -36,13 +36,13 @@ bundle agent change_management
       "$(watch_files_report_diffs)" -> { "InfoSec" }
         changes => diff,
         handle => "change_management_files_watch_files_report_diffs",
-        ifvarclass => fileexists( $(watch_files_report_diffs) ),
+        if => fileexists( $(watch_files_report_diffs) ),
         comment => "Unplanned changes of these files may indicate a security
                     breach.";
 
       "$(watch_files_report_change)" -> { "InfoSec" }
         changes => detect_content_using("sha256"),
-        ifvarclass => fileexists( $(watch_files_report_change) ),
+        if => fileexists( $(watch_files_report_change) ),
         comment => "Unplanned changes of these files may indicate a security
                     breach. (Diffs are not reported in case those with access
                     to this report should not have access to shadow entries.)";

cfe_internal/enterprise/ha/ha_def.cf

@@ -24,7 +24,7 @@ bundle common ha_def
 
 
    "replication_only_node[$(ips)]"
-      string => "dummy", ifvarclass => strcmp("$(config[$(ips)][is_in_cluster])", "false");
+      string => "dummy", if => strcmp("$(config[$(ips)][is_in_cluster])", "false");
 
    "replication_only_nodes"
       slist => getindices("replication_only_node");

cfe_internal/enterprise/mission_portal.cf

@@ -111,7 +111,7 @@ bundle agent mission_portal_apache_from_stage(config, staged_config)
 
     "$(config)"
       copy_from => local_dcp( $(staged_config) ),
-      ifvarclass => returnszero("$(validate_config) > /dev/null 2>&1 ", "useshell"),
+      if => returnszero("$(validate_config) > /dev/null 2>&1 ", "useshell"),
       classes => results("bundle", "mission_portal_apache_config"),
       comment => "We make sure that the deployed config is a copy of the staged
                   config if the staged config passes a syntax check. We redirect
@@ -136,10 +136,10 @@ bundle agent mission_portal_apache_from_stage(config, staged_config)
   reports:
     DEBUG|DEBUG_mission_portal_apache_from_stage::
       "DEBUG $(this.bundle): '$(config)' should be a copy of '$(staged_config)' because it validates with '$(validate_config)'"
-      ifvarclass => returnszero("$(validate_config) > /dev/null 2>&1 ", "useshell");
+      if => returnszero("$(validate_config) > /dev/null 2>&1 ", "useshell");
 
       "DEBUG $(this.bundle): '$(config)' should *not* be a copy of '$(staged_config)' because it failed to validate with '$(validate_config)'"
-      ifvarclass => not(returnszero("$(validate_config) > /dev/null 2>&1 ", "useshell"));
+      if => not(returnszero("$(validate_config) > /dev/null 2>&1 ", "useshell"));
 }
 
 ##################################################################
@@ -275,8 +275,8 @@ bundle agent cfe_enterprise_selfsigned_cert
     DEBUG|DEBUG_cfe_enterprise_selfsigned_cert::
 
       "DEBUG $(this.bundle): Certificate Generation Requested"
-        ifvarclass => "_cfe_enterprise_selfsigned_cert_regenerate_certificate";
+        if => "_cfe_enterprise_selfsigned_cert_regenerate_certificate";
 
       "DEBUG $(this.bundle): No Certificate Generation Requested"
-        ifvarclass => "!_cfe_enterprise_selfsigned_cert_regenerate_certificate";
+        if => "!_cfe_enterprise_selfsigned_cert_regenerate_certificate";
 }

cfe_internal/update/lib.cf

@@ -219,26 +219,26 @@ bundle agent u_systemd_services(service,state)
       # conveniently, systemd states map to `services` states, except
       # for `enable`
 
-      "$(call_systemctl) -q start $(service)"   ifvarclass => "action_start";
-      "$(call_systemctl) -q stop $(service)"    ifvarclass => "action_stop";
-      "$(call_systemctl) -q reload $(service)"  ifvarclass => "action_reload";
-      "$(call_systemctl) -q restart $(service)" ifvarclass => "action_restart";
-      "$(call_systemctl) -q enable $(service)"  ifvarclass => "action_enable";
-      "$(call_systemctl) -q disable $(service)" ifvarclass => "action_disable";
+      "$(call_systemctl) -q start $(service)"   if => "action_start";
+      "$(call_systemctl) -q stop $(service)"    if => "action_stop";
+      "$(call_systemctl) -q reload $(service)"  if => "action_reload";
+      "$(call_systemctl) -q restart $(service)" if => "action_restart";
+      "$(call_systemctl) -q enable $(service)"  if => "action_enable";
+      "$(call_systemctl) -q disable $(service)" if => "action_disable";
 
       # Custom action for any of the non-standard systemd actions such a
       # status, try-restart, isolate, et al.
-      "$(call_systemctl) $(state) $(service)" ifvarclass => "action_custom";
+      "$(call_systemctl) $(state) $(service)" if => "action_custom";
 
   reports:
     DEBUG|DEBUG_u_systemd_service::
       "DEBUG $(this.bundle): using systemd layer to $(state) $(service)";
 
       "DEBUG $(this.bundle): Service $(service) unit file is not loaded; doing nothing"
-        ifvarclass => "systemd.!service_loaded";
+        if => "systemd.!service_loaded";
 
       "DEBUG $(this.bundle): Could not find service: $(service)"
-        ifvarclass => "systemd.service_notfound";
+        if => "systemd.service_notfound";
 }
 
 body perms u_mog(mode,user,group)

cfe_internal/update/update_bins.cf

@@ -90,21 +90,21 @@ bundle agent cfe_internal_update_bins
       "novapkg"                 string => "CFEcfengine-nova",
       comment => "Name convention of Nova package on Solaris",
       handle => "cfe_internal_update_bins_vars_novapkg_solaris",
-      ifvarclass => "nova_edition";
+      if => "nova_edition";
 
     aix.enterprise::
 
       "novapkg"                 string => "cfengine.cfengine-nova",
       comment => "Name convention of Nova package on AIX",
       handle => "cfe_internal_update_bins_vars_novapkg_aix",
-      ifvarclass => "nova_edition";
+      if => "nova_edition";
 
     !(solarisx86|solaris|aix).enterprise::
 
       "novapkg"                 string => "cfengine-nova",
       comment => "Name convention of Nova package for all but not Solaris",
       handle => "cfe_internal_update_bins_vars_novapkg_not_solaris_aix",
-      ifvarclass => "nova_edition";
+      if => "nova_edition";
 
     solaris.!sunos_i86pc.enterprise::
 
@@ -162,7 +162,7 @@ bundle agent cfe_internal_update_bins
       package_architectures => { "$(pkgarch)" },
       package_version => "$(update_def.current_version)-1",
       package_method => u_generic( "$(local_software_dir)" ),
-      ifvarclass => "nova_edition.have_software_dir",
+      if => "nova_edition.have_software_dir",
       classes => u_if_else("bin_update_success", "bin_update_fail");
 
     !am_policy_hub.(solaris|solarisx86).enterprise.trigger_upgrade.!bootstrap_mode::
@@ -175,7 +175,7 @@ bundle agent cfe_internal_update_bins
       package_architectures => { "$(pkgarch)" },
       package_version => "$(update_def.current_version)",
       package_method => u_generic( "$(local_software_dir)" ),
-      ifvarclass => "nova_edition.have_software_dir",
+      if => "nova_edition.have_software_dir",
       classes => u_if_else("bin_update_success", "bin_update_fail");
 
     !am_policy_hub.windows.enterprise.trigger_upgrade.!bootstrap_mode::
@@ -188,7 +188,7 @@ bundle agent cfe_internal_update_bins
       package_architectures => { "$(pkgarch)" },
       package_version => "$(update_def.current_version)",
       package_method => u_generic( "$(local_software_dir)" ),
-      ifvarclass => "nova_edition.have_software_dir",
+      if => "nova_edition.have_software_dir",
       classes => u_if_else("bin_update_success", "bin_update_fail");
 
     !am_policy_hub.aix.enterprise.trigger_upgrade.!bootstrap_mode::
@@ -201,7 +201,7 @@ bundle agent cfe_internal_update_bins
       package_architectures => { "$(pkgarch)" },
       package_version => "$(update_def.current_version).0",
       package_method => u_generic( "$(local_software_dir)" ),
-      ifvarclass => "nova_edition.have_software_dir",
+      if => "nova_edition.have_software_dir",
       classes => u_if_else("bin_update_success", "bin_update_fail");
 
       #
@@ -236,13 +236,13 @@ bundle agent cfe_internal_update_bins
       edit_defaults => u_empty_no_backup,
       edit_line => u_admin_file,
       perms => u_m("0644"),
-      ifvarclass => "solarisx86|solaris";
+      if => "solarisx86|solaris";
 
       "$(backup_script)"
       comment => "Create a backup script for cf-upgrade",
       handle => "cfe_internal_update_bins_files_backup_script",
       create => "true",
-      ifvarclass => "!windows",
+      if => "!windows",
       edit_defaults => u_empty_no_backup,
       edit_line => u_backup_script,
       perms => u_m("0755");
@@ -251,7 +251,7 @@ bundle agent cfe_internal_update_bins
       comment => "Create an install script for cf-upgrade",
       handle => "cfe_internal_update_bins_files_install_script",
       create => "true",
-      ifvarclass => "!windows",
+      if => "!windows",
       edit_defaults => u_empty_no_backup,
       edit_line => u_install_script,
       perms => u_m("0755");
@@ -280,7 +280,7 @@ bundle agent cfe_internal_update_bins
   reports:
     DEBUG|DEBUG_cfe_internal_update_bins::
       "DEBUG $(this.bundle): Evaluating binaries for upgrade using internal update mechanism"
-        ifvarclass => "trigger_upgrade";
+        if => "trigger_upgrade";
 
 }
 

cfe_internal/update/update_processes.cf

@@ -121,21 +121,21 @@ bundle agent cfe_internal_update_processes
         comment => "CFE processes that should not be enabled",
         handle => "cfe_internal_update_processes_vars_agents_to_be_disabled",
         slist => { @(def.agents_to_be_disabled) },
-        ifvarclass => isvariable( "def.agents_to_be_disabled" );
+        if => isvariable( "def.agents_to_be_disabled" );
 
       "agents_to_be_disabled"
         comment => "The default agents that should not be enabled.",
         handle => "cfe_internal_update_processes_vars_default_agents_to_be_disabled",
         slist => { },
-        ifvarclass => not( isvariable("def.agents_to_be_disabled") );
+        if => not( isvariable("def.agents_to_be_disabled") );
 
       # An agent is disabled if there is a persistently defined disablement
       # class OR if the agent is found in a list of agents to be specifically
       # disabled.
 
       "disabled[$(all_agents)]"
         string => "$(all_agents)",
-        ifvarclass => or( canonify( "persistent_disable_$(all_agents)" ),
+        if => or( canonify( "persistent_disable_$(all_agents)" ),
                           some( "$(all_agents)", agents_to_be_disabled ));
 
     systemd_supervised.policy_server.enterprise.hub_passive|(ha_replication_only_node.!failover_to_repliacation_node_enabled)::
@@ -193,7 +193,7 @@ bundle agent cfe_internal_update_processes
 
       "CHECKING FOR PERSISTENTLY DISABLED CFE AGENTS"
       usebundle => disable_cfengine_agents($(all_agents)),
-      ifvarclass => canonify("persistent_disable_$(all_agents)"),
+      if => canonify("persistent_disable_$(all_agents)"),
       comment => "Call a bundle to disable CFEngine given processes if persistent_disable_x is set",
       handle => "cfe_internal_update_processes_methods_maybe_disabling_cfe_agents";
 
@@ -254,7 +254,7 @@ bundle agent maintain_cfe_hub_process
       restart_class => "no_vacuumdb",
       comment => "Monitor vacuumdb process",
       handle => "cfe_internal_maintain_cfe_hub_process_processes_check_vacuumdb",
-      ifvarclass => "nova|enterprise";
+      if => "nova|enterprise";
 
    am_policy_hub.cfredis_in_enterprise::
 
@@ -263,27 +263,27 @@ bundle agent maintain_cfe_hub_process
       restart_class => "start_redis_server",
       comment => "Monitor redis-server process",
       handle => "cfe_internal_maintain_cfe_hub_process_processes_redis",
-      ifvarclass => "nova|enterprise";
+      if => "nova|enterprise";
 
     am_policy_hub.cfconsumer_in_enterprise::
       "$(cfe_internal_process_knowledge.bindir)/cf-consumer" -> { "ENT-2797" }
       restart_class => "start_cf_consumer",
       comment => "Monitor cf-consumer process",
       handle => "cfe_internal_maintain_cfe_hub_process_processes_cf_consumer",
-      ifvarclass => "(nova|enterprise).no_vacuumdb";
+      if => "(nova|enterprise).no_vacuumdb";
 
    am_policy_hub.!enable_cfengine_enterprise_hub_ha::
       "$(cfe_internal_process_knowledge.bindir)/postgres"
       restart_class => "start_postgres_server",
       comment => "Monitor postgres process",
       handle => "cfe_internal_maintain_cfe_hub_process_processes_postgres",
-      ifvarclass => "nova|enterprise";
+      if => "nova|enterprise";
 
     am_policy_hub.!enable_cfengine_enterprise_hub_ha.files_ok.!windows|ha_run_hub_process::
       "cf-hub"      restart_class => "start_hub",
       comment => "Monitor cf-hub process",
       handle => "cfe_internal_maintain_cfe_hub_process_processes_cf_hub",
-      ifvarclass => and( "(nova|enterprise).no_vacuumdb",
+      if => and( "(nova|enterprise).no_vacuumdb",
                          "!persistent_disable_cf_hub" ); # Don't start it if it's persistently disabled
 
     am_policy_hub.ha_kill_hub_process::
@@ -373,7 +373,7 @@ bundle agent disable_cfengine_agents(process)
       signals => { "term" },
       comment => "Terminate $(process)",
       handle => "cfe_internal_disable_cfengine_agents_processes_terminate_process",
-      ifvarclass => "disable_$(cprocess)";
+      if => "disable_$(cprocess)";
 
 }
 
@@ -410,7 +410,7 @@ bundle agent enable_cfengine_agents(process)
       restart_class => "restart_$(cprocess)",
       comment => "Create a class to restart a process",
       handle => "cfe_internal_enable_cfengine_agents_processes_restart_process",
-      ifvarclass => "enable_$(cprocess)";
+      if => "enable_$(cprocess)";
 
       #
 
@@ -422,21 +422,21 @@ bundle agent enable_cfengine_agents(process)
       comment => "Restart a process",
       handle => "cfe_internal_enable_cfengine_agents_commands_restart_process",
       classes => u_kept_successful_command,
-      ifvarclass => and( "restart_$(cprocess)",
+      if => and( "restart_$(cprocess)",
                          isvariable( "sys.$(cprocess)" ) );
 
   reports:
       "The process $(process) is persistently disabled.  Run with '-Dclear_persistent_disable_$(cprocess)' to re-enable it."
-      ifvarclass => and( "persistent_disable_$(cprocess)",
+      if => and( "persistent_disable_$(cprocess)",
                          isvariable( "sys.$(cprocess)" ));
 
       "The process $(process) has been re-enabled.  Run with '-Dset_persistent_disable_$(cprocess)' to disable it persistently again."
-      ifvarclass => and( "clear_persistent_disable_$(cprocess)",
+      if => and( "clear_persistent_disable_$(cprocess)",
                          isvariable( "sys.$(cprocess)" )),
       classes => u_clear_always("persistent_disable_$(cprocess)");
 
       "The process $(process) has been disabled persistently.  Run with '-Dclear_persistent_disable_$(cprocess)' to re-enable it."
-      ifvarclass => "set_persistent_disable_$(cprocess)",
+      if => "set_persistent_disable_$(cprocess)",
       classes => u_always_forever("persistent_disable_$(cprocess)");
 }