chef-cli 3.0.33 → 3.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e62dfc227a16206b504aa0a8838d2e1960e38573e0d1f2646fc4e14b1e174df
-  data.tar.gz: cfca788e2ae2a92d7014d62c4fc65c20d20cbe9b57a9c8bad24e342f70262167
+  metadata.gz: 027ecd97cab2e569bf86814f9e3788746e9b55a3f31349269b4429e757b96ef9
+  data.tar.gz: 354eb9e12001d0a46cab5b3989e352dec5802885f99dd0a69a9d7a90e3613cab
 SHA512:
-  metadata.gz: a4adff5f07ea9bf2fee6933c5b2f91eeebd2ceab36ba27c72f3ddf38555ce43940e31f7975c5cf3df1a0869f6d548869af33dd1fc70e30e1223b3c70634a5aad
-  data.tar.gz: a3c7f7187f9ee410517c4a81bd4160ef0f55cb3101b7197ef3c0d902e01863356ce5f8e35c52c15213b53e3680c17996d4a1eb13bb1ce4d9a30335e32858e72a
+  metadata.gz: 129c857eb35d45bfaf5b1ebec95bc80e691571b327d875d7da4ac7e26c7192ee6f5ac2ed79ffbd22cba920284b4c07609f50f0065b242ad93e1b5ad75a902f44
+  data.tar.gz: 7b8813adc11b52f0b5e6280444db3e025e9aa57494b2d17af59cb93ebf7a464e5a9670ecc15b99f5e143383ef073f35d04f56e2fe56b02a2bbc36b5da3ce6ad4

data/lib/chef-cli/policyfile/comparison_base.rb

@@ -21,6 +21,7 @@ end
 
 autoload :FFI_Yajl, "ffi_yajl"
 require_relative "../service_exceptions"
+require "net/protocol" unless defined?(Net::ProtocolError)
 
 module ChefCLI
   module Policyfile

data/lib/chef-cli/policyfile/remote_lock_fetcher.rb

@@ -18,7 +18,7 @@
 require_relative "../policyfile_lock"
 require_relative "lock_fetcher_mixin"
 require_relative "../exceptions"
-require "chef/http"
+require "net/protocol" unless defined?(Net::ProtocolError)
 require "tempfile" unless defined?(Tempfile)
 
 module ChefCLI

data/lib/chef-cli/service_exception_inspectors/http.rb

@@ -33,17 +33,11 @@ module ChefCLI
 
       def extended_error_info
         <<~END
-          --- REQUEST DATA ----
-          #{http_method} #{uri}
-          #{request_headers}
-          #{req_body}
-
           --- RESPONSE DATA ---
           #{code} #{response_message}
           #{response_headers}
 
           #{response_body}
-
         END
       end
 
@@ -90,30 +84,10 @@ module ChefCLI
         headers_s
       end
 
-      def request
-        exception.chef_rest_request
-      end
-
       def uri
         request.uri.to_s + request.path.to_s
       end
 
-      def http_method
-        request.method
-      end
-
-      def request_headers
-        headers_s = ""
-        request.each_header do |key, value|
-          headers_s << key << ": " << value << "\n"
-        end
-        headers_s
-      end
-
-      def req_body
-        request.body
-      end
-
     end
   end
 end

data/lib/chef-cli/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefCLI
-  VERSION = "3.0.33".freeze
+  VERSION = "3.0.35".freeze
 end

data/spec/unit/service_exception_inspectors/http_spec.rb

@@ -16,8 +16,7 @@
 #
 
 require "spec_helper"
-require "net/http" unless defined?(Net::HTTP)
-require "chef/monkey_patches/net_http"
+require "net/http"
 require "chef-cli/service_exception_inspectors/http"
 
 describe ChefCLI::ServiceExceptionInspectors::HTTP do
@@ -64,7 +63,7 @@ describe ChefCLI::ServiceExceptionInspectors::HTTP do
   end
 
   let(:exception) do
-    Net::HTTPClientException.new(message, response).tap { |e| e.chef_rest_request = request }
+    Net::HTTPClientException.new(message, response)
   end
 
   subject(:inspector) { described_class.new(exception) }
@@ -103,23 +102,10 @@ describe ChefCLI::ServiceExceptionInspectors::HTTP do
 
   end
 
-  describe "showing the request and response in extended error info" do
+  describe "showing the response in extended error info" do
 
     let(:response_body) { "this is the response" }
 
-    it "shows the request in a format similar to HTTP messages" do
-      expected_request_string = <<~E
-        --- REQUEST DATA ----
-        POST /organizations/chef-oss-dev/cookbooks
-        content-type: application/json
-        accept: application/json
-
-        this is the request
-
-      E
-      expect(inspector.extended_error_info).to include(expected_request_string)
-    end
-
     it "shows the response in a format similar to HTTP messages" do
       expected_response_string = <<~E
         --- RESPONSE DATA ---

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 3.0.33
+  version: 3.0.35
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-21 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli