bosh-registry 1.3202.0 → 1.3213.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b81190f21ff2e9c2140eb62f07d56fd1c0650875
-  data.tar.gz: 792a21d8902e0559e96add8c5063596a10e01955
+  metadata.gz: a1c27de62024689057c77295714a40f64f830805
+  data.tar.gz: 73abc057a0d5350d5ae63a60f6c6110955a98817
 SHA512:
-  metadata.gz: 687da0404dc11602cb2c226cfff5f1e8d107ae807db8cd954fd87f16e081ee401166a347d298fe9e6558c3c76a0c33023e60aab074244c42c9c9b955d08a0c41
-  data.tar.gz: 7ef71932a0fd7d18aaf665203c288f84e611a0c96b0a30bd3273fcf936a2d1b07bdb8862055bb05fc499df7a81698dfae9199496c839d658aaeb8fafd693d406
+  metadata.gz: 9d337d567611632a265b25b7813ebfc05ce1a70693d4473f3d0feb80447c8d2ea6291c46451e451627abccddb58049309169bd5f6af656996acafae0c656bf34
+  data.tar.gz: 1bfc2e6616b15f660b99eae5fcadc36f7567964925a872184cb8acb3b238adea8acf70e110658280f7c44c6b98e3faf454a538b74cfedf4691e41ea6124ac92c

data/lib/bosh/registry.rb

@@ -20,6 +20,7 @@ require "bosh/registry/api_controller"
 require "bosh/registry/config"
 require "bosh/registry/errors"
 require "bosh/registry/instance_manager"
+require "bosh/registry/instance_manager/aws_credentials_provider"
 require "bosh/registry/runner"
 require "bosh/registry/version"
 

data/lib/bosh/registry/instance_manager/aws.rb

@@ -1,4 +1,3 @@
-# Copyright (c) 2009-2013 VMware, Inc.
 
 module Bosh::Registry
 
@@ -31,15 +30,18 @@ module Bosh::Registry
         end
 
         # 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
+        # - if "static", credentials must be provided
+        # - if "env_or_profile", credentials are read from instance metadata
+        credentials_source = cloud_config['aws']['credentials_source'] || 'static'
+        static_credentials = {}
 
-        if cloud_config['aws']['credentials_source'] == 'static' || cloud_config['aws']['credentials_source'].nil?
-          @aws_options[:access_key_id] = cloud_config['aws']['access_key_id']
-          @aws_options[:secret_access_key] = cloud_config['aws']['secret_access_key']
+        if credentials_source == 'static'
+          static_credentials[:access_key_id] = cloud_config['aws']['access_key_id']
+          static_credentials[:secret_access_key] = cloud_config['aws']['secret_access_key']
         end
 
+        @aws_options[:credential_provider] = Bosh::Registry::AWSCredentialsProvider.new(static_credentials)
+
         @ec2 = AWS::EC2.new(@aws_options)
       end
 

data/lib/bosh/registry/instance_manager/aws_credentials_provider.rb

@@ -0,0 +1,12 @@
+module Bosh::Registry
+
+  class AWSCredentialsProvider < AWS::Core::CredentialProviders::DefaultProvider
+    DEFAULT_RETRIES = 10
+
+    def initialize(static_credentials = {})
+      @providers = []
+      @providers << AWS::Core::CredentialProviders::StaticProvider.new(static_credentials)
+      @providers << AWS::Core::CredentialProviders::EC2Provider.new(:retries => DEFAULT_RETRIES)
+    end
+  end
+end

data/lib/bosh/registry/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Registry
-    VERSION = '1.3202.0'
+    VERSION = '1.3213.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-registry
 version: !ruby/object:Gem::Version
-  version: 1.3202.0
+  version: 1.3213.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3202.0
+        version: 1.3213.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -225,6 +225,7 @@ files:
 - lib/bosh/registry/errors.rb
 - lib/bosh/registry/instance_manager.rb
 - lib/bosh/registry/instance_manager/aws.rb
+- lib/bosh/registry/instance_manager/aws_credentials_provider.rb
 - lib/bosh/registry/instance_manager/openstack.rb
 - lib/bosh/registry/models.rb
 - lib/bosh/registry/models/registry_instance.rb