hiera-aws 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 0d55a811a53f3d447fae3edd306dbb20f86bf56f
-  data.tar.gz: 008182bf2ef111104ba2e0ed7c85259ffc64eb06
-SHA512:
-  metadata.gz: fc6a9d1bc8816625f318f1a0a7bbc93eb507eee163ae86c3440eb06534b988a3eab3a7bee97b1dc02357b93e1132116e79d0a5fe0f401b535298f34a2191c67d
-  data.tar.gz: c634ff97a488ba0bfbbfa560b57177550dadff6a94d82e3abefa5f416d5aa8e1a99461136d8b62e386ce11363e3697d82ce7244147133f4a4dc5f081680099da
+--- 
+SHA1: 
+  metadata.gz: df09cbafee105c292fccfa418ce737723bcbdfe2
+  data.tar.gz: c605c9aff9a2743e3f6a81bad3828ba4f98b370a
+SHA512: 
+  metadata.gz: 2f44cb460fc933f9caf7ae5f8e0e5f9370eeba2dd40b1d04e77dad2468707180df49712ee6a66e0046fc79b7d7fbfe7eeaeb4cbcbc65f7802604492fb17adf55
+  data.tar.gz: d2aab23ef2d552d48b0f9b58dcdbf5e2ce88dbb86df42d9ddb78c0fcd8c6cd28585c2a16082a94f1ec97ae35c23b8aa2beccfc9c64d8f62760d9a38827f3727a

data/.rubocop.yml

@@ -3,6 +3,8 @@ AllCops:
     - Gemfile
     - Rakefile
 
+DotPosition:
+  Enabled: false
 Encoding:
   Enabled: false
 HashSyntax:

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 
-rvm: 1.9.3
+rvm:
+  - 1.8.7
+  - 1.9.3
 
 install: bundle install
 

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v0.5.0 (May 15 2014)
+
+* Change `redis_cluster_nodes_for_cfn_stack`, `memcached_cluster_nodes_for_cfn_stack`,
+  and `redis_cluster_replica_groups_for_cfn_stack` to only return resources that
+  are in state "available".
+* Change `redis_cluster_replica_groups_for_cfn_stack` response to include
+  `latest_cache_cluster_create_time`, which is the creation time unix timestamp
+  of the most current cache cluster in each replication group.
+
 ## v0.4.1 (May 12 2014)
 
 * Disable real HTTP connections in RSpec tests by using

data/README.md

@@ -67,7 +67,8 @@ The backend currently supports the following keys that you can pass to the
 ### redis_cluster_nodes_for_cfn_stack
 
 Returns an array of all Redis cluster nodes for the CloudFormation stack of an
-EC2 instance. The instance is identified by the Puppet fact `$ec2_instance_id`.
+EC2 instance. Only cluster nodes that are in state "available" are returned. The
+instance is identified by the Puppet fact `$ec2_instance_id`.
 
 Usage:
 
@@ -86,8 +87,9 @@ For each Redis cluster node in the array the following hash is returned:
 ### redis_cluster_replica_groups_for_cfn_stack
 
 Returns an array of the Redis Replication Groups of all Redis cluster nodes for
-the CloudFormation stack of an EC2 Instance. The instance is identified by the
-Puppet fact `$ec2_instance_id`.
+the CloudFormation stack of an EC2 Instance. Only Replication Groups that are in
+state "available" are returned. The instance is identified by the Puppet fact
+`$ec2_instance_id`.
 
 Usage:
 
@@ -100,15 +102,17 @@ For each replica group in the array the following hash is returned:
 ```json
 {
     "replication_group_id" => "some-group-id",
-    "primary_endpoint"     => { "address" => "some.replication.group.primary.endpoint", "port" => 1234 }
+    "primary_endpoint"     => { "address" => "some.replication.group.primary.endpoint", "port" => 1234 },
+    "latest_cache_cluster_create_time" => 1400155680
 }
 ```
 
 ### memcached_cluster_nodes_for_cfn_stack
 
 Returns an array of all Memcached cluster nodes for the CloudFormation stack of
-an EC2 instance. The instance is identified by the Puppet fact
-`$ec2_instance_id`. The returned array has the format `["host1", "host2"]`.
+an EC2 instance. Only cluster nodes that are in state "available" are returned.
+The instance is identified by the Puppet fact `$ec2_instance_id`. The returned
+array has the format `["host1", "host2"]`.
 
 Usage:
 
@@ -118,8 +122,8 @@ cluster_nodes = hiera("memcached_cluster_nodes_for_cfn_stack")
 
 ### rds_instances tag=value...
 
-Returns an array of all RDS database instances that have one or more tags
-assigned.
+Returns an array of all RDS database instances that are in state "available" and
+have one or more tags assigned.
 
 For each instance in the array the following hash is returned:
 

data/Rakefile

@@ -1,13 +1,19 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require "rubocop/rake_task"
 
-desc "Run RuboCop style and lint checks"
-Rubocop::RakeTask.new(:rubocop)
+# RuboCop only works with newer Ruby versions
+if RUBY_VERSION >= "1.9.2"
+  require "rubocop/rake_task"
+
+  desc "Run RuboCop style and lint checks"
+  Rubocop::RakeTask.new(:rubocop)
+
+  task :test => :rubocop
+end
 
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = "--color --format documentation"
 end
 
-task :test => [:rubocop, :spec]
+task :test => :spec
 task :default => :test

data/hiera-aws.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rubocop", "~> 0.21.0"
+  spec.add_development_dependency "rubocop", "~> 0.21.0" if RUBY_VERSION >= "1.9.2"
   spec.add_development_dependency "webmock"
 end

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

@@ -46,6 +46,8 @@ class Hiera
           end.map do |r|
             cluster_id = r.physical_resource_id
             cache_cluster_info(cluster_id)
+          end.select do |cluster|
+            cluster.fetch(:cache_cluster_status) == "available"
           end.select do |cluster|
             # Filter by engine type if provided
             if cluster_engine
@@ -71,6 +73,7 @@ class Hiera
           raise MissingFactError, "ec2_instance_id not found" unless ec2_instance_id
 
           replica_groups = {}
+          cluster_create_times = {}
           stack_name = cfn_stack_name(ec2_instance_id)
 
           clusters = cache_clusters_in_cfn_stack(stack_name, cluster_engine)
@@ -78,10 +81,18 @@ class Hiera
             replication_group_id = cluster[:replication_group_id]
             next unless replication_group_id
 
+            cache_cluster_create_time = cluster.fetch(:cache_cluster_create_time)
+            if cluster_create_times[replication_group_id].nil? || cluster_create_times[replication_group_id] < cache_cluster_create_time
+              cluster_create_times[replication_group_id] = cache_cluster_create_time
+            end
+
             client = AWS::ElastiCache::Client.new
+
             replication_group = client.describe_replication_groups(:replication_group_id => replication_group_id)[:replication_groups].first
+            next unless replication_group.fetch(:status) == "available"
 
-            primary_endpoint = replication_group.fetch(:node_groups).first.fetch(:primary_endpoint)
+            node_group = replication_group.fetch(:node_groups).first
+            primary_endpoint = node_group.fetch(:primary_endpoint)
 
             replica_groups[replication_group_id] = {
               :primary_endpoint => primary_endpoint
@@ -91,7 +102,8 @@ class Hiera
           replica_groups.map do |k, v|
             {
               "replication_group_id" => k,
-              "primary_endpoint"     => stringify_keys(v[:primary_endpoint])
+              "primary_endpoint"     => stringify_keys(v[:primary_endpoint]),
+              "latest_cache_cluster_create_time" => cluster_create_times[k].strftime("%s"),
             }
           end
         end

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

@@ -33,7 +33,8 @@ class Hiera
         private
 
         def db_instances
-          @db_instances ||= @client.describe_db_instances[:db_instances]
+          @client.describe_db_instances[:db_instances].
+            select { |i| i[:db_instance_status] == "available" }
         end
 
         def db_instances_with_tags(tags)

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

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

data/spec/aws_elasticache_spec.rb

@@ -1,9 +1,14 @@
 require "spec_helper"
 require "hiera/backend/aws/elasticache"
+require "date"
 
 class Hiera
   module Backend # rubocop:disable Documentation
     describe Aws::ElastiCache do
+
+      let(:time_earlier) { Time.new }
+      let(:time_later) { time_earlier + 1 }
+
       let(:ec2_client) do
         double(
           :instances => {
@@ -13,46 +18,175 @@ class Hiera
           }
         )
       end
+
       let(:cfn_client) do
         double(
           :stacks => {
             "some-stack-name" => double(
               :resources => [
+                # these are listed in reverse/random order to proove that
+                # tests don't rely on ordering.
+                double(
+                  :resource_type => "AWS::ElastiCache::CacheCluster",
+                  :physical_resource_id => "another-redis-cluster-id"
+                ),
                 double(
                   :resource_type => "AWS::ElastiCache::CacheCluster",
-                  :physical_resource_id => "some-cluster-id"
-                )
+                  :physical_resource_id => "some-redis-cluster-id"
+                ),
+                double(
+                  :resource_type => "AWS::ElastiCache::CacheCluster",
+                  :physical_resource_id => "another-memcache-cluster-id"
+                ),
+                double(
+                  :resource_type => "AWS::ElastiCache::CacheCluster",
+                  :physical_resource_id => "some-memcache-cluster-id"
+                ),
               ]
             )
           }
         )
       end
+
       let(:elasticache) do
         scope = { "ec2_instance_id" => "some-ec2-instance-id" }
         Aws::ElastiCache.new scope
       end
 
-      let(:some_cache_node) { { :endpoint => { :address => "1.1.1.1", :port => 1234 } } }
-      let(:another_cache_node) { { :endpoint => { :address => "2.2.2.2", :port => 1234 } } }
+      let(:some_cache_node) { { :endpoint => { :address => "1.1.1.1", :port => 1111 } } }
+      let(:another_cache_node) { { :endpoint => { :address => "2.2.2.2", :port => 2222 } } }
+      let(:third_cache_node) { { :endpoint => { :address => "3.3.3.3", :port => 3333 } } }
+      let(:fourth_cache_node) { { :endpoint => { :address => "4.4.4.4", :port => 4444 } } }
 
-      before do
+      let(:some_redis_cache_cluster) do
+        {
+          :cache_nodes          => [some_cache_node, another_cache_node],
+          :engine               => "redis",
+          :cache_cluster_status => "available",
+          :cache_cluster_create_time => time_earlier,
+        }
+      end
+
+      let(:another_redis_cache_cluster) do
+        {
+          :cache_nodes          => [third_cache_node, fourth_cache_node],
+          :engine               => "redis",
+          :cache_cluster_status => "available",
+          :cache_cluster_create_time => time_later,
+        }
+      end
+
+      let(:redis_cache_clusters) do
+        {
+          :cache_clusters => [some_redis_cache_cluster, another_redis_cache_cluster]
+        }
+      end
+
+      let(:some_memcache_cache_cluster) do
+        {
+          :cache_nodes          => [some_cache_node, another_cache_node],
+          :engine               => "memcached",
+          :cache_cluster_status => "available",
+        }
+      end
+
+      let(:another_memcache_cache_cluster) do
+        {
+          :cache_nodes          => [third_cache_node, fourth_cache_node],
+          :engine               => "memcached",
+          :cache_cluster_status => "available",
+        }
+      end
+
+      let(:memcache_cache_clusters) do
+        {
+          :cache_clusters => [some_memcache_cache_cluster, another_memcache_cache_cluster]
+        }
+      end
+
+      let(:all_cache_clusters) do
+        {
+          :cache_clusters => redis_cache_clusters[:cache_clusters] + memcache_cache_clusters[:cache_clusters],
+        }
+      end
+
+      let(:some_replication_group) do
+        {
+          :replication_group_id => "some-replication-group-id",
+          :node_groups => [{
+            :primary_endpoint => { :address => "some.replication.group.primary.endpoint", :port => 12_345 },
+          }],
+          :status => "available",
+        }
+      end
+
+      let(:another_replication_group) do
+        {
+          :replication_group_id => "another-replication-group-id",
+          :node_groups => [{
+            :primary_endpoint => { :address => "another.replication.group.primary.endpoint", :port => 23_456 },
+          }],
+          :status => "available",
+        }
+      end
+
+      let(:all_replication_groups) do
+        {
+          :replication_groups => [some_replication_group, another_replication_group]
+        }
+      end
+
+      before(:each) do
         AWS::EC2.stub(:new => ec2_client)
         AWS::CloudFormation.stub(:new => cfn_client)
+        @client = double
+
+        allow(@client).to receive(:describe_cache_clusters).and_return(all_cache_clusters)
+
+        allow(@client).to receive(:describe_cache_clusters).
+          with(
+            :cache_cluster_id => "some-redis-cluster-id",
+            :show_cache_node_info => true
+          ).
+          and_return(:cache_clusters => [some_redis_cache_cluster])
+
+        allow(@client).to receive(:describe_cache_clusters).
+          with(
+            :cache_cluster_id => "another-redis-cluster-id",
+            :show_cache_node_info => true
+          ).
+          and_return(:cache_clusters => [another_redis_cache_cluster])
+
+        allow(@client).to receive(:describe_cache_clusters).
+          with(
+            :cache_cluster_id => "some-memcache-cluster-id",
+            :show_cache_node_info => true
+          ).
+          and_return(:cache_clusters => [some_memcache_cache_cluster])
+
+        allow(@client).to receive(:describe_cache_clusters).
+          with(
+            :cache_cluster_id => "another-memcache-cluster-id",
+            :show_cache_node_info => true
+          ).
+          and_return(:cache_clusters => [another_memcache_cache_cluster])
+
+        allow(@client).to receive(:describe_replication_groups).
+          with(
+            :replication_group_id => "some-replication-group-id"
+          ).
+          and_return(:replication_groups => [some_replication_group])
+
+        allow(@client).to receive(:describe_replication_groups).
+          with(
+            :replication_group_id => "another-replication-group-id"
+          ).
+          and_return(:replication_groups => [another_replication_group])
+
+        allow(@client).to receive(:describe_replication_groups).with({}).and_return(all_replication_groups)
       end
 
       describe "#redis_cluster_nodes_for_cfn_stack" do
-        let(:cache_clusters) do
-          {
-            :cache_clusters => [{
-              :cache_nodes => [
-                some_cache_node,
-                another_cache_node
-
-              ],
-              :engine => "redis"
-            }]
-          }
-        end
 
         it "raises an exception when ec2_instance_id fact is missing" do
           elasticache = Aws::ElastiCache.new
@@ -62,168 +196,81 @@ class Hiera
         end
 
         it "returns all Redis cluster nodes for CloudFormation stack of EC2 instance" do
-          client = double
-          allow(client).to receive(:describe_cache_clusters).and_return(cache_clusters)
-          AWS::ElastiCache::Client.stub(:new => client)
-
-          expect(elasticache.redis_cluster_nodes_for_cfn_stack).to eq [
-            { "endpoint" => { "address" => "1.1.1.1", "port" => 1234 } },
-            { "endpoint" => { "address" => "2.2.2.2", "port" => 1234 } },
+          AWS::ElastiCache::Client.stub(:new => @client)
+          elasticache.redis_cluster_nodes_for_cfn_stack.should =~ [
+            { "endpoint" => { "address" => "1.1.1.1", "port" => 1111 } },
+            { "endpoint" => { "address" => "2.2.2.2", "port" => 2222 } },
+            { "endpoint" => { "address" => "3.3.3.3", "port" => 3333 } },
+            { "endpoint" => { "address" => "4.4.4.4", "port" => 4444 } },
           ]
         end
       end
 
       describe "#redis_cluster_replica_groups_for_cfn_stack" do
-        let(:cache_clusters) do
-          {
-            :cache_clusters => [{
-              :cache_nodes => [
-                some_cache_node,
-
-              ],
-              :replication_group_id => "some-group-id",
-              :engine => "redis",
-            }]
-          }
-        end
-        let(:replication_groups) do
-          {
-            :replication_groups => [{
-              :node_groups => [{
-                :primary_endpoint => { :address => "some.replication.group.primary.endpoint", :port => 1234 }
-              }]
-            }]
-          }
-        end
 
-        it "returns all Redis replica groups for CloudFormation stack of EC2 instance" do
-          client = double
-          allow(client).to receive(:describe_cache_clusters).and_return(cache_clusters)
-          allow(client).to receive(:describe_replication_groups).with(:replication_group_id => "some-group-id").and_return(replication_groups)
-          AWS::ElastiCache::Client.stub(:new => client)
-
-          expect(elasticache.redis_cluster_replica_groups_for_cfn_stack).to eq [
-            {
-              "replication_group_id" => "some-group-id",
-              "primary_endpoint"     => { "address" => "some.replication.group.primary.endpoint", "port" => 1234 }
-            },
-          ]
+        let(:some_redis_cache_cluster) do
+          super().merge :replication_group_id => "some-replication-group-id"
         end
 
         context "multiple defined cache clusters are in the same replica group" do
-          let(:cache_clusters) do
-            {
-              :cache_clusters => [
-                {
-                  :cache_nodes => [
-                    some_cache_node,
-                  ],
-                  :replication_group_id => "some-group-id",
-                  :engine => "redis",
-                },
-                {
-                  :cache_nodes => [
-                    another_cache_node,
-                  ],
-                  :replication_group_id => "some-group-id",
-                  :engine => "redis",
-                },
-              ]
-            }
-          end
-          let(:replication_groups) do
-            {
-              :replication_groups => [{
-                :node_groups => [{
-                  :primary_endpoint => { :address => "some.replication.group.primary.endpoint", :port => 1234 }
-                }]
-              }]
-            }
+
+          let(:another_redis_cache_cluster) do
+            super().merge :replication_group_id => "some-replication-group-id"
           end
 
           it "returns a deduplicated list of Redis replica groups" do
-            client = double
-            allow(client).to receive(:describe_cache_clusters).and_return(cache_clusters)
-            allow(client).to receive(:describe_replication_groups).with(:replication_group_id => "some-group-id").and_return(replication_groups)
-            AWS::ElastiCache::Client.stub(:new => client)
-
-            expect(elasticache.redis_cluster_replica_groups_for_cfn_stack).to eq [
-              {
-                "replication_group_id" => "some-group-id",
-                "primary_endpoint"     => { "address" => "some.replication.group.primary.endpoint", "port" => 1234 }
-              },
-            ]
+            AWS::ElastiCache::Client.stub(:new => @client)
+            actual = elasticache.redis_cluster_replica_groups_for_cfn_stack
+            expect(actual.length).to be 1
+            expect(actual.first).to include(
+                "replication_group_id" => "some-replication-group-id",
+                "primary_endpoint"     => { "address" => "some.replication.group.primary.endpoint", "port" => 12_345 }
+            )
           end
         end
 
-        context "one defined cluster is found without replica group" do
-          let(:cfn_client) do
-            double(
-              :stacks => {
-                "some-stack-name" => double(
-                  :resources => [
-                    double(
-                      :resource_type => "AWS::ElastiCache::CacheCluster",
-                      :physical_resource_id => "some-cluster-id"
-                    ),
-                    double(
-                      :resource_type => "AWS::ElastiCache::CacheCluster",
-                      :physical_resource_id => "another-cluster-id"
-                    ),
-                  ]
-                )
-              }
-            )
+        context "multiple defined cache clusters with different creation times are in the same replica group" do
+
+          let(:another_redis_cache_cluster) do
+            super().merge :replication_group_id => "some-replication-group-id"
           end
-          let(:cache_clusters) do
-            {
-              "some-cluster-id" => {
-                :cache_clusters => [
-                  {
-                    :cache_nodes => [
-                      some_cache_node,
-                    ],
-                    :replication_group_id => "some-group-id",
-                    :engine => "redis",
-                  },
-                ]
-              },
-              "another-cluster-id" => {
-                :cache_clusters => [
-                  {
-                    :cache_nodes => [
-                      another_cache_node,
-                    ],
-                    :engine => "redis",
-                  },
-                ]
+
+          it "returns the most current cache cluster creation timestamp for the whole replication group in order to know which replica group is the most current" do
+            AWS::ElastiCache::Client.stub(:new => @client)
+
+            actual = elasticache.redis_cluster_replica_groups_for_cfn_stack
+
+            actual.should eq [
+              {
+                "replication_group_id" => "some-replication-group-id",
+                "primary_endpoint"     => { "address" => "some.replication.group.primary.endpoint", "port" => 12_345 },
+                "latest_cache_cluster_create_time" => time_later.strftime("%s"),
               }
-            }
-          end
-          let(:replication_groups) do
-            {
-              :replication_groups => [{
-                :node_groups => [{
-                  :primary_endpoint => { :address => "some.replication.group.primary.endpoint", :port => 1234 }
-                }]
-              }]
-            }
+            ]
           end
+        end
+
+        context "two replica groups with one cache cluster each, one cache cluster being newer than the other" do
 
-          it "returns all Redis replica groups and does not fail" do
+          let(:another_redis_cache_cluster) do
+            super().merge :replication_group_id => "another-replication-group-id"
+          end
 
-            client = double
-            allow(client).to receive(:describe_cache_clusters) do |options|
-              cache_clusters.fetch(options.fetch(:cache_cluster_id))
-            end
+          it "returns the most current cache cluster creation time for each replication group" do
+            AWS::ElastiCache::Client.stub(:new => @client)
 
-            allow(client).to receive(:describe_replication_groups).with(:replication_group_id => "some-group-id").and_return(replication_groups)
-            AWS::ElastiCache::Client.stub(:new => client)
+            actual = elasticache.redis_cluster_replica_groups_for_cfn_stack
 
-            expect(elasticache.redis_cluster_replica_groups_for_cfn_stack).to eq [
+            actual.should =~ [
+              {
+                "replication_group_id" => "some-replication-group-id",
+                "primary_endpoint"     => { "address" => "some.replication.group.primary.endpoint", "port" => 12_345 },
+                "latest_cache_cluster_create_time" => time_earlier.strftime("%s"),
+              },
               {
-                "replication_group_id" => "some-group-id",
-                "primary_endpoint"     => { "address" => "some.replication.group.primary.endpoint", "port" => 1234 }
+                "replication_group_id" => "another-replication-group-id",
+                "primary_endpoint"     => { "address" => "another.replication.group.primary.endpoint", "port" => 23_456 },
+                "latest_cache_cluster_create_time" => time_later.strftime("%s"),
               },
             ]
           end
@@ -238,27 +285,9 @@ class Hiera
           end.to raise_error Aws::MissingFactError
         end
 
-        context "single cache cluster" do
-          let(:cache_clusters) do
-            {
-              :cache_clusters => [{
-                :cache_nodes => [
-                  { :endpoint => { :address => "3.3.3.3", :port => 5678 } },
-                  { :endpoint => { :address => "4.4.4.4", :port => 5678 } }
-
-                ],
-                :engine => "memcached"
-              }]
-            }
-          end
-
-          it "returns all Memcached cluster nodes for CloudFormation stack of EC2 instance" do
-            client = double
-            allow(client).to receive(:describe_cache_clusters).and_return(cache_clusters)
-            AWS::ElastiCache::Client.stub(:new => client)
-
-            expect(elasticache.memcached_cluster_nodes_for_cfn_stack).to eq ["3.3.3.3", "4.4.4.4"]
-          end
+        it "returns all Memcached cluster nodes for CloudFormation stack of EC2 instance" do
+          AWS::ElastiCache::Client.stub(:new => @client)
+          elasticache.memcached_cluster_nodes_for_cfn_stack.should =~ ["1.1.1.1", "2.2.2.2", "3.3.3.3", "4.4.4.4"]
         end
       end
     end

data/spec/aws_rds_spec.rb

@@ -10,18 +10,27 @@ class Hiera
           :db_instances => [
             {
               :db_instance_identifier => "db1",
-              :endpoint => { :address => "db1.some-region.rds.amazonaws.com" },
-              :engine => "mysql"
+              :endpoint               => { :address => "db1.some-region.rds.amazonaws.com" },
+              :engine                 => "mysql",
+              :db_instance_status     => "available",
             },
             {
               :db_instance_identifier => "db2",
-              :endpoint => { :address => "db2.some-region.rds.amazonaws.com" },
-              :engine => "mysql"
+              :endpoint               => { :address => "db2.some-region.rds.amazonaws.com" },
+              :engine                 => "mysql",
+              :db_instance_status     => "available",
             },
             {
               :db_instance_identifier => "db3",
-              :endpoint => { :address => "db3.some-region.rds.amazonaws.com" },
-              :engine => "mysql"
+              :endpoint               => { :address => "db3.some-region.rds.amazonaws.com" },
+              :engine                 => "mysql",
+              :db_instance_status     => "available",
+            },
+            {
+              :db_instance_identifier => "db4",
+              :endpoint               => nil,
+              :engine                 => "mysql",
+              :db_instance_status     => "modifying",
             }
           ]
         }
@@ -44,6 +53,12 @@ class Hiera
               { :key => "environment", :value => "production" },
               { :key => "role", :value => "mgmt-db" }
             ]
+          },
+          "arn:aws:rds:some-region:12345678:db:db4" => {
+            :tag_list => [
+              { :key => "environment", :value => "production" },
+              { :key => "role", :value => "mgmt-db" }
+            ]
           }
         }
       end

metadata

@@ -1,110 +1,73 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: hiera-aws
-version: !ruby/object:Gem::Version
-  version: 0.4.1
+version: !ruby/object:Gem::Version 
+  version: 0.5.0
 platform: ruby
-authors:
+authors: 
 - Mathias Lafeldt
 - Deniz Adrian
 - Soenke Ruempler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-05-15 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   name: aws-sdk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id002 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   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'
   type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   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'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.21.0
   type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.21.0
-- !ruby/object:Gem::Dependency
   name: webmock
-  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'
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
+  version_requirements: *id006
 description: Hiera AWS Backend
-email:
+email: 
 - mathias.lafeldt@jimdo.com
 - deniz.adrian@jimdo.com
 - soenke.ruempler@jimdo.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rubocop.yml
 - .travis.yml
@@ -125,30 +88,29 @@ files:
 - spec/aws_rds_spec.rb
 - spec/spec_helper.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.0.3
 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