blobstore_client 0.5.0 → 1.5.0.pre.1113

data/lib/blobstore_client/swift_blobstore_client.rb

@@ -1,17 +1,17 @@
 # Copyright (c) 2009-2012 VMware, Inc.
 
-require "base64"
-require "fog"
-require "multi_json"
-require "uri"
-require "uuidtools"
+require 'base64'
+require 'fog'
+require 'multi_json'
+require 'uri'
+require 'httpclient'
 
 module Bosh
   module Blobstore
 
     class SwiftBlobstoreClient < BaseClient
 
-      # Blobstore client for Swift
+      # Blobstore client for OpenStack Swift
       # @param [Hash] options Swift BlobStore options
       # @option options [Symbol] container_name
       # @option options [Symbol] swift_provider
@@ -26,130 +26,121 @@ module Bosh
         validate_options(@options)
 
         swift_provider = @options[:swift_provider]
-        swift_options = {:provider => swift_provider}
+        swift_options = { provider: swift_provider }
         swift_options.merge!(@options[swift_provider.to_sym])
+
+        if swift_options.has_key?(:openstack_auth_url)
+          unless swift_options[:openstack_auth_url].match(/\/tokens$/)
+            swift_options[:openstack_auth_url] = swift_options[:openstack_auth_url] + '/tokens'
+          end
+        end
+
         swift = Fog::Storage.new(swift_options)
 
         container_name = @options[:container_name]
         @container = swift.directories.get(container_name)
-        if @container.nil?
-          raise NotFound, "Swift container '#{container_name}' not found"
-        end
+        raise NotFound, "Swift container '#{container_name}' not found" if @container.nil?
+
         @container
       end
 
-      def create_file(file)
-        object_id = generate_object_id
-        object = container.files.create(:key => object_id,
-                                        :body => file,
-                                        :public => true)
-        encode_object_id(object_id, object.public_url)
+      protected
+
+      def create_file(object_id, file)
+        object_id ||= generate_object_id
+        object = container.files.create(key: object_id, body: file)
+        begin
+          public_url = object.public_url
+        rescue NotImplementedError
+          public_url = nil
+        end
+        encode_object_id(object_id, public_url)
       rescue Exception => e
         raise BlobstoreError, "Failed to create object: #{e.message}"
       end
 
       def get_file(object_id, file)
         object_info = decode_object_id(object_id)
-        if object_info["purl"]
-          response = @http_client.get(object_info["purl"]) do |block|
+        if object_info['purl']
+          response = @http_client.get(object_info['purl']) do |block|
             file.write(block)
           end
           if response.status != 200
-            raise BlobstoreError, "Could not fetch object, %s/%s" %
-                  [response.status, response.content]
+            raise BlobstoreError, "Could not fetch object, #{response.status} #{response.content}"
           end
         else
-          object = container.files.get(object_info["oid"]) do |block|
+          object = container.files.get(object_info['oid']) do |block|
             file.write(block)
           end
-          if object.nil?
-            raise NotFound, "Swift object '#{object_id}' not found"
-          end
+          raise NotFound, "Swift object '#{object_info['oid']}' not found" if object.nil?
         end
       rescue Exception => e
-        raise BlobstoreError,
-              "Failed to find object '#{object_id}': #{e.message}"
+        raise BlobstoreError, "Failed to find object '#{object_id}': #{e.message}"
       end
 
-      def delete(object_id)
+      def delete_object(object_id)
         object_info = decode_object_id(object_id)
-        object = container.files.get(object_info["oid"])
-        if object.nil?
-          raise NotFound, "Swift object '#{object_id}' not found"
-        else
-          object.destroy
-        end
+        object = container.files.get(object_info['oid'])
+
+        raise NotFound, "Swift object '#{object_id}' not found" if object.nil?
+
+        object.destroy
       rescue Exception => e
-        raise BlobstoreError,
-              "Failed to delete object '#{object_id}': #{e.message}"
+        raise BlobstoreError, "Failed to delete object '#{object_id}': #{e.message}"
       end
 
-      private
-
-      def generate_object_id
-        UUIDTools::UUID.random_create.to_s
+      def object_exists?(object_id)
+        object_info = decode_object_id(object_id)
+        object = container.files.head(object_info['oid'])
+        object.nil? ? false : true
+      rescue Exception => e
+        raise BlobstoreError, "Failed to find object '#{object_id}': #{e.message}"
       end
 
+      private
+
       def encode_object_id(object_id, public_url = nil)
-        json = MultiJson.encode({:oid => object_id, :purl => public_url})
-        URI::escape(Base64.encode64(json))
+        json = MultiJson.encode({ oid: object_id, purl: public_url })
+        URI.escape(Base64.encode64(json))
       end
 
       def decode_object_id(object_id)
         begin
-          object_info = MultiJson.decode(Base64.decode64(URI::unescape(object_id)))
-        rescue MultiJson::DecodeError => e
-          raise BlobstoreError, "Failed to parse object_id: #{e.message}"
+          object_info = MultiJson.decode(Base64.decode64(URI.unescape(object_id)))
+        rescue MultiJson::DecodeError
+          object_info = {}
+          object_info['oid'] = object_id
         end
 
-        if !object_info.kind_of?(Hash) || object_info["oid"].nil?
-          raise BlobstoreError, "Invalid object_id: #{object_info.inspect}"
-        end
+        raise BlobstoreError, "Invalid object_id: #{object_info.inspect}" if !object_info.kind_of?(Hash) || object_info['oid'].nil?
+
         object_info
       end
 
       def validate_options(options)
-        unless options.is_a?(Hash)
-          raise "Invalid options format, Hash expected, #{options.class} given"
-        end
-        unless options.has_key?(:container_name)
-          raise "Swift container name is missing"
-        end
-        unless options.has_key?(:swift_provider)
-          raise "Swift provider is missing"
-        end
+        raise "Invalid options format, Hash expected, #{options.class} given" unless options.is_a?(Hash)
+        raise 'Swift container name is missing' unless options.has_key?(:container_name)
+        raise 'Swift provider is missing' unless options.has_key?(:swift_provider)
         case options[:swift_provider]
-          when "hp"
-            unless options.has_key?(:hp)
-              raise "HP options are missing"
-            end
-            unless options[:hp].is_a?(Hash)
-              raise "Invalid HP options, Hash expected,
-                    #{options[:hp].class} given"
-            end
-            unless options[:hp].has_key?(:hp_account_id)
-              raise "HP account ID is missing"
-            end
-            unless options[:hp].has_key?(:hp_secret_key)
-              raise "HP secret key is missing"
-            end
-            unless options[:hp].has_key?(:hp_tenant_id)
-              raise "HP tenant ID is missing"
-            end
-          when "rackspace"
-            unless options.has_key?(:rackspace)
-              raise "Rackspace options are missing"
-            end
-            unless options[:rackspace].is_a?(Hash)
-              raise "Invalid Rackspace options, Hash expected,
-                    #{options[:rackspace].class} given"
-            end
-            unless options[:rackspace].has_key?(:rackspace_username)
-              raise "Rackspace username is missing"
-            end
-            unless options[:rackspace].has_key?(:rackspace_api_key)
-              raise "Rackspace API key is missing"
-            end
+          when 'hp'
+            raise 'HP options are missing' unless options.has_key?(:hp)
+            raise "Invalid HP options, Hash expected, #{options[:hp].class} given" unless options[:hp].is_a?(Hash)
+            raise 'HP access key is missing' unless options[:hp].has_key?(:hp_access_key)
+            raise 'HP secret key is missing' unless options[:hp].has_key?(:hp_secret_key)
+            raise 'HP tenant ID is missing' unless options[:hp].has_key?(:hp_tenant_id)
+            raise 'HP availability zone is missing' unless options[:hp].has_key?(:hp_avl_zone)
+          when 'openstack'
+            raise 'OpenStack options are missing' unless options.has_key?(:openstack)
+            raise "Invalid OpenStack options, Hash expected, #{options[:openstack].class} given" unless options[:openstack].is_a?(Hash)
+            raise 'OpenStack authorization URL is missing' unless options[:openstack].has_key?(:openstack_auth_url)
+            raise 'OpenStack user name is missing' unless options[:openstack].has_key?(:openstack_username)
+            raise 'OpenStack API key is missing' unless options[:openstack].has_key?(:openstack_api_key)
+            raise 'OpenStack tenant is missing' unless options[:openstack].has_key?(:openstack_tenant)
+          when 'rackspace'
+            raise 'Rackspace options are missing' unless options.has_key?(:rackspace)
+            raise "Invalid Rackspace options, Hash expected, #{options[:rackspace].class} given" unless options[:rackspace].is_a?(Hash)
+            raise 'Rackspace username is missing' unless options[:rackspace].has_key?(:rackspace_username)
+            raise 'Rackspace API key is missing' unless options[:rackspace].has_key?(:rackspace_api_key)
           else
             raise "Swift provider #{options[:swift_provider]} not supported"
         end

data/lib/blobstore_client/version.rb

@@ -3,7 +3,7 @@
 module Bosh
   module Blobstore
     class Client
-      VERSION = "0.5.0"
+      VERSION = '1.5.0.pre.1113'
     end
   end
 end

metadata

@@ -1,32 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: blobstore_client
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 1.5.0.pre.1113
+  prerelease: 6
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-s3
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 1.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 1.8.5
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,23 +42,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: ruby-atmos-pure
   requirement: !ruby/object:Gem::Requirement
@@ -91,22 +91,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.5
-- !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 1.5.0.pre.1113
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,37 +106,33 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
-description: BOSH blobstore client
-email: support@vmware.com
+        version: 1.5.0.pre.1113
+description: ! 'BOSH blobstore client
+
+  cfd471'
+email: support@cloudfoundry.com
 executables:
 - blobstore_client_console
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/blobstore_client_console
+- config/local.yml.example
 - lib/blobstore_client.rb
 - lib/blobstore_client/atmos_blobstore_client.rb
 - lib/blobstore_client/base.rb
 - lib/blobstore_client/client.rb
+- lib/blobstore_client/dav_blobstore_client.rb
 - lib/blobstore_client/errors.rb
 - lib/blobstore_client/local_client.rb
 - lib/blobstore_client/s3_blobstore_client.rb
 - lib/blobstore_client/simple_blobstore_client.rb
 - lib/blobstore_client/swift_blobstore_client.rb
 - lib/blobstore_client/version.rb
-- README
-- Rakefile
-- spec/assets/file
-- spec/spec_helper.rb
-- spec/unit/atmos_blobstore_client_spec.rb
-- spec/unit/blobstore_client_spec.rb
-- spec/unit/local_client_spec.rb
-- spec/unit/s3_blobstore_client_spec.rb
-- spec/unit/simple_blobstore_client_spec.rb
-- spec/unit/swift_blobstore_client_spec.rb
-homepage: http://www.vmware.com
-licenses: []
+- README.md
+homepage: https://github.com/cloudfoundry/bosh
+licenses:
+- Apache 2.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -162,31 +142,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -2537561053731340493
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -2537561053731340493
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: BOSH blobstore client
-test_files:
-- spec/assets/file
-- spec/spec_helper.rb
-- spec/unit/atmos_blobstore_client_spec.rb
-- spec/unit/blobstore_client_spec.rb
-- spec/unit/local_client_spec.rb
-- spec/unit/s3_blobstore_client_spec.rb
-- spec/unit/simple_blobstore_client_spec.rb
-- spec/unit/swift_blobstore_client_spec.rb
+test_files: []

data/README

@@ -1 +0,0 @@
-Blobstore client for VMware AppCloud Outer Shell.