cheffish 16.0.6 → 17.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9942d4df141be9174914e00fec17d021ed3531e7bca901a8dcdeb581326ee00
-  data.tar.gz: 160fee2c6189559aff41eaa0ad32741996cba3ddd29cb69318da36627d00756a
+  metadata.gz: 6a022a0802ceebdb2656147e6ada5348b95a0d6df170317ce7407d049502c741
+  data.tar.gz: ea8e169d0521142100ab4224be43a870c375f3c32a25f509ff0de15b7343384c
 SHA512:
-  metadata.gz: '08babeb42e2eea142a10a25b1ece32ebb9412de0d623ac5629d7b9173db99640c88a2b511c9ff30994d3784efb809c94b04ae954149332cd6c2c7798e7d44024'
-  data.tar.gz: cd0400c6de976a6aaf9b64eea00d2f5114edd53c69474192b89e514e3c0bedb40b02a2bd8ba564ff3047da8002b20c3bc260ae6f115159b8b808dc5a1d2bcf92
+  metadata.gz: f2ade13896c429b961aa71d2ff1c721102e7d896d7ba7d157b13a312dc9c3268de544e4d2883cccd48f5d68e09c915ce34217eff02b9fde2be73fb2bc597aef2
+  data.tar.gz: b6b89cfdc3d836c83330619ec878e503de1226591779728229fbff51b6cff6bb9cd4624796eba695ff51e8e326e97c90ffc913e1b0d39ed7b01f16535ef5c217

data/Gemfile

@@ -3,19 +3,23 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
-  gem "chefstyle", "1.2.0"
+  gem "chefstyle", "1.7.5"
   gem "rake"
   gem "rspec", "~> 3.0"
 end
 
+
 # Allow Travis to run tests with different dependency versions
 if ENV["GEMFILE_MOD"]
   puts ENV["GEMFILE_MOD"]
   instance_eval(ENV["GEMFILE_MOD"])
 else
   group :development do
-    gem "chef", "~> 16"
-    gem "ohai", "~> 16"
+    # temporarily we only support building against master
+    gem "chef", github: "chef/chef", branch: "master"
+    gem "ohai", github: "chef/ohai", branch: "master"
+    # gem "chef", "~> 16"
+    # gem "ohai", "~> 16"
   end
 end
 

data/Rakefile

@@ -39,4 +39,4 @@ task :console do
   IRB.start
 end
 
-task default: %i{style spec}
+task default: %i{spec style}

data/cheffish.gemspec

@@ -12,9 +12,10 @@ Gem::Specification.new do |s|
   s.email = "oss@chef.io"
   s.homepage = "https://github.com/chef/cheffish"
 
-  s.required_ruby_version = ">= 2.6.0"
+  s.required_ruby_version = ">= 2.7.0"
 
   s.add_dependency "chef-zero", ">= 14.0"
+  s.add_dependency "chef-utils", ">= 17.0"
   s.add_dependency "net-ssh"
 
   s.bindir       = "bin"

data/lib/chef/resource/chef_acl.rb

@@ -1,8 +1,10 @@
 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 "chef-utils/parallel_map" unless defined?(ChefUtils::ParallelMap)
+require "uri" unless defined?(URI)
+
+using ChefUtils::ParallelMap
 
 class Chef
   class Resource
@@ -126,13 +128,13 @@ class Chef
           # the ACL has changed.
           if new_resource.recursive == true || (new_resource.recursive == :on_change && (!acl || changed))
             children, _error = list(path, "*")
-            Chef::ChefFS::Parallelizer.parallel_do(children) do |child|
+            children.parallel_each do |child|
               next if child.split("/")[-1] == "containers"
 
               create_acl(child)
             end
             # containers mess up our descent, so we do them last
-            Chef::ChefFS::Parallelizer.parallel_do(children) do |child|
+            children.parallel_each do |child|
               next if child.split("/")[-1] != "containers"
 
               create_acl(child)
@@ -301,7 +303,7 @@ class Chef
             #
             # Result: /*/foo = [ '/organizations/foo', '/users/foo' ]
             #
-            matches = Chef::ChefFS::Parallelizer.parallelize(matches) do |pth|
+            matches = matches.parallel_map do |pth|
               found, error = list(pth, part)
               if error
                 if parts[0..index - 1].all? { |p| p != "*" }
@@ -312,7 +314,7 @@ class Chef
               else
                 found
               end
-            end.flatten(1).to_a
+            end.flatten.to_a
           end
 
           matches

data/lib/chef/resource/chef_data_bag_item.rb

@@ -196,17 +196,15 @@ class Chef
         end
 
         def new_secret
-          @new_secret ||= begin
-            if new_resource.secret
-              new_resource.secret
-            elsif new_resource.secret_path
-              Chef::EncryptedDataBagItem.load_secret(new_resource.secret_path)
-            elsif new_resource.encrypt.nil?
-              current_resource.secret
-            else
-              raise "Data bag item #{new_resource.name} has encryption on but no secret or secret_path is specified"
-            end
-          end
+          @new_secret ||= if new_resource.secret
+                            new_resource.secret
+                          elsif new_resource.secret_path
+                            Chef::EncryptedDataBagItem.load_secret(new_resource.secret_path)
+                          elsif new_resource.encrypt.nil?
+                            current_resource.secret
+                          else
+                            raise "Data bag item #{new_resource.name} has encryption on but no secret or secret_path is specified"
+                          end
         end
 
         def decrypt(json, secret)
@@ -238,15 +236,13 @@ class Chef
 
         # Get the current json decrypted, for comparison purposes
         def current_decrypted
-          @current_decrypted ||= begin
-            if current_resource.secret
-              decrypt(current_resource.raw_data || { "id" => new_resource.id }, current_resource.secret)
-            elsif current_resource.encrypt
-              raise "Could not decrypt current data bag item #{current_resource.name}"
-            else
-              current_resource.raw_data || { "id" => new_resource.id }
-            end
-          end
+          @current_decrypted ||= if current_resource.secret
+                                   decrypt(current_resource.raw_data || { "id" => new_resource.id }, current_resource.secret)
+                                 elsif current_resource.encrypt
+                                   raise "Could not decrypt current data bag item #{current_resource.name}"
+                                 else
+                                   current_resource.raw_data || { "id" => new_resource.id }
+                                 end
         end
 
         # Figure out the differences between new and current

data/lib/chef/resource/chef_mirror.rb

@@ -2,9 +2,11 @@ require_relative "../../cheffish"
 require_relative "../../cheffish/base_resource"
 require "chef/chef_fs/file_pattern"
 require "chef/chef_fs/file_system"
-require "chef/chef_fs/parallelizer"
 require "chef/chef_fs/file_system/chef_server/chef_server_root_dir"
 require "chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir"
+require "chef-utils/parallel_map" unless defined?(ChefUtils::ParallelMap)
+
+using ChefUtils::ParallelMap
 
 class Chef
   class Resource
@@ -97,7 +99,7 @@ class Chef
           end
 
           # Honor concurrency
-          Chef::ChefFS::Parallelizer.threads = new_resource.concurrency - 1
+          ChefUtils::DefaultThreadPool.instance.threads = new_resource.concurrency - 1
 
           # We don't let the user pass absolute paths; we want to reserve those for
           # multi-org support (/organizations/foo).

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
@@ -78,7 +78,7 @@ class Chef
             desired_output = encode_private_key(new_source_key)
             if current_resource.path == :none || desired_output != IO.read(new_path)
               converge_by "reformat key at #{new_resource.source_key_path} to #{new_resource.format} private key #{new_path} (#{new_resource.pass_phrase ? ", #{new_resource.cipher} password" : ""})" do
-                IO.write(new_path, desired_output)
+                IO.binwrite(new_path, desired_output)
               end
             end
 
@@ -137,7 +137,7 @@ class Chef
                 converge_by "change format of #{new_resource.type} private key #{new_path} from #{current_resource.format} to #{new_resource.format}" do
                   write_private_key(current_private_key)
                 end
-              elsif (@current_file_mode & 0077) != 0
+              elsif RUBY_PLATFORM !~ /mswin|mingw32|windows/ && (@current_file_mode & 0077) != 0
                 new_mode = @current_file_mode & 07700
                 converge_by "change mode of private key #{new_path} to #{new_mode.to_s(8)}" do
                   ::File.chmod(new_mode, new_path)
@@ -171,25 +171,23 @@ class Chef
         end
 
         def write_private_key(key)
-          ::File.open(new_path, "w") do |file|
+          ::File.open(new_path, "wb") do |file|
             file.chmod(0600)
             file.write(encode_private_key(key))
           end
         end
 
         def new_source_key
-          @new_source_key ||= begin
-                                if new_resource.source_key.is_a?(String)
-                                  source_key, _source_key_format = Cheffish::KeyFormatter.decode(new_resource.source_key, new_resource.source_key_pass_phrase)
-                                  source_key
-                                elsif new_resource.source_key
-                                  new_resource.source_key
-                                elsif new_resource.source_key_path
-                                  source_key, _source_key_format = Cheffish::KeyFormatter.decode(IO.read(new_resource.source_key_path), new_resource.source_key_pass_phrase, new_resource.source_key_path)
-                                  source_key
-                                else
-                                  nil
-                                end
+          @new_source_key ||= if new_resource.source_key.is_a?(String)
+                                source_key, _source_key_format = Cheffish::KeyFormatter.decode(new_resource.source_key, new_resource.source_key_pass_phrase)
+                                source_key
+                              elsif new_resource.source_key
+                                new_resource.source_key
+                              elsif new_resource.source_key_path
+                                source_key, _source_key_format = Cheffish::KeyFormatter.decode(IO.read(new_resource.source_key_path), new_resource.source_key_pass_phrase, new_resource.source_key_path)
+                                source_key
+                              else
+                                nil
                               end
         end
 

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
@@ -31,7 +31,7 @@ class Chef
         desired_output = encode_public_key(new_source_key)
         if Array(current_resource.action) == [ :delete ] || desired_output != IO.read(new_resource.path)
           converge_by "write #{new_resource.format} public key #{new_resource.path} from #{new_source_key_publicity} key #{new_resource.source_key_path}" do
-            IO.write(new_resource.path, desired_output)
+            IO.binwrite(new_resource.path, desired_output)
             # TODO permissions on file?
           end
         end
@@ -62,7 +62,7 @@ class Chef
             elsif new_resource.source_key
               source_key = new_resource.source_key
             elsif new_resource.source_key_path
-              source_key, _source_key_format = Cheffish::KeyFormatter.decode(IO.read(new_resource.source_key_path), new_resource.source_key_pass_phrase, new_resource.source_key_path)
+              source_key, _source_key_format = Cheffish::KeyFormatter.decode(IO.binread(new_resource.source_key_path), new_resource.source_key_pass_phrase, new_resource.source_key_path)
             else
               return nil
             end

data/lib/cheffish.rb

@@ -32,11 +32,13 @@ module Cheffish
   end
 
   def self.load_chef_config(chef_config = Chef::Config)
-    if ::Gem::Version.new(::Chef::VERSION) >= ::Gem::Version.new("12.0.0")
-      chef_config.config_file = ::Chef::Knife.chef_config_dir
-    else
-      chef_config.config_file = ::Chef::Knife.locate_config_file
-    end
+    chef_config.config_file = if ::Gem::Version.new(::Chef::VERSION) >= ::Gem::Version.new("12.0.0")
+                                require "chef/workstation_config_loader"
+                                Chef::WorkstationConfigLoader.new(nil, Chef::Log).chef_config_dir
+                              else
+                                require "chef/knife"
+                                Chef::Knife.locate_config_file
+                              end
     config_fetcher = Chef::ConfigFetcher.new(chef_config.config_file, chef_config.config_file_jail)
     if chef_config.config_file.nil?
       Chef::Log.warn("No config file found or specified on command line, using command line options.")
@@ -120,11 +122,17 @@ module Cheffish
 end
 
 # Include all recipe objects so require 'cheffish' brings in the whole recipe DSL
-
 require "chef/run_list/run_list_item"
 require_relative "cheffish/basic_chef_client"
 require_relative "cheffish/server_api"
-require "chef/knife"
+
+# Starting with the version below, knife is no longer in the chef gem and is
+# not available during a chef-client run.  We'll keep it here for older versions
+# to retain backward-compatibility.
+if ::Gem::Version.new(::Chef::VERSION) < ::Gem::Version.new("17.0.178")
+  require "chef/knife"
+end
+
 require "chef/config_fetcher"
 require "chef/log"
 require "chef/application"

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"
 

data/lib/cheffish/chef_actor_base.rb

@@ -74,38 +74,36 @@ module Cheffish
       end
 
       def new_public_key
-        @new_public_key ||= begin
-          if new_resource.source_key
-            if new_resource.source_key.is_a?(String)
-              key, _key_format = Cheffish::KeyFormatter.decode(new_resource.source_key)
+        @new_public_key ||= if new_resource.source_key
+                              if new_resource.source_key.is_a?(String)
+                                key, _key_format = Cheffish::KeyFormatter.decode(new_resource.source_key)
 
-              if key.private?
-                key.public_key
-              else
-                key
-              end
-            elsif new_resource.source_key.private?
-              new_resource.source_key.public_key
-            else
-              new_resource.source_key
-            end
-          elsif new_resource.source_key_path
-            source_key_path = new_resource.source_key_path
-            if Pathname.new(source_key_path).relative?
-              source_key_str, source_key_path = Cheffish.get_private_key_with_path(source_key_path, run_context.config)
-            else
-              source_key_str = IO.read(source_key_path)
-            end
-            source_key, _source_key_format = Cheffish::KeyFormatter.decode(source_key_str, new_resource.source_key_pass_phrase, source_key_path)
-            if source_key.private?
-              source_key.public_key
-            else
-              source_key
-            end
-          else
-            nil
-          end
-        end
+                                if key.private?
+                                  key.public_key
+                                else
+                                  key
+                                end
+                              elsif new_resource.source_key.private?
+                                new_resource.source_key.public_key
+                              else
+                                new_resource.source_key
+                              end
+                            elsif new_resource.source_key_path
+                              source_key_path = new_resource.source_key_path
+                              if Pathname.new(source_key_path).relative?
+                                source_key_str, source_key_path = Cheffish.get_private_key_with_path(source_key_path, run_context.config)
+                              else
+                                source_key_str = IO.read(source_key_path)
+                              end
+                              source_key, _source_key_format = Cheffish::KeyFormatter.decode(source_key_str, new_resource.source_key_pass_phrase, source_key_path)
+                              if source_key.private?
+                                source_key.public_key
+                              else
+                                source_key
+                              end
+                            else
+                              nil
+                            end
       end
 
       def augment_new_json(json)

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

@@ -62,13 +62,11 @@ class Chef
             string_key = "#{type}_path"
             symbol_key = "#{type}_path".to_sym
 
-            options[symbol_key] ||= begin
-              if options[:chef_repo_path].is_a?(String)
-                Chef::Util::PathHelper.join(options[:chef_repo_path], "#{type}s")
-              else
-                options[:chef_repo_path].map { |path| Chef::Util::PathHelper.join(path, "#{type}s") }
-              end
-            end
+            options[symbol_key] ||= if options[:chef_repo_path].is_a?(String)
+                                      Chef::Util::PathHelper.join(options[:chef_repo_path], "#{type}s")
+                                    else
+                                      options[:chef_repo_path].map { |path| Chef::Util::PathHelper.join(path, "#{type}s") }
+                                    end
 
             # Copy over to string keys for things that use string keys (ChefFS)...
             # TODO: Fix ChefFS to take symbols or use something that is insensitive to the difference

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 = "16.0.6".freeze
+  VERSION = "17.0.0".freeze
 end

data/spec/integration/private_key_spec.rb

@@ -224,7 +224,7 @@ describe Chef::Resource::PrivateKey do
         end
       end.to have_updated "private_key[#{repo_path}/blah]", :create
       expect(IO.read("#{repo_path}/blah")).not_to start_with("-----BEGIN")
-      expect(OpenSSL::PKey.read(IO.read("#{repo_path}/blah"))).to be_kind_of(OpenSSL::PKey::RSA)
+      expect(OpenSSL::PKey.read(IO.binread("#{repo_path}/blah"))).to be_kind_of(OpenSSL::PKey::RSA)
     end
   end
 

data/spec/integration/rspec/converge_spec.rb

@@ -4,7 +4,11 @@ require "cheffish/rspec/chef_run_support"
 describe "Cheffish::RSpec::ChefRunSupport" do
   extend Cheffish::RSpec::ChefRunSupport
 
-  let(:temp_file) { Tempfile.new("test") }
+  let(:temp_file) do
+    f = Tempfile.new("test")
+    f.close
+    f
+  end
 
   context "#recipe" do
     it "recipe { file ... } updates the file" do

data/spec/support/key_support.rb

@@ -1,10 +1,10 @@
 RSpec::Matchers.define :be_public_key_for do |private_key, pass_phrase|
   match do |public_key|
     if public_key.is_a?(String)
-      public_key, _public_key_format = Cheffish::KeyFormatter.decode(IO.read(File.expand_path(public_key)), pass_phrase, public_key)
+      public_key, _public_key_format = Cheffish::KeyFormatter.decode(IO.binread(File.expand_path(public_key)), pass_phrase, public_key)
     end
     if private_key.is_a?(String)
-      private_key, _private_key_format = Cheffish::KeyFormatter.decode(IO.read(File.expand_path(private_key)), pass_phrase, private_key)
+      private_key, _private_key_format = Cheffish::KeyFormatter.decode(IO.binread(File.expand_path(private_key)), pass_phrase, private_key)
     end
 
     encrypted = public_key.public_encrypt("hi there")
@@ -15,10 +15,10 @@ end
 RSpec::Matchers.define :match_private_key do |expected, pass_phrase|
   match do |actual|
     if expected.is_a?(String)
-      expected, _format = Cheffish::KeyFormatter.decode(IO.read(File.expand_path(expected)), pass_phrase, expected)
+      expected, _format = Cheffish::KeyFormatter.decode(IO.binread(File.expand_path(expected)), pass_phrase, expected)
     end
     if actual.is_a?(String)
-      actual, _format = Cheffish::KeyFormatter.decode(IO.read(File.expand_path(actual)), pass_phrase, actual)
+      actual, _format = Cheffish::KeyFormatter.decode(IO.binread(File.expand_path(actual)), pass_phrase, actual)
     end
 
     encrypted = actual.public_encrypt("hi there")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 16.0.6
+  version: 17.0.0
 platform: ruby
 authors:
 - Chef Software Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '14.0'
+- !ruby/object:Gem::Dependency
+  name: chef-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '17.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '17.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +134,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A set of Chef resources for configuring Chef Infra.