awsecrets 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de6c38e428ccb8616140af3adfd1f99f5baeb564
-  data.tar.gz: bfcb0d29b0f712037d9478bdbc716aa490c72baf
+  metadata.gz: b54990850e5df4e092d8538d89878f1934c673de
+  data.tar.gz: 7d0daf9490919f0cf0f1934c47208e7f73b78ffd
 SHA512:
-  metadata.gz: 92899ca325671d64bf25c5a202001785e2ffc8c0861dfac0a9b36b90cbc19f601ca941cc1c7c35860dd3918f1bba9f80894247c39d6df40412a2a31a204e0bc3
-  data.tar.gz: cb23938c57854bd83a85108445b7008adb7392f078d57d06ad2d0c86c538327f7360b1aa271d1a1350c605ae319a15fdb0fc2c9d258f2f990ef63893030f86fb
+  metadata.gz: 322296f455e56ac109d36449db677a6ae0d8a5b1ab9d5a4ada5379242d5559a6df063bda85a3b3a156da3e7d18bbe1ed486b248ff226265d303ef96aa5190421
+  data.tar.gz: 7ec6789073641adf4017cc9ce14280aace8d8f1c8b606e96c90b8a134e6e36e9e046be5d9d86b55f21b02c56b329add66de9761e4fa8c35e94324fa34547255a

data/Rakefile

@@ -1,6 +1,8 @@
 require 'bundler/gem_tasks'
 
 begin
+  require 'rspec'
+  require 'rspec/core'
   require 'rspec/core/rake_task'
   require 'octorelease'
   require 'rubocop/rake_task'

data/lib/awsecrets.rb

@@ -2,6 +2,7 @@ require 'awsecrets/version'
 require 'optparse'
 require 'aws-sdk'
 require 'aws_config'
+require 'net/http'
 require 'yaml'
 
 module Awsecrets
@@ -85,7 +86,7 @@ module Awsecrets
   def self.load_config
     @region ||= if AWSConfig[@profile] && AWSConfig[@profile]['region']
                   AWSConfig[@profile]['region']
-                else
+                elsif AWSConfig['default']
                   AWSConfig['default']['region']
                 end
 
@@ -95,6 +96,7 @@ module Awsecrets
   end
 
   def self.set_aws_config
+    @region ||= self.current_region
     Aws.config[:region] = @region
 
     if @role_arn && @source_profile
@@ -116,8 +118,9 @@ module Awsecrets
     end
 
     @credentials ||= Aws::SharedCredentials.new(profile_name: @profile) if @profile
-    @credentials ||= Aws::SharedCredentials.new(profile_name: 'default') unless @access_key_id
-    @credentials ||= Aws::Credentials.new(@access_key_id, @secret_access_key, @session_token)
+    @credentials ||= Aws::SharedCredentials.new(profile_name: 'default') if AWSConfig['default'] && !@access_key_id
+    @credentials ||= Aws::Credentials.new(@access_key_id, @secret_access_key, @session_token) if @access_key_id
+    @credentials ||= Aws::InstanceProfileCredentials.new
 
     Aws.config[:credentials] = @credentials
   end
@@ -125,4 +128,10 @@ module Awsecrets
   def self.generate_session_name
     "awsecrets-session-#{Time.now.to_i}"
   end
+
+  def self.current_region
+    metadata_endpoint = 'http://169.254.169.254/latest/meta-data/'
+    az = Net::HTTP.get(URI.parse(metadata_endpoint + 'placement/availability-zone'))
+    az[0...-1]
+  end
 end

data/lib/awsecrets/version.rb

@@ -1,3 +1,3 @@
 module Awsecrets
-  VERSION = '1.11.0'
+  VERSION = '1.12.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awsecrets
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk