From 3c11fcf152abcfeed31059a928df154c81a684d6 Mon Sep 17 00:00:00 2001 From: Nick Anderson Date: Wed, 5 Jul 2023 11:52:12 -0500 Subject: [PATCH] Removed considerations for old versions from bundle agent cfe_autorun_inventory_aws_ec2_metadata_cache CFEngine 3.10 and 3.11 are long out of support, no need to carry this considerations forward. Ticket: CFE-4222 Changelog: Title (cherry picked from commit c42cce1215e5684a28920f2c19fbda8c6ec6793b) --- inventory/any.cf | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/inventory/any.cf b/inventory/any.cf index 557e373f6..bd2ee66f5 100644 --- a/inventory/any.cf +++ b/inventory/any.cf @@ -670,23 +670,12 @@ bundle agent cfe_autorun_inventory_aws_ec2_metadata_cache files: ec2_instance.!(disable_inventory_aws|disable_inventory_aws_ec2_metadata):: - cfengine_3_10:: - "$(cache)" - create => "true", - edit_line => lines_present( "$(response[content])" ), - edit_defaults => empty, - if => regcmp( ".*", "$(content[version])" ); - -@if minimum_version(3.11) - # template_method inline_mustache introduced in 3.11 - !cfengine_3_10:: "$(cache)" template_method => "inline_mustache", edit_template_string => "{{{content}}}", template_data => @(response), create => "true", if => regcmp( ".*", "$(content[version])" ); -@endif } bundle agent cfe_aws_ec2_metadata_from_cache