hiera-aws 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af1b523a8c88063aabda1368e252f3fe783b4d28
-  data.tar.gz: 0fff368a79278ffec786e2cae6364ca1748851c5
+  metadata.gz: 1562b0fa2d2ba741b2f5b12baff4e13567d72849
+  data.tar.gz: f00a5df6b7c0d3c58ff7f9faff00c2e09aaeab49
 SHA512:
-  metadata.gz: 02c25dab91f3a9fb0bc7b185ec1d52ac736d51ca64f96cbc4831c35117515e9d91f3926cdaad105a5822067e329f9d4ebfbcb5d3672b9e5de4c6f067abbabfdd
-  data.tar.gz: db6cf28569c75f75305dae9e78d344f0119e53f6c769be4cfbf165a8d39e6a7128d570e104a890bbe1609a43c12c9015b09070fc4c6a99f39474cef44e805e37
+  metadata.gz: 048087837fc6f406e5e8e3a70b1b1685114fdfbe80a79fb367437d31c55fe52f8476badd34e3d0e175886b313134f0689985438a43a1fb768359ad1a08cb27e9
+  data.tar.gz: 2af386fad0a859c8b7d133a9a2a4c12bea04c7c38c5c4402243ecdfdeb63cb4db65713e703135da99f257db728172d36f26b77c845b1206ca55fff6b0085f9f1

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

@@ -1,7 +1,7 @@
 class Hiera
   module Backend
     module Aws # rubocop:disable Documentation
-      VERSION = "0.0.7"
+      VERSION = "0.0.8"
     end
   end
 end

data/lib/hiera/backend/aws_backend.rb

@@ -18,6 +18,28 @@ class Hiera
         Hiera.debug("AWS backend initialized")
       end
 
+      def lookup(key, scope, order_override, resolution_type)
+        answer = nil
+
+        Hiera.debug("Looking up #{key} in AWS backend")
+
+        Backend.datasources(scope, order_override) do |source|
+          Hiera.debug("Looking for data source #{source}")
+
+          service_class = find_service_class(source)
+          next unless service_class
+
+          value = service_class.lookup(key, scope)
+          next if value.nil? || value.empty?
+
+          answer = Backend.parse_answer(value, scope)
+          break if answer
+        end
+        answer
+      end
+
+      private
+
       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")
@@ -31,30 +53,18 @@ class Hiera
         end
       end
 
-      def lookup(key, scope, order_override, resolution_type) # rubocop:disable CyclomaticComplexity
-        Backend.datasources(scope, order_override) do |elem|
-          elements = elem.split "/"
-          next unless elements[0] == "aws"
-
-          service = elements[1]
-
-          service_class = case service
-                          when "elasticache"
-                            Hiera::Backend::Aws::ElastiCache.new
-                          when "rds"
-                            Hiera::Backend::Aws::RDS.new
-                          end
-          next if service_class.nil?
+      def find_service_class(source)
+        elements = source.split "/"
+        return nil unless elements[0] == "aws"
 
-          value = service_class.lookup(key, scope)
-          next if value.nil?
-
-          # this only supports resolution_type => :priority at the moment.
-          # TODO: implement :array and :hash merging
-          value = Backend.parse_answer(value, scope)
-          return value unless value.nil?
+        case elements[1]
+        when "elasticache"
+          Hiera::Backend::Aws::ElastiCache.new
+        when "rds"
+          Hiera::Backend::Aws::RDS.new
+        else
+          nil
         end
-        nil
       end
     end
   end

data/spec/aws_backend_spec.rb

@@ -57,6 +57,14 @@ class Hiera
           expect_any_instance_of(Aws::RDS).to receive(:lookup).with(key, scope)
           backend.lookup(*params)
         end
+
+        it "returns nil if service returns empty result" do
+          empty_result = []
+          Backend.stub(:datasources).and_yield "aws/rds"
+          Backend.stub(:parse_answer).and_return(empty_result)
+          Aws::RDS.stub(:new).and_return(double(:lookup => empty_result))
+          expect(backend.lookup(*params)).to be_nil
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera-aws
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Mathias Lafeldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk