blobstore_client 1.3048.0 → 1.3050.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51cbb788813064f3b51420f8922a143a92e623f5
-  data.tar.gz: cb9314111ce4d1559afe28856b8716f3b680631f
+  metadata.gz: c3b859784c32099e961274f50076eb4c01c0ca85
+  data.tar.gz: 4cc43968e3f02a04c377f1cb6270c6b8a91f2fbb
 SHA512:
-  metadata.gz: aa206950a92b2a50d4125d3ecccf1a09a9007e69222a4ee40126939a7ae77e0c72bfcfe1134e7832f07ef810d5f78ed8f794e6f4ed0147dd96a844ef3b3e6e54
-  data.tar.gz: 3efa325282275fa1b7ff2fd318811047644d8223c354bfb4b9d009da8c27e26b0a7c1d6a1faf98dbe7b2a1d96eaffa7351043553b520234f4b314bdd623c4219
+  metadata.gz: 2fac64d967832388dd5a15a4bd7fa633fb9f7d2f7afc5170a43c710e03b5cabe6a77221fb0d5cdf1cb0fcd80d7cb593b2928eccbab75c25c8f032fc795feb03a
+  data.tar.gz: ac7e9e942ccc3e1ff6743f1e96496867ca4712688f4a11129bd502568dd144eb3225b1b51e72abae5a139f1189bb11738d108504e6a289f2a70a575f71490c85

data/README.md

@@ -67,17 +67,6 @@ These are the options for the Blobstore client when provider is `s3`:
 * `secret_access_key` (optional, if not present, the blobstore client operates in read only mode)
   S3 Secret Access Key
 
-### Atmos
-
-These are the options for the Blobstore client when provider is `atmos`:
-
-* `url` (required)
-  Atmos URL
-* `uid` (required)
-  Atmos UID
-* `secret` (required)
-  Atmos password
-
 ### OpenStack Swift provider
 
 These are the options for the Blobstore client when provider is `swift`:
@@ -112,6 +101,8 @@ These are the options for the Blobstore client when `swift_provider` is `opensta
   OpenStack API key
 * `openstack_tenant` (required)
   OpenStack tenant name
+* `openstack_domain` (optional)
+  OpenStack domain
 * `openstack_region` (optional)
   OpenStack region
 
@@ -124,4 +115,4 @@ These are the options for the Blobstore client when `swift_provider` is `rackspa
 * `rackspace_api_key` (required)
   Rackspace Cloud Files API Key
 * `rackspace_region` (optional)
-  Rackspace Cloud Files Region (`dfw` or `ord`)
+  Rackspace Cloud Files Region (`dfw` or `ord`)

data/lib/blobstore_client.rb

@@ -10,6 +10,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(:AtmosBlobstoreClient, 'blobstore_client/atmos_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 atmos local]
+      PROVIDER_NAMES = %w[dav simple s3 swift 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.3048.0'
+      VERSION = '1.3050.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blobstore_client
 version: !ruby/object:Gem::Version
-  version: 1.3048.0
+  version: 1.3050.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.27.0
+        version: 1.31.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.27.0
+        version: 1.31.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -80,34 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: ruby-atmos-pure
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3050.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +166,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH blobstore client
-  e2c11a
+  b92cdc
 email: support@cloudfoundry.com
 executables:
 - blobstore_client_console
@@ -191,7 +177,6 @@ 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

data/lib/blobstore_client/atmos_blobstore_client.rb

@@ -1,115 +0,0 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-require 'atmos'
-require 'uri'
-require 'multi_json'
-require 'httpclient'
-
-module Bosh
-  module Blobstore
-    class AtmosBlobstoreClient < BaseClient
-      SHARE_URL_EXP = '1893484800' # expires on 2030 Jan-1
-
-      def initialize(options)
-        super(options)
-        @atmos_options = {
-          url: @options[:url],
-          uid: @options[:uid],
-          secret: @options[:secret]
-        }
-        @tag = @options[:tag]
-
-        if @options[:unsupported]
-          @atmos_options[:unsupported] = @options[:unsupported]
-        end
-
-        # Add proxy if ENV has the variable
-        proxy = case URI.parse(@atmos_options[:url] || '').scheme
-                  when 'https'
-                    ENV['HTTPS_PROXY'] || ENV['https_proxy']
-                  when 'http'
-                    ENV['HTTP_PROXY'] || ENV['http_proxy']
-                  else
-                    nil
-                end
-        if proxy
-          @atmos_options[:proxy] = proxy
-          @http_client = HTTPClient.new(proxy: proxy)
-        end
-        @http_client ||= HTTPClient.new
-        @http_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-
-      def atmos_server
-        raise 'Atmos password is missing (read-only mode)' unless @atmos_options[:secret]
-
-        @atmos ||= Atmos::Store.new(@atmos_options)
-      end
-
-      protected
-
-      def create_file(id, file)
-        raise BlobstoreError, 'Atmos does not support supplying the object id' if id
-        obj_conf = { data: file, length: File.size(file.path) }
-        obj_conf[:listable_metadata] = { @tag => true } if @tag
-        object_id = atmos_server.create(obj_conf).aoid
-        encode_object_id(object_id)
-      end
-
-      def get_file(object_id, file)
-        object_info = decode_object_id(object_id)
-        oid = object_info['oid']
-        sig = object_info['sig']
-
-        url = @atmos_options[:url] + "/rest/objects/#{oid}?uid=" +
-          URI.escape(@atmos_options[:uid]) +
-          "&expires=#{SHARE_URL_EXP}&signature=#{URI.escape(sig)}"
-
-        response = @http_client.get(url) do |block|
-          file.write(block)
-        end
-
-        if response.status != 200
-          raise BlobstoreError, sprintf('Could not fetch object, %s/%s', [response.status, response.content])
-        end
-      end
-
-      def delete_object(object_id)
-        object_info = decode_object_id(object_id)
-        oid = object_info['oid']
-        atmos_server.get(id: oid).delete
-      rescue Atmos::Exceptions::NoSuchObjectException
-        raise NotFound, "Atmos object '#{object_id}' not found"
-      end
-
-      def object_exists?(object_id)
-        atmos_server.get(id: object_id).exists?
-      end
-
-      private
-
-      def decode_object_id(object_id)
-        begin
-          object_info = MultiJson.decode(Base64.decode64(URI.unescape(object_id)))
-        rescue MultiJson::DecodeError
-          raise BlobstoreError, 'Failed to parse object_id. Please try updating the release'
-        end
-
-        if !object_info.kind_of?(Hash) || object_info['oid'].nil? ||
-          object_info['sig'].nil?
-          raise BlobstoreError, "Invalid object_id (#{object_id})"
-        end
-        object_info
-      end
-
-      def encode_object_id(object_id)
-        hash_string = "GET\n/rest/objects/#{object_id}\n#{@atmos_options[:uid]}\n#{SHARE_URL_EXP}"
-        secret = Base64.decode64(@atmos_options[:secret])
-        sig = HMAC::SHA1.digest(secret, hash_string)
-        signature = Base64.encode64(sig.to_s).chomp
-        json = MultiJson.encode({ oid: object_id, sig: signature })
-        URI.escape(Base64.encode64(json))
-      end
-    end
-  end
-end