fog 0.10.0 → 0.11.0

data/lib/fog/rackspace/requests/load_balancers/remove_connection_throttling.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def remove_connection_throttling(load_balancer_id)
+          request(
+            :expects => [200, 202],
+            :path => "loadbalancers/#{load_balancer_id}/connectionthrottle",
+            :method => 'DELETE'
+          )
+         end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/load_balancers/remove_monitor.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def remove_monitor(load_balancer_id)
+          request(
+            :expects => [200, 202],
+            :path => "loadbalancers/#{load_balancer_id}/healthmonitor",
+            :method => 'DELETE'
+          )
+         end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/load_balancers/remove_session_persistence.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def remove_session_persistence(load_balancer_id)
+          request(
+            :expects => [200, 202],
+            :path => "loadbalancers/#{load_balancer_id}/sessionpersistence",
+            :method => 'DELETE'
+          )
+         end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/load_balancers/set_connection_logging.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def set_connection_logging(load_balancer_id, value)
+          data = {
+            'connectionLogging' => {
+              'enabled' => value.to_s
+            }
+          }
+          request(
+            :body     => MultiJson.encode(data),
+            :expects  => [200, 202],
+            :path     => "loadbalancers/#{load_balancer_id}/connectionlogging",
+            :method   => 'PUT'
+          )
+         end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/load_balancers/set_connection_throttling.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def set_connection_throttling(load_balancer_id, max_connections, min_connections, max_connection_rate, rate_interval)
+          data = {
+            'maxConnections' => max_connections,
+            'minConnections' => min_connections,
+            'maxConnectionRate' => max_connection_rate,
+            'rateInterval' => rate_interval
+          }
+          request(
+            :body     => MultiJson.encode(data),
+            :expects  => [200, 202],
+            :path     => "loadbalancers/#{load_balancer_id}/connectionthrottle",
+            :method   => 'PUT'
+          )
+         end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/load_balancers/set_monitor.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def set_monitor(load_balancer_id, type, delay, timeout, attempsBeforeDeactivation, options = {})
+          data = {
+            'type' => type,
+            'delay' => delay,
+            'timeout' => timeout,
+            'attemptsBeforeDeactivation' => attempsBeforeDeactivation
+          }
+          if options.has_key? :path
+            data['path'] = options[:path]
+          end
+          if options.has_key? :body_regex
+            data['bodyRegex'] = options[:body_regex]
+          end
+          if options.has_key? :status_regex
+            data['statusRegex'] = options[:status_regex]
+          end
+          request(
+            :body     => MultiJson.encode(data),
+            :expects  => [200, 202],
+            :path     => "loadbalancers/#{load_balancer_id}/healthmonitor",
+            :method   => 'PUT'
+          )
+         end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/load_balancers/set_session_persistence.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def set_session_persistence(load_balancer_id, persistence_type)
+          data = {
+            'sessionPersistence' => {
+              'persistenceType' => persistence_type
+            }
+          }
+          request(
+            :body     => MultiJson.encode(data),
+            :expects  => [200, 202],
+            :path     => "loadbalancers/#{load_balancer_id}/sessionpersistence",
+            :method   => 'PUT'
+          )
+         end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/load_balancers/update_load_balancer.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def update_load_balancer(load_balancer_id, options = {})
+          data = {
+            'loadBalancer' => {
+              'name' => options[:name],
+              'port' => options[:port],
+              'protocol' => options[:protocol],
+              'algorithm' => options[:algorithm]
+            }
+          }
+          request(
+            :body     => MultiJson.encode(data),
+            :expects  => 202,
+            :method   => 'PUT',
+            :path     => "loadbalancers/#{load_balancer_id}.json"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/load_balancers/update_node.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def update_node(load_balancer_id, node_id, options = {})
+          data = {
+            'node' => {}
+          }
+          if options.has_key? :weight
+            data['node']['weight'] = options[:weight]
+          end
+          if options.has_key? :condition
+            data['node']['condition'] = options[:condition]
+          end
+          #TODO - Do anything if no valid options are passed in?
+          request(
+            :body     => MultiJson.encode(data),
+            :expects  => [200, 202],
+            :method   => 'PUT',
+            :path     => "loadbalancers/#{load_balancer_id}/nodes/#{node_id}.json"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/storage.rb

@@ -30,7 +30,7 @@ module Fog
 
     def self.directories
       directories = []
-      for provider in [:aws, :google, :local, :ninefold, :rackspace]
+      for provider in self.providers
         begin
           directories.concat(self[provider].directories)
         rescue # ignore any missing credentials/etc
@@ -73,5 +73,9 @@ module Fog
       metadata
     end
 
+    def self.providers
+      Fog.services[:storage]
+    end
+
   end
 end

data/lib/fog/storage/aws.rb

@@ -55,6 +55,8 @@ module Fog
 
       module Utils
 
+        attr_accessor :region
+
         def cdn
           @cdn ||= Fog::AWS::CDN.new(
             :aws_access_key_id => @aws_access_key_id,
@@ -179,6 +181,7 @@ module Fog
 
         def initialize(options={})
           require 'mime/types'
+          require 'multi_json'
           @aws_access_key_id = options[:aws_access_key_id]
           @aws_secret_access_key = options[:aws_secret_access_key]
           options[:region] ||= 'us-east-1'

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

@@ -86,9 +86,7 @@ module Fog
           if @acl
             options['x-amz-acl'] = @acl
           end
-          if @location
-            options['LocationConstraint'] = @location
-          end
+          options['LocationConstraint'] = @location || self.connection.region
           connection.put_bucket(key, options)
           true
         end

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

@@ -125,7 +125,7 @@ module Fog
 
         def url(expires)
           requires :key
-          collection.get_url(key, expires)
+          collection.get_https_url(key, expires)
         end
 
         private

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

@@ -125,7 +125,7 @@ module Fog
 
         def url(expires)
           requires :key
-          collection.get_url(key, expires)
+          collection.get_http_url(key, expires)
         end
 
         private

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

@@ -38,7 +38,7 @@ module Fog
 
         def destroy
           requires :directory, :key
-          ::File.delete(path)
+          ::File.delete(path) if ::File.exists?(path)
           dirs = path.split(::File::SEPARATOR)[0...-1]
           dirs.length.times do |index|
             dir_path = dirs[0..-index].join(::File::SEPARATOR)
@@ -50,11 +50,13 @@ module Fog
               break
             end
             pwd = Dir.pwd
-            Dir.chdir(dir_path)
-            if Dir.glob('*').empty?
-              Dir.rmdir(dir_path)
+            if ::Dir.exists?(dir_path)
+              Dir.chdir(dir_path)
+              if Dir.glob('*').empty?
+                Dir.rmdir(dir_path)
+              end
+              Dir.chdir(pwd)
             end
-            Dir.chdir(pwd)
           end
           true
         end
@@ -80,7 +82,7 @@ module Fog
               Dir.mkdir(dir_path)
             end
           end
-          file = ::File.new(path, 'w')
+          file = ::File.new(path, 'wb')
           if body.is_a?(String)
             file.write(body)
           else

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

@@ -73,7 +73,6 @@ module Fog
           options[:headers] ||= {}
           options[:headers]['Content-Type'] = content_type if content_type
           options[:body] = body
-          p options
           if objectid
             # pre-existing file, do a PUT
             data = connection.put_namespace(ns, options)

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

@@ -30,7 +30,7 @@ module Fog
         # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectCOPY.html
 
         def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {})
-          headers = { 'x-amz-copy-source' => "/#{source_bucket_name}/#{source_object_name}" }.merge!(options)
+          headers = { 'x-amz-copy-source' => "/#{source_bucket_name}/#{CGI.escape(source_object_name)}" }.merge!(options)
           request({
             :expects  => 200,
             :headers  => headers,

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

@@ -60,17 +60,20 @@ module Fog
       class Mock # :nodoc:all
 
         def get_bucket(bucket_name, options = {})
+          prefix, marker, delimiter, max_keys = \
+            options['prefix'], options['marker'], options['delimiter'], options['max-keys']
+          common_prefixes = []
+
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
           end
-          if options['delimiter']
-            Fog::Mock.not_implemented
-          end
           response = Excon::Response.new
           if bucket = self.data[:buckets][bucket_name]
             contents = bucket[:objects].values.sort {|x,y| x['Key'] <=> y['Key']}.reject do |object|
-                (options['prefix'] && object['Key'][0...options['prefix'].length] != options['prefix']) ||
-                (options['marker'] && object['Key'] <= options['marker'])
+                (prefix    && object['Key'][0...prefix.length] != prefix) ||
+                (marker    && object['Key'] <= marker) ||
+                (delimiter && object['Key'][(prefix ? prefix.length : 0)..-1].include?(delimiter) \
+                           && common_prefixes << object['Key'].sub(/^(#{prefix}[^#{delimiter}]+.).*/, '\1'))
               end.map do |object|
                 data = object.reject {|key, value| !['ETag', 'Key', 'StorageClass'].include?(key)}
                 data.merge!({
@@ -80,23 +83,23 @@ module Fog
                 })
               data
             end
-            max_keys = options['max-keys'] || 1000
+            max_keys = max_keys || 1000
             size = [max_keys, 1000].min
             truncated_contents = contents[0...size]
 
             response.status = 200
             response.body = {
-              'CommonPrefixes'  => [],
+              'CommonPrefixes'  => common_prefixes.uniq,
               'Contents'        => truncated_contents,
               'IsTruncated'     => truncated_contents.size != contents.size,
-              'Marker'          => options['marker'],
+              'Marker'          => marker,
               'MaxKeys'         => max_keys,
               'Name'            => bucket['Name'],
-              'Prefix'          => options['prefix']
+              'Prefix'          => prefix
             }
-            if options['max-keys'] && options['max-keys'] < response.body['Contents'].length
+            if max_keys && max_keys < response.body['Contents'].length
                 response.body['IsTruncated'] = true
-                response.body['Contents'] = response.body['Contents'][0...options['max-keys']]
+                response.body['Contents'] = response.body['Contents'][0...max_keys]
             end
           else
             response.status = 404

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

@@ -27,11 +27,9 @@ module Fog
 
         def post_object_hidden_fields(options = {})
           if options['policy']
-            options['policy'] = MultiJson.encode(options['policy'])
+            options['policy'] = Base64.encode64(MultiJson.encode(options['policy'])).gsub("\n", "")
             options['AWSAccessKeyId'] = @aws_access_key_id
-            string_to_sign = Base64.encode64(options['policy']).chomp!
-            signed_string = @hmac.sign(string_to_sign)
-            options['Signature'] = Base64.encode64(signed_string).chomp!
+            options['Signature'] = Base64.encode64(@hmac.sign(options['policy'])).gsub("\n", "")
           end
           options
         end

data/tests/aws/models/rds/server_tests.rb

@@ -6,7 +6,7 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
     # We'll need this later; create it early to avoid waiting
     @instance_with_final_snapshot = AWS[:rds].servers.create(rds_default_server_params.merge(:id => uniq_id("fog-snapshot-test"), :backup_retention_period => 1))
 
-    @instance.wait_for { ready? }
+    @instance.wait_for(20*60) { ready? }
 
     tests('#snapshots') do
       snapshot = nil
@@ -51,10 +51,10 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
       @instance.reload.wait_for { state == 'rebooting' }
       @instance.reload.wait_for { ready? }
 
-      # Restore back to original state
+      # Restore back to original state using symbols
       restore_options = {
-       'DBParameterGroupName' => orig_parameter_group,
-       'DBSecurityGroups' => orig_security_groups
+       :parameter_group_name => orig_parameter_group,
+       :security_group_names => orig_security_groups
       }
       @instance.modify(true, restore_options)
 

data/tests/compute/models/aws/server_tests.rb

@@ -6,7 +6,6 @@ Shindo.tests("Fog::Compute[:aws] | monitor", ['aws']) do
     responds_to(association)
   end
 
-
   tests('new instance') do
 
     test('#monitor = true') do
@@ -44,4 +43,19 @@ Shindo.tests("Fog::Compute[:aws] | monitor", ['aws']) do
   end
 
   @instance.destroy
+
+  tests('tags') do
+    @instance = Fog::Compute[:aws].servers.create(:tags => {'key' => 'value'})
+
+    tests('@instance.reload.tags').returns({'key' => 'value'}) do
+      @instance.reload.tags
+    end
+
+    unless Fog.mocking?
+      Fog::Compute[:aws].tags.all('resource-id' => @instance.identity).each {|tag| tag.destroy}
+    end
+
+    @instance.destroy
+  end
+
 end