fog 1.1.2 → 1.2.0

data/lib/fog/aws/parsers/compute/describe_instance_status.rb

@@ -5,56 +5,89 @@ module Fog
         class DescribeInstanceStatus < Fog::Parsers::Base
 
           def new_instance
-            @instance = { 'eventsSet' => [], 'instanceState' => {} }
+            @instance = { 'instanceState' => {}, 'systemStatus' => { 'details' => [] }, 'instanceStatus' => { 'details' => [] }, 'event' => {} }
           end
 
-          def new_event
-            @event = {}
+          def new_item
+            @item = {}
           end
 
           def reset
             @instance_status = {}
             @response = { 'instanceStatusSet' => [] }
-            @in_events_set = false
-            new_event
+            @in_system_status = false
+            @in_details = false
+            @in_event = false
             new_instance
+            new_item
           end
 
           def start_element(name, attrs=[])
             super
             case name
-            when 'eventsSet'
-              @in_events_set = true
+            when 'systemStatus'
+              @in_system_status = true
+            when 'instanceStatus'
+              @in_instance_status = true
+            when 'details'
+              @in_details = true
+            when 'event'
+              @in_event = true
             end
           end
 
-
           def end_element(name)
-            if @in_events_set
-              case name
-              when 'code', 'description'
-                @event[name] = value
-              when 'notAfter', 'notBefore'
-                @event[name] = Time.parse(value)
-              when 'item'
-                @instance['eventsSet'] << @event
-                new_event
-              when 'eventsSet'
-                @in_events_set = false
-              end
-            else
-              case name
-              when 'instanceId', 'availabilityZone'
-                @instance[name] = value
-              when 'name', 'code'
+            case name
+            when 'name'
+              if @in_details
+                @item[name] = value
+              else
                 @instance['instanceState'][name] = value
-              when 'item'
+              end
+            when 'status'
+              if @in_details
+                @item[name] = value
+              elsif @in_system_status
+                @instance['systemStatus'][name] = value
+              elsif @in_instance_status
+                @instance['instanceStatus'][name] = value
+              end
+            when 'details'
+              @in_details = false
+            when 'item'
+              if @in_system_status
+                @instance['systemStatus']['details'] << @item
+              elsif @in_instance_status
+                @instance['instanceStatus']['details'] << @item
+              else
                 @response['instanceStatusSet'] << @instance
                 new_instance
-              when 'requestId'
-                @response[name] = value
-
               end
+              new_item
+            when 'instanceStatus'
+              @in_instance_status = false
+            when 'systemStatus'
+              @in_system_status = false
+            when 'code'
+              if @in_event
+                @instance['event'][name] = value.strip
+              else
+                @instance['instanceState'][name] = value
+              end
+            when 'description'
+              if @in_event
+                @instance['event'][name] = value.strip
+              end
+            when 'notAfter', 'notBefore'
+              if @in_event
+                @instance['event'][name] = Time.parse(value)
+              end
+            when 'event'
+              @in_event = false
+            when 'instanceId', 'availabilityZone'
+              @instance[name] = value
+            when 'requestId'
+              @response[name] = value
             end
           end
         end

data/lib/fog/aws/parsers/compute/describe_instances.rb

@@ -31,7 +31,7 @@ module Fog
             when 'architecture', 'clientToken', 'dnsName', 'imageId',
                   'instanceId', 'instanceType', 'ipAddress', 'kernelId',
                   'keyName', 'platform', 'privateDnsName', 'privateIpAddress', 'ramdiskId',
-                  'reason', 'rootDeviceType'
+                  'reason', 'rootDeviceType',  'subnetId', 'vpcId'
               @instance[name] = value
             when 'attachTime'
               @block_device_mapping[name] = Time.parse(value)
@@ -46,7 +46,7 @@ module Fog
             when 'groupId', 'groupName'
               case @context.last
               when 'groupSet'
-                @reservation['groupSet'] << value
+                @reservation['groupSet'] << value if @context.first != "instancesSet"
               when 'placement'
                 @instance['placement'][name] = value
               end

data/lib/fog/aws/parsers/compute/describe_security_groups.rb

@@ -34,15 +34,15 @@ module Fog
               @ip_range[name] = value
             when 'fromPort', 'toPort'
               if @in_ip_permissions_egress
-                @ip_permission_egress[name] = value.to_i              
+                @ip_permission_egress[name] = value.to_i
               else
                 @ip_permission[name] = value.to_i
               end
             when 'groups'
               @in_groups = false
-            when 'groupDescription', 'ownerId', 'groupId'
+            when 'groupDescription', 'ownerId', 'vpcId'
               @security_group[name] = value
-            when 'groupName'
+            when 'groupId','groupName'
               if @in_groups
                 @group[name] = value
               else
@@ -63,7 +63,7 @@ module Fog
             when 'item'
               if @in_groups
                 if @in_ip_permissions_egress
-                  @ip_permission_egress['group'] << @group
+                  @ip_permission_egress['groups'] << @group
                 else
                   @ip_permission['groups'] << @group
                 end

data/lib/fog/aws/parsers/compute/describe_subnets.rb

@@ -0,0 +1,49 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+
+        class DescribeSubnets < Fog::Parsers::Base
+
+          def reset
+            @subnet = { 'tagSet' => {} }
+            @response = { 'subnetSet' => [] }
+            @tag = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'tagSet'
+              @in_tag_set = true
+            end
+          end
+
+          def end_element(name)
+            if @in_tag_set
+              case name
+                when 'item'
+                  @subnet['tagSet'][@tag['key']] = @tag['value']
+                  @tag = {}
+                when 'key', 'value'
+                  @tag[name] = value
+                when 'tagSet'
+                  @in_tag_set = false
+              end
+            else
+              case name
+              when 'subnetId', 'state', 'vpcId', 'cidrBlock', 'availableIpAddressCount', 'availabilityZone'
+                @subnet[name] = value
+              when 'item'
+                @response['subnetSet'] << @subnet
+                @subnet = { 'tagSet' => {} }
+              when 'requestId'
+                @response[name] = value
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/compute/describe_volume_status.rb

@@ -0,0 +1,70 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+        class DescribeVolumeStatus < Fog::Parsers::Base
+
+          def new_volume
+            @volume = { 'volumeStatus' => { 'details' => [] }, 'eventSet' => {}, 'actionSet' => {} }
+          end
+
+          def reset
+            @volume_status = {}
+            @response = { 'volumeStatusSet' => [] }
+            @inside = nil
+          end
+
+          def start_element(name, attrs=[])
+            super
+            case name
+            when 'item'
+              new_volume if @inside.nil?
+            when 'volumeStatus'
+              @inside = :volume_status
+            when 'details'
+              @inside = :details
+            when 'eventSet'
+              @inside = :event
+            when 'actionSet'
+              @inside = :action
+            end
+          end
+
+          def end_element(name)
+            case name
+            #Simple closers
+            when 'details'
+              @inside = nil
+            when 'volumeStatus'
+              @inside = nil
+            when 'eventSet'
+              @inside = nil
+            when 'actionSet'
+              @inside = nil
+            when 'item'
+              @response['volumeStatusSet'] << @volume if @inside.nil?
+            #Top level
+            when 'nextToken', 'requestId'
+              @response[name] = value
+            # Volume Stuff
+            when 'volumeId', 'availabilityZone'
+              @volume[name] = value
+            #The mess...
+            when 'name', 'status'
+              case @inside
+              when :details
+                @volume['volumeStatus']['details'] << {name => value }
+              when :volume_status
+                @volume['volumeStatus'][name] = value
+              end
+            when 'code', 'eventId', 'eventType', 'description'
+              @volume["#{@inside}Set"][name] = value.strip
+            when 'notAfter', 'notBefore'
+              @volume["#{@inside}Set"][name] = Time.parse(value)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/compute/describe_vpcs.rb

@@ -0,0 +1,49 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+
+        class DescribeVpcs < Fog::Parsers::Base
+
+          def reset
+            @vpc = { 'tagSet' => {} }
+            @response = { 'vpcSet' => [] }
+            @tag = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'tagSet'
+              @in_tag_set = true
+            end
+          end
+
+          def end_element(name)
+            if @in_tag_set
+              case name
+                when 'item'
+                  @vpc['tagSet'][@tag['key']] = @tag['value']
+                  @tag = {}
+                when 'key', 'value'
+                  @tag[name] = value
+                when 'tagSet'
+                  @in_tag_set = false
+              end
+            else
+              case name
+              when 'vpcId', 'state', 'cidrBlock', 'dhcpOptionsId', 'instanceTenancy'
+                @vpc[name] = value
+              when 'item'
+                @response['vpcSet'] << @vpc
+                @vpc = { 'tagSet' => {} }
+              when 'requestId'
+                @response[name] = value
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/dns/list_resource_record_sets.rb

@@ -9,11 +9,12 @@ module Fog
             @resource_record = []
             @resource_record_set = {}
             @resource_record_set['ResourceRecords'] = []
+            @alias_target = {}
             @response = {}
             @response['ResourceRecordSets'] = []
             @section = :resource_record_set
           end
-          
+
           def end_element(name)
             if @section == :resource_record_set
               case name
@@ -21,6 +22,11 @@ module Fog
                 @resource_record_set[name] = value
               when 'Value'
                 @resource_record_set['ResourceRecords'] << value
+              when 'AliasTarget'
+                @resource_record_set[name] = @alias_target
+                @alias_target = {}
+              when 'HostedZoneId', 'DNSName'
+                @alias_target[name] = value
               when 'ResourceRecordSet'
                 @response['ResourceRecordSets'] << @resource_record_set
                 @resource_record_set = {}
@@ -29,12 +35,14 @@ module Fog
                 @section = :main
               end
             elsif @section == :main
-                case name
-                when 'MaxItems'
-                  @response[name]= value.to_i
-                when 'IsTruncated', 'NextRecordName', 'NextRecordType'
-                  @response[name]= value
-                end
+              case name
+              when 'MaxItems'
+                @response[name] = value.to_i
+              when 'NextRecordName', 'NextRecordType'
+                @response[name] = value
+              when 'IsTruncated'
+                @response[name] = value == 'true'
+              end
             end
           end
 

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

@@ -0,0 +1,64 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELB
+
+        class DescribeLoadBalancerPolicies < Fog::Parsers::Base
+
+          def reset
+            reset_policy
+            reset_policy_attribute_description
+            @results = { 'PolicyDescriptions' => [] }
+            @response = { 'DescribeLoadBalancerPoliciesResult' => {}, 'ResponseMetadata' => {} }
+          end
+
+          def reset_policy
+            @policy = { 'PolicyAttributeDescriptions' => [], 'PolicyName' => '', 'PolicyTypeName' => '' }
+          end
+
+          def reset_policy_attribute_description
+            @policy_attribute_description = { 'AttributeName' => '', 'AttributeValue' => '' }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'PolicyAttributeDescriptions'
+              @in_policy_attributes = true
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'member'
+              if @in_policy_attributes
+                @policy['PolicyAttributeDescriptions'] << @policy_attribute_description
+                reset_policy_attribute_description
+              elsif !@in_policy_attributes
+                @results['PolicyDescriptions'] << @policy
+                reset_policy
+              end
+
+            when 'PolicyName', 'PolicyTypeName'
+              @policy[name] = value
+
+            when 'PolicyAttributeDescriptions'
+              @in_policy_attributes = false
+
+            when 'AttributeName', 'AttributeValue'
+              @policy_attribute_description[name] = value
+
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+
+            when 'DescribeLoadBalancerPoliciesResponse'
+              @response['DescribeLoadBalancerPoliciesResult'] = @results
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end