knife-depsolver 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e42020738fc3bfa53b285d3cc6ac18fa7ca3918d
-  data.tar.gz: 9b2eb422129104d5006d94c83bae8dae89fcc728
+  metadata.gz: b5937e944afd44c612b2fe9beb72ab82fc54b6fb
+  data.tar.gz: 6d29b51bacad2ecc548abde5836745976cfcdfbe
 SHA512:
-  metadata.gz: a619dcc79ebf4c2d877f1331916a7dd36b9dbc4f10f0b0d530c564429b76986a4a8f794c93879187303198c40b9814801f9620e7298818653c2c31f867b63a49
-  data.tar.gz: 0ec6a6f0aefecb4471fb9add3bc0560ebe27becdf10514e71594d562b6c57254c2a15b4bcaf64ac80fd827b9660089b69a71271b4bc32828f170a2fad268c634
+  metadata.gz: c6458795f49739bceb38884ba4fe2d534a3f07c7bb005adf981e833230b27813d9391dd21e1259b3b1c20e9621ebfb093b28e40115bed8d7d208ddc8027296c8
+  data.tar.gz: 3c27e32e8bba168011d2afd4407fcdf552e92035f146a0108a31c3b9f4127701e9dec02c2a6150ca22831a4e3e35775b44ad58e9e28aade5e6786e478839853c

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.0.1
+
+Add error handling
+
 ## 1.0.0
 
 Initial release

data/lib/chef/knife/depsolver.rb

@@ -1,13 +1,4 @@
-# This `knife exec` script gets a node's expanded run_list with version
-# constraints for a specified environment.
-
-# Then it POSTs the expanded run_list to the environment's cookbook_versions
-# endpoint to retrieve a list of dependency resolved cookbooks that meet all
-# specified version constraints.
-
 require 'chef/knife'
-require 'chef/run_list/run_list_expansion'
-require 'chef/run_list/run_list_item'
 
 class Chef
   class Knife
@@ -23,52 +14,63 @@ class Chef
              description: 'Use the run list from a given node'
 
       def run
-        cookbook_versions = {}
+        begin
+          if config[:node]
+            node = Chef::Node.load(config[:node])
+          else
+            node = Chef::Node.new
+            node.name('depsolver-tmp-node')
 
-        run_list = name_args.map {|item| item.to_s.split(/,/) }.flatten.each{|item| item.strip! }
-        run_list.delete_if {|item| item.empty? }
+            run_list = name_args.map {|item| item.to_s.split(/,/) }.flatten.each{|item| item.strip! }
+            run_list.delete_if {|item| item.empty? }
 
-        if config[:node]
-          node = Chef::Node.load(config[:node])
-        else
-          node = Chef::Node.new
-          node.name('depsolver-tmp-node')
-          run_list.each do |arg|
-            node.run_list.add(arg)
+            run_list.each do |arg|
+              node.run_list.add(arg)
+            end
           end
-        end
 
-        environment = config[:environment]
-        environment ||= node.chef_environment
+          environment = config[:environment]
+          environment ||= node.chef_environment
 
-        run_list_expansion = node.expand!
-        expanded_run_list_with_versions = run_list_expansion.recipes.with_version_constraints_strings
+          environment_cookbook_versions = Chef::Environment.load(environment).cookbook_versions
+
+          run_list_expansion = node.expand!
+          expanded_run_list_with_versions = run_list_expansion.recipes.with_version_constraints_strings
 
-        begin
           depsolver_start_time = Time.now
+
           ckbks = rest.post_rest("environments/" + environment + "/cookbook_versions", { "run_list" => expanded_run_list_with_versions })
+
           depsolver_finish_time = Time.now
-        rescue
-        end
 
-        depsolver_results = {}
-        ckbks.each do |name, ckbk|
-          version = ckbk.is_a?(Hash) ? ckbk['version'] : ckbk.version
-          depsolver_results[name] = version
-        end
+          depsolver_results = {}
+          ckbks.each do |name, ckbk|
+            version = ckbk.is_a?(Hash) ? ckbk['version'] : ckbk.version
+            depsolver_results[name] = version
+          end
 
-        results = {
-          node: node.name,
-          environment: environment,
-          environment_cookbook_versions: Chef::Environment.load(environment).cookbook_versions,
-          run_list: node.run_list,
-          expanded_run_list: expanded_run_list_with_versions,
-          depsolver_results: depsolver_results,
-          depsolver_cookbook_count: depsolver_results.count,
-          depsolver_elapsed_ms: ((depsolver_finish_time - depsolver_start_time) * 1000).to_i
-        }
+        rescue => e
+          api_error = {}
+          api_error[:error_code] = e.response.code
+          api_error[:error_message] = e.response.message
+          begin
+            api_error[:error_body] = JSON.parse(e.response.body)
+          rescue JSON::ParserError
+          end
+        ensure
+          results = {}
+          results[:node] = node.name unless node.nil? || node.name.nil?
+          results[:environment] = environment unless environment.nil?
+          results[:environment_cookbook_versions] = environment_cookbook_versions unless environment_cookbook_versions.nil?
+          results[:run_list] = node.run_list unless node.nil? || node.run_list.nil?
+          results[:expanded_run_list] = expanded_run_list_with_versions unless expanded_run_list_with_versions.nil?
+          results[:depsolver_results] = depsolver_results unless depsolver_results.nil? || depsolver_results.empty?
+          results[:depsolver_cookbook_count] = ckbks.count unless ckbks.nil?
+          results[:depsolver_elapsed_ms] = ((depsolver_finish_time - depsolver_start_time) * 1000).to_i unless depsolver_finish_time.nil?
+          results[:api_error] = api_error unless api_error.nil?
 
-        msg(JSON.pretty_generate(results))
+          msg(JSON.pretty_generate(results))
+        end
       end
     end
   end

data/lib/knife-depsolver/version.rb

@@ -1,3 +1,3 @@
 module KnifeDepsolver
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-depsolver
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jeremiah Snapp