ultradns_updater 0.0.19 → 0.0.20

data/apiary.apib

@@ -0,0 +1,34 @@
+HOST: http://www.google.com/
+
+--- Sample API v2 ---
+---
+Welcome to the our sample API documentation. All comments can be written in (support [Markdown](http://daringfireball.net/projects/markdown/syntax) syntax)
+---
+
+--
+Shopping Cart Resources
+The following is a section of resources related to the shopping cart
+--
+List products added into your shopping-cart. (comment block again in Markdown)
+GET /shopping-cart
+< 200
+< Content-Type: application/json
+{ "items": [
+  { "url": "/shopping-cart/1", "product":"2ZY48XPZ", "quantity": 1, "name": "New socks", "price": 1.25 }
+] }
+
+Save new products in your shopping cart
+POST /shopping-cart
+> Content-Type: application/json
+{ "product":"1AB23ORM", "quantity": 2 }
+< 201
+< Content-Type: application/json
+{ "status": "created", "url": "/shopping-cart/2" }
+
+
+-- Payment Resources --
+This resource allows you to submit payment information to process your *shopping cart* items
+POST /payment
+{ "cc": "12345678900", "cvc": "123", "expiry": "0112" }
+< 200
+{ "receipt": "/payment/receipt/1" }

data/config/sample.config.yaml

@@ -1,11 +1,15 @@
 ---
 update_strategy: 
-  use: 'ec2' # choose strategy to use
+  use: 'ec2' # choose strategy to use: ec2, hostname, configured, or more than one to attempt: ['ec2', 'openstack']
+  # strategies follow:
+  # Other strategies defined below:
   ec2: # read from ec2 
     access_key_id : 'ACCESS KEY ID'
     secret_access_key : 'ACCESS KEY'
     name_tag : 'Name' # tag to use in AWS for the DNS CNAME or A & hostname (fqdn)
     iface: 'auto' # for VPC, the interface to use if no public hostname is available
+  openstack:
+    dhcp_domain: '.novalocal'
   hostname:  # read from the hostname (fqdn)
     iface: 'eth0' # interface to use to use the IP to map to the hostname
                   # 'auto' is also possible pick the interface that has connectivity

data/lib/ultradns_updater/cli.rb

@@ -22,11 +22,13 @@ class UltraDNSUpdater::CLI
   def self.run  
     opts = parse(ARGV)
     
-    strategy_name = opts[:force_strategy] || opts[:update_strategy][:use]
-    strategy_klass = UltraDNSUpdater::Strategies.strategy(strategy_name)
-    
-    ultradns = UltraDNSUpdater::UltraDNS.new(opts[:ultradns])
-    hostname = strategy_klass.new(ultradns).update(opts[:update_strategy][strategy_name.to_sym].merge({:logger => @logger}))
+    if opts[:force_strategy]
+      opts[:update_strategy][:use] = opts[:force_strategy]
+    end
+
+    ultradns = UltraDNSUpdater::UltraDNS.new(opts[:ultradns])    
+    strategy_klass = UltraDNSUpdater::Strategies.strategy(opts[:update_strategy][:use])
+    hostname = strategy_klass.new(ultradns, opts[:update_strategy], @logger).update()
     
     if hostname.nil?
       error_text = "Error Creating or Updating CNAME for hostname: #{hostname} using: #{strategy_name}"

data/lib/ultradns_updater/ec2.rb

@@ -47,6 +47,15 @@ class UltraDNSUpdater::Ec2
     @public_hostname
   end
 
+  def get_instance_public_ipv4
+    @public_ipv4 ||= begin
+      response = HTTPI.get(URI("#{EC2_META_DATA_URL}/public-ipv4").to_s)
+      response.code == 200 ? response.body : ''
+    end
+    @logger.debug("Public IPv4 = #{@public_ipv4}")
+    @public_ipv4
+  end
+
   def get_name_tag
     dns_cname = ''
     ec2.tags.filter('resource-id', get_instance_id()).each do |tag|

data/lib/ultradns_updater/strategies/configured.rb

@@ -14,8 +14,8 @@
 
 module UltraDNSUpdater::Strategies
   class Configured < UpdateStrategy
-    def update(strategy_config)
-      hostname = strategy_config[:name]
+    def update()
+      hostname = strategy_config()[:name]
       precondition.not_empty(hostname)
       
       ip = iface_ip(strategy_config)

data/lib/ultradns_updater/strategies/ec2.rb

@@ -15,7 +15,7 @@
 module UltraDNSUpdater::Strategies
   class Ec2 < UpdateStrategy
     
-    def update(strategy_config)
+    def update()
       ec2 = UltraDNSUpdater::Ec2.new(strategy_config)
       name_tag_value = ec2.get_name_tag
 

data/lib/ultradns_updater/strategies/hostname.rb

@@ -17,8 +17,10 @@ require 'ultradns_updater/strategies/configured'
 
 module UltraDNSUpdater::Strategies
   class Hostname < Configured
-    def update(strategy_config)
-      super(strategy_config.merge({:name => Socket::gethostname()}))
+    
+    def strategy_config
+      super().merge({:name => Socket::gethostname()})
     end
+    
   end
 end

data/lib/ultradns_updater/strategies/multiple.rb

@@ -0,0 +1,50 @@
+# 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.
+
+module UltraDNSUpdater::Strategies
+  class Multiple < UpdateStrategy
+    def self.factory(strategies)
+      clazz = Class.new(UltraDNSUpdater::Strategies::Multiple)
+      clazz.send(:define_method, :strategies) {strategies}
+      clazz
+    end
+    
+    def initialize(ultradns, strategy_section, logger = ::Logger.new(STDOUT))
+      super(ultradns, strategy_section, logger)
+      @strategy_instances = []
+      strategies.each do |strategy|
+        @strategy_instances << strategy.new(ultradns, strategy_section, logger)
+      end
+    end
+    
+    # should be overwritten
+    def strategies; []; end
+    
+    def update()
+      @strategy_instances.each do |strategy|
+        begin
+          strategy_config[:logger].info("Trying strategy #{strategy.class.name}") if strategy_config[:logger]
+          result = strategy.update()
+          return result if result
+        rescue
+          # ignore, try next
+        end
+      end
+      nil
+    end
+    
+  end
+end
+
+

data/lib/ultradns_updater/strategies/openstack.rb

@@ -0,0 +1,37 @@
+# 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.
+
+module UltraDNSUpdater::Strategies
+  class Openstack < UpdateStrategy
+    
+    def update()
+      opts = {:access_key_id => nil, 
+        :secret_access_key => nil, 
+        :logger => strategy_config()[:logger]
+      }
+      ec2 = UltraDNSUpdater::Ec2.new(opts)
+      
+      dhcp_domain = strategy_config()[:dhcp_domain]
+      name_value = ec2.get_instance_public_hostname.gsub(/#{dhcp_domain}/, '')
+      ip = ec2.get_instance_public_ipv4
+      
+      result = nil
+      if name_value && ip && ultradns.create_or_update_a(name_value, ip)
+        result = name_value
+      end
+      result
+    end
+    
+  end
+end

data/lib/ultradns_updater/strategies/update_strategy.rb

@@ -15,18 +15,28 @@
 class UltraDNSUpdater::Strategies::UpdateStrategy
   include UltraDNSUpdater::Preconditions
   
-  def initialize(ultradns)
+  def initialize(ultradns, strategy_section, logger = ::Logger.new(STDOUT))
     @ultradns = ultradns
+    @strategy_section = strategy_section
+    @logger = logger
   end
   
   # update ultradns based on the configuration provided
   # returns: the hostname applied or else nil
-  def update(strategy_config); end
+  def update(); end
   
   def ultradns
     @ultradns
   end
   
+  def strategy_to_use
+    @strategy_section[:use]
+  end
+  
+  def strategy_config
+    @strategy_section[strategy_to_use.to_sym].merge({:logger => @logger}) rescue nil
+  end
+  
   def iface_ip(strategy_config)
     ip = nil
     if strategy_config[:iface] == 'auto'

data/lib/ultradns_updater/strategies.rb

@@ -17,22 +17,34 @@ module UltraDNSUpdater::Strategies; end
 
 require 'ultradns_updater/strategies/update_strategy'
 require 'ultradns_updater/strategies/ec2'
+require 'ultradns_updater/strategies/openstack'
+require 'ultradns_updater/strategies/multiple'
 require 'ultradns_updater/strategies/configured'
 require 'ultradns_updater/strategies/hostname'
 
 module UltraDNSUpdater::Strategies
 
   def self.strategy(strategy_name)
-    strategy_sym = strategy_name.to_sym rescue nil
-    case strategy_sym
-    when :ec2
-      UltraDNSUpdater::Strategies::Ec2
-    when :hostname
-      UltraDNSUpdater::Strategies::Hostname
-    when :configured
-      UltraDNSUpdater::Strategies::Configured
+    if strategy_name.kind_of?(Array)
+      strategies = []
+      strategy_name.each do |strategy_item|
+        strategies << strategy(strategy_item)
+      end
+      UltraDNSUpdater::Strategies::Multiple.factory(strategies)
     else
-      raise "No strategy found for: #{strategy_name}"
+      strategy_sym = strategy_name.to_sym rescue nil
+      case strategy_sym
+      when :ec2
+        UltraDNSUpdater::Strategies::Ec2
+      when :openstack
+        UltraDNSUpdater::Strategies::Openstack
+      when :hostname
+        UltraDNSUpdater::Strategies::Hostname
+      when :configured
+        UltraDNSUpdater::Strategies::Configured
+      else
+        raise "No strategy found for: #{strategy_name}"
+      end
     end
   end
   

data/lib/ultradns_updater/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module UltraDNSUpdater
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

data/spec/lib/configured_spec.rb

@@ -25,10 +25,11 @@ describe UltraDNSUpdater::Strategies::Configured do
       
       ultradns = Object.new
       ultradns.should_receive(:create_or_update_a).with(name, ip_addr)
-      configured_strategy = UltraDNSUpdater::Strategies::Configured.new(ultradns)
+      configured_strategy = UltraDNSUpdater::Strategies::Configured.new(ultradns, 
+        {:use => 'conf', :conf => {:iface => 'eth0', :name => name}})
       configured_strategy.stub(:iface_ip).and_return(ip_addr)
 
-      configured_strategy.update({:iface => 'eth0', :name => name})
+      configured_strategy.update()
 
     ensure
 

data/spec/lib/hostname_spec.rb

@@ -25,12 +25,12 @@ describe UltraDNSUpdater::Strategies::Hostname do
       
       ultradns = Object.new
       ultradns.should_receive(:create_or_update_a).with(hostname, ip_addr)
-      hostname_strategy = UltraDNSUpdater::Strategies::Hostname.new(ultradns)
+      hostname_strategy = UltraDNSUpdater::Strategies::Hostname.new(ultradns, 
+        {:use => 'host', :host => {:iface => 'eth0'}})
       hostname_strategy.stub(:iface_ip).and_return(ip_addr)
       Socket.stub(:gethostname).and_return(hostname)
       Socket.gethostname.should == hostname
-      hostname_strategy.update({:iface => 'eth0'})
-
+      hostname_strategy.update()
     ensure
       Socket.unstub(:gethostname)
     end

data/spec/lib/ip_info_spec.rb

@@ -27,9 +27,9 @@ describe UltraDNSUpdater::IpInfo do
     
     iface = "eth0"
     if RUBY_PLATFORM =~ /darwin/
-      iface = "en1"
+      iface = "en0"
     end 
-    
+
     UltraDNSUpdater::IpInfo.ipv4_for_iface(iface).should_not == ''
     UltraDNSUpdater::IpInfo.ipv4_for_iface(iface).should match(/\d+\.\d+\.\d+\.\d+/)
   end
@@ -38,7 +38,7 @@ describe UltraDNSUpdater::IpInfo do
     
     iface = "eth0" # probably have eth0 on linux..
     if RUBY_PLATFORM =~ /darwin/
-      iface = "en1"
+      iface = "en0"
     end 
     
     UltraDNSUpdater::IpInfo.ipv6_for_iface(iface).should_not == ''

data/spec/lib/multiple_spec.rb

@@ -0,0 +1,49 @@
+# 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 'ostruct'
+
+
+describe UltraDNSUpdater::Strategies::Multiple do
+  it "should try multiple strategies" do
+    begin
+      fake_name = "openstack-iad01-az02.neustar.biz"
+      FakeWeb.register_uri(:get, UltraDNSUpdater::Ec2::EC2_META_DATA_URL + "/public-hostname", :body => fake_name)
+      fake_ipv4 = "10.1.2.3"
+      FakeWeb.register_uri(:get, UltraDNSUpdater::Ec2::EC2_META_DATA_URL + "/public-ipv4", :body => fake_ipv4)
+      
+      
+      ultradns = Object.new
+      ultradns.should_receive(:create_or_update_a).with(fake_name, fake_ipv4).and_return()
+      
+      clazz_bad = Class.new(UltraDNSUpdater::Strategies::UpdateStrategy) do 
+        def update()
+          raise "Fake Error"
+        end
+      end
+
+      multiple_factory = UltraDNSUpdater::Strategies::Multiple.factory(
+        [clazz_bad, UltraDNSUpdater::Strategies::Openstack])
+
+      openstack_strategy = multiple_factory.new(ultradns, 
+        { :use => 'conf', :conf => {} }
+      )
+      openstack_strategy.update().should == fake_name
+    ensure
+      FakeWeb.clean_registry
+    end
+  end
+end

data/spec/lib/openstack_spec.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 'spec_helper'
+require 'fakeweb'
+require 'ostruct'
+
+
+describe UltraDNSUpdater::Strategies::Openstack do
+  it "should update ultradns openstack information" do
+    begin
+      dhcp_domain = '.novalocal'
+      fake_name = "openstack-iad01-az02.neustar.biz"
+      FakeWeb.register_uri(:get, UltraDNSUpdater::Ec2::EC2_META_DATA_URL + "/public-hostname", 
+        :body => (fake_name + dhcp_domain))
+      fake_ipv4 = "10.1.2.3"
+      FakeWeb.register_uri(:get, UltraDNSUpdater::Ec2::EC2_META_DATA_URL + "/public-ipv4", :body => fake_ipv4)
+      
+      
+      ultradns = Object.new
+      ultradns.should_receive(:create_or_update_a).with(fake_name, fake_ipv4).and_return()
+      openstack_strategy = UltraDNSUpdater::Strategies::Openstack.new(ultradns, 
+        { :use => 'conf', :conf => {:dhcp_domain => dhcp_domain } }
+      )
+      openstack_strategy.update().should == fake_name
+    ensure
+      FakeWeb.clean_registry
+    end
+  end
+end
+

data/spec/lib/strategies_spec.rb

@@ -27,5 +27,13 @@ describe UltraDNSUpdater::Strategies do
     expect { UltraDNSUpdater::Strategies.strategy(nil) }.to raise_error(RuntimeError)
     expect { UltraDNSUpdater::Strategies.strategy(:blah) }.to raise_error(RuntimeError)
   end
+  
+  it "should support multiple strategies" do
+    UltraDNSUpdater::Strategies.strategy(['ec2', 'openstack']).should_not == nil
+    multiple = UltraDNSUpdater::Strategies.strategy(['ec2', 'openstack'])
+    multiple.new(nil, nil).strategies.should == 
+      [UltraDNSUpdater::Strategies::Ec2, UltraDNSUpdater::Strategies::Openstack]
+  end
+  
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ultradns_updater
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &2156070900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,32 +21,47 @@ dependencies:
         version: 1.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *2156070900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: wasabi
-  requirement: &2156069800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156069800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &2156068980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156068980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156067920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156067920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156066900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156066900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2156066400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156066400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Update your UltraDNS configured A, AAAA, or CNAMEs to point to an instance
   public hostnames
 email:
@@ -91,6 +121,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- apiary.apib
 - bin/ultradns_updater
 - config/sample.config.yaml
 - lib/ultradns_updater.rb
@@ -102,6 +133,8 @@ files:
 - lib/ultradns_updater/strategies/configured.rb
 - lib/ultradns_updater/strategies/ec2.rb
 - lib/ultradns_updater/strategies/hostname.rb
+- lib/ultradns_updater/strategies/multiple.rb
+- lib/ultradns_updater/strategies/openstack.rb
 - lib/ultradns_updater/strategies/update_strategy.rb
 - lib/ultradns_updater/ultradns.rb
 - lib/ultradns_updater/version.rb
@@ -109,6 +142,8 @@ files:
 - spec/lib/ec2_spec.rb
 - spec/lib/hostname_spec.rb
 - spec/lib/ip_info_spec.rb
+- spec/lib/multiple_spec.rb
+- spec/lib/openstack_spec.rb
 - spec/lib/strategies_spec.rb
 - spec/lib/ultradns_spec.rb
 - spec/spec_helper.rb
@@ -128,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2236748956179911852
+      hash: -3951190794668498878
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -137,10 +172,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2236748956179911852
+      hash: -3951190794668498878
 requirements: []
 rubyforge_project: ultradns_updater
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Update UltraDNS from an instance with EC2 support
@@ -149,6 +184,8 @@ test_files:
 - spec/lib/ec2_spec.rb
 - spec/lib/hostname_spec.rb
 - spec/lib/ip_info_spec.rb
+- spec/lib/multiple_spec.rb
+- spec/lib/openstack_spec.rb
 - spec/lib/strategies_spec.rb
 - spec/lib/ultradns_spec.rb
 - spec/spec_helper.rb