fog-aws 1.4.1 → 3.27.0

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 = {}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,58 +1,92 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DescribeVpcs < Fog::Parsers::Base
           def reset
-            @vpc = { 'tagSet' => {}, 'ipv6CidrBlockAssociationSet' => {} }
             @response = { 'vpcSet' => [] }
-            @tag = {}
+            @context = []
           end
 
           def start_element(name, attrs = [])
             super
-            case name
-            when 'tagSet'
-              @in_tag_set = true
-            when 'ipv6CidrBlockAssociationSet'
-              @in_ipv6_set = true
+            @context.push(name)
+
+            case @context[1 .. -1].join('.')
+              when 'vpcSet.item'
+                @current_vpc = { 'tagSet' => {}, 'cidrBlockAssociationSet' => [], 'ipv6CidrBlockAssociationSet' => [] }
+
+              when 'vpcSet.item.tagSet.item'
+                @current_tag_key = @current_tag_value = nil
+
+              when 'vpcSet.item.cidrBlockAssociationSet.item'
+                @current_cidr_block = {}
+
+              when 'vpcSet.item.ipv6CidrBlockAssociationSet.item'
+                @current_ipv6_block = {}
             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
-            elsif @in_ipv6_set
-              case name
-              when 'ipv6CidrBlock', 'associationId'
-                @vpc['ipv6CidrBlockAssociationSet'][name] = value
-              when 'ipv6CidrBlockState'
-                @vpc['ipv6CidrBlockAssociationSet'][name] = {'State' => value.squish}
-              when 'ipv6CidrBlockAssociationSet'
-                @vpc['amazonProvidedIpv6CidrBlock'] = !value.blank?
-                @in_ipv6_set = false
-              end
-            else
-              case name
-              when 'vpcId', 'state', 'cidrBlock', 'dhcpOptionsId', 'instanceTenancy'
-                @vpc[name] = value
-              when 'isDefault'
-                @vpc['isDefault'] = value == 'true'        
-              when 'item'
-                @response['vpcSet'] << @vpc
-                @vpc = { 'tagSet' => {}, 'ipv6CidrBlockAssociationSet' => {} }
+            case @context[1 .. -1].join('.')
+              # tagSet
+
+              when 'vpcSet.item.tagSet.item'
+                @current_vpc['tagSet'][@current_tag_key] = @current_tag_value
+                @current_tag_key = @current_tag_value = nil
+
+              when 'vpcSet.item.tagSet.item.key'
+                @current_tag_key = value
+
+              when 'vpcSet.item.tagSet.item.value'
+                @current_tag_value = value
+
+              # cidrBlockAssociationSet
+
+              when 'vpcSet.item.cidrBlockAssociationSet.item.cidrBlock',
+                   'vpcSet.item.cidrBlockAssociationSet.item.associationId'
+                @current_cidr_block[name] = value
+
+              when 'vpcSet.item.cidrBlockAssociationSet.item.cidrBlockState'
+                @current_cidr_block['state'] = value.strip
+
+              when 'vpcSet.item.cidrBlockAssociationSet.item'
+                @current_vpc['cidrBlockAssociationSet'] << @current_cidr_block
+
+              # ipv6CidrBlockAssociationSet
+
+              when 'vpcSet.item.ipv6CidrBlockAssociationSet.item.ipv6CidrBlock',
+                   'vpcSet.item.ipv6CidrBlockAssociationSet.item.associationId'
+                @current_ipv6_block[name] = value
+
+              when 'vpcSet.item.ipv6CidrBlockAssociationSet.item.ipv6CidrBlockState'
+                @current_ipv6_block['state'] = value.strip
+
+              when 'vpcSet.item.ipv6CidrBlockAssociationSet.item'
+                @current_vpc['ipv6CidrBlockAssociationSet'] << @current_ipv6_block
+
+              # vpc
+
+              when 'vpcSet.item.vpcId',
+                   'vpcSet.item.state',
+                   'vpcSet.item.cidrBlock',
+                   'vpcSet.item.dhcpOptionsId',
+                   'vpcSet.item.instanceTenancy'
+                @current_vpc[name] = value
+
+              when 'vpcSet.item.isDefault'
+                @current_vpc['isDefault'] = value == 'true'
+
+              when 'vpcSet.item'
+                @response['vpcSet'] << @current_vpc
+
+              # root
+
               when 'requestId'
                 @response[name] = value
-              end
             end
+
+            @context.pop
           end
         end
       end

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class DetachVolume < Fog::Parsers::Base
           def end_element(name)
             case name

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

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

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

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

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class ImportKeyPair < Fog::Parsers::Base
           def end_element(name)
             case name

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class MoveAddressToVpc < Fog::Parsers::Base
           def end_element(name)
             case name

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class NetworkAclParser < Fog::Parsers::Base
           def reset_nacl
             @network_acl = { 'associationSet' => [], 'entrySet' => [], 'tagSet' => {} }

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class NetworkInterfaceParser < Fog::Parsers::Base
           def reset_nic
             @nic = { 'groupSet' => {}, 'attachment' => {}, 'association' => {}, 'tagSet' => {}, 'privateIpAddressesSet' => [] }

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

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

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class RegisterImage < Fog::Parsers::Base
           def end_element(name)
             case name

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

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

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class RestoreAddressToClassic < Fog::Parsers::Base
           def end_element(name)
             case name

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class StartStopInstances < Fog::Parsers::Base
           def reset
             @instance = { 'currentState' => {}, 'previousState' => {} }

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Compute
-      module AWS
+    module AWS
+      module Compute
         class TerminateInstances < Fog::Parsers::Base
           def reset
             @instance = { 'previousState' => {}, 'currentState' => {} }

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

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

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

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module DNS
-      module AWS
+    module AWS
+      module DNS
         class CreateHostedZone < Fog::Parsers::Base
           def reset
             @hosted_zone = {}
@@ -16,7 +16,7 @@ module Fog
               case name
               when 'Id'
                 @hosted_zone[name] = value.sub('/hostedzone/', '')
-              when 'Name', 'CallerReference', 'Comment'
+              when 'Name', 'CallerReference', 'Comment', 'PrivateZone'
                 @hosted_zone[name]= value
               when 'HostedZone'
                 @response['HostedZone'] = @hosted_zone

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

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

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

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