aerosol 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9494ad62c369aa73f67af3dca0dcc28d8dd29ef820e5bd75c05e30b4203bd950
-  data.tar.gz: a7be58f47b1d874751346371cc3e448bcea64f5fce4846fc2b2c4875788db5ee
+  metadata.gz: 6d4984e8f3a4ad49c8fcf43ee3f8a46afc0a8ff5a03bc17e0e2a7c5ae51d5ff9
+  data.tar.gz: 6a02a6faf80b6a0bc3ccb317df748dac95d994f4a0fb146724ed844240727451
 SHA512:
-  metadata.gz: 805b520c8b7e883e58113b864732bbd841f01d56d3d1703da8e79982d940d590a47d0f2ed5458efa523bbb03c95d81a82eee5b031d81f946f92d7ff58b1f6024
-  data.tar.gz: 8b0390907ccbefef4e58d333f2e92da0a5489304380776fa00836fa9d578200c1623a489985aa1bff66e48e22cea84cdbcec2915ad984b1d364e0fcf31955b9d
+  metadata.gz: ddb94dbd6f44e8cb419d6051fc0e5855a8bc5bb9ce45de11e35da6600831d0a8f8928990d0429aa6f415b80a91381c4c198a5c1d8a2a341f7ea47992b2417178
+  data.tar.gz: 5f2488d1ec6336cb2a4a3aea9dadd7ab030b788bfb72fffb8723369857e875ccba832d88ecba070098c750d208de76c74ac5ee9c80cb4879f497e9f829435e0a

data/.travis.yml

@@ -2,9 +2,9 @@ sudo: false
 dist: trusty
 language: ruby
 rvm:
-    - 2.0
     - 2.1
     - 2.2
+    - 2.7
 cache: bundler
 before_install: gem install bundler -v 1.17.3
 script: CI=true bundle exec rake

data/lib/aerosol/auto_scaling.rb

@@ -7,7 +7,12 @@ class Aerosol::AutoScaling
                 :desired_capacity, :health_check_grace_period, :health_check_type, :load_balancer_names,
                 :placement_group, :tags, :created_time, :vpc_zone_identifier, :target_group_arns
   aws_class_attribute :launch_configuration, Aerosol::LaunchConfiguration
-  aws_class_attribute :launch_template, Aerosol::LaunchTemplate
+  aws_class_attribute(
+    :launch_template,
+    Aerosol::LaunchTemplate,
+    proc { |argument| argument.fetch(:launch_template, {})[:launch_template_name] }
+  )
+
   primary_key :auto_scaling_group_name
 
   def initialize(options={}, &block)
@@ -88,7 +93,7 @@ class Aerosol::AutoScaling
   def all_instances
     conn.describe_auto_scaling_groups(auto_scaling_group_names: [*auto_scaling_group_name])
         .auto_scaling_groups.first
-        .instances.map { |instance| Aerosol::Instance.from_hash(instance) }
+        .instances.map { |instance| Aerosol::Instance.from_hash(instance.to_hash) }
   end
 
   def launch_details
@@ -156,12 +161,6 @@ 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/aws_model.rb

@@ -47,13 +47,15 @@ module Aerosol::AWSModel
       aws_attributes.merge(attrs)
     end
 
-    def aws_class_attribute(name, klass)
+    def aws_class_attribute(name, klass, primary_key_proc = nil)
       unless klass.ancestors.include?(Aerosol::AWSModel) || (klass == self)
         raise '.aws_class_attribute requires a Aerosol::AWSModel that is not the current class.'
       end
 
+      primary_key_proc ||= proc { |hash| hash[klass.primary_key] }
+
       dsl_class_attribute(name, klass)
-      aws_class_attributes.merge!({ name => klass })
+      aws_class_attributes.merge!({ name => [klass, primary_key_proc] })
     end
 
     def exists?(key)
@@ -67,9 +69,9 @@ module Aerosol::AWSModel
 
     def from_hash(hash)
       raise 'To use .from_hash, you must specify a primary_key' if primary_key.nil?
-      refs = Hash[aws_class_attributes.map do |name, klass|
+      refs = Hash[aws_class_attributes.map do |name, (klass, primary_key_proc)|
         value = klass.instances.values.find do |inst|
-          inst.send(klass.primary_key).to_s == hash[klass.primary_key].to_s unless inst.send(klass.primary_key).nil?
+          inst.send(klass.primary_key).to_s == primary_key_proc.call(hash).to_s unless inst.send(klass.primary_key).nil?
         end
         [name, value]
       end].reject { |k, v| v.nil? }

data/lib/aerosol/instance.rb

@@ -5,7 +5,11 @@ 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
+  aws_class_attribute(
+    :launch_template,
+    Aerosol::LaunchTemplate,
+    proc { |argument| argument.fetch(:launch_template, {})[:launch_template_name] }
+  )
   primary_key :instance_id
 
   def live?
@@ -59,12 +63,6 @@ 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

@@ -3,7 +3,8 @@ class Aerosol::LaunchTemplate
   include Dockly::Util::Logger::Mixin
 
   logger_prefix '[aerosol launch_template]'
-  aws_attribute :launch_template_name, :image_id, :instance_type, :security_groups, :user_data,
+  aws_attribute :launch_template_name, :launch_template_id, :latest_version_number,
+                :image_id, :instance_type, :security_groups, :user_data,
                 :iam_instance_profile, :kernel_id, :key_name, :spot_price, :created_time,
                 :network_interfaces, :block_device_mappings, :ebs_optimized
   dsl_attribute :meta_data
@@ -21,15 +22,6 @@ class Aerosol::LaunchTemplate
     end
   end
 
-  def exists?
-    info "launch_template: needed?: #{launch_template_name}: " +
-         "checking for launch template: #{launch_template_name}"
-    exists = super
-    info "launch template: needed?: #{launch_template_name}: " +
-         "#{exists ? 'found' : 'did not find'} launch template: #{launch_template_name}"
-    exists
-  end
-
   def security_group(group)
     security_groups << group
   end
@@ -48,6 +40,7 @@ class Aerosol::LaunchTemplate
         },
       }.merge(create_options)
     )
+
     info self.inspect
   end
 
@@ -60,7 +53,7 @@ class Aerosol::LaunchTemplate
   def all_instances
     Aerosol::Instance.all.select { |instance|
       !instance.launch_template.nil? &&
-        (instance.launch_template == launch_template_name)
+        (instance.launch_template.launch_template_name == launch_template_name)
     }.each(&:description)
   end
 
@@ -78,13 +71,14 @@ class Aerosol::LaunchTemplate
       lts.concat(new_lts.launch_templates)
       next_token = new_lts.next_token
     end until next_token.nil?
-
     lts
   end
 
   def to_s
     %{Aerosol::LaunchTemplate { \
 "launch_template_name" => "#{launch_template_name}", \
+"launch_template_id" => "#{launch_template_id}", \
+"latest_version_number" => "#{latest_version_number}", \
 "image_id" => "#{image_id}", \
 "instance_type" => "#{instance_type}", \
 "security_group_ids" => #{security_groups.to_s}, \

data/lib/aerosol/version.rb

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

metadata

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