chef-zero 15.0.21 → 15.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34776aef3fe422f1e424df794d55fd1d495aa73afcb57a0bbf10441bdbf97612
-  data.tar.gz: 89f747fbec1a77ca84cf2b5046e4e87084608230e0496f14d403b78d4247ff91
+  metadata.gz: 00071a8eebf554379bd831d228ca87964ee665a935232b1055ab0ab9628117d4
+  data.tar.gz: 15c1ee1fbe857a55ee344ecd1329b786731bc7526cb0d4b56d6801595e7e3520
 SHA512:
-  metadata.gz: 1a82f4c60a37b524ca07bfc501d20e0dbb7b6e088da1e44284267cfdd2c702c8632aa332ed8632d77e89b03cd81a6e20bc01612c1f5ed1cdd376ca64a77503a0
-  data.tar.gz: 1141be211822488884b07bc40b6d67419fbadeec4f130ae1446510b4f4c1410b375c74460b6327b9ca26b5a340cf4aee4da0461cd91c9f38e67c2ce4bb65b2e7
+  metadata.gz: 0e35acb20599a35cf00e7475172c6596b898f5e2597a12421a2f01d50d84afd4431157ec6f6d41e6f9854d6a912f1bd94d6ea559d941e3a54d6d39cbab5c2108
+  data.tar.gz: cb64bb7aa2be0a339c2508c06355f2b45bcdfdb2d3fef7ffa50d5ad2ed0a85de3381c80039d14fea7a1d5fbc00891c60cc095dfd01ecb64dba4565d2c8c8fe5c

data/chef-zero.gemspec

@@ -13,10 +13,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 3.0"
 
-  # Note: 7.1.0 does not defaults its cache_format_version to 7.1 but 6.1 instead which gives deprecation warnings
-  # Remove the version constraint when we can upgrade to 7.1.1 post stable release of Activesupport 7.1
-  # Similar issue with 7.0 existed: https://github.com/rails/rails/pull/45293
-  s.add_dependency "activesupport", ">= 7", "< 8.1"
   s.add_dependency "mixlib-log", ">= 2.0", "< 4.0"
   s.add_dependency "hashie", ">= 2.0", "< 6.0"
   s.add_dependency "uuidtools", "~> 2.1"

data/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb

@@ -36,7 +36,7 @@ module ChefZero
         end
 
         # Depsolve!
-        solved = depsolve(request, desired_versions.keys, desired_versions, environment_constraints)
+        solved, cookbook_obj_cache = depsolve(request, desired_versions.keys, desired_versions, environment_constraints)
         unless solved
           if @last_missing_dep && !cookbook_names.include?(@last_missing_dep)
             return raise RestErrorResponse.new(412, "No such cookbook: #{@last_missing_dep}")
@@ -50,23 +50,31 @@ module ChefZero
 
         result = {}
         solved.each_pair do |name, versions|
-          cookbook = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", name, versions[0]]))
+          if cookbook_obj_cache.dig(name, versions[0])
+            cookbook = cookbook_obj_cache[name][versions[0]]
+          else
+            cookbook = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", name, versions[0]]))
+          end
           result[name] = ChefData::DataNormalizer.normalize_cookbook(self, request.rest_path[0..1], cookbook, name, versions[0], request.base_uri, "MIN", false, api_version: request.api_version)
         end
         json_response(200, result)
       end
 
-      def depsolve(request, unsolved, desired_versions, environment_constraints)
+      def depsolve(request, unsolved, desired_versions, environment_constraints, cookbook_obj_cache = nil)
         desired_versions.each do |cb, ver|
           if ver.empty?
             @last_constraint_failure = cb
-            return nil
+            return [nil, nil]
           end
         end
 
         # If everything is already
         solve_for = unsolved[0]
-        return desired_versions unless solve_for
+        return [desired_versions, cookbook_obj_cache] unless solve_for
+
+        # Cache the get_data calls - this saves the need to run the get_data call a second time in #post
+        # Conceptually: cache[cookbook][version] = cookbook_object
+        cookbook_obj_cache ||= {}
 
         # Go through each desired version of this cookbook, starting with the latest,
         # until we find one we can solve successfully with
@@ -77,6 +85,8 @@ module ChefZero
 
           # Pick this cookbook, and add dependencies
           cookbook_obj = FFI_Yajl::Parser.parse(get_data(request, request.rest_path[0..1] + ["cookbooks", solve_for, desired_version]))
+          cookbook_obj_cache[solve_for] ||= {}
+          cookbook_obj_cache[solve_for][desired_version] = cookbook_obj
           cookbook_metadata = cookbook_obj["metadata"] || {}
           cookbook_dependencies = cookbook_metadata["dependencies"] || {}
           dep_not_found = false
@@ -100,10 +110,10 @@ module ChefZero
           next if dep_not_found
 
           # Depsolve children with this desired version!  First solution wins.
-          result = depsolve(request, new_unsolved, new_desired_versions, environment_constraints)
-          return result if result
+          result, cookbook_obj_cache = depsolve(request, new_unsolved, new_desired_versions, environment_constraints, cookbook_obj_cache)
+          return [result, cookbook_obj_cache] if result
         end
-        nil
+        [nil, nil]
       end
 
       def sort_versions(versions)

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = "15.0.21".freeze
+  VERSION = "15.1.0".freeze
 end

data/spec/run_oc_pedant.rb

@@ -52,13 +52,6 @@ def start_cheffs_server(chef_repo_path)
 
   Dir.mkdir(chef_repo_path) unless File.exist?(chef_repo_path)
 
-  # 11.6 and below had a bug where it couldn't create the repo children automatically
-  if Chef::VERSION.to_f < 11.8
-    %w{clients cookbooks data_bags environments nodes roles users}.each do |child|
-      Dir.mkdir("#{chef_repo_path}/#{child}") unless File.exist?("#{chef_repo_path}/#{child}")
-    end
-  end
-
   # Start the new server
   Chef::Config.repo_mode = "hosted_everything"
   Chef::Config.chef_repo_path = chef_repo_path
@@ -125,7 +118,8 @@ begin
   Pedant.config[:config_file] = "spec/support/oc_pedant.rb"
 
   # Because ChefFS can only ever have one user (pivotal), we can't do most of the
-  # tests that involve multiple
+  # tests that involve multiple users. All modern Chef versions (>= 12.13.19)
+  # support keys, ACL, cookbook-artifacts, and policies, so we don't skip those.
   chef_fs_skips = if ENV["CHEF_FS"]
                     [ "--skip-association",
                       "--skip-users",
@@ -137,16 +131,6 @@ begin
                     []
                   end
 
-  unless Gem::Requirement.new(">= 12.8.0").satisfied_by?(Gem::Version.new(Chef::VERSION))
-    chef_fs_skips << "--skip-keys"
-  end
-
-  unless Gem::Requirement.new(">= 12.13.19").satisfied_by?(Gem::Version.new(Chef::VERSION))
-    chef_fs_skips << "--skip-acl"
-    chef_fs_skips << "--skip-cookbook-artifacts"
-    chef_fs_skips << "--skip-policies"
-  end
-
   # These things aren't supported by Chef Zero in any mode of operation:
   default_skips = [
     # "the goal is that only authorization, authentication and validation tests

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 15.0.21
+  version: 15.1.0
 platform: ruby
 authors:
 - Chef Software, Inc.
@@ -9,26 +9,6 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '7'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '7'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
@@ -317,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef server for testing
   and solo setup purposes