zonify 0.4.3 → 0.4.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1e30191a3ca007c303fe49c7e5ae55d9dbb1f29f
+  data.tar.gz: e7f5d12cc76788684ab3940786ed741290a06a50
+SHA512:
+  metadata.gz: b5ed894a4cd3b0d60318e25ea352e9b283a65fc74582bdc3a388df5e346d8ebe2779ad2b68d92d6482b2113c189ad968a947f0c51ec3eb341983987597ca4252
+  data.tar.gz: 9f7d532d7d0cad92a4a485162d0767a43dda163e08449b5e59a1f2b880df32fed0fe82c775e4042b27e574cfbc9d7b25d5359f51a97f4958795522a92caf7a15

data/README

@@ -34,6 +34,10 @@ DESCRIPTION
 
        AWS_REGION=eu-west-1
 
+       One  may  specify --use-iam-profile option to configure the zonify tool
+       with AWS IAM-provided access and secret keys. This capability is avail-
+       able only when running the tool on an EC2 instance with an IAM role.
+
        The  Zonify  subcommands  allow  staged  generation, transformation and
        auditing of entries as well as straightforward,  one-step  synchroniza-
        tion.

data/bin/zonify

@@ -18,7 +18,7 @@ class CLIAWS
     @options = {}
     @options.merge!(options) if options
     env_adapter
-    { :region                => ENV['AWS_REGION'],
+    { :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'])
     }.each{|k,v| @options.merge!(k=>v) if v }
@@ -27,8 +27,9 @@ class CLIAWS
     aws.respond_to?(sym)
   end
   def env_adapter
-    [ %w| AWS_ACCESS_KEY_ID     AWS_ACCESS_KEY |,
-      %w| AWS_SECRET_ACCESS_KEY AWS_SECRET_KEY | ].each do |a, b|
+    [ %w| AWS_REGION            AWS_DEFAULT_REGION |,
+      %w| AWS_ACCESS_KEY_ID     AWS_ACCESS_KEY     |,
+      %w| AWS_SECRET_ACCESS_KEY AWS_SECRET_KEY     | ].each do |a, b|
       ENV[a] = ENV[b] if ENV[b]     # Ensure new variable takes precedence.
       ENV[b] = ENV[a] unless ENV[b]
     end
@@ -151,7 +152,9 @@ def main
   netlogging = (ARGV.delete("-n") or ARGV.delete("--net"))
   norm       = (ARGV.delete("--srv-singleton") or not
                 ARGV.delete("--no-srv-singleton"))
+  use_iam_profile = ARGV.delete("--use-iam-profile")
   aws = CLIAWS.new
+  aws.options[:use_iam_profile] = true if use_iam_profile
   types = nil
   while i = ARGV.index('--types')
     ARGV.delete_at(i)
@@ -183,13 +186,22 @@ def main
       Zonify::YAML.trim_lines(dumped).join.sub(/ *\[\]$/,'')
     end.join
     STDOUT.write entries
+  when 'merge'
+    parsed = ARGV[1..-1].map{|path| Zonify::YAML.read(File.read(path)) }
+    unless parsed.empty?
+      suffix, records = parsed[0]
+      rebased = parsed[1..-1].map do |sfx, recs|
+        Zonify::Mappings.rewrite(recs, [[sfx,[suffix]]])
+      end
+      STDOUT.write Zonify::YAML.format(Zonify.merge(records, *rebased), suffix)
+    end
   when 'diff'
     suffix, old_records = Zonify::YAML.read(File.read(ARGV[1]))
     new_suffix, new_records = Zonify::YAML.read(File.read(ARGV[2]))
     qualified = Zonify::Mappings.rewrite(new_records, [[new_suffix,[suffix]]])
     changes = Zonify.diff(qualified, old_records, (types or %w| * |))
     STDERR.puts(display(changes)) unless quiet
-    STDOUT.write(Zonify::YAML.trim_lines(YAML.dump(changes)))
+    STDOUT.write(Zonify::YAML.trim_lines(YAML.dump(changes)).join)
   when 'sync'
     suffix = ARGV[1]
     check_name(suffix)
@@ -214,7 +226,7 @@ def main
     _, old_records = aws.route53_zone(suffix)
     changes = Zonify.diff(mapped, old_records, (types or %w| CNAME SRV |))
     STDERR.puts(display(changes)) unless quiet
-    STDOUT.write(Zonify::YAML.trim_lines(YAML.dump(changes)))
+    STDOUT.write(Zonify::YAML.trim_lines(YAML.dump(changes)).join)
   when 'summarize'
     handle = ARGV[1] ? File.open(ARGV[1]) : STDIN
     changes = yaml_with_default(handle, [])

data/lib/zonify.rb

@@ -95,7 +95,8 @@ class AWS
       dns = i.dns_name
       # The default hostname for EC2 instances is derived from their internal
       # DNS entry.
-      unless dns.nil? or dns.empty? or i.state == 'terminated'
+      terminal_states = %w| terminated shutting-down |
+      unless dns.nil? or dns.empty? or terminal_states.member? i.state
         groups = (i.groups or [])
         attrs = { :sg => groups,
                   :tags => (i.tags or []),
@@ -111,7 +112,7 @@ class AWS
   def load_balancers
     elb.load_balancers.map do |elb|
       { :instances => elb.instances,
-        :prefix    => Zonify.cut_down_elb_name(elb.dns_name) }
+        :prefix    => Zonify.cut_down_elb_name(elb.dns_name.downcase) }
     end
   end
   def eips
@@ -170,8 +171,8 @@ def zone(hosts, elbs)
   host_records = hosts.map do |id,info|
     name = "#{id}.inst."
     priv = "#{info[:priv]}.priv."
-    [ Zonify::RR.cname(name, info[:dns], '86400'),
-      Zonify::RR.cname(priv, info[:dns], '86400'),
+    [ Zonify::RR.cname(name, info[:dns], '600'),
+      Zonify::RR.cname(priv, info[:dns], '600'),
       Zonify::RR.srv('inst.', name) ] +
     info[:tags].map do |tag|
       k, v = tag
@@ -464,17 +465,31 @@ end
 module YAML
 extend self
   def format(records, suffix='')
-   _suffix_ = Zonify._dot(Zonify.dot_(suffix))
-   entries = records.keys.sort.map do |k|
-     dumped = ::YAML.dump(k=>records[k])
-     Zonify::YAML.trim_lines(dumped).map{|ln| '  ' + ln }.join
-   end.join
-   "suffix: #{_suffix_}\nrecords:\n" + entries
+    _suffix_ = Zonify._dot(Zonify.dot_(suffix))
+    entries = records.keys.sort.map do |k|
+      if k == 'CNAME'
+        STDERR.puts(::YAML.dump(records))
+        abort "A problem was found // #{ARGV[0]}"
+      end
+      [ k + ":\n" ] + records[k].keys.sort_by{|kk| kk.to_s }.map do |kk|
+        sorted = Zonify::YAML.sorted_hash(records[k][kk])
+        lines = Zonify::YAML.trim_lines(sorted)
+        [ kk + ":\n" ] + lines.map{|ln| '  ' + ln }
+      end.flatten.map{|ln| '  ' + ln }
+    end.flatten.map{|ln| '  ' + ln }.join
+    "suffix: #{_suffix_}\nrecords:\n" + entries
+  end
+  def sorted_hash(h)
+    result = ::YAML::quick_emit(h.object_id, {}) do |out|
+      out.map("") do |map|
+        h.keys.sort_by{|k| k.to_s }.each{|k| map.add(k, h[k]) }
+      end
+    end
   end
   def read(text)
     yaml = ::YAML.load(text)
-    if yaml['suffix'] and yaml['records']
-      [yaml['suffix'], yaml['records']]
+    if yaml['suffix']
+      [yaml['suffix'], (yaml['records'] or {})]
     end
   end
   def trim_lines(yaml)

metadata

@@ -1,85 +1,64 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: zonify
-version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 3
-  version: 0.4.3
+version: !ruby/object:Gem::Version
+  version: 0.4.6
 platform: ruby
-authors: 
-- Airbnb
+authors:
+- Jason Dusek
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-10-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fog
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Zonify provides a command line tool for generating DNS records from EC2
   instances, instance tags, load balancers and security groups. A mechanism for
   syncing these records with a zone stored in Route 53 is also provided.
-
-email: contact@airbnb.com
-executables: 
+email: oss@solidsnack.be
+executables:
 - zonify
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/zonify/log.rb
+files:
 - lib/zonify.rb
 - README
 - bin/zonify
-homepage: https://github.com/airbnb/zonify
-licenses: 
+homepage: https://github.com/solidsnack/zonify
+licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Generate DNS information from EC2 metadata.
 test_files: []
-

data/lib/zonify/log.rb

@@ -1,36 +0,0 @@
-require 'time'
-
-require 'sqlite3'
-
-module Zonify
-module Log
-
-class SQLite
-  attr_reader :connection_string, :connection
-  def initialize(connection_string=':memory:')
-    @connection_string = connection_string
-    @connection = SQLite3::Database.new(@connection_string) 
-  end
-
-  def log(record)
-    name, type, ttl, value,
-    weight, set           = [ record[:name],   record[:type],
-                              record[:ttl],    record[:value],
-                              record[:weight], record[:set_identifier] ]
-    name, type, ttl, value,
-    weight, set           = [ record[:name],   record[:type],
-                              record[:ttl],    record[:value],
-                              record[:weight], record[:set_identifier] ]
-  end
-end
-
-extend self
-
-def now
-  x = Time.now.utc
-  x.iso8601.sub('T', ' ').sub('Z','.') + ("%0.3f" % x.to_f).split('.').last
-end
-
-end
-end
-