fog 1.0.0 → 1.1.0

data/lib/fog/aws/models/compute/spot_requests.rb

@@ -17,7 +17,7 @@ module Fog
 
         def all(filters = self.filters)
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("all with #{filters.class} param is deprecated, use all('spot-instance-request-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("all with #{filters.class} param is deprecated, use all('spot-instance-request-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'spot-instance-request-id' => [*filters]}
           end
           self.filters = filters
@@ -34,6 +34,50 @@ module Fog
           )
         end
 
+        def bootstrap(new_attributes = {})
+          spot_request = connection.spot_requests.new(new_attributes)
+
+          unless new_attributes[:key_name]
+            # first or create fog_#{credential} keypair
+            name = Fog.respond_to?(:credential) && Fog.credential || :default
+            unless spot_request.key_pair = connection.key_pairs.get("fog_#{name}")
+              spot_request.key_pair = connection.key_pairs.create(
+                :name => "fog_#{name}",
+                :public_key => server.public_key
+              )
+            end
+          end
+
+          # make sure port 22 is open in the first security group
+          security_group = connection.security_groups.get(spot_request.groups.first)
+          authorized = security_group.ip_permissions.detect do |ip_permission|
+            ip_permission['ipRanges'].first && ip_permission['ipRanges'].first['cidrIp'] == '0.0.0.0/0' &&
+            ip_permission['fromPort'] == 22 &&
+            ip_permission['ipProtocol'] == 'tcp' &&
+            ip_permission['toPort'] == 22
+          end
+          unless authorized
+            security_group.authorize_port_range(22..22)
+          end
+
+          spot_request.save
+          spot_request.wait_for { ready? }
+          Fog.wait_for { server = connection.servers.get(spot_request.instance_id) }
+          server = connection.servers.get(spot_request.instance_id)
+          if spot_request.tags
+            for key, value in spot_request.tags
+              connection.tags.create(
+                :key          => key,
+                :resource_id  => spot_request.instance_id,
+                :value        => value
+              )
+            end
+          end
+          server.wait_for { ready? }
+          server.setup(:key_data => [server.private_key])
+          server
+        end
+
         def get(spot_request_id)
           if spot_request_id
             self.class.new(:connection => connection).all('spot-instance-request-id' => spot_request_id).first

data/lib/fog/aws/models/compute/volumes.rb

@@ -64,7 +64,7 @@ module Fog
 
         def all(filters = filters)
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("all with #{filters.class} param is deprecated, use all('volume-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("all with #{filters.class} param is deprecated, use all('volume-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'volume-id' => [*filters]}
           end
           self.filters = filters

data/lib/fog/aws/models/elb/load_balancer.rb

@@ -12,6 +12,8 @@ module Fog
         attribute :health_check,          :aliases => 'HealthCheck'
         attribute :instances,             :aliases => 'Instances'
         attribute :source_group,          :aliases => 'SourceSecurityGroup'
+        attribute :hosted_zone_name,      :aliases => 'CanonicalHostedZoneName'
+        attribute :hosted_zone_name_id,   :aliases => 'CanonicalHostedZoneNameID'
 
         def initialize(attributes={})
           attributes[:availability_zones] ||= attributes['AvailabilityZones'] || %w(us-east-1a us-east-1b us-east-1c us-east-1d)

data/lib/fog/aws/models/storage/file.rb

@@ -104,7 +104,7 @@ module Fog
         def save(options = {})
           requires :body, :directory, :key
           if options != {}
-            Fog::Logger.warning("options param is deprecated, use acl= instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("options param is deprecated, use acl= instead [light_black](#{caller.first})[/]")
           end
           options['x-amz-acl'] ||= @acl if @acl
           options['Cache-Control'] = cache_control if cache_control

data/lib/fog/aws/parsers/cdn/get_invalidation_list.rb

@@ -15,7 +15,6 @@ module Fog
           end
 
           def end_element(name)
-            puts name
             case name
             when 'InvalidationSummary'
               @response['InvalidationSummary'] << @invalidation_summary

data/lib/fog/aws/parsers/cloud_formation/update_stack.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Parsers
+    module AWS
+      module CloudFormation
+
+        class UpdateStack < Fog::Parsers::Base
+
+          def end_element(name)
+            case name
+            when 'RequestId', 'StackId'
+              @response[name] = value
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/cloud_watch/delete_alarms.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module AWS
+      module CloudWatch
+
+        class DeleteAlarms < Fog::Parsers::Base
+
+          def reset
+            @response = { 'ResponseMetadata' => {} }
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = @value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/cloud_watch/describe_alarm_history.rb

@@ -0,0 +1,40 @@
+module Fog
+  module Parsers
+    module AWS
+      module CloudWatch
+
+        class DescribeAlarmHistory < Fog::Parsers::Base
+
+          def reset
+            @response = { 'DescribeAlarmHistoryResult' => {'AlarmHistoryItems' => []}, 'ResponseMetadata' => {} }
+            reset_alarm_history_item
+          end
+
+          def reset_alarm_history_item
+            @alarm_history_item = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'AlarmName', 'HistoryItemType', 'HistorySummary'
+              @alarm_history_item[name] = value
+            when 'Timestamp'
+              @alarm_history_item[name] = Time.parse value 
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            when 'NextToken'
+              @response['ResponseMetadata'][name] = value
+            when 'member'
+              @response['DescribeAlarmHistoryResult']['AlarmHistoryItems']  << @alarm_history_item
+              reset_alarm_history_item
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/cloud_watch/describe_alarms.rb

@@ -0,0 +1,73 @@
+module Fog
+  module Parsers
+    module AWS
+      module CloudWatch
+
+        class DescribeAlarms < Fog::Parsers::Base
+
+          def reset
+            @response = { 'DescribeAlarmsResult' => {'MetricAlarms' => []}, 'ResponseMetadata' => {} }
+            reset_metric_alarms
+          end
+
+          def reset_metric_alarms
+            @metric_alarms = {'Dimensions' => []}
+          end
+
+          def reset_dimension
+            @dimension = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name  
+            when 'Dimensions'
+              @in_dimensions = true
+            when 'member'
+              if @in_dimensions
+                reset_dimension
+              end
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'Name', 'Value'
+              @dimension[name] = value
+            when 'AlarmConfigurationUpdatedTimestamp', 'StateUpdatedTimestamp'
+              @metric_alarms[name] = Time.parse value
+            when 'Period', 'EvaluationPeriods'
+              @metric_alarms[name] = value.to_i
+            when 'Threshold'
+              @metric_alarms[name] = value.to_f
+            when 'AlarmActions', 'OKActions', 'InsufficientDataActions'
+              @metric_alarms[name] = value.to_s.strip
+            when 'AlarmName', 'Namespace', 'MetricName', 'AlarmDescription', 'AlarmArn', 'Unit',
+              'StateValue', 'Statistic', 'ComparisonOperator', 'StateReason', 'ActionsEnabled'
+              @metric_alarms[name] = value
+            when 'StateUpdatedTimestamp', 'AlarmConfigurationUpdatedTimestamp'
+              @metric_alarms[name] = Time.parse value
+            when 'Dimensions'
+              @in_dimensions = false
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            when 'NextToken'
+              @response['ResponseMetadata'][name] = value
+            when 'member'
+              if !@in_dimensions
+                if @metric_alarms.has_key?('AlarmName')
+                  @response['DescribeAlarmsResult']['MetricAlarms']  << @metric_alarms
+                  reset_metric_alarms
+                elsif @response['DescribeAlarmsResult']['MetricAlarms'].last != nil
+                  @response['DescribeAlarmsResult']['MetricAlarms'].last.merge!( @metric_alarms)
+                end
+              else
+                @metric_alarms['Dimensions'] << @dimension
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/cloud_watch/describe_alarms_for_metric.rb

@@ -0,0 +1,71 @@
+module Fog
+  module Parsers
+    module AWS
+      module CloudWatch
+
+        class DescribeAlarmsForMetric < Fog::Parsers::Base
+
+          def reset
+            @response = { 'DescribeAlarmsForMetricResult' => {'MetricAlarms' => []}, 'ResponseMetadata' => {} }
+            reset_metric_alarms
+          end
+
+          def reset_metric_alarms
+            @metric_alarms = {'Dimensions' => []}
+          end
+
+          def reset_dimension
+            @dimension = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name  
+            when 'Dimensions'
+              @in_dimensions = true
+            when 'member'
+              if @in_dimensions
+                reset_dimension
+              end
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'Name', 'Value'
+              @dimension[name] = value
+            when 'Period', 'EvaluationPeriods'
+              @metric_alarms[name] = value.to_i
+            when 'Threshold'
+              @metric_alarms[name] = value.to_f
+            when 'AlarmActions', 'OKActions', 'InsufficientDataActions'
+              @metric_alarms[name] = value.to_s.strip
+            when 'AlarmName', 'Namespace', 'MetricName', 'AlarmDescription', 'AlarmArn', 'Unit',
+                'StateValue', 'Statistic', 'ComparisonOperator', 'StateReason', 'ActionsEnabled'
+              @metric_alarms[name] = value
+            when 'StateUpdatedTimestamp', 'AlarmConfigurationUpdatedTimestamp'
+              @metric_alarms[name] = Time.parse value
+            when 'Dimensions'
+              @in_dimensions = false  
+            when 'NextToken'
+              @response['ResponseMetadata'][name] = value
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            when 'member'
+              if !@in_dimensions
+                if @metric_alarms.has_key?('AlarmName')
+                  @response['DescribeAlarmsForMetricResult']['MetricAlarms']  << @metric_alarms
+                  reset_metric_alarms
+                elsif @response['DescribeAlarmsForMetricResult']['MetricAlarms'].last != nil
+                  @response['DescribeAlarmsForMetricResult']['MetricAlarms'].last.merge!( @metric_alarms)
+                end
+              else
+                @metric_alarms['Dimensions'] << @dimension
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/cloud_watch/disable_alarm_actions.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module AWS
+      module CloudWatch
+
+        class DisableAlarmActions < Fog::Parsers::Base
+
+          def reset
+            @response = { 'ResponseMetadata' => {} }
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            end
+          end
+        end       
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/cloud_watch/enable_alarm_actions.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module AWS
+      module CloudWatch
+
+        class EnableAlarmActions < Fog::Parsers::Base
+
+          def reset
+            @response = { 'ResponseMetadata' => {} }
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            end
+          end
+        end       
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/cloud_watch/get_metric_statistics.rb

@@ -40,3 +40,4 @@ module Fog
     end
   end
 end
+

data/lib/fog/aws/parsers/cloud_watch/put_metric_alarm.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module AWS
+      module CloudWatch
+
+        class PutMetricAlarm < Fog::Parsers::Base
+
+          def reset
+            @response = { 'ResponseMetadata' => {} }
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value.strip
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/cloud_watch/set_alarm_state.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module AWS
+      module CloudWatch
+
+        class SetAlarmState < Fog::Parsers::Base
+
+          def reset
+            @response = { 'ResponseMetadata' => {} }
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            end
+          end
+        end       
+      end
+    end
+  end
+end