hiera-aws 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6804168e6c111bd7e5edc20f782abbecb230ac19
-  data.tar.gz: 50a75291e7d1625444d21fa37d67cd3669edac7d
+  metadata.gz: eed5fc6fc7e3723477b66a94f61fb6f9192320dc
+  data.tar.gz: 0c7263e0a1706423950e1b2492d523066cb12293
 SHA512:
-  metadata.gz: 4a0045d0fd95522afd2197e21aeccfdacd5e1cca54013aa7315de2cf214ed41fb8610abeec10d144ce74eb00289f360b78817a9ffe705a73ee564cb575d51d6b
-  data.tar.gz: 724067dda2420c650282104587d56c444ce776e2ffca8b90f1e7e4579fc2bd9fc839057dc773fb5fe6b0e6018a2ff87c1d7e7373a57afb0b3d93c1403288d17b
+  metadata.gz: 31a9141fbe5a274ff9e978446c4a87f57b5353c3ff9c77140ffca86dc1dfd74ffa50d92bc6c70a1a17f17a645e5e5899b5bffed9eafb0f972e74c3daa740958d
+  data.tar.gz: f131c2343c0fb05f3de4c48a8a39b73dcfb91a2e6544a61ac394946636223d2e086549dd713dd937bbf37ac0d094617fd5157db2af98b881a4aae2d0cb46094e

data/README.md

@@ -51,6 +51,14 @@ the backend configuration in `hiera.yml`:
   :secret_access_key: your_aws_secret_access_key_here
 ```
 
+In addition to credentials, you can also specify a particular AWS region that
+will be used for all AWS API operations:
+
+```yaml
+:aws:
+  :region: eu-west-1
+```
+
 ## Hiera Keys
 
 The backend currently supports the following keys that you can pass to the

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

@@ -14,7 +14,7 @@ class Hiera
         attr_reader :scope
 
         def aws_region
-          puppet_fact("location") || "eu-west-1"
+          AWS.config.region
         end
 
         def aws_account_number

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

@@ -6,7 +6,7 @@ class Hiera
       # Implementation of Hiera keys for aws/elasticache
       class ElastiCache < Base
         def cache_nodes_by_cache_cluster_id
-          client = AWS::ElastiCache::Client.new :region => aws_region
+          client = AWS::ElastiCache::Client.new
           cache_cluster_id = scope["cache_cluster_id"]
           raise MissingFactError, "cache_cluster_id not found" unless cache_cluster_id
           options = { :cache_cluster_id => cache_cluster_id, :show_cache_node_info => true }
@@ -18,13 +18,13 @@ class Hiera
         # XXX: Lots of spiked code ahead that MUST be refactored.
         #
         def cfn_stack_name(instance_id)
-          client = AWS::EC2.new :region => aws_region
+          client = AWS::EC2.new
           instances = client.instances[instance_id]
           instances.tags["aws:cloudformation:stack-name"]
         end
 
         def cache_cluster_info(cluster_id)
-          client = AWS::ElastiCache::Client.new :region => aws_region
+          client = AWS::ElastiCache::Client.new
           options = { :cache_cluster_id => cluster_id, :show_cache_node_info => true }
           info = client.describe_cache_clusters(options)
           info.fetch(:cache_clusters).first
@@ -32,7 +32,7 @@ class Hiera
 
         # rubocop:disable MultilineBlockChain
         def cache_clusters_in_cfn_stack(stack_name, cluster_engine = nil)
-          client = AWS::CloudFormation.new :region => aws_region
+          client = AWS::CloudFormation.new
 
           stack = client.stacks[stack_name]
           stack.resources.select do |r|

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

@@ -7,7 +7,7 @@ class Hiera
       class RDS < Base
         def initialize(scope = {})
           super(scope)
-          @client = AWS::RDS::Client.new :region => aws_region
+          @client = AWS::RDS::Client.new
         end
 
         # Override default key lookup to implement custom format. Examples:

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

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

data/lib/hiera/backend/aws_backend.rb

@@ -13,7 +13,7 @@ class Hiera
           require "aws-sdk"
         end
 
-        setup_aws_credentials
+        setup_aws_config
 
         Hiera.debug("AWS backend initialized")
       end
@@ -40,17 +40,28 @@ class Hiera
 
       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")
+      def setup_aws_config
+        return unless Config[:aws]
+
+        aws_config = {}
 
-          AWS.config(
-            :access_key_id     => Config[:aws][:access_key_id],
-            :secret_access_key => Config[:aws][:secret_access_key]
-          )
+        if 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]
+          aws_config[:secret_access_key] = Config[:aws][:secret_access_key]
         else
           Hiera.debug("Using AWS credentials from environment or IAM role")
         end
+
+        region = Config[:aws][:region]
+        if region
+          Hiera.debug("Using AWS region '#{region}' from backend configuration")
+          aws_config[:region] = region
+        else
+          Hiera.debug("Using default AWS region")
+        end
+
+        AWS.config(aws_config)
       end
 
       def find_service_class(source)

data/spec/aws_backend_spec.rb

@@ -8,20 +8,28 @@ class Hiera
       end
 
       describe "#initialize" do
-        it "uses AWS credentials from environment or IAM role by default" do
+        it "does not change AWS configuration 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"
+          aws_config = {
+            :access_key_id     => "some-access-key-id",
+            :secret_access_key => "some-secret-access-key"
           }
+          Config.stub(:[]).with(:aws).and_return(aws_config)
+          expect(AWS).to receive(:config).with(aws_config)
+          Aws_backend.new
+        end
 
-          Config.stub(:[]).with(:aws).and_return(credentials)
-          expect(AWS).to receive(:config).with(credentials)
+        it "uses particular AWS region if provided" do
+          aws_config = {
+            :region => "some-aws-region"
+          }
+          Config.stub(:[]).with(:aws).and_return(aws_config)
+          expect(AWS).to receive(:config).with(aws_config)
           Aws_backend.new
         end
       end

data/spec/aws_base_spec.rb

@@ -25,15 +25,10 @@ class Hiera
       end
 
       describe "#aws_region" do
-        it "defaults to eu-west-1" do
+        it "returns the region set by global AWS config" do
+          AWS.stub(:config).and_return(double(:region => "some-region"))
           service = Aws::Base.new
-          expect(service.aws_region).to eq "eu-west-1"
-        end
-
-        it "can be set via Puppet fact" do
-          scope = { "location" => "some-aws-region" }
-          service = Aws::Base.new scope
-          expect(service.aws_region).to eq "some-aws-region"
+          expect(service.aws_region).to eq "some-region"
         end
       end
 

data/spec/aws_rds_spec.rb

@@ -9,17 +9,17 @@ class Hiera
           :db_instances => [
             {
               :db_instance_identifier => "db1",
-              :endpoint => { :address => "db1.eu-west-1.rds.amazonaws.com" },
+              :endpoint => { :address => "db1.some-region.rds.amazonaws.com" },
               :engine => "mysql"
             },
             {
               :db_instance_identifier => "db2",
-              :endpoint => { :address => "db2.eu-west-1.rds.amazonaws.com" },
+              :endpoint => { :address => "db2.some-region.rds.amazonaws.com" },
               :engine => "mysql"
             },
             {
               :db_instance_identifier => "db3",
-              :endpoint => { :address => "db3.eu-west-1.rds.amazonaws.com" },
+              :endpoint => { :address => "db3.some-region.rds.amazonaws.com" },
               :engine => "mysql"
             }
           ]
@@ -27,18 +27,18 @@ class Hiera
       end
       let(:rds_tags) do
         {
-          "arn:aws:rds:eu-west-1:12345678:db:db1" => {
+          "arn:aws:rds:some-region:12345678:db:db1" => {
             :tag_list => [
               { :key => "environment", :value => "dev" }
             ]
           },
-          "arn:aws:rds:eu-west-1:12345678:db:db2" => {
+          "arn:aws:rds:some-region:12345678:db:db2" => {
             :tag_list => [
               { :key => "environment", :value => "dev" },
               { :key => "role", :value => "mgmt-db" }
             ]
           },
-          "arn:aws:rds:eu-west-1:12345678:db:db3" => {
+          "arn:aws:rds:some-region:12345678:db:db3" => {
             :tag_list => [
               { :key => "environment", :value => "production" },
               { :key => "role", :value => "mgmt-db" }
@@ -48,6 +48,8 @@ class Hiera
       end
 
       before do
+        AWS.stub(:config).and_return(double(:region => "some-region"))
+
         rds_client = double
         AWS::RDS::Client.stub(:new).and_return(rds_client)
         allow(rds_client).to receive(:describe_db_instances).and_return(rds_instances)
@@ -67,17 +69,17 @@ class Hiera
         end
 
         it "returns all database instances if no tags are provided" do
-          expect(rds.lookup("rds", scope)).to eq ["db1.eu-west-1.rds.amazonaws.com",
-                                                  "db2.eu-west-1.rds.amazonaws.com",
-                                                  "db3.eu-west-1.rds.amazonaws.com"]
+          expect(rds.lookup("rds", scope)).to eq ["db1.some-region.rds.amazonaws.com",
+                                                  "db2.some-region.rds.amazonaws.com",
+                                                  "db3.some-region.rds.amazonaws.com"]
         end
 
         it "returns database instances with specific tags" do
-          expect(rds.lookup("rds role=mgmt-db", scope)).to eq ["db2.eu-west-1.rds.amazonaws.com",
-                                                               "db3.eu-west-1.rds.amazonaws.com"]
-          expect(rds.lookup("rds environment=dev", scope)).to eq ["db1.eu-west-1.rds.amazonaws.com",
-                                                                  "db2.eu-west-1.rds.amazonaws.com"]
-          expect(rds.lookup("rds environment=production role=mgmt-db", scope)).to eq ["db3.eu-west-1.rds.amazonaws.com"]
+          expect(rds.lookup("rds role=mgmt-db", scope)).to eq ["db2.some-region.rds.amazonaws.com",
+                                                               "db3.some-region.rds.amazonaws.com"]
+          expect(rds.lookup("rds environment=dev", scope)).to eq ["db1.some-region.rds.amazonaws.com",
+                                                                  "db2.some-region.rds.amazonaws.com"]
+          expect(rds.lookup("rds environment=production role=mgmt-db", scope)).to eq ["db3.some-region.rds.amazonaws.com"]
         end
 
         it "returns empty array if no database instances can be found" do
@@ -96,17 +98,17 @@ class Hiera
           expect(rds.lookup("rds_instances", scope)).to eq [
             {
               "db_instance_identifier" => "db1",
-              "endpoint" => { "address" => "db1.eu-west-1.rds.amazonaws.com" },
+              "endpoint" => { "address" => "db1.some-region.rds.amazonaws.com" },
               "engine" => "mysql"
             },
             {
               "db_instance_identifier" => "db2",
-              "endpoint" => { "address" => "db2.eu-west-1.rds.amazonaws.com" },
+              "endpoint" => { "address" => "db2.some-region.rds.amazonaws.com" },
               "engine" => "mysql"
             },
             {
               "db_instance_identifier" => "db3",
-              "endpoint" => { "address" => "db3.eu-west-1.rds.amazonaws.com" },
+              "endpoint" => { "address" => "db3.some-region.rds.amazonaws.com" },
               "engine" => "mysql"
             }
           ]
@@ -116,12 +118,12 @@ class Hiera
           expect(rds.lookup("rds_instances role=mgmt-db", scope)).to eq [
             {
               "db_instance_identifier" => "db2",
-              "endpoint" => { "address" => "db2.eu-west-1.rds.amazonaws.com" },
+              "endpoint" => { "address" => "db2.some-region.rds.amazonaws.com" },
               "engine" => "mysql"
             },
             {
               "db_instance_identifier" => "db3",
-              "endpoint" => { "address" => "db3.eu-west-1.rds.amazonaws.com" },
+              "endpoint" => { "address" => "db3.some-region.rds.amazonaws.com" },
               "engine" => "mysql"
             }
           ]
@@ -131,12 +133,12 @@ class Hiera
           expect(rds.lookup("rds_instances environment=dev", scope)).to eq [
             {
               "db_instance_identifier" => "db1",
-              "endpoint" => { "address" => "db1.eu-west-1.rds.amazonaws.com" },
+              "endpoint" => { "address" => "db1.some-region.rds.amazonaws.com" },
               "engine" => "mysql"
             },
             {
               "db_instance_identifier" => "db2",
-              "endpoint" => { "address" => "db2.eu-west-1.rds.amazonaws.com" },
+              "endpoint" => { "address" => "db2.some-region.rds.amazonaws.com" },
               "engine" => "mysql"
             }
           ]
@@ -146,7 +148,7 @@ class Hiera
           expect(rds.lookup("rds_instances environment=production role=mgmt-db", scope)).to eq [
             {
               "db_instance_identifier" => "db3",
-              "endpoint" => { "address" => "db3.eu-west-1.rds.amazonaws.com" },
+              "endpoint" => { "address" => "db3.some-region.rds.amazonaws.com" },
               "engine" => "mysql"
             }
           ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mathias Lafeldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk