ruby_aem_aws 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff1811700428fb65c37eb7e1483880d021409248
-  data.tar.gz: 0a9a738540c1b4ef71c36b4a7d87720f92dc21ca
+  metadata.gz: 3509ae25ef1a37f800a95eec009bddb1280cbc0c
+  data.tar.gz: 0676f7a857483a52a78c0ab13efd389bdd5f6250
 SHA512:
-  metadata.gz: dde9e65199958cda617db9e1c0025c572afd05b66233773ac642dc424003d5913b9b88ee20492ae63dc24c011e082e914ffa58aaaf7ee63b629e4ffd8fc4ac99
-  data.tar.gz: '0342921e2739eb702196395a0f2a9bcbe89395fb631a352ebb7a211453f42a435b3513a8c6b680ddfa7cfdd265e60263d4544bdc4ea40cf5cf37084d5b38f5c4'
+  metadata.gz: 8ec2ccf3f5b781fd7f191e7a0835d4f65d82fd6a8e396dad43c8f47d8b68c8e754c68d0afb51474fbefa8e30b03301c62b6a85cb122f24370e1e250f4ec820b4
+  data.tar.gz: 1ec2dabe8d7b26d741b25cecec676121e7ebb9e6dc824c65f8b5a4bf8944a706658bfe0ad07b433665b9e0e0ccf7bfede7a5ba29d19d170c384541ffb7722ad9

data/conf/gem.yaml

@@ -0,0 +1 @@
+version: 2.0.0

data/lib/ruby_aem_aws.rb

@@ -20,23 +20,24 @@ module RubyAemAws
   # AemAws class represents the AWS stack for AEM.
   class AemAws
     # @param conf configuration hash of the following configuration values:
-    # - region: the AWS region (eg ap-southeast-2)
+    # - 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_profile: AWS profile name
     # @return new RubyAemAws::AemAws instance
     def initialize(conf = {})
-      conf[:region] ||= Constants::REGION_DEFAULT
+      conf[:aws_region] ||= Constants::REGION_DEFAULT
       conf[:aws_access_key_id] ||= Constants::ACCESS_KEY_ID
       conf[:aws_secret_access_key] ||= Constants::SECRET_ACCESS_KEY
       conf[:aws_profile] ||= Constants::PROFILE
 
-      Aws.config.update(region: conf[:region])
+      Aws.config.update(region: conf[:aws_region])
 
       credentials = Aws::Credentials.new(conf[:aws_access_key_id], conf[:aws_secret_access_key]) unless conf[:aws_access_key_id].nil?
       credentials = Aws::SharedCredentials.new(profile_name: conf[:aws_profile]) unless conf[:aws_profile].nil?
       credentials = Aws::InstanceProfileCredentials.new if conf[:aws_profile].nil? && conf[:aws_access_key_id].nil?
       raise RubyAemAws::ArgumentError unless defined? credentials
+
       Aws.config.update(credentials: credentials)
 
       @aws = AwsCreator.create_aws
@@ -57,11 +58,6 @@ module RubyAemAws
     # Create a consolidated instance.
     #
     # @param stack_prefix AWS tag: StackPrefix
-    # @param aws_clients 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 consolidated(stack_prefix)
       aws_clients = {
@@ -77,13 +73,6 @@ module RubyAemAws
     # Create a full set instance.
     #
     # @param stack_prefix AWS tag: StackPrefix
-    # @param aws_clients 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 full_set(stack_prefix)
       aws_clients = {
@@ -101,13 +90,6 @@ module RubyAemAws
     # Create Stack Manager resources
     #
     # @param stack_prefix AWS tag: StackPrefix
-    # @param aws_clients 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 stack_manager(stack_prefix)
       aws_clients = {
@@ -129,7 +111,7 @@ module RubyAemAws
       {
         Ec2Client: Aws::EC2::Client.new,
         Ec2Resource: Aws::EC2::Resource.new,
-        ElbClient: Aws::ElasticLoadBalancing::Client.new(
+        ElbClient: Aws::ElasticLoadBalancingV2::Client.new(
           retry_limit: 20
         ),
         AutoScalingClient: Aws::AutoScaling::Client.new(

data/lib/ruby_aem_aws/abstract/cloudwatch.rb

@@ -39,7 +39,7 @@ module RubyAemAws
       }
     end
 
-    # @param loggroup_name Cloudwatch loggroup name
+    # @param log_group_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
     def filter_for_cloudwatch_log_stream(log_group_name, log_stream_name)
@@ -71,7 +71,7 @@ module RubyAemAws
     end
 
     # @param dimensions_name Cloudwatch Dimension name
-    # @param dimension_values Cloudwatch Dimension value
+    # @param dimensions_value Cloudwatch Dimension value
     # @return Array of a Cloudwatch Dimension value filter for the Cloudwatch dimension filter
     def dimensions_value_filter_for_cloudwatch_metric(dimensions_name, dimensions_value)
       {

data/lib/ruby_aem_aws/abstract/component.rb

@@ -33,7 +33,6 @@ module RubyAemAws
         filters: [
           { name: 'tag:StackPrefix', values: [@descriptor.stack_prefix] },
           { name: 'tag:Component', values: [@descriptor.ec2.component] },
-          { name: 'tag:Name', values: [@descriptor.ec2.name] },
           { name: 'instance-state-name', values: ['running'] }
         ]
       }

data/lib/ruby_aem_aws/abstract/single_component.rb

@@ -25,6 +25,7 @@ module RubyAemAws
       count = instances.count
       raise RubyAemAws::ExpectedSingleInstanceError if count > 1
       return nil if count.zero?
+
       instances.first
     end
 

data/lib/ruby_aem_aws/abstract/stackmanager.rb

@@ -35,7 +35,7 @@ module RubyAemAws
     end
 
     # @param dynamodb_tablename AWS DynamoDB table name
-    # @param attkey_attribute_valueribute_value Key value to query for
+    # @param key_attribute_value Key value to query for
     # @return Array of a DynamoDB filter to query for a specific value
     def filter_for_db_query(dynamodb_tablename, key_attribute_value)
       {

data/lib/ruby_aem_aws/architecture/consolidated_stack.rb

@@ -36,11 +36,6 @@ module RubyAemAws
       @stack_prefix = stack_prefix
     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, @consolidated_aws_clients)

data/lib/ruby_aem_aws/architecture/full_set_stack.rb

@@ -33,7 +33,7 @@ module RubyAemAws
     # - CloudWatchClient: AWS Cloudwatch Client.
     # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
     # - Ec2Resource: AWS EC2 Resource connection.
-    # - ElbClient: AWS ElasticLoadBalancer Client.
+    # - ElbClient: AWS ElasticLoadBalancer v2 Client.
     # @return new RubyAemAws::FullSetStack instance
     def initialize(stack_prefix, params)
       @author_aws_clients = {
@@ -70,69 +70,31 @@ module RubyAemAws
       @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)

data/lib/ruby_aem_aws/component/author.rb

@@ -29,7 +29,7 @@ module RubyAemAws
       # - CloudWatchClient: AWS Cloudwatch Client.
       # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
       # - Ec2Resource: AWS EC2 Resource connection.
-      # - ElbClient: AWS ElasticLoadBalancer Client.
+      # - ElbClient: AWS ElasticLoadBalancer v2 Client.
       # @return new RubyAemAws::FullSet::Author
       def initialize(stack_prefix, params)
         author_aws_clients = {
@@ -59,6 +59,13 @@ module RubyAemAws
         instance += 1 if author_standby.wait_until_healthy.eql? true
         return true unless instance < 2
       end
+
+      def get_tags
+        tags = []
+        tags.push(author_primary.get_tags)
+        tags.push(author_standby.get_tags)
+        tags
+      end
     end
   end
 end

data/lib/ruby_aem_aws/component/author_dispatcher.rb

@@ -14,6 +14,7 @@
 
 require_relative '../abstract/grouped_component'
 require_relative '../abstract/snapshot'
+require_relative '../constants'
 require_relative '../mixins/healthy_resource_verifier'
 require_relative '../mixins/metric_verifier'
 require_relative 'component_descriptor'
@@ -41,7 +42,7 @@ module RubyAemAws
       # - CloudWatchClient: AWS Cloudwatch Client.
       # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
       # - Ec2Resource: AWS EC2 Resource connection.
-      # - ElbClient: AWS ElasticLoadBalancer Client.
+      # - ElbClient: AWS ElasticLoadBalancer v2 Client.
       # @return new RubyAemAws::FullSet::AuthorDispatcher
       def initialize(stack_prefix, params)
         @descriptor = ComponentDescriptor.new(stack_prefix,
@@ -56,7 +57,8 @@ module RubyAemAws
 
       def terminate_all_instances
         get_all_instances.each do |i|
-          next if i.nil?
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
+
           i.terminate
           i.wait_until_terminated
         end
@@ -67,6 +69,16 @@ module RubyAemAws
         instance.terminate
         instance.wait_until_terminated
       end
+
+      def get_tags
+        tags = []
+        get_all_instances.each do |i|
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
+
+          tags.push(i.tags)
+        end
+        tags
+      end
     end
   end
 end

data/lib/ruby_aem_aws/component/author_primary.rb

@@ -52,6 +52,11 @@ module RubyAemAws
         instance.terminate
         instance.wait_until_terminated
       end
+
+      def get_tags
+        instance = get_instance
+        instance.tags
+      end
     end
   end
 end

data/lib/ruby_aem_aws/component/author_publish_dispatcher.rb

@@ -46,6 +46,11 @@ module RubyAemAws
         @cloud_watch_log_client = params[:CloudWatchLogsClient]
         @ec2_resource = params[:Ec2Resource]
       end
+
+      def get_tags
+        instance = get_instance
+        instance.tags
+      end
     end
   end
 end

data/lib/ruby_aem_aws/component/author_standby.rb

@@ -23,7 +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 AbstractGroupedComponent
+      include AbstractSingleComponent
       include AbstractSnapshot
       include HealthyStateVerifier
       include MetricVerifier
@@ -52,6 +52,11 @@ module RubyAemAws
         instance.terminate
         instance.wait_until_terminated
       end
+
+      def get_tags
+        instance = get_instance
+        instance.tags
+      end
     end
   end
 end

data/lib/ruby_aem_aws/component/chaos_monkey.rb

@@ -14,6 +14,7 @@
 
 require_relative '../abstract/grouped_component'
 require_relative '../abstract/snapshot'
+require_relative '../constants'
 require_relative '../mixins/healthy_resource_verifier'
 require_relative '../mixins/metric_verifier'
 require_relative '../mixins/snapshot_verifier'
@@ -50,7 +51,8 @@ module RubyAemAws
 
       def terminate_all_instances
         get_all_instances.each do |i|
-          next if i.nil?
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
+
           i.terminate
           i.wait_until_terminated
         end
@@ -61,6 +63,16 @@ module RubyAemAws
         instance.terminate
         instance.wait_until_terminated
       end
+
+      def get_tags
+        tags = []
+        get_all_instances.each do |i|
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
+
+          tags.push(i.tags)
+        end
+        tags
+      end
     end
   end
 end

data/lib/ruby_aem_aws/component/component_descriptor.rb

@@ -18,6 +18,7 @@ module RubyAemAws
       def stack_prefix
         # Unwrap from {:stack_prefix = value} to the value if necessary.
         return stack_prefix_in[:stack_prefix] if stack_prefix_in.is_a? Hash
+
         stack_prefix_in
       end
     end

data/lib/ruby_aem_aws/component/orchestrator.rb

@@ -14,6 +14,7 @@
 
 require_relative '../abstract/grouped_component'
 require_relative '../abstract/snapshot'
+require_relative '../constants'
 require_relative '../mixins/healthy_resource_verifier'
 require_relative '../mixins/metric_verifier'
 require_relative '../mixins/snapshot_verifier'
@@ -50,7 +51,8 @@ module RubyAemAws
 
       def terminate_all_instances
         get_all_instances.each do |i|
-          next if i.nil?
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
+
           i.terminate
           i.wait_until_terminated
         end
@@ -61,6 +63,16 @@ module RubyAemAws
         instance.terminate
         instance.wait_until_terminated
       end
+
+      def get_tags
+        tags = []
+        get_all_instances.each do |i|
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
+
+          tags.push(i.tags)
+        end
+        tags
+      end
     end
   end
 end

data/lib/ruby_aem_aws/component/publish.rb

@@ -14,6 +14,7 @@
 
 require_relative '../abstract/grouped_component'
 require_relative '../abstract/snapshot'
+require_relative '../constants'
 require_relative '../mixins/healthy_resource_verifier'
 require_relative '../mixins/metric_verifier'
 require_relative '../mixins/snapshot_verifier'
@@ -50,7 +51,8 @@ module RubyAemAws
 
       def terminate_all_instances
         get_all_instances.each do |i|
-          next if i.nil?
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
+
           i.terminate
           i.wait_until_terminated
         end
@@ -61,6 +63,16 @@ module RubyAemAws
         instance.terminate
         instance.wait_until_terminated
       end
+
+      def get_tags
+        tags = []
+        get_all_instances.each do |i|
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
+
+          tags.push(i.tags)
+        end
+        tags
+      end
     end
   end
 end

data/lib/ruby_aem_aws/component/publish_dispatcher.rb

@@ -14,6 +14,7 @@
 
 require_relative '../abstract/grouped_component'
 require_relative '../abstract/snapshot'
+require_relative '../constants'
 require_relative '../mixins/healthy_resource_verifier'
 require_relative '../mixins/metric_verifier'
 require_relative '../mixins/snapshot_verifier'
@@ -40,7 +41,7 @@ module RubyAemAws
       # - CloudWatchClient: AWS Cloudwatch Client.
       # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.
       # - Ec2Resource: AWS EC2 Resource connection.
-      # - ElbClient: AWS ElasticLoadBalancer Client.
+      # - ElbClient: AWS ElasticLoadBalancer v2 Client.
       # @return new RubyAemAws::FullSet::PublishDispatcher
       def initialize(stack_prefix, params)
         @descriptor = ComponentDescriptor.new(stack_prefix,
@@ -55,7 +56,8 @@ module RubyAemAws
 
       def terminate_all_instances
         get_all_instances.each do |i|
-          next if i.nil?
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
+
           i.terminate
           i.wait_until_terminated
         end
@@ -66,6 +68,16 @@ module RubyAemAws
         instance.terminate
         instance.wait_until_terminated
       end
+
+      def get_tags
+        tags = []
+        get_all_instances.each do |i|
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
+
+          tags.push(i.tags)
+        end
+        tags
+      end
     end
   end
 end

data/lib/ruby_aem_aws/component/stack_manager_resources.rb

@@ -29,7 +29,6 @@ module RubyAemAws
       include SNSTopic
       include S3Access
 
-      # @param dynamodb_client AWS DynamoDB client connection
       # @param params Array of AWS Clients and Resource connections:
       # - CloudWatchClient: AWS Cloudwatch Client.
       # - CloudWatchLogsClient: AWS Cloudwatch Logs Client.

data/lib/ruby_aem_aws/constants.rb

@@ -24,19 +24,34 @@ module RubyAemAws
     ALL_ACTIVE = [PENDING, RUNNING, SHUTTING_DOWN, STOPPING, STOPPED].freeze
   end
 
+  # API InstanceState codes https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_InstanceState.html
+  class InstanceStateCode
+    PENDING = 0
+    RUNNING = 16
+    SHUTTING_DOWN = 32
+    TERMINATED = 48
+    STOPPING = 64
+    STOPPED = 80
+  end
+
   class ELBInstanceState
-    INSERVICE = 'InService'.freeze
-    OUTOFSERVICE = 'OutOfService'.freeze
+    DRAINING = 'draining'.freeze
+    HEALTHY = 'healthy'.freeze
+    INITIAL = 'initial'.freeze
+    UNAVAILABLE = 'unavailable'.freeze
+    UNHEALTHY = 'unhealthy'.freeze
+    UNUSED = 'unused'.freeze
 
-    ALL_ACTIVE = [INSERVICE, OUTOFSERVICE].freeze
+    ALL_ACTIVE = [HEALTHY, INITIAL, UNAVAILABLE, UNUSED].freeze
   end
 
   class Constants
-    REGION_DEFAULT = 'ap-southeast-2'.freeze
+    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_scret_access_key']
     PROFILE = ENV['AWS_PROFILE']
     INSTANCE_STATE_HEALTHY = RubyAemAws::InstanceState::RUNNING.freeze
-    ELB_INSTANCE_INSERVICE = RubyAemAws::ELBInstanceState::INSERVICE.freeze
+    INSTANCE_STATE_CODE_RUNNING = RubyAemAws::InstanceStateCode::RUNNING
+    ELB_INSTANCE_INSERVICE = RubyAemAws::ELBInstanceState::HEALTHY.freeze
   end
 end

data/lib/ruby_aem_aws/error.rb

@@ -43,13 +43,6 @@ module RubyAemAws
 
   # Raise this when a component unexpectedly has more than one instance.
   class ExpectedSingleInstanceError < StandardError
-    # def initialize(count, descriptor)
-    #   message << 'Expected exactly one instance'
-    #   message << " but got #{count}" unless count.nil?
-    #   message << "for (#{descriptor.stack_prefix}, #{descriptor.ec2.component}, #{descriptor.ec2.name})" unless descriptor.nil?
-    #   super(message)
-    # end
-
     def initialize(msg = 'Expected exactly one instance')
       super
     end

data/lib/ruby_aem_aws/mixins/healthy_count_verifier.rb

@@ -48,7 +48,10 @@ module RubyAemAws
       return :no_elb if elb.nil?
 
       elb_running_instances = 0
-      get_instances_state_from_elb(elb).each do |i|
+      elb_instances = get_instances_state(elb_client, elb)
+      return :no_elb_targets if elb_instances.nil?
+
+      elb_instances.each do |i|
         elb_running_instances += 1 if i[:state] == RubyAemAws::Constants::INSTANCE_STATE_HEALTHY
       end
 
@@ -57,12 +60,14 @@ module RubyAemAws
       return :misconfigured if desired_capacity < 1
       return :recovering if elb_running_instances < desired_capacity
       return :scaling if elb_running_instances > desired_capacity
+
       :ready
     end
 
     # @return true, if all EC2 instances within the ELB are running
     def wait_until_healthy
       raise ELBMisconfiguration if health_state.eql?(:misconfigured)
+
       sleep 60 while health_state.eql?(:recovering) || health_state.eql?(:scaling)
       return true if health_state.eql?(:ready)
     end
@@ -93,6 +98,7 @@ module RubyAemAws
           if tag.key == 'StackPrefix' && tag.value == descriptor.stack_prefix
             asg_matches_stack_prefix = true
             break if asg_matches_component
+
             next
           end
           if tag.key == 'Component' && tag.value == descriptor.ec2.component
@@ -105,41 +111,71 @@ module RubyAemAws
       nil
     end
 
-    # @return ElasticLoadBalancer by StackPrefix and logical-id tags.
+    # @return ElasticLoadBalancer Arn.
     def find_elb(elb_client)
-      elbs = elb_client.describe_load_balancers.load_balancer_descriptions
+      elbs = elb_client.describe_load_balancers(page_size: 50)
+      elb_arn = find_elb_arn(elbs.load_balancers)
+
+      return elb_arn unless elb_arn.nil?
+
+      until elbs.last_page?
+        elbs = elb_client.describe_load_balancers(page_size: 50, marker: elbs.next_marker)
+        elb_arn = find_elb_arn(elbs.load_balancers)
+        return elb_arn unless elb_arn.nil?
+      end
+      nil
+    end
+
+    # @return ElasticLoadBalancer Arn by StackPrefix tag & ELB name.
+    def find_elb_arn(elbs)
       elbs.each do |elb|
         elb_matches_stack_prefix = false
-        elb_matches_logical_id = false
-        tag_descriptions = elb_client.describe_tags(load_balancer_names: [elb.load_balancer_name]).tag_descriptions
+        elb_matches_name = false
+        begin
+          tag_descriptions = elb_client.describe_tags(resource_arns: [elb.load_balancer_arn]).tag_descriptions
+        rescue Aws::ElasticLoadBalancingV2::Errors::LoadBalancerNotFound
+          next
+        end
+
         next if tag_descriptions.empty?
 
         tags = tag_descriptions[0].tags
         tags.each do |tag|
-          if tag.key == 'StackPrefix' && tag.value == descriptor.stack_prefix
-            elb_matches_stack_prefix = true
-            break if elb_matches_logical_id
-            next
-          end
-          if tag.key == 'aws:cloudformation:logical-id' && tag.value == descriptor.elb.id
-            elb_matches_logical_id = true
-            break if elb_matches_stack_prefix
-          end
+          elb_matches_stack_prefix = true if tag.key == 'StackPrefix' && tag.value == descriptor.stack_prefix
+          elb_matches_name = true if tag.key == 'Name' && tag.value == descriptor.elb.name
+
+          return elb.load_balancer_arn if elb_matches_stack_prefix && elb_matches_name
+
+          next
         end
-        return elb if elb_matches_stack_prefix && elb_matches_logical_id
       end
       nil
     end
 
-    def get_instances_state_from_elb(elb)
+    def get_instances_state(elb_client, elb_arn)
+      described_target_groups = elb_client.describe_target_groups(load_balancer_arn: elb_arn)
+
+      return nil if described_target_groups.target_groups.empty?
+
+      target_group = described_target_groups.target_groups[0]
+      target_group_arn = target_group.target_group_arn
+
+      described_target_health = elb_client.describe_target_health(target_group_arn: target_group_arn)
+
+      return nil if described_target_health.target_health_descriptions.empty?
+
+      targets = described_target_health.target_health_descriptions
+
       stack_prefix_instances = []
-      elb.instances.each do |i|
-        instance = get_instance_by_id(i.instance_id)
+      targets.each do |t|
+        instance = get_instance_by_id(t.target.id)
         next if instance.nil?
+
         instance.tags.each do |tag|
           next if tag.key != 'StackPrefix'
           break if tag.value != descriptor.stack_prefix
-          stack_prefix_instances.push(id: i.instance_id, state: instance.state.name)
+
+          stack_prefix_instances.push(id: t.target.id, state: instance.state.name)
         end
       end
       stack_prefix_instances

data/lib/ruby_aem_aws/mixins/healthy_resource_verifier.rb

@@ -53,18 +53,19 @@ module RubyAemAws
       elb = find_elb(elb_client)
       return :no_elb if elb.nil?
 
-      elb_instance_state = elb_client.describe_instance_health(load_balancer_name: elb.load_balancer_name)
+      elb_instance_state = get_instances_elb_state(elb_client, elb)
+      return :no_elb_targets if elb_instance_state.nil?
 
       elb_running_instances = 0
-      elb_instance_state.instance_states.each do |i|
-        elb_running_instances += 1 if i.state == RubyAemAws::Constants::ELB_INSTANCE_INSERVICE
+      elb_instance_state.each do |i|
+        elb_running_instances += 1 if i.target_health.state == RubyAemAws::Constants::ELB_INSTANCE_INSERVICE
       end
 
       desired_capacity = asg.desired_capacity
-
       return :misconfigured if desired_capacity < 1
       return :recovering if elb_running_instances < desired_capacity
       return :scaling if elb_running_instances > desired_capacity
+
       :ready
     end
 
@@ -86,28 +87,34 @@ module RubyAemAws
       #     puts("  Instance #{i.instance_id}: #{i.health_status}")
       #   end
       # end
-
-      desired_capacity = asg.desired_capacity
       instances_inservice = 0
-      asg.instances.each do |instances|
-        instances_inservice += 1 if instances.health_status.eql? 'Healthy'
+      desired_capacity = asg.desired_capacity
+
+      get_all_instances.each do |i|
+        next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
+        return false if i.state.name != Constants::INSTANCE_STATE_HEALTHY
+
+        instances_inservice += 1
       end
 
       return :misconfigured if desired_capacity < 1
       return :recovering if instances_inservice < desired_capacity
       return :scaling if instances_inservice > desired_capacity
+
       :ready
     end
 
     # @return true, if all instances within the ELB are inService
     def wait_until_healthy_elb
       raise ELBMisconfiguration if health_state_elb.eql?(:misconfigured)
+
       sleep 60 while health_state_elb.eql?(:recovering) || health_state_elb.eql?(:scaling)
       return true if health_state_elb.eql?(:ready)
     end
 
     def wait_until_healthy_asg
       raise ASGMisconfiguration if health_state_asg.eql?(:misconfigured)
+
       sleep 60 while health_state_asg.eql?(:recovering) || health_state_asg.eql?(:scaling)
       return true if health_state_asg.eql?(:ready)
     end
@@ -138,6 +145,7 @@ module RubyAemAws
           if tag.key == 'StackPrefix' && tag.value == descriptor.stack_prefix
             asg_matches_stack_prefix = true
             break if asg_matches_component
+
             next
           end
           if tag.key == 'Component' && tag.value == descriptor.ec2.component
@@ -150,30 +158,58 @@ module RubyAemAws
       nil
     end
 
-    # @return ElasticLoadBalancer by StackPrefix and logical-id tags.
+    # @return ElasticLoadBalancer Arn.
     def find_elb(elb_client)
-      elbs = elb_client.describe_load_balancers.load_balancer_descriptions
+      elbs = elb_client.describe_load_balancers(page_size: 50)
+      elb_arn = find_elb_arn(elbs.load_balancers)
+
+      return elb_arn unless elb_arn.nil?
+
+      until elbs.last_page?
+        elbs = elb_client.describe_load_balancers(page_size: 50, marker: elbs.next_marker)
+        elb_arn = find_elb_arn(elbs.load_balancers)
+        return elb_arn unless elb_arn.nil?
+      end
+      nil
+    end
+
+    # @return ElasticLoadBalancer Arn by StackPrefix tag & ELB name.
+    def find_elb_arn(elbs)
       elbs.each do |elb|
         elb_matches_stack_prefix = false
-        elb_matches_logical_id = false
-        tag_descriptions = elb_client.describe_tags(load_balancer_names: [elb.load_balancer_name]).tag_descriptions
+        elb_matches_name = false
+        begin
+          tag_descriptions = elb_client.describe_tags(resource_arns: [elb.load_balancer_arn]).tag_descriptions
+        rescue Aws::ElasticLoadBalancingV2::Errors::LoadBalancerNotFound
+          next
+        end
+
         next if tag_descriptions.empty?
 
         tags = tag_descriptions[0].tags
         tags.each do |tag|
-          if tag.key == 'StackPrefix' && tag.value == descriptor.stack_prefix
-            elb_matches_stack_prefix = true
-            break if elb_matches_logical_id
-            next
-          end
-          if tag.key == 'aws:cloudformation:logical-id' && tag.value == descriptor.elb.id
-            elb_matches_logical_id = true
-            break if elb_matches_stack_prefix
-          end
+          elb_matches_stack_prefix = true if tag.key == 'StackPrefix' && tag.value == descriptor.stack_prefix
+          elb_matches_name = true if tag.key == 'Name' && tag.value == descriptor.elb.name
+
+          return elb.load_balancer_arn if elb_matches_stack_prefix && elb_matches_name
         end
-        return elb if elb_matches_stack_prefix && elb_matches_logical_id
       end
       nil
     end
+
+    def get_instances_elb_state(elb_client, elb_arn)
+      described_target_groups = elb_client.describe_target_groups(load_balancer_arn: elb_arn)
+
+      return nil if described_target_groups.target_groups.empty?
+
+      target_group = described_target_groups.target_groups[0]
+      target_group_arn = target_group.target_group_arn
+
+      described_target_health = elb_client.describe_target_health(target_group_arn: target_group_arn)
+
+      return nil if described_target_health.target_health_descriptions.empty?
+
+      described_target_health.target_health_descriptions
+    end
   end
 end

data/lib/ruby_aem_aws/mixins/healthy_state_verifier.rb

@@ -22,7 +22,8 @@ module RubyAemAws
     def healthy?
       has_instance = false
       get_all_instances.each do |i|
-        next if i.nil? || i.state.code != 16
+        next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
+
         has_instance = true
         return false if i.state.name != Constants::INSTANCE_STATE_HEALTHY
       end
@@ -32,7 +33,8 @@ module RubyAemAws
     def wait_until_healthy
       instance_healthy = false
       get_all_instances.each do |i|
-        next if i.nil? || i.state.code != 16
+        next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
+
         i.wait_until_running
         instance_healthy = true
         return false if i.state.name != Constants::INSTANCE_STATE_HEALTHY

data/lib/ruby_aem_aws/mixins/instance_describer.rb

@@ -21,6 +21,7 @@ module RubyAemAws
       descriptions = []
       get_all_instances.each do |i|
         next if i.nil?
+
         descriptions.push(describe_instance(i))
       end
       descriptions.join(', ')

data/lib/ruby_aem_aws/mixins/metric_verifier.rb

@@ -48,6 +48,7 @@ module RubyAemAws
 
       instances.each do |instance|
         next if instance.nil?
+
         instance_id = instance.instance_id
         dimensions_value = instance.instance_id
 
@@ -73,6 +74,7 @@ module RubyAemAws
 
       instances.each do |instance|
         next if instance.nil?
+
         instance_id = instance.instance_id
         log_stream_name = "#{@descriptor.ec2.component}/#{instance_id}"
 
@@ -106,6 +108,7 @@ module RubyAemAws
 
       instances.each do |instance|
         next if instance.nil?
+
         instance_id = instance.instance_id
         log_stream_name = "#{@descriptor.ec2.component}/#{instance_id}"
 
@@ -167,7 +170,7 @@ module RubyAemAws
       return true unless response.events.empty?
     end
 
-    # @param loggroup Cloudwatch loggroup name
+    # @param loggroup_name Cloudwatch loggroup name
     # @return True if Cloudwatch loggroup exists
     def loggroup?(loggroup_name)
       namespace = 'AWS/Logs'

data/lib/ruby_aem_aws/mixins/snapshot_verifier.rb

@@ -28,6 +28,7 @@ module RubyAemAws
       has_snapshot = false
       get_snapshots_by_type(snapshot_type).each do |s|
         next if s.nil?
+
         has_snapshot = true
       end
       has_snapshot

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: ruby_aem_aws
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Shine Solutions
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: retries
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.0.5
+- !ruby/object:Gem::Dependency
+  name: tuples
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.20
 description: ruby_aem_aws is a Ruby client for Shine Solutions Adobe Experience Manager
   (AEM) Platform on AWS
 email:
@@ -74,6 +88,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- conf/gem.yaml
 - lib/ruby_aem_aws.rb
 - lib/ruby_aem_aws/abstract/cloudwatch.rb
 - lib/ruby_aem_aws/abstract/component.rb