hostnamer 1.0.0 → 1.0.2

data/README.md

@@ -16,7 +16,7 @@ Usage: hostnamer [options]
     -j, --json-attributes [PATH]     Chef json attributes file. Defaults to /etc/chef/node.json
     -t, --tags [TAG,TAG]             Tags to postpend, eg: --tags production,california
     -p, --profile [PROFILE]          AWS user profile. Uses the current IAM or the default profile located under ~/.aws
-    -r, --retries [RETRIES]          Number of times to retry before failing. Defaults to 3
+    -r, --retries [RETRIES]          Number of times to retry before failing. Defaults to 5``:wq
     -w, --retry-wait SECONDS         Retry wait time. Defaults to 10s
     -v, --[no-]verbose               Run verbosely
         --version                    Show version
@@ -27,8 +27,9 @@ Usage: hostnamer [options]
 ### Ubuntu/Debian
 
 ```
-wget https://s3.amazonaws.com/demandbase-pkgs-public/hostnamer_1.0.0_all.deb
-sudo dpkg --install hostnamer_1.0.0_all.deb
+version=1.0.2
+wget https://s3.amazonaws.com/demandbase-pkgs-public/hostnamer_${version}_all.deb
+sudo dpkg --install hostnamer_${version}_all.deb
 sudo apt-get update -y && apt-get -f install # install any missing dependencies
 ```
 

data/lib/hostnamer/hostnamer.rb

@@ -6,7 +6,7 @@ require 'optparse'
 
 module Hostnamer
   module_function
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
   class DNSInsertFailed < RuntimeError; end
   class DNSQueryFailed  < RuntimeError; end
 
@@ -15,7 +15,7 @@ module Hostnamer
       zoneid    = opts[:zone_id] or raise "zone id must be present, specify using --zone-id ZONEID"
       tags      = opts[:tags]         || []
       name      = opts[:cluster_name] || detect_first_chef_role(opts[:json_attrs]) || 'instance'
-      retries   = opts[:retries]      || 3
+      retries   = opts[:retries]      || 5
       retrywait = opts[:retry_wait]   || 10
       profile   = opts[:profile]
       ip        = detect_ip
@@ -26,8 +26,8 @@ module Hostnamer
           host, domain = determine_available_host(tags, zoneid, profile)
           add_host_record("#{host}.#{domain}", ip, zoneid, profile)
           return host
-        rescue Exception => e
-          log "regisration failed.. retrying in #{retrywait}s"
+        rescue DNSInsertFailed => e
+          log "Route53 update failed.. retrying in #{retrywait}s"
           sleep retrywait
           raise e
         end
@@ -50,7 +50,7 @@ module Hostnamer
         end
       rescue Exception => e
         raise "#{nodefile} is not found or invalid. Specify a cluster name using --cluster-name"
-      end 
+      end
     end
   end
 
@@ -72,9 +72,10 @@ module Hostnamer
     log "determining_available_host" do
       n = 0
       domain  = detect_domain(zoneid, profile)
-      records = list_record_sets(zoneid, profile)
       host = (tags + ["%02d" % n]).join('-')
+      records = list_record_sets(zoneid, "#{host}.#{domain}", profile)
       while records.include?("#{host}.#{domain}") do
+        records = list_record_sets(zoneid, "#{host}.#{domain}", profile)
         log "checking availability for #{host}.#{domain}"
         host = (tags + ["%02d" % n+=1]).join('-')
       end
@@ -95,9 +96,9 @@ module Hostnamer
     end
   end
 
-  def list_record_sets(zoneid, profile=nil)
+  def list_record_sets(zoneid, hostname, profile=nil)
     log "list_record_sets" do
-      cmd = "aws route53 list-resource-record-sets --hosted-zone-id #{zoneid} --output text"
+      cmd = "aws route53 list-resource-record-sets --hosted-zone-id #{zoneid} --output text --start-record-name #{hostname}"
       cmd = "#{cmd} --profile #{profile}" if profile
       debug "exec: #{cmd}"
       records = `#{cmd} | grep RESOURCERECORDSETS | awk '{print $2}'`.strip
@@ -107,12 +108,12 @@ module Hostnamer
   end
 
   def record_unavailable?(record)
-    `dig #{record} +short`.strip != '' 
+    `dig #{record} +short`.strip != ''
   end
 
   def add_host_record(host, ip, zoneid, profile = nil)
     log "add_host_record: #{host}" do
-      payload = Tempfile.new('payload') 
+      payload = Tempfile.new('payload')
       payload.write %Q(
           {
             "Comment": "Added by hostnamer during instance bootstrap",
@@ -146,8 +147,7 @@ module Hostnamer
       yield
     rescue => e
       n = n - 1
-      (debug "retrying #{n} times" and retry) if n > 0
-      raise e
+      retry if n > 0
     end
   end
 
@@ -155,9 +155,9 @@ module Hostnamer
     msg = "hostnamer: #{msg}"
     if ENV['HOSTNAMER_VERBOSE']
       if doprint
-        $stdout.print(msg) 
+        $stderr.print(msg)
       else
-        $stdout.puts(msg)
+        $stderr.puts(msg)
       end
     end
   end
@@ -193,6 +193,8 @@ module Hostnamer
   def parse_options(argv)
     options = {}
     options[:json_attrs] = "/etc/chef/node.json"
+    options[:retry_wait] = 10
+    options[:retries] = 5
     parser = OptionParser.new do |opts|
       opts.banner = "Usage: hostnamer [options]"
       opts.on "-Z", "--zone-id ZONEID", "Route 53 zone id" do |z|
@@ -209,12 +211,12 @@ module Hostnamer
       end
       opts.on "-p", "--profile [PROFILE]", "AWS user profile. Uses the current IAM or the default profile located under ~/.aws" do |p|
         options[:profile] = p
-      end  
-      opts.on "-r", "--retries [RETRIES]", "Number of times to retry before failing. Defaults to 3" do |r|
+      end
+      opts.on "-r", "--retries [RETRIES]", "Number of times to retry before failing. Defaults to #{options[:retries]}" do |r|
         options[:retries] = r
       end
-      opts.on "-w", "--retry-wait SECONDS", "Retry wait time. Defaults to 10s" do |w|
-        opptions[:retry_wait] = w
+      opts.on "-w", "--retry-wait SECONDS", "Retry wait time. Defaults to #{options[:retry_wait]}s" do |w|
+        options[:retry_wait] = w
       end
       opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
         options[:verbose] = v
@@ -241,13 +243,13 @@ module Hostnamer
           log "detected zone id: #{zid}"
           zid.strip
         else
-          raise "could not detect zone_id from #{domain} because \"zone_id\" TXT record is missing. Either insert a TXT record in the DNS or specify --zone-id ZONEID" 
+          raise "could not detect zone_id from #{domain} because \"zone_id\" TXT record is missing. Either insert a TXT record in the DNS or specify --zone-id ZONEID"
           nil
         end
       end
     end
   end
-  
+
   def detect_soa_ttl(domain)
     log "detect_soa_ttl" do
       if answer = `dig +nocmd +noall +answer soa #{domain}`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hostnamer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -71,7 +71,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -333262311511193171
+      hash: -1545043648711111311
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -333262311511193171
+      hash: -1545043648711111311
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23