knife-cloudformation 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b002141f6da41466fef046cf455e9ee8a355a98
-  data.tar.gz: c48f9be9c8bdedfadee2aab047a02b971d7a90d9
+  metadata.gz: 13b24aa4ad8bd90e9b02f130ee8dc992e657ce1b
+  data.tar.gz: c1916b7656ed73950454349fb236407c94805013
 SHA512:
-  metadata.gz: c6452f2c5114f4347c9accc2e0672e7be693e975c8fa61921808d2ef79acb352a63bafae6323836816b3c2c9f80caee30e90ac18987803e424d9268d228c81c3
-  data.tar.gz: 5295001be1d029244189c029b753e12065d39061918091adc9cb81157b9bbdaec82c9f8623b8d6f4e178622700719f9f9a7d9e852dde417854a3b5421a155d0a
+  metadata.gz: b3927c0adb0eac79ce40f4468361814cc3cd22d7e50c5003f646164576e12a4180b480a0b3dc7eabd7ee2bc62a44a99234236f78b6e301d733834dbfcc93469f
+  data.tar.gz: dda8df44d640cb443a66e9757b0535d59d1d164bf3d33306b237063208b34ab9041cda45ca82ad160b311300cc4312080558a7855ada16d277b32fac2ab2d955

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.2.8
+* Update stack lookup implementation to make faster from CLI
+* Prevent constant error on exception when Redis is not in use
+* Provide better error messages on request failures
+
 ## v0.2.6
 * Update to parameter re-defaults to use correct hash instance
 

data/lib/chef/knife/cloudformation_create.rb

@@ -85,7 +85,7 @@ class Chef
           ui.info "  -> #{stack_info}"
         end
 
-        stack = provider.stacks.build(
+        stack = provider.connection.stacks.build(
           Chef::Config[:knife][:cloudformation][:options].dup.merge(
             :name => name,
             :template => file
@@ -107,13 +107,11 @@ class Chef
         stack.save
 
         if(Chef::Config[:knife][:cloudformation][:poll])
-          provider.fetch_stacks
           poll_stack(stack.name)
-          stack = provider.stacks.get(name)
+          stack = provider.connection.stacks.get(name)
 
           if(stack.reload.success?)
             ui.info "Stack create complete: #{ui.color('SUCCESS', :green)}"
-            provider.fetch_stacks
             knife_output = Chef::Knife::CloudformationDescribe.new
             knife_output.name_args.push(name)
             knife_output.config[:outputs] = true
@@ -141,7 +139,7 @@ class Chef
         remote_stacks = Chef::Config[:knife][:cloudformation].
           fetch(:create, {}).fetch(:apply_stacks, [])
         remote_stacks.each do |stack_name|
-          remote_stack = provider.stacks.get(stack_name)
+          remote_stack = provider.connection.stacks.get(stack_name)
           if(remote_stack)
             stack.apply_stack(remote_stack)
           else

data/lib/chef/knife/cloudformation_describe.rb

@@ -41,7 +41,7 @@ class Chef
       # Run the stack describe action
       def _run
         stack_name = name_args.last
-        stack = provider.stacks.get(stack_name)
+        stack = provider.connection.stacks.get(stack_name)
         if(stack)
           display = [].tap do |to_display|
             AVAILABLE_DISPLAYS.each do |display_option|

data/lib/chef/knife/cloudformation_destroy.rb

@@ -24,7 +24,7 @@ class Chef
         ui.warn "Destroying Cloud Formation#{plural}: #{ui.color(stacks.join(', '), :bold)}"
         ui.confirm "Destroy formation#{plural}"
         stacks.each do |stack_name|
-          stack = provider.stacks.get(stack_name)
+          stack = provider.connection.stacks.get(stack_name)
           if(stack)
             stack.destroy
           else
@@ -33,7 +33,6 @@ class Chef
         end
         if(config[:polling])
           if(stacks.size == 1)
-            provider.fetch_stacks
             poll_stack(stacks.first)
           else
             ui.error "Stack polling is not available when multiple stack deletion is requested!"

data/lib/chef/knife/cloudformation_events.rb

@@ -46,12 +46,12 @@ class Chef
       def _run
         name = name_args.first
         ui.info "Cloud Formation Events for Stack: #{ui.color(name, :bold)}\n"
-        stack = provider.stacks.get(name)
+        stack = provider.connection.stacks.get(name)
         last_id = nil
         if(stack)
           events = get_events(stack)
           things_output(name, events, 'events')
-          last_id = events.last[:id]
+          last_id = events.last ? events.last[:id] : nil
           if(Chef::Config[:knife][:cloudformation][:poll])
             cycle_events = true
             while(cycle_events)

data/lib/chef/knife/cloudformation_inspect.rb

@@ -53,7 +53,7 @@ class Chef
       # Run the stack inspection action
       def _run
         stack_name = name_args.last
-        stack = provider.stacks.get(stack_name)
+        stack = provider.connection.stacks.get(stack_name)
         ui.info "Stack inspection #{ui.color(stack_name, :bold)}:"
         outputs = [:attribute, :nodes, :instance_failure].map do |key|
           if(config.has_key?(key))

data/lib/chef/knife/cloudformation_update.rb

@@ -37,7 +37,7 @@ class Chef
           exit 1
         end
 
-        stack = provider.stacks.get(name)
+        stack = provider.connection.stacks.get(name)
 
         if(stack)
           ui.info "#{ui.color('Cloud Formation:', :bold)} #{ui.color('update', :green)}"
@@ -67,10 +67,8 @@ class Chef
 
           if(Chef::Config[:knife][:cloudformation][:poll])
             poll_stack(stack.name)
-            provider.fetch_stacks
             if(stack.success?)
               ui.info "Stack update complete: #{ui.color('SUCCESS', :green)}"
-              provider.fetch_stacks
               knife_output = Chef::Knife::CloudformationDescribe.new
               knife_output.name_args.push(name)
               knife_output.config[:outputs] = true
@@ -117,7 +115,7 @@ class Chef
         remote_stacks = Chef::Config[:knife][:cloudformation].
           fetch(:update, {}).fetch(:apply_stacks, [])
         remote_stacks.each do |stack_name|
-          remote_stack = provider.stacks.get(stack_name)
+          remote_stack = provider.connection.stacks.get(stack_name)
           if(remote_stack)
             remote_stack.parameters.each do |key, value|
               next if Chef::Config[:knife][:cloudformation][:stacks][:ignore_parameters].include?(key)

data/lib/chef/knife/cloudformation_validate.rb

@@ -18,7 +18,7 @@ class Chef
         file = KnifeCloudformation::Utils::StackParameterScrubber.scrub!(file)
         file = translate_template(file)
         begin
-          result = provider.stacks.build(
+          result = provider.connection.stacks.build(
             :name => 'validation-stack',
             :template => file
           ).validate

data/lib/knife-cloudformation/cache.rb

@@ -264,8 +264,12 @@ module KnifeCloudformation
         self[lock_name].lock do
           yield
         end
-      rescue Redis::Lock::LockTimeout
-        raise if raise_on_locked
+      rescue => e
+        if(e.class.to_s == 'Redis::Lock::LockTimeout')
+          raise if raise_on_locked
+        else
+          raise
+        end
       end
     end
 

data/lib/knife-cloudformation/knife/base.rb

@@ -20,7 +20,10 @@ module KnifeCloudformation
         # @param args [String] extra strings to output
         def _debug(e, *args)
           if(ENV['DEBUG'])
-            ui.fatal "Exception information: #{e.class}: #{e}\n#{e.backtrace.join("\n")}\n"
+            ui.fatal "Exception information: #{e.class}: #{e.message}\n#{e.backtrace.join("\n")}\n"
+            if(e.is_a?(Miasma::Error::ApiError))
+              ui.fatal "Response body: #{e.response.body.to_s.inspect}"
+            end
             args.each do |string|
               ui.fatal string
             end
@@ -92,7 +95,7 @@ module KnifeCloudformation
           begin
             _run
           rescue => e
-            ui.fatal "Unexpected Error: #{e}"
+            ui.fatal "Unexpected Error: #{e.message}"
             _debug(e)
             exit 1
           end

data/lib/knife-cloudformation/utils/stack_parameter_scrubber.rb

@@ -19,13 +19,15 @@ module KnifeCloudformation
         # @param template [Hash]
         # @return [Hash] template
         def scrub!(template)
-          parameters = template.fetch('Parameters', {})
-          parameters.each do |name, options|
-            options.delete_if do |attribute, value|
-              !ALLOWED_PARAMETER_ATTRIBUTES.include?(attribute)
+          parameters = template['Parameters']
+          if(parameters)
+            parameters.each do |name, options|
+              options.delete_if do |attribute, value|
+                !ALLOWED_PARAMETER_ATTRIBUTES.include?(attribute)
+              end
             end
+            template['Parameters'] = parameters
           end
-          template['Parameters'] = parameters
           template
         end
 

data/lib/knife-cloudformation/version.rb

@@ -1,4 +1,4 @@
 module KnifeCloudformation
   # Current library version
-  VERSION = Gem::Version.new('0.2.6')
+  VERSION = Gem::Version.new('0.2.8')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-cloudformation
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef