fog-aws 0.7.6 → 0.8.0

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

@@ -48,15 +48,17 @@ module Fog
             params[:headers]['If-Unmodified-Since'] = Fog::Time.at(options['If-Unmodified-Since'].to_i).to_date_header
           end
 
+          idempotent = true
           if block_given?
             params[:response_block] = Proc.new
+            idempotent = false
           end
 
           request(params.merge!({
             :expects  => [ 200, 206 ],
             :bucket_name => bucket_name,
             :object_name => object_name,
-            :idempotent => true,
+            :idempotent => idempotent,
             :method   => 'GET',
           }))
         end
@@ -115,10 +117,10 @@ module Fog
                   response.body = body
                 else
                   data = StringIO.new(body)
-                  remaining = data.length
+                  remaining = total_bytes = data.length
                   while remaining > 0
                     chunk = data.read([remaining, Excon::CHUNK_SIZE].min)
-                    block.call(chunk)
+                    block.call(chunk, remaining, total_bytes)
                     remaining -= Excon::CHUNK_SIZE
                   end
                 end

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

@@ -10,13 +10,13 @@ module Fog
         #     * ID [String] Unique identifier for the rule
         #     * Prefix [String] Prefix identifying one or more objects to which the rule applies
         #     * Enabled [Boolean] if rule is currently being applied
-        #     * Expiration [Hash] Container for the object expiration rule.
-        #       * Days [Integer] lifetime, in days, of the objects that are subject to the rule
+        #     * [NoncurrentVersion]Expiration [Hash] Container for the object expiration rule.
+        #       * [Noncurrent]Days [Integer] lifetime, in days, of the objects that are subject to the rule
         #       * Date [Date] Indicates when the specific rule take effect.
         #         The date value must conform to the ISO 8601 format. The time is always midnight UTC.
-        #     * Transition [Hash] Container for the transition rule that describes when objects transition
+        #     * [NoncurrentVersion]Transition [Hash] Container for the transition rule that describes when objects transition
         #       to the Glacier storage class
-        #       * Days [Integer] lifetime, in days, of the objects that are subject to the rule
+        #       * [Noncurrent]Days [Integer] lifetime, in days, of the objects that are subject to the rule
         #       * Date [Date] Indicates when the specific rule take effect.
         #         The date value must conform to the ISO 8601 format. The time is always midnight UTC.
         #       * StorageClass [String] Indicates the Amazon S3 storage class to which you want the object
@@ -33,7 +33,7 @@ module Fog
                   ID rule['ID']
                   Prefix rule['Prefix']
                   Status rule['Enabled'] ? 'Enabled' : 'Disabled'
-                  unless (rule['Expiration'] or rule['Transition'])
+                  unless (rule['Expiration'] or rule['Transition'] or rule['NoncurrentVersionExpiration'] or rule['NoncurrentVersionTransition'])
                     Expiration { Days rule['Days'] }
                   else
                     if rule['Expiration']
@@ -43,6 +43,19 @@ module Fog
                         Expiration { Date rule['Expiration']['Date'].is_a?(Time) ? rule['Expiration']['Date'].utc.iso8601 : Time.parse(rule['Expiration']['Date']).utc.iso8601 }
                       end
                     end
+                    if rule['NoncurrentVersionExpiration']
+                      if rule['NoncurrentVersionExpiration']['NoncurrentDays']
+                        NoncurrentVersionExpiration { NoncurrentDays rule['NoncurrentVersionExpiration']['NoncurrentDays'] }
+                      elsif rule['NoncurrentVersionExpiration']['Date']
+                        NoncurrentVersoinExpiration {
+                          if Date rule['NoncurrentVersionExpiration']['Date'].is_a?(Time)
+                            rule['NoncurrentVersionExpiration']['Date'].utc.iso8601
+                          else
+                            Time.parse(rule['NoncurrentVersionExpiration']['Date']).utc.iso8601
+                          end
+                        }
+                      end
+                    end
                     if rule['Transition']
                       Transition {
                         if rule['Transition']['Days']
@@ -53,6 +66,16 @@ module Fog
                         StorageClass rule['Transition']['StorageClass'].nil? ? 'GLACIER' : rule['Transition']['StorageClass']
                       }
                     end
+                    if rule['NoncurrentVersionTransition']
+                      NoncurrentVersionTransition {
+                        if rule['NoncurrentVersionTransition']['NoncurrentDays']
+                          NoncurrentDays rule['NoncurrentVersionTransition']['NoncurrentDays']
+                        elsif rule['NoncurrentVersionTransition']['Date']
+                          Date rule['NoncurrentVersionTransition']['Date'].is_a?(Time) ? time.utc.iso8601 : Time.parse(time).utc.iso8601
+                        end
+                        StorageClass rule['NoncurrentVersionTransition']['StorageClass'].nil? ? 'GLACIER' : rule['NoncurrentVersionTransition']['StorageClass']
+                      }
+                    end
                   end
                 }
               end

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

@@ -18,6 +18,10 @@ module Fog
         # @option options x-amz-acl [String] Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
         # @option options x-amz-storage-class [String] Default is 'STANDARD', set to 'REDUCED_REDUNDANCY' for non-critical, reproducable data
         # @option options x-amz-meta-#{name} Headers to be returned with object, note total size of request without body must be less than 8 KB. Each name, value pair must conform to US-ASCII.
+        # @option options encryption [String] Sets HTTP header for server-side encryption. Set to 'AES256' for SSE-S3 and SSE-C. Set to 'aws:kms' for SSE-KMS
+        # @option options encryption_key [String] Encryption customer key for SSE-C
+        # @option options x-amz-server-side-encryption-aws-kms-key-id [String] KMS key ID of the encryption key for SSE-KMS
+        # @option options x-amz-server-side-encryption-context [String] Encryption context for SSE-KMS
         #
         # @return [Excon::Response] response:
         #   * headers [Hash]:

data/lib/fog/aws/storage.rb

@@ -205,6 +205,8 @@ module Fog
           case region.to_s
           when DEFAULT_REGION, ''
             's3.amazonaws.com'
+          when 'cn-north-1'
+            's3.cn-north-1.amazonaws.com.cn'
           else
             "s3-#{region}.amazonaws.com"
           end
@@ -644,6 +646,7 @@ module Fog
           #we must also reset the signature
           def rewind
             self.signature = initial_signature
+            self.finished = false
             body.rewind
           end
 

data/lib/fog/aws/sts.rb

@@ -7,7 +7,7 @@ module Fog
       class ValidationError < Fog::AWS::STS::Error; end
       class AwsAccessKeysMissing < Fog::AWS::STS::Error; end
 
-      recognizes :aws_access_key_id, :aws_secret_access_key, :host, :path, :port, :scheme, :persistent, :aws_session_token, :use_iam_profile, :aws_credentials_expire_at, :instrumentor, :instrumentor_name
+      recognizes :region, :aws_access_key_id, :aws_secret_access_key, :host, :path, :port, :scheme, :persistent, :aws_session_token, :use_iam_profile, :aws_credentials_expire_at, :instrumentor, :instrumentor_name
 
       request_path 'fog/aws/requests/sts'
       request :get_federation_token
@@ -74,12 +74,13 @@ module Fog
         def initialize(options={})
 
           @use_iam_profile = options[:use_iam_profile]
+          @region     = options[:region]      || 'us-east-1'
           setup_credentials(options)
           @instrumentor       = options[:instrumentor]
           @instrumentor_name  = options[:instrumentor_name] || 'fog.aws.sts'
           @connection_options     = options[:connection_options] || {}
 
-          @host       = options[:host]        || 'sts.amazonaws.com'
+          @host       = options[:host]        || "sts.#{@region}.amazonaws.com"
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
@@ -100,7 +101,7 @@ module Fog
           @aws_credentials_expire_at = options[:aws_credentials_expire_at]
 
           if (@aws_access_key_id && @aws_secret_access_key)
-            @signer = Fog::AWS::SignatureV4.new(@aws_access_key_id, @aws_secret_access_key, 'us-east-1', 'sts')
+            @signer = Fog::AWS::SignatureV4.new(@aws_access_key_id, @aws_secret_access_key, @region, 'sts')
           end
         end
 

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "0.7.6"
+    VERSION = "0.8.0"
   end
 end

data/tests/models/compute/server_tests.rb

@@ -60,6 +60,17 @@ Shindo.tests("Fog::Compute[:aws] | monitor", ['aws']) do
       @instance.associate_public_ip == false
     end
 
+    test('#stop') do
+      @instance.stop
+      @instance.wait_for { state == "stopped" }
+      @instance.state == "stopped"
+    end
+
+    test("#start") do
+      @instance.start
+      @instance.wait_for { ready? }
+      @instance.state == "running"
+    end
   end
 
   @instance.destroy

data/tests/models/iam/roles_tests.rb

@@ -1,14 +1,12 @@
 Shindo.tests("Fog::Compute[:iam] | roles", ['aws','iam']) do
 
-  pending if Fog.mocking?
-
   @iam = Fog::AWS[:iam]
   @role_one_name = 'fake_role_one'
   @role_two_name = 'fake_role_two'
 
   @role_three_name = 'fake_role_three'
   @role_three_path = '/path/to/fake_role_three/'
-  @role_four_name = 'fake_role_four'
+  @role_four_name  = 'fake_role_four'
 
   tests('#create').succeeds do
     @role_one = @iam.roles.create(:rolename => @role_one_name)
@@ -37,7 +35,7 @@ Shindo.tests("Fog::Compute[:iam] | roles", ['aws','iam']) do
   end
 
   tests('#get',"returns nil if the role doesn't exists").succeeds do
-    @iam.roles.get('non-exists') == nil
+    @iam.roles.get('blah').nil?
   end
 
   tests('#create', 'assigns path').succeeds do
@@ -54,6 +52,16 @@ Shindo.tests("Fog::Compute[:iam] | roles", ['aws','iam']) do
     @iam.roles.get(@role_one_name).destroy
   end
 
+  tests('#all', 'limit 1').succeeds do
+    1 == @iam.roles.all(:limit => 1).size
+  end
+
+  tests('#all', 'each_entry').succeeds do
+    roles = []; @iam.roles.each(:limit => 1) { |r| roles << r }
+
+    3 == roles.size
+  end
+
   tests('#destroy','clean up remaining roles').succeeds do
     @iam.roles.get(@role_two_name).destroy
     @iam.roles.get(@role_three_name).destroy

data/tests/models/storage/directory_tests.rb

@@ -9,6 +9,10 @@ Shindo.tests("Storage[:aws] | directory", ["aws"]) do
       @instance.public_url
     end
 
+    tests('#location').returns('us-east-1') do # == Fog::AWS::Storage::DEFAULT_REGION
+      @instance.location
+    end
+
     @instance.acl = 'public-read'
     @instance.save
 

data/tests/requests/compute/instance_tests.rb

@@ -81,7 +81,7 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
     'timestamp'    => Time
   }
 
-  @terminate_instances_format = {
+  @instance_state_change_format = {
     'instancesSet'  => [{
       'currentState' => {'code' => Integer, 'name' => String},
       'instanceId'    => String,
@@ -161,6 +161,7 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
       'eventsSet'        => [Fog::Nullable::Hash],
     }]
   }
+
   tests('success') do
 
     @instance_id = nil
@@ -217,6 +218,39 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
 
     another_server.destroy
 
+    tests("#run_instances_with_tags").formats(@describe_instances_format) do
+
+      svr1 = Fog::Compute[:aws].servers.create(
+          :availability_zone => 'eu-west-1a',
+          :tags => {
+              "Name"  => "test::test::test",
+              "Stack" => "test",
+              "Stage" => "test",
+              "App"   => "test1",
+          },
+          :image_id => 'ami-3d7e2e54',
+          :flavor_id =>  't1.micro',
+      )
+      svr2 = Fog::Compute[:aws].servers.create(
+          :availability_zone => 'eu-west-1b',
+          :tags => {
+              "Name"  => "test::test::dev",
+              "Stack" => "test",
+              "Stage" => "test",
+              "App"   => "test2",
+          },
+          :image_id => 'ami-3d7e2e54',
+          :flavor_id =>  't1.micro',
+      )
+
+      filters = {'tag:App' => ['test1', 'test2']}
+      body = Fog::Compute[:aws].describe_instances('tag:App' => ['test1', 'test2']).body
+      tests("returns 2 hosts").returns(2) { body['reservationSet'].size }
+      svr1.destroy
+      svr2.destroy
+      body
+    end
+
     tests("#get_console_output('#{@instance_id}')").formats(@get_console_output_format) do
       Fog::Compute[:aws].get_console_output(@instance_id).body
     end
@@ -246,7 +280,15 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
       Fog::Compute[:aws].reboot_instances(@instance_id).body
     end
 
-    tests("#terminate_instances('#{@instance_id}')").formats(@terminate_instances_format) do
+    tests("#stop_instances('#{@instance_id}')").formats(@instance_state_change_format) do
+      Fog::Compute[:aws].stop_instances(@instance_id).body
+    end
+
+    tests("#start_instances('#{@instance_id}')").formats(@instance_state_change_format) do
+      Fog::Compute[:aws].start_instances(@instance_id).body
+    end
+
+    tests("#terminate_instances('#{@instance_id}')").formats(@instance_state_change_format) do
       Fog::Compute[:aws].terminate_instances(@instance_id).body
     end
 

data/tests/requests/dynamodb/item_tests.rb

@@ -91,10 +91,10 @@ Shindo.tests('Fog::AWS[:dynamodb] | item requests', ['aws']) do
       'LastEvaluatedKey'      => NilClass
     }
 
-    tests("#query('#{@table_name}', {'S' => 'key'}").formats(@query_format) do
+    tests("#query('#{@table_name}')").formats(@query_format) do
       pending if Fog.mocking?
       pending # requires a table with range key
-      Fog::AWS[:dynamodb].query(@table_name, {'S' => 'key'}).body
+      Fog::AWS[:dynamodb].query(@table_name).body
     end
 
     @scan_format = @query_format.merge('ScannedCount' => Integer)

data/tests/requests/storage/bucket_tests.rb

@@ -277,6 +277,11 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', ["aws"]) do
         Fog::Storage[:aws].put_bucket_lifecycle(@aws_bucket_name, lifecycle)
         Fog::Storage[:aws].get_bucket_lifecycle(@aws_bucket_name).body
       end
+      lifecycle = {'Rules' => [{'ID' => 'test rule', 'Prefix' => '/prefix', 'Enabled' => true, 'NoncurrentVersionExpiration' => {'NoncurrentDays' => 42}, 'NoncurrentVersionTransition' => {'NoncurrentDays' => 6, 'StorageClass'=>'GLACIER'}}]}
+      tests('versioned transition').returns(lifecycle) do
+        Fog::Storage[:aws].put_bucket_lifecycle(@aws_bucket_name, lifecycle)
+        Fog::Storage[:aws].get_bucket_lifecycle(@aws_bucket_name).body
+      end
       lifecycle = {'Rules' => [{'ID' => 'test rule', 'Prefix' => '/prefix', 'Enabled' => true, 'Expiration' => {'Date' => '2012-12-31T00:00:00.000Z'}}]}
       tests('date').returns(lifecycle) do
         Fog::Storage[:aws].put_bucket_lifecycle(@aws_bucket_name, lifecycle)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.8.0
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1584,8 +1584,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Amazon Web Services.
 test_files: []
+has_rdoc: