awsecrets 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c29dad4f0bd8650501761e00a49f27dbd12fe6fc
-  data.tar.gz: 103c6541fbb299a1797568244453116dd74e665f
+  metadata.gz: a8c263296a3ce4e2f9fb5a69662b5ddc3a3b741f
+  data.tar.gz: 75c2f9275a2c2cf08b4ba70a91515edef7d74912
 SHA512:
-  metadata.gz: 1ea8c0062f11c4a21b29a9079c0c196ed3d7b3292bc4322c1f18be772e87fdf4ec5d9f7e1f49b29a202385ce77cacc268ad174e5df6df0e575242245e53444ae
-  data.tar.gz: 6653379bc0220dc0d61485b68a786c1f4ff5e8f2a109c87ddf3127fec25caea5f90cfce070c80f19db1c3c8d223ff55f0c98ea2fce9aa87a94aa48d0383f6343
+  metadata.gz: d9cbebe3ea145b2835b20cdda2a4326f602e1b8dee814538fbecf9d5bbd5b2145b384ee0e177a2f04aa278e47224a9bdc63e31891081c086dc72c20370c8655d
+  data.tar.gz: e68e024855b51cd54d33dc94660ab148019695bb724cd4dd797e96b2cae6c1c58630dad036158ee54f8aaa06dba52ba59447ad57d64c73b9cde239adf4199a47

data/.rubocop.yml

@@ -1,3 +1,6 @@
+AllCops:
+  TargetRubyVersion: 2.1
+
 Lint/Eval:
   Enabled: false
 
@@ -25,6 +28,12 @@ Metrics/MethodLength:
 Metrics/PerceivedComplexity:
   Max: 15
 
+Performance/StringReplacement:
+  Enabled: false
+
+Style/Alias:
+  Enabled: false
+
 Style/BarePercentLiterals:
   Enabled: false
 
@@ -34,6 +43,12 @@ Style/ClassAndModuleChildren:
 Style/Documentation:
   Enabled: false
 
+Style/MutableConstant:
+  Enabled: false
+
+Style/MultilineOperationIndentation:
+  Enabled: false
+
 Style/StabbyLambdaParentheses:
   Enabled: false
 

data/README.md

@@ -1,7 +1,17 @@
-# awsecrets
+# awsecrets [![Gem](https://img.shields.io/gem/v/awsecrets.svg)](https://rubygems.org/gems/awsecrets) [![Travis](https://img.shields.io/travis/k1LoW/awsecrets.svg)](https://travis-ci.org/k1LoW/awsecrets)
 
 AWS credentials loader
 
+## awsecrets config precedence
+
+1. Command Line Options
+2. Environment Variables
+3. YAML file (secrets.yml)
+4. The AWS credentials file
+5. The CLI configuration file
+
+(See http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html#config-settings-and-precedence)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/awsecrets/version.rb

@@ -1,3 +1,3 @@
 module Awsecrets
-  VERSION = '0.2.0'
+  VERSION = '1.0.0'
 end

data/lib/awsecrets.rb

@@ -4,26 +4,69 @@ require 'aws_config'
 require 'yaml'
 
 module Awsecrets
-  def self.load(profile: nil, secrets_path: 'secrets.yml')
-    profile = ENV['AWS_PROFILE'] if profile.nil?
-    if profile
-      # SharedCredentials
-      aws_config = AWSConfig.profiles[profile]
-      aws_config = AWSConfig.profiles['default'] unless aws_config
-      Aws.config[:region] = aws_config.config_hash[:region] if aws_config
-      Aws.config[:credentials] = Aws::SharedCredentials.new(profile_name: profile)
-    else
-      # secrets.yml
-      creds = YAML.load_file(secrets_path) if File.exist?(secrets_path)
-      return if creds.nil?
-      Aws.config.update({
-                          region: creds['region']
-                        }) if creds.include?('region')
-      Aws.config.update({
-                          credentials: Aws::Credentials.new(
-                            creds['aws_access_key_id'],
-                            creds['aws_secret_access_key'])
-                        }) if creds.include?('aws_access_key_id') && creds.include?('aws_secret_access_key')
+  def self.load(profile: nil, region: nil, secrets_path: 'secrets.yml')
+    @profile = profile
+    @secrets_path = secrets_path
+    @region = region
+    @credentials = nil
+
+    # 1. Command Line Options
+    load_command
+    # 2. Environment Variables
+    load_env
+    # 3. YAML file (secrets.yml)
+    load_yaml
+    # 4. The AWS credentials file
+    load_creds
+    # 5. The CLI configuration file
+    load_config
+
+    Aws.config[:region] = @region
+    Aws.config[:credentials] = @credentials
+  end
+
+  def self.load_command
+    return unless @profile
+    aws_config = AWSConfig.profiles[@profile]
+    @region = aws_config.config_hash[:region] if aws_config
+    @credentials = Aws::SharedCredentials.new(profile_name: @profile)
+  end
+
+  def self.load_env
+    @region = ENV['AWS_REGION'] unless @region
+    @region = ENV['AWS_DEFAULT_REGION'] unless @region
+    if @credentials.nil? && ENV['AWS_PROFILE']
+      @credentials = Aws::SharedCredentials.new(profile_name: ENV['AWS_PROFILE'])
+      @profile = ENV['AWS_PROFILE']
     end
+    if @credentials.nil? && ENV['AWS_ACCESS_KEY_ID'] && ENV['AWS_SECRET_ACCESS_KEY']
+      @credentials = @credentials = Aws::Credentials.new(
+        ENV['AWS_ACCESS_KEY_ID'],
+        ENV['AWS_SECRET_ACCESS_KEY'])
+    end
+  end
+
+  def self.load_yaml
+    creds = YAML.load_file(@secrets_path) if File.exist?(@secrets_path)
+    if @region.nil? && creds
+      @region = creds['region'] if creds.include?('region')
+    end
+    if @credentials.nil? && creds && creds.include?('aws_access_key_id') && creds.include?('aws_secret_access_key')
+      @credentials = Aws::Credentials.new(
+        creds['aws_access_key_id'],
+        creds['aws_secret_access_key'])
+    end
+  end
+
+  def self.load_creds
+    return unless @credentials.nil?
+    @credentials = Aws::SharedCredentials.new(profile_name: nil)
+  end
+
+  def self.load_config
+    return unless @region.nil?
+    aws_config = AWSConfig.profiles[@profile]
+    aws_config = AWSConfig.profiles['default'] unless aws_config
+    @region = aws_config.config_hash[:region] if aws_config
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awsecrets
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: AWS credentials loader