fog 1.22.1 → 1.23.0

data/lib/fog/aws/models/compute/subnet.rb

@@ -11,6 +11,7 @@ module Fog
         attribute :available_ip_address_count,  :aliases => 'availableIpAddressCount'
         attribute :availability_zone,           :aliases => 'availabilityZone'
         attribute :tag_set,                     :aliases => 'tagSet'
+        attribute :map_public_ip_on_launch,     :aliases => 'mapPublicIpOnLaunch'
 
         def ready?
           requires :state

data/lib/fog/aws/models/compute/vpc.rb

@@ -55,7 +55,18 @@ module Fog
 
           data = service.create_vpc(cidr_block).body['vpcSet'].first
           new_attributes = data.reject {|key,value| key == 'requestId'}
+          new_attributes = data.reject {|key,value| key == 'requestId' || key == 'tagSet' }
           merge_attributes(new_attributes)
+
+          if tags = self.tags
+            # expect eventual consistency
+            Fog.wait_for { self.reload rescue nil }
+            service.create_tags(
+              self.identity,
+              tags
+            )
+          end
+
           true
         end
       end

data/lib/fog/aws/models/data_pipeline/pipeline.rb

@@ -7,6 +7,7 @@ module Fog
         identity  :id, :aliases => 'pipelineId'
         attribute :name
         attribute :description
+        attribute :tags
         attribute :user_id, :aliases => 'userId'
         attribute :account_id, :aliases => 'accountId'
         attribute :state, :aliases => 'pipelineState'
@@ -27,7 +28,7 @@ module Fog
           requires :name
           requires :unique_id
 
-          data = service.create_pipeline(unique_id, name)
+          data = service.create_pipeline(unique_id, name, nil, tags)
           merge_attributes(data)
 
           true

data/lib/fog/aws/models/elasticache/cluster.rb

@@ -17,22 +17,14 @@ module Fog
         attribute :maintenance_window, :aliases => 'PreferredMaintenanceWindow'
         # complex attributes
         attribute :nodes, :aliases => 'CacheNodes', :type => :array
-        attribute :parameter_group,
-          :aliases => 'CacheParameterGroup', :type => :hash
-        attribute :pending_values,
-          :aliases => 'PendingModifiedValues', :type => :hash
-        attribute :create_time,
-          :aliases => 'CacheClusterCreateTime', :type => :date_time
-        attribute :security_groups,
-          :aliases => 'CacheSecurityGroups', :type => :array
-        attribute :notification_config,
-          :aliases => 'NotificationConfiguration', :type => :hash
-        attribute :cache_subnet_group_name,
-          :aliases => 'CacheSubnetGroupName'
-        attribute :vpc_security_groups,
-          :aliases => 'VpcSecurityGroups', :type => :array
-        attribute :s3_snapshot_location,
-          :aliases => 'SnapshotArns', :type => :array
+        attribute :parameter_group, :aliases => 'CacheParameterGroup'
+        attribute :pending_values, :aliases => 'PendingModifiedValues'
+        attribute :create_time, :aliases => 'CacheClusterCreateTime', :type => :timestamp
+        attribute :security_groups, :aliases => 'CacheSecurityGroups', :type => :array
+        attribute :notification_config, :aliases => 'NotificationConfiguration'
+        attribute :cache_subnet_group_name, :aliases => 'CacheSubnetGroupName'
+        attribute :vpc_security_groups, :aliases => 'VpcSecurityGroups', :type => :array
+        attribute :s3_snapshot_location, :aliases => 'SnapshotArns', :type => :array
 
         attr_accessor :parameter_group_name
 

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

@@ -32,7 +32,7 @@ module Fog
             when 'architecture', 'clientToken', 'dnsName', 'hypervisor', 'imageId',
                   'instanceId', 'instanceType', 'ipAddress', 'kernelId', 'keyName',
                   'instanceLifecycle', 'platform', 'privateDnsName', 'privateIpAddress', 'ramdiskId',
-                  'reason', 'requesterId', 'rootDeviceType',
+                  'reason', 'requesterId', 'rootDeviceName', 'rootDeviceType',
                   'spotInstanceRequestId', 'virtualizationType'
               @instance[name] = value
             when 'attachTime'

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

@@ -47,8 +47,7 @@ module Fog
                 @internet_gateway[name] = value
               when 'item'
                 @response['internetGatewaySet'] << @internet_gateway
-                @internet_gateway = { 'tagSet' => {} }
-                @internet_gateway = { 'attachmentSet' => {} }
+                @internet_gateway = { 'attachmentSet' => {}, 'tagSet' => {} }
               when 'requestId'
                 @response[name] = value
               end

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

@@ -32,6 +32,8 @@ module Fog
               case name
               when 'subnetId', 'state', 'vpcId', 'cidrBlock', 'availableIpAddressCount', 'availabilityZone'
                 @subnet[name] = value
+              when 'mapPublicIpOnLaunch'
+                @subnet[name] = value == 'true' ? true : false
               when 'item'
                 @response['subnetSet'] << @subnet
                 @subnet = { 'tagSet' => {} }

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

@@ -0,0 +1,24 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+        class ModifySubnetAttribute < Fog::Parsers::Base
+          def reset
+            @response = {  }
+          end
+
+
+          def end_element(name)
+            case name
+            when 'return'
+              @response[name] = value == 'true' ? true : false
+            when 'requestId'
+              @response[name] = value
+            end
+          
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module Fog
       module AWS
         class NetworkInterfaceParser < Fog::Parsers::Base
           def reset_nic
-            @nic = { 'groupSet' => {}, 'attachment' => {}, 'association' => {}, 'tagSet' => {} }
+            @nic = { 'groupSet' => {}, 'attachment' => {}, 'association' => {}, 'tagSet' => {}, 'privateIpAddressesSet' => [] }
             @in_tag_set     = false
             @in_group_set   = false
             @in_attachment  = false
@@ -78,6 +78,11 @@ module Fog
             elsif @in_private_ip_addresses
               case name
               when 'item'
+                if value
+                  @private_ip_address['item'] = value.strip
+                else
+                  @private_ip_address['item'] = value
+                end
                 @private_ip_addresses << @private_ip_address
                 @private_ip_address = {}
               when 'privateIpAddress', 'privateDnsName', 'primary'

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

@@ -43,8 +43,7 @@ module Fog
 
             when 'LatestRestorableTime', 'InstanceCreateTime'
               @db_instance[name] = Time.parse value
-            when 'Engine',
-              'DBInstanceStatus', 'DBInstanceIdentifier', 'EngineVersion',
+            when 'Engine', 'DBInstanceStatus', 'DBInstanceIdentifier', 
               'PreferredBackupWindow', 'PreferredMaintenanceWindow',
               'AvailabilityZone', 'MasterUsername', 'DBName', 'LicenseModel',
               'DBSubnetGroupName'
@@ -72,7 +71,8 @@ module Fog
               else
                 @db_instance[name] = value.to_i
               end
-            when 'DBInstanceClass', 'EngineVersion', 'MasterUserPassword', 'MultiAZ'
+            when 'DBInstanceClass', 'EngineVersion', 'MasterUserPassword', 
+                'MultiAZ', 'Iops', 'AllocatedStorage'
               if @in_pending_modified_values
                 @pending_modified_values[name] = value
               else
@@ -95,18 +95,6 @@ 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
-              else
-                @db_instance[name] = value.to_i
-              end
 
             when 'Status'
               # Unfortunately, status is used in VpcSecurityGroupMemebership and

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

@@ -149,7 +149,12 @@ module Fog
         def normalize_permissions(options)
           normalized_permissions = []
           if options['SourceSecurityGroupName']
-            source_group_id=self.data[:security_groups][options['SourceSecurityGroupName']]['groupId']
+            group_name = if options['SourceSecurityGroupName'] =~ /default_elb/
+                           "default"
+                         else
+                           options['SourceSecurityGroupName']
+                         end
+            source_group_id=self.data[:security_groups][group_name]['groupId']
             ['tcp', 'udp'].each do |protocol|
               normalized_permissions << {
                 'ipProtocol' => protocol,
@@ -185,7 +190,7 @@ module Fog
                     security_group = if group_name = authorized_group['GroupName']
                                        self.data[:security_groups][group_name] || {}
                                      elsif group_id = authorized_group['GroupId']
-                                       self.data[:security_groups].values.find { |sg| sg['groupId'] == group_id }
+                                       self.data[:security_groups].values.find { |sg| sg['groupId'] == group_id } || {}
                                      end
 
                     {'groupName' => authorized_group['GroupName'] || security_group["groupName"], 'userId' => authorized_group['UserId'] || self.data[:owner_id], 'groupId' => authorized_group["GroupId"] || security_group['groupId']}
@@ -199,7 +204,7 @@ module Fog
                     security_group = if group_name = authorized_group['GroupName']
                                        self.data[:security_groups][group_name] || {}
                                      elsif group_id = authorized_group['GroupId']
-                                       self.data[:security_groups].values.find { |sg| sg['groupId'] == group_id }
+                                       self.data[:security_groups].values.find { |sg| sg['groupId'] == group_id } || {}
                                      end
 
                     {'groupName' => authorized_group['GroupName'] || security_group["groupName"], 'userId' => authorized_group['UserId'] || self.data[:owner_id], 'groupId' => authorized_group["GroupId"] || security_group['groupId']}

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

@@ -82,7 +82,7 @@ module Fog
                 },
               ],
               'associationSet' => [],
-              'tagSet'         => {},
+              'tagSet'         => {}
             }
 
             self.data[:network_acls][id] = data

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

@@ -39,26 +39,7 @@ module Fog
       class Mock
         def create_tags(resources, tags)
           resources = [*resources]
-
-          tagged = resources.map do |resource_id|
-            type = case resource_id
-            when /^ami\-[a-z0-9]{8}$/i
-              'image'
-            when /^i\-[a-z0-9]{8}$/i
-              'instance'
-            when /^snap\-[a-z0-9]{8}$/i
-              'snapshot'
-            when /^vol\-[a-z0-9]{8}$/i
-              'volume'
-            when /^igw\-[a-z0-9]{8}$/i
-              'internet_gateway'
-            end
-            if type && ((type == 'image' && visible_images[resource_id]) || self.data[:"#{type}s"][resource_id])
-              { 'resourceId' => resource_id, 'resourceType' => type }
-            else
-              raise(Fog::Service::NotFound.new("The #{type} ID '#{resource_id}' does not exist"))
-            end
-          end
+          tagged = tagged_resources(resources)
 
           tags.each do |key, value|
             self.data[:tags][key] ||= {}

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

@@ -49,7 +49,8 @@ module Fog
                 'dhcpOptionsId'      => Fog::AWS::Mock.request_id,
                 'tagSet'             => {},
                 'enableDnsSupport'   => true,
-                'enableDnsHostnames' => false
+                'enableDnsHostnames' => false,
+                'mapPublicIpOnLaunch'=> false
               }
               self.data[:vpcs].push(vpc)
 

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

@@ -40,23 +40,7 @@ module Fog
 
       class Mock
         def delete_tags(resources, tags)
-          tagged = Array(resources).map do |resource_id|
-            type = case resource_id
-            when /^ami\-[a-z0-9]{8}$/i
-              'image'
-            when /^i\-[a-z0-9]{8}$/i
-              'instance'
-            when /^snap\-[a-z0-9]{8}$/i
-              'snapshot'
-            when /^vol\-[a-z0-9]{8}$/i
-              'volume'
-            end
-            if type && ((type == 'image' && visible_images[resource_id]) || self.data[:"#{type}s"][resource_id])
-              { 'resourceId' => resource_id, 'resourceType' => type }
-            else
-              raise(Fog::Service::NotFound.new("The #{type} ID '#{resource_id}' does not exist"))
-            end
-          end
+          tagged = tagged_resources(resources)
 
           tags.each do |key, value|
             self.data[:tags][key][value] = self.data[:tags][key][value] - tagged

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

@@ -236,7 +236,7 @@ module Fog
                 'ownerId'       => instance['ownerId'],
                 'reservationId' => instance['reservationId']
               }
-              reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'architecture', 'blockDeviceMapping', 'clientToken', 'dnsName', 'ebsOptimized', 'hypervisor', 'iamInstanceProfile', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'ipAddress', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'networkInterfaces', 'ownerId', 'placement', 'platform', 'privateDnsName', 'privateIpAddress', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceType', 'stateReason', 'virtualizationType'].include?(key)}.merge('tagSet' => self.data[:tag_sets][instance['instanceId']])
+              reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'architecture', 'blockDeviceMapping', 'clientToken', 'dnsName', 'ebsOptimized', 'hypervisor', 'iamInstanceProfile', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'ipAddress', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'networkInterfaces', 'ownerId', 'placement', 'platform', 'privateDnsName', 'privateIpAddress', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceName', 'rootDeviceType', 'stateReason', 'virtualizationType'].include?(key)}.merge('tagSet' => self.data[:tag_sets][instance['instanceId']])
             end
           end
 

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

@@ -53,6 +53,7 @@ module Fog
           response = Excon::Response.new
 
           network_acls = self.data[:network_acls].values
+          network_acls = apply_tag_filters(network_acls, filters, 'networkAclId')
 
           aliases = {
             'vpc-id'         => 'vpcId',
@@ -90,6 +91,11 @@ module Fog
             end
           end
 
+          network_acls.each do |acl|
+            tags = self.data[:tag_sets][acl['networkAclId']]
+            acl.merge!('tagSet' => tags) if tags
+          end
+
           response.status = 200
           response.body = {
             'requestId'     => Fog::AWS::Mock.request_id,

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

@@ -41,6 +41,7 @@ module Fog
       class Mock
         def describe_vpcs(filters = {})
           vpcs = self.data[:vpcs]
+          vpcs = apply_tag_filters(vpcs, filters, 'vpcId')
 
           # Transition from pending to available
           vpcs.each do |vpc|
@@ -54,6 +55,11 @@ module Fog
             vpcs = vpcs.reject {|vpc| vpc['vpcId'] != filters['vpc-id']}
           end
 
+          vpcs.each do |vpc|
+            tags = self.data[:tag_sets][vpc['vpcId']]
+            vpc.merge!('tagSet' => tags) if tags
+          end
+
           Excon::Response.new(
             :status => 200,
             :body   => {

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

@@ -0,0 +1,58 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+        require 'fog/aws/parsers/compute/modify_subnet_attribute'
+
+        # Modifies a subnet attribute.
+        #
+        # ==== Parameters
+        # * SubnetId<~String> - The id of the subnet to modify
+        # * options<~Hash>:
+        #   * MapPublicIpOnLaunch<~Boolean> - Modifies the public IP addressing behavior for the subnet. 
+        #     Specify true to indicate that instances launched into the specified subnet should be assigned a public IP address. 
+        #     If set to true, the instance receives a public IP address only if the instance is launched with a single, 
+        #     new network interface with the device index of 0.
+        #
+        # === Returns
+        # * response<~Excon::Response>:
+        # * body<~Hash>:
+        # * 'requestId'<~String> - Id of request
+        # * 'return'<~Boolean> - Returns true if the request succeeds. Otherwise, returns an error.
+        # http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-ModifySubnetAttribute.html
+        def modify_subnet_attribute(subnet_id, options = {})
+          params = {}
+          params['MapPublicIpOnLaunch.Value'] = options.delete 'MapPublicIpOnLaunch' if options['MapPublicIpOnLaunch']
+          request({
+            'Action' => 'ModifySubnetAttribute',
+            'SubnetId' => subnet_id,
+            :parser => Fog::Parsers::Compute::AWS::ModifySubnetAttribute.new
+          }.merge(params))
+        end
+      end
+
+      class Mock
+        def modify_subnet_attribute(subnet_id, options={})
+          Excon::Response.new.tap do |response|
+            subnet = self.data[:subnets].detect { |v| v['subnetId'] == subnet_id }            
+            if subnet
+              subnet['mapPublicIpOnLaunch'] = options['MapPublicIpOnLaunch']
+
+              response.status = 200
+              
+              response.body = {
+                'requestId' => Fog::AWS::Mock.request_id,
+                'return'    => true
+              }
+            else
+              response.status = 404
+              response.body = {
+                'Code' => 'InvalidParameterValue'
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -43,7 +43,7 @@ module Fog
           }
 
           # This determines if we are doing a snapshot or a S3 backed AMI.
-          if(location =~ /^\/dev\/sd[a-p]\d{0,2}$/)
+          if(location =~ /^\/dev\/(xvd|sd)[a-p]\d{0,2}$/)
             common_options['RootDeviceName'] = location
           else
             common_options['ImageLocation'] = location
@@ -90,7 +90,7 @@ module Fog
               'registered' => Time.now
             }
 
-            if location[/^\/dev\/sd[a-p]\d{0,2}$/]
+            if location[/^\/dev\/(xvd|sd)[a-p]\d{0,2}$/]
               image['rootDeviceName'] = location
               image['rootDeviceType'] = 'ebs'
             else

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

@@ -48,7 +48,7 @@ module Fog
         #   * 'SecurityGroupId'<~Array> or <~String> - id's of security group(s) for instances, use this or SecurityGroup
         #   * 'InstanceInitiatedShutdownBehaviour'<~String> - specifies whether volumes are stopped or terminated when instance is shutdown, in [stop, terminate]
         #   * 'InstanceType'<~String> - Type of instance to boot. Valid options
-        #     in ['t1.micro', 'm1.small', 'm1.medium', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'c3.large', 'c3.xlarge', 'c3.2xlarge', 'c3.4xlarge', 'c3.8xlarge', 'g2.2xlarge', 'hs1.8xlarge', 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', 'cr1.8xlarge', 'm3.xlarge', 'm3.2xlarge', 'hi1.4xlarge', 'cc1.4xlarge', 'cc2.8xlarge', 'cg1.4xlarge', 'i2.xlarge', 'i2.2xlarge', 'i2.4xlarge', 'i2.8xlarge']
+        #     in ['t1.micro', 't2.micro', 't2.small', 't2.medium', 'm1.small', 'm1.medium', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'c3.large', 'c3.xlarge', 'c3.2xlarge', 'c3.4xlarge', 'c3.8xlarge', 'g2.2xlarge', 'hs1.8xlarge', 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge', 'cr1.8xlarge', 'm3.xlarge', 'm3.2xlarge', 'hi1.4xlarge', 'cc1.4xlarge', 'cc2.8xlarge', 'cg1.4xlarge', 'i2.xlarge', 'i2.2xlarge', 'i2.4xlarge', 'i2.8xlarge']
         #     default is 'm1.small'
         #   * 'KernelId'<~String> - Id of kernel with which to launch
         #   * 'KeyName'<~String> - Name of a keypair to add to booting instances
@@ -238,6 +238,7 @@ module Fog
               'privateDnsName'      => nil,
               'productCodes'        => [],
               'reason'              => nil,
+              'rootDeviceName'      => block_device_mapping.first && block_device_mapping.first["deviceName"],
               'rootDeviceType'      => 'instance-store',
               'virtualizationType'  => 'paravirtual'
             }

data/lib/fog/aws/requests/data_pipeline/create_pipeline.rb

@@ -7,15 +7,17 @@ module Fog
         # ==== Parameters
         # * UniqueId <~String> - A unique ID for of the pipeline
         # * Name <~String> - The name of the pipeline
+        # * Tags <~Hash> - Key/value string pairs to categorize the pipeline
         # * Description <~String> - Description of the pipeline
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
-        def create_pipeline(unique_id, name, description=nil)
+        def create_pipeline(unique_id, name, description=nil, tags=nil)
           params = {
             'uniqueId' => unique_id,
             'name' => name,
           }
+          params['tags'] = tags.map {|k,v| {"key" => k.to_s, "value" => v.to_s}} unless tags.nil? || tags.empty?
           params['Description'] = description if description
 
           response = request({
@@ -28,7 +30,7 @@ module Fog
       end
 
       class Mock
-        def create_pipeline(unique_id, name, description=nil)
+        def create_pipeline(unique_id, name, description=nil, tags=nil)
           Fog::Mock.not_implemented
         end
       end