r53z 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a76e281d58be3c97125591da8dd480f32cc6cb5
-  data.tar.gz: 68e49615f4b31b8f390e2c92c0b4eeb7d36251e4
+  metadata.gz: 83c9097772ffb2446770deb433f151234c7d48c6
+  data.tar.gz: f4c97405669e49664f15461cea6df4edb0dbc8da
 SHA512:
-  metadata.gz: 0f3e3e61987f2387d890147b5d71945b6cbb8a815ec35640f6d7c773943651d075eadd0ef19f1b7569f4dbb0f883cf30451325332e170802e98a0ef6233277a5
-  data.tar.gz: 90e2b3812b188c15a6f556eda3d3047eecf70fd4eeafbff9df995f2f8c671ddc71933a809433e9caa6d11afccc8b0a6e840371365d23562279f213e2d9fe561d
+  metadata.gz: 72b8bee3563a3eb8804473695ff5c9fe0d58115d544aef2b4fab69a098c26709b3f272fe0fdd0550ebad446ff4b2404f0f3d25ddb673c7d98f5ae492e729563c
+  data.tar.gz: b942db9c3fc19c72b056b75cf388271e3c85222a62426e04bff7b64a9a606b3e2017a3d5efcbfd76a0c2e74c7fc04dee84ade1807e6e8fa6cf02a979acdccfbd

data/.gitignore

@@ -45,9 +45,9 @@ build-iPhoneSimulator/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
+Gemfile.lock
+.ruby-version
+.ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    r53z (0.3.1)
+    r53z (0.3.3)
       aws-sdk
       inifile
       methadone (~> 1.9.2)

data/README.md

@@ -4,6 +4,8 @@ A simple CLI, REPL, and library for managing Route 53. It's primary purpose is t
 
 ## Installation
 
+r53z currently requires version 2.1.0 of Ruby, or greater (due to use of named method arguments without default values).
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -14,12 +16,14 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
+Or install it yourself as (it's on rubygems.org, but installation of the binary isn't working right yet, will be fixed sooon):
 
     $ gem install r53z
 
 ## Usage
 
+**NOTE:** Don't get too attached to the current CLI options. I'm rewriting the option parser to use sub-commands in the near future. So, if you love it like it is (surely, nobody could love it like it is), you'll need to lock in a version that still has this parser.
+
 Configure a credentials file in `~/.aws/credentials` (this should be an INI file; same as several other AWS utilities expect). It'll look something like this:
 
 ```ini
@@ -36,7 +40,7 @@ Usage: r53z [options] [args...]
 
 Simple CLI to manage, backup, and restore, Route 53 zones
 
-v0.2.0
+v0.3.0
 
 Options:
     -h, --help                       Show command line help
@@ -118,6 +122,39 @@ $ r53z --delete swelljoe.com virtualmin.com
 
 Specify the credentials configuration file on the command line. The file must be an INI file. By default, it will look for a file in ~/.aws/credentials (which is common across several AWS management tools). You can use the `--section` option to choose what section of the file to use.
 
+## More Examples
+
+### Working With Delegation Sets
+
+Finding the delegation set of a zone, and backing up all zones that share that delegation set:
+
+```
+$ r53z --list-delegation-sets swelljoe.com
+{
+  "id": "/delegationset/NKXKQ56JI1ZGT",
+  "caller_reference": "r53z-create-del-set-hh0xf3dm0xp7nuvt",
+  "name_servers": [
+    "ns-885.awsdns-46.net",
+    "ns-2016.awsdns-60.co.uk",
+    "ns-417.awsdns-52.com",
+    "ns-1299.awsdns-34.org"
+  ]
+}
+$ r53z --export ~/dumps --delegation-set "/delegationset/NKXKQ56JI1ZGT"
+```
+
+Creating a new zone with an existing delegation set:
+
+```
+$ r53z --create swelljoe.com --comment "dootdoot" --delegation-set "/delegationset/NKXKQ56JI1ZGT"
+```
+
+Restoring a zone into a specific delegation set (this will override the delegation set specified in the dump file):
+
+```
+$ r53z --restore ~/dumps swelljoe.com --delegation-set "/delegationset/NKXKQ56JI1ZGT"
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/bin/r53z

@@ -28,7 +28,8 @@ class App
   on("-u SECTION", "--section", "Section (user) in the credentials file to use.")
   on("-g ID", "--delegation-set", "Delegation set ID to use for various operations.")
   on("-t", "--list-delegation-sets", "List delegation set for named zone, or all sets if no zone specified.")
-  on("-D", "--delete-delegation-sets", "Delete one or more delegation sets by ID (WARNING: No confirmation!")
+  on("-S", "--create-delegation-sets", "Create one or more delegation sets, optionally associated with listed zones.")
+  on("-D", "--delete-delegation-sets", "Delete one or more delegation sets by ID (WARNING: No confirmation!)")
   on("-N ID", "--name-servers", "List name servers for delegation set.")
   # args greedily grabs any files or zones listed after the options
   arg(:args, :any)

data/lib/r53z/cli.rb

@@ -14,15 +14,18 @@ module R53z
       # XXX Dispatch table seems smarter...can't figure out how to call methods based
       # directly on hash keys at the moment.
       if options[:export]
+        unless options[:export].is_a? String
+          exit_now! "Export must have a valid directory path for dump files."
+        end
         unless Dir.exists?(File.expand_path(options[:export]))
-          help_now! "Export requires a directory path for zone files."
+          exit_now! "Directory " + options[:export] + " does not exist."
         end
         export(:options => options, :args => args)
       end
 
       if options[:restore]
         unless Dir.exists?(File.expand_path(options[:restore]))
-          help_now! "Restore requires a directory containing zone files and optionally one or more zones to restore."
+          exit_now! "Restore requires a directory containing zone files and optionally one or more zones to restore."
         end
         restore(:options => options, :args => args)
       end
@@ -37,7 +40,7 @@ module R53z
 
       if options[:delete]
         if args.empty?
-          help_now! "Delete requires one or more zone names."
+          exit_now! "Delete requires one or more zone names."
         end
         args.each do |name|
           if @client.list(name: name).any?
@@ -52,9 +55,13 @@ module R53z
         delegation_sets(args)
       end
 
+      if options['create-delegation-sets']
+        create_delegation(args)
+      end
+
       if options['delete-delegation-sets']
         if args.empty?
-          help_now! "Delete delegation sets requires one or more delegation set IDs."
+          exit_now! "Deleting delegation sets requires one or more delegation set IDs."
         end
         args.each do |id|
           @client.delete_delegation_set(id: id)
@@ -63,7 +70,7 @@ module R53z
 
       if options['record-sets']
         if args.empty?
-          help_now! "List record sets requires one or more zone names."
+          exit_now! "List record sets requires one or more zone names."
         end
         record_sets(args)
       end
@@ -109,8 +116,10 @@ module R53z
         end
       end
 
+      delegation = options['delegation-set'] or nil
+
       zones.each do |zone|
-        @client.restore(path, zone)
+        @client.restore(path, zone, delegation)
       end
     end
 
@@ -143,6 +152,10 @@ module R53z
       @client.create(info: zone_data)
     end
 
+    def add_record(options, args)
+      # Populate record set hash
+    end
+
     def delegation_sets(args)
       # show them all
       if args.empty?
@@ -163,6 +176,30 @@ module R53z
       end
     end
 
+    def create_delegation(args)
+      # further validation
+      zones = []
+      # No zones specified, create a new unassociated delegation set
+      if args.empty?
+        @client.create_delegation_set
+      end
+
+      args.each do |name|
+        # Make sure at least one specified zone exists
+        if @client.list(name: name)
+          zones.push(name)
+        else
+          puts "Couldn't locate zone " + name unless @client.list(name)
+        end
+        if zones.empty?
+          exit_now! "Couldn't find any of the specified zones."
+        end
+        zones.each do |zone|
+          @client.create_delegation_set(@client.get_zone_id(zone))
+        end
+      end
+    end
+
     def record_sets(args)
       args.each do |name|
         zone_id = @client.get_zone_id(name)

data/lib/r53z/client.rb

@@ -13,30 +13,47 @@ module R53z
     end
 
     # list one or all zones by name and ID
+    # XXX Should ideally be a lazy iterator, need to read up on how that's
+    # done in Ruby.
     def list(name: nil, delegation_set_id: nil)
-      begin
-        zones = self.client.list_hosted_zones(
-          delegation_set_id: delegation_set_id
-          )['hosted_zones']
-      rescue Aws::Route53::Errors::ServiceError
-        error "Failed to list zones" # XXX How do we get AWS error message out of it?
-      end
-
       rv = []
-      if zones
-        zones.each do |zone|
-          if name
-            unless name[-1] == '.'
-              name = name + '.'
-            end
-            unless name == zone[:name]
-              next
-            end
+      if name
+        name = name.to_s + "." unless name[-1] == '.'
+        zone = self.client.list_hosted_zones_by_name({
+          dns_name: name,
+          max_items: 1
+        })
+        # Response will always contain some zone, even if the one
+        # we want doesn't exist...so, if no match, return empty set
+        if zone.hosted_zones.first and zone.hosted_zones.first.name == name
+          rv.push({
+            :name => zone.hosted_zones.first.name,
+            :id =>   zone.hosted_zones.first.id,
+          })
+        end
+      else
+        is_truncated = true
+        marker = nil
+        # If more than 100, will be divided into sets, so we have to
+        # poll multiple times
+        while is_truncated
+          if marker
+            resp = self.client.list_hosted_zones(
+              delegation_set_id: delegation_set_id,
+              marker: marker,
+              )
+          else
+            resp = self.client.list_hosted_zones(
+              delegation_set_id: delegation_set_id)
+          end
+          is_truncated = resp['is_truncated']
+          marker = resp['next_marker']
+          resp['hosted_zones'].each do |z|
+            rv.push({:name => z[:name], :id => z[:id]})
           end
-          rv.push({:name => zone[:name], :id => zone[:id]})
         end
       end
-      rv
+      return rv
     end
 
     # Create zone with record(s) from an info and records hash
@@ -145,7 +162,7 @@ module R53z
 
     # Restore a zone from the given path. It expects files named
     # zone.zoneinfo.json and zone.json
-    def restore(path, domain)
+    def restore(path, domain, delegation = nil)
       # normalize domain
       unless domain[-1] == '.'
         domain = domain + '.'
@@ -153,6 +170,10 @@ module R53z
       # Load up the zone info file
       file = File.join(path, domain)
       info = R53z::JsonFile.read_json(path: file + "zoneinfo")
+      if delegation
+        # inject the specified delegation set into info, overriding file
+        info[:delegation_set] = {:id => delegation }
+      end
       records = R53z::JsonFile.read_json(path: file)
       # create the zone and the record sets
       self.create(:info => info, :records => records)

data/lib/r53z/version.rb

@@ -1,3 +1,3 @@
 module R53z
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/r53z.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://github.com/swelljoe/r53z"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir        = "bin"
+  spec.executables   = "r53z" 
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = '>= 2.1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r53z
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Joe Cooper
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,7 +139,8 @@ dependencies:
 description: 
 email:
 - swelljoe@gmail.com
-executables: []
+executables:
+- r53z
 extensions: []
 extra_rdoc_files: []
 files: