fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

data/lib/fog/go_grid/models/compute/server.rb

@@ -27,13 +27,13 @@ module Fog
 
         def destroy
           requires :id
-          connection.grid_server_delete(id)
+          service.grid_server_delete(id)
           true
         end
 
         def image
           requires :image_id
-          connection.grid_image_get(:image => image_id)
+          service.grid_image_get(:image => image_id)
         end
 
         def private_ip_address
@@ -58,14 +58,14 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :name, :image_id, :memory, :public_ip_address
           options = {
             'isSandbox'   => sandbox,
             'image'       => image_id
           }
           options = options.reject {|key, value| value.nil?}
-          data = connection.grid_server_add(image, public_ip_address, name, memory, options)
+          data = service.grid_server_add(image, public_ip_address, name, memory, options)
           merge_attributes(data.body)
           true
         end

data/lib/fog/go_grid/models/compute/servers.rb

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::GoGrid::Server
 
         def all
-          data = connection.grid_server_list.body['list']
+          data = service.grid_server_list.body['list']
           load(data)
         end
 
@@ -22,7 +22,7 @@ module Fog
         end
 
         def get(server_id)
-          if server_id && server = connection.grid_server_get(server_id).body['list'].first
+          if server_id && server = service.grid_server_get(server_id).body['list'].first
             new(server)
           end
         rescue Fog::Compute::GoGrid::NotFound

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

@@ -10,7 +10,7 @@ module Fog
         model Fog::Storage::Google::Directory
 
         def all
-         data = connection.get_service.body['Buckets']
+         data = service.get_service.body['Buckets']
          load(data)
         end
 
@@ -21,7 +21,7 @@ module Fog
             :max_keys   => 'max-keys',
             :prefix     => 'prefix'
           })
-          data = connection.get_bucket(key, options).body
+          data = service.get_bucket(key, options).body
           directory = new(:key => data['Name'])
           options = {}
           for k, v in data

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

@@ -21,7 +21,7 @@ module Fog
 
         def destroy
           requires :key
-          connection.delete_bucket(key)
+          service.delete_bucket(key)
           true
         rescue Excon::Errors::NotFound
           false
@@ -31,7 +31,7 @@ module Fog
           @files ||= begin
             Fog::Storage::Google::Files.new(
               :directory    => self,
-              :connection   => connection
+              :service   => service
             )
           end
         end
@@ -47,7 +47,7 @@ module Fog
 
         def public_url
           requires :key
-          if connection.get_bucket_acl(key).body['AccessControlList'].detect {|entry| entry['Scope']['type'] == 'AllUsers' && entry['Permission'] == 'READ'}
+          if service.get_bucket_acl(key).body['AccessControlList'].detect {|entry| entry['Scope']['type'] == 'AllUsers' && entry['Permission'] == 'READ'}
             if key.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
               "https://#{key}.storage.googleapis.com"
             else
@@ -67,7 +67,7 @@ module Fog
           if @location
             options['LocationConstraint'] = @location
           end
-          connection.put_bucket(key, options)
+          service.put_bucket(key, options)
           true
         end
 

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

@@ -47,15 +47,15 @@ module Fog
 
         def copy(target_directory_key, target_file_key)
           requires :directory, :key
-          connection.copy_object(directory.key, key, target_directory_key, target_file_key)
-          target_directory = connection.directories.new(:key => target_directory_key)
+          service.copy_object(directory.key, key, target_directory_key, target_file_key)
+          target_directory = service.directories.new(:key => target_directory_key)
           target_directory.files.get(target_file_key)
         end
 
         def destroy
           requires :directory, :key
           begin
-            connection.delete_object(directory.key, key)
+            service.delete_object(directory.key, key)
           rescue Excon::Errors::NotFound
           end
           true
@@ -92,7 +92,7 @@ module Fog
 
         def public_url
           requires :directory, :key
-          if connection.get_object_acl(directory.key, key).body['AccessControlList'].detect {|entry| entry['Scope']['type'] == 'AllUsers' && entry['Permission'] == 'READ'}
+          if service.get_object_acl(directory.key, key).body['AccessControlList'].detect {|entry| entry['Scope']['type'] == 'AllUsers' && entry['Permission'] == 'READ'}
             if directory.key.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
               "https://#{directory.key}.storage.googleapis.com/#{key}"
             else
@@ -117,7 +117,7 @@ module Fog
           options['Expires'] = expires if expires
           options.merge(metadata)
 
-          data = connection.put_object(directory.key, key, body, options)
+          data = service.put_object(directory.key, key, body, options)
           merge_attributes(data.headers.reject {|key, value| ['Content-Length', 'Content-Type'].include?(key)})
           self.content_length = Fog::Storage.get_body_size(body)
           self.content_type ||= Fog::Storage.get_content_type(body)

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

@@ -60,7 +60,7 @@ module Fog
 
         def get(key, options = {}, &block)
           requires :directory
-          data = connection.get_object(directory.key, key, options, &block)
+          data = service.get_object(directory.key, key, options, &block)
           file_data = data.headers.merge({
             :body => data.body,
             :key  => key
@@ -72,17 +72,17 @@ module Fog
 
         def get_http_url(key, expires)
           requires :directory
-          connection.get_object_http_url(directory.key, key, expires)
+          service.get_object_http_url(directory.key, key, expires)
         end
 
         def get_https_url(key, expires)
           requires :directory
-          connection.get_object_https_url(directory.key, key, expires)
+          service.get_object_https_url(directory.key, key, expires)
         end
 
         def head(key, options = {})
           requires :directory
-          data = connection.head_object(directory.key, key, options)
+          data = service.head_object(directory.key, key, options)
           file_data = data.headers.merge({
             :key => key
           })

data/lib/fog/google/storage.rb

@@ -225,8 +225,19 @@ DATA
           string_to_sign << "#{canonical_google_headers}"
 
           subdomain = params[:host].split(".#{@host}").first
-          unless subdomain =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
-            Fog::Logger.warning("fog: the specified google storage bucket name(#{subdomain}) is not a valid dns name.  See: http://code.google.com/apis/storage/docs/developer-guide.html#naming")
+          unless subdomain =~ /^(?!goog)(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
+            if subdomain =~ /_/
+              # https://github.com/fog/fog/pull/1258#issuecomment-10248620.
+              Fog::Logger.warning("fog: the specified google storage bucket name (#{subdomain}) is not DNS compliant (only characters a through z, digits 0 through 9, and the hyphen).")
+            else
+              # - Bucket names must contain only lowercase letters, numbers, dashes (-), underscores (_), and dots (.). Names containing dots require verification.
+              # - Bucket names must start and end with a number or letter.
+              # - Bucket names must contain 3 to 63 characters. Names containing dots can contain up to 222 characters, but each dot-separated component can be no longer than 63 characters.
+              # - Bucket names cannot be represented as an IP address in dotted-decimal notation (for example, 192.168.5.4).
+              # - Bucket names cannot begin with the "goog" prefix.
+              # - Also, for DNS compliance, you should not have a period adjacent to another period or dash. For example, ".." or "-." or ".-" are not acceptable.
+              Fog::Logger.warning("fog: the specified google storage bucket name (#{subdomain}) is not a valid dns name.  See: https://developers.google.com/storage/docs/bucketnaming")
+            end
             params[:host] = params[:host].split("#{subdomain}.")[-1]
             if params[:path]
               params[:path] = "#{subdomain}/#{params[:path]}"

data/lib/fog/hp.rb

@@ -15,6 +15,9 @@ module Fog
           else
             data = Fog::JSON.decode(error.response.body)
             message = data['message']
+            if message.nil? and !data.values.first.nil?
+              message = data.values.first['message']
+            end
           end
 
           new_error = super(error, message)
@@ -33,8 +36,8 @@ module Fog
 
         def self.slurp(error)
           new_error = super(error)
-          unless new_error.response_data.nil?
-            new_error.instance_variable_set(:@validation_errors, new_error.response_data['validationErrors'])
+          unless new_error.response_data.nil? or new_error.response_data['badRequest'].nil?
+            new_error.instance_variable_set(:@validation_errors, new_error.response_data['badRequest']['validationErrors'])
           end
           new_error
         end
@@ -135,7 +138,7 @@ module Fog
       request_body['auth']['tenantId'] = "#{@hp_tenant_id}" if @hp_tenant_id
 
       ### Make the call to CS to get auth token and service catalog
-      response = connection.request(
+      response = service.request(
         {
           :expects => 200,
           :headers => {

data/lib/fog/hp/models/compute/address.rb

@@ -13,7 +13,7 @@ module Fog
         attribute :instance_id
 
         def initialize(attributes = {})
-          # assign server first to prevent race condition with new_record?
+          # assign server first to prevent race condition with persisted?
           self.server = attributes.delete(:server)
           super
         end
@@ -21,7 +21,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.release_address(id)
+          service.release_address(id)
           true
         end
 
@@ -34,8 +34,8 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
-          data = connection.allocate_address.body['floating_ip']
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+          data = service.allocate_address.body['floating_ip']
           new_attributes = data.reject {|key,value| !['id', 'instance_id', 'ip', 'fixed_ip'].include?(key)}
           merge_attributes(new_attributes)
           if @server
@@ -47,19 +47,19 @@ module Fog
         private
 
         def associate(new_server)
-          if new_record?
+          unless persisted?
             @server = new_server
           else
             @server = nil
             self.instance_id = new_server.id
-            connection.associate_address(instance_id, ip)
+            service.associate_address(instance_id, ip)
           end
         end
 
         def disassociate
           @server = nil
-          unless new_record?
-            connection.disassociate_address(instance_id, ip)
+          if persisted?
+            service.disassociate_address(instance_id, ip)
           end
           self.instance_id = nil
         end

data/lib/fog/hp/models/compute/addresses.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::HP::Address
 
         def all
-          data = connection.list_addresses.body['floating_ips']
+          data = service.list_addresses.body['floating_ips']
           load(data)
         end
 
         def get(address_id)
-          if address = connection.get_address(address_id).body['floating_ip']
+          if address = service.get_address(address_id).body['floating_ip']
             new(address)
           end
         rescue Fog::Compute::HP::NotFound

data/lib/fog/hp/models/compute/flavors.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::HP::Flavor
 
         def all
-          data = connection.list_flavors_detail.body['flavors']
+          data = service.list_flavors_detail.body['flavors']
           load(data)
         end
 
         def get(flavor_id)
-          data = connection.get_flavor_details(flavor_id).body['flavor']
+          data = service.get_flavor_details(flavor_id).body['flavor']
           new(data)
         rescue Fog::Compute::HP::NotFound
           nil

data/lib/fog/hp/models/compute/image.rb

@@ -16,13 +16,13 @@ module Fog
         attribute :minDisk,     :aliases => 'min_disk'
         attribute :minRam,      :aliases => 'min_ram'
         attribute :server,   :aliases => 'server'
-        attribute :metadata       
+        attribute :metadata
         attribute :links
 
         def destroy
           requires :id
 
-          connection.delete_image(id)
+          service.delete_image(id)
           true
         end
 

data/lib/fog/hp/models/compute/images.rb

@@ -12,7 +12,7 @@ module Fog
         attribute :server
 
         def all
-          data = connection.list_images_detail.body['images']
+          data = service.list_images_detail.body['images']
           load(data)
           if server
             self.replace(self.select {|image| image.server.id == server.id})
@@ -21,7 +21,7 @@ module Fog
         end
 
         def get(image_id)
-          data = connection.get_image_details(image_id).body['image']
+          data = service.get_image_details(image_id).body['image']
           new(data)
         rescue Fog::Compute::HP::NotFound
           nil

data/lib/fog/hp/models/compute/key_pair.rb

@@ -18,7 +18,7 @@ module Fog
         def destroy
           requires :name
 
-          connection.delete_key_pair(name)
+          service.delete_key_pair(name)
           true
         end
 
@@ -26,9 +26,9 @@ module Fog
           requires :name
 
           data = if public_key
-            connection.create_key_pair(name, public_key).body['keypair']
+            service.create_key_pair(name, public_key).body['keypair']
           else
-            connection.create_key_pair(name).body['keypair']
+            service.create_key_pair(name).body['keypair']
           end
           new_attributes = data.reject {|key,value| !['fingerprint', 'public_key', 'name', 'private_key', 'user_id'].include?(key)}
           merge_attributes(new_attributes)

data/lib/fog/hp/models/compute/key_pairs.rb

@@ -11,7 +11,7 @@ module Fog
 
         def all
           items = []
-          connection.list_key_pairs.body['keypairs'].each do |kp|
+          service.list_key_pairs.body['keypairs'].each do |kp|
             items = items + kp.map { |key, value| value }
           end
           load(items)
@@ -28,4 +28,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/hp/models/compute/security_group.rb

@@ -16,25 +16,25 @@ module Fog
         def destroy
           requires :id
 
-          connection.delete_security_group(id)
+          service.delete_security_group(id)
           true
         end
 
         def save
           requires :name, :description
 
-          data = connection.create_security_group(name, description)
+          data = service.create_security_group(name, description)
           merge_attributes(data.body['security_group'])
           true
         end
 
         def create_rule(range, ip_protocol = "tcp", cidr = "0.0.0.0/0", group_id=nil)
           requires :id
-          connection.create_security_group_rule(id, ip_protocol, range.min, range.max, cidr, group_id)
+          service.create_security_group_rule(id, ip_protocol, range.min, range.max, cidr, group_id)
         end
 
         def delete_rule(rule_id)
-          connection.delete_security_group_rule(rule_id)
+          service.delete_security_group_rule(rule_id)
           true
         end
 

data/lib/fog/hp/models/compute/security_groups.rb

@@ -10,13 +10,13 @@ module Fog
         model Fog::Compute::HP::SecurityGroup
 
         def all
-          items = connection.list_security_groups.body['security_groups']
+          items = service.list_security_groups.body['security_groups']
           load(items)
         end
 
         def get(security_group_id)
           if security_group_id
-            sec_group = connection.get_security_group(security_group_id).body['security_group']
+            sec_group = service.get_security_group(security_group_id).body['security_group']
             new(sec_group)
           end
         rescue Fog::Compute::HP::NotFound
@@ -26,4 +26,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/hp/models/compute/server.rb

@@ -34,7 +34,7 @@ module Fog
         attr_writer :image_id, :flavor_id
 
         def initialize(attributes = {})
-          # assign these attributes first to prevent race condition with new_record?
+          # assign these attributes first to prevent race condition with persisted?
           self.security_groups = attributes.delete(:security_groups)
           self.min_count = attributes.delete(:min_count)
           self.max_count = attributes.delete(:max_count)
@@ -43,19 +43,19 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_server(id)
+          service.delete_server(id)
           true
         end
 
         def images
           requires :id
-          connection.images(:server => self)
+          service.images(:server => self)
         end
 
         def key_pair
           requires :key_name
 
-          connection.key_pairs.get(key_name)
+          service.key_pairs.get(key_name)
         end
 
         def key_pair=(new_keypair)
@@ -111,57 +111,57 @@ module Fog
           @security_groups = new_security_groups
         end
 
-        def security_groups   
+        def security_groups
           @security_groups
         end
-        
+
         def ready?
           self.state == 'ACTIVE'
         end
 
         def change_password(admin_password)
           requires :id
-          connection.change_password_server(id, admin_password)
+          service.change_password_server(id, admin_password)
           true
         end
 
         def reboot(type = 'SOFT')
           requires :id
-          connection.reboot_server(id, type)
+          service.reboot_server(id, type)
           true
         end
 
         def rebuild(image_id, name, admin_pass=nil, metadata=nil, personality=nil)
           requires :id
-          connection.rebuild_server(id, image_id, name, admin_pass, metadata, personality)
+          service.rebuild_server(id, image_id, name, admin_pass, metadata, personality)
           true
         end
 
         def resize(flavor_id)
           requires :id
-          connection.resize_server(id, flavor_id)
+          service.resize_server(id, flavor_id)
           true
         end
 
         def revert_resize
           requires :id
-          connection.revert_resized_server(id)
+          service.revert_resized_server(id)
           true
         end
 
         def confirm_resize
           requires :id
-          connection.confirm_resized_server(id)
+          service.confirm_resized_server(id)
           true
         end
 
         def create_image(name, metadata={})
           requires :id
-          connection.create_image(id, name, metadata)
+          service.create_image(id, name, metadata)
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :flavor_id, :image_id, :name
           options = {
             'metadata'    => metadata,
@@ -174,7 +174,7 @@ module Fog
             'security_groups' => @security_groups
           }
           options = options.reject {|key, value| value.nil?}
-          data = connection.create_server(name, flavor_id, image_id, options)
+          data = service.create_server(name, flavor_id, image_id, options)
           merge_attributes(data.body['server'])
           true
         end