ruby_aem_aws 1.5.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae2d23eb45fce95d159684a8b556feb24c638046
-  data.tar.gz: c127bec2c5002dcb157577c9f70ae16a6ace5d1c
+  metadata.gz: 3509ae25ef1a37f800a95eec009bddb1280cbc0c
+  data.tar.gz: 0676f7a857483a52a78c0ab13efd389bdd5f6250
 SHA512:
-  metadata.gz: 0cfee40d46a45d145c413ceab6811188210a6a1495bb277aa596d0497fd099f5440c4aebddbd461dc5fd2bab100d9ecd778726192beca13fd47f89332e4b7232
-  data.tar.gz: eaaadb2ebfd4f17e720cc4ad9578fc30b8247d8d2f95e44cb44d40f8524a8c5c3b744e2cc90a9a6d7b434ba46a8e029c197527ae3c1f2a0beda4b39f37a37431
+  metadata.gz: 8ec2ccf3f5b781fd7f191e7a0835d4f65d82fd6a8e396dad43c8f47d8b68c8e754c68d0afb51474fbefa8e30b03301c62b6a85cb122f24370e1e250f4ec820b4
+  data.tar.gz: 1ec2dabe8d7b26d741b25cecec676121e7ebb9e6dc824c65f8b5a4bf8944a706658bfe0ad07b433665b9e0e0ccf7bfede7a5ba29d19d170c384541ffb7722ad9

data/conf/gem.yaml

@@ -1 +1 @@
-version: 1.5.0
+version: 2.0.0

data/lib/ruby_aem_aws.rb

@@ -111,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/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 = {

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 = {

data/lib/ruby_aem_aws/component/author_dispatcher.rb

@@ -42,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,

data/lib/ruby_aem_aws/component/publish_dispatcher.rb

@@ -41,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,

data/lib/ruby_aem_aws/constants.rb

@@ -35,10 +35,14 @@ module RubyAemAws
   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
@@ -48,6 +52,6 @@ module RubyAemAws
     PROFILE = ENV['AWS_PROFILE']
     INSTANCE_STATE_HEALTHY = RubyAemAws::InstanceState::RUNNING.freeze
     INSTANCE_STATE_CODE_RUNNING = RubyAemAws::InstanceStateCode::RUNNING
-    ELB_INSTANCE_INSERVICE = RubyAemAws::ELBInstanceState::INSERVICE.freeze
+    ELB_INSTANCE_INSERVICE = RubyAemAws::ELBInstanceState::HEALTHY.freeze
   end
 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
 
@@ -108,44 +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
+          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
 
-            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
+          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,15 +53,15 @@ 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
@@ -158,31 +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
+          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
 
-            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
+          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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_aem_aws
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Shine Solutions
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-01 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk