From 1eb093203eb68b4a1e2155d2310acd825b80290b Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Fri, 20 Mar 2026 19:22:28 +0100 Subject: [PATCH] Fixed inconsistencies found by cfengine lint Signed-off-by: Ole Herman Schumacher Elgesem --- cfbs.json | 2 +- cfe_internal/enterprise/CFE_hub_specific.cf | 4 ++-- .../enterprise/federation/federation.cf | 4 ++-- cfe_internal/enterprise/ha/ha_info.json | 23 ++++++++----------- cfe_internal/recommendations.cf | 2 +- inventory/README.md | 2 +- inventory/any.cf | 4 ++-- .../acceptance/lib/files/append_user_field.cf | 2 +- 8 files changed, 20 insertions(+), 23 deletions(-) diff --git a/cfbs.json b/cfbs.json index dfa3ead214..fb478269eb 100644 --- a/cfbs.json +++ b/cfbs.json @@ -1,5 +1,5 @@ { - "name": "Masterfiles", + "name": "masterfiles", "description": "Official CFEngine Masterfiles Policy Framework (MPF)", "type": "module", "provides": { diff --git a/cfe_internal/enterprise/CFE_hub_specific.cf b/cfe_internal/enterprise/CFE_hub_specific.cf index c0f436c883..6a22c50dcc 100644 --- a/cfe_internal/enterprise/CFE_hub_specific.cf +++ b/cfe_internal/enterprise/CFE_hub_specific.cf @@ -607,7 +607,7 @@ bundle agent log_cfengine_enterprise_license_utilization } -bundle agent cfe_internal_enterprise_HA_classes +bundle agent cfe_internal_enterprise_ha_classes { classes: # NOTE The `hub_active` class is a hard class defined by the ha_plugin in @@ -645,7 +645,7 @@ bundle agent cfe_internal_enterprise_maintenance enterprise_edition:: "HA classes" - usebundle => "cfe_internal_enterprise_HA_classes", + usebundle => "cfe_internal_enterprise_ha_classes", comment => "Set the HA-related classes for the maintenance bundles"; "Enterprise Maintenance" diff --git a/cfe_internal/enterprise/federation/federation.cf b/cfe_internal/enterprise/federation/federation.cf index 5f2240a9c4..3019765784 100644 --- a/cfe_internal/enterprise/federation/federation.cf +++ b/cfe_internal/enterprise/federation/federation.cf @@ -816,9 +816,9 @@ bundle agent ensure_feeders arglist => { "cfdb", @if minimum_version(3.24) - "select ensure_feeders($(feeders_arg));" + "select ensure_feeders($(feeders_arg));", @else - `"select ensure_feeders($(feeders_arg));"` + `"select ensure_feeders($(feeders_arg));"`, @endif }, classes => psql_wrapper_exit_codes, diff --git a/cfe_internal/enterprise/ha/ha_info.json b/cfe_internal/enterprise/ha/ha_info.json index 786e3ee31e..2e3b749363 100644 --- a/cfe_internal/enterprise/ha/ha_info.json +++ b/cfe_internal/enterprise/ha/ha_info.json @@ -1,15 +1,12 @@ { - "192.168.100.10": - { - "sha": "PLACE KEY HERE", - "internal_ip": "192.168.100.10", - "is_in_cluster" : true, - }, - "192.168.100.11": - { - "sha": "PLACE KEY HERE", - "internal_ip": "192.168.100.11", - "is_in_cluster" : true, - } + "192.168.100.10": { + "sha": "PLACE KEY HERE", + "internal_ip": "192.168.100.10", + "is_in_cluster": true + }, + "192.168.100.11": { + "sha": "PLACE KEY HERE", + "internal_ip": "192.168.100.11", + "is_in_cluster": true + } } - diff --git a/cfe_internal/recommendations.cf b/cfe_internal/recommendations.cf index a33b2eb809..ec6d458a5d 100644 --- a/cfe_internal/recommendations.cf +++ b/cfe_internal/recommendations.cf @@ -1,4 +1,4 @@ -bundle agent MPF_class_recommendations +bundle agent mpf_class_recommendations { meta: (policy_server|am_policy_hub).enterprise_edition:: diff --git a/inventory/README.md b/inventory/README.md index 4c7f745dcf..d35da46ce6 100644 --- a/inventory/README.md +++ b/inventory/README.md @@ -183,7 +183,7 @@ R: inventory_lsb: OS = Ubuntu, codename = trusty, release = 14.04, flavor = Ubun * lives in: `any.cf` * runs `inventory_control.lldpctl_exec` through a Perl filter -* provides variables: `cfe_autorun_inventory_LLDP.K` for each `K` returned by the LLDB executable +* provides variables: `cfe_autorun_inventory_lldp.K` for each `K` returned by the LLDB executable ## mtab diff --git a/inventory/any.cf b/inventory/any.cf index 06c4bf3125..2d8f6a9c60 100644 --- a/inventory/any.cf +++ b/inventory/any.cf @@ -37,7 +37,7 @@ bundle agent inventory_autorun { methods: !disable_inventory_LLDP:: - "LLDP" usebundle => cfe_autorun_inventory_LLDP(), + "LLDP" usebundle => cfe_autorun_inventory_lldp(), handle => "cfe_internal_autorun_inventory_LLDP"; !disable_inventory_package_refresh:: @@ -1066,7 +1066,7 @@ bundle agent cfe_autorun_inventory_dmidecode "DEBUG $(this.bundle): Obtained Physical memory (MB) = '$(total_physical_memory_MB)'"; } -bundle agent cfe_autorun_inventory_LLDP +bundle agent cfe_autorun_inventory_lldp # @brief Do LLDP-based inventory # # This agent bundle runs lldpctl to discover information. See diff --git a/tests/acceptance/lib/files/append_user_field.cf b/tests/acceptance/lib/files/append_user_field.cf index 334dc1d50a..18a556541e 100644 --- a/tests/acceptance/lib/files/append_user_field.cf +++ b/tests/acceptance/lib/files/append_user_field.cf @@ -48,7 +48,7 @@ bundle agent check "fail" usebundle => dcs_fail( $(this.promise_filename) ), - ifvarclass => "_fail"; + if => "_fail"; pass:: "pass"