fog-aws 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17dd3fd68228d3795c582e27cd773d680077cdac
-  data.tar.gz: dc58a9189e5914e48398e907b381fb71775b78d5
+  metadata.gz: b96d5e8e4defc964f4f383e3db8e5e933101ea78
+  data.tar.gz: ee9929b2c953ecd1962311725a3ae17ed4396a0c
 SHA512:
-  metadata.gz: 8a7ebbf3ff34dc65a749d701657278a0f488a27da0049e3afb37e3c6f2dbec5e00cddad2ea7fa8289889db91a9be5fc0b8a3d7d1f0c609d5137d0bb2b6c997f7
-  data.tar.gz: ee0ae5c80c7c3ae9910d2065cf533b918131594b7b429f9f42eb003662afb9800d4418ca9b2be42cf71446e2d7faf7345e2e2964135a681337639f17a40f4369
+  metadata.gz: bc2f7b1df08b2a0bf9fbd54a87db7d7b18c7d5360e7661f060a906e51685564d68f809521db01dfa40711389859fc2d69a6207d5d21024b5e9c0fdcb1ad91ea0
+  data.tar.gz: 391f26896bb27d3fc601329a11d68aac5d865a3bd1c9fff1319f02cd789d8bad7ce91d1ad152e7607175ab80ff43baa196d153d35e2ec06d9f86c5aea73e6cfc

data/.travis.yml

@@ -10,7 +10,7 @@ matrix:
   - rvm: 1.8.7
     gemfile: gemfiles/Gemfile-ruby-1.8.7
   - rvm: 1.9.3
-    gemfile: Gemfile
+    gemfile: gemfiles/Gemfile-ruby-1.9
   - rvm: 2.0.0
     gemfile: Gemfile
   - rvm: 2.1.0
@@ -30,7 +30,7 @@ matrix:
   - rvm: jruby-18mode
     gemfile: gemfiles/Gemfile-ruby-1.8.7
   - rvm: jruby-19mode
-    gemfile: Gemfile
+    gemfile: gemfiles/Gemfile-ruby-1.9
   - rvm: jruby-head
     gemfile: Gemfile
   allow_failures:

data/CHANGELOG.md

@@ -2,7 +2,18 @@
 
 ## [Unreleased](https://github.com/fog/fog-aws/tree/HEAD)
 
-[Full Changelog](https://github.com/fog/fog-aws/compare/v0.9.4...HEAD)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v0.10.0...HEAD)
+
+**Merged pull requests:**
+
+- GitHub does no longer provide http:// pages [\#284](https://github.com/fog/fog-aws/pull/284) ([amatsuda](https://github.com/amatsuda))
+- Skip multipart if body size is less than chunk.  [\#283](https://github.com/fog/fog-aws/pull/283) ([brettcave](https://github.com/brettcave))
+- ECS container credentials [\#281](https://github.com/fog/fog-aws/pull/281) ([ryansch](https://github.com/ryansch))
+- test\(ci\): fix 1.9 builds with json \>= 2.0 [\#280](https://github.com/fog/fog-aws/pull/280) ([lanej](https://github.com/lanej))
+- Change DBSubnetGroup to DBSubnetGroupName model cluster while creation [\#279](https://github.com/fog/fog-aws/pull/279) ([chanakyacool](https://github.com/chanakyacool))
+
+## [v0.10.0](https://github.com/fog/fog-aws/tree/v0.10.0) (2016-07-15)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v0.9.4...v0.10.0)
 
 **Closed issues:**
 

data/fog-aws.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Module for the 'fog' gem to support Amazon Web Services.}
   spec.description   = %q{This library can be used as a module for `fog` or as standalone provider
                         to use the Amazon Web Services in applications..}
-  spec.homepage      = "http://github.com/fog/fog-aws"
+  spec.homepage      = "https://github.com/fog/fog-aws"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/gemfiles/Gemfile-ruby-1.9

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem 'json', '~> 1.8'
+gem 'mime-types', '~> 2.6', '>= 2.6.2'
+
+gemspec :path => "../"

data/lib/fog/aws/credential_fetcher.rb

@@ -6,6 +6,8 @@ module Fog
       INSTANCE_METADATA_PATH = "/latest/meta-data/iam/security-credentials/"
       INSTANCE_METADATA_AZ = "/latest/meta-data/placement/availability-zone/"
 
+      CONTAINER_CREDENTIALS_HOST = "http://169.254.170.2"
+
       module ServiceMethods
         def fetch_credentials(options)
           if options[:use_iam_profile] && Fog.mocking?
@@ -13,10 +15,23 @@ module Fog
           end
           if options[:use_iam_profile]
             begin
-              connection = options[:connection] || Excon.new(INSTANCE_METADATA_HOST)
-              role_name = connection.get(:path => INSTANCE_METADATA_PATH, :expects => 200).body
-              role_data = connection.get(:path => INSTANCE_METADATA_PATH+role_name, :expects => 200).body
-              az_data = connection.get(:path => INSTANCE_METADATA_AZ, :expects => 200).body
+              role_data = nil
+              az_data = nil
+
+              if ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"]
+                connection = options[:connection] || Excon.new(CONTAINER_CREDENTIALS_HOST)
+                credential_path = options[:credential_path] || ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"]
+                role_data = connection.get(:path => credential_path, :expects => 200).body
+
+                connection = options[:metadata_connection] || Excon.new(INSTANCE_METADATA_HOST)
+                az_data = connection.get(:path => INSTANCE_METADATA_AZ, :expects => 200).body
+              else
+                connection = options[:connection] || Excon.new(INSTANCE_METADATA_HOST)
+                role_name = connection.get(:path => INSTANCE_METADATA_PATH, :expects => 200).body
+                role_data = connection.get(:path => INSTANCE_METADATA_PATH+role_name, :expects => 200).body
+                az_data = connection.get(:path => INSTANCE_METADATA_AZ, :expects => 200).body
+              end
+
               region = az_data[0..-2] # get region from az
 
               session = Fog::JSON.decode(role_data)

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

@@ -8,7 +8,7 @@ module Fog
         attribute :backup_retention_period,      :aliases => 'BackupRetentionPeriod',     :type => :integer
         attribute :db_cluster_members,           :aliases => 'DBClusterMembers',          :type => :array
         attribute :db_cluster_parameter_group,   :aliases => 'DBClusterParameterGroup'
-        attribute :db_subnet_group,              :aliases => 'DBSubnetGroup'
+        attribute :db_subnet_group,              :aliases => 'DBSubnetGroupName'
         attribute :endpoint,                     :aliases => 'Endpoint'
         attribute :engine,                       :aliases => 'Engine'
         attribute :engine_version,               :aliases => 'EngineVersion'
@@ -72,7 +72,7 @@ module Fog
             'BackupRetentionPeriod'      => backup_retention_period,
             'DBClusterIdentifier'        => identity,
             'DBClusterParameterGroup'    => db_cluster_parameter_group,
-            'DBSubnetGroup'              => db_subnet_group,
+            'DBSubnetGroupName'          => db_subnet_group,
             'Endpoint'                   => endpoint,
             'Engine'                     => engine,
             'EngineVersion'              => engine_version,

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

@@ -27,7 +27,11 @@ module Fog
 
         # @note Chunk size to use for multipart uploads.
         #     Use small chunk sizes to minimize memory. E.g. 5242880 = 5mb
-        attr_accessor :multipart_chunk_size
+        attr_reader :multipart_chunk_size
+        def multipart_chunk_size=(mp_chunk_size)
+          raise ArgumentError.new("minimum multipart_chunk_size is 5242880") if mp_chunk_size < 5242880
+          @multipart_chunk_size = mp_chunk_size
+        end
 
         def acl
           requires :directory, :key
@@ -205,7 +209,10 @@ module Fog
           options['x-amz-storage-class'] = storage_class if storage_class
           options.merge!(encryption_headers)
 
-          if multipart_chunk_size && body.respond_to?(:read)
+          # With a single PUT operation you can upload objects up to 5 GB in size. Automatically set MP for larger objects.
+          multipart_chunk_size=5242880 if !multipart_chunk_size && Fog::Storage.get_body_size(body) > 5368709120
+
+          if multipart_chunk_size && Fog::Storage.get_body_size(body) >= multipart_chunk_size && body.respond_to?(:read)
             data = multipart_save(options)
             merge_attributes(data.body)
           else

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "0.10.0"
+    VERSION = "0.11.0"
   end
 end

data/tests/credentials_tests.rb

@@ -28,6 +28,19 @@ Shindo.tests('AWS | credentials', ['aws']) do
                 :aws_credentials_expire_at => expires_at}) { Fog::Compute::AWS.fetch_credentials(:use_iam_profile => true) }
     end
 
+    ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"] = '/v1/credentials?id=task_id'
+    Excon.stub({:method => :get, :path => '/v1/credentials?id=task_id'}, {:status => 200, :body => Fog::JSON.encode(credentials)})
+
+    tests("#fetch_credentials") do
+      returns({:aws_access_key_id => 'dummykey',
+                :aws_secret_access_key => 'dummysecret',
+                :aws_session_token => 'dummytoken',
+                :region => "us-west-1",
+                :aws_credentials_expire_at => expires_at}) { Fog::Compute::AWS.fetch_credentials(:use_iam_profile => true) }
+    end
+
+    ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"] = nil
+
     compute = Fog::Compute::AWS.new(:use_iam_profile => true)
 
     tests("#refresh_credentials_if_expired") do
@@ -54,6 +67,7 @@ Shindo.tests('AWS | credentials', ['aws']) do
     end
 
   ensure
+    ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"] = nil
     Excon.stubs.clear
     Excon.defaults[:mock] = old_mock_value
     Fog.unmock! if !fog_was_mocked

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,6 +145,7 @@ files:
 - fog-aws.gemspec
 - gemfiles/Gemfile-edge
 - gemfiles/Gemfile-ruby-1.8.7
+- gemfiles/Gemfile-ruby-1.9
 - lib/fog/aws.rb
 - lib/fog/aws/auto_scaling.rb
 - lib/fog/aws/beanstalk.rb
@@ -1603,7 +1604,7 @@ files:
 - tests/signaturev4_tests.rb
 - tests/signed_params_tests.rb
 - tests/storage_tests.rb
-homepage: http://github.com/fog/fog-aws
+homepage: https://github.com/fog/fog-aws
 licenses:
 - MIT
 metadata: {}