hiera-aws 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56537b23031d0700addcb408d1d47fd3a1eecd2e
-  data.tar.gz: e672330d9bf693caa50207dab7e0ce371a8d70db
+  metadata.gz: af1b523a8c88063aabda1368e252f3fe783b4d28
+  data.tar.gz: 0fff368a79278ffec786e2cae6364ca1748851c5
 SHA512:
-  metadata.gz: 1121e5a75df9263b4654cd2ba82da332d078550bfb538b7819e588d5615cb19f85e9043bf7a84b2450d922000bfb1e4d958602e0dd1c94924ab74ad6b422b254
-  data.tar.gz: 4b6b9056a6173ab307fd55470a92793bd501b5f9c6b0ad70e87230093432fec1ec2c65cfcbd01ad386455e855bdca1d62c5d108ce0d73d9bd240f38f79d8e1ee
+  metadata.gz: 02c25dab91f3a9fb0bc7b185ec1d52ac736d51ca64f96cbc4831c35117515e9d91f3926cdaad105a5822067e329f9d4ebfbcb5d3672b9e5de4c6f067abbabfdd
+  data.tar.gz: db6cf28569c75f75305dae9e78d344f0119e53f6c769be4cfbf165a8d39e6a7128d570e104a890bbe1609a43c12c9015b09070fc4c6a99f39474cef44e805e37

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

@@ -11,17 +11,17 @@ class Hiera
           @scope = scope
         end
 
+        attr_reader :scope
+
         def aws_region
-          @scope["location"] || "eu-west-1"
+          puppet_fact("location") || "eu-west-1"
         end
 
         def aws_account_number
-          @scope["aws_account_number"] ||
+          puppet_fact("aws_account_number") ||
             AWS::IAM.new.users.first.arn.split(":")[4]
         end
 
-        attr_reader :scope
-
         def lookup(key, scope)
           @scope = scope
           if respond_to? key
@@ -31,6 +31,12 @@ class Hiera
             nil
           end
         end
+
+        def puppet_fact(name)
+          fact = scope[name]
+          return nil if fact == :undefined
+          fact
+        end
       end
     end
   end

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

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

data/spec/aws_base_spec.rb

@@ -52,6 +52,23 @@ class Hiera
           expect(service.aws_account_number).to eq "12345678"
         end
       end
+
+      describe "#puppet_fact" do
+        it "returns value of Puppet fact if fact exists" do
+          service = Aws::Base.new "some-fact" => "some-value"
+          expect(service.puppet_fact "some-fact").to eq "some-value"
+        end
+
+        it "returns nil if Puppet fact is nil" do
+          service = Aws::Base.new
+          expect(service.puppet_fact "some-fact").to eq nil
+        end
+
+        it "returns nil if Puppet fact is undefined" do
+          service = Aws::Base.new "some-fact" => :undefined
+          expect(service.puppet_fact "some-fact").to eq nil
+        end
+      end
     end
   end
 end

metadata

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