cheffish 15.0.3 → 16.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 547830e01071a34cc583bbf5217ae5f55270c014c393e9a69301023a88717279
-  data.tar.gz: a29005438abb411a4b59bc7b1cf1782e36219e2bd951ec49c64273f9a7de6144
+  metadata.gz: 6c3c4f0101eecf3d58f4c8d0e67f048427e62856c021540eb51d84f1569388e2
+  data.tar.gz: c2ab2b550d930ff25636fd8766b75aa11fdd27b9b8da7657ed75ecfc9f0de147
 SHA512:
-  metadata.gz: 6db5d7117bb249b37d894d3b3e776f7d3b5e8c87cb2895e156fbe4393031dbfdfdcff8a9133b4bb7e578f85440905a5acbd30426e7a8d81171ac3fd44f583936
-  data.tar.gz: 2216df827dc0635fdf0e3a340a80dbf267c8c51f58d7bde7c2a7deb28f0b3eeb24975bc88e3c44809c12189c05751a8624285d90a7472ace2bbb6b69dd99542d
+  metadata.gz: a5c5fba98d56455fdc236dbc535edfb9e7def8f77d4640f2c7b01fbfecf320b033f9d2fc60b4bea7144866e6dc1b3743c8bb7b99a9fbd31c715eb74a6a42fa2b
+  data.tar.gz: 11461870b40ed6af669b1f688dd119b49cc0ff6bee8e801c0c047facfb598427c691f846530e9dae9b8df282014a66c32c6475ada7ff3efafe7e5a62a05751b0

data/cheffish.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version = Cheffish::VERSION
   s.platform = Gem::Platform::RUBY
   s.license = "Apache-2.0"
-  s.summary = "A set of Chef resources for configuring Chef."
+  s.summary = "A set of Chef resources for configuring Chef Infra."
   s.description = s.summary
   s.author = "Chef Software Inc."
   s.email = "oss@chef.io"

data/lib/chef/resource/chef_acl.rb

@@ -75,7 +75,7 @@ class Chef
         end
       end
 
-      action_class.class_eval do
+      action_class do
         # Update the ACL if necessary.
         def create_acl(path)
           changed = false
@@ -147,7 +147,7 @@ class Chef
           unless @current_acls.key?(acl_path)
             @current_acls[acl_path] = begin
               rest.get(rest_url(acl_path))
-                                      rescue Net::HTTPServerException => e
+                                      rescue Net::HTTPClientException => e
                                         unless e.response.code == "404" && new_resource.path.split("/").any? { |p| p == "*" }
                                           raise
                                         end
@@ -471,7 +471,7 @@ class Chef
         def rest_list(path)
           # All our rest lists are hashes where the keys are the names
           [ rest.get(rest_url(path)).keys, nil ]
-        rescue Net::HTTPServerException => e
+        rescue Net::HTTPClientException => e
           if e.response.code == "405" || e.response.code == "404"
             parts = path.split("/").select { |p| p != "" }.to_a
 

data/lib/chef/resource/chef_client.rb

@@ -38,7 +38,7 @@ class Chef
         delete_actor
       end
 
-      action_class.class_eval do
+      action_class do
         def actor_type
           "client"
         end

data/lib/chef/resource/chef_container.rb

@@ -25,10 +25,10 @@ class Chef
         end
       end
 
-      action_class.class_eval do
+      action_class do
         def load_current_resource
           @current_exists = rest.get("containers/#{new_resource.chef_container_name}")
-        rescue Net::HTTPServerException => e
+        rescue Net::HTTPClientException => e
           if e.response.code == "404"
             @current_exists = false
           else

data/lib/chef/resource/chef_data_bag.rb

@@ -27,7 +27,7 @@ class Chef
       action_class.class_eval do
         def load_current_resource
           @current_resource = json_to_resource(rest.get("data/#{new_resource.data_bag_name}"))
-        rescue Net::HTTPServerException => e
+        rescue Net::HTTPClientException => e
           if e.response.code == "404"
             @current_resource = not_found_resource
           else

data/lib/chef/resource/chef_data_bag_item.rb

@@ -103,7 +103,7 @@ class Chef
             resource = Chef::Resource::ChefDataBagItem.new(new_resource.name, run_context)
             resource.raw_data json
             @current_resource = resource
-          rescue Net::HTTPServerException => e
+          rescue Net::HTTPClientException => e
             if e.response.code == "404"
               @current_resource = not_found_resource
             else

data/lib/chef/resource/chef_environment.rb

@@ -84,7 +84,7 @@ class Chef
       action_class.class_eval do
         def load_current_resource
           @current_resource = json_to_resource(rest.get("environments/#{new_resource.environment_name}"))
-        rescue Net::HTTPServerException => e
+        rescue Net::HTTPClientException => e
           if e.response.code == "404"
             @current_resource = not_found_resource
           else

data/lib/chef/resource/chef_group.rb

@@ -45,7 +45,7 @@ class Chef
       action_class.class_eval do
         def load_current_resource
           @current_resource = json_to_resource(rest.get("groups/#{new_resource.group_name}"))
-        rescue Net::HTTPServerException => e
+        rescue Net::HTTPClientException => e
           if e.response.code == "404"
             @current_resource = not_found_resource
           else

data/lib/chef/resource/chef_node.rb

@@ -39,7 +39,7 @@ class Chef
       action_class.class_eval do
         def load_current_resource
           @current_resource = json_to_resource(rest.get("nodes/#{new_resource.name}"))
-        rescue Net::HTTPServerException => e
+        rescue Net::HTTPClientException => e
           if e.response.code == "404"
             @current_resource = not_found_resource
           else

data/lib/chef/resource/chef_organization.rb

@@ -130,7 +130,7 @@ class Chef
       action_class.class_eval do
         def load_current_resource
           @current_resource = json_to_resource(rest.get("#{rest.root_url}/organizations/#{new_resource.organization_name}"))
-        rescue Net::HTTPServerException => e
+        rescue Net::HTTPClientException => e
           if e.response.code == "404"
             @current_resource = not_found_resource
           else

data/lib/chef/resource/chef_role.rb

@@ -123,7 +123,7 @@ class Chef
       action_class.class_eval do
         def load_current_resource
           @current_resource = json_to_resource(rest.get("roles/#{new_resource.role_name}"))
-        rescue Net::HTTPServerException => e
+        rescue Net::HTTPClientException => e
           if e.response.code == "404"
             @current_resource = not_found_resource
           else

data/lib/cheffish/chef_actor_base.rb

@@ -119,7 +119,7 @@ module Cheffish
         begin
           json = rest.get("#{actor_path}/#{new_resource.name}")
           @current_resource = json_to_resource(json)
-        rescue Net::HTTPServerException => e
+        rescue Net::HTTPClientException => e
           if e.response.code == "404"
             @current_resource = not_found_resource
           else

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = "15.0.3".freeze
+  VERSION = "16.0.2".freeze
 end

data/spec/integration/chef_acl_spec.rb

@@ -191,7 +191,7 @@ if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new("3.1")
         it 'Converging chef_acl "nodes/y" throws a 404' do
           expect_converge do
             chef_acl "nodes/y"
-          end.to raise_error(Net::HTTPServerException)
+          end.to raise_error(Net::HTTPClientException)
         end
       end
 

data/spec/integration/chef_group_spec.rb

@@ -37,7 +37,7 @@ describe Chef::Resource::ChefGroup do
             action :delete
           end
         end.to not_have_updated("chef_group[x]", :delete).and not_have_updated("chef_group[x]", :create)
-        expect { get("groups/x") }.to raise_error(Net::HTTPServerException)
+        expect { get("groups/x") }.to raise_error(Net::HTTPClientException)
       end
 
       it 'Converging chef_group "x" creates the group with the given members' do
@@ -101,7 +101,7 @@ describe Chef::Resource::ChefGroup do
             action :delete
           end
         end.to have_updated("chef_group[x]", :delete)
-        expect { get("groups/x") }.to raise_error(Net::HTTPServerException)
+        expect { get("groups/x") }.to raise_error(Net::HTTPClientException)
       end
 
       it 'Converging chef_group "x" with existing users changes nothing' do

data/spec/integration/chef_node_spec.rb

@@ -40,7 +40,7 @@ describe Chef::Resource::ChefNode do
               with_chef_server "http://127.0.0.1:8899"
               chef_node "blah"
             end.to have_updated "chef_node[blah]", :create
-            expect { get("nodes/blah") }.to raise_error(Net::HTTPServerException)
+            expect { get("nodes/blah") }.to raise_error(Net::HTTPClientException)
             expect(get("http://127.0.0.1:8899/nodes/blah")["name"]).to eq("blah")
           end
         end
@@ -53,7 +53,7 @@ describe Chef::Resource::ChefNode do
                 chef_server({ chef_server_url: "http://127.0.0.1:8899" })
               end
             end.to have_updated "chef_node[blah]", :create
-            expect { get("nodes/blah") }.to raise_error(Net::HTTPServerException)
+            expect { get("nodes/blah") }.to raise_error(Net::HTTPClientException)
             expect(get("http://127.0.0.1:8899/nodes/blah")["name"]).to eq("blah")
           end
         end

data/spec/integration/chef_role_spec.rb

@@ -40,7 +40,7 @@ describe Chef::Resource::ChefRole do
               with_chef_server "http://127.0.0.1:8899"
               chef_role "blah"
             end.to have_updated "chef_role[blah]", :create
-            expect { get("roles/blah") }.to raise_error(Net::HTTPServerException)
+            expect { get("roles/blah") }.to raise_error(Net::HTTPClientException)
             expect(get("http://127.0.0.1:8899/roles/blah")["name"]).to eq("blah")
           end
         end
@@ -53,7 +53,7 @@ describe Chef::Resource::ChefRole do
                 chef_server({ chef_server_url: "http://127.0.0.1:8899" })
               end
             end.to have_updated "chef_role[blah]", :create
-            expect { get("roles/blah") }.to raise_error(Net::HTTPServerException)
+            expect { get("roles/blah") }.to raise_error(Net::HTTPClientException)
             expect(get("http://127.0.0.1:8899/roles/blah")["name"]).to eq("blah")
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 15.0.3
+  version: 16.0.2
 platform: ruby
 authors:
 - Chef Software Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A set of Chef resources for configuring Chef.
+description: A set of Chef resources for configuring Chef Infra.
 email: oss@chef.io
 executables: []
 extensions: []
@@ -130,5 +130,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: A set of Chef resources for configuring Chef.
+summary: A set of Chef resources for configuring Chef Infra.
 test_files: []