Merge pull request #1813 from craigcomstock/ENT-6115/master

ENT-6115 Added check for aws ec2 metadata content to make CI more reliable

Author: nickanderson

inventory/any.cf

@@ -607,7 +607,7 @@ bundle agent cfe_autorun_inventory_aws_ec2_metadata_cache
         create => "true",
         edit_line => lines_present( "$(response[content])" ),
         edit_defaults => empty,
-        if => isvariable( response );
+        if => regcmp( ".*", "$(response[content][version])" );
 
 @if minimum_version(3.11)
       # template_method inline_mustache introduced in 3.11
@@ -617,7 +617,7 @@ bundle agent cfe_autorun_inventory_aws_ec2_metadata_cache
         edit_template_string => "{{{content}}}",
         template_data => @(response),
         create =>   "true",
-        if => isvariable( response );
+        if => regcmp( ".*", "$(response[content][version])" );
 @endif
 }