fog-aws 0.11.0 → 3.18.0

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

@@ -1,22 +1,43 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeAddresses < Fog::Parsers::Base
           def reset
-            @address = {}
             @response = { 'addressesSet' => [] }
+            @address = {'tagSet' => {}}
+            @tag = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+            if name == 'tagSet'
+              @in_tag_set = true
+            end
           end
 
           def end_element(name)
-            case name
-            when 'instanceId', 'publicIp', 'domain', 'allocationId', 'associationId', 'networkInterfaceId', 'networkInterfaceOwnerId'
-              @address[name] = value
-            when 'item'
-              @response['addressesSet'] << @address
-              @address = {}
-            when 'requestId'
-              @response[name] = value
+            if @in_tag_set
+              case name
+              when 'item'
+                @address['tagSet'][@tag['key']] = @tag['value']
+                @tag = {}
+              when 'key', 'value'
+                @tag[name] = value
+              when 'tagSet'
+                @in_tag_set = false
+              end
+            else
+              case name
+              when 'instanceId', 'publicIp', 'domain', 'allocationId', 'associationId', 'networkInterfaceId', 'networkInterfaceOwnerId', 'privateIpAddress'
+                @address[name] = value
+              when 'item'
+                @response['addressesSet'] << @address
+                @address = { 'tagSet' => {} }
+              when 'requestId'
+                @response[name] = value
+              end
+
             end
           end
         end

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeAvailabilityZones < Fog::Parsers::Base
           def start_element(name, attrs = [])
             case name

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeClassicLinkInstances < Fog::Parsers::Base
           def reset
             @instance = { 'tagSet' => {}, 'groups' => [] }

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeDhcpOptions < Fog::Parsers::Base
           def reset
             @dhcp_options = { 'dhcpConfigurationSet' => {}, 'tagSet' => {} }

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

@@ -0,0 +1,122 @@
+module Fog
+  module Parsers
+    module AWS
+      module Compute
+        class DescribeImageAttribute < Fog::Parsers::Base
+          def reset
+            @response                             = { }
+            @in_description                       = false
+            @in_kernelId                          = false
+            @in_ramdiskId                         = false
+            @in_launchPermission                  = false
+            @in_productCodes                      = false
+            @in_blockDeviceMapping                = false
+            @in_sriovNetSupport                   = false
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'description'
+              @in_description = true
+            when 'kernel'
+              @in_kernel = true
+            when 'ramdisk'
+              @in_ramdisk = true
+            when 'launchPermission'
+              @in_launchPermission= true
+              unless @response.key?('launchPermission')
+                @response['launchPermission'] = []
+              end
+            when 'productCodes'
+              @in_productCodes = true
+              @product_codes = {}
+              unless @response.key?('productCodes')
+                @response['productCodes'] = []
+              end
+            when 'blockDeviceMapping'
+              @in_blockDeviceMapping = true
+              @block_device_mapping = {}
+              unless @response.key?('blockDeviceMapping')
+                @response['blockDeviceMapping'] = []
+              end
+            when 'sriovNetSupport'
+              unless @response.key?('sriovNetSupport')
+                @response['sriovNetSupport'] = 'false'
+              end
+              @in_sriovNetSupport = true
+            end
+          end
+
+          def end_element(name)
+            if @in_description
+              case name
+              when 'value'
+                @response['description'] = value
+              when 'description'
+                @in_description= false
+              end
+            elsif @in_kernel
+              case name
+              when 'value'
+                @response['kernelId'] = value
+              when 'kernel'
+                @in_kernelId = false
+              end
+            elsif @in_ramdisk
+              case name
+              when 'value'
+                @response['ramdiskId'] = value
+              when 'ramdisk'
+                @in_ramdiskId = false
+              end
+            elsif @in_launchPermission
+              case name
+              when 'group', 'userId'
+                @response['launchPermission'] << value
+              when 'launchPermission'
+                @in_launchPermission = false
+              end
+            elsif @in_blockDeviceMapping
+              case name
+              when 'item'
+                @response["blockDeviceMapping"] << @block_device_mapping
+                @block_device_mapping = {}
+              when 'volumeId', 'status', 'deviceName'
+                @block_device_mapping[name] = value
+              when 'attachTime'
+                @block_device_mapping['attachTime'] = Time.parse(value)
+              when 'deleteOnTermination'
+                @block_device_mapping['deleteOnTermination'] = (value == 'true')
+              when 'blockDeviceMapping'
+                @in_blockDeviceMapping = false
+              end
+            elsif @in_productCodes
+              case name
+              when 'item'
+                @response['productCodes'] << @product_codes
+                @product_codes = {}
+              when 'productCode', 'type'
+                @product_codes[name] = value
+              when 'productCodes'
+                @in_productCodes = false
+              end
+            elsif @in_sriovNetSupport
+              case name
+              when 'value'
+                @response["sriovNetSupport"] = value
+              when "sriovNetSupport"
+                @in_sriovNetSupport = false
+              end
+            else
+              case name
+              when 'requestId', 'imageId'
+                @response[name] = value
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeImages < Fog::Parsers::Base
           def reset
             @block_device_mapping = {}
@@ -68,12 +68,14 @@ module Fog
               case name
               when 'architecture', 'description', 'hypervisor', 'imageId', 'imageLocation', 'imageOwnerAlias', 'imageOwnerId', 'imageState', 'imageType', 'kernelId', 'name', 'platform', 'ramdiskId', 'rootDeviceType','rootDeviceName','virtualizationType'
                 @image[name] = value
-              when 'isPublic'
+              when 'isPublic','enaSupport'
                 if value == 'true'
                   @image[name] = true
                 else
                   @image[name] = false
                 end
+              when 'creationDate'
+                @image[name] = Time.parse(value) if value && !value.empty?
               when 'item'
                 @response['imagesSet'] << @image
                 @image = { 'blockDeviceMapping' => [], 'productCodes' => [], 'stateReason' => {}, 'tagSet' => {} }

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeInstanceAttribute < Fog::Parsers::Base
           def reset
             @response                             = { }

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeInstanceStatus < Fog::Parsers::Base
           def new_instance!
             @instance = { 'instanceState' => {}, 'systemStatus' => { 'details' => [] }, 'instanceStatus' => { 'details' => [] }, 'eventsSet' => [] }

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeInstances < Fog::Parsers::Base
           def reset
             @block_device_mapping = {}

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeInternetGateways < Fog::Parsers::Base
           def reset
             @internet_gateway = { 'attachmentSet' => {}, 'tagSet' => {} }

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeKeyPairs < Fog::Parsers::Base
           def reset
             @key = {}

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         require 'fog/aws/parsers/compute/network_acl_parser'
 
         class DescribeNetworkAcls < NetworkAclParser

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeNetworkInterfaceAttribute < NetworkInterfaceParser
           def reset
             @response             = { }

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         require 'fog/aws/parsers/compute/network_interface_parser'
 
         class DescribeNetworkInterfaces < NetworkInterfaceParser

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribePlacementGroups < Fog::Parsers::Base
           def reset
             @placement_group = {}

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeRegions < Fog::Parsers::Base
           def reset
             @region = {}

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

@@ -1,19 +1,18 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeReservedInstances < Fog::Parsers::Base
           def get_default_item
-            {'tagSet' => {}, 'recurringCharges' => {}}
+            {'tagSet' => {}, 'recurringCharges' => []}
           end
 
           def reset
             @context = []
-            # Note:  <recurringCharges> should also be handled as a set, but do not want to disrupt anyone relying on
-            # it currently being flatted
-            @contexts = ['reservedInstancesSet', 'tagSet']
+            @contexts = ['reservedInstancesSet', 'recurringCharges', 'tagSet']
             @reserved_instance = get_default_item
             @response = { 'reservedInstancesSet' => [] }
+            @charge = {}
             @tag = {}
           end
 
@@ -26,11 +25,11 @@ module Fog
 
           def end_element(name)
             case name
-            when 'availabilityZone', 'instanceType', 'productDescription', 'reservedInstancesId', 'state', 'offeringType', 'instanceTenancy'
+            when 'availabilityZone', 'instanceTenancy', 'instanceType', 'offeringType', 'productDescription', 'reservedInstancesId', 'scope', 'state'
               @reserved_instance[name] = value
             when 'duration', 'instanceCount'
               @reserved_instance[name] = value.to_i
-            when 'fixedPrice', 'amount', 'usagePrice'
+            when 'fixedPrice', 'usagePrice'
               @reserved_instance[name] = value.to_f
             when *@contexts
               @context.pop
@@ -39,10 +38,22 @@ module Fog
               when 'reservedInstancesSet'
                 @response['reservedInstancesSet'] << @reserved_instance
                 @reserved_instance = get_default_item
+              when 'recurringCharges'
+                @reserved_instance['recurringCharges'] << { 'frequency' => @charge['frequency'], 'amount' => @charge['amount'] }
+                @charge = {}
               when 'tagSet'
                 @reserved_instance['tagSet'][@tag['key']] = @tag['value']
                 @tag = {}
               end
+            when 'amount'
+              case @context.last
+              when 'reservedInstancesSet'
+                @reserved_instance[name] = value.to_f
+              when 'recurringCharges'
+                @charge[name] = value.to_f
+              end
+            when 'frequency'
+              @charge[name] = value
             when 'key', 'value'
               @tag[name] = value
             when 'requestId'

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeReservedInstancesOfferings < Fog::Parsers::Base
           def reset
             @reserved_instances_offering = {}
@@ -19,7 +19,7 @@ module Fog
             when 'item'
               @response['reservedInstancesOfferingsSet'] << @reserved_instances_offering unless @reserved_instances_offering.empty?
               @reserved_instances_offering = {}
-            when 'requestId'
+            when 'requestId', 'nextToken'
               @response[name] = value
             end
           end

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

@@ -1,13 +1,13 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeRouteTables < Fog::Parsers::Base
           def reset
             @association = { 'routeTableAssociationId' => nil, 'routeTableId' => nil, 'subnetId' => nil, 'main' => false }
             @in_association_set = false
             @in_route_set = false
-            @route = { 'destinationCidrBlock' => nil, 'gatewayId' => nil, 'instanceId' => nil, 'instanceOwnerId' => nil, 'networkInterfaceId' => nil, 'vpcPeeringConnectionId' => nil, 'state' => nil, 'origin' => nil }
+            @route = { 'destinationCidrBlock' => nil, 'gatewayId' => nil, 'instanceId' => nil, 'instanceOwnerId' => nil, 'networkInterfaceId' => nil, 'vpcPeeringConnectionId' => nil, 'natGatewayId' => nil, 'state' => nil, 'origin' => nil }
             @response = { 'routeTableSet' => [] }
             @tag = {}
             @route_table = { 'associationSet' => [], 'tagSet' => {}, 'routeSet' => [] }
@@ -54,11 +54,11 @@ module Fog
               end
             elsif @in_route_set
               case name
-              when 'destinationCidrBlock', 'gatewayId', 'instanceId', 'instanceOwnerId', 'networkInterfaceId', 'vpcPeeringConnectionId', 'state', 'origin'
+              when 'destinationCidrBlock', 'gatewayId', 'instanceId', 'instanceOwnerId', 'networkInterfaceId', 'vpcPeeringConnectionId', 'natGatewayId', 'state', 'origin'
                 @route[name] = value
               when 'item'
                 @route_table['routeSet'] << @route
-                @route = { 'destinationCidrBlock' => nil, 'gatewayId' => nil, 'instanceId' => nil, 'instanceOwnerId' => nil, 'networkInterfaceId' => nil, 'vpcPeeringConnectionId' => nil, 'state' => nil, 'origin' => nil }
+                @route = { 'destinationCidrBlock' => nil, 'gatewayId' => nil, 'instanceId' => nil, 'instanceOwnerId' => nil, 'networkInterfaceId' => nil, 'vpcPeeringConnectionId' => nil, 'natGatewayId' => nil, 'state' => nil, 'origin' => nil }
               when 'routeSet'
                 @in_route_set = false
               end

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

@@ -1,13 +1,14 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeSecurityGroups < Fog::Parsers::Base
           def reset
             @group = {}
-            @ip_permission = { 'groups' => [], 'ipRanges' => []}
-            @ip_permission_egress = { 'groups' => [], 'ipRanges' => []}
+            @ip_permission = { 'groups' => [], 'ipRanges' => [], 'ipv6Ranges' => []}
+            @ip_permission_egress = { 'groups' => [], 'ipRanges' => [], 'ipv6Ranges' => []}
             @ip_range = {}
+            @ipv6_range = {}
             @security_group = { 'ipPermissions' => [], 'ipPermissionsEgress' => [], 'tagSet' => {} }
             @response = { 'securityGroupInfo' => [] }
             @tag = {}
@@ -24,6 +25,8 @@ module Fog
               @in_ip_permissions_egress = true
             when 'ipRanges'
               @in_ip_ranges = true
+            when 'ipv6Ranges'
+              @in_ipv6_ranges = true
             when 'tagSet'
               @in_tag_set = true
             end
@@ -44,6 +47,8 @@ module Fog
               case name
               when 'cidrIp'
                 @ip_range[name] = value
+              when 'cidrIpv6'
+                @ipv6_range[name] = value
               when 'fromPort', 'toPort'
                 if @in_ip_permissions_egress
                   @ip_permission_egress[name] = value.to_i
@@ -72,6 +77,8 @@ module Fog
                 end
               when 'ipRanges'
                 @in_ip_ranges = false
+              when 'ipv6Ranges'
+                @in_ipv6_ranges = false
               when 'item'
                 if @in_groups
                   if @in_ip_permissions_egress
@@ -87,17 +94,24 @@ module Fog
                     @ip_permission['ipRanges'] << @ip_range
                   end
                   @ip_range = {}
+                elsif @in_ipv6_ranges
+                  if @in_ip_permissions_egress
+                    @ip_permission_egress['ipv6Ranges'] << @ipv6_range
+                  else
+                    @ip_permission['ipv6Ranges'] << @ipv6_range
+                  end
+                  @ipv6_range = {}
                 elsif @in_ip_permissions
                   @security_group['ipPermissions'] << @ip_permission
-                  @ip_permission = { 'groups' => [], 'ipRanges' => []}
+                  @ip_permission = { 'groups' => [], 'ipRanges' => [], 'ipv6Ranges' => []}
                 elsif @in_ip_permissions_egress
                   @security_group['ipPermissionsEgress'] << @ip_permission_egress
-                  @ip_permission_egress = { 'groups' => [], 'ipRanges' => []}
+                  @ip_permission_egress = { 'groups' => [], 'ipRanges' => [], 'ipv6Ranges' => []}
                 else
                   @response['securityGroupInfo'] << @security_group
                   @security_group = { 'ipPermissions' => [], 'ipPermissionsEgress' => [], 'tagSet' => {} }
                 end
-              when 'requestId'
+              when 'requestId', 'nextToken'
                 @response[name] = value
               when 'userId'
                 @group[name] = value

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeSnapshots < Fog::Parsers::Base
           def reset
             @response = { 'snapshotSet' => [] }

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeSpotPriceHistory < Fog::Parsers::Base
           def reset
             @spot_price = {}

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

@@ -1,12 +1,16 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeSubnets < Fog::Parsers::Base
           def reset
             @subnet = { 'tagSet' => {} }
             @response = { 'subnetSet' => [] }
             @tag = {}
+            @ipv6_cidr_block_association = {}
+            @in_tag_set = false
+            @in_ipv6_cidr_block_association_set = false
+            @in_cidr_block_state = false
           end
 
           def start_element(name, attrs = [])
@@ -14,25 +18,48 @@ module Fog
             case name
             when 'tagSet'
               @in_tag_set = true
+            when 'ipv6CidrBlockAssociationSet'
+              @in_ipv6_cidr_block_association_set = true
+            when 'ipv6CidrBlockState'
+              @in_cidr_block_state = 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
+            elsif @in_ipv6_cidr_block_association_set
+              if @in_cidr_block_state
+                case name
+                when 'state'
+                  @ipv6_cidr_block_association['ipv6CidrBlockState'] = { name => value }
+                when 'ipv6CidrBlockState'
+                  @in_cidr_block_state = false
+                end
+              else
+                case name
                 when 'item'
-                  @subnet['tagSet'][@tag['key']] = @tag['value']
-                  @tag = {}
-                when 'key', 'value'
-                  @tag[name] = value
-                when 'tagSet'
-                  @in_tag_set = false
+                  @subnet['ipv6CidrBlockAssociationSet'] = @ipv6_cidr_block_association
+                  @ipv6_cidr_block_association = {}
+                when 'ipv6CidrBlock', 'associationId'
+                  @ipv6_cidr_block_association[name] = value
+                when 'ipv6CidrBlockAssociationSet'
+                  @in_ipv6_cidr_block_association_set = false
+                end
               end
             else
               case name
               when 'subnetId', 'state', 'vpcId', 'cidrBlock', 'availableIpAddressCount', 'availabilityZone'
                 @subnet[name] = value
-              when 'mapPublicIpOnLaunch'
+              when 'mapPublicIpOnLaunch', 'defaultForAz'
                 @subnet[name] = value == 'true' ? true : false
               when 'item'
                 @response['subnetSet'] << @subnet

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeTags < Fog::Parsers::Base
           def reset
             @tag = {}

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeVolumeStatus < Fog::Parsers::Base
           def reset
             @action_set = {}