hiera-aws 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: c5eb2b414df749ddb9fb5764e9424a8f86256fe0
-  data.tar.gz: dcc498e4413d0bcbba1b1e661078b6da37ed9ac5
-SHA512: 
-  metadata.gz: 5d51b42416cb49e8e27d27e05aca4f86725e7548fe2a783fa3026970f2b69bb7ad0d53edd16ca473cde77ba8e6d4f59455b229c0850612a0180317e06179ba50
-  data.tar.gz: c38d28c309ddef1e90d2267f706b2b14e1d6a490a7a6e5c547ccd180448be131e7172fea1b8980dfd220917f2df4749f237eeba4816dea7b4dbfe3be2af396d3
+---
+SHA1:
+  metadata.gz: db0800685a66b940ed05671f7b7e6ef30c44d561
+  data.tar.gz: 39bd81a8d5ec926b3388f4f115a13e18c7f499d9
+SHA512:
+  metadata.gz: 2c15a81ed1e10cc95e8b10738707480bcf8814b9760cf3235bb35b5365cdef783742338f2b833ac5fd4f898e51ae9af9176fb65c756e4c66abb59302efe7972e
+  data.tar.gz: 567661b4d8c7973c9d9e3b995bb15d9f3b2f25c94cd26a652090182a580388469dd6bf77f3cd5cb2aacbacda07349957bf1cf22a94d32cca7f72ac52f42e519e

data/README.md

@@ -57,12 +57,38 @@ identified by its physical ID which must be passed to the backend via the Puppet
 fact `$cache_cluster_id`. The returned array has the format `["host1:port",
 "host2:port"]`.
 
+Usage:
+
 ```
 $cache_cluster_id = "your_cluster_id"
 
 cluster_nodes = hiera("cache_nodes_by_cache_cluster_id")
 ```
 
+### 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`.
+The returned array has the format `["host1", "host2"]`.
+
+Usage:
+
+```
+cluster_nodes = hiera("redis_cluster_nodes_for_cfn_stack")
+```
+
+### 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"]`.
+
+Usage:
+
+```
+cluster_nodes = hiera("memcached_cluster_nodes_for_cfn_stack")
+```
+
 ## License and Authors
 
 * Author:: Mathias Lafeldt (mathias.lafeldt@jimdo.com)

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

@@ -4,18 +4,78 @@ class Hiera
   module Backend
     module Aws
       class ElastiCache < Base
-        def client
+        def cache_nodes_by_cache_cluster_id
           region = scope["location"] || "eu-west-1"
-          AWS::ElastiCache::Client.new :region => region
-        end
+          client = AWS::ElastiCache::Client.new :region => region
 
-        def cache_nodes_by_cache_cluster_id
           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 }
           nodes = client.describe_cache_clusters(options)[:cache_clusters].first[:cache_nodes]
           nodes.map { |node| "#{node[:endpoint][:address]}:#{node[:endpoint][:port]}" }
         end
+
+        #
+        # XXX: Lots of spiked code ahead that MUST be refactored.
+        #
+        def cfn_stack_name(instance_id)
+          region = scope["location"] || "eu-west-1"
+          client = AWS::EC2.new :region => region
+
+          instances = client.instances[instance_id]
+          instances.tags["aws:cloudformation:stack-name"]
+        end
+
+        def cache_cluster_info(cluster_id)
+          region = scope["location"] || "eu-west-1"
+          client = AWS::ElastiCache::Client.new :region => region
+
+          options = { :cache_cluster_id => cluster_id, :show_cache_node_info => true }
+          info = client.describe_cache_clusters(options)
+          info.fetch(:cache_clusters).first
+        end
+
+        def cache_clusters_in_cfn_stack(stack_name, cluster_engine=nil)
+          region = scope["location"] || "eu-west-1"
+          client = AWS::CloudFormation.new :region => region
+
+          stack = client.stacks[stack_name]
+          stack.resources.select do |r|
+            r.resource_type == "AWS::ElastiCache::CacheCluster"
+          end.map do |r|
+            cluster_id = r.physical_resource_id
+            cache_cluster_info(cluster_id)
+          end.select do |cluster|
+            # Filter by engine type if provided
+            if cluster_engine
+              cluster.fetch(:engine) == cluster_engine.to_s
+            else
+              true
+            end
+          end
+        end
+
+        def cluster_nodes_for_cfn_stack(cluster_engine=nil)
+          ec2_instance_id = scope["ec2_instance_id"]
+          raise MissingFactError, "ec2_instance_id not found" unless ec2_instance_id
+
+          stack_name = cfn_stack_name(ec2_instance_id)
+          endpoints = []
+          clusters = cache_clusters_in_cfn_stack(stack_name, cluster_engine)
+          clusters.each do |cluster|
+            nodes = cluster.fetch(:cache_nodes)
+            endpoints += nodes.map { |node| node[:endpoint][:address] }
+          end
+          endpoints
+        end
+
+        def redis_cluster_nodes_for_cfn_stack
+          cluster_nodes_for_cfn_stack(:redis)
+        end
+
+        def memcached_cluster_nodes_for_cfn_stack
+          cluster_nodes_for_cfn_stack(:memcached)
+        end
       end
     end
   end

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

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

data/spec/aws_elasticache_spec.rb

@@ -3,56 +3,100 @@ require "hiera/backend/aws/elasticache"
 class Hiera
   module Backend
     describe Aws::ElastiCache do
-      describe "#client" do
-        it "returns an instance of AWS::ElastiCache::Client" do
+      let(:ec_redis_client) { double(
+        :describe_cache_clusters => {
+          :cache_clusters => [{
+            :cache_nodes => [
+              { :endpoint => { :address => "1.1.1.1", :port => 1234 } },
+              { :endpoint => { :address => "2.2.2.2", :port => 1234 } },
+
+            ],
+            :engine => "redis"
+          }]
+        }
+      )}
+      let(:ec_memcached_client) { double(
+        :describe_cache_clusters => {
+          :cache_clusters => [{
+            :cache_nodes => [
+              { :endpoint => { :address => "3.3.3.3", :port => 5678 } },
+              { :endpoint => { :address => "4.4.4.4", :port => 5678 } },
+
+            ],
+            :engine => "memcached"
+          }]
+        }
+      )}
+      let(:ec2_client) { double(
+        :instances => {
+          "some-ec2-instance-id" => double(
+            :tags => { "aws:cloudformation:stack-name" => "some-stack-name" }
+          )
+        }
+      )}
+      let(:cfn_client) { double(
+        :stacks => {
+          "some-stack-name" => double(
+            :resources => [
+              double(
+                :resource_type => "AWS::ElastiCache::CacheCluster",
+                :physical_resource_id => "some-cluster-id"
+              )
+            ]
+          )
+        }
+      )}
+
+      before do
+        AWS::EC2.stub(:new => ec2_client)
+        AWS::CloudFormation.stub(:new => cfn_client)
+      end
+
+      describe "#cache_nodes_by_cache_cluster_id" do
+        it "raises an exception when called without cache_cluster_id set" do
           elasticache = Aws::ElastiCache.new
-          client = double
-          AWS::ElastiCache::Client.stub(:new => client)
-          expect(elasticache.client).to eq client
+          expect do
+            elasticache.cache_nodes_by_cache_cluster_id
+          end.to raise_error Aws::MissingFactError
+        end
+
+        it "returns all nodes in cache cluster" do
+          scope = { "cache_cluster_id" => "some-cluster-id" }
+          elasticache = Aws::ElastiCache.new scope
+          AWS::ElastiCache::Client.stub(:new => ec_redis_client)
+          expect(elasticache.cache_nodes_by_cache_cluster_id).to eq ["1.1.1.1:1234", "2.2.2.2:1234"]
         end
+      end
 
-        it "configures the default AWS region eu-west-1" do
+      describe "#redis_cluster_nodes_for_cfn_stack" do
+        it "raises an exception when ec2_instance_id fact is missing" do
           elasticache = Aws::ElastiCache.new
-          expect(AWS::ElastiCache::Client).to receive(:new).with(:region => "eu-west-1")
-          elasticache.client
+          expect do
+            elasticache.redis_cluster_nodes_for_cfn_stack
+          end.to raise_error Aws::MissingFactError
         end
 
-        it "configures a custom AWS region passed via 'location' fact" do
-          scope = { "location" => "some-aws-region" }
+        it "returns all Redis cluster nodes for CloudFormation stack of EC2 instance" do
+          scope = { "ec2_instance_id" => "some-ec2-instance-id" }
           elasticache = Aws::ElastiCache.new scope
-          expect(AWS::ElastiCache::Client).to receive(:new).with(:region => "some-aws-region")
-          elasticache.client
+          AWS::ElastiCache::Client.stub(:new => ec_redis_client)
+          expect(elasticache.redis_cluster_nodes_for_cfn_stack).to eq ["1.1.1.1", "2.2.2.2"]
         end
       end
 
-      describe "#cache_nodes_by_cache_cluster_id" do
-        it "raises an exception when called without cache_cluster_id set" do
-          scope = {}
-          elasticache = Aws::ElastiCache.new scope
+      describe "#memcached_cluster_nodes_for_cfn_stack" do
+        it "raises an exception when ec2_instance_id fact is missing" do
+          elasticache = Aws::ElastiCache.new
           expect do
-            elasticache.cache_nodes_by_cache_cluster_id
+            elasticache.memcached_cluster_nodes_for_cfn_stack
           end.to raise_error Aws::MissingFactError
         end
 
-        it "returns all nodes in cache cluster" do
-          cluster_id = "some_cluster_id"
-          scope = { "cache_cluster_id" => cluster_id }
+        it "returns all Memcached cluster nodes for CloudFormation stack of EC2 instance" do
+          scope = { "ec2_instance_id" => "some-ec2-instance-id" }
           elasticache = Aws::ElastiCache.new scope
-
-          cluster_info = {
-            :cache_clusters => [{
-              :cache_nodes => [
-                { :endpoint => { :address => "1.2.3.4", :port => 1234 } },
-                { :endpoint => { :address => "5.6.7.8", :port => 5678 } },
-              ]
-            }]
-          }
-          options = { :cache_cluster_id => cluster_id, :show_cache_node_info => true }
-          client = Object.new
-          client.stub(:describe_cache_clusters).with(options).and_return(cluster_info)
-          AWS::ElastiCache::Client.stub(:new => client)
-
-          expect(elasticache.cache_nodes_by_cache_cluster_id).to eq ["1.2.3.4:1234", "5.6.7.8:5678"]
+          AWS::ElastiCache::Client.stub(:new => ec_memcached_client)
+          expect(elasticache.memcached_cluster_nodes_for_cfn_stack).to eq ["3.3.3.3", "4.4.4.4"]
         end
       end
     end

metadata

@@ -1,63 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hiera-aws
-version: !ruby/object:Gem::Version 
-  version: 0.0.4
+version: !ruby/object:Gem::Version
+  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Mathias Lafeldt
 - Deniz Adrian
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-01-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-02-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: aws-sdk
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id002 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  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
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  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
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  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
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -73,29 +90,30 @@ 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: 
-  - *id002
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
+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'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.1.9
 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