ruby_aem_aws 2.2.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e03800c323cf88f17f022f87f3df8bcd3316d95
-  data.tar.gz: 6288fdc5638777b3160dde0ef53b6e6579292741
+  metadata.gz: 95cd5259db49091f98e9697a3af15805c17e41a2
+  data.tar.gz: d4900116bedbdd096c20d3a7f2bacaaa35a9d31c
 SHA512:
-  metadata.gz: f62da424b5d615bfb8cb7a057c622335c781e47949cf3a7b590da51f1e8005cc93010bf789ff524019fa1fe5f3fcada98288f58a61880293a1c655094f0c34d6
-  data.tar.gz: 524f111c5a735488159a963c6354b714a784f9720e0d9556febf923b94a59ffd1d31b2b210ee2870341d924071eeee5608b0946abe6eec38bbe49b62956471fd
+  metadata.gz: 9c2e3351dceefc15ff96a2b3d5e8b9caa4629ac771e2d381e63d6ca27cff1ebd59f0d8c9331eed4388711af205e83a38bdb7a8069e8f2e44fe60e1cc3fe8ffd6
+  data.tar.gz: 8600e31f276230b59f5f5edb9614909b15d7d54444bddb77486515c802d13db688cf2010860486b0650001de0ff04beaeb771c8b26f3021a8a0bfb0010215275

data/conf/gem.yaml

@@ -1 +1 @@
-version: 2.2.0
+version: 2.3.1

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'] || 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'

metadata

@@ -1,29 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: ruby_aem_aws
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Shine Solutions
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-22 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-autoscaling
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 1.80.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 1.80.0
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-cloudformation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.70.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.70.0
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-cloudwatch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.67.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.67.0
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-cloudwatchlogs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.53.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.53.0
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-dynamodb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.76.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.76.0
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-ec2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.331.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.331.0
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-elasticloadbalancingv2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.79.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.79.0
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-sns
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.55.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.55.0
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.114.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.114.0
 - !ruby/object:Gem::Dependency
   name: retries
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +170,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.11.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: 0.9.28
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: 0.9.28
 description: ruby_aem_aws is a Ruby client for Shine Solutions Adobe Experience Manager
   (AEM) Platform on AWS
 email: