blobstore_client 1.3074.0 → 1.3087.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e81ed6ef23a58d667060e642a3ee6cf36392022
-  data.tar.gz: b72e96af0cda8734b70184b8b8c44c8e43c96cb1
+  metadata.gz: 0fcb07304adf704782f6efa56e7268053a5ce47a
+  data.tar.gz: 9a78ffba97f3dc9cd8ca74cbc65f4252fec10688
 SHA512:
-  metadata.gz: ad0f86d6ae014b66bd81a27066ffee36827fc9270f71d1ec0a8bff497a50609a47e7eca20aaa74b5adc6417c919962bcdde4867c0370738a6386f593d460d3e5
-  data.tar.gz: a3799c9540cf7d5f82856cefcf161a30f2b950bec8014b64337d54072b2066595d85b952da020ffbdd535bd8026effb642d00a5f34863ce73ce7475c2c38ef06
+  metadata.gz: aae542432589f24035b318c91550ddbcf407e988ec5682926937a2b5227bf13b057970555b3d414bc884ab411dcb1c258f69279cc408663c4158fde90b6758d2
+  data.tar.gz: 5f3c190e571ad2dc0c00a5ff6c148fb99cd6aebbb6ed861c0c0b73916480df6db4d0b17300d1038a90f656a561c39ce53ea03bf6ec3cbcda4d953d9afa77c31d

data/README.md

@@ -19,7 +19,7 @@ $ blobstore_client_console -p local -c config/local.yml.example
 => Welcome to BOSH blobstore client console
 You can use 'bsc' to access blobstore client methods
 > bsc.create("this is a test blob")
-=> "ef00746b-21ec-4473-a888-bf257cb7ea21" 
+=> "ef00746b-21ec-4473-a888-bf257cb7ea21"
 > bsc.get("ef00746b-21ec-4473-a888-bf257cb7ea21")
 => "this is a test blob"
 > bsc.exists?("ef00746b-21ec-4473-a888-bf257cb7ea21")
@@ -62,9 +62,11 @@ These are the options for the Blobstore client when provider is `s3`:
   Name of the S3 bucket
 * `encryption_key` (optional)
   Encryption_key that is applied before the object is sent to S3
-* `access_key_id` (optional, if not present, the blobstore client operates in read only mode)
+* `credentials_source` (optional)
+  Where to get AWS credentials. This can be set to `static` for to use an `access_key_id` and `secret_access_key` or `env_or_profile` to get the credentials from environment variables or an EC2 instance profile. Defaults to `static` if not set.
+* `access_key_id` (optional, if not present and `credentials_source` is `static`, the blobstore client operates in read only mode)
   S3 Access Key
-* `secret_access_key` (optional, if not present, the blobstore client operates in read only mode)
+* `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

data/lib/blobstore_client/s3_blobstore_client.rb

@@ -29,8 +29,6 @@ module Bosh
         @encryption_key = @options[:encryption_key]
 
         aws_options = {
-          access_key_id: @options[:access_key_id],
-          secret_access_key: @options[:secret_access_key],
           use_ssl: @options.fetch(:use_ssl, true),
           s3_port: @options.fetch(:port, 443),
           s3_endpoint: @options.fetch(:host, URI.parse(S3BlobstoreClient::ENDPOINT).host),
@@ -39,6 +37,8 @@ module Bosh
           s3_multipart_threshold: @options.fetch(:s3_multipart_threshold, 16_777_216),
         }
 
+        aws_options.merge!(aws_credentials)
+
         # using S3 without credentials is a special case:
         # it is really the simple blobstore client with a bucket name
         if read_only?
@@ -165,12 +165,36 @@ module Bosh
       end
 
       def read_only?
-        @options[:access_key_id].nil? && @options[:secret_access_key].nil?
+        (@options[:credentials_source] == 'static' ||
+        @options[:credentials_source].nil?) &&
+        @options[:access_key_id].nil? &&
+        @options[:secret_access_key].nil?
       end
 
       def full_oid_path(object_id)
          @options[:folder] ?  @options[:folder] + '/' + object_id : object_id
       end
+
+      def aws_credentials
+        creds = {}
+        # credentials_source could be static (default) or env_or_profile
+        # static credentials must be included in aws_properties
+        # env_or_profile credentials will use the AWS DefaultCredentialsProvider
+        # to find AWS credentials in environment variables or EC2 instance profiles
+        case @options.fetch(:credentials_source, 'static')
+          when 'static'
+            creds[:access_key_id]     = @options[:access_key_id]
+            creds[:secret_access_key] = @options[:secret_access_key]
+
+          when 'env_or_profile'
+            if !@options[:access_key_id].nil? || !@options[:secret_access_key].nil?
+              raise BlobstoreError, "can't use access_key_id or secret_access_key with env_or_profile credentials_source"
+            end
+          else
+            raise BlobstoreError, 'invalid credentials_source'
+        end
+        return creds
+      end
     end
   end
 end

data/lib/blobstore_client/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Blobstore
     class Client
-      VERSION = '1.3074.0'
+      VERSION = '1.3087.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blobstore_client
 version: !ruby/object:Gem::Version
-  version: 1.3074.0
+  version: 1.3087.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-19 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3074.0
+        version: 1.3087.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3074.0
+        version: 1.3087.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement