fog 1.19.0 → 1.20.0

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

@@ -11,7 +11,7 @@ module Fog
 
           def end_element(name)
             case name
-            when 'Arn', 'Path', 'ServerCertificateId', 'ServerCertificateName'
+            when 'Arn', 'Path', 'ServerCertificateId', 'ServerCertificateName', 'CertificateBody', 'CertificateChain'
               @response['Certificate'][name] = value
             when 'UploadDate'
               @response['Certificate'][name] = Time.parse(value)

data/lib/fog/aws/parsers/rds/db_parser.rb

@@ -100,6 +100,12 @@ module Fog
               @vpc_security_group = {}
             when 'VpcSecurityGroupId'
               @vpc_security_group[name] = value
+            when 'Iops'
+              if @in_pending_modified_values
+                @pending_modified_values[name] = value.to_i
+              else
+                @db_instance[name] = value.to_i
+              end
             when 'AllocatedStorage'
               if @in_pending_modified_values
                 @pending_modified_values[name] = value.to_i

data/lib/fog/aws/parsers/rds/snapshot_parser.rb

@@ -27,6 +27,7 @@ module Fog
             when 'Engine' then @db_snapshot['Engine'] = value
             when 'EngineVersion' then @db_snapshot['EngineVersion'] = value
             when 'InstanceCreateTime' then @db_snapshot['InstanceCreateTime'] = Time.parse value
+            when 'Iops' then @db_snapshot['Iops'] = value
             when 'MasterUsername' then @db_snapshot['MasterUsername'] = value
             when 'Port' then @db_snapshot['Port'] = value.to_i
             when 'SnapshotCreateTime' then @db_snapshot['SnapshotCreateTime'] = Time.parse value

data/lib/fog/aws/rds.rb

@@ -1,4 +1,4 @@
-require 'fog/aws'
+require 'fog/aws/core'
 
 module Fog
   module AWS

data/lib/fog/aws/redshift.rb

@@ -1,4 +1,4 @@
-require 'fog/aws'
+require 'fog/aws/core'
 
 module Fog
   module AWS

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

@@ -51,6 +51,7 @@ module Fog
               allocation_ip = describe_addresses( 'allocation-id'  => "#{allocation_id}").body['addressesSet'].first
               if !allocation_ip.nil?
                 public_ip = allocation_ip['publicIp']
+                address = public_ip.nil? ? nil : self.data[:addresses][public_ip]
               end
             end
             if !address.nil?

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

@@ -0,0 +1,105 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+        require 'fog/aws/parsers/compute/create_network_acl'
+
+        # Creates a network ACL
+        #
+        # ==== Parameters
+        # * vpcId<~String> - The ID of the VPC to create this network ACL under
+        #
+        # === Returns
+        # * response<~Excon::Response>:
+        # * body<~Hash>:
+        # * 'requestId'<~String>                   - Id of request
+        # * 'networkAcl'<~Array>:                  - The network ACL
+        # *   'networkAclId'<~String>              - The ID of the network ACL
+        # *   'vpcId'<~String>                     - The ID of the VPC for the network ACL
+        # *   'default'<~Boolean>                  - Indicates whether this is the default network ACL for the VPC
+        # *   'entrySet'<~Array>:                  - A list of entries (rules) in the network ACL
+        # *     'ruleNumber'<~Integer>             - The rule number for the entry. ACL entries are processed in ascending order by rule number
+        # *     'protocol'<~Integer>               - The protocol. A value of -1 means all protocols
+        # *     'ruleAction'<~String>              - Indicates whether to allow or deny the traffic that matches the rule
+        # *     'egress'<~Boolean>                 - Indicates whether the rule is an egress rule (applied to traffic leaving the subnet)
+        # *     'cidrBlock'<~String>               - The network range to allow or deny, in CIDR notation
+        # *     'icmpTypeCode'<~Hash>              - ICMP protocol: The ICMP type and code
+        # *       'code'<~Integer>                 - The ICMP code. A value of -1 means all codes for the specified ICMP type
+        # *       'type'<~Integer>                 - The ICMP type. A value of -1 means all types
+        # *     'portRange'<~Hash>                 - TCP or UDP protocols: The range of ports the rule applies to
+        # *       'from'<~Integer>                 - The first port in the range
+        # *       'to'<~Integer>                   - The last port in the range
+        # *   'associationSet'<~Array>:            - A list of associations between the network ACL and subnets
+        # *     'networkAclAssociationId'<~String> - The ID of the association
+        # *     'networkAclId'<~String>            - The ID of the network ACL
+        # *     'subnetId'<~String>                - The ID of the subnet
+        # *   'tagSet'<~Array>:                    - Tags assigned to the resource.
+        # *     'key'<~String>                     - Tag's key
+        # *     'value'<~String>                   - Tag's value
+        #
+        # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateNetworkAcl.html]
+        def create_network_acl(vpcId, options = {})
+          request({
+            'Action' => 'CreateNetworkAcl',
+            'VpcId'  => vpcId,
+            :parser  => Fog::Parsers::Compute::AWS::CreateNetworkAcl.new
+          }.merge!(options))
+        end
+      end
+
+      class Mock
+        def create_network_acl(vpcId, options = {})
+          response = Excon::Response.new
+          if vpcId
+            id = Fog::AWS::Mock.network_acl_id
+
+            unless self.data[:vpcs].detect { |s| s['vpcId'] == vpcId }
+              raise Fog::Compute::AWS::Error.new("Unknown VPC '#{vpcId}' specified")
+            end
+
+            data = {
+              'networkAclId'   => id,
+              'vpcId'          => vpcId,
+              'default'        => false,
+              'entrySet'       => [
+                {
+                  'icmpTypeCode' => {},
+                  'portRange'    => {},
+                  'ruleNumber'   => 32767,
+                  'protocol'     => -1,
+                  'ruleAction'   => "deny",
+                  'egress'       => true,
+                  'cidrBlock'    => "0.0.0.0/0",
+                },
+                {
+                  'icmpTypeCode' => {},
+                  'portRange'    => {},
+                  'ruleNumber'   => 32767,
+                  'protocol'     => -1,
+                  'ruleAction'   => "deny",
+                  'egress'       => false,
+                  'cidrBlock'    => "0.0.0.0/0",
+                },
+              ],
+              'associationSet' => [],
+              'tagSet'         => {},
+            }
+
+            self.data[:network_acls][id] = data
+            response.body = {
+              'requestId'  => Fog::AWS::Mock.request_id,
+              'networkAcl' => data
+            }
+          else
+            response.status = 400
+            response.body = {
+              'Code'    => 'InvalidParameterValue',
+              'Message' => "Invalid value '' for subnetId"
+            }
+          end
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,80 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+        require 'fog/aws/parsers/compute/basic'
+
+        # Creates a Network ACL entry
+        #
+        # ==== Parameters
+        # * network_acl_id<~String> - The ID of the ACL to add this entry to
+        # * rule_number<~Integer>   - The rule number for the entry, between 100 and 32766
+        # * protocol<~Integer>      - The IP protocol to which the rule applies. You can use -1 to mean all protocols.
+        # * rule_action<~String>    - Allows or denies traffic that matches the rule. (either allow or deny)
+        # * cidr_block<~String>     - The CIDR range to allow or deny
+        # * egress<~Boolean>        - Indicates whether this rule applies to egress traffic from the subnet (true) or ingress traffic to the subnet (false).
+        # * options<~Hash>:
+        # *   'Icmp.Code'           - ICMP code, required if protocol is 1
+        # *   'Icmp.Type'           - ICMP type, required if protocol is 1
+        # *   'PortRange.From'      - The first port in the range, required if protocol is 6 (TCP) or 17 (UDP)
+        # *   'PortRange.To'        - The last port in the range, required if protocol is 6 (TCP) or 17 (UDP)
+        #
+        # === Returns
+        # * response<~Excon::Response>:
+        # * body<~Hash>:
+        # * 'requestId'<~String> - Id of request
+        # * 'return'<~Boolean> - Returns true if the request succeeds.
+        #
+        # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateNetworkAclEntry.html]
+        def create_network_acl_entry(network_acl_id, rule_number, protocol, rule_action, cidr_block, egress, options = {})
+          request({
+            'Action'       => 'CreateNetworkAclEntry',
+            'NetworkAclId' => network_acl_id,
+            'RuleNumber'   => rule_number,
+            'Protocol'     => protocol,
+            'RuleAction'   => rule_action,
+            'Egress'       => egress,
+            'CidrBlock'    => cidr_block,
+            :parser        => Fog::Parsers::Compute::AWS::Basic.new
+          }.merge!(options))
+        end
+      end
+
+      class Mock
+        def create_network_acl_entry(network_acl_id, rule_number, protocol, rule_action, cidr_block, egress, options = {})
+          response = Excon::Response.new
+          if self.data[:network_acls][network_acl_id]
+
+            if self.data[:network_acls][network_acl_id]['entrySet'].detect { |r| r['ruleNumber'] == rule_number && r['egress'] == egress }
+              raise Fog::Compute::AWS::Error.new("Already a rule with that number")
+            end
+
+            data = {
+              'ruleNumber'   => rule_number,
+              'protocol'     => protocol,
+              'ruleAction'   => rule_action,
+              'egress'       => egress,
+              'cidrBlock'    => cidr_block,
+              'icmpTypeCode' => {},
+              'portRange'    => {}
+            }
+            data['icmpTypeCode']['code'] = options['Icmp.Code']      if options['Icmp.Code']
+            data['icmpTypeCode']['type'] = options['Icmp.Type']      if options['Icmp.Type']
+            data['portRange']['from']    = options['PortRange.From'] if options['PortRange.From']
+            data['portRange']['to']      = options['PortRange.To']   if options['PortRange.To']
+            self.data[:network_acls][network_acl_id]['entrySet'] << data
+
+            response.status = 200
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'return'    => true
+            }
+            response
+          else
+            raise Fog::Compute::AWS::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -46,19 +46,29 @@ module Fog
           Excon::Response.new.tap do |response|
             if cidrBlock  && vpcId
               response.status = 200
-              self.data[:subnets].push({
-                'subnetId'                 => Fog::AWS::Mock.request_id,
+              data = {
+                'subnetId'                 => Fog::AWS::Mock.subnet_id,
                 'state'                    => 'pending',
                 'vpcId'                    => vpcId,
                 'cidrBlock'                => cidrBlock,
                 'availableIpAddressCount'  => "255",
                 'availabilityZone'         => av_zone,
                 'tagSet'                   => {}
-              })
+              }
+
+              # Add this subnet to the default network ACL
+              accid = Fog::AWS::Mock.network_acl_association_id
+              default_nacl = self.data[:network_acls].values.detect { |nacl| nacl['vpcId'] == vpcId && nacl['default'] }
+              default_nacl['associationSet'] << {
+                'networkAclAssociationId' => accid,
+                'networkAclId'            => default_nacl['networkAclId'],
+                'subnetId'                => data['subnetId'],
+              }
 
+              self.data[:subnets].push(data)
               response.body = {
                 'requestId'    => Fog::AWS::Mock.request_id,
-                'subnetSet'    => self.data[:subnets]
+                'subnet'       => data,
               }
             else
               response.status = 400

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

@@ -43,7 +43,7 @@ module Fog
           Excon::Response.new.tap do |response|
             if cidrBlock 
               response.status = 200
-              vpc_id = Fog::AWS::Mock.request_id
+              vpc_id = Fog::AWS::Mock.vpc_id
               self.data[:vpcs].push({
                 'vpcId'         => vpc_id,
                 'state'         => 'pending',
@@ -66,6 +66,12 @@ module Fog
               assoc = add_route_association(default_route.id, nil, true)
               route_table["associationSet"].push(assoc)
 
+              # Create a default network ACL
+              default_nacl = self.network_acls.new(:vpc_id => vpc_id)
+              default_nacl.save
+              # Manually override since Amazon doesn't let you create a default one
+              self.data[:network_acls][default_nacl.network_acl_id]['default'] = true
+
               response.body = {
                 'requestId' => Fog::AWS::Mock.request_id,
                 'vpcSet'    => self.data[:vpcs]

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

@@ -0,0 +1,52 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+        require 'fog/aws/parsers/compute/basic'
+
+        # Deletes a network ACL.
+        #
+        # ==== Parameters
+        # * network_acl_id<~String> - The ID of the network ACL you want to delete.
+        #
+        # === Returns
+        # * response<~Excon::Response>:
+        # * body<~Hash>:
+        # * 'requestId'<~String> - Id of request
+        # * 'return'<~Boolean> - Returns true if the request succeeds.
+        #
+        # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteNetworkAcl.html]
+        def delete_network_acl(network_acl_id)
+          request(
+            'Action'       => 'DeleteNetworkAcl',
+            'NetworkAclId' => network_acl_id,
+            :parser        => Fog::Parsers::Compute::AWS::Basic.new
+          )
+        end
+      end
+      
+      class Mock
+        def delete_network_acl(network_acl_id)
+          response = Excon::Response.new
+          if self.data[:network_acls][network_acl_id]
+
+            if self.data[:network_acls][network_acl_id]['associationSet'].any?
+              raise Fog::Compute::AWS::Error.new("ACL is in use")
+            end
+
+            self.data[:network_acls].delete(network_acl_id)
+
+            response.status = 200
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'return'    => true
+            }
+            response
+          else
+            raise Fog::Compute::AWS::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+        require 'fog/aws/parsers/compute/basic'
+
+        # Deletes a network ACL entry
+        #
+        # ==== Parameters
+        # * network_acl_id<~String> - The ID of the network ACL
+        # * rule_number<~Integer>   - The rule number of the entry to delete.
+        # * egress<~Boolean>        - Indicates whether the rule is an egress rule (true) or ingress rule (false)
+        #
+        # === Returns
+        # * response<~Excon::Response>:
+        # * body<~Hash>:
+        # * 'requestId'<~String> - Id of request
+        # * 'return'<~Boolean> - Returns true if the request succeeds.
+        #
+        # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteNetworkAclEntry.html]
+        def delete_network_acl_entry(network_acl_id, rule_number, egress)
+          request(
+            'Action'       => 'DeleteNetworkAclEntry',
+            'NetworkAclId' => network_acl_id,
+            'RuleNumber'   => rule_number,
+            'Egress'       => egress,
+            :parser        => Fog::Parsers::Compute::AWS::Basic.new
+          )
+        end
+      end
+      
+      class Mock
+        def delete_network_acl_entry(network_acl_id, rule_number, egress)
+          response = Excon::Response.new
+          if self.data[:network_acls][network_acl_id]
+            if self.data[:network_acls][network_acl_id]['entrySet'].detect { |r| r['ruleNumber'] == rule_number && r['egress'] == egress }
+              self.data[:network_acls][network_acl_id]['entrySet'].delete_if { |r| r['ruleNumber'] == rule_number && r['egress'] == egress }
+            else
+              raise Fog::Compute::AWS::Error.new("No rule with that number and egress value")
+            end
+
+            response.status = 200
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'return'    => true
+            }
+            response
+          else
+            raise Fog::Compute::AWS::NotFound.new("The network ACL '#{network_acl_id}' does not exist")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -36,6 +36,10 @@ module Fog
               response.status = 200
               self.data[:vpcs].reject! { |v| v['vpcId'] == vpc_id }
 
+              # Delete the default network ACL
+              network_acl_id = self.network_acls.all('vpc-id' => vpc_id, 'default' => true).first.network_acl_id
+              self.data[:network_acls].delete(network_acl_id)
+
               response.body = {
                 'requestId' => Fog::AWS::Mock.request_id,
                 'return' => true

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

@@ -46,7 +46,7 @@ module Fog
 
           addresses_set = self.data[:addresses].values
 
-          aliases = {'public-ip' => 'publicIp', 'instance-id' => 'instanceId'}
+          aliases = {'public-ip' => 'publicIp', 'instance-id' => 'instanceId', 'allocation-id' => 'allocationId'}
           for filter_key, filter_value in filters
             aliased_key = aliases[filter_key]
             addresses_set = addresses_set.reject{|address| ![*filter_value].include?(address[aliased_key])}

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

@@ -0,0 +1,104 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/aws/parsers/compute/describe_network_acls'
+
+        # Describe all or specified network ACLs
+        #
+        # ==== Parameters
+        # * filters<~Hash> - List of filters to limit results with
+        #
+        # === Returns
+        # * response<~Excon::Response>:
+        # * body<~Hash>:
+        # * 'requestId'<~String>                   - Id of request
+        # * 'networkAclSet'<~Array>:               - A list of network ACLs
+        # *   'networkAclId'<~String>              - The ID of the network ACL
+        # *   'vpcId'<~String>                     - The ID of the VPC for the network ACL
+        # *   'default'<~Boolean>                  - Indicates whether this is the default network ACL for the VPC
+        # *   'entrySet'<~Array>:                  - A list of entries (rules) in the network ACL
+        # *     'ruleNumber'<~Integer>             - The rule number for the entry. ACL entries are processed in ascending order by rule number
+        # *     'protocol'<~Integer>               - The protocol. A value of -1 means all protocols
+        # *     'ruleAction'<~String>              - Indicates whether to allow or deny the traffic that matches the rule
+        # *     'egress'<~Boolean>                 - Indicates whether the rule is an egress rule (applied to traffic leaving the subnet)
+        # *     'cidrBlock'<~String>               - The network range to allow or deny, in CIDR notation
+        # *     'icmpTypeCode'<~Hash>              - ICMP protocol: The ICMP type and code
+        # *       'code'<~Integer>                 - The ICMP code. A value of -1 means all codes for the specified ICMP type
+        # *       'type'<~Integer>                 - The ICMP type. A value of -1 means all types
+        # *     'portRange'<~Hash>                 - TCP or UDP protocols: The range of ports the rule applies to
+        # *       'from'<~Integer>                 - The first port in the range
+        # *       'to'<~Integer>                   - The last port in the range
+        # *   'associationSet'<~Array>:            - A list of associations between the network ACL and subnets
+        # *     'networkAclAssociationId'<~String> - The ID of the association
+        # *     'networkAclId'<~String>            - The ID of the network ACL
+        # *     'subnetId'<~String>                - The ID of the subnet
+        # *   'tagSet'<~Array>:                    - Tags assigned to the resource.
+        # *     'key'<~String>                     - Tag's key
+        # *     'value'<~String>                   - Tag's value
+        #
+        # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeNetworkAcls.html]
+        def describe_network_acls(filters = {})
+          params = Fog::AWS.indexed_filters(filters)
+          request({
+            'Action' => 'DescribeNetworkAcls',
+            :idempotent => true,
+            :parser => Fog::Parsers::Compute::AWS::DescribeNetworkAcls.new
+          }.merge!(params))
+        end
+      end
+
+      class Mock
+        def describe_network_acls(filters = {})
+          response = Excon::Response.new
+
+          network_acls = self.data[:network_acls].values
+
+          aliases = {
+            'vpc-id'         => 'vpcId',
+            'network-acl-id' => 'networkAclId',
+            'default'        => 'default',
+          }
+          association_aliases = {
+            'association-id' => 'networkAclAssociationId',
+            'network-acl-id' => 'networkAclId',
+            'subnet-id'      => 'subnetId',
+          }
+          entry_aliases = {
+            'cidr'        => 'cidrBlock',
+            'egress'      => 'egress',
+            'rule-action' => 'ruleAction',
+            'rule-number' => 'ruleNumber',
+            'protocol'    => 'protocol',
+            'egress'      => 'egress',
+          }
+          for filter_key, filter_value in filters
+            filter_key = filter_key.to_s
+            if association_key = filter_key.split('association.')[1]
+              aliased_key = association_aliases[association_key]
+              network_acls = network_acls.reject{|nacl| !nacl['associationSet'].detect {|association| [*filter_value].include?(association[aliased_key])}}
+            elsif entry_key = filter_key.split('entry.icmp.')[1]
+              network_acls = network_acls.reject{|nacl| !nacl['entrySet'].detect {|association| [*filter_value].include?(association['icmpTypeCode'][entry_key])}}
+            elsif entry_key = filter_key.split('entry.port-range.')[1]
+              network_acls = network_acls.reject{|nacl| !nacl['entrySet'].detect {|association| [*filter_value].include?(association['portRange'][entry_key])}}
+            elsif entry_key = filter_key.split('entry.')[1]
+              aliased_key = entry_aliases[entry_key]
+              network_acls = network_acls.reject{|nacl| !nacl['entrySet'].detect {|association| [*filter_value].include?(association[aliased_key])}}
+            else
+              aliased_key = aliases[filter_key]
+              network_acls = network_acls.reject{|nacl| ![*filter_value].include?(nacl[aliased_key])}
+            end
+          end
+
+          response.status = 200
+          response.body = {
+            'requestId'     => Fog::AWS::Mock.request_id,
+            'networkAclSet' => network_acls
+          }
+          response
+        end
+      end
+    end
+  end
+end