Skip to content
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.

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

Upgrade ruby to 3.3 #233

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open
33 changes: 8 additions & 25 deletions .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,53 +11,36 @@ expeditor:

steps:

- label: run-specs-ruby-2.7
- label: run-specs-ruby-3.3
command:
- .expeditor/run_linux_tests.sh rspec
expeditor:
executor:
docker:
image: ruby:2.7
image: ruby:3.3

- label: run-specs-ruby-3.0

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we still need Ruby 3.0 and Ruby 3.1 tests passing until Chef 17 and 18 (respectively) are EOL.

command:
- .expeditor/run_linux_tests.sh rspec
expeditor:
executor:
docker:
image: ruby:3.0

- label: run-specs-windows-2.7
command:
- powershell .expeditor/run_windows_tests.ps1 rspec
expeditor:
executor:
docker:
host_os: windows
image: rubydistros/windows-2019:2.7

- label: run-specs-windows-ruby-3.0
- label: run-specs-windows-ruby-3.3
command:
- powershell .expeditor/run_windows_tests.ps1 rspec
expeditor:
executor:
docker:
host_os: windows
shell: ["powershell", "-Command"]
image: rubydistros/windows-2019:3.0
image: rubydistros/windows-2019:3.3

- label: cookstyle-generator-cb-tests-ruby-2.7
- label: cookstyle-generator-cb-tests-ruby-3.3
command:
- .expeditor/run_linux_tests.sh "rake style:cookstyle"
expeditor:
executor:
docker:
image: ruby:2.7
image: ruby:3.3

- label: chefstyle-tests-ruby-2.7
- label: chefstyle-tests-ruby-3.3
command:
- .expeditor/run_linux_tests.sh "rake style:chefstyle"
expeditor:
executor:
docker:
image: ruby:2.7
image: ruby:3.3
4 changes: 2 additions & 2 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up ruby 3.1
- name: Set up ruby 3.3
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1
ruby-version: 3.3
bundler-cache: true
- name: run specs
run: bundle exec rake spec --trace
Expand Down
16 changes: 3 additions & 13 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,12 @@ gemspec

group :test do
gem "rake"
gem "rspec", "~> 3.8"
gem "rspec", "~> 3.12"
gem "rspec-expectations", "~> 3.8"
gem "rspec-mocks", "~> 3.8"
gem "cookstyle", "=7.7.2" # this forces dependabot PRs to open which triggers cookstyle CI on the chef generate command
gem "chefstyle", "=1.6.2"
gem "cookstyle", "=7.32.2" # this forces dependabot PRs to open which triggers cookstyle CI on the chef generate command
gem "chefstyle", "=2.2.3"
gem "test-kitchen", "=3.5.1" # pinning test-kitchen to 3.5.1 which supports ruby < 3.1 . Need to update this to latest once we update the ruby to 3.1 and chef to 18.x in chef-cli

if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6")
gem "chef-zero", "~> 14"
gem "chef", "~> 15"
gem "chef-utils", "=16.6.14"
end
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.7")
gem "ohai", "~> 16"
end

gem "simplecov", require: false
end

Expand Down
4 changes: 2 additions & 2 deletions chef-cli.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
gem.license = "Apache-2.0"
gem.homepage = "https://www.chef.io/"

gem.required_ruby_version = ">= 2.7"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are still releasing at least one last bug fix release for Chef 17, and therefore would have Ruby 3.0.x on that version

gem.required_ruby_version = ">= 3.3"

gem.files = %w{Rakefile LICENSE} +
Dir.glob("Gemfile*") + # Includes Gemfile and locks
Expand All @@ -43,7 +43,7 @@ Gem::Specification.new do |gem|
gem.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
gem.add_dependency "ffi-yajl", ">= 1.0", "< 3.0"
gem.add_dependency "minitar", "~> 0.6"
if RUBY_VERSION.match?(/3.1/)
if RUBY_VERSION.match?(/3.3/)
gem.add_dependency "chef", "~> 18.0"
else
gem.add_dependency "chef", "~> 17.0"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given that the required_ruby_version is ">= 3.3", this would seem to indicate that if you have Ruby 3.4 installed, that you'll be locked to Chef 17, which I'm not sure will work out.

Expand Down
12 changes: 5 additions & 7 deletions lib/chef-cli/policyfile/artifactory_cookbook_source.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,12 @@ def preferred_source_for?(cookbook_name)
end

def universe_graph
@universe_graph ||= begin
full_community_graph.inject({}) do |normalized_graph, (cookbook_name, metadata_by_version)|
normalized_graph[cookbook_name] = metadata_by_version.inject({}) do |deps_by_version, (version, metadata)|
deps_by_version[version] = metadata["dependencies"]
deps_by_version
end
normalized_graph
@universe_graph ||= full_community_graph.inject({}) do |normalized_graph, (cookbook_name, metadata_by_version)|
normalized_graph[cookbook_name] = metadata_by_version.inject({}) do |deps_by_version, (version, metadata)|
deps_by_version[version] = metadata["dependencies"]
deps_by_version
end
normalized_graph
end
end

Expand Down
16 changes: 6 additions & 10 deletions lib/chef-cli/policyfile/chef_server_cookbook_source.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,12 @@ def preferred_source_for?(cookbook_name)
end

def universe_graph
@universe_graph ||= begin
full_chef_server_graph.inject({}) do |normalized_graph, (cookbook_name, metadata_by_version)|
normalized_graph[cookbook_name] = metadata_by_version.inject({}) do |deps_by_version, (version, metadata)|
deps_by_version[version] = metadata["dependencies"]
deps_by_version
end
normalized_graph
@universe_graph ||= full_chef_server_graph.inject({}) do |normalized_graph, (cookbook_name, metadata_by_version)|
normalized_graph[cookbook_name] = metadata_by_version.inject({}) do |deps_by_version, (version, metadata)|
deps_by_version[version] = metadata["dependencies"]
deps_by_version
end
normalized_graph
end
end

Expand Down Expand Up @@ -90,9 +88,7 @@ def http_connection_for(base_url)

def full_chef_server_graph
@full_chef_server_graph ||=
begin
http_connection_for(uri.to_s).get("/universe")
end
http_connection_for(uri.to_s).get("/universe")
end
end
end
Expand Down
12 changes: 5 additions & 7 deletions lib/chef-cli/policyfile/community_cookbook_source.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,12 @@ def ==(other)
end

def universe_graph
@universe_graph ||= begin
full_community_graph.inject({}) do |normalized_graph, (cookbook_name, metadata_by_version)|
normalized_graph[cookbook_name] = metadata_by_version.inject({}) do |deps_by_version, (version, metadata)|
deps_by_version[version] = metadata["dependencies"]
deps_by_version
end
normalized_graph
@universe_graph ||= full_community_graph.inject({}) do |normalized_graph, (cookbook_name, metadata_by_version)|
normalized_graph[cookbook_name] = metadata_by_version.inject({}) do |deps_by_version, (version, metadata)|
deps_by_version[version] = metadata["dependencies"]
deps_by_version
end
normalized_graph
end
end

Expand Down
14 changes: 6 additions & 8 deletions lib/chef-cli/policyfile/delivery_supermarket_source.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,13 @@ def default_source_args
end

def universe_graph
@universe_graph ||= begin
@community_source.universe_graph.inject({}) do |truncated, (cookbook_name, version_and_deps_list)|
sorted_versions = version_and_deps_list.keys.sort_by do |version_string|
Semverse::Version.new(version_string)
end
greatest_version = sorted_versions.last
truncated[cookbook_name] = { greatest_version => version_and_deps_list[greatest_version] }
truncated
@universe_graph ||= @community_source.universe_graph.inject({}) do |truncated, (cookbook_name, version_and_deps_list)|
sorted_versions = version_and_deps_list.keys.sort_by do |version_string|
Semverse::Version.new(version_string)
end
greatest_version = sorted_versions.last
truncated[cookbook_name] = { greatest_version => version_and_deps_list[greatest_version] }
truncated
end
end

Expand Down
30 changes: 13 additions & 17 deletions lib/chef-cli/policyfile/policyfile_location_specification.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,18 @@ def revision_id

# @return A policyfile lock fetcher compatible with the given source_options
def fetcher
@fetcher ||= begin
if source_options[:path] && !source_options[:git]
Policyfile::LocalLockFetcher.new(name, source_options, storage_config)
elsif source_options[:remote]
Policyfile::RemoteLockFetcher.new(name, source_options)
elsif source_options[:server]
Policyfile::ChefServerLockFetcher.new(name, source_options, chef_config)
elsif source_options[:git]
Policyfile::GitLockFetcher.new(name, source_options, storage_config)
else
raise ChefCLI::InvalidPolicyfileLocation.new(
"Invalid policyfile lock location type. The supported locations are: #{LOCATION_TYPES.join(", ")}"
)
end
@fetcher ||= if source_options[:path] && !source_options[:git]
Policyfile::LocalLockFetcher.new(name, source_options, storage_config)
elsif source_options[:remote]
Policyfile::RemoteLockFetcher.new(name, source_options)
elsif source_options[:server]
Policyfile::ChefServerLockFetcher.new(name, source_options, chef_config)
elsif source_options[:git]
Policyfile::GitLockFetcher.new(name, source_options, storage_config)
else
raise ChefCLI::InvalidPolicyfileLocation.new(
"Invalid policyfile lock location type. The supported locations are: #{LOCATION_TYPES.join(", ")}"
)
end
end

Expand Down Expand Up @@ -106,9 +104,7 @@ def errors
#
# @return [PolicyfileLock] the loaded policyfile lock
def policyfile_lock
@policyfile_lock ||= begin
PolicyfileLock.new(storage_config, ui: ui).build_from_lock_data(fetcher.lock_data)
end
@policyfile_lock ||= PolicyfileLock.new(storage_config, ui: ui).build_from_lock_data(fetcher.lock_data)
end

# @return [Hash] The source_options that describe how to fetch this exact lock again
Expand Down
12 changes: 6 additions & 6 deletions lib/chef-cli/policyfile_services/export_repo.rb
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@ def with_staging_dir
random_string = SecureRandom.hex(2)
path = "chef-export-#{random_string}"
Dir.mktmpdir(path) do |d|
begin
@staging_dir = d
yield
ensure
@staging_dir = nil
end

@staging_dir = d
yield
ensure
@staging_dir = nil

end
end

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This is a Chef Infra Client recipe file. It can be used to specify resources
# which will apply configuration to a server.

log "Welcome to Chef Infra Client, #{node['example']['name']}!" do
log log "Welcome to Chef Infra Client, #{node["example"]["name"]}!" do
level :info
end

Expand Down
2 changes: 1 addition & 1 deletion spec/unit/command/generator_commands/repo_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ def generator_context
let(:file) { "cookbooks/example/recipes/default.rb" }

it "has the right contents" do
expect(file_contents).to match(/log "Welcome to Chef Infra Client, \#\{node\['example'\]\['name'\]\}!" do/)
expect(file_contents).to match(/log "Welcome to Chef Infra Client, \#\{node\["example"\]\["name"\]\}!" do/)
end
end
end
Expand Down
8 changes: 4 additions & 4 deletions spec/unit/kitchen/provisioner/chef_zero_capture_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@
end

after do
begin
subject.cleanup_sandbox
rescue # rubocop:disable Lint/HandleExceptions
end

subject.cleanup_sandbox
rescue # rubocop:disable Lint/HandleExceptions

end
end

Expand Down
20 changes: 10 additions & 10 deletions spec/unit/policyfile/comparison_base_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -251,11 +251,11 @@
end

let(:http_exception) do
begin
response.error!
rescue => e
e
end

response.error!
rescue => e
e

end

before do
Expand Down Expand Up @@ -285,11 +285,11 @@
end

let(:http_exception) do
begin
response.error!
rescue => e
e
end

response.error!
rescue => e
e

end

before do
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/policyfile_lock_serialization_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@

it "requires the values in named_run_lists to be valid run lists" do
bad_named_run_lists = valid_lock_data.dup
bad_named_run_lists["named_run_lists"] = { "bad" => [ 42 ] }
bad_named_run_lists["named_run_lists"] = { "bad" => [ "42" ] }

expect { lockfile.build_from_lock_data(bad_named_run_lists) }.to raise_error(ChefCLI::InvalidLockfile)
end
Expand Down
22 changes: 11 additions & 11 deletions spec/unit/policyfile_services/clean_policies_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
end

let(:http_exception) do
begin
response.error!
rescue => e
e
end

response.error!
rescue => e
e

end

before do
Expand Down Expand Up @@ -196,11 +196,11 @@
end

let(:http_exception) do
begin
response.error!
rescue => e
e
end

response.error!
rescue => e
e

end

before do
Expand All @@ -215,7 +215,7 @@
# this will continue to print that out until they remove HTTPServerException
expected_message = <<~ERROR
Failed to delete some policy revisions:
- appserver (4444444444444444444444444444444444444444444444444444444444444444): Net::HTTPServerException 403 \"Unauthorized\"
- appserver (4444444444444444444444444444444444444444444444444444444444444444): Net::HTTPClientException 403 \"Unauthorized\"
ERROR

expect { clean_policies_service.run }.to raise_error do |error|
Expand Down
Loading
Loading