fog 1.18.0 → 1.19.0

data/fog.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '1.18.0'
-  s.date              = '2013-10-31'
+  s.version           = '1.19.0'
+  s.date              = '2013-12-19'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('builder')
-  s.add_dependency('excon', '~>0.28.0')
+  s.add_dependency('excon', '~>0.31.0')
   s.add_dependency('formatador', '~>0.2.0')
   s.add_dependency('multi_json', '~>1.0')
   s.add_dependency('mime-types')

data/lib/fog/aws.rb

@@ -2,12 +2,6 @@ require 'fog/core'
 require 'fog/aws/credential_fetcher'
 require 'fog/aws/signaturev4'
 
-begin
-  require 'unf/normalizer'
-rescue LoadError
-  Fog::Logger.warning("Unable to load the 'unf' gem. Your AWS strings may not be properly encoded.")
-end
-
 module Fog
   module AWS
     extend Fog::Provider
@@ -92,6 +86,14 @@ module Fog
     end
 
     def self.escape(string)
+      unless @unf_loaded_or_warned
+        begin
+          require('unf/normalizer')
+        rescue LoadError
+          Fog::Logger.warning("Unable to load the 'unf' gem. Your AWS strings may not be properly encoded.")
+        end
+        @unf_loaded_or_warned = true
+      end
       string = defined?(::UNF::Normalizer) ? ::UNF::Normalizer.normalize(string, :nfc) : string
       string.gsub(/([^a-zA-Z0-9_.\-~]+)/) {
         "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
@@ -268,7 +270,7 @@ module Fog
         "zone-#{Fog::Mock.random_hex(8)}"
       end
       def self.change_id
-        "change-#{Fog::Mock.random_hex(8)}"
+        Fog::Mock.random_letters_and_numbers(14)
       end
       def self.nameservers
         [

data/lib/fog/aws/cloud_watch.rb

@@ -155,7 +155,6 @@ module Fog
             :expects    => 200,
             :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
             :idempotent => idempotent,
-            :host       => @host,
             :method     => 'POST',
             :parser     => parser
           })

data/lib/fog/aws/compute.rb

@@ -47,6 +47,7 @@ module Fog
 
       request_path 'fog/aws/requests/compute'
       request :allocate_address
+      request :assign_private_ip_addresses
       request :associate_address
       request :associate_dhcp_options
       request :attach_network_interface
@@ -126,6 +127,7 @@ module Fog
       request :modify_network_interface_attribute
       request :modify_snapshot_attribute
       request :modify_volume_attribute
+      request :modify_vpc_attribute
       request :purchase_reserved_instances_offering
       request :reboot_instances
       request :release_address

data/lib/fog/aws/dns.rb

@@ -34,7 +34,8 @@ module Fog
                 :limits => {
                   :duplicate_domains => 5
                 },
-                :zones => {}
+                :zones => {},
+                :changes => {}
               }
             end
           end

data/lib/fog/aws/elb.rb

@@ -31,10 +31,12 @@ module Fog
       request :deregister_instances_from_load_balancer
       request :describe_instance_health
       request :describe_load_balancers
+      request :describe_load_balancer_attributes
       request :describe_load_balancer_policies
       request :describe_load_balancer_policy_types
       request :disable_availability_zones_for_load_balancer
       request :enable_availability_zones_for_load_balancer
+      request :modify_load_balancer_attributes
       request :register_instances_with_load_balancer
       request :set_load_balancer_listener_ssl_certificate
       request :set_load_balancer_policies_of_listener

data/lib/fog/aws/models/auto_scaling/configuration.rb

@@ -7,8 +7,10 @@ module Fog
 
         identity  :id,                    :aliases => 'LaunchConfigurationName'
         attribute :arn,                   :aliases => 'LaunchConfigurationARN'
+        attribute :associate_public_ip,   :aliases => 'AssociatePublicIpAddress'
         attribute :block_device_mappings, :aliases => 'BlockDeviceMappings'
         attribute :created_at,            :aliases => 'CreatedTime'
+        attribute :iam_instance_profile,  :aliases => 'IamInstanceProfile'
         attribute :image_id,              :aliases => 'ImageId'
         #attribute :instance_monitoring,   :aliases => 'InstanceMonitoring'
         attribute :instance_monitoring,   :aliases => 'InstanceMonitoring', :squash => 'Enabled'
@@ -18,6 +20,8 @@ module Fog
         attribute :ramdisk_id,            :aliases => 'RamdiskId'
         attribute :security_groups,       :aliases => 'SecurityGroups'
         attribute :user_data,             :aliases => 'UserData'
+        attribute :spot_price,            :aliases => 'SpotPrice'
+        
 
         def initialize(attributes={})
           #attributes[:availability_zones] ||= %w(us-east-1a us-east-1b us-east-1c us-east-1d)

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

@@ -6,12 +6,13 @@ module Fog
 
       class Address < Fog::Model
 
-        identity  :public_ip,            :aliases => 'publicIp'
+        identity  :public_ip,                  :aliases => 'publicIp'
 
-        attribute :allocation_id,        :aliases => 'allocationId'
-        attribute :association_id,       :aliases => 'associationId'
-        attribute :server_id,            :aliases => 'instanceId'
-        attribute :network_interface_id, :aliases => 'networkInterfaceId'
+        attribute :allocation_id,              :aliases => 'allocationId'
+        attribute :association_id,             :aliases => 'associationId'
+        attribute :server_id,                  :aliases => 'instanceId'
+        attribute :network_interface_id,       :aliases => 'networkInterfaceId'
+        attribute :network_interface_owner_id, :aliases => 'networkInterfaceOwnerId'
         attribute :domain
 
         def initialize(attributes = {})

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

@@ -16,6 +16,16 @@ module Fog
         { :bits => 32, :cores =>   5,  :disk => 350,  :id =>  'c1.medium',  :name => 'High-CPU Medium',      :ram => 1740.8},
         { :bits => 64, :cores =>  20,  :disk => 1690, :id =>  'c1.xlarge',  :name => 'High-CPU Extra Large', :ram => 7168},
 
+        { :bits => 64, :cores =>   7,  :disk =>  32,  :id => 'c3.large',    :name => 'C3 Large',                 :ram => 3750},
+        { :bits => 64, :cores =>  14,  :disk =>  80,  :id => 'c3.xlarge',   :name => 'C3 Extra Large',           :ram => 7168},
+        { :bits => 64, :cores =>  28,  :disk => 160,  :id => 'c3.2xlarge',  :name => 'C3 Double Extra Large',    :ram => 15360},
+        { :bits => 64, :cores =>  55,  :disk => 320,  :id => 'c3.4xlarge',  :name => 'C3 Quadruple Extra Large', :ram => 30720},
+        { :bits => 64, :cores => 108,  :disk => 640,  :id => 'c3.8xlarge',  :name => 'C3 Eight Extra Large',     :ram => 61440},
+
+        { :bits => 64, :cores =>   26, :disk => 60,   :id => 'g2.2xlarge',  :name => 'GPU Double Extra Large', :ram => 15360},
+
+        { :bits => 64, :cores =>   35, :disk => 50331648, :id => 'hs1.8xlarge', :name => 'High Storage Eight Extra Large', :ram => 119808},
+
         { :bits => 64, :cores =>  6.5, :disk => 420,  :id =>  'm2.xlarge',  :name => 'High-Memory Extra Large',           :ram => 17510.4},
         { :bits => 64, :cores =>   13, :disk => 850,  :id =>  'm2.2xlarge', :name => 'High Memory Double Extra Large',    :ram => 35020.8},
         { :bits => 64, :cores =>   26, :disk => 1690, :id =>  'm2.4xlarge', :name => 'High Memory Quadruple Extra Large', :ram => 70041.6},

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

@@ -42,7 +42,7 @@ module Fog
           self.groups ||= ["default"]
           self.flavor_id ||= 't1.micro'
           self.image_id   ||= begin
-            self.username = 'ubuntu'
+            self.username ||= 'ubuntu'
 
             # Old 'connection' is renamed as service and should be used instead
             prepare_service_value(attributes)

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

@@ -14,6 +14,10 @@ module Fog
         attribute :availability_zone,           :aliases => 'availabilityZone'
         attribute :tag_set,                     :aliases => 'tagSet'
 
+        def ready?
+          requires :state
+          state == 'available'
+        end
 
         # Removes an existing subnet
         #

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

@@ -20,6 +20,11 @@ module Fog
           super
         end
 
+        def ready?
+          requires :state
+          state == 'available'
+        end
+
         # Removes an existing vpc
         #
         # vpc.destroy

data/lib/fog/aws/models/dns/records.rb

@@ -33,9 +33,7 @@ module Fog
           data['NextRecordIdentifier'] = nil unless data.has_key?('NextRecordIdentifier')
 
           merge_attributes(data.reject {|key, value| !['IsTruncated', 'MaxItems', 'NextRecordName', 'NextRecordType', 'NextRecordIdentifier'].include?(key)})
-          # leave out the default, read only records
-          data = data['ResourceRecordSets'].reject {|record| ['NS', 'SOA'].include?(record['Type'])}
-          load(data)
+          load(data['ResourceRecordSets'])
         end
 
         #

data/lib/fog/aws/models/elb/load_balancer.rb

@@ -35,6 +35,16 @@ module Fog
           super
         end
 
+        def cross_zone_load_balancing?
+          requires :id
+          service.describe_load_balancer_attributes(id).body['DescribeLoadBalancerAttributesResult']['LoadBalancerAttributes']['CrossZoneLoadBalancing']['Enabled']
+        end
+
+        def cross_zone_load_balancing= value
+          requires :id
+          service.modify_load_balancer_attributes(id, 'CrossZoneLoadBalancing' => {'Enabled' => value})
+        end
+
         def register_instances(instances)
           requires :id
           data = service.register_instances_with_load_balancer(instances, id).body['RegisterInstancesWithLoadBalancerResult']

data/lib/fog/aws/models/glacier/vault.rb

@@ -33,7 +33,7 @@ module Fog
         end
 
         def delete_notification_configuration
-          service.delete_vault_notification_configuration
+          service.delete_vault_notification_configuration(id)
         end
 
         def save

data/lib/fog/aws/models/rds/server.rb

@@ -11,6 +11,7 @@ module Fog
         attribute :engine_version, :aliases => 'EngineVersion'
         attribute :state, :aliases => 'DBInstanceStatus'
         attribute :allocated_storage, :aliases => 'AllocatedStorage', :type => :integer
+        attribute :iops, :aliases => 'Iops'
         attribute :availability_zone , :aliases => 'AvailabilityZone'
         attribute :flavor_id, :aliases => 'DBInstanceClass'
         attribute :endpoint, :aliases => 'Endpoint'
@@ -31,7 +32,7 @@ module Fog
         attribute :license_model, :aliases => 'LicenseModel'
         attribute :db_subnet_group_name, :aliases => 'DBSubnetGroupName'
         attribute :publicly_accessible, :aliases => 'PubliclyAccessible'
-        attribute :vpc_security_groups, :aliases => 'VpcSecurityGroups'
+        attribute :vpc_security_groups, :aliases => 'VpcSecurityGroups', :type => :array
 
         attr_accessor :password, :parameter_group_name, :security_group_names, :port
 
@@ -116,6 +117,7 @@ module Fog
             'Port'                          => port || attributes['Port'],
             'Engine'                        => engine,
             'EngineVersion'                 => engine_version,
+            'Iops'                          => iops,
             'MasterUsername'                => master_username,
             'MasterUserPassword'            => password || attributes['MasterUserPassword'],
             'PreferredMaintenanceWindow'    => preferred_maintenance_window,
@@ -123,7 +125,8 @@ module Fog
             'MultiAZ'                       => multi_az,
             'LicenseModel'                  => license_model,
             'DBSubnetGroupName'             => db_subnet_group_name,
-            'PubliclyAccessible'            => publicly_accessible
+            'PubliclyAccessible'            => publicly_accessible,
+            'VpcSecurityGroups'             => vpc_security_groups,
           }
 
           options.delete_if {|key, value| value.nil?}

data/lib/fog/aws/models/rds/subnet_group.rb

@@ -12,7 +12,21 @@ module Fog
         attribute  :vpc_id, :aliases => 'VpcId'
         attribute  :subnet_ids, :aliases => 'Subnets'
 
-        # TODO: ready?, save, destroy
+        def ready?
+          requires :status
+          status == 'Complete'
+        end
+
+        def save
+          requires :description, :id, :subnet_ids
+          service.create_db_subnet_group(id, subnet_ids, description)
+          reload
+        end
+
+        def destroy
+          requires :id
+          service.delete_db_subnet_group(id)
+        end
 
       end
     end

data/lib/fog/aws/models/storage/file.rb

@@ -33,13 +33,13 @@ module Fog
 
         # Set file's access control list (ACL).
         # 
-        #     valid acls: private, public-read, public-read-write, authenticated-read
+        #     valid acls: private, public-read, public-read-write, authenticated-read, bucket-owner-read, bucket-owner-full-control
         # 
         # @param [String] new_acl one of valid options
         # @return [String] @acl
         # 
         def acl=(new_acl)
-          valid_acls = ['private', 'public-read', 'public-read-write', 'authenticated-read']
+          valid_acls = ['private', 'public-read', 'public-read-write', 'authenticated-read', 'bucket-owner-read', 'bucket-owner-full-control']
           unless valid_acls.include?(new_acl)
             raise ArgumentError.new("acl must be one of [#{valid_acls.join(', ')}]")
           end

data/lib/fog/aws/parsers/auto_scaling/describe_launch_configurations.rb

@@ -68,7 +68,13 @@ module Fog
               @launch_configuration[name] = value
             when 'KernelId', 'RamdiskId', 'UserData'
               @launch_configuration[name] = value
+            when 'IamInstanceProfile'
+              @launch_configuration[name] = value
+            when 'SpotPrice'
+              @launch_configuration[name] = value.to_f
 
+            when 'AssociatePublicIpAddress'
+              @in_associate_public_ip = false
             when 'BlockDeviceMappings'
               @in_block_device_mappings = false
             when 'LaunchConfigurations'

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

@@ -0,0 +1,25 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+
+        class AssignPrivateIpAddresses < Fog::Parsers::Base
+
+          def end_element(name)
+            case name
+            when 'requestId'
+              @response[name] = value
+            when 'return'
+              if value == 'true'
+                @response[name] = true
+              else
+                @response[name] = false
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -12,7 +12,7 @@ module Fog
 
           def end_element(name)
             case name
-            when 'instanceId', 'publicIp', 'domain', 'allocationId', 'associationId'
+            when 'instanceId', 'publicIp', 'domain', 'allocationId', 'associationId', 'networkInterfaceId', 'networkInterfaceOwnerId'
               @address[name] = value
             when 'item'
               @response['addressesSet'] << @address

data/lib/fog/aws/parsers/elb/describe_load_balancer_attributes.rb

@@ -0,0 +1,40 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELB
+
+        class DescribeLoadBalancerAttributes < Fog::Parsers::Base
+
+          def reset
+            @response = { 'DescribeLoadBalancerAttributesResult' => { 'LoadBalancerAttributes' => {} }, 'ResponseMetadata' => {} }
+            @stack = []
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name 
+            when 'CrossZoneLoadBalancing'
+              @cross_zone_load_balancing = {}
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'Enabled'
+              if @cross_zone_load_balancing
+                @cross_zone_load_balancing['Enabled'] = value == 'true' ? true : false
+              end
+            when 'CrossZoneLoadBalancing'
+              @response['DescribeLoadBalancerAttributesResult']['LoadBalancerAttributes']['CrossZoneLoadBalancing'] = @cross_zone_load_balancing
+              @cross_zone_load_balancing = nil
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+module Fog
+  module Parsers
+    module AWS
+      module RDS
+
+        require 'fog/aws/parsers/rds/subnet_group_parser'
+
+        class DeleteDBSubnetGroup < Fog::Parsers::AWS::RDS::SubnetGroupParser
+
+          def reset
+            @response = { 'DeleteDBSubnetGroupResponse' => {}, 'ResponseMetadata' => {} }
+            super
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            else
+              super
+            end
+
+          end
+
+        end
+
+      end
+    end
+  end
+end
+

data/lib/fog/aws/rds.rb

@@ -49,7 +49,8 @@ module Fog
 
       request :create_db_subnet_group
       request :describe_db_subnet_groups
-      # TODO: :delete_db_subnet_group, :modify_db_subnet_group
+      request :delete_db_subnet_group
+      # TODO: :modify_db_subnet_group
 
       request :describe_orderable_db_instance_options
 
@@ -168,7 +169,7 @@ module Fog
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
-          @version    = options[:version] || '2012-09-17' #'2011-04-01'
+          @version    = options[:version] || '2013-05-15'
         end
 
         def owner_id
@@ -215,7 +216,6 @@ module Fog
               :expects    => 200,
               :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
               :idempotent => idempotent,
-              :host       => @host,
               :method     => 'POST',
               :parser     => parser
             })