ruby_aem_aws 1.3.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2119ea82ad020763efc3509aeb665994a52deed4
-  data.tar.gz: 5f497699aca45316d69e62a864d95e30fb7df1db
+  metadata.gz: d0449e7cac793e0800bfef68c08bd32e1081fd04
+  data.tar.gz: 7d65262846445f5b575108fb2949ec6c875d12c9
 SHA512:
-  metadata.gz: 65a7e1bc47342df6ddc07f23e54d7b75f347264c9d8b69592caef796a49ac88f23b85a0564c006eea8393dd8458d5b98c8199ce82c863edf92fa98a0a60ae613
-  data.tar.gz: 40ff794bd6ecd741d1c4f19ac1c00555a49e1f5ff5103f5399c8b1004b3e25b1d4b283549ff63e45fd1f02188ec82f9a370178d257ac399cc6ea998a47645e19
+  metadata.gz: ceb1b660d9f5ed17b89e82eb2a7cfe117da776c4ea075cae3cdbbe5badb2e464bd1d6c2c986fb2250f943ee056492fbfe35c4ffe740b3d62469b64f42756d35a
+  data.tar.gz: b9babf9f36d1257d1373ed2f10494a9edbd7effa4f366f8b9eefac4df264c6fccdd034b5eb1c1b1353d9e5e81c0c63996a3741231e8d47c8bf895f91dc31e7a8

data/conf/gem.yaml

@@ -1 +1 @@
-version: 1.3.0
+version: 2.0.1

data/lib/ruby_aem_aws/abstract/cloudwatch.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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/grouped_component.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/ruby_aem_aws/abstract/single_component.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/ruby_aem_aws/abstract/snapshot.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/ruby_aem_aws/abstract/stackmanager.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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/architecture/stack_manager.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/ruby_aem_aws/client/cloudwatch.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/ruby_aem_aws/client/dynamo_db.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/ruby_aem_aws/client/s3.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/ruby_aem_aws/client/sns_topic.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/ruby_aem_aws/component/author.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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,7 @@ 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
@@ -72,7 +73,7 @@ module RubyAemAws
       def get_tags
         tags = []
         get_all_instances.each do |i|
-          next if i.nil?
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
 
           tags.push(i.tags)
         end

data/lib/ruby_aem_aws/component/author_primary.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/ruby_aem_aws/component/author_publish_dispatcher.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/ruby_aem_aws/component/author_standby.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/ruby_aem_aws/component/chaos_monkey.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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,7 @@ 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
@@ -66,7 +67,7 @@ module RubyAemAws
       def get_tags
         tags = []
         get_all_instances.each do |i|
-          next if i.nil?
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
 
           tags.push(i.tags)
         end

data/lib/ruby_aem_aws/component/component_descriptor.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/ruby_aem_aws/component/orchestrator.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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,7 @@ 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
@@ -66,7 +67,7 @@ module RubyAemAws
       def get_tags
         tags = []
         get_all_instances.each do |i|
-          next if i.nil?
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
 
           tags.push(i.tags)
         end

data/lib/ruby_aem_aws/component/publish.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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,7 @@ 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
@@ -66,7 +67,7 @@ module RubyAemAws
       def get_tags
         tags = []
         get_all_instances.each do |i|
-          next if i.nil?
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
 
           tags.push(i.tags)
         end

data/lib/ruby_aem_aws/component/publish_dispatcher.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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,7 @@ 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
@@ -71,7 +72,7 @@ module RubyAemAws
       def get_tags
         tags = []
         get_all_instances.each do |i|
-          next if i.nil?
+          next if i.nil? || i.state.code != Constants::INSTANCE_STATE_CODE_RUNNING
 
           tags.push(i.tags)
         end

data/lib/ruby_aem_aws/component/stack_manager_resources.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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
@@ -87,11 +87,14 @@ 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
@@ -155,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

data/lib/ruby_aem_aws/mixins/healthy_state_verifier.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ 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
@@ -33,7 +33,7 @@ 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

data/lib/ruby_aem_aws/mixins/instance_describer.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/ruby_aem_aws/mixins/metric_verifier.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -170,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

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/ruby_aem_aws.rb

@@ -1,4 +1,4 @@
-# Copyright 2018 Shine Solutions
+# Copyright 2018-2021 Shine Solutions Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,18 +20,18 @@ 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?
@@ -58,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 = {
@@ -78,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 = {
@@ -102,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 = {
@@ -130,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(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_aem_aws
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Shine Solutions
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -38,6 +38,20 @@ dependencies:
     - - '='
       - !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
@@ -58,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.19
+        version: 0.9.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.19
+        version: 0.9.20
 description: ruby_aem_aws is a Ruby client for Shine Solutions Adobe Experience Manager
   (AEM) Platform on AWS
 email: