ruby_aem_aws 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e03800c323cf88f17f022f87f3df8bcd3316d95
-  data.tar.gz: 6288fdc5638777b3160dde0ef53b6e6579292741
+  metadata.gz: 889a43cb7a66988ec2ff320e7d3aee6bf253543a
+  data.tar.gz: c07c8773e792398b5f83d5dd33fc9e8d777b2650
 SHA512:
-  metadata.gz: f62da424b5d615bfb8cb7a057c622335c781e47949cf3a7b590da51f1e8005cc93010bf789ff524019fa1fe5f3fcada98288f58a61880293a1c655094f0c34d6
-  data.tar.gz: 524f111c5a735488159a963c6354b714a784f9720e0d9556febf923b94a59ffd1d31b2b210ee2870341d924071eeee5608b0946abe6eec38bbe49b62956471fd
+  metadata.gz: 02b9dc41c34f82148160b47d8b1c064d8a519c0d9aa5955006d620ac67b8b490fe29580efc8491a8d55da43f37d395439d07148aca83bc36d33a4628f8e1b399
+  data.tar.gz: fcccded1753d2f957c8605b2a5811f24bbce6187140607761022bc6fb69e035ae1ebd9a8678e1f57a583030ec266d7a0c194ba81a9bf817ed1929594ba0b5ab2

data/conf/gem.yaml

@@ -1 +1 @@
-version: 2.2.0
+version: 2.2.1

data/lib/ruby_aem_aws/client/cloudwatch.rb

@@ -36,13 +36,24 @@ module RubyAemAws
     # @param log_message Log message to filter for
     # @return Cloudwatch log client filter_log_events response
     def get_log_event(loggroup_name, log_stream_name, log_message)
+      # Initialise response as an empty response having no events and no next token
+      # This is needed to handle the scenario when initial filter log events returns
+      # a response with nil next token, ensuring the clients of this method to
+      # be able to identify any empty response events.
+      response = { events: [], next_token: nil }
+
       filter = filter_for_cloudwatch_log_event(loggroup_name, log_stream_name, log_message)
-      response = cloud_watch_log_client.filter_log_events(filter)
+      curr_response = cloud_watch_log_client.filter_log_events(filter)
 
-      until response.next_token.nil?
-        next_token = { next_token: response.next_token }
+      # Since late 2021 (circa aws-sdk-cloudwatchlog 1.45.0), the last response
+      # is always empty (empty response events and nil next token).
+      # Previous to late 2021, the last response used to contain the filtered events
+      # with nil next token.
+      until curr_response.next_token.nil?
+        next_token = { next_token: curr_response.next_token }
         filter.update(next_token)
-        response = cloud_watch_client.filter_log_events(filter)
+        response = curr_response
+        curr_response = cloud_watch_log_client.filter_log_events(filter)
       end
 
       response

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_aem_aws
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Shine Solutions
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-22 00:00:00.000000000 Z
+date: 2021-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk