ruby_aem_aws 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edf9ceb92a749def70b1e6e77657080a4757495f
-  data.tar.gz: a8d1f5d6c776d8a9be4d0d9b59e16e8279ceb289
+  metadata.gz: 631ffea7c2e71618e87352d28061102390ef2005
+  data.tar.gz: f1cd6d63244d9f05caffce66d4755829f9430abc
 SHA512:
-  metadata.gz: dcc5fe4b4d0a0e197b6f743a3c63532b4e069b5c50b038b2545acd649bc1d7cf7f49b780c3d16c3a7d0bb28318a55b248d29ce9aaf77c164b4b8315ad4aafb10
-  data.tar.gz: 7ef88b57050e47973b5c122ea46ec87400e665f92f305183dc34f1ba1ac743cf1d0e323f5312b7eda6414a5c135954ad5b31460fe051f7927616bcfee769aa72
+  metadata.gz: 53bb0273d04b6f930af17d0cd6465bf712d33aa962f09e57184e0b565ef64f57b48489dddb7c8220d0d8f13e58e23e5084618056c96834058adc406aad81d607
+  data.tar.gz: e33ea47a4e3abd0269e145af2f3235c09006469309bd6ebc35ae0a04ae732f6b6840903761a47e1aef90bcae519a46e536dc08f14561a84aa143551a34cd36fc

data/conf/gem.yaml

@@ -1 +1 @@
-version: 2.1.0
+version: 2.3.0

data/lib/ruby_aem_aws/abstract/grouped_component.rb

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'aws-sdk'
 require_relative 'component'
 
 module RubyAemAws

data/lib/ruby_aem_aws/abstract/single_component.rb

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'aws-sdk'
 require_relative 'component'
 
 module RubyAemAws

data/lib/ruby_aem_aws/abstract/snapshot.rb

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'aws-sdk'
 require_relative 'component'
 
 module RubyAemAws

data/lib/ruby_aem_aws/architecture/full_set_stack.rb

@@ -24,6 +24,7 @@ module RubyAemAws
   # Factory for the full-set AEM stack component interfaces.
   class FullSetStack
     attr_reader :cloudformation_client, :cloud_watch_client
+
     include MetricVerifier
 
     # @param stack_prefix AWS tag: StackPrefix

data/lib/ruby_aem_aws/architecture/stack_manager.rb

@@ -18,6 +18,7 @@ module RubyAemAws
   # Interface to interact with AEM StackManager
   class StackManager
     attr_reader :sm_resources, :cloudformation_client
+
     # @param stack_prefix AWS tag: StackPrefix
     # @param params Array of AWS Clients and Resource connections:
     # - CloudFormationClient: AWS Cloudformation Client.

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

data/lib/ruby_aem_aws/component/author_dispatcher.rb

@@ -25,6 +25,7 @@ module RubyAemAws
     # Interface to the AWS instances playing and supporting the AuthorDispatcher role in a full-set AEM stack.
     class AuthorDispatcher
       attr_reader :descriptor, :ec2_resource, :asg_client, :elb_client, :cloud_watch_client, :cloud_watch_log_client
+
       include AbstractGroupedComponent
       include AbstractSnapshot
       include HealthyResourceVerifier

data/lib/ruby_aem_aws/component/author_primary.rb

@@ -23,6 +23,7 @@ module RubyAemAws
     # Interface to the AWS instance running the Author-Primary component of a full-set AEM stack.
     class AuthorPrimary
       attr_reader :descriptor, :ec2_resource, :cloud_watch_client, :cloud_watch_log_client
+
       include AbstractSingleComponent
       include AbstractSnapshot
       include HealthyStateVerifier

data/lib/ruby_aem_aws/component/author_publish_dispatcher.rb

@@ -24,6 +24,7 @@ module RubyAemAws
     # Interface to a single AWS instance running all three AEM components as a consolidated stack.
     class AuthorPublishDispatcher
       attr_reader :descriptor, :ec2_resource, :cloud_watch_client, :cloud_watch_log_client
+
       include AbstractSingleComponent
       include AbstractSnapshot
       include HealthyStateVerifier

data/lib/ruby_aem_aws/component/author_standby.rb

@@ -23,6 +23,7 @@ module RubyAemAws
     # Interface to the AWS instance running the Author-Standby component of a full-set AEM stack.
     class AuthorStandby
       attr_reader :descriptor, :ec2_resource, :cloud_watch_client, :cloud_watch_log_client
+
       include AbstractSingleComponent
       include AbstractSnapshot
       include HealthyStateVerifier

data/lib/ruby_aem_aws/component/chaos_monkey.rb

@@ -24,6 +24,7 @@ module RubyAemAws
     # Interface to the AWS instance running the ChaosMonkey component of a full-set AEM stack.
     class ChaosMonkey
       attr_reader :descriptor, :ec2_resource, :asg_client, :cloud_watch_client, :cloud_watch_log_client
+
       include AbstractGroupedComponent
       include AbstractSnapshot
       include HealthyResourceVerifier

data/lib/ruby_aem_aws/component/orchestrator.rb

@@ -24,6 +24,7 @@ module RubyAemAws
     # Interface to the AWS instance running the Orchestrator component of a full-set AEM stack.
     class Orchestrator
       attr_reader :descriptor, :ec2_resource, :asg_client, :cloud_watch_client, :cloud_watch_log_client
+
       include AbstractGroupedComponent
       include AbstractSnapshot
       include HealthyResourceVerifier

data/lib/ruby_aem_aws/component/publish.rb

@@ -24,6 +24,7 @@ module RubyAemAws
     # Interface to the AWS instance running the Publish component of a full-set AEM stack.
     class Publish
       attr_reader :descriptor, :ec2_resource, :cloud_watch_client, :asg_client, :cloud_watch_log_client
+
       include AbstractGroupedComponent
       include AbstractSnapshot
       include HealthyResourceVerifier

data/lib/ruby_aem_aws/component/publish_dispatcher.rb

@@ -24,6 +24,7 @@ module RubyAemAws
     # Interface to the AWS instance running the PublishDispatcher component of a full-set AEM stack.
     class PublishDispatcher
       attr_reader :descriptor, :ec2_resource, :asg_client, :elb_client, :cloud_watch_client, :cloud_watch_log_client
+
       include AbstractGroupedComponent
       include AbstractSnapshot
       include HealthyResourceVerifier

data/lib/ruby_aem_aws/component/stack_manager_resources.rb

@@ -23,6 +23,7 @@ module RubyAemAws
     # Interface to the AWS StackManager to send out commands
     class StackManagerResources
       attr_reader :dynamodb_client, :s3_client, :s3_resource, :cloud_watch_client, :cloud_watch_log_client
+
       include AbstractStackManager
       include DynamoDB
       include MetricVerifier

data/lib/ruby_aem_aws/constants.rb

@@ -47,10 +47,10 @@ module RubyAemAws
 
   class Constants
     REGION_DEFAULT = ENV['AWS_DEFAULT_REGION'] || ENV['aws_default_region'] || ENV['AWS_REGION'] || ENV['aws_region'] || 'ap-southeast-2'.freeze
-    ACCESS_KEY_ID = ENV['AWS_ACCESS_KEY_ID'] || ENV['aws_access_key_id']
-    SECRET_ACCESS_KEY = ENV['AWS_SECRET_ACCESS_KEY'] || ENV['aws_secret_access_key']
-    SESSION_TOKEN = ENV['AWS_SESSION_TOKEN'] || ENV['aws_session_token']
-    PROFILE = ENV['AWS_PROFILE']
+    ACCESS_KEY_ID = ENV['AWS_ACCESS_KEY_ID'] || ENV.fetch('aws_access_key_id', nil)
+    SECRET_ACCESS_KEY = ENV['AWS_SECRET_ACCESS_KEY'] || ENV.fetch('aws_secret_access_key', nil)
+    SESSION_TOKEN = ENV['AWS_SESSION_TOKEN'] || ENV.fetch('aws_session_token', nil)
+    PROFILE = ENV['AWS_PROFILE'] || ENV.fetch('aws_profile', nil)
     INSTANCE_STATE_HEALTHY = RubyAemAws::InstanceState::RUNNING.freeze
     INSTANCE_STATE_CODE_RUNNING = RubyAemAws::InstanceStateCode::RUNNING
     ELB_INSTANCE_INSERVICE = RubyAemAws::ELBInstanceState::HEALTHY.freeze

data/lib/ruby_aem_aws.rb

@@ -12,6 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'aws-sdk-autoscaling'
+require 'aws-sdk-cloudformation'
+require 'aws-sdk-cloudwatch'
+require 'aws-sdk-cloudwatchlogs'
+require 'aws-sdk-dynamodb'
+require 'aws-sdk-ec2'
+require 'aws-sdk-elasticloadbalancingv2'
+require 'aws-sdk-sns'
+require 'aws-sdk-s3'
 require_relative 'ruby_aem_aws/architecture/consolidated_stack'
 require_relative 'ruby_aem_aws/architecture/full_set_stack'
 require_relative 'ruby_aem_aws/architecture/stack_manager'
@@ -23,6 +32,7 @@ module RubyAemAws
     # - aws_region: the AWS region (eg ap-southeast-2)
     # - aws_access_key_id: the AWS access key
     # - aws_secret_access_key: the AWS secret access key
+    # - aws_session_token: session token from STS
     # - aws_profile: AWS profile name
     # @return new RubyAemAws::AemAws instance
     def initialize(conf = {})

metadata

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