aws-eni 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14eb7ab252066d43cf0f289c7d5de6e796fe6b95
-  data.tar.gz: b96f9a46cc748d54bbef973a5af74fca467a7b22
+  metadata.gz: 9e3020c6ae20a0d6a7027f065560e00c5764dbfb
+  data.tar.gz: f4827152a5efad857d3a8818e7f882a5a25e15ca
 SHA512:
-  metadata.gz: 48d1acfaaac7ca2ea0777305388fa1cac6f48c1b0a368dc9b08e493ff4a52274fc1813a34027b0c0858c27c4e3c91f3396df2090f1c9152f520133f0b0abbc75
-  data.tar.gz: fb0c4f4a9b9309b8236c729c7ac438f62579a057accf41488c5e3822cb0cb509d52f30aa6dc393ea2f6253cf4c720f568a0ef45e3628ad368c2b2e659210dc7d
+  metadata.gz: bd1bb10082ba681b5452411d8f2e75a39cc9b6d7227e3e8b996de89b5d619072c3295a40c63db98e0e11bb2c938e8c01c7b736fd5122f6bd4da45d896a65b435
+  data.tar.gz: 9c0e454b7797af337b50829ee4231ee9ee2f3f558343980023f4bb5078f6fb0c17fe0d81e5954473b90e67669e25adbb710ffc808143bb9e7b9eeb2a47e52ed4

data/bin/aws-eni

@@ -24,7 +24,7 @@ desc 'Display all system commands and warnings'
 switch [:V,:verbose], negatable: false
 
 pre do |opt|
-  Aws::ENI.timeout 90
+  Aws::ENI.timeout 120
   Aws::ENI.verbose opt[:verbose]
   true
 end
@@ -398,11 +398,14 @@ command [:unassign] do |c|
   c.desc 'Release any associated public IP address'
   c.switch [:r,:release], negatable: false
 
+  c.desc 'Do not wait for new interface state to propogate'
+  c.switch [:n,:noblock], negatable: false
+
   c.action do |global,opts,args|
     params = parse_args args, :interface_id, :device_name, :private_ip
     help_now! "Missing argument" unless params[:private_ip]
-    params[:release] = opts[:release]
 
+    params.merge! release: opts[:release], block: !opts[:noblock]
     unassign = Aws::ENI.unassign_secondary_ip(params[:private_ip], params)
     if unassign[:released]
       puts "EIP #{unassign[:public_ip]} (#{unassign[:allocation_id]}) dissociated from #{unassign[:private_ip]} and released"
@@ -463,11 +466,15 @@ command [:dissociate] do |c|
   c.desc 'Release the associated public IP address'
   c.switch [:r,:release], negatable: false
 
+  c.desc 'Do not wait for new interface state to propogate'
+  c.switch [:noblock], negatable: false
+
   c.action do |global,opts,args|
     params = parse_args args, :private_ip, :public_ip, :allocation_id, :association_id, :interface_id, :device_name
-    params[:release] = opts[:release]
     address = params[:private_ip] || params[:public_ip] || params[:association_id] || params[:allocation_id]
     help_now! "Missing argument" unless address
+
+    params.merge! release: opts[:release], block: !opts[:noblock]
     dissoc = Aws::ENI.dissociate_elastic_ip(address, params)
     if dissoc[:released]
       puts "EIP #{dissoc[:public_ip]} (#{dissoc[:allocation_id]}) dissociated from #{dissoc[:private_ip]} on #{dissoc[:device_name]} (#{dissoc[:interface_id]}) and released"

data/lib/aws-eni.rb

@@ -9,16 +9,21 @@ module Aws
   module ENI
     extend self
 
+    # class level thread-safe lock
+    @lock = Mutex.new
+
     def environment
-      @environment ||= Meta.connection do
-        hwaddr = Meta.instance('network/interfaces/macs/').lines.first.strip.chomp('/')
-        {
-          instance_id:       Meta.instance('instance-id'),
-          availability_zone: Meta.instance('placement/availability-zone'),
-          region:            Meta.instance('placement/availability-zone').sub(/^(.*)[a-z]$/,'\1'),
-          vpc_id:            Meta.interface(hwaddr, 'vpc-id'),
-          vpc_cidr:          Meta.interface(hwaddr, 'vpc-ipv4-cidr-block')
-        }.freeze
+      @lock.synchronize do
+        @environment ||= Meta.connection do
+          hwaddr = Meta.instance('network/interfaces/macs/').lines.first.strip.chomp('/')
+          {
+            instance_id:       Meta.instance('instance-id'),
+            availability_zone: Meta.instance('placement/availability-zone'),
+            region:            Meta.instance('placement/availability-zone').sub(/^(.*)[a-z]$/,'\1'),
+            vpc_id:            Meta.interface(hwaddr, 'vpc-id'),
+            vpc_cidr:          Meta.interface(hwaddr, 'vpc-ipv4-cidr-block')
+          }.freeze
+        end
       end
     rescue Errors::MetaNotFound
       raise Errors::EnvironmentError, 'Unable to detect VPC, library incompatible with EC2-Classic'
@@ -33,7 +38,7 @@ module Aws
 
     def timeout(new_default = nil)
       @timeout = new_default.to_i if new_default
-      @timeout ||= 30
+      @timeout ||= 120
     end
 
     def verbose(set_verbose = nil)
@@ -117,7 +122,7 @@ module Aws
       end
 
       if do_block || do_config || do_enable
-        wait_for 'the interface to attach', rescue: Errors::MetaNotFound do
+        wait_for 'the interface to attach', rescue: Errors::InvalidInterface do
           device.exists? && Client.interface_attached(device.interface_id)
         end
       end
@@ -261,7 +266,7 @@ module Aws
       new_ip = options[:private_ip]
 
       if do_block && !device.enabled?
-        raise Errors::InvalidParameter, "Interface #{device.name} is not enabled (cannot block)"
+        raise Errors::InvalidParameter, "Interface #{device.name} is not enabled (cannot test connection)"
       end
 
       if new_ip
@@ -273,29 +278,34 @@ module Aws
           private_ip_addresses: [new_ip],
           allow_reassignment: false
         )
-        wait_for 'private ip address to be assigned' do
-          Client.interface_private_ips(interface_id).include?(new_ip) ||
-          device.local_ips.include?(new_ip)
-        end
       else
         Client.assign_private_ip_addresses(
           network_interface_id: interface_id,
           secondary_private_ip_address_count: 1,
           allow_reassignment: false
         )
-        wait_for 'new private ip address to be assigned' do
-          new_ips = Client.interface_private_ips(interface_id) - current_ips
-          new_ips = device.local_ips - current_ips if new_ips.empty?
-          new_ip = new_ips.first if new_ips
+        wait_for 'new private IP address to be assigned' do
+          client_ips = Client.interface_private_ips(interface_id)
+          new_ip = (client_ips - current_ips).first || (device.meta_ips - current_ips).first
         end
       end
 
       if do_config
         device.add_alias(new_ip)
-        if do_block && !Interface.test(new_ip, target: device.gateway)
+        if do_block && !Interface.test(new_ip, target: device.gateway, timeout: timeout)
           raise Errors::TimeoutError, 'Timed out waiting for IP address to become active'
         end
       end
+
+      if do_block
+        # ensure new state has propagated to avoid race conditions
+        wait_for 'new private IP address to appear in metadata' do
+          device.meta_ips.include?(new_ip)
+        end
+        wait_for 'new private IP address to appear in EC2 resource' do
+          Client.interface_private_ips(interface_id).include?(new_ip)
+        end
+      end
       {
         private_ip:    new_ip,
         interface_id:  interface_id,
@@ -308,6 +318,7 @@ module Aws
     # remove a private ip using the AWS api and remove it from local config
     def unassign_secondary_ip(private_ip, options = {})
       do_release = !!options[:release]
+      do_block = options[:block] != false
 
       find = options[:device_name] || options[:device_number] || options[:interface_id] || private_ip
       device = Interface[find].assert(
@@ -335,6 +346,16 @@ module Aws
         network_interface_id: interface[:network_interface_id],
         private_ip_addresses: [private_ip]
       )
+
+      if do_block
+        # ensure new state has propagated to avoid race conditions
+        wait_for 'private IP address to be removed from metadata' do
+          !device.meta_ips.include?(private_ip)
+        end
+        wait_for 'private IP address to be removed from EC2 resource' do
+          !Client.interface_private_ips(device.interface_id).include?(private_ip)
+        end
+      end
       {
         private_ip:     private_ip,
         device_name:    device.name,
@@ -402,8 +423,14 @@ module Aws
         allow_reassociation:  false
       )
 
-      if do_block && !Interface.test(private_ip)
-        raise Errors::TimeoutError, 'Timed out waiting for ip address to become active'
+      if do_block
+        # ensure new state has propagated to avoid race conditions
+        wait_for 'public IP address to appear in metadata' do
+          device.public_ips.has_value?(eip[:public_ip])
+        end
+        if !Interface.test(private_ip, timeout: timeout)
+          raise Errors::TimeoutError, 'Timed out waiting for IP address to become active'
+        end
       end
       {
         private_ip:     private_ip,
@@ -420,6 +447,7 @@ module Aws
     # optionally release the public ip
     def dissociate_elastic_ip(address, options = {})
       do_release = !!options[:release]
+      do_block = options[:block] != false
 
       # assert device attributes if we've specified a device
       if find = options[:device_name] || options[:device_number]
@@ -463,6 +491,13 @@ module Aws
 
       Client.disassociate_address(association_id: eip[:association_id])
       Client.release_address(allocation_id: eip[:allocation_id]) if do_release
+
+      if device && do_block
+        # ensure new state has propagated to avoid race conditions
+        wait_for 'public IP address to be removed from metadata' do
+          !device.public_ips.has_value?(eip[:public_ip])
+        end
+      end
       {
         private_ip:     eip[:private_ip_address],
         device_name:    device && device.name,
@@ -578,7 +613,7 @@ module Aws
     def wait_for(task, options = {}, &block)
       errors = [*options[:rescue]]
       timeout = options[:timeout] || self.timeout
-      interval = options[:interval] || 0.1
+      interval = options[:interval] || 0.3
 
       until timeout < 0
         begin

data/lib/aws-eni/interface.rb

@@ -6,6 +6,9 @@ module Aws
   module ENI
     class Interface
 
+      # Class level thread-safe lock
+      @lock = Mutex.new
+
       class << self
         include Enumerable
 
@@ -15,8 +18,10 @@ module Aws
         def [](index)
           case index
           when Integer
-            @instance_cache ||= []
-            @instance_cache[index] ||= new("eth#{index}", false)
+            @lock.synchronize do
+              @instance_cache ||= []
+              @instance_cache[index] ||= new("eth#{index}", false)
+            end
           when nil
             self[next_available_index]
           when /^(?:eth)?([0-9]+)$/
@@ -144,6 +149,7 @@ module Aws
         @name = name
         @device_number = $1.to_i
         @route_table = @device_number + 10000
+        @lock = Mutex.new
         configure if auto_config
       end
 
@@ -166,19 +172,21 @@ module Aws
 
       # Validate and return basic interface metadata
       def info
-        hwaddr = self.hwaddr
-        unless @meta_cache && @meta_cache[:hwaddr] == hwaddr
-          @meta_cache = Meta.connection do
-            raise Errors::MetaBadResponse unless Meta.interface(hwaddr, '', not_found: nil)
-            {
-              hwaddr:       hwaddr,
-              interface_id: Meta.interface(hwaddr, 'interface-id'),
-              subnet_id:    Meta.interface(hwaddr, 'subnet-id'),
-              subnet_cidr:  Meta.interface(hwaddr, 'subnet-ipv4-cidr-block')
-            }.freeze
+        @lock.synchronize do
+          hwaddr = self.hwaddr
+          unless @meta_cache && @meta_cache[:hwaddr] == hwaddr
+            @meta_cache = Meta.connection do
+              raise Errors::MetaBadResponse unless Meta.interface(hwaddr, '', not_found: nil)
+              {
+                hwaddr:       hwaddr,
+                interface_id: Meta.interface(hwaddr, 'interface-id'),
+                subnet_id:    Meta.interface(hwaddr, 'subnet-id'),
+                subnet_cidr:  Meta.interface(hwaddr, 'subnet-ipv4-cidr-block')
+              }.freeze
+            end
           end
+          @meta_cache
         end
-        @meta_cache
       rescue Errors::MetaConnectionFailed
         raise Errors::InvalidInterface, "Interface #{name} could not be found in the EC2 instance meta-data"
       end
@@ -210,13 +218,25 @@ module Aws
         list.lines.grep(/inet ([0-9\.]+)\/.* #{name}/i){ $1 }
       end
 
+      # Return an array of ip addresses found in our instance metadata
+      def meta_ips
+        # hack to use cached hwaddr when available since this is often polled
+        # continuously for changes
+        hwaddr = (@meta_cache && @meta_cache[:hwaddr]) || hwaddr
+        Meta.interface(hwaddr, 'local-ipv4s', cache: false).lines.map(&:strip)
+      end
+
+      # Return a hash of local/public ip associations found in instance metadata
       def public_ips
         hwaddr = self.hwaddr
         Hash[
           Meta.connection do
             Meta.interface(hwaddr, 'ipv4-associations/', not_found: '', cache: false).lines.map do |public_ip|
               public_ip.strip!
-              [ Meta.interface(hwaddr, "ipv4-associations/#{public_ip}", cache: false), public_ip ]
+              unless private_ip = Meta.interface(hwaddr, "ipv4-associations/#{public_ip}", not_found: nil, cache: false)
+                raise Errors::MetaBadResponse
+              end
+              [ private_ip, public_ip ]
             end
           end
         ]
@@ -244,7 +264,6 @@ module Aws
         changes = 0
         prefix = self.prefix # prevent exists? check on each use
 
-        meta_ips = Meta.interface(hwaddr, 'local-ipv4s', cache: false).lines.map(&:strip)
         local_primary, *local_aliases = local_ips
         meta_primary, *meta_aliases = meta_ips
 

data/lib/aws-eni/meta.rb

@@ -5,6 +5,10 @@ require 'aws-eni/errors'
 module Aws
   module ENI
     module Meta
+      extend self
+
+      # Per-thread open connection storage
+      @connections = {}
 
       # These are the errors we trap when attempting to talk to the instance
       # metadata service.  Any of these imply the service is not present, not
@@ -21,7 +25,7 @@ module Aws
 
       # Perform a GET request on an open HTTP connection to the EC2 instance
       # meta-data and return the body of any 200 response.
-      def self.get(path, options = {})
+      def get(path, options = {})
         @cache ||= {}
         if @cache[path] && options[:cache] != false
           @cache[path]
@@ -43,39 +47,46 @@ module Aws
 
       # Perform a GET request on the instance metadata and return the body of
       # any 200 response.
-      def self.instance(path, options = {})
+      def instance(path, options = {})
         get("/latest/meta-data/#{path}", options)
       end
 
       # Perform a GET request on the interface metadata and return the body of
       # any 200 response.
-      def self.interface(hwaddr, path, options = {})
+      def interface(hwaddr, path, options = {})
         instance("network/interfaces/macs/#{hwaddr}/#{path}", options)
       end
 
       # Open a connection and attempt to execute the block `retries` times.
       # Can specify open and read timeouts in addition to the number of retries.
-      def self.connection(options = {})
-        return yield(@open_connection) if @open_connection
+      def connection(options = {})
+        raise ArgumentError, 'Must be called with a block' unless block_given?
+        attempts = 0
         retries = options[:retries] || 5
-        failed_attempts = 0
-        begin
-          http = Net::HTTP.new('169.254.169.254', '80', nil)
-          http.open_timeout = options[:open_timeout] || 5
-          http.read_timeout = options[:read_timeout] || 5
-          @open_connection = http.start
-          yield(http).tap { http.finish }
-        rescue *FAILURES => e
-          if failed_attempts < retries
-            # retry after an ever increasing cooldown time with each failure
-            Kernel.sleep(1.2 ** failed_attempts)
-            failed_attempts += 1
-            retry
-          else
-            raise Errors::MetaConnectionFailed, "EC2 Metadata request failed after #{retries} retries."
+
+        if (http = @connections[Thread.current]) && http.active?
+          yield(http)
+        else
+          begin
+            http = Net::HTTP.new('169.254.169.254', '80', nil)
+            http.open_timeout = options[:open_timeout] || 5
+            http.read_timeout = options[:read_timeout] || 5
+
+            @connections[Thread.current] = http.start
+            yield(http)
+          rescue *FAILURES => e
+            if attempts < retries
+              # increasing cooldown time on each attempt
+              Kernel.sleep(1.2 ** attempts)
+              attempts += 1
+              retry
+            else
+              raise Errors::MetaConnectionFailed, "EC2 Metadata request failed after #{retries} retries."
+            end
+          ensure
+            http = @connections.delete(Thread.current)
+            http.finish if http && http.active?
           end
-        ensure
-          @open_connection = nil
         end
       end
     end

data/lib/aws-eni/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module ENI
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-eni
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Mike Greiling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli