aerosol 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c51be45f1098f15a79cbab049755110bf351bed1661bb5b28504ab34c613f01
-  data.tar.gz: 235972faf898d0cc796cdf0b7de74f05a6c3aa396dc13b9f0f8909fb1229cecb
+  metadata.gz: 9494ad62c369aa73f67af3dca0dcc28d8dd29ef820e5bd75c05e30b4203bd950
+  data.tar.gz: a7be58f47b1d874751346371cc3e448bcea64f5fce4846fc2b2c4875788db5ee
 SHA512:
-  metadata.gz: 5aa215e96061f829d5042d72c56495f0059cb716b12b89386ca84e7b5568b6993d39a18d07e216c90de2af96ba742d5ea588c733e0303d275ffdb16bfb7f8965
-  data.tar.gz: 890ced1dce45bcf8ab1de6d60834f78bd881490efd9d7473ada54ac92359a691c53f031959c9cb7e08fb1745c7d9ada0abb84b00913d83e5166cb661c252fdbd
+  metadata.gz: 805b520c8b7e883e58113b864732bbd841f01d56d3d1703da8e79982d940d590a47d0f2ed5458efa523bbb03c95d81a82eee5b031d81f946f92d7ff58b1f6024
+  data.tar.gz: 8b0390907ccbefef4e58d333f2e92da0a5489304380776fa00836fa9d578200c1623a489985aa1bff66e48e22cea84cdbcec2915ad984b1d364e0fcf31955b9d

data/lib/aerosol/auto_scaling.rb

@@ -41,7 +41,7 @@ class Aerosol::AutoScaling
   def create!
     ensure_present! :max_size, :min_size
     raise 'availability_zones or vpc_zone_identifier must be set' if [availability_zones, vpc_zone_identifier].none?
-    raise 'launch_configuration or launch_template must be set' if [launch_configuration, launch_template].none?
+    raise 'launch_configuration or launch_template must be set' unless launch_details
 
     info "creating auto scaling group"
     launch_details = create_launch_details
@@ -70,9 +70,9 @@ class Aerosol::AutoScaling
     conn.delete_auto_scaling_group(auto_scaling_group_name: auto_scaling_group_name, force_delete: true)
     begin
       (0..2).each { break if deleting?; sleep 1 }
-      launch_configuration.destroy
+      launch_details.destroy
     rescue => ex
-      info "Launch Config: #{launch_configuration} for #{auto_scaling_group_name} was not deleted."
+      info "Launch Details: #{launch_details} for #{auto_scaling_group_name} were not deleted."
       info ex.message
     end
   end
@@ -91,6 +91,10 @@ class Aerosol::AutoScaling
         .instances.map { |instance| Aerosol::Instance.from_hash(instance) }
   end
 
+  def launch_details
+    launch_configuration || launch_template
+  end
+
   def tag(val)
     tags.merge!(val)
   end
@@ -152,6 +156,12 @@ class Aerosol::AutoScaling
 }}
   end
 
+  def self.from_hash(hash)
+    instance = super(hash)
+    instance['launch_template'] = (hash[:launch_template][:launch_template_name]) if hash[:launch_template]
+    instance
+  end
+
 private
   def conn
     Aerosol::AWS.auto_scaling

data/lib/aerosol/instance.rb

@@ -5,6 +5,7 @@ class Aerosol::Instance
 
   aws_attribute :availability_zone, :health_status, :instance_id, :lifecycle_state
   aws_class_attribute :launch_configuration, Aerosol::LaunchConfiguration
+  aws_class_attribute :launch_template, Aerosol::LaunchTemplate
   primary_key :instance_id
 
   def live?
@@ -58,6 +59,12 @@ class Aerosol::Instance
     instances
   end
 
+  def self.from_hash(hash)
+    instance = super(hash)
+    instance['launch_template'] = (hash[:launch_template][:launch_template_name]) if hash[:launch_template]
+    instance
+  end
+
 private
   def describe!
     ensure_present! :instance_id

data/lib/aerosol/launch_template.rb

@@ -60,7 +60,7 @@ class Aerosol::LaunchTemplate
   def all_instances
     Aerosol::Instance.all.select { |instance|
       !instance.launch_template.nil? &&
-        (instance.launch_template.launch_template == launch_template_name)
+        (instance.launch_template == launch_template_name)
     }.each(&:description)
   end
 

data/lib/aerosol/runner.rb

@@ -229,7 +229,7 @@ class Aerosol::Runner
 
   def old_instances
     require_deploy!
-    old_auto_scaling_groups.map(&:launch_configuration).compact.map(&:all_instances).flatten.compact
+    old_auto_scaling_groups.map(&:launch_details).compact.map(&:all_instances).flatten.compact
   end
 
   def old_auto_scaling_groups
@@ -243,6 +243,7 @@ class Aerosol::Runner
   def select_auto_scaling_groups(&block)
     require_deploy!
     Aerosol::LaunchConfiguration.all # load all of the launch configurations first
+    Aerosol::LaunchTemplate.all
     Aerosol::AutoScaling.all.select { |asg|
       (asg.tags['Deploy'].to_s == auto_scaling.tags['Deploy']) &&
         (block.nil? ? true : block.call(asg))
@@ -251,11 +252,13 @@ class Aerosol::Runner
 
   def new_instances
     require_deploy!
-    while launch_configuration.all_instances.length < auto_scaling.min_size
+
+    while launch_details.all_instances.length < auto_scaling.min_size
       info "Waiting for instances to come up"
       sleep 10
     end
-    launch_configuration.all_instances
+
+    launch_details.all_instances
   end
 
   def with_deploy(name)
@@ -280,7 +283,7 @@ class Aerosol::Runner
            :live_check, :db_config_path, :instance_live_grace_period,
            :app_port, :continue_if_stop_app_fails, :stop_app_retries,
            :is_alive?, :log_files, :tail_logs, :to => :deploy
-  delegate :launch_configuration, :to => :auto_scaling
+  delegate :launch_details, :to => :auto_scaling
 
 private
 

data/lib/aerosol/version.rb

@@ -1,5 +1,5 @@
 # Copyright Swipely, Inc.  All rights reserved.
 
 module Aerosol
-  VERSION = '1.9.0'
+  VERSION = '1.9.1'
 end

data/spec/aerosol/runner_spec.rb

@@ -253,6 +253,57 @@ describe Aerosol::Runner do
   end
 
   describe '#new_instances' do
+    context 'With a launch template' do
+      let!(:lt) do
+        Aerosol::LaunchTemplate.new! do
+          name :lt
+          image_id 'fake-ami-how-scandalous'
+          instance_type 'm1.large'
+        end
+      end
+      let!(:asg_lt) do
+        Aerosol::AutoScaling.new! do
+          name :asg_lt
+          availability_zones 'us-east-1'
+          min_size 0
+          max_size 3
+          launch_template :lt
+          stub(:sleep)
+        end
+      end
+      let!(:instance1) do
+        Aerosol::Instance.from_hash(
+          {
+            instance_id: 'z0',
+            launch_template: { launch_template_name: lt.launch_template_name }
+          }
+        )
+      end
+      let!(:instance2) do
+        double(
+          :launch_template => double(:launch_template_name => 'lc7-8891022'),
+          :launch_configuration => nil
+        )
+      end
+      let!(:instance3) do
+        double(
+          :launch_template => nil,
+          :launch_configuration => double(:launch_configuration_name => 'lc0-8891022')
+        )
+      end
+
+      before do
+        Aerosol::Instance.stub(:all).and_return([instance1, instance2, instance3])
+      end
+
+      it 'returns each instance that is a member of the current launch template' do
+        deploy = Aerosol::Deploy.new!(name: :lt_deploy, auto_scaling: :asg_lt)
+        subject.with_deploy(:lt_deploy) do
+          subject.new_instances.should == [instance1]
+        end
+      end
+    end
+
     let!(:lc7) do
       Aerosol::LaunchConfiguration.new! do
         name :lc7

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aerosol
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord