fog-aws 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30d84e3705aeee14d91a9c82f15fb312a5f4c639
-  data.tar.gz: c0ad1b0157cdf4f1d5afc87e0db4abc1e1f33e64
+  metadata.gz: 63e0bc6ed8840b40f95208a3254e449f22cf295e
+  data.tar.gz: 566b518ff636d7b6f2e2572da30a1959155c0da7
 SHA512:
-  metadata.gz: 43f3f056697c6d3407f6c4f0f7f6bc1ab0b7b50f01118a16fb7e095965da5d04edf044a01b8931c4b3c60c8cb8f00744b53160330ccaa3e190a20a5228e4a4e4
-  data.tar.gz: c5305530afe5c59a43f8cc93cfe9e0ab4cdbd6bdc6037a5b2790deff609ebdeb6a220a7aa1f48eb6c1b7f020e163098bc6ba586160dcb06cb52de2bb353f8dd6
+  metadata.gz: e9445b6c2d33ad2d37476237fe18c4637a59d4b7179e60ab90403a172b4a36945dc394ea6dce655261cbc07c9db7d3412bd7a078a4b9d8377804b8c4914f00bf
+  data.tar.gz: 036d202d04d82ac75435c2b3267d7d6909646ebccdc7058839a096fab118d8b5fd2303cee2b4811d6c2eb80e85983a7edf12dc8187c8c99de9467d7f0560bbeb

data/Gemfile

@@ -2,6 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in fog-aws.gemspec
 gemspec
-
 gem 'pry-nav', group: :test
 gem "codeclimate-test-reporter", group: :test, require: nil

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

@@ -10,8 +10,8 @@ module Fog
 
         # Creates a new scaling policy.
         def initialize(attributes={})
-          self.filters = attributes
-          super(attributes)
+          self.filters ||= {}
+          super
         end
 
         def all(filters_arg = filters)

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

@@ -22,7 +22,8 @@ module Fog
         attribute :user_data,             :aliases => 'UserData'
         attribute :spot_price,            :aliases => 'SpotPrice'
         attribute :placement_tenancy,     :aliases => 'PlacementTenancy'
-
+        attribute :classic_link_vpc_id,   :aliases => 'ClassicLinkVPCId'
+        attribute :classic_link_security_groups, :aliases => 'ClassicLinkVPCSecurityGroups'
 
         def initialize(attributes={})
           #attributes[:availability_zones] ||= %w(us-east-1a us-east-1b us-east-1c us-east-1d)

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

@@ -42,19 +42,8 @@ module Fog
 
         def activities
           requires :id
-          data = []
-          next_token = nil
-          loop do
-            result = service.describe_scaling_activities('AutoScalingGroupName' => id, 'NextToken' => next_token).body['DescribeScalingActivitiesResult']
-            data += result['Activities']
-            next_token = result['NextToken']
-            break if next_token.nil?
-          end
-          Fog::AWS::AutoScaling::Activities.new({
-            :data => data,
-            :service => service,
-            #:load_balancer => self
-          })
+
+          activities = Fog::AWS::AutoScaling::Activities.new(:service => service, :filters => {'AutoScalingGroupName' => id})
         end
 
         def configuration

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

@@ -12,7 +12,7 @@ module Fog
           end
 
           def reset_launch_configuration
-            @launch_configuration = { 'BlockDeviceMappings' => [], 'InstanceMonitoring' => {}, 'SecurityGroups' => [] }
+            @launch_configuration = { 'BlockDeviceMappings' => [], 'InstanceMonitoring' => {}, 'SecurityGroups' => [], 'ClassicLinkVPCSecurityGroups' => []}
           end
 
           def reset_block_device_mapping
@@ -30,6 +30,8 @@ module Fog
               @in_block_device_mappings = true
             when 'SecurityGroups'
               @in_security_groups = true
+            when 'ClassicLinkVPCSecurityGroups'
+              @in_classic_link_security_groups = true
             end
           end
 
@@ -41,6 +43,8 @@ module Fog
                 reset_block_device_mapping
               elsif @in_security_groups
                 @launch_configuration['SecurityGroups'] << value
+              elsif @in_classic_link_security_groups
+                @launch_configuration['ClassicLinkVPCSecurityGroups'] << value
               else
                 @results['LaunchConfigurations'] << @launch_configuration
                 reset_launch_configuration
@@ -49,7 +53,7 @@ module Fog
             when 'DeviceName', 'VirtualName'
               @block_device_mapping[name] = value
 
-            when 'SnapshotId', 'VolumeSize'
+            when 'SnapshotId', 'VolumeSize', 'VolumeType', 'Iops'
               @ebs[name] = value
             when 'Ebs'
               @block_device_mapping[name] = @ebs
@@ -62,11 +66,11 @@ module Fog
               @launch_configuration[name] = Time.parse(value)
             when 'ImageId', 'InstanceType', 'KeyName'
               @launch_configuration[name] = value
-            when 'LaunchConfigurationARN', 'LaunchConfigurationName'
+            when 'LaunchConfigurationARN', 'LaunchConfigurationName', 'ClassicLinkVPCId'
               @launch_configuration[name] = value
             when 'KernelId', 'RamdiskId', 'UserData'
               @launch_configuration[name] = value
-            when 'IamInstanceProfile'
+            when 'IamInstanceProfile', 'PlacementTenancy'
               @launch_configuration[name] = value
             when 'SpotPrice'
               @launch_configuration[name] = value.to_f
@@ -79,7 +83,8 @@ module Fog
               @in_launch_configurations = false
             when 'SecurityGroups'
               @in_security_groups = false
-
+            when 'ClassicLinkVPCSecurityGroups'
+              @in_classic_link_security_groups = false
             when 'NextToken'
               @results[name] = value
 

data/lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb

@@ -64,6 +64,11 @@ module Fog
           if security_groups = options.delete('SecurityGroups')
              options.merge!(AWS.indexed_param('SecurityGroups.member.%d', [*security_groups]))
           end
+
+          if classic_link_groups = options.delete('ClassicLinkVPCSecurityGroups')
+            options.merge!(AWS.indexed_param('ClassicLinkVPCSecurityGroups.member.%d', [*classic_link_groups]))
+          end
+          
           if options['UserData']
             options['UserData'] = Base64.encode64(options['UserData'])
           end

data/lib/fog/aws/requests/dns/change_resource_record_sets.rb

@@ -141,6 +141,7 @@ module Fog
           body = %Q{<?xml version="1.0" encoding="UTF-8"?><ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/#{@version}/">#{changes}</ChangeResourceRecordSetsRequest>}
           request({
             :body       => body,
+            :idempotent => true,
             :parser     => Fog::Parsers::DNS::AWS::ChangeResourceRecordSets.new,
             :expects    => 200,
             :method     => 'POST',

data/lib/fog/aws/requests/dns/get_hosted_zone.rb

@@ -27,8 +27,9 @@ module Fog
 
           request({
             :expects => 200,
-            :parser  => Fog::Parsers::DNS::AWS::GetHostedZone.new,
+            :idempotent => true,
             :method  => 'GET',
+            :parser  => Fog::Parsers::DNS::AWS::GetHostedZone.new,
             :path    => "hostedzone/#{zone_id}"
           })
         end

data/lib/fog/aws/requests/dns/list_resource_record_sets.rb

@@ -48,11 +48,12 @@ module Fog
           end
 
           request({
-            :query   => parameters,
-            :parser  => Fog::Parsers::DNS::AWS::ListResourceRecordSets.new,
             :expects => 200,
+            :idempotent => true,
             :method  => 'GET',
-            :path    => "hostedzone/#{zone_id}/rrset"
+            :parser  => Fog::Parsers::DNS::AWS::ListResourceRecordSets.new,
+            :path    => "hostedzone/#{zone_id}/rrset",
+            :query   => parameters
           })
         end
       end

data/lib/fog/aws/requests/iam/delete_group_policy.rb

@@ -27,6 +27,23 @@ module Fog
           )
         end
       end
+
+      class Mock
+        def delete_group_policy(group_name, policy_name)
+          if !data[:groups].key? group_name
+            raise Fog::AWS::IAM::NotFound.new("The group with name #{group_name} cannot be found.")
+          elsif !data[:groups][group_name][:policies].key? policy_name
+            raise Fog::AWS::IAM::NotFound.new("The group policy with name #{policy_name} cannot be found.")
+          else
+            data[:groups][group_name][:policies].delete(policy_name)
+
+            Excon::Response.new.tap do |response|
+              response.body = { 'RequestId' => Fog::AWS::Mock.request_id }
+              response.status = 200
+            end
+          end
+        end
+      end
     end
   end
 end

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

@@ -33,29 +33,29 @@ module Fog
 
           source = self.data[:servers][source_identifier]
           data = {
-            'AllocatedStorage' => source['AllocatedStorage'],
-            'AutoMinorVersionUpgrade' => options.key?('AutoMinorVersionUpgrade') ? options['AutoMinorVersionUpgrade'] : true,
-            'AvailabilityZone' => options['AvailabilityZone'],
-            'DBInstanceClass' => options['DBInstanceClass'] || 'db.m1.small',
-            'DBInstanceIdentifier' => instance_identifier,
-            'DBInstanceStatus' => 'creating',
-            'DBName' => source['DBName'],
-            'DBParameterGroups' => source['DBParameterGroups'],
-            'DBSecurityGroups' => source['DBSecurityGroups'],
-            'Endpoint' => {},
-            'Engine' => source['Engine'],
-            'EngineVersion' => options['EngineVersion'] || '5.5.12',
-            'InstanceCreateTime' => nil,
-            'Iops' => source['Iops'],
-            'LatestRestorableTime' => nil,
-            'LicenseModel' => 'general-public-license',
-            'MasterUsername' => source['MasterUsername'],
-            'MultiAZ' => false,
-            'PendingModifiedValues' => {},
-            'PreferredBackupWindow'=> '08:00-08:30',
-            'PreferredMaintenanceWindow'=> "mon:04:30-mon:05:00",
-            'ReadReplicaDBInstanceIdentifiers'=> [],
-            'ReadReplicaSourceDBInstanceIdentifier'=> source_identifier
+            'AllocatedStorage'                      => source['AllocatedStorage'],
+            'AutoMinorVersionUpgrade'               => options.key?('AutoMinorVersionUpgrade') ? options['AutoMinorVersionUpgrade'] : true,
+            'AvailabilityZone'                      => options['AvailabilityZone'],
+            'DBInstanceClass'                       => options['DBInstanceClass'] || 'db.m1.small',
+            'DBInstanceIdentifier'                  => instance_identifier,
+            'DBInstanceStatus'                      => 'creating',
+            'DBName'                                => source['DBName'],
+            'DBParameterGroups'                     => source['DBParameterGroups'],
+            'DBSecurityGroups'                      => source['DBSecurityGroups'],
+            'Endpoint'                              => {},
+            'Engine'                                => source['Engine'],
+            'EngineVersion'                         => source['EngineVersion'],
+            'InstanceCreateTime'                    => nil,
+            'Iops'                                  => source['Iops'],
+            'LatestRestorableTime'                  => nil,
+            'LicenseModel'                          => 'general-public-license',
+            'MasterUsername'                        => source['MasterUsername'],
+            'MultiAZ'                               => false,
+            'PendingModifiedValues'                 => {},
+            'PreferredBackupWindow'                 => '08:00-08:30',
+            'PreferredMaintenanceWindow'            => "mon:04:30-mon:05:00",
+            'ReadReplicaDBInstanceIdentifiers'      => [],
+            'ReadReplicaSourceDBInstanceIdentifier' => source_identifier
           }
           self.data[:servers][instance_identifier] = data
           self.data[:servers][source_identifier]['ReadReplicaDBInstanceIdentifiers'] << instance_identifier

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

@@ -21,6 +21,21 @@ module Fog
           })
         end
       end
+
+      class Mock
+        def delete_bucket_policy(bucket_name)
+           if bucket = data[:buckets][bucket_name]
+             bucket[:policy] = nil
+
+             Excon::Response.new.tap do |response|
+               response.body = { 'RequestId' => Fog::AWS::Mock.request_id }
+               response.status = 200
+             end
+           else
+             raise Fog::AWS::IAM::NotFound.new("The bucket with name #{bucket_name} cannot be found.")
+           end
+        end
+      end
     end
   end
 end

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

@@ -20,6 +20,23 @@ module Fog
           })
         end
       end
+
+      class Mock
+        #FIXME: You can't actually use the credentials for anything elsewhere in Fog
+        #FIXME: Doesn't do any validation on the policy
+        def put_bucket_policy(bucket_name, policy)
+          if bucket = data[:buckets][bucket_name]
+            bucket[:policy] = policy
+
+            Excon::Response.new.tap do |response|
+              response.body = { 'RequestId' => Fog::AWS::Mock.request_id }
+              response.status = 200
+            end
+          else
+            raise Fog::AWS::IAM::NotFound.new("The bucket with name #{bucket_name} cannot be found.")
+          end
+        end
+      end
     end
   end
 end

data/lib/fog/aws/storage.rb

@@ -141,9 +141,28 @@ module Fog
 
         def signed_url(params, expires)
           #convert expires from a point in time to a delta to now
+          expires = expires.to_i
+          if @signature_version == 4
+            params = v4_signed_params_for_url(params, expires)
+          else
+            params = v2_signed_params_for_url(params, expires)
+          end
+
+          params_to_url(params)
+        end
+
+        private
+
+        def validate_signature_version!
+          unless @signature_version == 2 || @signature_version == 4
+            raise "Unknown signature version #{@signature_version}; valid versions are 2 or 4"
+          end
+        end
+
+        def v4_signed_params_for_url(params, expires)
           now = Fog::Time.now
 
-          expires = expires.to_i - now.to_i
+          expires = expires - now.to_i
           params[:headers] ||= {}
 
           params[:query]||= {}
@@ -157,14 +176,29 @@ module Fog
           params = request_params(params)
           params[:headers][:host] = params[:host]
 
-          signature = @signer.signature_parameters(params, now, "UNSIGNED-PAYLOAD")
+          signature_query_params = @signer.signature_parameters(params, now, "UNSIGNED-PAYLOAD")
+          params[:query] = (params[:query] || {}).merge(signature_query_params)
+          params
+        end
 
-          params[:query] = (params[:query] || {}).merge(signature)
+        def v2_signed_params_for_url(params, expires)
+          if @aws_session_token
+            params[:headers]||= {}
+            params[:headers]['x-amz-security-token'] = @aws_session_token
+          end
+          signature = signature_v2(params, expires)
 
-          params_to_url(params)
-        end
+          params = request_params(params)
 
-        private
+          signature_query_params = {
+            'AWSAccessKeyId' => @aws_access_key_id,
+            'Signature' => signature,
+            'Expires' => expires,
+          }
+          params[:query] = (params[:query] || {}).merge(signature_query_params)
+          params[:query]['x-amz-security-token'] = @aws_session_token if @aws_session_token
+          params
+        end
 
         def region_to_host(region=nil)
           case region.to_s
@@ -365,18 +399,24 @@ module Fog
 
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
+
+          @region = options[:region] || DEFAULT_REGION
+
           if @endpoint = options[:endpoint]
             endpoint = URI.parse(@endpoint)
             @host = endpoint.host
             @scheme = endpoint.scheme
             @port = endpoint.port
           else
-            @region     = options[:region]      || DEFAULT_REGION
             @host       = options[:host]        || region_to_host(@region)
             @scheme     = options[:scheme]      || DEFAULT_SCHEME
             @port       = options[:port]        || DEFAULT_SCHEME_PORT[@scheme]
           end
+
+
           @path_style = options[:path_style] || false
+          @signature_version = options.fetch(:aws_signature_version, 4)
+          validate_signature_version!
           setup_credentials(options)
         end
 
@@ -396,6 +436,11 @@ module Fog
 
           @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key, @region, 's3')
         end
+
+        def signature_v2(params, expires)
+          'foo'
+        end
+
       end
 
       class Real
@@ -430,13 +475,14 @@ module Fog
           validate_signature_version!
           @path_style = options[:path_style]  || false
 
+          @region = options[:region] || DEFAULT_REGION
+
           if @endpoint = options[:endpoint]
             endpoint = URI.parse(@endpoint)
             @host = endpoint.host
             @scheme = endpoint.scheme
             @port = endpoint.port
           else
-            @region     = options[:region]      || DEFAULT_REGION
             @host       = options[:host]        || region_to_host(@region)
             @scheme     = options[:scheme]      || DEFAULT_SCHEME
             @port       = options[:port]        || DEFAULT_SCHEME_PORT[@scheme]
@@ -451,11 +497,6 @@ module Fog
 
         private
 
-        def validate_signature_version!
-          unless @signature_version == 2 || @signature_version == 4
-            raise "Unknown signature version #{@signature_version}; valid versions are 2 or 4"
-          end
-        end
 
         def setup_credentials(options)
           @aws_access_key_id     = options[:aws_access_key_id]
@@ -554,7 +595,7 @@ module Fog
             new_params[:bucket_name] =  %r{<Bucket>([^<]*)</Bucket>}.match(body).captures.first
             new_params[:host] = %r{<Endpoint>([^<]*)</Endpoint>}.match(body).captures.first
             # some errors provide it directly
-            @new_region = %r{<Region>([^<]*)</Region>}.match(body).captures.first
+            @new_region = %r{<Region>([^<]*)</Region>}.match(body) ? Regexp.last_match.captures.first : nil
           end
           Fog::Logger.warning("fog: followed redirect to #{host}, connecting to the matching region will be more performant")
           original_region, original_signer = @region, @signer

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/tests/models/elasticache/cluster_tests.rb

@@ -9,20 +9,20 @@ Shindo.tests('AWS::Elasticache | cache clusters', ['aws', 'elasticache']) do
 
   pending if Fog.mocking?
 
-  Formatador.display_line "Creating cluster #{cluster_params[:id]}..."
+  Fog::Formatador.display_line "Creating cluster #{cluster_params[:id]}..."
   model_tests(Fog::AWS[:elasticache].clusters, cluster_params, false) do
     @instance.reload  # Reload to get the cluster info from AWS
-    Formatador.display_line "Waiting for #{@instance.id} "+
+    Fog::Formatador.display_line "Waiting for #{@instance.id} "+
       "to become available (#{@instance.status})..."
     @instance.wait_for {ready?}
   end
 
   # Single model is still deleting, so re-randomize the cluster ID
   cluster_params[:id] = "fog-test-cluster-#{rand(999).to_s}"
-  Formatador.display_line "Creating cluster #{cluster_params[:id]}..."
+  Fog::Formatador.display_line "Creating cluster #{cluster_params[:id]}..."
   collection_tests(Fog::AWS[:elasticache].clusters, cluster_params, false) do
     @instance.reload  # Reload to get the cluster info from AWS
-    Formatador.display_line "Waiting for #{@instance.id} "+
+    Fog::Formatador.display_line "Waiting for #{@instance.id} "+
       "to become available (#{@instance.status})..."
     @instance.wait_for {ready?}
   end

data/tests/models/elb/model_tests.rb

@@ -69,7 +69,7 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
         Fog::Compute[:aws].disable_ec2_classic if Fog.mocking?
 
         if Fog::Compute[:aws].supported_platforms.include?("EC2")
-          Formatador.display_line("[yellow]Skipping test [bold]with default vpc[/][yellow] due to AWS account having EC2 available[/]")
+          Fog::Formatador.display_line("[yellow]Skipping test [bold]with default vpc[/][yellow] due to AWS account having EC2 available[/]")
         else
           elb2 = Fog::AWS[:elb].load_balancers.create(:id => "#{elb_id}-2", :availability_zones => @availability_zones[0])
           tests("elb source group should start with default_elb_").returns(true) { !!(elb2.source_group["GroupName"] =~ /default_elb_/) }

data/tests/models/rds/tagging_tests.rb

@@ -1,8 +1,8 @@
 Shindo.tests("AWS::RDS | tagging", ['aws', 'rds']) do
 
   @server = Fog::AWS[:rds].servers.create(rds_default_server_params)
-  Formatador.display_line "Creating RDS instance #{@server.id}"
-  Formatador.display_line "Waiting for instance #{@server.id} to be ready"
+  Fog::Formatador.display_line "Creating RDS instance #{@server.id}"
+  Fog::Formatador.display_line "Waiting for instance #{@server.id} to be ready"
   @server.wait_for { ready? }
 
   tags1 = {'key1' => 'val1'}

data/tests/models/storage/url_tests.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-
 Shindo.tests('AWS | url', ["aws"]) do
 
 
@@ -14,11 +13,30 @@ Shindo.tests('AWS | url', ["aws"]) do
 
   now = Fog::Time.now
   if RUBY_VERSION > '1.8.7' # ruby 1.8.x doesn't provide hash ordering
-    tests('#url w/ response-cache-control').returns(
+    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(Time.now + 500, :query => { 'response-cache-control' => 'No-cache' }).gsub(/(X-Amz-Signature=)[0-9a-f]+\z/,'\\1')
+      @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',
+    :aws_secret_access_key => 'abc',
+    :aws_signature_version => 2,
+    :region => 'us-east-1'
+  )
+
+  @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
 

data/tests/requests/elasticache/cache_cluster_tests.rb

@@ -46,7 +46,7 @@ Shindo.tests('AWS::Elasticache | cache cluster requests', ['aws', 'elasticache']
       body
     end
 
-    Formatador.display_line "Waiting for cluster #{CLUSTER_ID}..."
+    Fog::Formatador.display_line "Waiting for cluster #{CLUSTER_ID}..."
     Fog::AWS[:elasticache].clusters.get(CLUSTER_ID).wait_for {ready?}
 
     tests(
@@ -77,7 +77,7 @@ Shindo.tests('AWS::Elasticache | cache cluster requests', ['aws', 'elasticache']
     ).formats(AWS::Elasticache::Formats::CACHE_CLUSTER_RUNNING) do
       c = Fog::AWS[:elasticache].clusters.get(CLUSTER_ID)
       node_id = c.nodes.last['CacheNodeId']
-      Formatador.display_line "Rebooting node #{node_id}..."
+      Fog::Formatador.display_line "Rebooting node #{node_id}..."
       body = Fog::AWS[:elasticache].reboot_cache_cluster(c.id, [ node_id ]).body
       returns('rebooting cache cluster nodes') do
         body['CacheCluster']['CacheClusterStatus']
@@ -85,7 +85,7 @@ Shindo.tests('AWS::Elasticache | cache cluster requests', ['aws', 'elasticache']
       body['CacheCluster']
     end
 
-    Formatador.display_line "Waiting for cluster #{CLUSTER_ID}..."
+    Fog::Formatador.display_line "Waiting for cluster #{CLUSTER_ID}..."
     Fog::AWS[:elasticache].clusters.get(CLUSTER_ID).wait_for {ready?}
 
     tests(
@@ -93,7 +93,7 @@ Shindo.tests('AWS::Elasticache | cache cluster requests', ['aws', 'elasticache']
     ).formats(AWS::Elasticache::Formats::CACHE_CLUSTER_RUNNING) do
       c = Fog::AWS[:elasticache].clusters.get(CLUSTER_ID)
       node_id = c.nodes.last['CacheNodeId']
-      Formatador.display_line "Removing node #{node_id}..."
+      Fog::Formatador.display_line "Removing node #{node_id}..."
       body = Fog::AWS[:elasticache].modify_cache_cluster(c.id,
       {
         :num_nodes          => NUM_NODES - 1,
@@ -106,7 +106,7 @@ Shindo.tests('AWS::Elasticache | cache cluster requests', ['aws', 'elasticache']
       body['CacheCluster']
     end
 
-    Formatador.display_line "Waiting for cluster #{CLUSTER_ID}..."
+    Fog::Formatador.display_line "Waiting for cluster #{CLUSTER_ID}..."
     Fog::AWS[:elasticache].clusters.get(CLUSTER_ID).wait_for {ready?}
 
     tests(

data/tests/requests/rds/tagging_tests.rb

@@ -1,11 +1,11 @@
 Shindo.tests('AWS::RDS | tagging requests', ['aws', 'rds']) do
   @rds = Fog::AWS[:rds]
   @db_instance_id = "fog-test-#{rand(65536).to_s(16)}"
-  Formatador.display_line "Creating RDS instance #{@db_instance_id}"
+  Fog::Formatador.display_line "Creating RDS instance #{@db_instance_id}"
   @rds.create_db_instance(@db_instance_id, 'AllocatedStorage' => 5,
         'DBInstanceClass' => 'db.t1.micro', 'Engine' => 'mysql',
         'MasterUsername' => 'foguser', 'MasterUserPassword' => 'fogpassword')
-  Formatador.display_line "Waiting for instance #{@db_instance_id} to be ready"
+  Fog::Formatador.display_line "Waiting for instance #{@db_instance_id} to be ready"
   @db = @rds.servers.get(@db_instance_id)
   @db.wait_for { ready? }
 
@@ -73,6 +73,6 @@ Shindo.tests('AWS::RDS | tagging requests', ['aws', 'rds']) do
     end
   end
 
-  Formatador.display_line "Destroying DB instance #{@db_instance_id}"
+  Fog::Formatador.display_line "Destroying DB instance #{@db_instance_id}"
   @db.destroy
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler