route53 0.1.8 → 0.2.0

data/README.markdown

@@ -6,7 +6,7 @@ This interface can either be used as a command line tool or as a library from wi
 Costs & Impact
 --------------
 
-At the time of this writing Amazon charges $1/zone/month. This includes zones that have been created and deleted and then recreated. The creator of this gem is not responsible for costs incurred while using this interface or unexpected oepration or bugs which may incur a cost for the user. The creator is also not responsible for any downtime incurred or disruption in service from the usage of this tool. DNS can be a tricky thing, be careful and always make sure you have a backup of your zone prior to mucking around with it. (route53 -l example.com.)
+At the time of this writing Amazon charges $1/zone/month. This includes zones that have been created and deleted and then recreated outside of the normal 12 hour grace period. The creator of this gem is not responsible for costs incurred while using this interface or unexpected oepration or bugs which may incur a cost for the user. The creator is also not responsible for any downtime incurred or disruption in service from the usage of this tool. DNS can be a tricky thing, be careful and always make sure you have a backup of your zone prior to mucking around with it. (route53 -l example.com.)
 
 Latest Version
 --------------
@@ -43,10 +43,10 @@ The first time you run the gem in command line mode you'll be prompted to setup.
     Please answer the following prompts.
     Amazon Access Key: []
     Amazon Secret Key: []
-    Amazon Route 53 API Version: [2010-10-01] 
-    Amazon Route 53 Endpoint: [https://route53.amazonaws.com/] 
-    Default TTL: [3600] 
-    Save the configuration file to "~/.route53"?: [Y] 
+    Amazon Route 53 API Version: [2011-05-05]
+    Amazon Route 53 Endpoint: [https://route53.amazonaws.com/]
+    Default TTL: [3600]
+    Save the configuration file to "~/.route53"?: [Y]
 
 Command Line Options
 --------------------
@@ -66,15 +66,19 @@ Command Line Options
         --name [NAME]                Specify a name for a record
         --type [TYPE]                Specify a type for a record
         --ttl [TTL]                  Specify a TTL for a record
+        --weight [WEIGHT]            Specify a Weight for a record
+        --ident [IDENTIFIER]         Specify a unique identifier for a record
         --values [VALUE1],[VALUE2],[VALUE3]
                                      Specify one or multiple values for a record
+        --zone-apex-id [ZONE_APEX_ID]
+                                     Specify a zone apex if for the record
     -m, --comment [COMMENT]          Provide a comment for this operation
         --no-wait                    Do not wait for actions to finish syncing.
     -s, --setup                      Run the setup ptogram to create your configuration file.
     -f, --file [CONFIGFILE]          Specify a configuration file to use
         --access [ACCESSKEY]         Specify an access key on the command line.
         --secret [SECRETKEY]         Specify a secret key on the command line. WARNING: Not a good idea
-
+        --no-upgrade                 Do not automatically upgrade the route53 api spec for this version.
 
 Command Line Usage
 ------------------
@@ -100,9 +104,20 @@ Once route53 is installed, started and has been setup you're ready to start. You
     #If updating values for a record, make sure to includ all other values. Otherwise they will be dropped
     route53 --zone example.com. -g --ttl 600
     
+    #Creating a record that corresponds to an Amazon ELB (zone apex support)
+    route53 --zone example.com. -c --name example. --zone-apex-id Z3DZXE0XXXXXXX --type A --values my-load-balancer-XXXXXXX.us-east-1.elb.amazonaws.com
+    
+    #Creating weighted record sets
+    route53 example.com. -c --name www.example.com. --weight 15 --ident "75 percent of traffic to pool1" --type CNAME --values pool1.example.com.
+    route53 example.com. -c --name www.example.com. --weight 5 --ident "25 percent of traffic to pool2" --type CNAME --values pool2.example.com.
+    
+    #Creating a wildcard domain
+    route53 example.com. -c --name *.example.com --type CNAME --values pool1.example.com.
+    
     #Deleting a zone - First remove all records except the NS and SOA record. Then delete the zone.
     route53 --zone example.com. -r
     route53 -d example.com.
+    
 
 Library Usage
 -------------

data/lib/route53.rb

@@ -19,7 +19,7 @@ module Route53
     attr_reader :endpoint
     attr_reader :verbose
     
-    def initialize(accesskey,secret,api='2010-10-01',endpoint='https://route53.amazonaws.com/',verbose=false)
+    def initialize(accesskey,secret,api='2011-05-05',endpoint='https://route53.amazonaws.com/',verbose=false)
       @accesskey = accesskey
       @secret = secret
       @api = api
@@ -165,14 +165,23 @@ module Route53
           #puts "Name:"+record.search("Name").first.innerText if @conn.verbose
           #puts "Type:"+record.search("Type").first.innerText if @conn.verbose
           #puts "TTL:"+record.search("TTL").first.innerText if @conn.verbose
-          record.search("Value").each do |val|
-            #puts "Val:"+val.innerText if @conn.verbose
-          end
+          #record.search("Value").each do |val|
+          #  #puts "Val:"+val.innerText if @conn.verbose
+          #end
+          zone_apex_records = record.search("HostedZoneId")
+          values = record.search("Value").map { |val| val.innerText }
+          values << record.search("DNSName").first.innerText unless zone_apex_records.empty?
+          weight_records = record.search("Weight")
+          ident_records = record.search("SetIdentifier")
           dom_records.push(DNSRecord.new(record.search("Name").first.innerText,
                         record.search("Type").first.innerText,
-                        record.search("TTL").first.innerText,
-                        record.search("Value").map { |val| val.innerText },
-                        self))
+                        (record.search("TTL").first.innerText if zone_apex_records.empty?),
+                        values,
+                        self,
+                        (zone_apex_records.first.innerText unless zone_apex_records.empty?),
+                        (weight_records.first.innerText unless weight_records.empty?),
+                        (ident_records.first.innerText unless ident_records.empty?)
+                        ))
         end
         
         truncated = (zone_file.search("IsTruncated").first.innerText == "true")
@@ -230,7 +239,7 @@ module Route53
 
       
     def initialize(resp,conn)
-      @raw_data = resp
+      @raw_data = unescape(resp)
       if error?
         $stderr.puts "ERROR: Amazon returned an error for the request."
         $stderr.puts "ERROR: RAW_XML: "+@raw_data
@@ -291,6 +300,10 @@ module Route53
     def to_s
       return @raw_data
     end
+    
+    def unescape(string)
+      string.gsub(/\\0(\d{2})/) { $1.oct.chr }
+    end
   end
   
   class DNSRecord
@@ -298,16 +311,22 @@ module Route53
     attr_reader :type
     attr_reader :ttl
     attr_reader :values
+    attr_reader :weight
+    attr_reader :ident
+    attr_reader :zone_apex
     
-    def initialize(name,type,ttl,values,zone)
+    def initialize(name,type,ttl,values,zone,zone_apex=nil,weight=nil,ident=nil)
       @name = name
       unless @name.end_with?(".")
         @name += "."
       end
-      @type = type
-      @ttl = ttl.upcase
+      @type = type.upcase
+      @ttl = ttl
       @values = values
       @zone = zone
+      @zone_apex = zone_apex
+      @weight = weight
+      @ident = ident
     end
     
     def gen_change_xml(xml,action)
@@ -316,14 +335,23 @@ module Route53
         change.ResourceRecordSet { |record|
           record.Name(@name)
           record.Type(@type)
-          record.TTL(@ttl)
-          record.ResourceRecords { |resources|
-            @values.each { |val|
-              resources.ResourceRecord { |record|
-                record.Value(val)
+          record.SetIdentifier(@ident) if @ident
+          record.Weight(@weight) if @weight
+          record.TTL(@ttl) unless @zone_apex
+          if @zone_apex
+            record.AliasTarget { |targets|
+              targets.HostedZoneId(@zone_apex)
+              targets.DNSName(@values.first)
+            }
+          else
+            record.ResourceRecords { |resources|
+              @values.each { |val|
+                resources.ResourceRecord { |record|
+                  record.Value(val)
+                }
               }
             }
-          }
+          end
         }
       }
     end
@@ -337,12 +365,13 @@ module Route53
     end
     
     #Need to modify to a param hash
-    def update(name,type,ttl,values,comment=nil)
+    def update(name,type,ttl,values,comment=nil, zone_apex = nil)
       prev = self.clone
       @name = name unless name.nil?
       @type = type unless type.nil?
       @ttl = ttl unless ttl.nil?
       @values = values unless values.nil?
+      @zone_apex = zone_apex unless zone_apex.nil?
       @zone.perform_actions([
           {:action => "DELETE", :record => prev},
           {:action => "CREATE", :record => self},
@@ -351,20 +380,28 @@ module Route53
     
     #Returns the raw array so the developer can update large batches manually
     #Need to modify to a param hash
-    def update_dirty(name,type,ttl,values)
+    def update_dirty(name,type,ttl,values,zone_apex = nil)
       prev = self.clone
       @name = name unless name.nil?
       @type = type unless type.nil?
       @ttl = ttl unless ttl.nil?
       @values = values unless values.nil?
+      @zone_apex = zone_apex unless zone_apex.nil?
       return [{:action => "DELETE", :record => prev},
       {:action => "CREATE", :record => self}]
     end
     
     def to_s
-      return "#{@name} #{@type} #{@ttl} #{@values.join(",")}"
+      if @weight
+        "#{@name} #{@type} #{@ttl} '#{@ident}' #{@weight} #{@values.join(",")}"
+      elsif @zone_apex
+        "#{@name} #{@type} #{@zone_apex} #{@values.join(",")}"
+      else
+        "#{@name} #{@type} #{@ttl} #{@values.join(",")}"
+      end
     end
   end
+
 end
 
     $messages = { "InvalidClientTokenId" => "You may have a missing or incorrect secret or access key. Please double check your configuration files and amazon account",
@@ -373,7 +410,7 @@ end
                   "Other" => "It looks like you've run into an unhandled error. Please send a detailed bug report with the entire input and output from the program to support@50projects.com or to https://github.com/pcorliss/ruby_route_53/issues and we'll do out best to help you.",
                   "SignatureDoesNotMatch" => "It looks like your secret key is incorrect or no longer valid. Please check your amazon account information for the proper key.",
                   "HostedZoneNotEmpty" => "You'll need to first delete the contents of this zone. You can do so using the '--remove' option as part of the command line interface.",
-                  "InvalidChangeBatch" => "You may have tried to delete a NS or SOA record. This error is safe to ignore if you're just trying to delete all records as part of a zone prior to deleting the zone. Otherwise please file a bug by sending a detailed bug report with the entire input and output from the program to support@50projects.com or to https://github.com/pcorliss/ruby_route_53/issues and we'll do out best to help you.",
+                  "InvalidChangeBatch" => "You may have tried to delete a NS or SOA record. This error is safe to ignore if you're just trying to delete all records as part of a zone prior to deleting the zone. Or you may have tried to create a record that already exists. Otherwise please file a bug by sending a detailed bug report with the entire input and output from the program to support@50projects.com or to https://github.com/pcorliss/ruby_route_53/issues and we'll do out best to help you.",
                   "ValidationError" => "Check over your input again to make sure the record to be created is valid. The error message should give you some hints on what went wrong. If you're still having problems please file a bug by sending a detailed bug report with the entire input and output from the program to support@50projects.com or to https://github.com/pcorliss/ruby_route_53/issues and we'll do out best to help you."}
                   
 

data/lib/route53/cli.rb

@@ -35,7 +35,8 @@ module Route53
         puts "\nFinished at #{DateTime.now}" if @options.verbose
         
       else
-        #puts "Usage Message"
+        puts "ERROR: Invalid Options passed. Please run with --help"
+        exit 1
       end
         
     end
@@ -57,13 +58,17 @@ module Route53
         opts.on('-z', '--zone [ZONE]', String, "Specify a zone to perform an operation on. Either in 'example.com.' or '/hostedzone/XXX' format") { |zone| @options.zone = zone }
         
         opts.on('-c', '--create', "Create a new record") { @options.create_record = true }
+        
         opts.on('-r', '--remove', String, "Remove a record") { |record| @options.remove_record = true }
         opts.on('-g', '--change', String, "Change a record") { |record| @options.change_record = true }
         
         opts.on('--name [NAME]', String, "Specify a name for a record") { |name| @options.name = name }
         opts.on('--type [TYPE]', String, "Specify a type for a record") { |dnstype| @options.dnstype = dnstype }
         opts.on('--ttl [TTL]', String, "Specify a TTL for a record") { |ttl| @options.ttl = ttl }
+        opts.on('--weight [WEIGHT]', String, "Specify a Weight for a record") { |weight| @options.weight = weight }
+        opts.on('--ident [IDENTIFIER]', String, "Specify a unique identifier for a record") { |ident| @options.ident = ident }
         opts.on('--values [VALUE1],[VALUE2],[VALUE3]', Array, "Specify one or multiple values for a record") { |value| @options.values = value }
+        opts.on('--zone-apex-id [ZONE_APEX_ID]', String, "Specify a zone apex if for the record") { |zone_apex| @options.zone_apex = zone_apex }
         
         opts.on('-m', '--comment [COMMENT]', String, "Provide a comment for this operation") { |comment| @options.comment = comment }
         
@@ -74,10 +79,12 @@ module Route53
         opts.on('--access [ACCESSKEY]',String,"Specify an access key on the command line.") { |access| @options.access = access }
         opts.on('--secret [SECRETKEY]',String,"Specify a secret key on the command line. WARNING: Not a good idea") { |secret| @options.secret = secret }
         
+        opts.on('--no-upgrade',"Do not automatically upgrade the route53 api spec for this version.") { @options.no_upgrade = true }
+        
         opts.parse!(@arguments) rescue return false
         
         process_options
-        true      
+        true
       end
 
       # Performs post-parse processing on options
@@ -180,7 +187,7 @@ module Route53
               puts "Zone Deleted." unless resp.error?
             end
           else
-            $stderr.puts "ERROR: Couldn't Find Record for @options.zone."
+            $stderr.puts "ERROR: Couldn't Find Record for #{@options.zone}."
           end
         else
           required_options("delete zone",["--zone"])
@@ -197,7 +204,7 @@ module Route53
             zones.each do |z|
               puts "Creating Record"
               @options.ttl = @config['default_ttl'] if @options.ttl.nil?
-              if @options.dnstype == 'TXT'
+              if @options.dnstype.upcase == 'TXT'
                 @options.values = @options.values.map do |val|
                   unless val.start_with?('"') && val.end_with?('"')
                     val = '"' + val unless val.start_with? '"'
@@ -206,7 +213,7 @@ module Route53
                   val
                 end
               end
-              record = Route53::DNSRecord.new(@options.name,@options.dnstype,@options.ttl,@options.values,z)
+              record = Route53::DNSRecord.new(@options.name,@options.dnstype,@options.ttl,@options.values,z,@options.zone_apex,@options.weight,@options.ident)
               puts "Creating Record #{record}"
               resps.push(record.create)
             end
@@ -215,7 +222,7 @@ module Route53
               puts "Record Created." unless resp.error?
             end
           else
-            $stderr.puts "ERROR: Couldn't Find Record for @options.zone."
+            $stderr.puts "ERROR: Couldn't Find Record for #{@options.zone}."
           end
         else
           #$stderr.puts "ERROR: The following arguments are required for a create record operation."
@@ -243,11 +250,11 @@ module Route53
                   puts "Record Deleted." unless resp.error?
                 end
               else
-                $stderr.puts "ERROR: Couldn't Find Record for @options.zone of type "+(@options.dnstype.nil? ? "ANY" : @options.dnstype)+"."
+                $stderr.puts "ERROR: Couldn't Find Record for #{@options.zone} of type "+(@options.dnstype.nil? ? "ANY" : @options.dnstype)+"."
               end
             end
           else
-            $stderr.puts "ERROR: Couldn't Find Record for @options.zone."
+            $stderr.puts "ERROR: Couldn't Find Record for #{@options.zone}."
           end
         else
           #$stderr.puts "ERROR: The following arguments are required for a record removal operation."
@@ -263,7 +270,7 @@ module Route53
           if zones.size > 0
             zones.each do |z|
               records = z.get_records(@options.dnstype.nil? ? "ANY" : @options.dnstype)
-              records = records.select { |rec| rec.name == @options.name } if @options.name
+              records = records.select { |rec|  puts "Rec: #{rec.name}"; rec.name == @options.name } if @options.name
               if records.size > 0
                 if records.size > 1
                   records = record_picker(records,false)
@@ -275,11 +282,11 @@ module Route53
                   puts "Record Modified." unless resp.error?
                 end
               else
-                $stderr.puts "ERROR: Couldn't Find Record for @options.zone of type "+(@options.dnstype.nil? ? "ANY" : @options.dnstype)+"."
+                $stderr.puts "ERROR: Couldn't Find Record for #{@options.name} of type "+(@options.dnstype.nil? ? "ANY" : @options.dnstype)+"."
               end
             end
           else
-            $stderr.puts "ERROR: Couldn't Find Record for @options.zone."
+            $stderr.puts "ERROR: Couldn't Find Record for #{@options.name}."
           end
         else
           #$stderr.puts "ERROR: The following arguments are required for a record change operation."
@@ -304,7 +311,7 @@ module Route53
         new_config = Hash.new
         new_config['access_key'] = get_input(String,"Amazon Access Key")
         new_config['secret_key'] = get_input(String,"Amazon Secret Key")
-        new_config['api'] = get_input(String,"Amazon Route 53 API Version","2010-10-01")
+        new_config['api'] = get_input(String,"Amazon Route 53 API Version","2011-05-05")
         new_config['endpoint'] = get_input(String,"Amazon Route 53 Endpoint","https://route53.amazonaws.com/")
         new_config['default_ttl'] = get_input(String,"Default TTL","3600")
         if get_input(true.class,"Save the configuration file to \"~/.route53\"?","Y")
@@ -406,6 +413,14 @@ module Route53
         unless @config
           @config = Hash.new
         end
+        if @config['api'] != '2011-05-05' && !@options.no_upgrade
+          puts "Note: Automatically setting your configuration file to the amazon route 53 api spec this program was written for. You can avoid this by passing --no-upgrade"
+          @config['api'] = '2011-05-05'
+          File.open(@options.file,'w') do |out|
+            YAML.dump(@config,out)
+          end
+          File.chmod(0600,@options.file)
+        end
       end
       
       def user_home

data/lib/route53/version.rb

@@ -1,3 +1,3 @@
 module Route53
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 8
-  version: 0.1.8
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Philip Corliss
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 -06:00
+date: 2011-05-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency