fog-aws 3.5.2 → 3.19.0

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

@@ -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/get_hosted_zone.rb

@@ -17,14 +17,14 @@ module Fog
               case name
               when 'Id'
                 @hosted_zone[name]= value.sub('/hostedzone/', '')
-              when 'Name', 'CallerReference', 'Comment', 'PrivateZone', 'Config', 'ResourceRecordSetCount'
+              when 'Name', 'CallerReference', 'Comment', 'PrivateZone', 'Config'
                 @hosted_zone[name]= value
+              when 'ResourceRecordSetCount'
+                @hosted_zone['ResourceRecordSetCount'] = value.to_i
               when 'HostedZone'
                 @response['HostedZone'] = @hosted_zone
                 @hosted_zone = {}
                 @section = :name_servers
-              when 'ResourceRecordSetCount'
-                @response['ResourceRecordSetCount'] = value.to_i
               end
             elsif @section == :name_servers
               case name

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

@@ -13,8 +13,10 @@ module Fog
             case name
             when 'Id'
               @zone[name] = value.sub('/hostedzone/', '')
-            when 'Name', 'CallerReference', 'Comment'
+            when 'Name', 'CallerReference', 'Comment', 'PrivateZone'
               @zone[name] = value
+            when 'ResourceRecordSetCount'
+              @zone['ResourceRecordSetCount'] = value.to_i
             when 'HostedZone'
               @hosted_zones << @zone
               @zone = {}

data/lib/fog/aws/parsers/elbv2/create_load_balancer.rb

@@ -0,0 +1,88 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELBV2
+        class CreateLoadBalancer < Fog::Parsers::Base
+          def reset
+            reset_load_balancer
+            reset_availability_zone
+            @load_balancer_addresses = {}
+            @state = {}
+            @results = { 'LoadBalancers' => [] }
+            @response = { 'CreateLoadBalancerResult' => {}, 'ResponseMetadata' => {} }
+          end
+
+          def reset_load_balancer
+            @load_balancer = { 'SecurityGroups' => [], 'AvailabilityZones' => [] }
+          end
+
+          def reset_availability_zone
+            @availability_zone = { 'LoadBalancerAddresses' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'AvailabilityZones'
+              @in_availability_zones = true
+            when 'LoadBalancerAddresses'
+              @in_load_balancer_addresses = true
+            when 'SecurityGroups'
+              @in_security_groups = true
+            when 'State'
+              @in_state = true
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'member'
+              if @in_availability_zones && @in_load_balancer_addresses
+                @availability_zone['LoadBalancerAddresses'] << @load_balancer_addresses
+              elsif @in_availability_zones
+                @load_balancer['AvailabilityZones'] << @availability_zone
+                reset_availability_zone
+              elsif @in_security_groups
+                @load_balancer['SecurityGroups'] << value
+              else
+                @results['LoadBalancers'] << @load_balancer
+                reset_load_balancer
+              end
+            when 'SubnetId', 'ZoneName'
+              @availability_zone[name] = value
+            when 'IpAddress', 'AllocationId'
+              @load_balancer_addresses[name] = value
+
+            when 'CanonicalHostedZoneName', 'CanonicalHostedZoneNameID', 'LoadBalancerName', 'DNSName', 'Scheme', 'Type',
+                 'LoadBalancerArn', 'IpAddressType', 'CanonicalHostedZoneId', 'VpcId'
+              @load_balancer[name] = value
+            when 'CreatedTime'
+              @load_balancer[name] = Time.parse(value)
+
+            when 'LoadBalancerAddresses'
+              @in_load_balancer_addresses = false
+            when 'AvailabilityZones'
+              @in_availability_zones = false
+            when 'SecurityGroups'
+              @in_security_groups = false
+            when 'State'
+              @in_state = false
+              @load_balancer[name] = @state
+              @state = {}
+            when 'Code'
+              @state[name] = value
+
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+
+            when 'NextMarker'
+              @results['NextMarker'] = value
+            when 'CreateLoadBalancerResponse'
+              @response['CreateLoadBalancerResult'] = @results
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/elbv2/describe_listeners.rb

@@ -0,0 +1,110 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELBV2
+        class DescribeListeners < Fog::Parsers::Base
+          def reset
+            reset_listener
+            @default_action = {}
+            @certificate = {}
+            @config = {}
+            @target_groups = []
+            @target_group = {}
+            @target_group_stickiness_config = {}
+            @results = { 'Listeners' => [] }
+            @response = { 'DescribeListenersResult' => {}, 'ResponseMetadata' => {} }
+          end
+
+          def reset_listener
+            @listener= { 'DefaultActions' => [], 'Certificates' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'DefaultActions'
+              @in_default_actions = true
+            when 'Certificates'
+              @in_certificates = true
+            when 'TargetGroups'
+              @in_target_groups = true
+            when 'TargetGroupStickinessConfig'
+              @in_target_group_stickiness_config = true
+            end
+          end
+
+          def end_element(name)
+            if @in_default_actions
+              case name
+              when 'member'
+                if @in_target_groups
+                  @target_groups << @target_group
+                  @target_group = {}
+                else
+                  @listener['DefaultActions'] << @default_action
+                  @default_action = {}
+                end
+              when 'TargetGroupArn'
+                if @in_target_groups
+                  @target_group[name] = value
+                else
+                  @default_action[name] = value
+                end
+              when 'Weight'
+                @target_group[name] = value
+              when 'Type', 'Order'
+                @default_action[name] = value
+              when 'Path', 'Protocol', 'Port', 'Query', 'Host', 'StatusCode', 'ContentType',
+                   'MessageBody', 'StatusCode'
+                @config[name] = value
+              when 'RedirectConfig', 'ForwardConfig', 'FixedResponseConfig'
+                @default_action[name] = @config
+                @config = {}
+              when 'DurationSeconds', 'Enabled'
+                @target_group_stickiness_config[name] = value
+              when 'DefaultActions'
+                @in_default_actions = false
+              when 'TargetGroupStickinessConfig'
+                if @in_target_group_stickiness_config
+                  @config['TargetGroupStickinessConfig'] = @target_group_stickiness_config
+                  @in_target_group_stickiness_config = false
+                  @target_group_stickiness_config = {}
+                end
+              when 'TargetGroups'
+                @config['TargetGroups'] = @target_groups
+                @in_target_groups = false
+                @target_groups = []
+              end
+            else
+              case name
+              when 'member'
+                if @in_certificates
+                  @listener['Certificates'] << @certificate
+                  @certificate = {}
+                else
+                  @results['Listeners'] << @listener
+                  reset_listener
+                end
+              when 'LoadBalancerArn', 'Protocol', 'Port', 'ListenerArn', 'SslPolicy'
+                @listener[name] = value
+              when 'CertificateArn'
+                @certificate[name] = value
+              when 'Certificates'
+                @in_certificates = false
+
+              when 'RequestId'
+                @response['ResponseMetadata'][name] = value
+
+              when 'NextMarker'
+                @results['NextMarker'] = value
+
+              when 'DescribeListenersResponse'
+                @response['DescribeListenersResult'] = @results
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,88 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELBV2
+        class DescribeLoadBalancers < Fog::Parsers::Base
+          def reset
+            reset_load_balancer
+            reset_availability_zone
+            @load_balancer_addresses = {}
+            @state = {}
+            @results = { 'LoadBalancers' => [] }
+            @response = { 'DescribeLoadBalancersResult' => {}, 'ResponseMetadata' => {} }
+          end
+
+          def reset_load_balancer
+            @load_balancer = { 'SecurityGroups' => [], 'AvailabilityZones' => [] }
+          end
+
+          def reset_availability_zone
+            @availability_zone = { 'LoadBalancerAddresses' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'AvailabilityZones'
+              @in_availability_zones = true
+            when 'LoadBalancerAddresses'
+              @in_load_balancer_addresses = true
+            when 'SecurityGroups'
+              @in_security_groups = true
+            when 'State'
+              @in_state = true
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'member'
+              if @in_availability_zones && @in_load_balancer_addresses
+                @availability_zone['LoadBalancerAddresses'] << @load_balancer_addresses
+              elsif @in_availability_zones
+                @load_balancer['AvailabilityZones'] << @availability_zone
+                reset_availability_zone
+              elsif @in_security_groups
+                @load_balancer['SecurityGroups'] << value
+              else
+                @results['LoadBalancers'] << @load_balancer
+                reset_load_balancer
+              end
+            when 'SubnetId', 'ZoneName'
+              @availability_zone[name] = value
+            when 'IpAddress', 'AllocationId'
+              @load_balancer_addresses[name] = value
+
+            when 'CanonicalHostedZoneName', 'CanonicalHostedZoneNameID', 'LoadBalancerName', 'DNSName', 'Scheme', 'Type',
+                 'LoadBalancerArn', 'IpAddressType', 'CanonicalHostedZoneId', 'VpcId'
+              @load_balancer[name] = value
+            when 'CreatedTime'
+              @load_balancer[name] = Time.parse(value)
+
+            when 'LoadBalancerAddresses'
+              @in_load_balancer_addresses = false
+            when 'AvailabilityZones'
+              @in_availability_zones = false
+            when 'SecurityGroups'
+              @in_security_groups = false
+            when 'State'
+              @in_state = false
+              @load_balancer[name] = @state
+              @state = {}
+            when 'Code'
+              @state[name] = value
+
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+
+            when 'NextMarker'
+              @results['NextMarker'] = value
+            when 'DescribeLoadBalancersResponse'
+              @response['DescribeLoadBalancersResult'] = @results
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELBV2
+        class DescribeTags < Fog::Parsers::Base
+          def reset
+            @this_key   = nil
+            @this_value = nil
+            @tags       = Hash.new
+            @response   = { 'DescribeTagsResult' => { 'TagDescriptions' => [] }, 'ResponseMetadata' => {} }
+            @in_tags = false
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+              when 'member'
+                unless @in_tags
+                  @resource_arn = nil
+                  @tags = {}
+                end
+              when 'Tags'
+                @in_tags = true
+            end
+          end
+
+          def end_element(name)
+            super
+            case name
+              when 'member'
+                if @in_tags
+                  @tags[@this_key] = @this_value
+                  @this_key, @this_value = nil, nil
+                else
+                  @response['DescribeTagsResult']['TagDescriptions'] << { 'Tags' => @tags, 'ResourceArn' => @resource_arn }
+                end
+              when 'Key'
+                @this_key = value
+              when 'Value'
+                @this_value = value
+              when 'ResourceArn'
+                @resource_arn = value
+              when 'RequestId'
+                @response['ResponseMetadata'][name] = value
+              when 'Tags'
+                @in_tags = false
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/elbv2/empty.rb

@@ -0,0 +1,10 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELBV2
+        class Empty < ELB::Empty
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/iam/get_group_policy.rb

@@ -14,7 +14,7 @@ module Fog
             when 'GroupName', 'PolicyName'
               @response[name] = value
             when 'PolicyDocument'
-              @response['Policy'][name] = if decoded_string = URI.decode(value)
+              @response['Policy'][name] = if decoded_string = URI.decode_www_form_component(value)
                                   Fog::JSON.decode(decoded_string) rescue value
                                 else
                                   value

data/lib/fog/aws/parsers/iam/get_role_policy.rb

@@ -12,7 +12,7 @@ module Fog
             when 'RoleName', 'PolicyName'
               @response['Policy'][name] = value
             when 'PolicyDocument'
-              @response['Policy'][name] = if decoded_string = URI.decode(value)
+              @response['Policy'][name] = if decoded_string = URI.decode_www_form_component(value)
                                   Fog::JSON.decode(decoded_string) rescue value
                                 else
                                   value

data/lib/fog/aws/parsers/iam/get_user_policy.rb

@@ -14,7 +14,7 @@ module Fog
             when 'UserName', 'PolicyName'
               @response['Policy'][name] = value
             when 'PolicyDocument'
-              @response['Policy'][name] = if decoded_string = URI.decode(value)
+              @response['Policy'][name] = if decoded_string = URI.decode_www_form_component(value)
                                   Fog::JSON.decode(decoded_string) rescue value
                                 else
                                   value

data/lib/fog/aws/parsers/iam/policy_version.rb

@@ -18,7 +18,7 @@ module Fog
             when 'IsDefaultVersion'
               @version[name] = (value == 'true')
             when 'Document'
-              @version[name] = if decoded_string = URI.decode(value)
+              @version[name] = if decoded_string = URI.decode_www_form_component(value)
                                  Fog::JSON.decode(decoded_string) rescue value
                                else
                                  value

data/lib/fog/aws/parsers/storage/get_object_tagging.rb

@@ -0,0 +1,33 @@
+module Fog
+  module Parsers
+    module AWS
+      module Storage
+        class GetObjectTagging < Fog::Parsers::Base
+          def reset
+            @in_tag = {}
+            @response = {'ObjectTagging' => {}}
+          end
+
+          def start_element(name, *args)
+            super
+            if name == 'Tag'
+              @in_tag = {}
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'Tag'
+              @response['ObjectTagging'].merge!(@in_tag)
+              @in_tag = {}
+            when 'Key'
+              @in_tag[value] = nil
+            when 'Value'
+              @in_tag = {@in_tag.keys.first => value}
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/storage/upload_part_copy_object.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Parsers
+    module AWS
+      module Storage
+        class UploadPartCopyObject < Fog::Parsers::Base
+          def end_element(name)
+            case name
+            when 'ETag'
+              @response[name] = value.gsub('"', '')
+            when 'LastModified'
+              @response[name] = Time.parse(value)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/sts/assume_role_with_web_identity.rb

@@ -2,7 +2,7 @@ module Fog
   module Parsers
     module AWS
       module STS
-        class AssumeRoleWithWithWebIdentity < Fog::Parsers::Base
+        class AssumeRoleWithWebIdentity < Fog::Parsers::Base
           def reset
             @response = {}
           end

data/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb

@@ -30,6 +30,9 @@ module Fog
         #       * 'IpRanges'<~Array>:
         #         * ip_range<~Hash>:
         #           * 'CidrIp'<~String> - CIDR range
+        #       * 'Ipv6Ranges'<~Array>:
+        #         * ip_range<~Hash>:
+        #           * 'CidrIpv6'<~String> - CIDR range
         #       * 'ToPort'<~Integer> - End of port range (or -1 for ICMP wildcard)
         #
         # === Returns
@@ -72,6 +75,10 @@ module Fog
               range_index += 1
               params[format('IpPermissions.%d.IpRanges.%d.CidrIp', key_index, range_index)] = ip_range['CidrIp']
             end
+            (permission['Ipv6Ranges'] || []).each_with_index do |ip_range, range_index|
+              range_index += 1
+              params[format('IpPermissions.%d.Ipv6Ranges.%d.CidrIpv6', key_index, range_index)] = ip_range['CidrIpv6']
+            end
           end
           params.reject {|k, v| v.nil? }
         end
@@ -186,6 +193,14 @@ module Fog
               'groups'     => [],
               'ipRanges'   => [{'cidrIp' => options['CidrIp']}]
             }
+          elsif options['CidrIpv6']
+            normalized_permissions << {
+              'ipProtocol' => options['IpProtocol'],
+              'fromPort'   => Integer(options['FromPort']),
+              'toPort'     => Integer(options['ToPort']),
+              'groups'     => [],
+              'ipv6Ranges' => [{'cidrIpv6' => options['CidrIpv6']}]
+            }
           elsif options['IpPermissions']
             options['IpPermissions'].each do |permission|
 

data/lib/fog/aws/requests/compute/create_network_interface.rb

@@ -2,6 +2,7 @@ module Fog
   module AWS
     class Compute
       class Real
+        require 'ipaddr'
         require 'fog/aws/parsers/compute/create_network_interface'
 
         # Creates a network interface
@@ -68,7 +69,7 @@ module Fog
               raise Fog::AWS::Compute::Error.new("Unknown subnet '#{subnetId}' specified")
             else
               id = Fog::AWS::Mock.network_interface_id
-              cidr_block = IPAddress.parse(subnet['cidrBlock'])
+              cidr_block = IPAddr.new(subnet['cidrBlock'])
 
               groups = {}
               if options['GroupSet']
@@ -82,12 +83,14 @@ module Fog
               end
 
               if options['PrivateIpAddress'].nil?
+                range = cidr_block.to_range
                 # Here we try to act like a DHCP server and pick the first
                 # available IP (not including the first in the cidr block,
                 # which is typically reserved for the gateway).
-                cidr_block.each_host do |p_ip|
-                  unless self.data[:network_interfaces].map{ |ni, ni_conf| ni_conf['privateIpAddress'] }.include?p_ip.to_s ||
-                    cidr_block.first == p_ip
+                range = range.drop(2)[0..-2] if cidr_block.ipv4?
+
+                range.each do |p_ip|
+                  unless self.data[:network_interfaces].map{ |ni, ni_conf| ni_conf['privateIpAddress'] }.include?p_ip.to_s
                     options['PrivateIpAddress'] = p_ip.to_s
                     break
                   end

data/lib/fog/aws/requests/compute/create_subnet.rb

@@ -2,7 +2,7 @@ module Fog
   module AWS
     class Compute
       class Real
-        require 'ipaddress'
+        require 'ipaddr'
         require 'fog/aws/parsers/compute/create_subnet'
 
         # Creates a Subnet with the CIDR block you specify.
@@ -50,11 +50,11 @@ module Fog
               if vpc.nil?
                 raise Fog::AWS::Compute::NotFound.new("The vpc ID '#{vpcId}' does not exist")
               end
-              if ! ::IPAddress.parse(vpc['cidrBlock']).include?(::IPAddress.parse(cidrBlock))
+              if ! ::IPAddr.new(vpc['cidrBlock']).include?(::IPAddr.new(cidrBlock))
                 raise Fog::AWS::Compute::Error.new("Range => The CIDR '#{cidrBlock}' is invalid.")
               end
               self.data[:subnets].select{ |s| s['vpcId'] == vpcId }.each do |subnet|
-                if ::IPAddress.parse(subnet['cidrBlock']).include?(::IPAddress.parse(cidrBlock))
+                if ::IPAddr.new(subnet['cidrBlock']).include?(::IPAddr.new(cidrBlock))
                   raise Fog::AWS::Compute::Error.new("Conflict => The CIDR '#{cidrBlock}' conflicts with another subnet")
                 end
               end

data/lib/fog/aws/requests/compute/create_vpc.rb

@@ -11,7 +11,6 @@ module Fog
         # * options<~Hash>:
         #   * InstanceTenancy<~String> - The allowed tenancy of instances launched into the VPC. A value of default
         #     means instances can be launched with any tenancy; a value of dedicated means instances must be launched with tenancy as dedicated.
-        #     please not that the documentation is incorrect instanceTenancy will not work while InstanceTenancy will
         #
         # === Returns
         # * response<~Excon::Response>:
@@ -54,7 +53,8 @@ module Fog
                 'classicLinkEnabled'          => false,
                 'classicLinkDnsSupport'       => false,
                 'cidrBlockAssociationSet'     => [{ 'cidrBlock' => cidrBlock, 'state' => 'associated', 'associationId' => "vpc-cidr-assoc-#{vpc_id}" }],
-                'ipv6CidrBlockAssociationSet' => []
+                'ipv6CidrBlockAssociationSet' => [],
+                'instanceTenancy'             => options['InstanceTenancy'] || 'default'
               }
               self.data[:vpcs].push(vpc)
 

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

@@ -27,6 +27,8 @@ module Fog
         #         * 'ipProtocol'<~String> - Ip protocol, must be in ['tcp', 'udp', 'icmp']
         #         * 'ipRanges'<~Array>:
         #           * 'cidrIp'<~String> - CIDR range
+        #         * 'ipv6Ranges'<~Array>:
+        #           * 'cidrIpv6'<~String> - CIDR ipv6 range
         #         * 'toPort'<~Integer> - End of port range (or -1 for ICMP wildcard)
         #       * 'ownerId'<~String> - AWS Access Key Id of the owner of the security group
         #     * 'NextToken'<~String> - The token to retrieve the next page of results

data/lib/fog/aws/requests/compute/request_spot_instances.rb

@@ -113,7 +113,7 @@ module Fog
               raise Fog::AWS::Compute::Error.new(message)
             end
 
-            if !image_id.match(/^ami-[a-f0-9]{8}$/)
+            if !image_id.match(/^ami-[a-f0-9]{8,17}$/)
               message = "The image id '[#{image_id}]' does not exist"
               raise Fog::AWS::Compute::NotFound.new(message)
             end