zonify 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e30191a3ca007c303fe49c7e5ae55d9dbb1f29f
-  data.tar.gz: e7f5d12cc76788684ab3940786ed741290a06a50
+  metadata.gz: 186d36c96eef1d14b65e3f3a576592cdf3db4bdc
+  data.tar.gz: 1505c7e0e7f101d959d3e73c962b8da3e7dc60b7
 SHA512:
-  metadata.gz: b5ed894a4cd3b0d60318e25ea352e9b283a65fc74582bdc3a388df5e346d8ebe2779ad2b68d92d6482b2113c189ad968a947f0c51ec3eb341983987597ca4252
-  data.tar.gz: 9f7d532d7d0cad92a4a485162d0767a43dda163e08449b5e59a1f2b880df32fed0fe82c775e4042b27e574cfbc9d7b25d5359f51a97f4958795522a92caf7a15
+  metadata.gz: 1bfcabe561a6ce7f7f0ae7d63c183c110d1af970da427b84d2e944ea80fb5a65efe1dc5472f008ef66c36d23d762c07a6422a6016a0ff4b23a08e3d00bac7d54
+  data.tar.gz: 3250c3104624cc774acfaa8d7f718dc45d835b02fd17cf166c76e3c031e004ded25fd531dcf5963e99a53d50cce11305e7d0de0052098dc51a8d511ab1ca69c1

data/bin/zonify

@@ -16,11 +16,12 @@ class CLIAWS
   attr_reader :options
   def initialize(access=nil, secret=nil)
     @options = {}
-    @options.merge!(options) if options
     env_adapter
-    { :region                => ENV['AWS_DEFAULT_REGION'],
-      :aws_access_key_id     => (access or ENV['AWS_ACCESS_KEY']),
-      :aws_secret_access_key => (secret or ENV['AWS_SECRET_KEY'])
+    auth = { :aws_access_key_id     => (access or ENV['AWS_ACCESS_KEY']),
+             :aws_secret_access_key => (secret or ENV['AWS_SECRET_KEY']) }
+    auth = { :use_iam_profile       => true } unless auth.values.all?
+    @options.merge!(auth)
+    { :region                       => ENV['AWS_DEFAULT_REGION'],
     }.each{|k,v| @options.merge!(k=>v) if v }
   end
   def respond_to?(sym)
@@ -153,8 +154,16 @@ def main
   norm       = (ARGV.delete("--srv-singleton") or not
                 ARGV.delete("--no-srv-singleton"))
   use_iam_profile = ARGV.delete("--use-iam-profile")
+  zone = nil
+  while i = ARGV.index('--zone')
+    raise 'Zone already set...' if zone
+    ARGV.delete_at(i)
+    zone = ARGV[i]
+    ARGV.delete_at(i)
+  end
   aws = CLIAWS.new
   aws.options[:use_iam_profile] = true if use_iam_profile
+  aws.options[:zone] = zone if zone
   types = nil
   while i = ARGV.index('--types')
     ARGV.delete_at(i)

data/lib/zonify.rb

@@ -19,12 +19,14 @@ class AWS
     def create(options)
       options_ec2 = options.merge( :provider=>'AWS',
                                    :connection_options=>{:nonblock=>false} )
+      options_ec2.delete(:zone)
       ec2 = Proc.new{|| Fog::Compute.new(options_ec2) }
       options_elb = options_ec2.dup.delete_if{|k, _| k == :provider }
       elb = Proc.new{|| Fog::AWS::ELB.new(options_elb) }
       options_r53 = options_ec2.dup.delete_if{|k, _| k == :region }
       r53 = Proc.new{|| Fog::DNS.new(options_r53) }
-      Zonify::AWS.new(:ec2_proc=>ec2, :elb_proc=>elb, :r53_proc=>r53)
+      options.merge!(:ec2_proc=>ec2, :elb_proc=>elb, :r53_proc=>r53)
+      Zonify::AWS.new(options)
     end
   end
   attr_reader :ec2_proc, :elb_proc, :r53_proc
@@ -35,6 +37,7 @@ class AWS
     @ec2_proc = opts[:ec2_proc]
     @elb_proc = opts[:elb_proc]
     @r53_proc = opts[:r53_proc]
+    @zone     = opts[:zone]
   end
   def ec2
     @ec2 ||= @ec2_proc.call
@@ -56,7 +59,11 @@ class AWS
   def route53_zone(suffix)
     suffix_ = Zonify.dot_(suffix)
     relevant_zone = r53.zones.select do |zone|
-      suffix_.end_with?(zone.domain)
+      if @zone
+        @zone == zone.id
+      else
+        suffix_.end_with?(zone.domain)
+      end
     end.sort_by{|zone| zone.domain.length }.last
     if relevant_zone
       relevant_records = relevant_zone.records.all!.map do |rr|
@@ -70,9 +77,19 @@ class AWS
   # Apply a changeset to the records in Route53. The records must all be under
   # the same zone and suffix.
   def apply(changes, comment='Synced with Zonify tool.')
-    # Dumb way to do this because I can not figure out #reject!
-    keep = changes.select{|c| c[:value].length <= 100 }
-    filtered = changes.select{|c| c[:value].length > 100 }
+    filtered = changes.select{|change| change[:value].length > 100 }
+    # For all the SRV records that were considered too long, get the names of
+    # the associated weighted CNAMEs.
+    filtered_correlates = filtered.map do |change|
+      case change[:name]
+      when /^_[*][.]_[*][.]/
+        change[:name][6, change[:name].length]
+      end
+    end.compact
+    keep = changes.select do |change|
+      change[:value].length <= 100 and not
+        filtered_correlates.include?(change[:name])
+    end
     unless keep.empty?
       suffix  = keep.first[:name] # Works because of longest submatch rule.
       zone, _ = route53_zone(suffix)
@@ -85,14 +102,18 @@ class AWS
             acc
           end
         end
-        r53.change_resource_record_sets(zone.id, rekeyed, :comment=>comment)
+        begin
+          r53.change_resource_record_sets(zone.id, rekeyed, :comment=>comment)
+        rescue Fog::Errors::Error => e
+          STDERR.puts("Failed with some records, due to:\n#{e}")
+        end
       end
     end
     filtered
   end
   def instances
     ec2.servers.inject({}) do |acc, i|
-      dns = i.dns_name
+      dns = (i.dns_name or i.private_dns_name)
       # The default hostname for EC2 instances is derived from their internal
       # DNS entry.
       terminal_states = %w| terminated shutting-down |
@@ -294,7 +315,7 @@ def cname_multitudinous(tree)
       if 'SRV' == type and 1 < data[:value].length
         wrrs = data[:value].inject({}) do |accumulator, rr|
           server = Zonify.dot_(rr.sub(/^([^ ]+ +){3}/, '').strip)
-          id = server.split('.').first # Always the isntance ID.
+          id = server.split('.').first # Always the instance ID.
           accumulator[id] = data.merge(:value=>[server], :weight=>"16")
           accumulator
         end
@@ -434,7 +455,7 @@ end
 LDH_RE = /^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])$/
 def string_to_ldh_component(s)
   LDH_RE.match(s) ? s.downcase : s.downcase.gsub(/[^a-z0-9-]/, '-').
-                                            sub(/(^[-]+|[-]+$)/, '')[0...64]
+                                            sub(/(^[-]+|[-]+$)/, '')[0...63]
 end
 
 def string_to_ldh(s)
@@ -602,4 +623,3 @@ end
 RRTYPE_RE = /^([*]|[A-Z0-9-]+)$/
 
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zonify
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Jason Dusek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog