hiera-aws 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 2b923a0b4b2d2c761751b5610ea9fe85ebcff5bb
-  data.tar.gz: a7ac165741cc99270a7a131e167ac20d91ab4195
-SHA512:
-  metadata.gz: 1d838c73d8911967510679e404be9059d9e7ea242babc70874706a7f4cfd7f6266279a1d1e8d9e7ab81a1bd613468bdbb1500a8fc3803a5efd2be8d42d33ca42
-  data.tar.gz: 4b6d7bd9a4477afe685d86210cc2fe426ce68d39ba3b6787024eba4ab4daa84751566597146aca16d0260db23b02871e5ec35d9c3fdebecf026c674c3c4ae61d
+--- 
+SHA1: 
+  metadata.gz: c5eb2b414df749ddb9fb5764e9424a8f86256fe0
+  data.tar.gz: dcc498e4413d0bcbba1b1e661078b6da37ed9ac5
+SHA512: 
+  metadata.gz: 5d51b42416cb49e8e27d27e05aca4f86725e7548fe2a783fa3026970f2b69bb7ad0d53edd16ca473cde77ba8e6d4f59455b229c0850612a0180317e06179ba50
+  data.tar.gz: c38d28c309ddef1e90d2267f706b2b14e1d6a490a7a6e5c547ccd180448be131e7172fea1b8980dfd220917f2df4749f237eeba4816dea7b4dbfe3be2af396d3

data/README.md

@@ -33,9 +33,17 @@ service currently supported by this backend.
   - aws/elasticache
 ```
 
-Last but not least, make sure to grant all EC2 instances sufficient privileges
-for Hiera to work, i.e. assign an IAM Role that allows the action
-`elasticache:Describe*`.
+To grant sufficient privileges for Hiera to work, you either have to assign the
+EC2 instances an IAM role that allows the action `elasticache:Describe*`
+(preferred) or provide credentials for a user with the same privileges via the
+backend configuration in `hiera.yml`:
+
+```yaml
+:aws:
+  :access_key_id: your_aws_access_key_id_here
+  :secret_access_key: your_aws_secret_access_key_here
+```
+
 
 ## Hiera Keys
 

data/lib/hiera/backend/aws/version.rb

@@ -1,7 +1,7 @@
 class Hiera
   module Backend
     module Aws
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

data/lib/hiera/backend/aws_backend.rb

@@ -11,9 +11,24 @@ class Hiera
           require "aws-sdk"
         end
 
+        setup_aws_credentials
+
         Hiera.debug("AWS backend initialized")
       end
 
+      def setup_aws_credentials
+        if Config[:aws] && Config[:aws][:access_key_id] && Config[:aws][:secret_access_key]
+          Hiera.debug("Using AWS credentials from backend configuration")
+
+          AWS.config({
+            :access_key_id     => Config[:aws][:access_key_id],
+            :secret_access_key => Config[:aws][:secret_access_key]
+          })
+        else
+          Hiera.debug("Using AWS credentials from environment or IAM role")
+        end
+      end
+
       def lookup(key, scope, order_override, resolution_type)
         Backend.datasources(scope, order_override) do |elem|
           elements = elem.split "/"

data/spec/aws_backend_spec.rb

@@ -3,17 +3,39 @@ require "hiera/backend/aws_backend"
 class Hiera
   module Backend
     describe Aws_backend do
-      let(:backend) { Aws_backend.new }
-
       before do
         Hiera.stub(:debug)
       end
 
+      describe "#initialize" do
+        it "uses AWS credentials from environment or IAM role by default" do
+          Config.stub(:[]).with(:aws)
+          expect(AWS).to_not receive(:config)
+          Aws_backend.new
+        end
+
+        it "uses AWS credentials from backend configuration if provided" do
+          credentials = {
+            :access_key_id     => "some_access_key_id",
+            :secret_access_key => "some_secret_access_key"
+          }
+
+          Config.stub(:[]).with(:aws).and_return(credentials)
+          expect(AWS).to receive(:config).with(credentials)
+          Aws_backend.new
+        end
+      end
+
       describe "#lookup" do
+        let(:backend) { Aws_backend.new }
         let(:key) { "some_key" }
         let(:scope) { { "foo" => "bar" } }
         let(:params) { [key, scope, "", :priority] }
 
+        before do
+          Config.stub(:[]).with(:aws)
+        end
+
         it "returns nil if hierarchy is empty" do
           Backend.stub(:datasources)
           expect(backend.lookup(*params)).to be_nil

metadata

@@ -1,80 +1,63 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: hiera-aws
-version: !ruby/object:Gem::Version
-  version: 0.0.3
+version: !ruby/object:Gem::Version 
+  version: 0.0.4
 platform: ruby
-authors:
+authors: 
 - Mathias Lafeldt
 - Deniz Adrian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-01-30 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: aws-sdk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id002 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
+  type: :development
+  version_requirements: *id005
 description: Hiera AWS Backend
-email:
+email: 
 - mathias.lafeldt@jimdo.com
 - deniz.adrian@jimdo.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -90,30 +73,29 @@ files:
 - spec/aws_base_spec.rb
 - spec/aws_elasticache_spec.rb
 homepage: https://github.com/Jimdo/hiera-aws
-licenses:
+licenses: 
 - Apache 2.0
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Hiera AWS Backend
-test_files:
+test_files: 
 - spec/aws_backend_spec.rb
 - spec/aws_base_spec.rb
 - spec/aws_elasticache_spec.rb