hiera-aws 0.3.0 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f5b0d54142dbe9c5ab4ae5bca2c50a48dafc0a65
+  data.tar.gz: b4a17bbc96478779d2b819faf36d9078bc9ec3d8
+SHA512:
+  metadata.gz: 382da2fccca8a46b53acd289663a4d54c538c4c8b30de6b0ad7e9216d1a3fa0d3666ef2c948bc85714fc6c29e324c64e57c9c56d82bda186bf99a499e3b21e88
+  data.tar.gz: 8b7995e6b0b4af55a45f80165a9b6bdbffb25f6a4436848956840d3a20601416f65641026715c87313c4cef0de4c16aaab2d5a41787f4204c90556069ab34ab8

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  Includes:
+  Include:
     - Gemfile
     - Rakefile
 

data/README.md

@@ -68,7 +68,6 @@ The backend currently supports the following keys that you can pass to the
 
 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:
 
@@ -76,6 +75,14 @@ Usage:
 cluster_nodes = hiera("redis_cluster_nodes_for_cfn_stack")
 ```
 
+For each Redis cluster node in the array the following hash is returned:
+
+```json
+{
+    "endpoint" => { "address" => "some.redis.endpoint", "port" => 6379 },
+}
+```
+
 ### redis_cluster_replica_groups_for_cfn_stack
 
 Returns an array of the Redis Replication Groups of all Redis cluster nodes for

data/hiera-aws.gemspec

@@ -23,5 +23,5 @@ 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"
+  spec.add_development_dependency "rubocop", "~> 0.21.0"
 end

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

@@ -5,9 +5,24 @@ class Hiera
     module Aws
       # Implementation of Hiera keys for aws/elasticache
       class ElastiCache < Base
-          #
-        # XXX: Lots of spiked code ahead that MUST be refactored.
-        #
+        def redis_cluster_replica_groups_for_cfn_stack
+          cluster_replica_groups_for_cfn_stack(:redis)
+        end
+
+        def redis_cluster_nodes_for_cfn_stack
+          cluster_nodes_for_cfn_stack(:redis).map do |node|
+            { "endpoint" => stringify_keys(node.fetch(:endpoint)) }
+          end
+        end
+
+        def memcached_cluster_nodes_for_cfn_stack
+          cluster_nodes_for_cfn_stack(:memcached).map do |node|
+            node.fetch(:endpoint)[:address]
+          end
+        end
+
+        private
+
         def cfn_stack_name(instance_id)
           client = AWS::EC2.new
           instances = client.instances[instance_id]
@@ -47,13 +62,8 @@ class Hiera
           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
+          clusters.reduce([]) { |a, e| a + e.fetch(:cache_nodes) }
         end
 
         def cluster_replica_groups_for_cfn_stack(cluster_engine = nil)
@@ -85,18 +95,6 @@ class Hiera
             }
           end
         end
-
-        def redis_cluster_replica_groups_for_cfn_stack
-          cluster_replica_groups_for_cfn_stack(:redis)
-        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/rds.rb

@@ -39,7 +39,7 @@ class Hiera
         def db_instances_with_tags(tags)
           db_instances.select do |i|
             all_tags = db_instance_tags(i.fetch(:db_instance_identifier))
-            tags.all? { |k, v| tags[k] == all_tags[k] }
+            tags.all? { |k, _| tags[k] == all_tags[k] }
           end
         end
 

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

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

data/lib/hiera/backend/aws_backend.rb

@@ -18,7 +18,7 @@ class Hiera
         Hiera.debug("AWS backend initialized")
       end
 
-      def lookup(key, scope, order_override, resolution_type)
+      def lookup(key, scope, order_override, resolution_type) # rubocop:disable UnusedMethodArgument
         answer = nil
 
         Hiera.debug("Looking up '#{key}' in AWS backend")

data/spec/aws_elasticache_spec.rb

@@ -65,7 +65,10 @@ class Hiera
           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 ["1.1.1.1", "2.2.2.2"]
+          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 } },
+          ]
         end
       end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera-aws
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Mathias Lafeldt
@@ -11,88 +10,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.21.0
 description: Hiera AWS Backend
 email:
 - mathias.lafeldt@jimdo.com
@@ -122,27 +111,26 @@ files:
 homepage: https://github.com/Jimdo/hiera-aws
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Hiera AWS Backend
 test_files:
 - spec/aws_backend_spec.rb