aws-asg-fleet 0.0.1 → 0.0.2

data/asg-fleet.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "aws-asg-fleet"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["Zach Wily"]
   spec.email         = ["zach@zwily.com"]
   spec.description   = %q{AWS Auto Scaling Fleets}

data/lib/aws/auto_scaling/fleet.rb

@@ -59,16 +59,13 @@ module AWS
         old_lc = template_group.launch_configuration
         image_id = options[:image_id] || old_lc.image_id
         instance_type = options[:instance_type] || old_lc.instance_type
-        [ :block_device_mappings, :detailed_instance_monitoring, :kernel_id,
+
+        options = Fleet.options_from(old_lc,
+          :block_device_mappings, :detailed_instance_monitoring, :kernel_id,
           :key_pair, :ramdisk_id, :security_groups, :user_data,
-          :iam_instance_profile, :spot_price ].each do |k|
-          existing_value = old_lc.send(k)
-          next if existing_value == nil || existing_value == []
-          options[k] ||= existing_value
-        end
+          :iam_instance_profile, :spot_price).merge(options)
 
         launch_configurations = LaunchConfigurationCollection.new(:config => config)
-        puts options
         new_lc = launch_configurations.create(name, image_id, instance_type, options)
 
         groups.each do |group|
@@ -78,6 +75,24 @@ module AWS
         new_lc
       end
 
+      # @private
+      # Collects non-nil, non-empty-array attributes from the supplied object
+      # into a Hash. Also converts any Array-like objects into real
+      # Arrays.
+      def self.options_from(obj, *attributes)
+        opts = {}
+        attributes.each do |key|
+          value = obj.send(key)
+          next if value.nil?
+          if value.is_a? Array
+            value = value.to_a
+            next if value.empty?
+          end
+          opts[key] ||= value
+        end
+        opts
+      end
+
       protected
 
       def resource_identifiers

data/lib/aws/auto_scaling/fleet_group_collection.rb

@@ -39,7 +39,7 @@ module AWS
         ## Clone the group
         template_group = @fleet.template_group
 
-        options = options_from(template_group,
+        options = Fleet.options_from(template_group,
           :load_balancers, :min_size, :max_size, :launch_configuration,
           :availability_zones, :default_cooldown, :desired_capacity,
           :health_check_grace_period, :health_check_type, :placement_group,
@@ -70,10 +70,15 @@ module AWS
 
         group = GroupCollection.new(:config => config).create name, options
 
+        # Match metric collection with the template
+        # (If this call ever supports specifying a granularity of other than
+        # '1Minute', this will need to change.)
+        group.enable_metrics_collection(template_group.enabled_metrics.keys)
+
         ## Clone the scaling policies and alarms from the group
         cloudwatch = AWS::CloudWatch.new(:config => config)
         template_group.scaling_policies.each do |template_policy|
-          policy_options = options_from(template_policy,
+          policy_options = Fleet.options_from(template_policy,
             :adjustment_type, :scaling_adjustment, :cooldown, :min_adjustment_step)
 
           policy = group.scaling_policies.create template_policy.name, policy_options
@@ -81,7 +86,7 @@ module AWS
           template_policy.alarms.keys.each do |template_alarm_name|
             template_alarm = cloudwatch.alarms[template_alarm_name]
             alarm_name = "#{template_alarm.name}-#{group.name}"
-            alarm_options = options_from(template_alarm,
+            alarm_options = Fleet.options_from(template_alarm,
               :namespace, :metric_name, :comparison_operator, :evaluation_periods,
               :period, :statistic, :threshold, :actions_enabled, :alarm_description,
               :unit)
@@ -129,17 +134,6 @@ module AWS
           yield tag.resource
         end
       end
-
-      def options_from(obj, *attributes)
-        opts = {}
-        attributes.each do |key|
-          value = obj.send(key)
-          next if value.nil? || (value.respond_to?(:empty?) && value.empty?)
-          value = value.to_a if value.is_a? Array
-          opts[key] ||= value
-        end
-        opts
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-asg-fleet
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk