awsborn 0.8.1 → 0.8.2

data/README.mdown

@@ -113,6 +113,9 @@ Mandatory keys for load_balancer:
 
 Optional keys for load_balancer:
 
+* `:dns_alias` -- a domain name to be tied to the load balancer in Route 53.
+    May be a simple name (`www`) in which case the cluster domain will be added,
+    or a full domain name.
 * `:only` -- a list of server names to which the load balancer is
 	restricted.
 * `:except` -- a list of servers that the load balancer should ignore.

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "david@icehouse.se"
     gem.homepage = "http://github.com/icehouse/awsborn"
     gem.authors = ["David Vrensk", "Jean-Louis Giordano"]
-    gem.add_dependency "right_aws", ">= 2.1.0"
+    gem.add_dependency "icehouse-right_aws", ">= 2.2.0"
     gem.add_dependency "json_pure", ">= 1.2.3"
     gem.add_dependency "rake"
     gem.add_development_dependency "rspec", ">= 2.6.0"

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/awsborn.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{awsborn}
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Vrensk", "Jean-Louis Giordano"]
-  s.date = %q{2011-08-16}
+  s.date = %q{2011-08-23}
   s.description = %q{Awsborn lets you define and launch a server cluster on Amazon EC2.}
   s.email = %q{david@icehouse.se}
   s.extra_rdoc_files = [
@@ -37,12 +37,15 @@ Gem::Specification.new do |s|
     "lib/awsborn/known_hosts_updater.rb",
     "lib/awsborn/load_balancer.rb",
     "lib/awsborn/rake.rb",
+    "lib/awsborn/route53.rb",
     "lib/awsborn/server.rb",
     "lib/awsborn/server_cluster.rb",
     "spec/aws_constants_spec.rb",
     "spec/ec2_spec.rb",
     "spec/elb_spec.rb",
     "spec/load_balancer_spec.rb",
+    "spec/route53_spec.rb",
+    "spec/server_cluster_spec.rb",
     "spec/server_spec.rb",
     "spec/spec.opts",
     "spec/spec_helper.rb"
@@ -57,20 +60,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<right_aws>, [">= 2.1.0"])
+      s.add_runtime_dependency(%q<icehouse-right_aws>, [">= 2.2.0"])
       s.add_runtime_dependency(%q<json_pure>, [">= 1.2.3"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.6.0"])
       s.add_development_dependency(%q<webmock>, [">= 1.3.0"])
     else
-      s.add_dependency(%q<right_aws>, [">= 2.1.0"])
+      s.add_dependency(%q<icehouse-right_aws>, [">= 2.2.0"])
       s.add_dependency(%q<json_pure>, [">= 1.2.3"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.6.0"])
       s.add_dependency(%q<webmock>, [">= 1.3.0"])
     end
   else
-    s.add_dependency(%q<right_aws>, [">= 2.1.0"])
+    s.add_dependency(%q<icehouse-right_aws>, [">= 2.2.0"])
     s.add_dependency(%q<json_pure>, [">= 1.2.3"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.6.0"])

data/lib/awsborn/elb.rb

@@ -50,6 +50,10 @@ module Awsborn
       describe_load_balancer(balancer_name)[:availability_zones]
     end
 
+    def canonical_hosted_zone_name_id (balancer_name)
+      describe_load_balancer(balancer_name)[:canonical_hosted_zone_name_id]
+    end
+
     def create_load_balancer (balancer_name)
       logger.debug "Creating load balancer #{balancer_name}"
       connection.create_load_balancer(balancer_name, [@region+'a'], [])

data/lib/awsborn/load_balancer.rb

@@ -2,7 +2,7 @@ module Awsborn
   class LoadBalancer
 
     include Awsborn::AwsConstants
-    attr_accessor :name, :only, :except, :region, :listeners, :sticky_cookies, :health_check_config
+    attr_accessor :name, :only, :except, :region, :listeners, :sticky_cookies, :health_check_config, :dns_alias
 
     DEFAULT_LISTENERS = [ { :protocol => :http, :load_balancer_port => 80, :instance_port => 80} ]
     DEFAULT_HEALTH_CONFIG = {
@@ -12,6 +12,7 @@ module Awsborn
       :timeout => 5,
       :interval => 30
     }
+
     def initialize (name, options={})
       @name = name
       @only   = options[:only] || []
@@ -20,13 +21,14 @@ module Awsborn
       @listeners = options[:listeners] || DEFAULT_LISTENERS
       @sticky_cookies = options[:sticky_cookies] || []
       @health_check_config = DEFAULT_HEALTH_CONFIG.merge(options[:health_check] || {})
+      @dns_alias = options[:dns_alias]
     end
 
     def elb
       @elb ||= Elb.new(@region)
     end
 
-    def dns_name
+    def aws_dns_name
       elb.dns_name(@name)
     end
 
@@ -34,11 +36,14 @@ module Awsborn
       elb.instances(@name)
     end
 
+    def canonical_hosted_zone_name_id
+      elb.canonical_hosted_zone_name_id(@name)
+    end
+
     def instances= (new_instances)
       previous_instances = self.instances
       register_instances(new_instances - previous_instances)
       deregister_instances(previous_instances - new_instances)
-      self.instances
     end
 
     def zones
@@ -49,7 +54,6 @@ module Awsborn
       previous_zones = self.zones
       enable_zones(new_zones - previous_zones)
       disable_zones(previous_zones - new_zones)
-      self.zones
     end
 
     def description
@@ -94,27 +98,58 @@ module Awsborn
       elb.configure_health_check(@name, @health_check_config)
     end
 
-    def update_with (new_servers)
+    def launch_or_update (running_servers)
       launch unless running?
 
-      servers_to_be_balanced = new_servers
-      servers_to_be_balanced =
-        servers_to_be_balanced.select{|s| @only.include?(s.name)}    unless @only.empty?
-      servers_to_be_balanced =
-        servers_to_be_balanced.reject{|s| @except.include?(s.name)}  unless @except.empty?
+      set_instances_to_selected(running_servers)
+      update_settings
 
-      self.instances = servers_to_be_balanced.map{|s| s.instance_id }
-      self.zones     = servers_to_be_balanced.map{|s| symbol_to_aws_zone(s.zone) }.uniq
+      configure_dns if @dns_alias
+    end
 
-      update_listeners
-      update_sticky_cookies
-      update_health_config
+    def configure_dns
+      route53.create_zone @dns_alias unless route53.zone_exists?(@dns_alias)
+      case route53.alias_target(@dns_alias)
+      when aws_dns_name
+        # It is already good
+      when nil
+        route53.add_alias_record(:alias => @dns_alias, :lb_fqdn => aws_dns_name, :lb_zone => canonical_hosted_zone_name_id)
+      else
+        route53.remove_alias_records(@dns_alias)
+        route53.add_alias_record(:alias => @dns_alias, :lb_fqdn => aws_dns_name, :lb_zone => canonical_hosted_zone_name_id)
+      end
+    end
 
-      self.description
+    def route53
+      @route53 ||= Route53.new
+    end
+
+    def dns_info
+      if dns_alias
+        route53.zone_for(dns_alias)
+      end
     end
 
     protected
 
+    def set_instances_to_selected (running_servers)
+      servers_to_be_balanced = select_servers(running_servers)
+      self.instances = servers_to_be_balanced.map {|s| s.instance_id }
+      self.zones     = servers_to_be_balanced.map {|s| symbol_to_aws_zone(s.zone) }.uniq
+    end
+
+    def select_servers (servers)
+      servers = servers.select {|s| @only.include?(s.name)}    unless @only.empty?
+      servers = servers.reject {|s| @except.include?(s.name)}  unless @except.empty?
+      servers
+    end
+
+    def update_settings
+      update_listeners
+      update_sticky_cookies
+      update_health_config
+    end
+
     def set_disabled_cookie_policy(ports)
       # Do nothing
     end

data/lib/awsborn/rake.rb

@@ -26,7 +26,19 @@ module Awsborn
 
       desc "Start all servers (or host=name1,name2) but don't run chef."
       task :start do |t,args|
-        cluster(args).launch get_hosts(args)
+        c = cluster(args)
+        c.launch get_hosts(args)
+        info = c.load_balancer_info
+        print_required_dns_setting(info) if info
+      end
+
+      def print_required_dns_setting (info)
+        puts "Make sure those NS records are present in your DNS settings:"
+        puts(info.map do |dns_entry|
+          dns_entry[:name_servers].map do |ns|
+            "#{dns_entry[:name]}\tIN\tNS\t#{ns}."
+          end
+        end.join("\n"))
       end
 
       desc "Update .ssh/known_hosts with data from all servers (or host=host1,host2)"
@@ -132,4 +144,4 @@ EOH
 
     end
   end
-end
+end

data/lib/awsborn/route53.rb

@@ -0,0 +1,70 @@
+module Awsborn
+  class Route53
+    extend Forwardable
+    def_delegators :Awsborn, :logger
+    include Awsborn::AwsConstants
+    attr_reader :connection
+
+    def connection
+      unless @connection
+        @connection = RightAws::Route53Interface.new(Awsborn.access_key_id, Awsborn.secret_access_key, :logger => Awsborn.logger)
+      end
+      @connection
+    end
+
+    def initialize (zone = nil)
+    end
+
+    def zone_exists? (name)
+      !! zone_overview_for(name)
+    end
+
+    def zone_for (name)
+      zone_id = zone_id_for(name)
+      connection.get_hosted_zone(zone_id) if zone_id
+    end
+
+    def zone_id_for (name)
+      overview = zone_overview_for(name)
+      overview[:aws_id] if overview
+    end
+
+    def create_zone (name)
+      connection.create_hosted_zone({:name => with_final_dot(name), :config => {:comment => ''}})
+    end
+
+    def alias_target (name)
+      name = with_final_dot(name)
+      zone = zone_id_for(name)
+      alias_record = connection.list_resource_record_sets(zone).detect { |rr| rr[:name] == name && rr[:alias_target] }
+      alias_record && alias_record[:alias_target]
+    end
+
+    def add_alias_record (options)
+      name = with_final_dot(options[:alias])
+      zone = zone_id_for(name)
+      alias_target = { :hosted_zone_id => options[:lb_zone], :dns_name => options[:lb_fqdn] }
+      alias_record = { :name => options[:alias], :type => 'A', :alias_target => alias_target }
+      connection.create_resource_record_sets(zone, [alias_record])
+    end
+
+    def remove_alias_records (name)
+      name = with_final_dot(name)
+      zone = zone_id_for(name)
+      alias_records = connection.list_resource_record_sets(zone).select { |rr| rr[:name] == name && rr[:alias_target] }
+      connection.delete_resource_record_sets(zone, alias_records)
+    end
+
+    private
+
+    def zone_overview_for (name)
+      name = with_final_dot(name)
+      zones = connection.list_hosted_zones
+      zone = zones.detect { |zone| zone[:name] == name }
+    end
+
+    def with_final_dot (name)
+      name =~ /\.$/ ? name : "#{name}."
+    end
+  end
+end

data/lib/awsborn/server_cluster.rb

@@ -2,7 +2,7 @@ module Awsborn
   class ServerCluster
     include Enumerable
 
-    attr_accessor :name
+    attr_accessor :name, :load_balancers
 
     def self.build (klass, name, &block)
       cluster = new(klass, name)
@@ -44,6 +44,7 @@ module Awsborn
     end
 
     def load_balancer (name, options={})
+      options = add_domain_to_dns_alias(options)
       @load_balancers << Awsborn::LoadBalancer.new(name, options)
     end
 
@@ -73,10 +74,17 @@ module Awsborn
 
     def update_load_balancing(running)
       @load_balancers.each do |lb|
-        lb.update_with(running).inspect
+        lb.launch_or_update(running)
       end
     end
 
+    def load_balancer_info
+      info = load_balancers.map do |lb|
+        lb.dns_info
+      end.compact
+      info.empty? ? nil : info
+    end
+
     def generate_key_pair (instances)
       @key_pair = instances.first.ec2.generate_key_pair
     end
@@ -96,9 +104,15 @@ module Awsborn
     protected
     
     def add_domain_to_ip (hash)
-      if @domain && hash.has_key?(:ip) && ! hash[:ip].include?('.')
-        ip = [hash[:ip], @domain].join('.')
-        hash.merge(:ip => ip)
+      add_domain_to_key(:ip, hash)
+    end
+    def add_domain_to_dns_alias (hash)
+      add_domain_to_key(:dns_alias, hash)
+    end
+    def add_domain_to_key (key, hash)
+      if @domain && hash.has_key?(key) && ! hash[key].include?('.')
+        expanded = [hash[key], @domain].join('.')
+        hash.merge(key => expanded)
       else
         hash
       end

data/spec/elb_spec.rb

@@ -74,6 +74,13 @@ describe Awsborn::Elb do
       end
     end
 
+    describe "canonical_hosted_zone_name_id" do
+      it "extracts zone id from description" do
+        @mock_interface.should_receive(:describe_load_balancers).with('some-name').and_return([{:canonical_hosted_zone_name_id => 'Z000'}])
+        @elb.canonical_hosted_zone_name_id('some-name').should == 'Z000'
+      end
+    end
+
     describe "create_load_balancer" do
       it "forwards to ElbInterface with a temporary zone and no listeners" do
         @mock_interface.should_receive(:create_load_balancer).with('some-name', ['eu-west-1a'], [])

data/spec/load_balancer_spec.rb

@@ -12,7 +12,17 @@ describe Awsborn::LoadBalancer do
                        :enable_zones => true,
                        :set_load_balancer_listeners => true,
                        :describe_load_balancer => "description",
-                      :configure_health_check => true)
+                       :dns_name => 'asdf',
+                       :configure_health_check => true)
+    Awsborn::Elb.stub!(:new).and_return(@mocked_elb)
+
+    @mocked_route53 = mock(:route53,
+      :zone_exists? => true,
+      :add_alias_record => true,
+      :alias_target => 'some-name-0001.lb.amz.com'
+    )
+    Awsborn::Route53.stub!(:new).and_return(@mocked_route53)
+
     @listener_fixture = [ { :protocol => :tcp, :load_balancer_port => 123, :instance_port => 123} ]
     @cookies_fixture = [ { :ports => [123], :policy => :disabled } ]
     @health_check_fixture = {
@@ -22,8 +32,8 @@ describe Awsborn::LoadBalancer do
       :timeout => 6,
       :interval => 31
     }
-    Awsborn::Elb.stub!(:new).and_return(@mocked_elb)
   end
+
   describe "initialize" do
     it "requires a valid region option" do
       expect { Awsborn::LoadBalancer.new('some-name') }.to raise_error
@@ -33,7 +43,8 @@ describe Awsborn::LoadBalancer do
       subject do
         @balancer = Awsborn::LoadBalancer.new(
           'some-name',
-          :region => :eu_west_1a,
+          :dns_alias => 'www.example.net',
+          :region => :eu_west_1,
           :only => [:server1, :server2],
           :except => [:server2],
           :listeners => @listener_fixture,
@@ -42,6 +53,7 @@ describe Awsborn::LoadBalancer do
         )
       end
       its(:name)           { should == 'some-name' }
+      its(:dns_alias)      { should == 'www.example.net' }
       its(:region)         { should == 'eu-west-1' }
       its(:only)           { should == [:server1, :server2] }
       its(:except)         { should == [:server2] }
@@ -76,17 +88,16 @@ describe Awsborn::LoadBalancer do
     end
   end
 
-  describe "dns_name" do
+  describe "aws_dns_name" do
     it "delegates to elb" do
       @mocked_elb.should_receive(:dns_name).with('some-name').and_return('dns-name')
       @balancer = Awsborn::LoadBalancer.new(
         'some-name',
         :region => :eu_west_1
-      ).dns_name.should == 'dns-name'
+      ).aws_dns_name.should == 'dns-name'
     end
   end
 
-
   describe "instances" do
     it "delegates to elb" do
       @mocked_elb.should_receive(:instances).with('some-name').and_return('instances')
@@ -275,7 +286,7 @@ describe Awsborn::LoadBalancer do
     end
   end
 
-  describe "update_with" do
+  describe "launch_or_update" do
     before do
       @balancer = Awsborn::LoadBalancer.new(
         'some-name',
@@ -291,12 +302,12 @@ describe Awsborn::LoadBalancer do
     it "launches the load balancer if not running" do
       @mocked_elb.should_receive(:running?).with('some-name').and_return(false)
       @mocked_elb.should_receive(:create_load_balancer).with('some-name').and_return(nil)
-      @balancer.update_with(@new_servers)
+      @balancer.launch_or_update(@new_servers)
     end
     it "does not launch the load balancer if running" do
       @mocked_elb.should_receive(:running?).with('some-name').and_return(true)
       @mocked_elb.should_not_receive(:create_load_balancer)
-      @balancer.update_with(@new_servers)
+      @balancer.launch_or_update(@new_servers)
     end
     it "sets instances and new zones and updates listeners, sticky cookies and health config" do
       @balancer.should_receive(:instances=).with(['i-00000001', 'i-00000002'])
@@ -304,8 +315,7 @@ describe Awsborn::LoadBalancer do
       @balancer.should_receive(:update_listeners)
       @balancer.should_receive(:update_sticky_cookies)
       @balancer.should_receive(:update_health_config)
-      @balancer.should_receive(:description).and_return('description')
-      @balancer.update_with(@new_servers).should == 'description'
+      @balancer.launch_or_update(@new_servers)
     end
     it "takes into account the :only option" do
       @balancer.only = [:server1]
@@ -315,8 +325,7 @@ describe Awsborn::LoadBalancer do
       @balancer.should_receive(:update_listeners)
       @balancer.should_receive(:update_sticky_cookies)
       @balancer.should_receive(:update_health_config)
-      @balancer.should_receive(:description).and_return('description')
-      @balancer.update_with(@new_servers).should == 'description'
+      @balancer.launch_or_update(@new_servers)
     end
     it "takes into account the :except option" do
       @balancer.except = [:server1]
@@ -327,9 +336,68 @@ describe Awsborn::LoadBalancer do
       @balancer.should_receive(:update_sticky_cookies)
       @balancer.should_receive(:update_health_config)
       @balancer.should_receive(:description).and_return('description')
-      @balancer.update_with(@new_servers).should == 'description'
+      @balancer.launch_or_update(@new_servers)
+      @balancer.description.should == 'description'
+    end
+    it "configures dns" do
+      @balancer.dns_alias = 'www.example.net'
+      @balancer.should_receive(:configure_dns)
+      @balancer.launch_or_update(@new_servers)
     end
   end
 
-end
+  describe "configure_dns" do
+    before do
+      @balancer = Awsborn::LoadBalancer.new('some-name', :region => :eu_west_1, :dns_alias => 'www.example.net')
+      @balancer.stub!(:aws_dns_name).and_return('some-name-0001.lb.amz.com')
+      @balancer.stub!(:canonical_hosted_zone_name_id).and_return('Z0000000000')
+    end
+
+    it "creates the zone if it does not exist" do
+      @mocked_route53.should_receive(:create_zone).with('www.example.net')
+      @mocked_route53.should_receive(:zone_exists?).with('www.example.net').and_return(false)
+      @balancer.configure_dns
+    end
+
+    it "doesn't create the zone if it already exists" do
+      @mocked_route53.should_not_receive(:create_zone)
+      @mocked_route53.should_receive(:zone_exists?).with('www.example.net').and_return(true)
+      @balancer.configure_dns
+    end
+
+    it "adds the load balancer name as an Alias record" do
+      @mocked_route53.should_receive(:alias_target).with('www.example.net').and_return(nil)
+      @mocked_route53.should_receive(:add_alias_record).with(:alias => 'www.example.net',
+        :lb_fqdn => 'some-name-0001.lb.amz.com', :lb_zone => 'Z0000000000')
+      @balancer.configure_dns
+    end
+
+    it "removes an outdated alias record" do
+      @mocked_route53.should_receive(:alias_target).with('www.example.net').and_return('old-name-1.lb.amz.com')
+      @mocked_route53.should_receive(:remove_alias_records).with('www.example.net')
+      @mocked_route53.should_receive(:add_alias_record).with(:alias => 'www.example.net',
+        :lb_fqdn => 'some-name-0001.lb.amz.com', :lb_zone => 'Z0000000000')
+      @balancer.configure_dns
+    end
+
+    it "doesn't touch the records if they are OK" do
+      @mocked_route53.should_not_receive(:add_alias_record)
+      @mocked_route53.should_not_receive(:remove_alias_records)
+      @balancer.configure_dns
+    end
+  end
 
+  describe "dns_info" do
+    it "forwards to route53 if dns_alias is present" do
+      @balancer = Awsborn::LoadBalancer.new(
+        'some-name',
+        :region => :eu_west_1a,
+        :dns_alias => 'my-awesome-site.example.com.'
+      )
+      @mocked_route53.should_receive(:zone_for).
+                      with('my-awesome-site.example.com.').
+                      and_return('pasta banana')
+      @balancer.dns_info.should == 'pasta banana'
+    end
+  end
+end

data/spec/route53_spec.rb

@@ -0,0 +1,145 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Awsborn::Route53 do
+  before do
+    @mock_interface = mock(:route53_interface)
+    RightAws::Route53Interface.stub!(:new).and_return(@mock_interface)
+    Awsborn.stub!(:access_key_id).and_return('access_key_id')
+    Awsborn.stub!(:secret_access_key).and_return('secret_access_key')
+  end
+
+  describe "connection" do
+    before do
+      @r53 = Awsborn::Route53.new
+    end
+    it "setup a connection the first time" do
+      RightAws::Route53Interface.should_receive(:new).
+                             with('access_key_id', 'secret_access_key', :logger => Awsborn.logger).
+                             exactly(:once)
+      @r53.connection
+      @r53.connection
+    end
+  end
+
+  context "for a valid r53" do
+    before do
+      @r53 = Awsborn::Route53.new(:eu_west_1b)
+      @zone_list_fixture = [
+        {
+          :aws_id=>"/hostedzone/Z1111111111111",
+          :caller_reference=>"1295422234-657482-hfkeo-JFKid-Ldfle-Sdrty",
+          :config=>{:comment=>"My test site!"},
+          :name=>"my-awesome-site.com."
+        },
+          {
+          :aws_id=>"/hostedzone/Z2222222222222",
+          :caller_reference=>"1234567890",
+          :config=>{:comment=>"My second test site!"},
+          :name=>"my-other-awesome-site.com."
+        }
+      ]
+      @zone_detail_fixture = {
+        :config=>{:comment=>"My test site!"},
+        :aws_id=>"/hostedzone/Z1111111111111",
+        :caller_reference=>"1295422234-657482-hfkeo-JFKid-Ldfle-Sdrty",
+        :name_servers=>
+        [ "ns-794.awsdns-35.net",
+          "ns-459.awsdns-57.com",
+          "ns-1537.awsdns-00.co.uk",
+          "ns-1165.awsdns-17.org"],
+          :name=>"my-awesome-site.com."}
+    end
+
+    describe "zone_exists?" do
+      before do
+        @mock_interface.stub!(:list_hosted_zones).and_return(@zone_list_fixture)
+      end
+      it "checks the result from Route53Interface" do
+        @r53.zone_exists?('my-awesome-site.com.').should == true
+        @r53.zone_exists?('my-awesome-site.com').should == true
+        @r53.zone_exists?('horrible.com').should == false
+      end
+    end
+
+    describe "zone_for" do
+      before do
+        @mock_interface.stub!(:list_hosted_zones).and_return(@zone_list_fixture)
+      end
+      it "retrieves zone description from Route53Interface if a zone matches the given name" do
+        @mock_interface.should_receive(:get_hosted_zone).
+                        with("/hostedzone/Z1111111111111").
+                        and_return(@zone_detail_fixture)
+        @r53.zone_for('my-awesome-site.com.').should == @zone_detail_fixture
+      end
+      it "retrieves zone description from Route53Interface even for a name without ending dot" do
+        @mock_interface.should_receive(:get_hosted_zone).
+                        with("/hostedzone/Z1111111111111").
+                        and_return(@zone_detail_fixture)
+        @r53.zone_for('my-awesome-site.com').should == @zone_detail_fixture
+      end
+      it "returns nil if no zone match the given name" do
+        @mock_interface.should_not_receive(:get_hosted_zone)
+        @r53.zone_for('horrible.com').should be_nil
+      end
+    end
+
+    describe "zone_id_for" do
+      before do
+        @mock_interface.stub!(:list_hosted_zones).and_return(@zone_list_fixture)
+      end
+      it "checks the result from Route53Interface" do
+        @r53.zone_id_for('my-awesome-site.com.').should == "/hostedzone/Z1111111111111"
+        @r53.zone_id_for('my-awesome-site.com').should == "/hostedzone/Z1111111111111"
+        @r53.zone_id_for('horrible.com').should be_nil
+      end
+
+    end
+
+    describe "create_zone" do
+      it "delegates to Route53Interface" do
+        @mock_interface.should_receive(:create_hosted_zone).with({:name => 'example.net.', :config => {:comment => ''}})
+        @r53.create_zone 'example.net'
+      end
+    end
+
+    describe "alias_target" do
+      it "delegates cleverly to Route53Interface" do
+        @mock_interface.should_receive(:list_hosted_zones).and_return(@zone_list_fixture)
+        alias_target = { :hosted_zone_id => 'Z2222222222', :dns_name => 'example-1111111111.us-east-1.elb.amazonaws.com.' }
+        alias_record = { :name => 'example.net.', :type => 'A', :alias_target => alias_target }
+        @mock_interface.should_receive(:list_resource_record_sets).with(/Z111111111111/).and_return([alias_record])
+
+        @r53.alias_target('my-awesome-site.com')
+      end
+    end
+
+    describe "add_alias_record" do
+      it "delegates to Route53Interface" do
+        zones = [{:aws_id=>"/hostedzone/Z111111111111", :name=>"example.net."}]
+        @mock_interface.stub!(:list_hosted_zones).and_return(zones)
+
+        alias_target = { :hosted_zone_id => 'Z2222222222', :dns_name => 'example-1111111111.us-east-1.elb.amazonaws.com.' }
+        alias_record = { :name => 'example.net.', :type => 'A', :alias_target => alias_target }
+
+        # .dup since it will get :action => :create
+        @mock_interface.should_receive(:create_resource_record_sets).with(/Z111111111111/, [alias_record.dup])
+
+        @r53.add_alias_record(:alias => 'example.net.', :lb_fqdn => alias_target[:dns_name], :lb_zone => 'Z2222222222')
+      end
+    end
+
+    describe "remove_alias_records" do
+      it "delegates to Route53Interface" do
+        zones = [{:aws_id=>"/hostedzone/Z111111111111", :name=>"example.net."}]
+        @mock_interface.stub!(:list_hosted_zones).and_return(zones)
+
+        alias_target = { :hosted_zone_id => 'Z2222222222', :dns_name => 'example-1111111111.us-east-1.elb.amazonaws.com.' }
+        alias_record = { :name => 'example.net.', :type => 'A', :alias_target => alias_target }
+        @mock_interface.should_receive(:list_resource_record_sets).with(/Z111111111111/).and_return([alias_record])
+        @mock_interface.should_receive(:delete_resource_record_sets).with(/Z111111111111/, [alias_record.dup])
+
+        @r53.remove_alias_records('example.net')
+      end
+    end
+  end
+end

data/spec/server_cluster_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+class SampleServer < Awsborn::Server
+  instance_type :m1_small
+  image_id 'ami-2fc2e95b'
+  keys :all
+end
+
+describe Awsborn::ServerCluster do
+
+  before(:each) do
+    Awsborn.verbose = false
+  end
+
+  describe "build" do
+    it "adds the domain to servers" do
+      c = Awsborn::ServerCluster.build SampleServer, 'foo' do
+        domain 'example.org'
+        server :name, :ip => 'www'
+      end
+      c.first.elastic_ip.should == 'www.example.org'
+    end
+    it "adds the domain to load balancers" do
+      c = Awsborn::ServerCluster.build SampleServer, 'foo' do
+        domain 'example.org'
+        load_balancer 'elbe', :dns_alias => 'www', :region => 'eu-west-1'
+      end
+      c.load_balancers.first.dns_alias.should == 'www.example.org'
+    end
+  end
+
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: awsborn
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - David Vrensk
@@ -16,23 +16,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-16 00:00:00 +02:00
+date: 2011-08-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: right_aws
+  name: icehouse-right_aws
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
         - 2
-        - 1
+        - 2
         - 0
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -127,12 +127,15 @@ files:
 - lib/awsborn/known_hosts_updater.rb
 - lib/awsborn/load_balancer.rb
 - lib/awsborn/rake.rb
+- lib/awsborn/route53.rb
 - lib/awsborn/server.rb
 - lib/awsborn/server_cluster.rb
 - spec/aws_constants_spec.rb
 - spec/ec2_spec.rb
 - spec/elb_spec.rb
 - spec/load_balancer_spec.rb
+- spec/route53_spec.rb
+- spec/server_cluster_spec.rb
 - spec/server_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb