aws-eni 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e3020c6ae20a0d6a7027f065560e00c5764dbfb
-  data.tar.gz: f4827152a5efad857d3a8818e7f882a5a25e15ca
+  metadata.gz: c19de93aff68758d1c59c46801a7ad707350aa7b
+  data.tar.gz: 6fb377899c3f4c1f894d82a195768e699388cfec
 SHA512:
-  metadata.gz: bd1bb10082ba681b5452411d8f2e75a39cc9b6d7227e3e8b996de89b5d619072c3295a40c63db98e0e11bb2c938e8c01c7b736fd5122f6bd4da45d896a65b435
-  data.tar.gz: 9c0e454b7797af337b50829ee4231ee9ee2f3f558343980023f4bb5078f6fb0c17fe0d81e5954473b90e67669e25adbb710ffc808143bb9e7b9eeb2a47e52ed4
+  metadata.gz: ef384ea2c14806ba12a499563639b8c1f4b9d63ee7c4b4f081c3cb6368813d625003204fccee7c68d9220f63741de189020b19c471ed8ee408cb1319298cb085
+  data.tar.gz: d3e0e7595785be73265394aa356457f343001033b03ef32336e41c6cd58909ecf83f8b1d2ad7f1ebe9f4d404b5306ea44da5fcae619508573eff6f3d856e0cba

data/bin/aws-eni

@@ -562,7 +562,7 @@ command [:check] do |c|
   c.action do |global,opts,args|
     help_now! "Too many arguments" if args.count > 1
 
-    print 'Interface permissions test... '
+    print 'kernel permissions test... '
     if Aws::ENI.has_interface_access?
       puts 'success!'
     else
@@ -570,13 +570,23 @@ command [:check] do |c|
       puts "- unable to modify network configuration with /sbin/ip (try sudo)"
     end
 
-    print 'AWS EC2 permissions test... '
-    if Aws::ENI.has_client_access?
+    print 'ec2 instance meta-data test... '
+    begin
+      env = Aws::ENI.environment
+    rescue Aws::ENI::Errors::EnvironmentError
+      puts 'failed'
+      puts '- unable to access ec2 meta-data. are we runing on ec2?'
+    else
+      puts 'success!'
+    end
+
+    print 'aws ec2 client access test... '
+    if env && Aws::ENI.has_client_access?
       puts 'success!'
     else
       puts 'failed'
-      puts "- insufficient EC2 access. Ensure you have granted access to the"
-      puts "  appropriate EC2 methods in your IAM policy (see documentation)"
+      puts '- insufficient ec2 access to mutate interface config.'
+      puts '- ensure you have granted access to the appropriate ec2 methods in your IAM policy (see documentation)'
     end
   end
 end

data/lib/aws-eni/client.rb

@@ -25,8 +25,9 @@ module Aws
       # lazy-load our ec2 client
       def client
         @client ||= EC2::Client.new(region: region)
-      rescue StandardError => e
-        raise if e === Errors::ServiceError
+      rescue Errors::ServiceError
+        raise
+      rescue
         raise Errors::EnvironmentError, 'Unable to initialize EC2 client'
       end
 

data/lib/aws-eni/interface.rb

@@ -99,13 +99,14 @@ module Aws
 
         # Execute an 'ip' command
         def cmd(command, options = {})
+          options[:sudo] = options[:sudo] != false
           errors = options[:errors]
           options[:errors] = true
           begin
             exec("/sbin/ip #{command}", options)
           rescue Errors::InterfaceOperationError => e
             case e.message
-            when /operation not permitted/i
+            when /operation not permitted/i, /password is required/i
               raise Errors::InterfacePermissionError, "Operation not permitted"
             else
               raise if errors
@@ -125,6 +126,7 @@ module Aws
           output = nil
           errors = options[:errors]
           verbose = self.verbose || options[:verbose]
+          command = "sudo -n #{command}" if options[:sudo]
 
           puts command if verbose
           Open3.popen3(command) do |i,o,e,t|
@@ -213,8 +215,8 @@ module Aws
 
       # Return an array of configured ip addresses (primary + secondary)
       def local_ips
-        list = cmd("addr show dev #{name} primary") +
-               cmd("addr show dev #{name} secondary")
+        list = cmd("addr show dev #{name} primary", sudo: false) +
+               cmd("addr show dev #{name} secondary", sudo: false)
         list.lines.grep(/inet ([0-9\.]+)\/.* #{name}/i){ $1 }
       end
 
@@ -256,7 +258,7 @@ module Aws
 
       # Check whether our interface is enabled
       def enabled?
-        exists? && cmd("link show up").include?(name)
+        exists? && cmd("link show up", sudo: false).include?(name)
       end
 
       # Initialize a new interface config

data/lib/aws-eni/version.rb

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

metadata

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