fog 1.23.0 → 1.24.0

data/lib/fog/rackspace/models/databases/user.rb

@@ -8,10 +8,11 @@ module Fog
 
         attribute :password
         attribute :databases
+        attribute :host
 
         def save
           requires :identity, :instance, :password
-          service.create_user(instance.identity, identity, password, :databases => databases)
+          service.create_user(instance.identity, identity, password, :databases => databases, :host => host)
           true
         end
 

data/lib/fog/rackspace/models/load_balancers/load_balancer.rb

@@ -27,6 +27,7 @@ module Fog
         attribute :state,               :aliases => 'status'
         attribute :timeout
         attribute :nodes
+        attribute :https_redirect,      :aliases => 'httpsRedirect'
 
         def initialize(attributes)
           #HACK - Since we are hacking how sub-collections work, we have to make sure the service is valid first.
@@ -67,6 +68,18 @@ module Fog
           nodes.load(new_nodes)
         end
 
+        def https_redirect
+          if @https_redirect.nil?
+            requires :identity
+            @https_redirect = begin
+              service.get_load_balancer(identity).body['loadBalancer']['httpsRedirect']
+            rescue => e
+              nil
+            end
+          end
+          @https_redirect
+        end
+
         def ssl_termination
           requires :identity
           ssl_termination = service.get_ssl_termination(identity).body['sslTermination']
@@ -226,8 +239,9 @@ module Fog
         end
 
         private
+
         def create
-          requires :name, :protocol, :port, :virtual_ips, :nodes
+          requires :name, :protocol, :virtual_ips
 
           options = {}
           options[:algorithm] = algorithm if algorithm
@@ -238,16 +252,19 @@ module Fog
         end
 
         def update
-          requires :name, :protocol, :port, :algorithm, :timeout
+          requires :name, :protocol, :port, :algorithm, :timeout, :https_redirect
           options = {
             :name => name,
             :algorithm => algorithm,
             :protocol => protocol,
             :port => port,
-            :timeout => timeout }
+            :timeout => timeout,
+            :https_redirect => !!https_redirect
+          }
+
           service.update_load_balancer(identity, options)
 
-          #TODO - Should this bubble down to nodes? Without tracking changes this would be very inefficient.
+          # TODO - Should this bubble down to nodes? Without tracking changes this would be very inefficient.
           # For now, individual nodes will have to be saved individually after saving an LB
         end
 

data/lib/fog/rackspace/queues.rb

@@ -47,13 +47,20 @@ module Fog
           @rackspace_username = options[:rackspace_username]
           @rackspace_queues_client_id = options[:rackspace_queues_client_id] || Fog::UUID.uuid
           @rackspace_auth_url = options[:rackspace_auth_url]
+          @rackspace_queues_url = options[:rackspace_queues_url]
           @rackspace_must_reauthenticate = false
           @connection_options = options[:connection_options] || {}
-          @rackspace_region = options[:rackspace_region] || :ord
+          @rackspace_region = options[:rackspace_region]
 
           unless v2_authentication?
             raise Fog::Errors::NotImplemented.new("V2 authentication required for Queues")
           end
+
+          unless @rackspace_region || @rackspace_queues_url
+            Fog::Logger.deprecation("Default region support will be removed in an upcoming release. Please switch to manually setting your endpoint. This requires settng the :rackspace_region option.")
+          end
+
+          @rackspace_region ||= :ord
         end
 
         def service_name
@@ -65,7 +72,7 @@ module Fog
         end
 
         def endpoint_uri(service_endpoint_url=nil)
-          @uri = super(@rackspace_endpoint || service_endpoint_url, :rackspace_queues_url)
+          @uri = super(@rackspace_queues_url || service_endpoint_url, :rackspace_queues_url)
         end
 
         def authenticate(options={})

data/lib/fog/rackspace/requests/block_storage/create_volume.rb

@@ -10,6 +10,8 @@ module Fog
         # @option options [String] :display_description display description for volume
         # @option options [String] :volume_type type of volume
         # @option options [String] :snapshot_id The optional snapshot from which to create a volume.
+        # @option options [String] :image_id The ID of an image from the compute service. If provided, a bootable volume will be
+        #    created.
         # @return [Excon::Response] response:
         #   * body [Hash]:
         #     * 'volume' [Hash]:
@@ -41,6 +43,7 @@ module Fog
           data['volume']['volume_type'] = options[:volume_type] unless options[:volume_type].nil?
           data['volume']['availability_zone'] = options[:availability_zone] unless options[:availability_zone].nil?
           data['volume']['snapshot_id'] = options[:snapshot_id] unless options[:snapshot_id].nil?
+          data['volume']['imageRef'] = options[:image_id] unless options[:image_id].nil?
 
           request(
             :body => Fog::JSON.encode(data),
@@ -80,6 +83,7 @@ module Fog
               snapshot = self.data[:snapshots][snapshot_id]
               volume.merge!("size" => snapshot["size"])
             end
+            volume["image_id"] = options[:image_id] if options[:image_id]
 
             self.data[:volumes][volume_id] = volume
 

data/lib/fog/rackspace/requests/compute_v2/create_server.rb

@@ -14,6 +14,12 @@ module Fog
         # @option options [Hash] personality Hash containing data to inject into the file system of the cloud server instance during server creation.
         # @option options [Boolean] config_drive whether to attach a read-only configuration drive
         # @option options [String] keypair  Name of the kay-pair to associate with this server.
+        # @option options [Array<Hash>] block_device_mapping A manually specified block device mapping to fully control the creation and
+        #   attachment of volumes to this server. Mutually exclusive with :volume_id or :volume_image_id. If provided, leave image_id
+        #   as "". See http://developer.openstack.org/api-ref-compute-v2-ext.html#ext-os-block-device-mapping-v2-boot for details.
+        # @option options [String] boot_volume_id Id of a pre-created bootable volume to use for this server. If provided, leave image_id as "".
+        # @option options [String] boot_image_id Id of an image to create a bootable volume from and attach to this server. If provided,
+        #   leave image_id as "".
         # @return [Excon::Response] response:
         #   * body [Hash]:
         #     * server [Hash]:
@@ -40,6 +46,7 @@ module Fog
         # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Server_Metadata-d1e2529.html
         # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/Server_Personality-d1e2543.html
         # @see http://docs.rackspace.com/servers/api/v2/cs-devguide/content/ch_extensions.html#diskconfig_attribute
+        # @see http://developer.openstack.org/api-ref-compute-v2-ext.html#ext-os-block-device-mapping-v2-boot
         #
         # * State Transitions
         #   * BUILD -> ACTIVE
@@ -73,6 +80,42 @@ module Fog
 
           data['server']['key_name'] = options[:key_name] unless options[:key_name].nil?
 
+          if options[:block_device_mapping]
+            if options[:boot_volume_id]
+              Fog::Logger.warning("Manual :block_device_mapping overrides :boot_volume_id in #create_server!")
+            end
+
+            if options[:boot_image_id]
+              Fog::Logger.warning("Manual :block_device_mapping overrides :boot_image_id in #create_server!")
+            end
+
+            data['server']['block_device_mapping_v2'] = options[:block_device_mapping]
+          else
+            if options[:boot_volume_id]
+              if options[:boot_image_id]
+                Fog::Logger.warning(":boot_volume_id overrides :boot_image_id!")
+              end
+
+              data['server']['block_device_mapping_v2'] = [{
+                'boot_index' => '0',
+                'uuid' => options[:boot_volume_id],
+                'source_type' => 'volume',
+                'destination_type' => 'volume',
+                'volume_size' => 100
+              }]
+            end
+
+            if options[:boot_image_id]
+              data['server']['block_device_mapping_v2'] = [{
+                'boot_index' => '0',
+                'uuid' => options[:boot_image_id],
+                'source_type' => 'image',
+                'destination_type' => 'volume',
+                'volume_size' => 100
+              }]
+            end
+        end
+
           request(
             :body    => Fog::JSON.encode(data),
             :expects => [202],

data/lib/fog/rackspace/requests/compute_v2/create_virtual_interface.rb

@@ -20,7 +20,7 @@ module Fog
           request(
             :expects => [200],
             :method => 'POST',
-            :path => "/servers/#{server_id}/os-virtual-interfacesv2",
+            :path => "servers/#{server_id}/os-virtual-interfacesv2",
             :body => Fog::JSON.encode(data)
           )
         end

data/lib/fog/rackspace/requests/compute_v2/delete_metadata_item.rb

@@ -16,7 +16,7 @@ module Fog
           request(
             :expects => 204,
             :method => 'DELETE',
-            :path => "/#{collection}/#{obj_id}/metadata/#{key}"
+            :path => "#{collection}/#{obj_id}/metadata/#{key}"
           )
         end
       end

data/lib/fog/rackspace/requests/compute_v2/delete_virtual_interface.rb

@@ -14,7 +14,7 @@ module Fog
           request(
             :expects => [200],
             :method => 'DELETE',
-            :path => "/servers/#{server_id}/os-virtual-interfacesv2/#{interface_id}"
+            :path => "servers/#{server_id}/os-virtual-interfacesv2/#{interface_id}"
           )
         end
       end

data/lib/fog/rackspace/requests/compute_v2/get_metadata_item.rb

@@ -18,7 +18,7 @@ module Fog
           request(
             :expects => 200,
             :method => 'GET',
-            :path => "/#{collection}/#{obj_id}/metadata/#{key}"
+            :path => "#{collection}/#{obj_id}/metadata/#{key}"
           )
         end
       end

data/lib/fog/rackspace/requests/compute_v2/list_keypairs.rb

@@ -19,7 +19,7 @@ module Fog
           request(
             :method   => 'GET',
             :expects  => 200,
-            :path     => '/os-keypairs'
+            :path     => 'os-keypairs'
           )
         end
       end

data/lib/fog/rackspace/requests/compute_v2/list_metadata.rb

@@ -17,7 +17,7 @@ module Fog
           request(
             :expects => [200, 203],
             :method => 'GET',
-            :path => "/#{collection}/#{obj_id}/metadata"
+            :path => "#{collection}/#{obj_id}/metadata"
           )
         end
       end

data/lib/fog/rackspace/requests/compute_v2/list_virtual_interfaces.rb

@@ -13,7 +13,7 @@ module Fog
           request(
             :expects => [200],
             :method => 'GET',
-            :path => "/servers/#{server_id}/os-virtual-interfacesv2"
+            :path => "servers/#{server_id}/os-virtual-interfacesv2"
           )
         end
       end

data/lib/fog/rackspace/requests/compute_v2/set_metadata.rb

@@ -18,7 +18,7 @@ module Fog
           request(
             :expects => [200, 203],
             :method => 'PUT',
-            :path => "/#{collection}/#{obj_id}/metadata",
+            :path => "#{collection}/#{obj_id}/metadata",
             :body => Fog::JSON.encode('metadata' => metadata)
           )
         end

data/lib/fog/rackspace/requests/compute_v2/set_metadata_item.rb

@@ -19,7 +19,7 @@ module Fog
           request(
             :expects => 200,
             :method => 'PUT',
-            :path => "/#{collection}/#{obj_id}/metadata/#{key}",
+            :path => "#{collection}/#{obj_id}/metadata/#{key}",
             :body => Fog::JSON.encode('meta' => { key => value })
           )
         end

data/lib/fog/rackspace/requests/compute_v2/update_metadata.rb

@@ -18,7 +18,7 @@ module Fog
           request(
             :expects => [200, 203],
             :method => 'POST',
-            :path => "/#{collection}/#{obj_id}/metadata",
+            :path => "#{collection}/#{obj_id}/metadata",
             :body => Fog::JSON.encode('metadata' => metadata)
           )
         end

data/lib/fog/rackspace/requests/databases/create_user.rb

@@ -7,7 +7,8 @@ module Fog
             'users' => [{
               'name' => name,
               'password' => password,
-              'databases' => options[:databases] || []
+              'databases' => options[:databases] || [],
+              'host' => options[:host] || '%'
             }]
           }
 

data/lib/fog/rackspace/requests/databases/grant_user_access.rb

@@ -0,0 +1,32 @@
+module Fog
+  module Rackspace
+    class Databases
+      class Real
+        def grant_user_access(instance_id, user, *databases)
+          user =
+            if user.respond_to?(:name) && user.respond_to?(:host) 
+              host_str = 
+                if user.host && user.host != '' && user.host != '%'
+                  "@#{user.host}"
+                end.to_s
+              user.name + host_str
+            else
+              user
+            end
+
+          data = { :databases => [] }
+          databases.each do |db_name|
+            data[:databases] << { :name => db_name }
+          end
+
+          request(
+            :body => Fog::JSON.encode(data),
+            :expects => 202,
+            :method => 'PUT',
+            :path => "instances/#{instance_id}/users/#{user}/databases"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/databases/revoke_user_access.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Rackspace
+    class Databases
+      class Real
+        def revoke_user_access(instance_id, user, database)
+          user =
+            if user.respond_to?(:name) && user.respond_to?(:host) 
+              host_str = 
+                if user.host && user.host != '' && user.host != '%'
+                  "@#{user.host}"
+                end.to_s
+              user.name + host_str
+            else
+              user
+            end
+
+          request(
+            :expects => 202,
+            :method => 'DELETE',
+            :path => "instances/#{instance_id}/users/#{user}/databases/#{database}"
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -2,19 +2,37 @@ module Fog
   module Rackspace
     class LoadBalancers
       class Real
-        def create_load_balancer(name, protocol, port, virtual_ips, nodes, options = {})
-          data = {
-            'loadBalancer' => {
-              'name' => name,
-              'port' => port,
-              'protocol' => protocol,
-              'virtualIps' => virtual_ips,
-            }
+
+        # Issue an asynchronous request to create a new Load Balancer.
+        #
+        # @param name [String] human-friendly identifier for the balancer that will be shown in
+        #   the web UI.
+        # @param protocol [String] well-known protocol describing the traffic to be load balanced.
+        # @param port [Integer] port for the balancer to listen on and balance to.
+        # @param virtual_ips [Array<Hash>] description of the kind of IP address to bind to, or id
+        #   of the existing virtual IP from another balancer. Examples: `{ 'type' => 'PUBLIC' }`,
+        #   `{ 'type' => 'PRIVATE' }`, `{ 'id' => 1234 }`
+        # @param nodes [Array<Hash>] collection of
+        # @option options [String] :algorithm balancing algorithm for the balancer to use.
+        #   See http://docs.rackspace.com/loadbalancers/api/v1.0/clb-devguide/content/Algorithms-d1e4367.html
+        # @option options [String] :timeout amount of time the load balancer will wait for a response
+        #   from a back-end node before terminating the connection. Defaults to 30 seconds, may be
+        #   increased to a maximum of 120 seconds.
+        #
+        def create_load_balancer(name, protocol, port = nil, virtual_ips = [{'type' => 'PUBLIC'}], nodes = nil, options = {})
+          lb_data = {
+            'name' => name,
+            'protocol' => protocol,
+            'virtualIps' => virtual_ips
           }
 
-          data['loadBalancer']['nodes'] = nodes if nodes && !nodes.empty?
-          data['loadBalancer']['algorithm'] = options[:algorithm] if options.key? :algorithm
-          data['loadBalancer']['timeout'] = options[:timeout] if options.key? :timeout
+          lb_data['nodes'] = nodes if nodes && !nodes.empty?
+          lb_data['port'] = port if port
+          lb_data['algorithm'] = options[:algorithm] if options.key? :algorithm
+          lb_data['timeout'] = options[:timeout] if options.key? :timeout
+          lb_data['httpsRedirect'] = options[:https_redirect] if options.key? :https_redirect
+
+          data = { 'loadBalancer' => lb_data }
 
           request(
             :body     => Fog::JSON.encode(data),
@@ -23,15 +41,65 @@ module Fog
             :path     => 'loadbalancers.json'
           )
         end
+
       end
 
       class Mock
         def create_load_balancer(name, protocol, port, virtual_ips, nodes, options = {})
-          data = {"loadBalancer"=>{"name"=>name, "id"=>Fog::Mock.random_numbers(6), "protocol"=>protocol, "port"=>port, "algorithm"=>"RANDOM", "status"=>"BUILD",
-                                           "cluster"=>{"name"=>"my-cluster.rackspace.net"}, "timeout"=>30, "created"=>{"time"=> MockData.zulu_time},
-                                           "updated"=>{"time"=>MockData.zulu_time }, "halfClosed"=>false, "connectionLogging"=>{"enabled"=>false}, "contentCaching"=>{"enabled"=>false}}}
-                  data["virtual_ips"] = virtual_ips.map {|n| {"virtualIps"=>[{"address"=> MockData.ipv4_address, "id"=>Fog::Mock.random_numbers(6), "type"=> n.type, "ipVersion"=>"IPV4"}, {"address"=> MockData.ipv6_address, "id"=> Fog::Mock.random_numbers(4), "type"=>"PUBLIC", "ipVersion"=>"IPV6"}], "sourceAddresses"=>{"ipv6Public"=> MockData.ipv6_address, "ipv4Servicenet"=>MockData.ipv4_address, "ipv4Public"=>MockData.ipv4_address}}
-                  data["nodes"] = nodes.map {|n| {"address"=>n.address, "id"=>Fog::Mock.random_numbers(6), "type"=>"PRIMARY", "port"=>n.port, "status"=>"ONLINE", "condition"=>"ENABLED", "weight"=>1}}}
+          data = {
+            "loadBalancer" => {
+              "name" => name,
+              "id" => Fog::Mock.random_numbers(6),
+              "protocol" => protocol,
+              "port" => port,
+              "algorithm" => "RANDOM",
+              "status" => "BUILD",
+              "cluster" => { "name" => "my-cluster.rackspace.net" },
+              "timeout" => 30,
+              "created" => {"time" => MockData.zulu_time },
+              "updated" => {"time" => MockData.zulu_time },
+              "halfClosed" => false,
+              "connectionLogging" => { "enabled" => false },
+              "contentCaching" => { "enabled" => false },
+              "httpsRedirect" => false
+            }
+          }
+
+          data["virtual_ips"] = virtual_ips.map do |n|
+            {
+              "virtualIps" => [
+                {
+                  "address" => MockData.ipv4_address,
+                  "id" => Fog::Mock.random_numbers(6),
+                  "type" => n.type,
+                  "ipVersion" => "IPV4"
+                },
+                {
+                  "address" => MockData.ipv6_address,
+                  "id" => Fog::Mock.random_numbers(4),
+                  "type" => "PUBLIC",
+                  "ipVersion" => "IPV6"
+                }
+              ],
+              "sourceAddresses" => {
+                "ipv6Public" => MockData.ipv6_address,
+                "ipv4Servicenet" => MockData.ipv4_address,
+                "ipv4Public" => MockData.ipv4_address
+              }
+            }
+          end
+
+          data["nodes"] = nodes.map do |n|
+            {
+              "address" => n.address,
+              "id" => Fog::Mock.random_numbers(6),
+              "type" => "PRIMARY",
+              "port" => n.port,
+              "status" => "ONLINE",
+              "condition" => "ENABLED",
+              "weight" => 1
+            }
+          end
 
           Excon::Response.new(:body => data, :status => 202)
         end