chef-resolver 0.9.1 → 0.9.2

data/.gitignore

@@ -16,3 +16,5 @@ tmp
 .yardoc
 _yardoc
 doc/
+
+spec/files/changing_*

data/README.md

@@ -1,4 +1,20 @@
 chef-resolver
 ==================
 
-A DNS resolver for Mac OS X that does role queries to resolve hostnames
+A DNS resolver for Mac OS X that does role queries to resolve hostnames
+
+### Installation
+
+```
+gem install chef-resolver
+chef-resolver install
+nano -w ~/.chef-resolver.yml
+```
+
+### Usage
+
+```
+ssh role-name-3.config.chef
+ssh other-role.chef
+ping another-role.config2.chef
+```

data/bin/chef-resolver

@@ -24,7 +24,7 @@ if ARGV[0] == 'install'
       f.write <<-DEFAULT_CONFIG
 # # Access with role.config_name.chef
 # config_name:
-#   knife_path: /full/path/to/knife.rb
+#   knife_file: /full/path/to/knife.rb
 #   env: # optional
 #     CHEF_ENV: production
 DEFAULT_CONFIG
@@ -66,11 +66,12 @@ port #{dns_port}
 RESOLVER
   resolver.close
   begin
+    FileUtils.mkdir '/etc/resolver', :mode => 0755 unless File.exist?('/etc/resolver')
     FileUtils.cp(resolver.path, '/etc/resolver/chef')
   rescue
-    cmd = "sudo cp #{resolver.path} /etc/resolver/chef"
-    puts cmd
-    `#{cmd}`
+    puts "Installing system configuration files as root"
+    `sudo mkdir -m 0755 /etc/resolver 2>/dev/null`
+    `sudo cp #{resolver.path} /etc/resolver/chef`
   end
   resolver.unlink
 
@@ -100,14 +101,8 @@ elsif ARGV[0] == 'uninstall'
   exit 0
 end
 
-# Load configs
-unless File.exist?(config_path)
-  raise "Could not find config file: #{config_path}"
-end
-config = YAML.load_file(config_path)
-
 # Start server
 Thread.abort_on_exception = true
-dns = Chef::ResolverServer.new dns_port, config
-dns.run
+dns = Chef::ResolverServer.new dns_port, config_path, true
+dns.start
 Thread.stop

data/lib/chef/resolver/file_watcher.rb

@@ -0,0 +1,45 @@
+class Chef
+  module Resolver
+    class FileWatcher
+      def initialize filenames
+        self.filenames = filenames
+      end
+
+      def filenames= filenames
+        @filenames = filenames || []
+        @mtimes = {}
+        @filenames.each do |f|
+          raise "File does not exist: #{f}" unless File.exist?(f)
+          @mtimes[f] = File.stat(f).mtime
+        end
+      end
+
+      def watch &callback
+        @thread = Thread.new { watch_filenames &callback }
+      end
+
+      def stop
+        @thread.kill
+      end
+
+    private
+      def watch_filenames &callback
+        loop do
+          sleep 1
+
+          @filenames.each do |f|
+            if File.exist?(f)
+              mtime = File.stat(f).mtime
+              next if @mtimes[f] == mtime
+              @mtimes[f] = mtime
+              yield f
+            else
+              yield f
+              next
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/resolver/version.rb

@@ -1,5 +1,5 @@
 class Chef
   module Resolver
-    VERSION = "0.9.1"
+    VERSION = "0.9.2"
   end
 end

data/lib/chef/resolver_server.rb

@@ -1,46 +1,31 @@
 require 'resolv'
 require 'socket'
 require 'chef'
+require 'chef/resolver/file_watcher'
 
 class Chef
   class ResolverServer
-    def initialize(port, config)
-      @server = UDPSocket.open
-      @server.bind "127.0.0.1", port
-
-      domains = config.keys
-      @root_domains = {}
-      domains.each {|d| @root_domains[Resolv::DNS::Name.create("#{d}.chef.")] = config[d]}
-      @root_domains[Resolv::DNS::Name.create("chef.")] = config[domains[0]] if domains.length == 1
-    end
+    IPv4 = "127.0.0.1".freeze
 
-    def resolve_host host
-      puts "Resolving: #{host}"
-      @root_domains.each do |domain, config|
-        next unless host.subdomain_of?(domain)
-        role_part = host.to_s.split('.')[0]
-        if role_part =~ /^(.+)-(\d+)$/
-          return query_chef $1, $2.to_i - 1, config
-        else
-          return query_chef role_part, 0, config
-        end
+    def initialize port, config, watch = false
+      @port = port
+      if config.is_a?(String)
+        load_config_from_file config
+        start_file_watcher if watch
+      else
+        load_config config
       end
-      return nil
     end
 
-    def query_chef role, index, config
-      load_chef_config config
+    def start
+      @server = UDPSocket.open
+      @server.bind IPv4, @port
+      @thread = Thread.new { process_requests }
+    end
 
-      puts "\tLooking up role #{role}..."
-      nodes = Chef::Search::Query.new.search('node', "role:#{role}")[0]
-      if index >= nodes.length
-        puts "\tIndex beyond bounds: #{index} vs #{nodes.length}"
-        return nil
-      else
-        node = nodes[index]
-        puts "\tFound node: #{node['name']}"
-        return node.has_key?('ec2') ? node['ec2']['public_ipv4'] : node['ipaddress']
-      end
+    def stop
+      @thread.kill if @thread
+      @watcher.stop if @watcher
     end
 
     def load_chef_config config
@@ -65,47 +50,87 @@ class Chef
       nil
     end
 
-    def read_msg
-      data, from = @server.recvfrom(1024)
-      return Resolv::DNS::Message.decode(data), from
+  private
+    def load_config config
+      domains = config.keys
+      @root_domains = {}
+      domains.each {|d| @root_domains[Resolv::DNS::Name.create("#{d}.chef.")] = config[d]}
+      @root_domains[Resolv::DNS::Name.create("chef.")] = config[domains[0]] if domains.length == 1
+    end
+
+    def load_config_from_file config_path
+      raise "Could not find config file: #{config_path}" unless File.exist?(config_path)
+
+      # Parse config from file and save paths to all files we might want to track
+      @config_path = File.expand_path(config_path)
+      @tracked_files = [@config_path]
+      load_config YAML.load_file(@config_path)
+      @root_domains.each {|d, c| @tracked_files << File.expand_path(c['knife_file'])}
     end
 
-    def answer(msg)
-      a = Resolv::DNS::Message.new msg.id
-      a.qr = 1
-      a.opcode = msg.opcode
-      a.aa = 1
-      a.rd = msg.rd
-      a.ra = 0
-      a.rcode = 0
-      a
+    def start_file_watcher
+      @watcher = Resolver::FileWatcher.new @tracked_files
+      @watcher.watch do |path|
+        @cached_configs = nil # Reset chef configs
+        load_config_from_file @config_path if path == @config_path
+        @watcher.filenames = @tracked_files
+      end
     end
 
-    def send_to(data, to)
-      @server.send data, 0, to[2], to[1]
+    def resolve_host host
+      puts "Resolving: #{host}"
+      @root_domains.each do |domain, config|
+        next unless host.subdomain_of?(domain)
+        next unless host.length - 1 == domain.length # Make sure the subdomain is the role part
+        role_part = host.to_s.split('.')[0]
+        if role_part =~ /^(.+)-(\d+)$/
+          return query_chef $1, $2.to_i - 1, config
+        else
+          return query_chef role_part, 0, config
+        end
+      end
+      return nil
     end
 
-    def run
-      @thread = Thread.new do
-        while true
-          msg, from = read_msg
+    def query_chef role, index, config
+      load_chef_config config
 
-          a = answer(msg)
+      puts "\tLooking up role #{role}..."
+      nodes = Chef::Search::Query.new.search('node', "role:#{role}")[0]
+      if index >= nodes.length
+        puts "\tIndex beyond bounds: #{index} vs #{nodes.length}"
+        return nil
+      else
+        node = nodes[index]
+        puts "\tFound node: #{node['name']}"
+        return node.has_key?('ec2') ? node['ec2']['public_ipv4'] : node['ipaddress']
+      end
+    end
 
-          msg.each_question do |q,cls|
-            next unless Resolv::DNS::Resource::IN::A == cls
-            ip = resolve_host q
-            a.add_answer "#{q.to_s}.", 60, cls.new(ip) if ip
+    def process_requests
+      loop do
+        data, from = @server.recvfrom(1024)
+        msg = Resolv::DNS::Message.decode(data)
+
+        a = Resolv::DNS::Message.new msg.id
+        a.qr = 1
+        a.opcode = msg.opcode
+        a.aa = 1
+        a.rd = msg.rd
+
+        msg.each_question do |q, cls|
+          next unless Resolv::DNS::Resource::IN::A == cls
+          ip = resolve_host q
+          if ip
+            a.add_answer "#{q.to_s}.", 60, cls.new(ip)
           end
-
-          send_to a.encode, from
         end
-      end
-    end
+        a.rcode = 3 unless a.answer.length > 0 # Not found
 
-    def stop
+        @server.send a.encode, 0, from[2], from[1]
+      end
+    ensure
       @server.close
-      @thread.kill if @thread
     end
   end
 end

data/spec/resolver_server_spec.rb

@@ -5,9 +5,8 @@ require 'chef/resolver_server'
 describe Chef::ResolverServer do
   TESTING_DNS_PORT = 20571
 
-  def start_server config
-    @server = Chef::ResolverServer.new TESTING_DNS_PORT, config
-    @server.run
+  def new_server config, watch = false
+    @server = Chef::ResolverServer.new TESTING_DNS_PORT, config, watch
   end
 
   def stop_server
@@ -40,8 +39,8 @@ describe Chef::ResolverServer do
 
   before :all do
     @default_config = Chef::Config.configuration
-    @test_config = {'knife_file' => File.dirname(__FILE__)+'/knife/test_knife.rb'}
-    @test2_config = {'knife_file' => File.dirname(__FILE__)+'/knife/test2_knife.rb', 'env' => {'ENV_PROP' => 'test2'}}
+    @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'}}
   end
 
   after :each do
@@ -50,13 +49,13 @@ describe Chef::ResolverServer do
   end
 
   it "should load chef config" do
-    start_server 'test' => @test_config
+    new_server 'test' => @test_config
     @server.load_chef_config @test_config
     Chef::Config.test_prop.should == true
   end
 
   it "should properly reset chef config between loads" do
-    start_server 'test' => @test_config, 'test2' => @test2_config
+    new_server 'test' => @test_config, 'test2' => @test2_config
     @server.load_chef_config @test_config
     Chef::Config.test_prop.should == true
     Chef::Config.shared_prop.should == 'test_knife'
@@ -68,7 +67,7 @@ describe Chef::ResolverServer do
   end
 
   it "should properly reset ENV between chef config loads" do
-    start_server 'test' => @test_config, 'test2' => @test2_config
+    new_server 'test' => @test_config, 'test2' => @test2_config
     @server.load_chef_config @test_config
     @server.load_chef_config @test2_config
     Chef::Config.env_prop.should == 'test2'
@@ -78,32 +77,88 @@ describe Chef::ResolverServer do
   end
 
   it "should resolve a name like ROLE.CONFIG.chef" do
-    start_server 'test' => @test_config, 'test2' => @test2_config
+    new_server 'test' => @test_config, 'test2' => @test2_config
+    @server.start
     stub_search 'test_role', [{'ipaddress' => '1.1.1.1'}]
     getaddress('test_role.test2.chef').should == '1.1.1.1'
   end
 
   it "should resolve a name like ROLE-INDEX.CONFIG.chef" do
-    start_server 'test' => @test_config
+    new_server 'test' => @test_config
+    @server.start
     stub_search 'test_role', [{'ipaddress' => '1.1.1.1'}, {'ipaddress' => '2.2.2.2'}, {'ipaddress' => '3.3.3.3'}, {'ipaddress' => '4.4.4.4'}]
     getaddress('test_role-3.test.chef').should == '3.3.3.3'
   end
 
   it "should resolve a name like ROLE.chef if only one config" do
     # Should fail with multiple configs
-    start_server 'test' => @test_config, 'test2' => @test2_config
+    new_server 'test' => @test_config, 'test2' => @test2_config
+    @server.start
     expect { getaddress('test_role.chef') }.to raise_error(Resolv::ResolvError)
     stop_server
 
     # Should succeed with one config
-    start_server 'test' => @test_config
+    new_server 'test' => @test_config
+    @server.start
     stub_search 'test_role', [{'ipaddress' => '1.1.1.1'}]
     getaddress('test_role.chef').should == '1.1.1.1'
   end
 
+  it "should not resolve ROLE.CONFIG.chef without a matching config" do
+    new_server 'test' => @test_config
+    @server.start
+    expect { getaddress('test_role.test2.chef') }.to raise_error(Resolv::ResolvError)
+  end
+
   it "should resolve ec2 node public ip addresses properly" do
-    start_server 'test' => @test_config
+    new_server 'test' => @test_config
+    @server.start
     stub_search '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)}
+    new_server path
+    @server.start
+    stub_search 'test_role', [{'ipaddress' => '1.1.1.1'}]
+    getaddress('test_role.chef').should == '1.1.1.1'
+  end
+
+  it "should reload configs on config change" do
+    path = File.dirname(__FILE__)+'/files/changing_config.yml'
+    File.open(path, 'w') {|f| f.write({'test' => @test_config}.to_yaml)}
+    new_server path, true
+    @server.start
+
+    sleep 2
+    File.open(path, 'w') {|f| f.write({'test2' => @test2_config}.to_yaml)}
+    sleep 2
+
+    expect { getaddress('test_role.test.chef') }.to raise_error(Resolv::ResolvError)
+    stub_search 'test_role', [{'ipaddress' => '1.1.1.1'}]
+    getaddress('test_role.test2.chef').should == '1.1.1.1'
+  end
+
+  it "should reload configs on knife change" do
+    config_path = File.dirname(__FILE__)+'/files/changing_config.yml'
+    knife_path  = File.dirname(__FILE__)+'/files/changing_knife.rb'
+    File.open(config_path, 'w') {|f| f.write({'changing' => {'knife_file' => knife_path}}.to_yaml)}
+    File.open(knife_path, 'w') {|f| f.write("test_prop true\n")}
+    new_server config_path, true
+    @server.start
+
+    stub_search 'test_role', [{'ipaddress' => '1.1.1.1'}]
+    getaddress('test_role.changing.chef').should == '1.1.1.1'
+    Chef::Config.test_prop.should == true
+
+    sleep 2
+    File.open(knife_path, 'w') {|f| f.write("test_prop false\n")}
+    sleep 2
+
+    stub_search 'test_role', [{'ipaddress' => '1.1.1.1'}]
+    getaddress('test_role.changing.chef').should == '1.1.1.1'
+    Chef::Config.test_prop.should == false
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Stephen Augenstein
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-20 00:00:00 -05:00
+date: 2013-02-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,10 +47,11 @@ files:
 - Rakefile
 - bin/chef-resolver
 - chef-resolver.gemspec
+- lib/chef/resolver/file_watcher.rb
 - lib/chef/resolver/version.rb
 - lib/chef/resolver_server.rb
-- spec/knife/test2_knife.rb
-- spec/knife/test_knife.rb
+- spec/files/test2_knife.rb
+- spec/files/test_knife.rb
 - spec/resolver_server_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -84,7 +85,7 @@ signing_key:
 specification_version: 3
 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: 
-- spec/knife/test2_knife.rb
-- spec/knife/test_knife.rb
+- spec/files/test2_knife.rb
+- spec/files/test_knife.rb
 - spec/resolver_server_spec.rb
 - spec/spec_helper.rb