chef-resolver 0.11.0 → 0.12.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: da1a68ea8f3b56014ff1bd7d6e4cb354fc9f88e2
+  data.tar.gz: 11efcc4c30f99630b230e85a96c0092d2c250380
+SHA512:
+  metadata.gz: ae0424cb9faf3e72955c592274929a663cc6fbc1fc2e40354e9a0d497c0bce9301f4e7ecec3b276ece5b1f1b94af3a2dc126d414618542bda2c8fe0e9ad2697f
+  data.tar.gz: cb36533b7c3f84ee83d6d99dd5c3ff527600e8ce00d5fad19453edc68aaf2d6cb78d8bfcb8e1e68bfc72ddb434143044de09a08afe711d758bf6b1e9e2247e2a

data/bin/chef-resolver

@@ -25,6 +25,7 @@ if ARGV[0] == 'install'
 # # Access with role.config_name.chef
 # config_name:
 #   knife_file: /full/path/to/knife.rb
+#   use_private_ip: false # optional
 #   search_extra: 'role:production' # optional
 #   env: # optional
 #     CHEF_ENV: production

data/lib/chef/resolver/version.rb

@@ -1,5 +1,5 @@
 class Chef
   module Resolver
-    VERSION = "0.11.0"
+    VERSION = "0.12.0"
   end
 end

data/lib/chef/resolver_server.rb

@@ -111,10 +111,23 @@ class Chef
       else
         node = nodes[index]
         puts "\tFound node: #{node['name']}"
-        return node.has_key?('ec2') ? node['ec2']['public_ipv4'] : node['ipaddress']
+        return calculate_node_ip(node, config)
       end
     end
 
+    def calculate_node_ip node, config
+      ip = if node.has_key?('cloud')
+        if config['use_private_ip']
+          node['cloud']['local_ipv4']
+        else
+          node['cloud']['public_ipv4']
+        end
+      else
+        node['ipaddress']
+      end
+      ip.is_a?(Array) ? ip.first : ip
+    end
+
     def process_requests
       loop do
         data, from = @server.recvfrom(1024)

data/spec/resolver_server_spec.rb

@@ -46,6 +46,7 @@ describe Chef::ResolverServer do
     @test_config = {'knife_file' => File.dirname(__FILE__)+'/files/test_knife.rb'}
     @test2_config = {'knife_file' => File.dirname(__FILE__)+'/files/test2_knife.rb', 'env' => {'ENV_PROP' => 'test2'}}
     @test3_config = {'knife_file' => File.dirname(__FILE__)+'/files/test_knife.rb', 'search_extra' => 'role:staging'}
+    @vpn_config = {'knife_file' => File.dirname(__FILE__)+'/files/test_knife.rb', 'use_private_ip' => true}
   end
 
   after :each do
@@ -123,13 +124,6 @@ describe Chef::ResolverServer do
     expect { getaddress('test_role.test2.chef') }.to raise_error(Resolv::ResolvError)
   end
 
-  it "should resolve ec2 node public ip addresses properly" do
-    new_server 'test' => @test_config
-    @server.start
-    stub_search 'role:test_role', [{'ec2' => {'public_ipv4' => '1.1.1.1'}, 'ipaddress' => '0.0.0.0'}]
-    getaddress('test_role.chef').should == '1.1.1.1'
-  end
-
   it "should support a file path" do
     path = File.dirname(__FILE__)+'/files/changing_config.yml'
     File.open(path, 'w') {|f| f.write({'test' => @test_config}.to_yaml)}
@@ -174,4 +168,20 @@ describe Chef::ResolverServer do
     getaddress('test_role.changing.chef').should == '1.1.1.1'
     Chef::Config.test_prop.should == false
   end
+
+  describe "#calculate_node_ip" do
+    it "should prefer cloud ip addresses over ipaddress field" do
+      new_server 'test' => @test_config
+      @server.start
+      stub_search 'role:test_role', [{'cloud' => {'public_ipv4' => '1.1.1.1'}, 'ipaddress' => '0.0.0.0'}]
+      getaddress('test_role.chef').should == '1.1.1.1'
+    end
+
+    it "should prefer cloud ip addresses over ipaddress field with use_private_ip" do
+      new_server 'test' => @vpn_config
+      @server.start
+      stub_search 'role:test_role', [{'cloud' => {'local_ipv4' => '1.1.1.1'}, 'ipaddress' => '0.0.0.0'}]
+      getaddress('test_role.chef').should == '1.1.1.1'
+    end
+  end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: chef-resolver
 version: !ruby/object:Gem::Version
-  version: 0.11.0
-  prerelease: 
+  version: 0.12.0
 platform: ruby
 authors:
 - Stephen Augenstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -51,33 +48,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/warhammerkid/chef-resolver
 licenses: []
+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'
-      segments:
-      - 0
-      hash: 160828053575409919
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 160828053575409919
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Instead of doing knife search node role every time you want to look up a
   server, simply ssh into ROLE_NAME-##.chef
 test_files: