address pr comment

Author: efd6

packages/aws/data_stream/guardduty/agent/stream/httpjson.yml.hbs

@@ -80,7 +80,7 @@ chain:
         target: body.findings
 cursor:
   last_execution_datetime:
-    value: '[[with $f := (index .last_response.body "findings")]][[if (ne (len $f) 50)]][[.last_event.updatedAt]][[end]][[end]]'
+    value: '[[$f := (index .last_response.body "findings")]][[if $f]][[if (ne (len $f) 50)]][[.last_event.updatedAt]][[end]][[end]]'
     ignore_empty_value: true
 tags:
 {{#if preserve_original_event}}

packages/aws/data_stream/securityhub_insights/agent/stream/httpjson.yml.hbs

@@ -94,7 +94,7 @@ response.pagination:
   - set:
       # Set a NextToken value if one actually exists, but continue either way.
       target: body.NextToken
-      value: '[[.last_response.body.NextToken]]'
+      value: '[[with (index .last_response.body "NextToken")]][[.]][[end]]'
       fail_on_template_error: false
   - delete:
       target: header.Authorization