aws-eni 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 613d8b521f5ea3db65f0420e90dfe188c6b42e53
-  data.tar.gz: 0a1eebe7c2b86a128a282f9edd8d61d5c0c39d2c
+  metadata.gz: 5bd70f82e45aa8e1c89003fefe1118b3c3e7a0ff
+  data.tar.gz: 8f7c1cbbb2136f722d34f8d414a167327e6920f0
 SHA512:
-  metadata.gz: 092fd301932d4521a4c7b1fda6c1d04f21160d9585bd5e0b1c11e5385a87b97b21bb33bd3a55001fafa3da4e2b39d67b12b5cd759c7f00aa2064ce9dfe733edd
-  data.tar.gz: c10cb8481dc1f9a544e3ebedb674bd434d4e30f1a9cdc1e02d022d2195016f5f16813919a387a82e27b4aa206d29b092cbbb51bc568e1a4f3ba7e135007f976c
+  metadata.gz: 3d7d4e8422d6232c893375f284b4cbc33b232c2cbc2af731be6f679540c017ab97e6162a22ce52ca011a49ca11dac653f862b51bba9893ebf5ed6a78ca280b89
+  data.tar.gz: 09dafcec8f9c13900c99754f0dfad80b7a912da55512de34f163a8a546fc4cdd2efaba04b8eb34032f5dd6857a95e35c9cce5c686272818cf32093c81af0ec24

data/bin/aws-eni

@@ -361,9 +361,10 @@ command [:unassign] do |c|
   c.switch [:r,:release], negatable: false
 
   c.action do |global,opts,args|
-    help_now! "Missing argument" if args.empty?
     params = parse_args args, :interface_id, :device_name, :private_ip
+    help_now! "Missing argument" unless params[:private_ip]
     params[:release] = opts[:release]
+
     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"
@@ -416,10 +417,10 @@ command [:dissociate] do |c|
   c.switch [:r,:release], negatable: false
 
   c.action do |global,opts,args|
-    help_now! "Missing argument" if args.empty?
     params = parse_args args, :private_ip, :public_ip, :allocation_id, :association_id, :interface_id, :device_name
-    ip = params[:private_ip] || params[:public_ip] || params[:association_id] || params[:allocation_id]
-    dissoc = Aws::ENI.dissociate_elastic_ip(ip, params)
+    address = params[:private_ip] || params[:public_ip] || params[:association_id] || params[:allocation_id]
+    help_now! "Missing argument" unless address
+    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"
     else

data/lib/aws-eni.rb

@@ -1,5 +1,4 @@
 require 'time'
-require 'resolv'
 require 'aws-sdk'
 require 'aws-eni/version'
 require 'aws-eni/errors'
@@ -258,15 +257,44 @@ module Aws
 
     # remove a private ip using the AWS api and remove it from local config
     def unassign_secondary_ip(private_ip, options = {})
-      raise NoMethodError, "unassign_secondary_ip not yet implemented"
+      do_release = !!options[:release]
+
+      find = options[:device_name] || options[:device_number] || options[:interface_id] || private_ip
+      device = IFconfig[find].assert(
+        exists: true,
+        device_name:   options[:device_name],
+        interface_id:  options[:interface_id],
+        device_number: options[:device_number]
+      )
+
+      resp = client.describe_network_interfaces(network_interface_ids: [device.interface_id])
+      interface = resp[:network_interfaces].first
+      raise UnknownInterfaceError, "Interface attachment could not be located" unless interface
+
+      unless addr_info = interface[:private_ip_addresses].find { |addr| addr[:private_ip_address] == private_ip }
+        raise InvalidParameterError, "IP #{private_ip} not found on #{device.name}"
+      end
+      if addr_info[:primary]
+        raise InvalidParameterError, "The primary IP address of an interface cannot be unassigned"
+      end
+
+      if assoc = addr_info[:association]
+        client.release_address(allocation_id: assoc[:allocation_id]) if do_release
+      end
+
+      device.remove_alias(private_ip)
+      client.unassign_private_ip_addresses(
+        network_interface_id: interface[:network_interface_id],
+        private_ip_addresses: [private_ip]
+      )
       {
-        private_ip:     '0.0.0.0',
-        device_name:    'eth0',
-        interface_id:   'eni-1a2b3c4d',
-        public_ip:      '0.0.0.0',
-        allocation_id:  'eipalloc-1a2b3c4d',
-        association_id: 'eipassoc-1a2b3c4d',
-        released:       true
+        private_ip:     private_ip,
+        device_name:    device.name,
+        interface_id:   device.interface_id,
+        public_ip:      assoc[:public_ip],
+        allocation_id:  assoc[:allocation_id],
+        association_id: assoc[:association_id],
+        released:       assoc && do_release
       }
     end
 
@@ -318,15 +346,36 @@ module Aws
     # dissociate a public ip from a private ip through the AWS api and
     # optionally release the public ip
     def dissociate_elastic_ip(ip, options = {})
-      raise NoMethodError, "dissociate_elastic_ip not yet implemented"
+      do_release = !!options[:release]
+      eip = describe_address(ip)
+
+      if find = options[:device_name] || options[:device_number] || options[:interface_id]
+        device = IFconfig[find].assert(
+          device_name:   options[:device_name],
+          device_number: options[:device_number],
+          interface_id:  options[:interface_id]
+        )
+        if device.interface_id != eip[:network_interface_id]
+          raise UnknownInterfaceError, "EIP #{public_ip} is not associated with interface #{device.name} (#{device.interface_id})"
+        end
+      else
+        begin
+          device = IFconfig[eip[:network_interface_id]]
+        rescue UnknownInterfaceError
+          raise UnknownInterfaceError, "EIP #{public_ip} is not associated with an interface on this machine"
+        end
+      end
+
+      client.disassociate_address(association_id: eip[:association_id])
+      client.release_address(allocation_id: eip[:allocation_id]) if do_release
       {
-        private_ip:     '0.0.0.0',
-        device_name:    'eth0',
-        interface_id:   'eni-1a2b3c4d',
-        public_ip:      '0.0.0.0',
-        allocation_id:  'eipalloc-1a2b3c4d',
-        association_id: 'eipassoc-1a2b3c4d',
-        released:       true
+        private_ip:     eip[:private_ip_address],
+        device_name:    device.name,
+        interface_id:   eip[:network_interface_id],
+        public_ip:      eip[:public_ip],
+        allocation_id:  eip[:allocation_id],
+        association_id: eip[:association_id],
+        released:       do_release
       }
     end
 
@@ -425,7 +474,18 @@ module Aws
 
     # use either an ip address or allocation id
     def describe_address(address)
-      filter_by = address =~ Resolv::IPv4::Regex ? 'public-ip' : 'allocation-id'
+      filter_by = case address
+        when /^eipalloc-/
+          'allocation-id'
+        when /^eipassoc-/
+          'allocation-id'
+        else
+          if IPAddr.new(environment[:vpc_cidr]) === IPAddr.new(address)
+            'private-ip-address'
+          else
+            'public-ip'
+          end
+        end
       resp = client.describe_addresses(filters: [
         { name: 'domain', values: ['vpc'] },
         { name: filter_by, values: [address] }

data/lib/aws-eni/ifconfig.rb

@@ -22,7 +22,7 @@ module Aws
           when /^(?:eth)?([0-9]+)$/
             self[$1.to_i]
           when /^eni-/
-            find { |dev| dev.instance_id == index }
+            find { |dev| dev.interface_id == index }
           when /^[0-9a-f:]+$/i
             find { |dev| dev.hwaddr.casecmp(index) == 0 }
           when /^[0-9\.]+$/
@@ -314,7 +314,7 @@ module Aws
       end
 
       # Remove a secondary ip from this interface
-      def remove_alias
+      def remove_alias(ip)
         cmd("addr del #{ip}/#{prefix} dev #{name}")
         unless name == 'eth0' || !cmd("rule list").match(/([0-9]+):\s+from #{ip} lookup #{route_table}/)
           cmd("rule delete pref #{$1}")

data/lib/aws-eni/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module ENI
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

metadata

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