blobstore_client 1.3112.0 → 1.3115.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f56560dea232eac18a6e79c7fef1cb91c8a0b871
-  data.tar.gz: f8d29948bf0e3110f8ebc1a04b1dc8dd553bc767
+  metadata.gz: 8fe8c7a244450fab928073d12c1e3f3b59f445e7
+  data.tar.gz: 36f62486ca4cdf43bde43e150d76c5e1daa717a4
 SHA512:
-  metadata.gz: 1373503640b61a743d37c0829e509fe3c7520fe588fcd07eb915f5a945adbe30ce90afca3687506e5e18d82ed9fd6acd3ff9565a438057695681a19bc302fc1b
-  data.tar.gz: bfac5a0bc38f4d01a1f5a238c033862c36adbc973e8fc067505dfd0186f71b982f509533d5dd1991a28de91e1ce27b703986351948455ccde91d5cb6884f094e
+  metadata.gz: a45399970f5fe1ee8eb9b50497b884721ae4af99075a21baa6d24c0a75903c6388d858ed7ddfdf88541e092786a9c120879462b658c208cd26b4f159fd35d0bb
+  data.tar.gz: 446510a5724436ef3efdd0bd1c7aee8ff10153c86f8380cef49da2b896362c9585a3aabe3ef346d7cb4c70b2b5fec82366ff6f9311babcb122db9e0c7f1aae95

data/README.md

@@ -68,53 +68,3 @@ These are the options for the Blobstore client when provider is `s3`:
   S3 Access Key
 * `secret_access_key` (optional, if not present and `credentials_source` is `static`, the blobstore client operates in read only mode)
   S3 Secret Access Key
-
-### OpenStack Swift provider
-
-These are the options for the Blobstore client when provider is `swift`:
-
-* `container_name` (required)
-  Name of the container
-* `swift_provider` (required)
-  OpenStack Swift provider (supported: `hp`, `openstack` and `rackspace`)
-
-#### HP Object Storage
-
-These are the options for the Blobstore client when `swift_provider` is `hp`:
-
-* `hp_access_key` (required)
-  HP Object Storage Access Key
-* `hp_secret_key` (required)
-  HP Object Storage Secret Key
-* `hp_tenant_id` (required)
-  HP Object Storage Project ID
-* `hp_avl_zone` (required)
-  HP Object Storage Availability Zone (`region-a.geo-1` or `region-b.geo-1`)
-
-#### OpenStack Object Storage
-
-These are the options for the Blobstore client when `swift_provider` is `openstack`:
-
-* `openstack_auth_url` (required)
-  URL of the OpenStack Identity endpoint to connect to
-* `openstack_username` (required)
-  OpenStack user name
-* `openstack_api_key` (required)
-  OpenStack API key
-* `openstack_tenant` (required)
-  OpenStack tenant name
-* `openstack_domain` (optional)
-  OpenStack domain
-* `openstack_region` (optional)
-  OpenStack region
-
-#### Rackspace Cloud Files
-
-These are the options for the Blobstore client when `swift_provider` is `rackspace`:
-
-* `rackspace_username` (required)
-  Rackspace Cloud Files Username
-* `rackspace_api_key` (required)
-  Rackspace Cloud Files API Key
-* `rackspace_region` (optional)
-  Rackspace Cloud Files Region (`dfw` or `ord`)

data/lib/blobstore_client.rb

@@ -9,6 +9,5 @@ require 'blobstore_client/sha1_verifiable_blobstore_client'
 
 Bosh::Blobstore.autoload(:S3BlobstoreClient, 'blobstore_client/s3_blobstore_client')
 Bosh::Blobstore.autoload(:SimpleBlobstoreClient, 'blobstore_client/simple_blobstore_client')
-Bosh::Blobstore.autoload(:SwiftBlobstoreClient, 'blobstore_client/swift_blobstore_client')
 Bosh::Blobstore.autoload(:LocalClient, 'blobstore_client/local_client')
 Bosh::Blobstore.autoload(:DavBlobstoreClient, 'blobstore_client/dav_blobstore_client')

data/lib/blobstore_client/client.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Blobstore
     class Client
-      PROVIDER_NAMES = %w[dav simple s3 swift local]
+      PROVIDER_NAMES = %w[dav simple s3 local]
 
       def self.create(blobstore_provider, options = {})
         unless PROVIDER_NAMES.include?(blobstore_provider)

data/lib/blobstore_client/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Blobstore
     class Client
-      VERSION = '1.3112.0'
+      VERSION = '1.3115.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blobstore_client
 version: !ruby/object:Gem::Version
-  version: 1.3112.0
+  version: 1.3115.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -24,34 +24,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.60.2
-- !ruby/object:Gem::Dependency
-  name: fog
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.34.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.34.0
-- !ruby/object:Gem::Dependency
-  name: fog-aws
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.6
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3112.0
+        version: 1.3115.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3112.0
+        version: 1.3115.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +157,6 @@ files:
 - lib/blobstore_client/s3_blobstore_client.rb
 - lib/blobstore_client/sha1_verifiable_blobstore_client.rb
 - lib/blobstore_client/simple_blobstore_client.rb
-- lib/blobstore_client/swift_blobstore_client.rb
 - lib/blobstore_client/version.rb
 homepage: https://github.com/cloudfoundry/bosh
 licenses:

data/lib/blobstore_client/swift_blobstore_client.rb

@@ -1,153 +0,0 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-require 'base64'
-require 'fog'
-require 'multi_json'
-require 'uri'
-require 'httpclient'
-
-module Bosh
-  module Blobstore
-
-    class SwiftBlobstoreClient < BaseClient
-
-      # Blobstore client for OpenStack Swift
-      # @param [Hash] options Swift BlobStore options
-      # @option options [Symbol] container_name
-      # @option options [Symbol] swift_provider
-      def initialize(options)
-        super(options)
-        @http_client = HTTPClient.new
-      end
-
-      def container
-        return @container if @container
-
-        validate_options(@options)
-
-        swift_provider = @options[: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)
-        raise NotFound, "Swift container '#{container_name}' not found" if @container.nil?
-
-        @container
-      end
-
-      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|
-            file.write(block)
-          end
-          if response.status != 200
-            raise BlobstoreError, "Could not fetch object, #{response.status} #{response.content}"
-          end
-        else
-          object = container.files.get(object_info['oid']) do |block|
-            file.write(block)
-          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}"
-      end
-
-      def delete_object(object_id)
-        object_info = decode_object_id(object_id)
-        object = container.files.get(object_info['oid'])
-
-        raise NotFound, "Swift object '#{object_id}' not found" if object.nil?
-
-        object.destroy
-      rescue NotFound => e
-        raise e
-      rescue Exception => e
-        raise BlobstoreError, "Failed to delete object '#{object_id}': #{e.message}"
-      end
-
-      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))
-      end
-
-      def decode_object_id(object_id)
-        begin
-          object_info = MultiJson.decode(Base64.decode64(URI.unescape(object_id)))
-        rescue MultiJson::DecodeError
-          object_info = {}
-          object_info['oid'] = object_id
-        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)
-        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'
-            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
-      end
-
-    end
-  end
-end