ec2_ultradns_updater 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,17 +1,19 @@
 PATH
   remote: .
   specs:
-    ec2_ultradns_updater (0.0.3)
+    ec2_ultradns_updater (0.0.6)
       aws-sdk
-      savon
+      savon (= 0.9.9)
+      wasabi (= 2.1.0)
 
 GEM
   remote: http://rubygems.org/
   remote: http://gems.github.com/
   specs:
-    akami (1.0.0)
+    akami (1.1.0)
       gyoku (>= 0.4.0)
-    aws-sdk (1.5.2)
+      nokogiri (>= 1.5.2)
+    aws-sdk (1.5.3)
       httparty (~> 0.7)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -29,7 +31,7 @@ GEM
     json (1.7.3)
     multi_json (1.3.6)
     multi_xml (0.5.1)
-    nokogiri (1.5.3)
+    nokogiri (1.5.4)
     nori (1.1.0)
     rack (1.4.1)
     rake (0.9.2.2)
@@ -50,7 +52,7 @@ GEM
       nori (~> 1.1)
       wasabi (~> 2.1)
     uuidtools (2.1.2)
-    wasabi (2.1.1)
+    wasabi (2.1.0)
       nokogiri (>= 1.4.0)
 
 PLATFORMS

data/ec2_ultradns_updater.gemspec

@@ -22,7 +22,9 @@ Gem::Specification.new do |s|
 
   
   s.add_runtime_dependency "aws-sdk"
-  s.add_runtime_dependency "savon" # http://savonrb.com/
+  #s.add_runtime_dependency "wasabi", "2.2.0"
+  s.add_runtime_dependency "wasabi", "2.1.0"
+  s.add_runtime_dependency "savon", "0.9.9" # http://savonrb.com/
   
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"

data/lib/ec2_ultradns_updater.rb

@@ -26,6 +26,7 @@ end
 
 require "ec2_ultradns_updater/cli"
 require "ec2_ultradns_updater/ec2"
+require "ec2_ultradns_updater/ip_info"
 require "ec2_ultradns_updater/preconditions"
 require "ec2_ultradns_updater/ultradns"
 require "ec2_ultradns_updater/version"

data/lib/ec2_ultradns_updater/cli.rb

@@ -22,17 +22,24 @@ class Ec2UltraDNSUpdater::CLI
   def self.run  
     opts = parse(ARGV)
     
-    ec2 = Ec2UltraDNSUpdater::Ec2.new(opts['aws'])
-    ultradns = Ec2UltraDNSUpdater::UltraDNS.new(opts['ultradns'])
+    ec2 = Ec2UltraDNSUpdater::Ec2.new(opts[:aws])
+    ultradns = Ec2UltraDNSUpdater::UltraDNS.new(opts[:ultradns])
     name_tag_value = ec2.get_name_tag
     
-    result = ultradns.create_or_update_cname(name_tag_value, ec2.get_instance_public_hostname)
+    result = false
+    if ec2.get_instance_public_hostname != ''
+      result = ultradns.create_or_update_cname(name_tag_value, ec2.get_instance_public_hostname)
+    else
+      # try using an ip that reaches the internet
+      result = ultradns.create_or_update_a(name_tag_value, Ec2UltraDNSUpdater::IpInfo.local_ipv4)
+    end
+    
     if !result
       error_text = "Error Creating or Updating CNAME for #{ec2.get_instance_public_hostname} to #{name_tag_value}"
       @logger.error error_text
       ::Logger.new(STDERR).error error_text
-    elsif !opts['out'].empty?
-      write_hostname(opts['out'], name_tag_value)
+    elsif !opts[:out].empty?
+      write_hostname(opts[:out], name_tag_value)
     end
   end
   
@@ -42,32 +49,35 @@ class Ec2UltraDNSUpdater::CLI
     end
   end
   
-  def self.load_config(filename)
-    config = configure_logger(YAML.load_file(filename))
+  def self.load_config(opts, filename)
+    config = symbolize_keys(YAML.load_file(filename))
+    # merge the new file config & update the logger config
+    configure_logger(opts.merge!(config))
   end
   
   def self.configure_logger(opts)
-    if opts['log_to']
-      @logger = ::Logger.new(opts['log_to'])
+    if opts[:log_to]
+      @logger = ::Logger.new(opts[:log_to])
     end
     @logger ||= ::Logger.new(STDOUT)
 
-    @logger.level = opts['verbose'] ? Logger::DEBUG : Logger::INFO
+    @logger.level = opts[:verbose] ? Logger::DEBUG : Logger::INFO
     
-    opts['aws']['logger'] = @logger if opts['aws']
-    opts['ultradns']['logger'] = @logger if opts['ultradns']
+    opts[:aws][:logger] = @logger if opts[:aws]
+    opts[:ultradns][:logger] = @logger if opts[:ultradns]
     
     opts
   end
   
   def self.parse(args)
     options = {}
-    options['aws'] = {}
-    options['ultradns'] = {}
-    options['log_to'] = ::Logger.new(STDOUT)
-    options['verbose'] = false
-    options['out'] = ''
-
+    options[:aws] = {}
+    options[:ultradns] = {}
+    options[:log_to] = ::Logger.new(STDOUT)
+    options[:verbose] = false
+    options[:out] = ''
+    options[:config] = nil
+    
     opts = OptionParser.new do |opts|
       opts.banner = "Usage: ec2_ultradns_updater [options]"
 
@@ -76,17 +86,17 @@ class Ec2UltraDNSUpdater::CLI
 
       opts.on("-c", "--config config.yaml",
               "Configuration for the updater") do |config|
-        options.merge!(load_config(config))
+        options[:config] = config
       end
       
       opts.on("-o", "--out filename", "Write out the name assigned") do |out|
-        options['out'] = out
+        options[:out] = out
       end
       
       opts.separator ""
 
       opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-        options['verbose'] = v
+        options[:verbose] = v
       end
 
       opts.on_tail("-h", "--help", "Show this message") do
@@ -101,7 +111,26 @@ class Ec2UltraDNSUpdater::CLI
     end
 
     opts.parse!(args)
-    options
+    # load the config
+    load_config(options, options[:config])
+  end
+  
+  def self.symbolize_keys(hash)
+    unless hash.nil?
+      hash.replace(
+        hash.each_key.inject({}) do |h, k|
+          v = hash.delete(k)
+          key = k.to_sym rescue k
+          if v.is_a? (Hash)
+            h[key] = symbolize_keys(v)
+          else
+            h[key] = v
+          end
+          h
+        end
+      )
+    end
+    hash
   end
 end
 

data/lib/ec2_ultradns_updater/ec2.rb

@@ -18,27 +18,36 @@ class Ec2UltraDNSUpdater::Ec2
 
   def initialize(opts = {})
     AWS.config(
-      :access_key_id => opts['access_key_id'],
-      :secret_access_key => opts['secret_access_key'])
+      :access_key_id => opts[:access_key_id],
+      :secret_access_key => opts[:secret_access_key])
       
-    @logger = opts['logger'] || Logger.new(STDOUT)
-    @tag_name = opts['name_tag'] || 'Name' # default to Name
+    @logger = opts[:logger] || Logger.new(STDOUT)
+    
+    # also configure HTTPI
+    HTTPI.logger = @logger
+    HTTPI.log_level = :debug
+    @tag_name = opts[:name_tag] || 'Name' # default to Name
   end
   
   def get_instance_id
-    @instance_id ||= Net::HTTP.get(URI("#{EC2_META_DATA_URL}/instance-id"))
+    @instance_id ||= begin    
+      response = HTTPI.get(URI("#{EC2_META_DATA_URL}/instance-id").to_s)
+      response.code == 200 ? response.body : ''
+    end
     @logger.debug("Instance ID = #{@instance_id}")
     @instance_id
   end
 
   def get_instance_public_hostname
-    @public_hostname ||= Net::HTTP.get(URI("#{EC2_META_DATA_URL}/public-hostname"))
+    @public_hostname ||= begin
+      response = HTTPI.get(URI("#{EC2_META_DATA_URL}/public-hostname").to_s)
+      response.code == 200 ? response.body : ''
+    end
     @logger.debug("Public Hostname = #{@public_hostname}")
     @public_hostname
   end
 
   def get_name_tag
-    ec2 = AWS::EC2.new
     dns_cname = ''
     ec2.tags.filter('resource-id', get_instance_id()).each do |tag|
       @logger.debug { tag.resource.inspect } # resource is an EC2 object, e.g. AWS::EC2::VPC
@@ -49,6 +58,20 @@ class Ec2UltraDNSUpdater::Ec2
     @logger.debug("Tagged DNS CNAME = #{dns_cname} for #{get_instance_id()}")
     dns_cname
   end
+  
+  def ec2
+    @ec2_region ||= begin
+      ec2 = AWS::EC2.new
+      region = nil
+      ec2.regions.each do |r| 
+        if r.instances.map(&:id).include?(get_instance_id())
+          region = r
+          break
+        end
+      end
+      region
+    end
+  end
 end
 
 

data/lib/ec2_ultradns_updater/ip_info.rb

@@ -0,0 +1,42 @@
+# Copyright 2012 NeuStar, Inc. All rights reserved.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'socket'
+
+class Ec2UltraDNSUpdater::IpInfo
+  
+  def self.local_ipv4
+    # pdns1.ultradns.net.	IN	A	204.74.108.1
+    local_ip('204.74.108.1')
+  end
+  
+  def self.local_ipv6
+    # pdns1.ultradns.net.	IN	AAAA	2001:502:f3ff::1
+    # 2001:502:f3ff:0:0:0:0:1
+    local_ip('2001:502:f3ff::1')
+  end
+
+  # nice trick from: http://coderrr.wordpress.com/2008/05/28/get-your-local-ip-address/
+  def self.local_ip(host)
+    socket_type = (host =~ /\:/) ? Socket::AF_INET6 : Socket::AF_INET
+    orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true  # turn off reverse DNS resolution temporarily
+    UDPSocket.open(socket_type) do |s|
+      s.connect host, 1
+      s.addr.last
+    end
+  ensure
+    Socket.do_not_reverse_lookup = orig
+  end
+  
+end

data/lib/ec2_ultradns_updater/ultradns.rb

@@ -17,11 +17,17 @@ class Ec2UltraDNSUpdater::UltraDNS
   include Ec2UltraDNSUpdater::Preconditions
   
   ULTRADNS_WSDL_URL = "http://ultra-api.ultradns.com:8008/UltraDNS_WS/v01?wsdl"
-  CNAME_TYPE = 5
   DEFAULT_TTL = 60
   
+  module TYPE
+    ANY = ALL = 0
+    A = 1
+    CNAME = 5
+    AAAA = 28
+  end
+  
   def initialize(opts = {})
-    @logger = opts['logger'] || Logger.new(STDOUT)
+    @logger = opts[:logger] || Logger.new(STDOUT)
     
     Savon.configure do |config|
       config.logger = @logger
@@ -30,56 +36,96 @@ class Ec2UltraDNSUpdater::UltraDNS
     # also configure HTTPI
     HTTPI.logger = @logger
 
-    @username = opts['username']
-    @password = opts['password']
-    @zone = fix_zone_name(opts['zone'] || '')
+    @username = opts[:username]
+    @password = opts[:password]
+    @zone = fix_zone_name(opts[:zone] || '')
     
     precondition.str_not_empty(@username)
     precondition.str_not_empty(@password)
     precondition.str_not_empty(@zone)
   end
   
+  
   def get_cname_guid(cname)
-    zone = @zone
-    fixed_cname = fix_zone_name(cname)
+    get_guid_by_label_and_type(cname, TYPE::CNAME)
+  end
+  
+  def create_or_update_cname(cname, to_hostname)
+    create_or_update_info1(TYPE::CNAME, cname, fix_zone_name(to_hostname))
+  end
+  
+  def get_a_guid(node_label)
+    get_guid_by_label_and_type(node_label, TYPE::A)
+  end
+  
+  def create_or_update_a(node_label, to_ip)
+    create_or_update_info1(TYPE::A, node_label, to_ip)
+  end
     
-    guids_resp = client.request(:v01, 'getResourceRecordGUIDList') {
+  def network_status?    
+    resp = client.request(:v01, 'getNeustarNetworkStatus') #:get_neustar_network_status) 
+    @logger.debug(resp)
+    log_error(resp)
+    resp.success?
+  end
+  
+  def delete_record_by_guid(guid)
+    resp = client.request(:v01, 'deleteResourceRecord') {
       soap.body do |xml|
-        xml.resourceRecord({
-          "ZoneName" => zone, 'Type' => CNAME_TYPE, 'DName' => fixed_cname
-        }) 
+        xml.transactionID()
+        xml.guid(guid)
       end
     }
-    log_error(guids_resp)
-    
-    begin
-      guid = guids_resp[:get_resource_record_guid_list_response][:resource_record_guid_list][:guid]
-      @logger.debug("guid found: #{guid}")
-    rescue
-      @logger.debug("guid not found")
+    log_error(resp)
+    resp.success?
+  end
+  
+  
+  def get_records_by_label(label)
+    get_record_by_label_and_type(label, TYPE::ALL)
+  end
+  
+  def delete_record_by_label(label)
+    recs = get_records_by_label(label)
+    unless recs.nil?
+      guid = (recs[:resource_record][:@guid] rescue '') || ''
+      delete_record_by_guid(guid) unless guid == ''
     end
-    guid
   end
   
-  def create_or_update_cname(cname, to_hostname)
-    precondition.str_not_empty(cname)
-    precondition.str_not_empty(to_hostname)
+  def delete_record_by_label_not_matching_type(label, type)
+    recs = get_records_by_label(label)
+    unless recs.nil?
+      guid = (recs[:resource_record][:@guid] rescue '') || ''
+      rec_type = (recs[:resource_record][:@type] rescue '') || ''
+      if guid != '' && rec_type != type
+        delete_record_by_guid(guid)
+      end
+    end
+  end
+  
+  #############
+  
+  def create_or_update_info1(type, label, to_value)
+    precondition.str_not_empty(label)
+    precondition.str_not_empty(to_value)
     
     zone = @zone
-    fixed_cname = fix_zone_name(cname)
-    fixed_to_hostname = fix_zone_name(to_hostname)
+    fixed_label = fix_zone_name(label)
     
-    guid = get_cname_guid(cname)
+    guid = get_guid_by_label_and_type(label, type) || ''
 
     change_method = 'createResourceRecord'
-    record_opts = {'Type' => CNAME_TYPE, 'DName' => fixed_cname, 'TTL' => DEFAULT_TTL}
+    record_opts = {'Type' => type, 'DName' => fixed_label, 'TTL' => DEFAULT_TTL}
 
-    if guid != nil && guid != ''
-      @logger.info "Updating Record Mapping: #{fixed_cname} => #{fixed_to_hostname}"
+    if guid != ''
+      @logger.info "Updating Record Mapping: #{fixed_label} => #{to_value}"
       change_method = 'updateResourceRecord' # update it
       record_opts['Guid'] = guid;
     else
-      @logger.info "Creating Record Mapping: #{fixed_cname} => #{fixed_to_hostname}"
+      # make sure there isn't another record at this label of a different type
+      delete_record_by_label_not_matching_type(label, type)
+      @logger.info "Creating Record Mapping: #{fixed_label} => #{to_value}"
       record_opts['ZoneName'] = zone;
     end
 
@@ -91,7 +137,7 @@ class Ec2UltraDNSUpdater::UltraDNS
       soap.body do |xml|
         xml.transactionID()
         xml.resourceRecord(record_opts) {
-          xml.tag!("#{ns}:InfoValues", {"Info1Value" => fixed_to_hostname})
+          xml.tag!("#{ns}:InfoValues", {"Info1Value" => to_value})
         }
       end
     }
@@ -100,24 +146,50 @@ class Ec2UltraDNSUpdater::UltraDNS
     resp.success?
   end
   
-  def network_status?
-    resp = client.request :v01, :get_neustar_network_status
-    @logger.debug(resp)
-    log_error(resp)
-    resp.success?
+  def get_guid_by_label_and_type(label, type)
+    zone = @zone
+    fixed_label = fix_zone_name(label)
+    
+    guids_resp = client.request(:v01, 'getResourceRecordGUIDList') {
+      soap.body do |xml|
+        xml.resourceRecord({
+          "ZoneName" => zone, 'Type' => type, 'DName' => fixed_label
+        }) 
+      end
+    }
+    log_error(guids_resp)
+
+    begin
+      guid = guids_resp[:get_resource_record_guid_list_response][:resource_record_guid_list][:guid]
+      @logger.debug("guid found: #{guid}")
+    rescue
+      @logger.debug("guid not found")
+    end
+    guid
   end
   
-  def delete_record_by_guid(guid)
-    resp = client.request(:v01, 'deleteResourceRecord') {
+  
+  def get_record_by_label_and_type(label, type)
+    zone = @zone
+    fixed_label = fix_zone_name(label)
+    
+    records_resp = client.request(:v01, 'getResourceRecordsOfDNameByType') {
       soap.body do |xml|
-        xml.transactionID()
-        xml.guid(guid)
+        xml.zoneName(zone)
+        xml.rrType(type)
+        xml.hostName(fixed_label)
       end
     }
-    log_error(resp)
-    resp.success?
+    log_error(records_resp)
+  
+    begin
+      records_resp.to_hash[:get_resource_records_of_d_name_by_type_response][:resource_record_list]
+    rescue
+      @logger.debug("Resource Record list is empty")
+    end
   end
   
+  
   def client
     soap_username = @username
     soap_password = @password
@@ -135,6 +207,6 @@ class Ec2UltraDNSUpdater::UltraDNS
   
   # ..Must end with a '.'  
   def fix_zone_name(name)
-    name[-1] != '.' ? "#{name}." : name
+    (name != nil && name.strip != '' && name[-1] != '.') ? "#{name}." : name
   end
 end

data/lib/ec2_ultradns_updater/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module Ec2UltraDNSUpdater
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/lib/ec2_spec.rb

@@ -52,16 +52,22 @@ describe Ec2UltraDNSUpdater::Ec2 do
       tags = Object.new
       tags.stub(:filter).and_return([tag])
     
-      AWS::EC2.any_instance.stub(:tags).and_return(tags)
+#      AWS::EC2.any_instance.stub(:tags).and_return(tags)
+      
+      
+      
       fake_name = "ec2-111-111-111-111.compute-1.amazonaws.com"
       FakeWeb.register_uri(:get, Ec2UltraDNSUpdater::Ec2::EC2_META_DATA_URL + "/public-hostname", :body => fake_name)
       FakeWeb.register_uri(:get, Ec2UltraDNSUpdater::Ec2::EC2_META_DATA_URL + "/instance-id", :body => tag.resource)
     
-      ec2 = Ec2UltraDNSUpdater::Ec2.new({'access_key_id' => 123, 'secret_access_key' => 'abc', 'name_tag' => 'Testname'})
+      ec2 = Ec2UltraDNSUpdater::Ec2.new({:access_key_id => 123, :secret_access_key => 'abc', :name_tag => 'Testname'})
+      ec2_stub = Object.new
+      ec2_stub.stub(:tags).and_return(tags)
+      ec2.stub(:ec2).and_return(ec2_stub)
       ec2.get_name_tag.should == tag.value
     
     ensure
-      AWS::EC2.any_instance.unstub(:tags)
+      #AWS::EC2.any_instance.unstub(:tags)
       FakeWeb.clean_registry
     end
   end

data/spec/lib/ip_info_spec.rb

@@ -0,0 +1,26 @@
+# Copyright 2012 NeuStar, Inc. All rights reserved.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'spec_helper'
+require 'fakeweb'
+require 'yaml'
+
+describe Ec2UltraDNSUpdater::IpInfo do
+  
+  it "should get an ipv4 address" do
+    Ec2UltraDNSUpdater::IpInfo.local_ipv4().should_not == ''
+    Ec2UltraDNSUpdater::IpInfo.local_ipv4().should match(/\d+\.\d+\.\d+\.\d+/)
+  end
+  
+end

data/spec/lib/ultradns_spec.rb

@@ -19,22 +19,22 @@ require 'yaml'
 describe Ec2UltraDNSUpdater::UltraDNS do
   
   it "should raise if cname is empty" do
-    ultra = Ec2UltraDNSUpdater::UltraDNS.new({'username' => 'blah', 'password' => 'blah', 'zone' => 'ultrandns.com.'})
+    ultra = Ec2UltraDNSUpdater::UltraDNS.new({:username => 'blah', :password => 'blah', :zone => 'ultrandns.com.'})
     expect { ultra.create_or_update_cname }.to raise_error
   end
   
   it "should raise if to_hostname is empty" do
-    ultra = Ec2UltraDNSUpdater::UltraDNS.new({'username' => 'blah', 'password' => 'blah', 'zone' => 'ultrandns.com.'})
+    ultra = Ec2UltraDNSUpdater::UltraDNS.new({:username => 'blah', :password => 'blah', :zone => 'ultrandns.com.'})
     expect { ultra.create_or_update_cname("adsf", '') }.to raise_error
   end
   
   it "should fix a zone name without a trailing dot" do
-    ultra = Ec2UltraDNSUpdater::UltraDNS.new({'username' => 'blah', 'password' => 'blah', 'zone' => 'ultrandns.com.'})
+    ultra = Ec2UltraDNSUpdater::UltraDNS.new({:username => 'blah', :password => 'blah', :zone => 'ultrandns.com.'})
     ultra.fix_zone_name("a.b.com").should == "a.b.com."
   end
   
   it "should not change a zone name with a trailing dot" do
-    ultra = Ec2UltraDNSUpdater::UltraDNS.new({'username' => 'blah', 'password' => 'blah', 'zone' => 'ultrandns.com.'})
+    ultra = Ec2UltraDNSUpdater::UltraDNS.new({:username => 'blah', :password => 'blah', :zone => 'ultrandns.com.'})
     name = "a.b.biz."
     ultra.fix_zone_name(name).should == name
   end
@@ -43,34 +43,115 @@ describe Ec2UltraDNSUpdater::UltraDNS do
   LIVE_CONFIG = File.join(File.dirname(__FILE__), '..', '..', 'config', 'live.config.yaml')
   
   it "should check network status" do
-    config = Ec2UltraDNSUpdater::CLI.load_config(LIVE_CONFIG)
+    config = Ec2UltraDNSUpdater::CLI.load_config({}, LIVE_CONFIG)
     config.should_not eq(nil)
     
-    ultra = Ec2UltraDNSUpdater::UltraDNS.new(config['ultradns'])
+    ultra = Ec2UltraDNSUpdater::UltraDNS.new(config[:ultradns])
     (ultra.network_status?).should eq(true)
   end
   
   it "should create a new record and then update the record" do
-    config = Ec2UltraDNSUpdater::CLI.load_config(LIVE_CONFIG)
+    config = Ec2UltraDNSUpdater::CLI.load_config({}, LIVE_CONFIG)
     config.should_not eq(nil)
     
-    ultra = Ec2UltraDNSUpdater::UltraDNS.new(config['ultradns'])
-    guid = ultra.get_cname_guid(config['test_cname'])
+    ultra = Ec2UltraDNSUpdater::UltraDNS.new(config[:ultradns])
+    guid = ultra.get_cname_guid(config[:test_cname])
     if guid != nil && guid != ''
       ultra.delete_record_by_guid(guid).should eq(true)
     end
     
-    result = ultra.create_or_update_cname(config['test_cname'], config['test_public_hostname'][0])
+    # create cname
+    
+    result = ultra.create_or_update_cname(config[:test_cname], config[:test_public_hostname][0])
     result.should eq(true)
-    guid_0 = ultra.get_cname_guid(config['test_cname'])
+    guid_0 = ultra.get_cname_guid(config[:test_cname])
     guid_0.should_not be_empty
+
+    recs = ultra.get_record_by_label_and_type(config[:test_cname], 
+        Ec2UltraDNSUpdater::UltraDNS::TYPE::CNAME)
+    cname = recs[:resource_record][:info_values][:@info1_value]
+    cname.should == config[:test_public_hostname][0] + '.' # no trailing . in config
+
+
+    # update cname
     
-    result = ultra.create_or_update_cname(config['test_cname'], config['test_public_hostname'][1])
+    result = ultra.create_or_update_cname(config[:test_cname], config[:test_public_hostname][1])
     result.should eq(true)
-    guid_1 = ultra.get_cname_guid(config['test_cname'])
+    guid_1 = ultra.get_cname_guid(config[:test_cname])
     guid_1.should_not be_empty
     guid_0.should == guid_1
-    #TODO, check the value
+    
+    recs = ultra.get_record_by_label_and_type(config[:test_cname], 
+        Ec2UltraDNSUpdater::UltraDNS::TYPE::CNAME)
+    cname = recs[:resource_record][:info_values][:@info1_value]
+    cname.should == config[:test_public_hostname][1] + '.' # no trailing . in config
+
+    
+    # remove the CNAME record
+    if guid_0 != nil && guid_0 != ''
+      ultra.delete_record_by_guid(guid_0).should eq(true)
+    end
+    
+    # create A record
+    IP = '1.2.3.4'
+    result = ultra.create_or_update_a(config[:test_cname], IP)
+    result.should eq(true)
+    guid_2 = ultra.get_a_guid(config[:test_cname])
+    recs = ultra.get_record_by_label_and_type(config[:test_cname], 
+        Ec2UltraDNSUpdater::UltraDNS::TYPE::A)
+    
+    ip = recs[:resource_record][:info_values][:@info1_value]
+    ip.should == IP
+
+    guid_2.should_not be_empty
+    guid_0.should_not == guid_2
+    
+    # remove the A record
+    ultra.delete_record_by_label(config[:test_cname])
+    
+    guid_3 = ultra.get_a_guid(config[:test_cname])
+    guid_3.should == nil
+  end
+  
+  it "should create a new record and then create a record of a different type" do
+    config = Ec2UltraDNSUpdater::CLI.load_config({}, LIVE_CONFIG)
+    config.should_not eq(nil)
+    
+    ultra = Ec2UltraDNSUpdater::UltraDNS.new(config[:ultradns])
+    
+    
+    # create cname
+    
+    result = ultra.create_or_update_cname(config[:test_cname], config[:test_public_hostname][0])
+    result.should eq(true)
+    guid_0 = ultra.get_cname_guid(config[:test_cname])
+    guid_0.should_not be_empty
+
+    recs = ultra.get_record_by_label_and_type(config[:test_cname], 
+        Ec2UltraDNSUpdater::UltraDNS::TYPE::CNAME)
+    cname = recs[:resource_record][:info_values][:@info1_value]
+    cname.should == config[:test_public_hostname][0] + '.' # no trailing . in config
+
+  
+    # create A record
+    ip_value = '1.2.3.4'
+    result = ultra.create_or_update_a(config[:test_cname], ip_value)
+    result.should eq(true)
+    guid_2 = ultra.get_a_guid(config[:test_cname])
+    recs = ultra.get_record_by_label_and_type(config[:test_cname], 
+        Ec2UltraDNSUpdater::UltraDNS::TYPE::A)
+    
+    ip = recs[:resource_record][:info_values][:@info1_value]
+    ip.should == ip_value
+
+    guid_2.should_not be_empty
+    guid_0.should_not == guid_2
+    
+    # remove the A record
+    ultra.delete_record_by_label(config[:test_cname])
+    
+    guid_3 = ultra.get_a_guid(config[:test_cname])
+    guid_3.should == nil
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2_ultradns_updater
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000Z
+date: 2012-06-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &2153547120 !ruby/object:Gem::Requirement
+  requirement: &2157349700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153547120
+  version_requirements: *2157349700
+- !ruby/object:Gem::Dependency
+  name: wasabi
+  requirement: &2157349200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157349200
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &2153546700 !ruby/object:Gem::Requirement
+  requirement: &2157348700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.9
   type: :runtime
   prerelease: false
-  version_requirements: *2153546700
+  version_requirements: *2157348700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153546280 !ruby/object:Gem::Requirement
+  requirement: &2157348320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153546280
+  version_requirements: *2157348320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153545860 !ruby/object:Gem::Requirement
+  requirement: &2157347860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153545860
+  version_requirements: *2157347860
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2153545440 !ruby/object:Gem::Requirement
+  requirement: &2157347440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153545440
+  version_requirements: *2157347440
 description: Update your UltraDNS configured CNAMEs to point to EC2 instance public
   hostnames
 email:
@@ -87,10 +98,12 @@ files:
 - lib/ec2_ultradns_updater.rb
 - lib/ec2_ultradns_updater/cli.rb
 - lib/ec2_ultradns_updater/ec2.rb
+- lib/ec2_ultradns_updater/ip_info.rb
 - lib/ec2_ultradns_updater/preconditions.rb
 - lib/ec2_ultradns_updater/ultradns.rb
 - lib/ec2_ultradns_updater/version.rb
 - spec/lib/ec2_spec.rb
+- spec/lib/ip_info_spec.rb
 - spec/lib/ultradns_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ultradns/ec2_ultradns_updater
@@ -120,5 +133,6 @@ specification_version: 3
 summary: Update UltraDNS for EC2 instances
 test_files:
 - spec/lib/ec2_spec.rb
+- spec/lib/ip_info_spec.rb
 - spec/lib/ultradns_spec.rb
 - spec/spec_helper.rb