cheffish 15.0.3 → 16.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 547830e01071a34cc583bbf5217ae5f55270c014c393e9a69301023a88717279
-  data.tar.gz: a29005438abb411a4b59bc7b1cf1782e36219e2bd951ec49c64273f9a7de6144
+  metadata.gz: 726a0ded80830e71581d351ec749ff293d81949a19da0402da101bcc3544a826
+  data.tar.gz: 998aec1220e1a3c5a1d4b23d124d913f8bc1773657a77de5981965e04c59e4d1
 SHA512:
-  metadata.gz: 6db5d7117bb249b37d894d3b3e776f7d3b5e8c87cb2895e156fbe4393031dbfdfdcff8a9133b4bb7e578f85440905a5acbd30426e7a8d81171ac3fd44f583936
-  data.tar.gz: 2216df827dc0635fdf0e3a340a80dbf267c8c51f58d7bde7c2a7deb28f0b3eeb24975bc88e3c44809c12189c05751a8624285d90a7472ace2bbb6b69dd99542d
+  metadata.gz: debed5adc595ef207988ad3d63249803ea2dfca46848f1e93e62fc80b5abd22efaa299077e0594a9c93555ba385da8fd5a2dda9c8688f6ff4b6ba96c725924b6
+  data.tar.gz: 7ba6a0b11beccce010665ef0239634b4549b2d19b2d6569d179ed2cbcf894bacfae3e5a45f44a70865971bd2bf183ade6a9b54e0dc3cc470e76c96bf6abd43b5

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
-  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
+  gem "chefstyle", "1.4.3"
   gem "rake"
   gem "rspec", "~> 3.0"
 end
@@ -14,8 +14,8 @@ if ENV["GEMFILE_MOD"]
   instance_eval(ENV["GEMFILE_MOD"])
 else
   group :development do
-    gem "chef", "~> 15"
-    gem "ohai", "~> 15"
+    gem "chef", "~> 16"
+    gem "ohai", "~> 16"
   end
 end
 

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

@@ -2,7 +2,7 @@ require_relative "../../cheffish"
 require_relative "../../cheffish/base_resource"
 require "chef/chef_fs/data_handler/acl_data_handler"
 require "chef/chef_fs/parallelizer"
-require "uri"
+require "uri" unless defined?(URI)
 
 class Chef
   class Resource
@@ -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
@@ -112,7 +112,7 @@ class Chef
           end
 
           # Determine if data bag is encrypted and if so, what its version is
-          _first_real_key, first_real_value = (current_resource.raw_data || {}).select { |key, value| key != "id" && !value.nil? }.first
+          _first_real_key, first_real_value = (current_resource.raw_data || {}).find { |key, value| key != "id" && !value.nil? }
           if first_real_value
             if first_real_value.is_a?(Hash) &&
                 first_real_value["version"].is_a?(Integer) &&

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_mirror.rb

@@ -165,7 +165,7 @@ class Chef
         end
 
         def repo_mode
-          new_resource.chef_server[:chef_server_url] =~ %r{/organizations/} ? "hosted_everything" : "everything"
+          %r{/organizations/}.match?(new_resource.chef_server[:chef_server_url]) ? "hosted_everything" : "everything"
         end
 
         def options

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/chef/resource/private_key.rb

@@ -1,6 +1,6 @@
 require "openssl/cipher"
 require_relative "../../cheffish/base_resource"
-require "openssl"
+require "openssl" unless defined?(OpenSSL)
 require_relative "../../cheffish/key_formatter"
 
 class Chef

data/lib/chef/resource/public_key.rb

@@ -1,6 +1,6 @@
 require "openssl/cipher"
 require_relative "../../cheffish/base_resource"
-require "openssl"
+require "openssl" unless defined?(OpenSSL)
 require_relative "../../cheffish/key_formatter"
 
 class Chef

data/lib/cheffish/basic_chef_client.rb

@@ -5,7 +5,7 @@ require "chef/event_dispatch/dispatcher"
 require "chef/node"
 require "chef/run_context"
 require "chef/runner"
-require "forwardable"
+require "forwardable" unless defined?(Forwardable)
 require "chef/providers"
 require "chef/resources"
 
@@ -80,12 +80,11 @@ module Cheffish
     # add_resource() method.
     def self.build_resource(type, name, created_at = nil, &resource_attrs_block)
       created_at ||= caller[0]
-      result = BasicChefClient.new.tap do |client|
+      BasicChefClient.new.tap do |client|
         client.with_chef_config do
           client.build_resource(type, name, created_at, &resource_attrs_block)
         end
       end
-      result
     end
 
     def self.inline_resource(provider, provider_action, *resources, &block)

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/chef_run.rb

@@ -41,7 +41,7 @@ module Cheffish
         chef_config[:log_location] = StringIOTee.new(chef_config[:log_location])
         @client = ::Cheffish::BasicChefClient.new(nil,
           [ event_sink, Chef::Formatters.new(:doc, chef_config[:stdout], chef_config[:stderr]) ],
-          chef_config)
+          **chef_config)
       end
     end
 

data/lib/cheffish/key_formatter.rb

@@ -1,9 +1,9 @@
-require "openssl"
-require "net/ssh"
-require "etc"
-require "socket"
-require "digest/md5"
-require "base64"
+require "openssl" unless defined?(OpenSSL)
+require "net/ssh" unless defined?(Net::SSH)
+require "etc" unless defined?(Etc)
+require "socket" unless defined?(Socket)
+require "digest/md5" unless defined?(Digest::MD5)
+require "base64" unless defined?(Base64)
 
 module Cheffish
   class KeyFormatter

data/lib/cheffish/rspec/chef_run_support.rb

@@ -1,7 +1,7 @@
 require "chef_zero/rspec"
 require "chef/server_api"
 require_relative "repository_support"
-require "uri"
+require "uri" unless defined?(URI)
 require_relative "../chef_run"
 require_relative "recipe_run_wrapper"
 require_relative "matchers"

data/lib/cheffish/rspec/recipe_run_wrapper.rb

@@ -1,5 +1,5 @@
 require_relative "../chef_run"
-require "forwardable"
+require "forwardable" unless defined?(Forwardable)
 
 module Cheffish
   module RSpec

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = "15.0.3".freeze
+  VERSION = "16.0.12".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.12
 platform: ruby
 authors:
 - Chef Software Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-09-30 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: []