knife-cloudformation 0.1.6 → 0.1.8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.1.8
+* Update event cache handling
+* Allow multiple users for node connect attempts
+
 ## v0.1.6
 * Adds inspect action
 * Updates to commons

data/lib/chef/knife/cloudformation_inspect.rb

@@ -80,10 +80,26 @@ class Chef
         ui.info "Displaying stack #{ui.color(stack_name, :bold)} failure on instance #{ui.color(inst_id, :bold)}"
         opts = ssh_key ? {:keys => [ssh_key]} : {}
         remote_path = '/var/log/cfn-init.log'
-        content = remote_file_contents(inst_addr, ssh_user, remote_path, opts)
-        ui.info "  content of #{remote_path}:"
-        ui.info ""
-        ui.info content
+        content = nil
+        attempt_ssh_users.each do |ssh_user_name|
+          begin
+            content = remote_file_contents(inst_addr, ssh_user_name, remote_path, opts)
+            break
+          rescue Net::SSH::AuthenticationFailed
+            ui.warn "Authentication failed for user: #{ssh_user_name} on instance: #{inst_addr}"
+          end
+        end
+        if(content)
+          ui.info "  content of #{remote_path}:"
+          ui.info ""
+          ui.info content
+        else
+          ui.error "Failed to retreive content from node at: #{inst_addr}"
+        end
+      end
+
+      def attempt_ssh_users
+        ([ssh_user] + Array(Chef::Config[:knife][:cloudformation][:ssh_attempt_users])).flatten.compact
       end
 
       def ssh_user

data/lib/knife-cloudformation/aws_commons/stack.rb

@@ -111,7 +111,7 @@ module KnifeCloudformation
           .body['StackResources']
       end
 
-      def refresh?(bool=false)
+      def refresh?(bool=nil)
         bool || (bool.nil? && @force_refresh)
       end
 
@@ -204,12 +204,17 @@ module KnifeCloudformation
       end
 
       def events(all=false)
-        res = common.aws(:cloud_formation).describe_stack_events(name).body['StackEvents']
-        @memo[:events] ||= []
-        current = @memo[:events].map{|e| e['EventId']}
-        res.delete_if{|e| current.include?(e['EventId'])}
-        @memo[:events] += res
-        @memo[:events].uniq!
+        if(@memo[:events].nil? || refresh?)
+          res = common.aws(:cloud_formation).describe_stack_events(name).body['StackEvents']
+          @memo[:events] ||= []
+          current = @memo[:events].map{|e| e['EventId']}
+          res.delete_if{|e| current.include?(e['EventId'])}
+          @memo[:events] += res
+          @memo[:events].uniq!
+          @memo[:events].sort!{|x,y| x['Timestamp'] <=> y['Timestamp']}
+        else
+          res = []
+        end
         all ? @memo[:events] : res
       end
 

data/lib/knife-cloudformation/utils.rb

@@ -56,13 +56,30 @@ module KnifeCloudformation
     module Ssher
       def remote_file_contents(address, user, path, ssh_opts={})
         require 'net/sftp'
-        content = nil
-        Net::SFTP.start(address, user, ssh_opts) do |con|
-          con.file.open(path) do |f|
-            content = f.read
+        content = ''
+        ssh_session = Net::SSH.start(address, user, ssh_opts)
+        con = Net::SFTP::Session.new(ssh_session)
+        con.loop{ con.opening? }
+        f_handle = con.open!(path)
+        data = ''
+        count = 0
+        while(data)
+          data = nil
+          request = con.read(f_handle, count, 1024) do |response|
+            unless(response.eof?)
+              if(response.ok?)
+                count += 1024
+                content << response[:data]
+                data = true
+              end
+            end
           end
+          request.wait
         end
-        content
+        con.close!(f_handle)
+        con.close_channel
+        ssh_session.close
+        content.empty? ? nil : content
       end
     end
   end

data/lib/knife-cloudformation/version.rb

@@ -2,5 +2,5 @@ module KnifeCloudformation
   class Version < Gem::Version
   end
 
-  VERSION = Version.new('0.1.6')
+  VERSION = Version.new('0.1.8')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-cloudformation
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -81,6 +81,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- knife-cloudformation-0.1.6.gem
 - lib/chef/knife/cloudformation_events.rb
 - lib/chef/knife/cloudformation_base.rb
 - lib/chef/knife/cloudformation_destroy.rb