chef-zero 15.0.9 → 15.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fb45baf627f5d0eeec63162db3345028471925cc72e742d39c88ff9f5d4a466
-  data.tar.gz: d70a96867a8c6d76608c42b2ac9cc1d542b1b26fd269d72cfde5c7361d295e09
+  metadata.gz: 04c149e0bfc367d62c582cb488f9a4a36c98e126e1f956be300905cff7ce79c2
+  data.tar.gz: 8dd05e4e6d51d7b875e406deadfc59814ca76f7be56433a149665ddab9312123
 SHA512:
-  metadata.gz: 9ac0c317279131671cdb92124dd15946218f71a56e893b180f37e683bbbe4be02ab5f72bdc9ebd636ba9dab085e1e339e0db8bab81b2cd2aa0c6e9dbd695e494
-  data.tar.gz: e0ffdb1666f06a7db9b3f554e7892bb54e1937c92a0c983ac986c775f7ef6e88505815d0648e14b7593ec41ce8198db37106f39b96b8be78c7ce8b76fb5b8d33
+  metadata.gz: 0c7f1b16510d565922b70b0643969fa9a15b780a8da0a2d6e81c9d2bd246b1bcef74b58ab04ab84430273b179194252b4f48ff7fe2941472319bfa8a37b7dade
+  data.tar.gz: 6ec5789ca973167914b30a7aef7093669f74be46e0f2ffaf4de51fcc1a1ed110ece46f07c46e0f5c6a7309f1a32af28087d30935b753ed2905c16ff8605c6286

data/Gemfile

@@ -8,6 +8,8 @@ group :pedant do
   gem "oc-chef-pedant", git: "https://github.com/chef/chef-server.git", branch: "main"
 end
 
+gem "ffi", ">= 1.15.5", "< 1.17.0"
+
 group :development, :test do
   gem "chefstyle"
   gem "rake"
@@ -18,8 +20,8 @@ if ENV["GEMFILE_MOD"]
   puts "GEMFILE_MOD: #{ENV["GEMFILE_MOD"]}"
   instance_eval(ENV["GEMFILE_MOD"])
 else
-  gem "chef", "~> 14.0"
-  gem "ohai", "~> 14.0"
+  gem "chef", "~> 18.6"
+  gem "ohai", "~> 18.0"
 end
 
 group :debug do

data/chef-zero.gemspec

@@ -11,13 +11,18 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/chef/chef-zero"
   s.license = "Apache-2.0"
 
-  s.required_ruby_version = ">= 2.6"
+  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.0", "< 7.1"
   s.add_dependency "mixlib-log", ">= 2.0", "< 4.0"
   s.add_dependency "hashie", ">= 2.0", "< 5.0"
   s.add_dependency "uuidtools", "~> 2.1"
   s.add_dependency "ffi-yajl", "~> 2.2"
-  s.add_dependency "rack", "~> 2.0", ">= 2.0.6"
+  s.add_dependency "rack", "~> 3.1", ">= 3.1.10"
+  s.add_dependency "rackup", "~> 2.2", ">= 2.2.1"
   s.add_dependency "webrick"
 
   s.bindir       = "bin"

data/lib/chef_zero/endpoints/policy_revision_endpoint.rb

@@ -7,7 +7,50 @@ module ChefZero
       # GET /organizations/ORG/policies/NAME/revisions/REVISION
       def get(request)
         data = parse_json(get_data(request))
-        data = ChefData::DataNormalizer.normalize_policy(data, request.rest_path[3], request.rest_path[5])
+        
+        # need to add another field in the response called 'policy_group_list'
+        # example response
+        #     {
+        #       "revision_id": "909c26701e291510eacdc6c06d626b9fa5350d25",
+        #       "name": "some_policy_name",
+        #       "run_list": [
+        #         "recipe[policyfile_demo::default]"
+        #       ],
+        #       "cookbook_locks": {
+        #         "policyfile_demo": {
+        #           "identifier": "f04cc40faf628253fe7d9566d66a1733fb1afbe9",
+        #           "version": "1.2.3"
+        #         }
+        #       },
+        #       "policy_group_list": ["some_policy_group"]
+        #     }
+        data[:policy_group_list] = Array.new
+
+        # extracting policy name and revision
+        request_policy_name = request.rest_path[3]
+        request_policy_revision = request.rest_path[5]
+
+        # updating the request to fetch the policy group list
+        request.rest_path[2] = "policy_groups"
+        request.rest_path = request.rest_path.slice(0,3)
+
+        list_data(request).each do |group_name|
+          group_path = request.rest_path + [group_name]
+
+          # fetching all the policies associated with each group
+          policy_list = list_data(request, group_path + ["policies"])
+          policy_list.each do |policy_name|
+            revision_id = parse_json(get_data(request, group_path + ["policies", policy_name]))
+
+            # if the name and revision matchs, we add the group to the response
+            if (policy_name == request_policy_name) && (revision_id == request_policy_revision)
+              policy_group_list = data[:policy_group_list]
+              data[:policy_group_list] = [group_name] + policy_group_list
+            end
+          end
+        end
+        
+        data = ChefData::DataNormalizer.normalize_policy(data, request_policy_name, request_policy_revision)
         json_response(200, data)
       end
 

data/lib/chef_zero/endpoints/sandboxes_endpoint.rb

@@ -15,8 +15,9 @@ module ChefZero
 
         needed_checksums = FFI_Yajl::Parser.parse(request.body)["checksums"]
         result_checksums = {}
+        available_checksums = list_data(request, request.rest_path[0..1] + %w{file_store checksums})
         needed_checksums.keys.each do |needed_checksum|
-          if list_data(request, request.rest_path[0..1] + %w{file_store checksums}).include?(needed_checksum)
+          if available_checksums.include?(needed_checksum)
             result_checksums[needed_checksum] = { needs_upload: false }
           else
             result_checksums[needed_checksum] = {

data/lib/chef_zero/server.rb

@@ -23,6 +23,7 @@ require "timeout" unless defined?(Timeout)
 require "stringio" unless defined?(StringIO)
 
 require "rack" unless defined?(Rack)
+require "rackup" unless defined?(Rackup)
 require "webrick" unless defined?(WEBrick)
 require "webrick/https"
 
@@ -295,7 +296,7 @@ module ChefZero
         end
       )
       ENV["HTTPS"] = "on" if options[:ssl]
-      @server.mount("/", Rack::Handler::WEBrick, app)
+      @server.mount("/", Rackup::Handler::WEBrick, app)
 
       # Pick a port
       # If options[:port] can be an Enumerator, an Array, or an Integer,

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = "15.0.9".freeze
+  VERSION = "15.0.17".freeze
 end

data/spec/run_oc_pedant.rb

@@ -191,7 +191,8 @@ begin
 
     "--skip-status",
     "--skip=email_case_insensitive",
-    "--skip=nginx_default_error"
+    "--skip=nginx_default_error",
+    "--skip=response_headers"
   ]
 
   # The knife tests are very slow and don't give us a lot of extra coverage,

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 15.0.9
+  version: 15.0.17
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
@@ -84,20 +104,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 3.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.10
+- !ruby/object:Gem::Dependency
+  name: rackup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -252,14 +292,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef server for testing