ruby_aem_aws 0.9.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d23d001d09dd996630598d0071f708718f30b0b
-  data.tar.gz: c5cefe20a38f77314d6cbeed3f9ed8cb388d7f56
+  metadata.gz: 3daf08867a182eb7c35e8ed5ebcfb53e7bb389a5
+  data.tar.gz: 6da14e3a85100aa7a00f101ce126bd58e1eab7b8
 SHA512:
-  metadata.gz: 63fb90c45359a8f53ce46f3915b4db065af656a8191580737ecce6c63021d5ac6e1976700ec7cac4a68ce5965763431d44a5c93b60bb2885eff2cf8da8173249
-  data.tar.gz: ebbedfd91b882d848d4e02380fa385bd49a9c850b4f401fbab62df3870f7d98bbb28b8f2e23064e0360346427d46f6a41944940b835c8d6d9de7e2224e2fa722
+  metadata.gz: 5684eeab58ef11ff2eb70f7478f2ca52f56d1402119c5c96ef81f44981dfd14347cdb91e673191a68864e0657d9ff06d7577007a382f4ff6d937233429c46a1d
+  data.tar.gz: f21329b8af855fdec77baa94587f9fafd1f593ca5687365bab749ad92f5d879ed486f33dbf7ed0804261ff2807b32967fe3b5dde909bc429894aa4d5823b5877

data/lib/ruby_aem_aws/abstract/cloudwatch.rb

@@ -0,0 +1,81 @@
+# Copyright 2018 Shine Solutions
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative '../error'
+
+module RubyAemAws
+  # Add common methods to all Components.
+  module AbstractCloudwatch
+    # @param alarm_name Cloudwatch alarm name
+    # @return Array of a Cloudwatch alarm filter to filter for a specific Cloudwatch alarm
+    private def filter_for_cloudwatch_alarm(alarm_name)
+      {
+        alarm_names: [alarm_name]
+      }
+    end
+
+    # @param loggroup_name Cloudwatch loggroup name
+    # @param log_stream_name Cloudwatch logstream name
+    # @param log_message log message to filter for
+    # @return Array of a Cloudwatch log event filter to filter for a specific Cloudwatch log event
+    private def filter_for_cloudwatch_log_event(loggroup_name, log_stream_name, log_message)
+      {
+        log_group_name: loggroup_name,
+        log_stream_names: [log_stream_name],
+        filter_pattern: log_message
+      }
+    end
+
+    # @param loggroup_name Cloudwatch loggroup name
+    # @param log_stream_name Cloudwatch logstream name
+    # @return Array of a Cloudwatch log stream filter to filter for a specific Cloudwatch log stream
+    private def filter_for_cloudwatch_log_stream(log_group_name, log_stream_name)
+      {
+        log_group_name: log_group_name,
+        log_stream_name_prefix: log_stream_name,
+        order_by: 'LogStreamName'
+      }
+    end
+
+    # @param namespace Cloudwatch metric namespace
+    # @param metric_name Cloudwatch metric name
+    # @return Array of a Cloudwatch metric filter to filter for a specific Cloudwatch metric
+    private def filter_for_cloudwatch_metric(namespace, metric_name)
+      {
+        namespace: namespace,
+        metric_name: metric_name
+      }
+    end
+
+    # @param dimension_values Cloudwatch Dimension value
+    # @return Array of a Cloudwatch dimension filter for the Cloudwatch metric filter
+    private def dimensions_filter_for_cloudwatch_metric(dimension_values)
+      {
+        dimensions: [
+          dimension_values
+        ]
+      }
+    end
+
+    # @param dimensions_name Cloudwatch Dimension name
+    # @param dimension_values Cloudwatch Dimension value
+    # @return Array of a Cloudwatch Dimension value filter for the Cloudwatch dimension filter
+    private def dimensions_value_filter_for_cloudwatch_metric(dimensions_name, dimensions_value)
+      {
+        name: dimensions_name,
+        value: dimensions_value
+      }
+    end
+  end
+end

data/lib/ruby_aem_aws/{component/abstract_component.rb → abstract/component.rb}

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative 'component_descriptor'
-require_relative 'mixins/instance_describer'
+require_relative '../component/component_descriptor'
+require_relative '../mixins/instance_describer'
 require_relative '../error'
 
 module RubyAemAws
@@ -36,6 +36,8 @@ module RubyAemAws
       }
     end
 
+    # @param snapshot_type SnapshotType tag
+    # @return Array of a EC2 filter to filter for a specific Snapshottype
     private def filter_for_snapshot(snapshot_type)
       {
         filters: [

data/lib/ruby_aem_aws/{component/abstract_grouped_component.rb → abstract/grouped_component.rb}

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 require 'aws-sdk'
-require_relative 'abstract_component'
+require_relative 'component'
 
 module RubyAemAws
   # Add common methods to all Components.

data/lib/ruby_aem_aws/{component/abstract_single_component.rb → abstract/single_component.rb}

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 require 'aws-sdk'
-require_relative 'abstract_component'
+require_relative 'component'
 
 module RubyAemAws
   # Add common methods to all Components.

data/lib/ruby_aem_aws/{component/abstract_snapshot.rb → abstract/snapshot.rb}

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 require 'aws-sdk'
-require_relative 'abstract_component'
+require_relative 'component'
 
 module RubyAemAws
   # Add method to scan for snapshots

data/lib/ruby_aem_aws/{component/abstract_stackmanager.rb → abstract/stackmanager.rb}

@@ -15,6 +15,9 @@
 module RubyAemAws
   # Add common methods to StackManager resource
   module AbstractStackManager
+    # @param dynamodb_tablename AWS DynamoDB table name
+    # @param attribute_value value to scan for
+    # @return Array of a DynamoDB filter to scan for a specific value
     private def filter_for_db_scan(dynamodb_tablename, attribute_value)
       {
         table_name: dynamodb_tablename,
@@ -29,6 +32,9 @@ module RubyAemAws
       }
     end
 
+    # @param dynamodb_tablename AWS DynamoDB table name
+    # @param attkey_attribute_valueribute_value Key value to query for
+    # @return Array of a DynamoDB filter to query for a specific value
     private def filter_for_db_query(dynamodb_tablename, key_attribute_value)
       {
         table_name: dynamodb_tablename,
@@ -49,6 +55,10 @@ module RubyAemAws
       }
     end
 
+    # @param task Stack Manager task to trigger
+    # @param stack_prefix Target Stack Prefix name
+    # @param details SNS Message payload
+    # @return Array of a AWS SNS publish filter to query for a specific value
     private def message_for_sns_publish(task, stack_prefix, details)
       "{ \"default\": \"{ 'task': '#{task}', 'stack_prefix': '#{stack_prefix}', 'details': #{details} }\"}"
     end

data/lib/ruby_aem_aws/{consolidated_stack.rb → architecture/consolidated_stack.rb}

@@ -12,24 +12,38 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative 'component/author_publish_dispatcher'
+require_relative '../component/author_publish_dispatcher'
 
 module RubyAemAws
   # Factory for the consolidated AEM stack component interface.
   class ConsolidatedStack
+    attr_reader :cloudformation_client
+
     # @param stack_prefix AWS tag: StackPrefix
-    # @param ec2_resource AWS EC2 client
-    # @param cloud_watch_client AWS CloudWatch client
+    # @param params Array of AWS Clients and Resource connections:
+    # - CloudFormationClient: AWS Cloudformation Client.
+    # - CloudWatchClient: AWS Cloudwatch Client.
+    # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
+    # - Ec2Resource: AWS EC2 Resource connection.
     # @return new RubyAemAws::ConsolidatedStack instance
-    def initialize(stack_prefix, ec2_resource, cloud_watch_client)
+    def initialize(stack_prefix, params)
+      @consolidated_aws_clients = {
+        CloudWatchClient: params[:CloudWatchClient],
+        CloudWatchLogsClient: params[:CloudWatchLogsClient],
+        Ec2Resource: params[:Ec2Resource]
+      }
+      @cloudformation_client = cloudformation_client
       @stack_prefix = stack_prefix
-      @ec2_resource = ec2_resource
-      @cloud_watch_client = cloud_watch_client
     end
 
+    # @param stack_prefix AWS tag: StackPrefix
+    # @param consolidated_aws_clients Array of AWS Clients and Resource connections:
+    # - CloudWatchClient: AWS Cloudwatch Client.
+    # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
+    # - Ec2Resource: AWS EC2 Resource connection.
     # @return new RubyAemAws::Component::AuthorPublishDispatcher instance
     def author_publish_dispatcher
-      RubyAemAws::Component::AuthorPublishDispatcher.new(@stack_prefix, @ec2_resource, @cloud_watch_client)
+      RubyAemAws::Component::AuthorPublishDispatcher.new(@stack_prefix, @consolidated_aws_clients)
     end
   end
 end

data/lib/ruby_aem_aws/architecture/full_set_stack.rb

@@ -0,0 +1,141 @@
+# Copyright 2018 Shine Solutions
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative '../component/author_dispatcher'
+require_relative '../component/author'
+require_relative '../component/chaos_monkey'
+require_relative '../component/orchestrator'
+require_relative '../component/publish_dispatcher'
+require_relative '../component/publish'
+require_relative '../mixins/metric_verifier'
+
+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
+    # @param params Array of AWS Clients and Resource connections:
+    # - AutoScalingClient: AWS AutoScalingGroup Client.
+    # - CloudFormationClient: AWS Cloudformation Client.
+    # - CloudWatchClient: AWS Cloudwatch Client.
+    # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
+    # - Ec2Resource: AWS EC2 Resource connection.
+    # - ElbClient: AWS ElasticLoadBalancer Client.
+    # @return new RubyAemAws::FullSetStack instance
+    def initialize(stack_prefix, params)
+      @author_aws_clients = {
+        CloudWatchClient: params[:CloudWatchClient],
+        CloudWatchLogsClient: params[:CloudWatchLogsClient],
+        Ec2Resource: params[:Ec2Resource],
+        ElbClient: params[:ElbClient]
+      }
+
+      @dispatcher_aws_clients = {
+        AutoScalingClient: params[:AutoScalingClient],
+        CloudWatchClient: params[:CloudWatchClient],
+        CloudWatchLogsClient: params[:CloudWatchLogsClient],
+        Ec2Resource: params[:Ec2Resource],
+        ElbClient: params[:ElbClient]
+      }
+
+      @publish_aws_clients = {
+        AutoScalingClient: params[:AutoScalingClient],
+        CloudWatchClient: params[:CloudWatchClient],
+        CloudWatchLogsClient: params[:CloudWatchLogsClient],
+        Ec2Resource: params[:Ec2Resource]
+      }
+
+      @aem_java_aws_clients = {
+        AutoScalingClient: params[:AutoScalingClient],
+        CloudWatchClient: params[:CloudWatchClient],
+        CloudWatchLogsClient: params[:CloudWatchLogsClient],
+        Ec2Resource: params[:Ec2Resource]
+      }
+
+      @cloudformation_client = params[:CloudFormationClient]
+      @cloud_watch_client = params[:CloudWatchClient]
+      @stack_prefix = stack_prefix
+    end
+
+    # @param stack_prefix AWS tag: StackPrefix
+    # @param dispatcher_aws_clients Array of AWS Clients and Resource connections:
+    # - AutoScalingClient: AWS AutoScalingGroup Client.
+    # - CloudWatchClient: AWS Cloudwatch Client.
+    # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
+    # - Ec2Resource: AWS EC2 Resource connection.
+    # - ElbClient: AWS ElasticLoadBalancer Client.
+    # @return new RubyAemAws::Component::AuthorDispatcher instance
+    def author_dispatcher
+      RubyAemAws::Component::AuthorDispatcher.new(@stack_prefix, @dispatcher_aws_clients)
+    end
+
+    # @param stack_prefix AWS tag: StackPrefix
+    # @param author_aws_clients Array of AWS Clients and Resource connections:
+    # - CloudWatchClient: AWS Cloudwatch Client.
+    # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
+    # - Ec2Resource: AWS EC2 Resource connection.
+    # - ElbClient: AWS ElasticLoadBalancer Client.
+    # @return new RubyAemAws::Component::Author instance
+    def author
+      RubyAemAws::Component::Author.new(@stack_prefix, @author_aws_clients)
+    end
+
+    # @param stack_prefix AWS tag: StackPrefix
+    # @param chaos_monkey_aws_clients Array of AWS Clients and Resource connections:
+    # - AutoScalingClient: AWS AutoScalingGroup Client.
+    # - CloudWatchClient: AWS Cloudwatch Client.
+    # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
+    # - Ec2Resource: AWS EC2 Resource connection.
+    # @return new RubyAemAws::Component::ChaosMonkey instance
+    def chaos_monkey
+      RubyAemAws::Component::ChaosMonkey.new(@stack_prefix, @aem_java_aws_clients)
+    end
+
+    # @param stack_prefix AWS tag: StackPrefix
+    # @param orchestrator_aws_clients Array of AWS Clients and Resource connections:
+    # - AutoScalingClient: AWS AutoScalingGroup Client.
+    # - CloudWatchClient: AWS Cloudwatch Client.
+    # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
+    # - Ec2Resource: AWS EC2 Resource connection.
+    # @return new RubyAemAws::Component::Orchestrator instance
+    def orchestrator
+      RubyAemAws::Component::Orchestrator.new(@stack_prefix, @aem_java_aws_clients)
+    end
+
+    # @param stack_prefix AWS tag: StackPrefix
+    # @param publish_aws_clients Array of AWS Clients and Resource connections:
+    # - AutoScalingClient: AWS AutoScalingGroup Client.
+    # - CloudWatchClient: AWS Cloudwatch Client.
+    # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
+    # - Ec2Resource: AWS EC2 Resource connection.
+    # @return new RubyAemAws::Component::Publish instance
+    def publish
+      RubyAemAws::Component::Publish.new(@stack_prefix, @publish_aws_clients)
+    end
+
+    # @param stack_prefix AWS tag: StackPrefix
+    # @param dispatcher_aws_clients Array of AWS Clients and Resource connections:
+    # - AutoScalingClient: AWS AutoScalingGroup Client.
+    # - CloudWatchClient: AWS Cloudwatch Client.
+    # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
+    # - Ec2Resource: AWS EC2 Resource connection.
+    # - ElbClient: AWS ElasticLoadBalancer Client.
+    # @return new RubyAemAws::Component::PublishDispatcher instance
+    def publish_dispatcher
+      RubyAemAws::Component::PublishDispatcher.new(@stack_prefix, @dispatcher_aws_clients)
+    end
+  end
+end

data/lib/ruby_aem_aws/architecture/stack_manager.rb

@@ -0,0 +1,44 @@
+# Copyright 2018 Shine Solutions
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative '../component/stack_manager_resources'
+
+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.
+    # - CloudWatchClient: AWS Cloudwatch Client.
+    # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
+    # - DynamoDBClient: AWS DynamoDB Client.
+    # - S3Client: AWS S3 Client.
+    # - S3Resource: AWS S3 Resource connection.
+    # @return new RubyAemAws::StackManager instance
+    def initialize(stack_prefix, params)
+      stack_manager_aws_client = {
+        CloudWatchClient: params[:CloudWatchClient],
+        CloudWatchLogsClient: params[:CloudWatchLogsClient],
+        DynamoDBClient: params[:DynamoDBClient],
+        S3Client: params[:S3Client],
+        S3Resource: params[:S3Resource]
+      }
+
+      @sm_resources = RubyAemAws::Component::StackManagerResources.new(stack_manager_aws_client)
+      @cloudformation_client = params[:CloudFormationClient]
+      @stack_prefix = stack_prefix
+    end
+  end
+end

data/lib/ruby_aem_aws/client/cloudwatch.rb

@@ -0,0 +1,87 @@
+# Copyright 2018 Shine Solutions
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module RubyAemAws
+  # Mixin for checking that an instance has associated CloudWatch metrics.
+  module CloudwatchClient
+    # @param alarm_name Cloudwatch alarm name
+    # @return Cloudwatch client describe_alarms response
+    def get_alarm(alarm_name)
+      alarm_filter = filter_for_cloudwatch_alarm(alarm_name)
+
+      response = cloud_watch_client.describe_alarms(alarm_filter)
+
+      until response.next_token.nil?
+        next_token = { next_token: response.next_token }
+        filter.update(next_token)
+        response = cloud_watch_client.describe_alarms(alarm_filter)
+      end
+
+      response
+    end
+
+    # @param loggroup_name Cloudwatch loggroup name
+    # @param log_stream_name Cloudwatch log stream name
+    # @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)
+      filter = filter_for_cloudwatch_log_event(loggroup_name, log_stream_name, log_message)
+      response = cloud_watch_log_client.filter_log_events(filter)
+
+      until response.next_token.nil?
+        next_token = { next_token: response.next_token }
+        filter.update(next_token)
+        response = cloud_watch_client.filter_log_events(filter)
+      end
+
+      response
+    end
+
+    # @param loggroup_name Cloudwatch loggroup name
+    # @param log_stream_name Cloudwatch log stream name
+    # @return Cloudwatch log client describe_log_streams response
+    def get_log_streams(loggroup_name, log_stream_name)
+      filter = filter_for_cloudwatch_log_stream(loggroup_name, log_stream_name)
+
+      response = cloud_watch_log_client.describe_log_streams(filter)
+
+      until response.next_token.nil?
+        next_token = { next_token: response.next_token }
+        filter.update(next_token)
+        response = cloud_watch_client.describe_log_streams(filter)
+      end
+
+      response
+    end
+
+    # @param namespace Cloudwatch namespace name
+    # @param metric_name Cloudwatch metric name
+    # @param dimension Cloudwatch dimension filter
+    # @return Cloudwatch client list_metrics response
+    def get_metrics(namespace, metric_name, dimension)
+      filter = filter_for_cloudwatch_metric(namespace, metric_name)
+      filter.update(dimension)
+
+      response = cloud_watch_client.list_metrics(filter)
+
+      until response.next_token.nil?
+        next_token = { next_token: response.next_token }
+        filter.update(next_token)
+        response = cloud_watch_client.list_metrics(filter)
+      end
+
+      response
+    end
+  end
+end

data/lib/ruby_aem_aws/{component/mixins → client}/s3.rb

@@ -36,7 +36,7 @@ module RubyAemAws
     def get_s3_object(bucket, s3_object_name, dest_path)
       options = { bucket: bucket, key: s3_object_name }
       options = options.merge(response_target: dest_path) unless dest_path.nil?
-      s3_client.get_object(**options)
+      s3_client.get_object(options)
     end
   end
 end

data/lib/ruby_aem_aws/component/author.rb

@@ -25,15 +25,23 @@ module RubyAemAws
       ELB_NAME = 'AEM Author Load Balancer'.freeze
 
       # @param stack_prefix AWS tag: StackPrefix
-      # @param ec2_resource AWS EC2 resource
-      # @param elb_client AWS ELB client
-      # @param cloud_watch_client AWS CloudWatch client
+      # @param params Array of AWS Clients and Resource connections:
+      # - CloudWatchClient: AWS Cloudwatch Client.
+      # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
+      # - Ec2Resource: AWS EC2 Resource connection.
+      # - ElbClient: AWS ElasticLoadBalancer Client.
       # @return new RubyAemAws::FullSet::Author
-      def initialize(stack_prefix, ec2_resource, elb_client, cloud_watch_client)
-        @author_primary = Component::AuthorPrimary.new(stack_prefix, ec2_resource, cloud_watch_client)
-        @author_standby = Component::AuthorStandby.new(stack_prefix, ec2_resource, cloud_watch_client)
-        @ec2_resource = ec2_resource
-        @elb_client = elb_client
+      def initialize(stack_prefix, params)
+        author_aws_clients = {
+          CloudWatchClient: params[:CloudWatchClient],
+          CloudWatchLogsClient: params[:CloudWatchLogsClient],
+          Ec2Resource: params[:Ec2Resource]
+        }
+
+        @author_primary = Component::AuthorPrimary.new(stack_prefix, author_aws_clients)
+        @author_standby = Component::AuthorStandby.new(stack_prefix, author_aws_clients)
+        @ec2_resource = params[:Ec2Resource]
+        @elb_client = params[:ElbClient]
       end
 
       # @return true, if all author instances are healthy

data/lib/ruby_aem_aws/component/author_dispatcher.rb

@@ -12,21 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative 'abstract_grouped_component'
-require_relative 'abstract_snapshot'
-require_relative 'mixins/healthy_count_verifier'
-require_relative 'mixins/metric_verifier'
+require_relative '../abstract/grouped_component'
+require_relative '../abstract/snapshot'
+require_relative '../mixins/healthy_resource_verifier'
+require_relative '../mixins/metric_verifier'
 require_relative 'component_descriptor'
-require_relative 'mixins/snapshot_verifier'
+require_relative '../mixins/snapshot_verifier'
 
 module RubyAemAws
   module Component
     # 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
+      attr_reader :descriptor, :ec2_resource, :asg_client, :elb_client, :cloud_watch_client, :cloud_watch_log_client
       include AbstractGroupedComponent
       include AbstractSnapshot
-      include HealthyCountVerifier
+      include HealthyResourceVerifier
       include MetricVerifier
       include SnapshotVerifier
 
@@ -36,19 +36,22 @@ module RubyAemAws
       ELB_NAME = 'AEM Author Dispatcher Load Balancer'.freeze
 
       # @param stack_prefix AWS tag: StackPrefix
-      # @param ec2_resource AWS EC2 resource
-      # @param asg_client AWS AutoScalingGroup client
-      # @param elb_client AWS ElasticLoadBalancer client
-      # @param cloud_watch_client AWS CloudWatch client
+      # @param params Array of AWS Clients and Resource connections:
+      # - AutoScalingClient: AWS AutoScalingGroup Client.
+      # - CloudWatchClient: AWS Cloudwatch Client.
+      # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
+      # - Ec2Resource: AWS EC2 Resource connection.
+      # - ElbClient: AWS ElasticLoadBalancer Client.
       # @return new RubyAemAws::FullSet::AuthorDispatcher
-      def initialize(stack_prefix, ec2_resource, asg_client, elb_client, cloud_watch_client)
+      def initialize(stack_prefix, params)
         @descriptor = ComponentDescriptor.new(stack_prefix,
                                               EC2Descriptor.new(EC2_COMPONENT, EC2_NAME),
                                               ELBDescriptor.new(ELB_ID, ELB_NAME))
-        @ec2_resource = ec2_resource
-        @elb_client = elb_client
-        @asg_client = asg_client
-        @cloud_watch_client = cloud_watch_client
+        @asg_client = params[:AutoScalingClient]
+        @cloud_watch_client = params[:CloudWatchClient]
+        @cloud_watch_log_client = params[:CloudWatchLogsClient]
+        @ec2_resource = params[:Ec2Resource]
+        @elb_client = params[:ElbClient]
       end
 
       def terminate_all_instances

data/lib/ruby_aem_aws/component/author_primary.rb

@@ -12,17 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative 'abstract_single_component'
-require_relative 'abstract_snapshot'
-require_relative 'mixins/healthy_state_verifier'
-require_relative 'mixins/metric_verifier'
-require_relative 'mixins/snapshot_verifier'
+require_relative '../abstract/single_component'
+require_relative '../abstract/snapshot'
+require_relative '../mixins/healthy_state_verifier'
+require_relative '../mixins/metric_verifier'
+require_relative '../mixins/snapshot_verifier'
 
 module RubyAemAws
   module Component
     # 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
+      attr_reader :descriptor, :ec2_resource, :cloud_watch_client, :cloud_watch_log_client
       include AbstractSingleComponent
       include AbstractSnapshot
       include HealthyStateVerifier
@@ -33,14 +33,17 @@ module RubyAemAws
       EC2_NAME = 'AEM Author - Primary'.freeze
 
       # @param stack_prefix AWS tag: StackPrefix
-      # @param ec2_resource AWS EC2 resource
-      # @param cloud_watch_client AWS CloudWatch client
+      # @param params Array of AWS Clients and Resource connections:
+      # - CloudWatchClient: AWS Cloudwatch Client.
+      # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
+      # - Ec2Resource: AWS EC2 Resource connection.
       # @return new RubyAemAws::FullSet::AuthorPrimary
-      def initialize(stack_prefix, ec2_resource, cloud_watch_client)
+      def initialize(stack_prefix, params)
         @descriptor = ComponentDescriptor.new(stack_prefix,
                                               EC2Descriptor.new(EC2_COMPONENT, EC2_NAME))
-        @ec2_resource = ec2_resource
-        @cloud_watch_client = cloud_watch_client
+        @cloud_watch_client = params[:CloudWatchClient]
+        @cloud_watch_log_client = params[:CloudWatchLogsClient]
+        @ec2_resource = params[:Ec2Resource]
       end
 
       # @return Aws::EC2::Instance