fog 0.0.84 → 0.0.85

data/lib/fog/aws/models/ec2/server.rb

@@ -8,7 +8,7 @@ module Fog
 
         identity  :id,                    'instanceId'
 
-        attribute :architecture
+        attr_accessor :architecture
         attribute :ami_launch_index,      'amiLaunchIndex'
         attribute :availability_zone,     'availabilityZone'
         attribute :block_device_mapping,  'blockDeviceMapping'
@@ -43,6 +43,12 @@ module Fog
           connection.addresses(:server => self)
         end
 
+        def console_output
+          requires :id
+
+          connection.get_console_output(@id)
+        end
+
         def destroy
           requires :id
 

data/lib/fog/aws/models/s3/directories.rb

@@ -26,15 +26,15 @@ module Fog
           load(data)
         end
 
-        def get(name, options = {})
+        def get(key, options = {})
           remap_attributes(options, {
             :delimiter  => 'delimiter',
             :marker     => 'marker',
             :max_keys   => 'max-keys',
             :prefix     => 'prefix'
           })
-          data = connection.get_bucket(name, options).body
-          directory = new(:name => data['Name'])
+          data = connection.get_bucket(key, options).body
+          directory = new(:key => data['Name'])
           options = {}
           for key, value in data
             if ['Delimiter', 'IsTruncated', 'Marker', 'MaxKeys', 'Prefix'].include?(key)
@@ -44,7 +44,7 @@ module Fog
           directory.files.merge_attributes(options)
           files = data['Contents']
           while data['IsTruncated']
-            data = connection.get_bucket(name, options.merge!('marker' => files.last['Key'])).body
+            data = connection.get_bucket(key, options.merge!('marker' => files.last['Key'])).body
             files.concat(data['Contents'])
           end
           directory.files.load(files)

data/lib/fog/aws/models/s3/directory.rb

@@ -6,22 +6,24 @@ module Fog
     module S3
 
       class Directory < Fog::Model
+        extend Fog::Deprecation
+        deprecate(:name, :key)
 
-        identity  :name,          'Name'
+        identity  :key,           'Name'
 
         attribute :creation_date, 'CreationDate'
 
         def destroy
-          requires :name
-          connection.delete_bucket(@name)
+          requires :key
+          connection.delete_bucket(key)
           true
         rescue Excon::Errors::NotFound
           false
         end
 
         def location
-          requires :name
-          data = connection.get_bucket_location(@name)
+          requires :key
+          data = connection.get_bucket_location(key)
           data.body['LocationConstraint']
         end
 
@@ -39,24 +41,24 @@ module Fog
         end
 
         def payer
-          requires :name
-          data = connection.get_request_payment(@name)
+          requires :key
+          data = connection.get_request_payment(key)
           data.body['Payer']
         end
 
         def payer=(new_payer)
-          requires :name
-          connection.put_request_payment(@name, new_payer)
+          requires :key
+          connection.put_request_payment(key, new_payer)
           @payer = new_payer
         end
 
         def save
-          requires :name
+          requires :key
           options = {}
           if @location
             options['LocationConstraint'] = @location
           end
-          connection.put_bucket(@name, options)
+          connection.put_bucket(key, options)
           true
         end
 

data/lib/fog/aws/parsers/elb/deregister_instances_from_load_balancer.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELB
+
+        class DeregisterInstancesFromLoadBalancer < Fog::Parsers::Base
+
+          def reset
+            @response = { 'DeregisterInstancesFromLoadBalancerResult' => { 'Instances' => [] }, 'ResponseMetadata' => {} }
+          end
+
+          def end_element(name)
+            case name
+            when 'InstanceId'
+              @response['DeregisterInstancesFromLoadBalancerResult']['Instances'] << {name => @value}
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/elb/describe_instance_health.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELB
+
+        class DescribeInstanceHealth < Fog::Parsers::Base
+
+          def reset
+            @response = { 'DescribeInstanceHealthResult' => { 'InstanceStates' => [] }, 'ResponseMetadata' => {} }
+            @instance_state = {}
+          end
+
+          def end_element(name)
+            case name
+            when 'Description', 'State', 'InstanceId', 'ReasonCode'
+              @instance_state[name] = @value
+            when 'member'
+              @response['DescribeInstanceHealthResult']['InstanceStates'] << @instance_state
+              @instance_state = {}
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/elb/describe_load_balancers.rb

@@ -0,0 +1,101 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELB
+
+        class DescribeLoadBalancers < Fog::Parsers::Base
+
+          def reset
+            @load_balancer = { 'ListenerDescriptions' => [], 'Instances' => [], 'AvailabilityZones' => [], 'Policies' => {'AppCookieStickinessPolicies' => [], 'LBCookieStickinessPolicies' => [] }, 'HealthCheck' => {} }
+            @listener_description = { 'PolicyNames' => [], 'Listener' => {} }
+            @results = { 'LoadBalancerDescriptions' => [] }
+            @response = { 'DescribeLoadBalancersResult' => {}, 'ResponseMetadata' => {} }
+          end
+
+          def start_element(name, attrs = [])
+            case name
+            when 'ListenerDescriptions'
+              @in_listeners = true
+            when 'Instances'
+              @in_instances = true
+            when 'AvailabilityZones'
+              @in_availability_zones = true
+            when 'PolicyNames'
+              @in_policy_names = true
+            when 'Policies'
+              @in_policies = true
+            when 'LBCookieStickinessPolicies'
+              @in_lb_cookies = true
+            when 'AppCookieStickinessPolicies'
+              @in_app_cookies = true
+            end
+            @value = ''
+          end
+
+          def end_element(name)
+            case name
+            when 'member'
+              if @in_policy_names
+                @listener_description['PolicyNames'] << @value
+              elsif @in_availability_zones
+                @load_balancer['AvailabilityZones'] << @value
+              elsif @in_listeners
+                @load_balancer['ListenerDescriptions'] << @listener_description
+                @listener_description = { 'PolicyNames' => [], 'Listener' => {} }
+              elsif @in_app_cookies
+                @load_balancer['Policies']['AppCookieStickinessPolicies'] << @value
+              elsif @in_lb_cookies
+                @load_balancer['Policies']['LBCookieStickinessPolicies'] << @value
+              elsif !@in_instances && !@in_policies
+                @results['LoadBalancerDescriptions'] << @load_balancer
+                @load_balancer = { 'ListenerDescriptions' => [], 'Instances' => [], 'AvailabilityZones' => [], 'Policies' => {'AppCookieStickinessPolicies' => [], 'LBCookieStickinessPolicies' => [] }, 'HealthCheck' => {} }
+              end
+
+            when 'LoadBalancerName', 'DNSName'
+              @load_balancer[name] = @value
+            when 'CreatedTime'
+              @load_balancer[name] = Time.parse(@value)
+
+            when 'ListenerDescriptions'
+              @in_listeners = false
+            when 'PolicyNames'
+              @in_policy_names = false
+            when 'Protocol'
+              @listener_description['Listener'][name] = @value
+            when 'LoadBalancerPort', 'InstancePort'
+              @listener_description['Listener'][name] = @value.to_i
+
+            when 'Instances'
+              @in_instances = false
+            when 'InstanceId'
+              @load_balancer['Instances'] << @value
+
+            when 'AvailabilityZones'
+              @in_availability_zones = false
+
+            when 'Policies'
+              @in_policies = false
+            when 'AppCookieStickinessPolicies'
+              @in_app_cookies = false
+            when 'LBCookieStickinessPolicies'
+              @in_lb_cookies = false
+
+            when 'Interval', 'HealthyThreshold', 'Timeout', 'UnhealthyThreshold'
+              @load_balancer['HealthCheck'][name] = @value.to_i
+            when 'Target'
+              @load_balancer['HealthCheck'][name] = @value
+
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = @value
+
+            when 'DescribeLoadBalancersResponse'
+              @response['DescribeLoadBalancersResult'] = @results
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/elb/disable_availability_zones_for_load_balancer.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELB
+
+        class DisableAvailabilityZonesForLoadBalancer < Fog::Parsers::Base
+
+          def reset
+            @response = { 'DisableAvailabilityZonesForLoadBalancerResult' => { 'AvailabilityZones' => [] }, 'ResponseMetadata' => {} }
+          end
+
+          def end_element(name)
+            case name
+            when 'member'
+              @response['DisableAvailabilityZonesForLoadBalancerResult']['AvailabilityZones'] << @value
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/elb/enable_availability_zones_for_load_balancer.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELB
+
+        class EnableAvailabilityZonesForLoadBalancer < Fog::Parsers::Base
+
+          def reset
+            @response = { 'EnableAvailabilityZonesForLoadBalancerResult' => { 'AvailabilityZones' => [] }, 'ResponseMetadata' => {} }
+          end
+
+          def end_element(name)
+            case name
+            when 'member'
+              @response['EnableAvailabilityZonesForLoadBalancerResult']['AvailabilityZones'] << @value
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/elb/register_instances_with_load_balancer.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELB
+
+        class RegisterInstancesWithLoadBalancer < Fog::Parsers::Base
+
+          def reset
+            @response = { 'RegisterInstancesWithLoadBalancerResult' => { 'Instances' => [] }, 'ResponseMetadata' => {} }
+          end
+
+          def end_element(name)
+            case name
+            when 'InstanceId'
+              @response['RegisterInstancesWithLoadBalancerResult']['Instances'] << {name => @value}
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/ec2/detach_volume.rb

@@ -36,9 +36,9 @@ module Fog
         def detach_volume(volume_id, options = {})
           response = Excon::Response.new
           response.status = 200
-          if volume = @data[:volumes][volume_id]
+          if (volume = @data[:volumes][volume_id]) && !volume['attachmentSet'].empty?
             data = volume['attachmentSet'].pop
-            @data[:volumes][volume_id]['status'] = 'available'
+            volume['status'] = 'available'
             response.status = 200
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id

data/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb

@@ -0,0 +1,45 @@
+module Fog
+  module AWS
+    module ELB
+      class Real
+
+        # Deregister an instance from an existing ELB
+        #
+        # ==== Parameters
+        # * instance_ids<~Array> - List of instance IDs to remove from ELB
+        # * lb_name<~String> - Load balancer to remove instances from
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ResponseMetadata'<~Hash>:
+        #       * 'RequestId'<~String> - Id of request
+        #     * 'DeregisterInstancesFromLoadBalancerResult'<~Hash>:
+        #       * 'Instances'<~Array> - array of hashes describing instances currently enabled
+        #         * 'InstanceId'<~String>
+        def deregister_instances_from_load_balancer(instance_ids, lb_name)
+          params = ELB.indexed_param('Instances.member.%.InstanceId', [*instance_ids], 1)
+          request({
+            'Action'           => 'DeregisterInstancesFromLoadBalancer',
+            'LoadBalancerName' => lb_name,
+            :parser            => Fog::Parsers::AWS::ELB::DeregisterInstancesFromLoadBalancer.new
+          }.merge!(params))
+        end
+
+        alias :deregister_instances :deregister_instances_from_load_balancer
+
+      end
+
+      class Mock
+
+        def deregister_instances_from_load_balancer(instance_ids, lb_name)
+          raise MockNotImplemented.new("Contributions welcome!")
+        end
+
+        alias :deregister_instances :deregister_instances_from_load_balancer
+
+      end
+
+    end
+  end
+end

data/lib/fog/aws/requests/elb/describe_instance_health.rb

@@ -0,0 +1,44 @@
+module Fog
+  module AWS
+    module ELB
+      class Real
+
+        # Get health status for one or more instances on an existing ELB
+        #
+        # ==== Parameters
+        # * lb_name<~String> - Load balancer to check instances health on
+        # * instance_ids<~Array> - Optional list of instance IDs to check
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ResponseMetadata'<~Hash>:
+        #       * 'RequestId'<~String> - Id of request
+        #     * 'DescribeInstanceHealthResult'<~Hash>:
+        #       * 'InstanceStates'<~Array> - array of hashes describing instance health
+        #         * 'Description'<~String>
+        #         * 'State'<~String>
+        #         * 'InstanceId'<~String>
+        #         * 'ReasonCode'<~String>
+        def describe_instance_health(lb_name, instance_ids = [])
+          params = ELB.indexed_param('Instances.member.%.InstanceId', [*instance_ids], 1)
+          request({
+            'Action'           => 'DescribeInstanceHealth',
+            'LoadBalancerName' => lb_name,
+            :parser            => Fog::Parsers::AWS::ELB::DescribeInstanceHealth.new
+          }.merge!(params))
+        end
+
+      end
+
+      class Mock
+
+        def describe_instance_health(lb_name, instance_ids = [])
+          raise MockNotImplemented.new("Contributions welcome!")
+        end
+
+      end
+
+    end
+  end
+end