r53z 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cadc6896a66b6d8b2ebf236434f0e927a64181c5
-  data.tar.gz: 5b2fae7827027b48628d85205606c7d3886c4ea3
+  metadata.gz: cbefca21e3aaf8ddf5f9898696868aecbe8ec550
+  data.tar.gz: 7c064f9024e238ed16a4d1d76e986f2f5b39218a
 SHA512:
-  metadata.gz: adb8ab8ccc1507c842c2d651d1540f5dc932adfb049f47f5e2ed27273f3e3e1ae86558b6ac4a25b7b8a4d3cdd5a2e5a816162d9cece0385c9e2db0303c0b492e
-  data.tar.gz: 7c839ca913e0ee1f694f631a54c6c0c1bbfb4014543f87b4ccb9050ee0aa77b76c084e69942d2eab258e90b583464f71f6a83a17912742aa15ba16cbf3d714c2
+  metadata.gz: 4c23a1baba90b83bd42f0f1d62eaca1ad8e29e9b44c8a8b5fdb3c94d11a1c9f2a104f60422899d496ad1941f2f92a6050beda845e6b3981d6c64ade114895f1c
+  data.tar.gz: 1de9e5ba20d9d8230f16c60270c88e23ca3f9c86709b10e3acf62f8db0a5d29a014b01c3f1b4f9f82b19fa29ea3eae6eb50e7b2c3ef401d74e39a2908794ff94

data/Gemfile.lock

@@ -16,12 +16,12 @@ GEM
       ffi (~> 1.9.10)
       rspec-expectations (>= 2.99)
       thor (~> 0.19)
-    aws-sdk (2.3.18)
-      aws-sdk-resources (= 2.3.18)
-    aws-sdk-core (2.3.18)
+    aws-sdk (2.3.11)
+      aws-sdk-resources (= 2.3.11)
+    aws-sdk-core (2.3.11)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.18)
-      aws-sdk-core (= 2.3.18)
+    aws-sdk-resources (2.3.11)
+      aws-sdk-core (= 2.3.11)
     builder (3.2.2)
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)

data/bin/r53z

@@ -17,16 +17,19 @@ class App
   description "Simple CLI to manage, backup, and restore, Route 53 zones"
   #
   # Accept flags via:
-  on("-x", "--export", "Export zones to files in specified directory, optionally specify one or more zones")
-  on("-r", "--restore", "Restore zone from directory, optionally specify one or more zones")
-  on("-l", "--list", "List name and ID of one or all zones")
-  on("-s", "--record-sets", "List record sets for the given zone")
+  on("-x", "--export", "Export zones to files in specified directory, optionally specify one or more zones.")
+  on("-r", "--restore", "Restore zone from directory, optionally specify one or more zones.")
+  on("-l", "--list", "List name and ID of one or all zones.")
+  on("-s", "--record-sets", "List record sets for the given zone.")
+  on("-c NAME", "--create", "Create a zone with the given name and optional --comment and --delegation-set.")
+  on("-n COMMENT", "--comment", "Optional comment when creating a zone.")
   on("-d", "--delete", "Delete one or more zone(s) by name (WARNING: No confirmation!)")
-  on("-c", "--credentials", "File containing credentials information")
-  on("-u", "--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 all delegation sets")
-  on("-n ID", "--name-servers", "List name servers for delegation set")
+  on("-C", "--credentials", "File containing credentials information.")
+  on("-u", "--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("-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

@@ -11,7 +11,7 @@ module R53z
       creds = R53z::Config.new(config_file)
       @client = R53z::Client.new(section, creds)
 
-      # XXX Dispath table seems smarter...can't figure out how to calls methods based
+      # XXX Dispath table seems smarter...can't figure out how to call methods based
       # directly on hash keys at the moment.
       if options[:export]
         help_now! "Export requires a directory path for zone files" if args.length < 1
@@ -20,7 +20,7 @@ module R53z
 
       if options[:restore]
         if args.empty?
-          help_now! "Restore requires a directory containing zone files and optionally one or more zones to restore"
+          help_now! "Restore requires a directory containing zone files and optionally one or more zones to restore."
         end
         restore(:options => options, :args => args)
       end
@@ -29,34 +29,45 @@ module R53z
         list(options: options, args: args)
       end
 
+      if options[:create]
+        create(options)
+      end
+
       if options[:delete]
         if args.empty?
-          help_now! "Delete requires one or more zone names"
+          help_now! "Delete requires one or more zone names."
         end
         args.each do |name|
-          @client.delete(name)
+          if @client.list(name: name).any?
+            @client.delete(name)
+          else
+            exit_now! "Could not locate zone named " + name
+          end
         end
       end
 
       if options['list-delegation-sets']
-        sets = @client.list_delegation_sets
-        sets.each do |set|
-          puts JSON.pretty_generate(set.to_h)
+        delegation_sets(args)
+      end
+
+      if options['delete-delegation-sets']
+        if args.empty?
+          help_now! "Delete delegation sets requires one or more delegation set IDs."
+        end
+        args.each do |id|
+          @client.delete_delegation_set(id: id)
         end
       end
 
       if options['record-sets']
         if args.empty?
-          help_now! "List record sets requires one or more zone names"
-        end
-        args.each do |name|
-          sets = @client.record_list(@client.get_zone_id(name))
-          puts JSON.pretty_generate(sets)
+          help_now! "List record sets requires one or more zone names."
         end
+        record_sets(args)
       end
 
       if options['name-servers']
-        dset = @client.get_delegation_set(id: options['name-servers'])
+        dset = @client.get_delegation_set(options['name-servers'])
         puts JSON.pretty_generate(dset.delegation_set[:name_servers])
       end
     end
@@ -112,6 +123,56 @@ module R53z
         )
       end
     end
+
+    def create(options)
+      # Populate a zone hash
+      zone_data = {:hosted_zone => { :hosted_zone_config => {}}, :delegation_set =>{}}
+      zone_data[:hosted_zone][:name] = options[:create]
+      if options[:comment]
+        zone_data[:hosted_zone][:config] = {}
+        zone_data[:hosted_zone][:config][:comment] = options[:comment]
+      end
+      if options['delegation-set']
+        zone_data[:delegation_set][:id] = options['delegation-set']
+      end
+      @client.create(info: zone_data)
+    end
+
+    def delegation_sets(args)
+      # show them all
+      if args.empty?
+        sets = @client.list_delegation_sets
+        sets.each do |set|
+          puts JSON.pretty_generate(set.to_h)
+        end
+      else # only show specified zones
+        args.each do |name|
+          dset_id = @client.get_delegation_set_id(name)
+          if dset_id
+            dset = @client.get_delegation_set(dset_id)
+            puts JSON.pretty_generate(dset.delegation_set.to_h)
+          else
+            exit_now!("Could not find a delegation set for " + name)
+          end
+        end
+      end
+    end
+
+    def record_sets(args)
+      args.each do |name|
+        zone_id = @client.get_zone_id(name)
+        if zone_id
+          sets = @client.list_records(@client.get_zone_id(name))
+        else
+          exit_now!("Could not locate zone " + name)
+        end
+        if sets
+          puts JSON.pretty_generate(sets)
+        else
+          exit_now!("Could not locate record list for " + name)
+        end
+      end
+    end
   end
 end
 

data/lib/r53z/client.rb

@@ -23,22 +23,24 @@ module R53z
       end
 
       rv = []
-      zones.each do |zone|
-        if name
-          unless name[-1] == '.'
-            name = name + '.'
-          end
-          unless name == zone[:name]
-            next
+      if zones
+        zones.each do |zone|
+          if name
+            unless name[-1] == '.'
+              name = name + '.'
+            end
+            unless name == zone[:name]
+              next
+            end
           end
+          rv.push({:name => zone[:name], :id => zone[:id]})
         end
-        rv.push({:name => zone[:name], :id => zone[:id]})
       end
       rv
     end
 
     # Create zone with record(s) from an info and records hash
-    def create(info:, records:)
+    def create(info:, records: nil)
       rv = {} # pile up the responses in a single hash
       #if self.list(info[:name]).any?
       #  error(info[:name] + "exists")
@@ -47,37 +49,39 @@ module R53z
       # hosted_zone_config on create/restore. argh.
       # XXX: also, private_zone is not accepted here for some reason
       zone = info[:hosted_zone]
-      zone_data = {
-        :name => zone[:name],
-        :caller_reference => 'r53z-create-' + self.random_string,
-        :hosted_zone_config => {
-          :comment => zone[:config][:comment]
-        }
-      }
-      # command line overrides everything else
-      if options['delegation-set']
-        zone_data[:delegation_set_id] = options['delegation-set']
-      elsif info[:delegation_set] and info[:delegation_set][:id]
+      # Populate a zone_data hash with options for zone creation
+      zone_data = {}
+      zone_data[:name] = zone[:name]
+      zone_data[:caller_reference] = 'r53z-create-' + self.random_string
+      if zone[:config] and zone[:config][:comment]
+        zone_data[:hosted_zone_config] = {}
+        zone_data[:hosted_zone_config][:comment] = zone[:config][:comment]
+      end
+      if info[:delegation_set] and info[:delegation_set][:id]
         zone_data[:delegation_set_id] = info[:delegation_set][:id]
       end
       zone_resp = self.client.create_hosted_zone(zone_data)
       rv[:hosted_zone_resp] = zone_resp
+
       rv[:record_set_resp] = []
-      records.each do |record|
-        # skip these, as they are handled separately (delegation set?)
-        unless (record[:type] == "NS" || record[:type] == "SOA")
-          record_resp = self.client.change_resource_record_sets({
-            :hosted_zone_id => zone_resp[:hosted_zone][:id],
-            :change_batch => {
-              :changes => [
-                {
-                  :action => "CREATE",
-                  :resource_record_set => record
-                }
-              ]
-            }
-          })
-          rv[:record_set_resp].push(record_resp)
+      # Optionally populate records
+      if records
+        records.each do |record|
+          # skip these, as they are handled separately (delegation set?)
+          unless (record[:type] == "NS" || record[:type] == "SOA")
+            record_resp = self.client.change_resource_record_sets({
+              :hosted_zone_id => zone_resp[:hosted_zone][:id],
+              :change_batch => {
+                :changes => [
+                  {
+                    :action => "CREATE",
+                    :resource_record_set => record
+                  }
+                ]
+              }
+            })
+            rv[:record_set_resp].push(record_resp)
+          end
         end
       end
       return rv
@@ -94,7 +98,7 @@ module R53z
     # delete all of the resource record sets in a zone (this is required to delete
     # a zone
     def delete_all_rr_sets(zone_id)
-      self.record_list(zone_id).reject do |rs|
+      self.list_records(zone_id).reject do |rs|
         (rs[:type] == "NS" || rs[:type] == "SOA")
       end.each do |record_set|
         self.client.change_resource_record_sets({
@@ -123,7 +127,7 @@ module R53z
       # dump the record sets
       R53z::JsonFile.write_json(
         path: File.join(dirpath, name),
-        data: self.record_list(zone_id))
+        data: self.list_records(zone_id))
 
       # Dump the zone metadata, plus the delegated set info
       out = { :hosted_zone => 
@@ -154,7 +158,7 @@ module R53z
       self.create(:info => info, :records => records)
     end
 
-    def record_list(zone_id)
+    def list_records(zone_id)
       records = self.client.list_resource_record_sets(hosted_zone_id: zone_id)
       rv = []
       records[:resource_record_sets].each do |record|

data/lib/r53z/version.rb

@@ -1,3 +1,3 @@
 module R53z
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/r53z.gemspec

@@ -13,19 +13,12 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Simple zone manager for Route 53.}
   spec.homepage      = "http://github.com/swelljoe/r53z"
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = 'http://blahblah.mygemserver.com'
-  else
-    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  end
-
   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.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.1.0'
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency('rdoc')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r53z
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Joe Cooper
@@ -14,126 +14,126 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: methadone
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.2
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -143,7 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -164,25 +164,24 @@ files:
 homepage: http://github.com/swelljoe/r53z
 licenses:
 - gplv3
-metadata:
-  allowed_push_host: http://blahblah.mygemserver.com
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Simple zone manager for Route 53.