fog-aws 1.4.1 → 2.0.0

data/lib/fog/aws/requests/kinesis/put_record.rb

@@ -46,8 +46,7 @@ module Fog
           data = options.delete("Data")
           partition_key = options.delete("PartitionKey")
 
-          sample_method = RUBY_VERSION == "1.8.7" ? :choice : :sample
-          shard_id = stream["Shards"].send(sample_method)["ShardId"]
+          shard_id = stream["Shards"].sample["ShardId"]
           shard = stream["Shards"].detect{ |shard| shard["ShardId"] == shard_id }
           # store the records on the shard(s)
           shard["Records"] << {

data/lib/fog/aws/requests/kinesis/put_records.rb

@@ -43,8 +43,7 @@ module Fog
           record_results = records.map { |r|
             sequence_number = next_sequence_number
 
-            sample_method = RUBY_VERSION == "1.8.7" ? :choice : :sample
-            shard_id = stream["Shards"].send(sample_method)["ShardId"]
+            shard_id = stream["Shards"].sample["ShardId"]
             shard = stream["Shards"].detect{ |shard| shard["ShardId"] == shard_id }
             # store the records on the shard(s)
             shard["Records"] << r.merge("SequenceNumber" => sequence_number)

data/lib/fog/aws/requests/lambda/invoke.rb

@@ -18,7 +18,7 @@ module Fog
           headers = {}
           if client_context = params.delete('ClientContext')
             headers['X-Amz-Client-Context'] =
-              Base64::encode64(Fog::Json.encode(client_context))
+              Base64::encode64(Fog::JSON.encode(client_context))
           end
           if client_type = params.delete('InvocationType')
             headers['X-Amz-Client-Type'] = client_type

data/lib/fog/aws/requests/rds/describe_orderable_db_instance_options.rb

@@ -4,8 +4,8 @@ module Fog
       class Real
         require 'fog/aws/parsers/rds/describe_orderable_db_instance_options'
 
-        # Describe all or specified load db instances
-        # http://docs.amazonwebservices.com/AmazonRDS/latest/APIReference/API_DescribeDBInstances.html
+        # Describe all or specified orderable db instances options
+        # https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_DescribeOrderableDBInstanceOptions.html
         # ==== Parameters
         # * Engine <~String> - The name of the engine to retrieve DB Instance options for. Required.
         # * Options <~Hash> - Hash of options. Optional. The following keys are used:
@@ -47,11 +47,17 @@ module Fog
                                    'ReadReplicaCapable' => true,
                                    'EngineVersion' => opts[:engine_version] || '5.6.12',
                                    'AvailabilityZones' => [
-                                      {'Name' => 'us-east-1b', 'ProvisionedIopsCapable' => true},
-                                      {'Name' => 'us-east-1c', 'ProvisionedIopsCapable' => true},
-                                      {'Name' => 'us-east-1d', 'ProvisionedIopsCapable' => false},
-                                      {'Name' => 'us-east-1e', 'ProvisionedIopsCapable' => true}],
+                                      {'Name' => 'us-east-1b'},
+                                      {'Name' => 'us-east-1c'},
+                                      {'Name' => 'us-east-1d'},
+                                      {'Name' => 'us-east-1e'}],
                                    'DBInstanceClass' => size,
+                                   'SupportsStorageEncryption' => true,
+                                   'SupportsPerformanceInsights' => false,
+                                   'StorageType' => 'gp2',
+                                   'SupportsIops' => false,
+                                   'SupportsIAMDatabaseAuthentication' => false,
+                                   'SupportsEnhancedMonitoring' => true,
                                    'Vpc' => opts[:vpc].nil? ? true : opts[:vpc]}
 
             end

data/lib/fog/aws/requests/storage/put_object.rb

@@ -30,7 +30,6 @@ module Fog
         # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPUT.html
 
         def self.conforming_to_us_ascii!(keys, hash)
-          return if RUBY_VERSION =~ /^1\.8\./
           keys.each do |k|
             v = hash[k]
             if !v.encode(::Encoding::US_ASCII, :undef => :replace).eql?(v)

data/lib/fog/aws/service_mapper.rb

@@ -0,0 +1,129 @@
+module Fog
+  module AWS
+    # @api private
+    #
+    # This is a temporary lookup helper for extracting into external module.
+    #
+    # Cleaner provider/service registration will replace this code.
+    #
+    class ServiceMapper
+      def self.class_for(key)
+        case key
+          when :auto_scaling
+            Fog::AWS::AutoScaling
+          when :beanstalk
+            Fog::AWS::ElasticBeanstalk
+          when :cdn
+            Fog::CDN::AWS
+          when :cloud_formation
+            Fog::AWS::CloudFormation
+          when :cloud_watch
+            Fog::AWS::CloudWatch
+          when :compute
+            Fog::Compute::AWS
+          when :data_pipeline
+            Fog::AWS::DataPipeline
+          when :ddb, :dynamodb
+            Fog::AWS::DynamoDB
+          when :dns
+            Fog::DNS::AWS
+          when :elasticache
+            Fog::AWS::Elasticache
+          when :elb
+            Fog::AWS::ELB
+          when :emr
+            Fog::AWS::EMR
+          when :glacier
+            Fog::AWS::Glacier
+          when :iam
+            Fog::AWS::IAM
+          when :redshift
+            Fog::AWS::Redshift
+          when :sdb, :simpledb
+            Fog::AWS::SimpleDB
+          when :ses
+            Fog::AWS::SES
+          when :sqs
+            Fog::AWS::SQS
+          when :eu_storage, :storage
+            Fog::Storage::AWS
+          when :rds
+            Fog::AWS::RDS
+          when :sns
+            Fog::AWS::SNS
+          when :sts
+            Fog::AWS::STS
+          else
+            # @todo Replace most instances of ArgumentError with NotImplementedError
+            # @todo For a list of widely supported Exceptions, see:
+            # => http://www.zenspider.com/Languages/Ruby/QuickRef.html#35
+            raise ArgumentError, "Unsupported #{self} service: #{key}"
+        end
+      end
+
+      def self.[](service)
+        @@connections ||= Hash.new do |hash, key|
+          hash[key] = case key
+                        when :auto_scaling
+                          Fog::AWS::AutoScaling.new
+                        when :beanstalk
+                          Fog::AWS::ElasticBeanstalk.new
+                        when :cdn
+                          Fog::Logger.warning("AWS[:cdn] is not recommended, use CDN[:aws] for portability")
+                          Fog::CDN.new(:provider => 'AWS')
+                        when :cloud_formation
+                          Fog::AWS::CloudFormation.new
+                        when :cloud_watch
+                          Fog::AWS::CloudWatch.new
+                        when :compute
+                          Fog::Logger.warning("AWS[:compute] is not recommended, use Compute[:aws] for portability")
+                          Fog::Compute.new(:provider => 'AWS')
+                        when :data_pipeline
+                          Fog::AWS::DataPipeline.new
+                        when :ddb, :dynamodb
+                          Fog::AWS::DynamoDB.new
+                        when :dns
+                          Fog::Logger.warning("AWS[:dns] is not recommended, use DNS[:aws] for portability")
+                          Fog::DNS.new(:provider => 'AWS')
+                        when :elasticache
+                          Fog::AWS::Elasticache.new
+                        when :elb
+                          Fog::AWS::ELB.new
+                        when :emr
+                          Fog::AWS::EMR.new
+                        when :glacier
+                          Fog::AWS::Glacier.new
+                        when :iam
+                          Fog::AWS::IAM.new
+                        when :redshift
+                          Fog::AWS::Redshift.new
+                        when :rds
+                          Fog::AWS::RDS.new
+                        when :eu_storage
+                          Fog::Storage.new(:provider => 'AWS', :region => 'eu-west-1')
+                        when :sdb, :simpledb
+                          Fog::AWS::SimpleDB.new
+                        when :ses
+                          Fog::AWS::SES.new
+                        when :sqs
+                          Fog::AWS::SQS.new
+                        when :storage
+                          Fog::Logger.warning("AWS[:storage] is not recommended, use Storage[:aws] for portability")
+                          Fog::Storage.new(:provider => 'AWS')
+                        when :sns
+                          Fog::AWS::SNS.new
+                        when :sts
+                          Fog::AWS::STS.new
+                        else
+                          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+                      end
+        end
+        @@connections[service]
+      end
+
+      def self.services
+        Fog::AWS.services
+      end
+    end
+  end
+end

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "1.4.1"
+    VERSION = "2.0.0"
   end
 end

data/tests/helpers/collection_helper.rb

@@ -39,12 +39,6 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
         'none?', 'one?'
       ]
 
-      # JRuby 1.7.5+ issue causes a SystemStackError: stack level too deep
-      # https://github.com/jruby/jruby/issues/1265
-      if RUBY_PLATFORM == "java" and JRUBY_VERSION =~ /1\.7\.[5-8]/
-        methods.delete('all?')
-      end
-
       methods.each do |enum_method|
         if collection.respond_to?(enum_method)
           tests("##{enum_method}").succeeds do

data/tests/models/efs/mount_target_tests.rb

@@ -5,7 +5,9 @@ Shindo.tests("AWS::EFS | mount target", ["aws", "efs"]) do
   if Fog.mocking?
     vpc = Fog::Compute[:aws].vpcs.create(:cidr_block => "10.0.0.0/16")
     subnet = Fog::Compute[:aws].subnets.create(:vpc_id => vpc.id, :cidr_block => "10.0.1.0/24")
-    default_security_group_data = Fog::Compute[:aws].data[:security_groups]['default']
+    default_security_group_data = Fog::Compute[:aws].data[:security_groups].values.find do |sg|
+      sg['groupDescription'] == 'default_elb security group'
+    end
     default_security_group = Fog::Compute[:aws].security_groups.new(default_security_group_data)
   else
     vpc = Fog::Compute[:aws].vpcs.first

data/tests/models/elasticache/subnet_groups_tests.rb

@@ -14,7 +14,6 @@ Shindo.tests('AWS::Elasticache | subnet group', ['aws', 'elasticache']) do
   @subnets = (1..3).map do
     result = Fog::Compute[:aws].create_subnet(@vpc.id, "10.#{vpc_range}.#{subnet_range}.0/24",
                                               'AvailabilityZone' => subnet_az)
-    puts result
     subnet = result.body['subnet']
     subnet_az = subnet_az.succ
     subnet_range *= 2

data/tests/models/storage/file_tests.rb

@@ -43,10 +43,6 @@ Shindo.tests("Storage[:aws] | file", ["aws"]) do
       end
 
       tests('#versions are all for the correct key').returns(true) do
-        # JRuby 1.7.5+ issue causes a SystemStackError: stack level too deep
-        # https://github.com/jruby/jruby/issues/1265
-        pending if RUBY_PLATFORM == "java" and JRUBY_VERSION =~ /1\.7\.[5-8]/
-
         @instance.versions.all? { |v| v.key == @instance.key }
       end
     end

data/tests/models/storage/url_tests.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 Shindo.tests('AWS | url', ["aws"]) do
 
-
   @storage = Fog::Storage.new(
     :provider => 'AWS',
     :aws_access_key_id => '123',
@@ -12,15 +11,7 @@ Shindo.tests('AWS | url', ["aws"]) do
   @file = @storage.directories.new(:key => 'fognonbucket').files.new(:key => 'test.txt')
 
   now = Fog::Time.now
-  if RUBY_VERSION > '1.8.7' # ruby 1.8.x doesn't provide hash ordering
-    tests('#v4 url w/ response-cache-control').returns(
-      "https://fognonbucket.s3.amazonaws.com/test.txt?response-cache-control=No-cache&X-Amz-Expires=500&X-Amz-Date=#{now.to_iso8601_basic}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=123/#{now.utc.strftime('%Y%m%d')}/us-east-1/s3/aws4_request&X-Amz-SignedHeaders=host&X-Amz-Signature="
-    ) do
-
-      @file.url(now + 500, :query => { 'response-cache-control' => 'No-cache' }).gsub(/(X-Amz-Signature=)[0-9a-f]+\z/,'\\1')
-    end
-  end
-
+  
   @storage = Fog::Storage.new(
     :provider => 'AWS',
     :aws_access_key_id => '123',
@@ -31,14 +22,4 @@ Shindo.tests('AWS | url', ["aws"]) do
 
   @file = @storage.directories.new(:key => 'fognonbucket').files.new(:key => 'test.txt')
 
-  if RUBY_VERSION > '1.8.7' # ruby 1.8.x doesn't provide hash ordering
-    tests('#v2 url w/ response-cache-control').returns(
-      "https://fognonbucket.s3.amazonaws.com/test.txt?response-cache-control=No-cache&AWSAccessKeyId=123&Signature=foo&Expires=#{now.to_i + 500}"
-    ) do
-
-      @file.url(now + 500, :query => { 'response-cache-control' => 'No-cache' })
-    end
-  end
-
-
 end

data/tests/models/storage/versions_tests.rb

@@ -15,15 +15,10 @@ Shindo.tests("Storage[:aws] | versions", ["aws"]) do
 
     versions = []
     versions << @instance.service.put_object(@instance.key, 'one', 'abcde').headers['x-amz-version-id']
-
-    puts versions.first
-
     versions << @instance.service.put_object(@instance.key, 'one', '32423').headers['x-amz-version-id']
     versions << @instance.service.delete_object(@instance.key, 'one').headers['x-amz-version-id']
     versions.reverse!
 
-    puts versions.first
-
     versions << @instance.service.put_object(@instance.key, 'two', 'aoeu').headers['x-amz-version-id']
 
     tests('#versions') do

data/tests/requests/compute/network_interface_tests.rb

@@ -47,18 +47,6 @@ Shindo.tests('Fog::Compute[:aws] | network interface requests', ['aws']) do
     @subnet_id         = @subnet.subnet_id
     @security_group_id = @security_group.group_id
 
-    @security_groups = [
-      @security_group.name, {
-        'groupDescription'  => @security_group.description,
-        'groupName'         => @security_group.name,
-        'groupId'           => @security_group_id,
-        'ipPermissionsEgress' => [],
-        'ipPermissions'     => [],
-        'ownerId'           => @owner_id,
-        'vpcId'             => @vpc.id
-      }
-    ]
-
     DESCRIPTION = "Small and green"
     tests("#create_network_interface(#{@subnet_id})").formats(@network_interface_create_format) do
       data = Fog::Compute[:aws].create_network_interface(@subnet_id, {"PrivateIpAddress" => "10.0.10.23"}).body
@@ -164,7 +152,8 @@ Shindo.tests('Fog::Compute[:aws] | network interface requests', ['aws']) do
     tests("#describe_network_interface_attribute(#{@nic2_id}, 'description')").returns(DESCRIPTION) do
       Fog::Compute[:aws].describe_network_interface_attribute(@nic2_id, 'description').body["description"]
     end
-    tests("#describe_network_interface_attribute(#{@nic2_id}, 'groupSet')").returns({ @security_group_id => @security_groups }) do
+
+    tests("#describe_network_interface_attribute(#{@nic2_id}, 'groupSet')").returns({ @security_group_id => @security_group.name }) do
       Fog::Compute[:aws].describe_network_interface_attribute(@nic2_id, 'groupSet').body["groupSet"]
     end
 

data/tests/requests/compute/subnet_tests.rb

@@ -8,6 +8,8 @@ Shindo.tests('Fog::Compute[:aws] | subnet requests', ['aws']) do
     'availableIpAddressCount'  => String,
     'availabilityZone'         => String,
     'tagSet'                   => Hash,
+    'mapPublicIpOnLaunch'      => Fog::Boolean,
+    'defaultForAz'             => Fog::Boolean,
   }
 
   @single_subnet_format = {
@@ -24,7 +26,7 @@ Shindo.tests('Fog::Compute[:aws] | subnet requests', ['aws']) do
     'requestId' => String,
     'return' => Fog::Boolean
   }
-  
+
   @vpc_network = '10.0.10.0/24'
   @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => @vpc_network)
   @vpc_id = @vpc.id

data/tests/requests/compute/vpc_tests.rb

@@ -32,12 +32,14 @@ Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do
 
   @describe_vpcs_format = {
     'vpcSet' => [{
-      'vpcId'           => String,
-      'state'           => String,
-      'cidrBlock'       => String,
-      'dhcpOptionsId'   => String,
-      'tagSet'          => Hash,
-      'instanceTenancy' => Fog::Nullable::String,
+      'vpcId'                       => String,
+      'state'                       => String,
+      'cidrBlock'                   => String,
+      'dhcpOptionsId'               => String,
+      'tagSet'                      => Hash,
+      'instanceTenancy'             => Fog::Nullable::String,
+      'cidrBlockAssociationSet'     => [{'cidrBlock'     => String, 'associationId' => String, 'state' => String}],
+      'ipv6CidrBlockAssociationSet' => [{'ipv6CidrBlock' => String, 'associationId' => String, 'state' => String}]
     }],
     'requestId' => String
   }

data/tests/requests/dns/dns_tests.rb

@@ -188,10 +188,6 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
       change_batch << resource_record_set
       options = { :comment => 'add ALIAS record to domain'}
 
-      puts "Hosted Zone ID (ELB): #{hosted_zone_id}"
-      puts "DNS Name (ELB): #{dns_name}"
-      puts "Zone ID for Route 53: #{@zone_id}"
-
       response = @r53_connection.change_resource_record_sets(@zone_id, change_batch, options)
 
       Fog.wait_for { @r53_connection.get_change(response.body["Id"]).body["Status"] != "PENDING" }

data/tests/requests/efs/file_system_tests.rb

@@ -33,7 +33,7 @@ Shindo.tests('AWS::EFS | file systems', ['aws', 'efs']) do
         :vpc_id     => vpc.id,
         :cidr_block => "10.0.1.0/24"
       )
-      default_security_group = Fog::Compute[:aws].security_groups.detect { |sg| sg.description == 'default group' }
+      default_security_group = Fog::Compute[:aws].security_groups.detect { |sg| sg.description == 'default_elb security group' }
     else
       vpc = Fog::Compute[:aws].vpcs.first
       subnet = vpc.subnets.first

data/tests/requests/iam/managed_policy_tests.rb

@@ -43,7 +43,6 @@ Shindo.tests('AWS::IAM | managed policy requests', ['aws']) do
 
     tests("#create_policy('fog_policy')").formats(create_policy_format) do
       body = Fog::AWS[:iam].create_policy('fog_policy', @policy, '/fog/').body
-      puts body.inspect
       @policy_arn = body['Policy']['Arn']
       body
     end

data/tests/requests/iam/versioned_managed_policy_tests.rb

@@ -57,10 +57,7 @@ Shindo.tests('AWS::IAM | versioned managed policy requests', ['aws']) do
     }
 
     tests("#create_policy('fog_policy')").formats(create_policy_format) do
-      body = Fog::AWS[:iam].create_policy('fog_policy', @policy, '/fog/').body
-      puts body.inspect
-      @policy_arn = body['Policy']['Arn']
-      body
+      Fog::AWS[:iam].create_policy('fog_policy', @policy, '/fog/').body['Policy']['Arn']
     end
 
     tests("#list_policies('fog_policy')").formats(list_policies_format) do
@@ -72,10 +69,7 @@ Shindo.tests('AWS::IAM | versioned managed policy requests', ['aws']) do
     end
 
     tests("#create_versioned_policy('fog_policy')").formats(create_versioned_policy_format) do
-      body = Fog::AWS[:iam].create_versioned_policy(@policy_arn, @policy_v2, true).body
-      puts body.inspect
-      @policy_version_document = body['PolicyVersion']['Document']
-      body
+      Fog::AWS[:iam].create_versioned_policy(@policy_arn, @policy_v2, true).body['PolicyVersion']['Document']
     end
 
     tests("#list_policy_versions('fog_policy')").formats(list_policy_versions_format) do
@@ -95,10 +89,7 @@ Shindo.tests('AWS::IAM | versioned managed policy requests', ['aws']) do
     end
 
     tests("#delete_versioned_policy('fog_policy')").formats(AWS::IAM::Formats::BASIC) do
-      body = Fog::AWS[:iam].delete_policy(@policy_arn, 'v2').body
-      puts body.inspect
-      @policy_version_document = body['PolicyVersion']['Document']
-      body
+      Fog::AWS[:iam].delete_policy(@policy_arn, 'v2').body['PolicyVersion']['Document']
     end
 
     tests("#delete_policy('fog_policy')").formats(AWS::IAM::Formats::BASIC) do