olery-aws 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4592a112c2bfde7e1fc50a21e6f06e6d5308de8ccb1c6c6291494df50184e732
-  data.tar.gz: b6e2b32c49a1859ae05298850f081e55173b39ddb4605f122a63c03dc07ec4a2
+  metadata.gz: ac29fe4f4188601f1e6c5448b1559342f715ff959dfdd383416c515ede4b4136
+  data.tar.gz: 48b99d784fae2a65b917f5d938704228b8174fb607b7a981e3ba290c0da253e5
 SHA512:
-  metadata.gz: 44679fc3c631095891f66d11369119512136e06d8d6df86616d5b68e7256cc89106bb53c28781394c0c89c569ff91cc62084d1d6922ac0db55d14e30f4eca8b3
-  data.tar.gz: 7c6d2d6ddd2faf261fc64879759bd5cdf1cbbd1a95dbec7aba3834e4160dfa71b001ddeacc0dd977393bb294872a1a9b60bdaa5a05d32b95313b543bddc31cdd
+  metadata.gz: 438cb9bf859d8aca981836eda06b8b659df66c157dc3bdb16f341f19ee709e4070f82d3f2492aff09c411ab7dfaa11a249937a830cc2231d861aaf1ff77ebf37
+  data.tar.gz: 49c2c42bbd65b3df9b7808b32050bcd068e6f2bb340b5bada16453f32ace09ea1d7f207cbb1837e3bbbf67d11694884f50bfc0fd66e3925a86e3e77b94224293

data/bin/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require_relative '../lib/olery/aws'
+
+require'pry'
+Pry.start
+

data/lib/olery/aws/command/rotate.rb

@@ -102,15 +102,23 @@ Examples:
         # @param [Struct] group
         #
         def rotate_elb(group)
-          info 'Disabling terminating of instances'
+          if group.load_balancer_names.blank?
+            info 'Starting instance refresh'
+            auto_scaling.start_instance_refresh auto_scaling_group_name: group.auto_scaling_group_name
 
-          suspend_processes(group.auto_scaling_group_name, 'Terminate')
+            info 'Waiting refresh to finish'
+            wait_until_refresh group
+            return
+          end
 
-          new_size    = group.max_size * 2
-          new_desired = group.desired_capacity * 2
+          info 'Disabling terminating of instances'
+          suspend_processes group.auto_scaling_group_name, 'Terminate'
 
-          info "Doubling autoscaling capacity to #{new_size}"
+          new_size     = group.max_size * 2
+          new_desired  = group.desired_capacity * 2
+          instance_ids = group.instances.map(&:instance_id)
 
+          info "Doubling autoscaling desired to #{new_desired} and capacity to #{new_size}"
           update_group(
             group.auto_scaling_group_name,
             max_size:         new_size,
@@ -118,34 +126,26 @@ Examples:
           )
 
           info 'Waiting for ELBs to register instances'
-
-          wait_for_elbs group.load_balancer_names, new_desired
+          wait_for_elbs group, new_desired
 
           info 'Waiting for all instances to be in service'
-
           group.load_balancer_names.each do |elb_name|
             wait_until_in_service(elb_name)
           end
 
-          instance_ids = group.instances.map(&:instance_id)
-
           info 'Disabling launching of new instances'
-
           suspend_processes(group.auto_scaling_group_name, 'Launch')
 
           info 'Detaching old instances'
-
           detach_instances(group.auto_scaling_group_name, instance_ids)
 
           info 'Waiting for instances to be removed from autoscaling group'
-
           wait_until_removed_from_group(
             group.auto_scaling_group_name,
             instance_ids
           )
 
           info 'Terminating old instances'
-
           terminate_instances(instance_ids)
 
           wait_until_terminated(instance_ids)
@@ -302,22 +302,44 @@ Examples:
         # @param [Array] elb_names
         # @param [Struct] group
         #
-        def wait_for_elbs(elb_names, instances)
+        def wait_for_elbs group, instances
           loop_with_limit do
             response = load_balancing.describe_load_balancers(
-              :load_balancer_names => elb_names
+              :load_balancer_names => group.load_balancer_names
             )
 
             ok_elbs = response.load_balancer_descriptions.count do |elb|
               elb.instances.length == instances
             end
 
-            break if ok_elbs == elb_names.length
+            break if ok_elbs == group.load_balancer_names.length
 
             sleep(5)
           end
         end
 
+        def wait_until_refresh group
+          loop_with_limit do
+            desc    = auto_scaling.describe_instance_refreshes auto_scaling_group_name: group.auto_scaling_group_name
+            refresh = desc.instance_refreshes.first
+
+            break if refresh.percentage_complete == 100
+
+            sleep 10
+          end
+        end
+
+        def wait_until_healthy group, desired
+          loop_with_limit do
+            group = get_group group.auto_scaling_group_name
+
+            instances = group.instances.select{ |i| lifecycle_state == 'InService' and g.health_status == 'Healthy' }
+            break if instances.size == desired
+
+            sleep 5
+          end
+        end
+
         ##
         # @param [String] elb_name
         #
@@ -463,7 +485,7 @@ Examples:
         # @return [String|NilClass]
         #
         def group_locked_by(group_name)
-          tag = get_group(group_name).tags.find { |tag| tag.key == LOCK_TAG }
+          tag = get_group(group_name).tags.find{ |t| t.key == LOCK_TAG }
 
           tag ? tag.value : nil
         end

data/lib/olery/aws/version.rb

@@ -1,7 +1,7 @@
 module Olery
   module AWS
 
-    VERSION = '1.2.1'
+    VERSION = '1.3.0'
 
   end
 end

data/lib/olery/aws.rb

@@ -1,6 +1,7 @@
 require 'aws-sdk'
 require 'slop'
 require 'uuid'
+require 'active_support/all'
 
 require 'logger'
 

data/olery-aws.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'aws-sdk', '~> 2.0'
   gem.add_dependency 'slop', '~> 4.0'
   gem.add_dependency 'uuid'
+  gem.add_dependency 'activesupport'
 
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: olery-aws
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Olery B.V.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2021-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- bin/console
 - bin/olery-aws
 - lib/olery/aws.rb
 - lib/olery/aws/command.rb