Skip to content

updating code to account for removing the chef-version #352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnmccrae merged 1 commit into from
Nov 6, 2025
Merged

updating code to account for removing the chef-version #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
- Remove active support, it does not seem to be used [#349](https://github.com/chef/chef-zero/pull/349) ([jaymzh](https://github.com/jaymzh))
<!-- latest_release -->

<!-- next_release -->
## Unreleased

#### Changed
- Remove obsolete Chef version checks for ancient Chef versions (< 12.13.19 from 2016). All modern Chef versions support keys, ACL, cookbook-artifacts, and policies.
<!-- next_release -->

<!-- release_rollup since=15.0.17 -->
### Changes not yet released to rubygems.org

Expand Down
20 changes: 2 additions & 18 deletions spec/run_oc_pedant.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -125,7 +118,8 @@ def args_from_env(key)
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",
Expand All @@ -137,16 +131,6 @@ def args_from_env(key)
[]
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
Expand Down