From 376741827929e85f7c271cafb88bf4f71b5c26b9 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 13 Dec 2023 15:09:25 +0530 Subject: [PATCH 01/10] updated the undo path for windows Signed-off-by: nikhil2611 --- lib/chef-cli/helpers.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chef-cli/helpers.rb b/lib/chef-cli/helpers.rb index 9cdabd46..f7a1e6c2 100644 --- a/lib/chef-cli/helpers.rb +++ b/lib/chef-cli/helpers.rb @@ -144,7 +144,7 @@ def expected_omnibus_root def default_package_home if Chef::Platform.windows? - File.join(ENV["LOCALAPPDATA"], ChefCLI::Dist::PRODUCT_PKG_HOME) + File.join(ENV["LOCALAPPDATA"], ChefCLI::Dist::PRODUCT_PKG_HOME).gsub('\\','/') else File.expand_path("~/.#{ChefCLI::Dist::PRODUCT_PKG_HOME}") end From d299edfdc53dc1ec298bb82e17dd7745717a92a5 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 13 Dec 2023 18:07:05 +0530 Subject: [PATCH 02/10] updated verify pipeline to run spec for ruby 3.1 Signed-off-by: nikhil2611 --- .expeditor/verify.pipeline.yml | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index d4c15cf3..b5708aad 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -11,32 +11,15 @@ expeditor: steps: -- label: run-specs-ruby-2.7 +- label: run-specs-ruby-3.1 command: - .expeditor/run_linux_tests.sh rspec expeditor: executor: docker: - image: ruby:2.7 + image: ruby:3.1 -- label: run-specs-ruby-3.0 - 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.1 command: - powershell .expeditor/run_windows_tests.ps1 rspec expeditor: @@ -44,20 +27,20 @@ steps: docker: host_os: windows shell: ["powershell", "-Command"] - image: rubydistros/windows-2019:3.0 + image: rubydistros/windows-2019:3.1 -- label: cookstyle-generator-cb-tests-ruby-2.7 +- label: cookstyle-generator-cb-tests-ruby-3.1 command: - .expeditor/run_linux_tests.sh "rake style:cookstyle" expeditor: executor: docker: - image: ruby:2.7 + image: ruby:3.1 -- label: chefstyle-tests-ruby-2.7 +- label: chefstyle-tests-ruby-3.1 command: - .expeditor/run_linux_tests.sh "rake style:chefstyle" expeditor: executor: docker: - image: ruby:2.7 + image: ruby:3.1 From b59efaf4586a7ad75c580bc3c95aec9bd508b632 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 13 Dec 2023 19:02:16 +0530 Subject: [PATCH 03/10] test case and chef style fix Signed-off-by: nikhil2611 --- lib/chef-cli/helpers.rb | 2 +- spec/unit/policyfile_services/clean_policies_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/chef-cli/helpers.rb b/lib/chef-cli/helpers.rb index f7a1e6c2..6c72237e 100644 --- a/lib/chef-cli/helpers.rb +++ b/lib/chef-cli/helpers.rb @@ -144,7 +144,7 @@ def expected_omnibus_root def default_package_home if Chef::Platform.windows? - File.join(ENV["LOCALAPPDATA"], ChefCLI::Dist::PRODUCT_PKG_HOME).gsub('\\','/') + File.join(ENV["LOCALAPPDATA"], ChefCLI::Dist::PRODUCT_PKG_HOME).gsub("\\", "/") else File.expand_path("~/.#{ChefCLI::Dist::PRODUCT_PKG_HOME}") end diff --git a/spec/unit/policyfile_services/clean_policies_spec.rb b/spec/unit/policyfile_services/clean_policies_spec.rb index 6c8a010e..6d462fc2 100644 --- a/spec/unit/policyfile_services/clean_policies_spec.rb +++ b/spec/unit/policyfile_services/clean_policies_spec.rb @@ -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| From dace5d0058a15e9d4b72b6ffb38a218529ff0df3 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 13 Dec 2023 20:18:36 +0530 Subject: [PATCH 04/10] chefstyle to back 2.7 Signed-off-by: nikhil2611 --- .expeditor/verify.pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index b5708aad..bb0082e6 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -37,10 +37,10 @@ steps: docker: image: ruby:3.1 -- label: chefstyle-tests-ruby-3.1 +- label: chefstyle-tests-ruby-2.7 command: - .expeditor/run_linux_tests.sh "rake style:chefstyle" expeditor: executor: docker: - image: ruby:3.1 + image: ruby:2.7 From a99b7bb133a53383945c28f61308d6e70100630b Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 13 Dec 2023 23:50:11 +0530 Subject: [PATCH 05/10] chefstyle fixes Signed-off-by: nikhil2611 --- .expeditor/verify.pipeline.yml | 4 ++-- chef-cli.gemspec | 6 +++++- spec/unit/policyfile_services/clean_policies_spec.rb | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index bb0082e6..b5708aad 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -37,10 +37,10 @@ steps: docker: image: ruby:3.1 -- label: chefstyle-tests-ruby-2.7 +- label: chefstyle-tests-ruby-3.1 command: - .expeditor/run_linux_tests.sh "rake style:chefstyle" expeditor: executor: docker: - image: ruby:2.7 + image: ruby:3.1 diff --git a/chef-cli.gemspec b/chef-cli.gemspec index 1a4018f9..08328483 100644 --- a/chef-cli.gemspec +++ b/chef-cli.gemspec @@ -43,7 +43,11 @@ 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" - gem.add_dependency "chef", ">= 16.0" + if RUBY_VERSION.match?(/3.1/) + gem.add_dependency "chef", "~> 18.0" + else + gem.add_dependency "chef", ">= 16.0" + end gem.add_dependency "solve", "< 5.0", "> 2.0" gem.add_dependency "addressable", ">= 2.3.5", "< 2.9" gem.add_dependency "cookbook-omnifetch", "~> 0.5" diff --git a/spec/unit/policyfile_services/clean_policies_spec.rb b/spec/unit/policyfile_services/clean_policies_spec.rb index 6d462fc2..6c8a010e 100644 --- a/spec/unit/policyfile_services/clean_policies_spec.rb +++ b/spec/unit/policyfile_services/clean_policies_spec.rb @@ -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::HTTPClientException 403 \"Unauthorized\" + - appserver (4444444444444444444444444444444444444444444444444444444444444444): Net::HTTPServerException 403 \"Unauthorized\" ERROR expect { clean_policies_service.run }.to raise_error do |error| From 51e4e4121935ed1aba60c2c0a4d766253679603a Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 14 Dec 2023 00:09:29 +0530 Subject: [PATCH 06/10] updated gemfilr Signed-off-by: nikhil2611 --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 0319f14f..ec94c3d7 100644 --- a/Gemfile +++ b/Gemfile @@ -7,8 +7,8 @@ group :test do gem "rspec", "~> 3.8" 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", ">= 2.11.1" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6") From 5675d978d4e0b8069e66156ac52a6b5a00e3148c Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 14 Dec 2023 00:19:30 +0530 Subject: [PATCH 07/10] chefstyle fixes Signed-off-by: nikhil2611 --- .../policyfile/artifactory_cookbook_source.rb | 12 ++++---- .../policyfile/chef_server_cookbook_source.rb | 16 ++++------ .../policyfile/community_cookbook_source.rb | 12 ++++---- .../policyfile/delivery_supermarket_source.rb | 14 ++++----- .../policyfile_location_specification.rb | 30 ++++++++----------- .../policyfile_services/export_repo.rb | 12 ++++---- .../repo/cookbooks/example/recipes/default.rb | 2 +- .../provisioner/chef_zero_capture_spec.rb | 8 ++--- spec/unit/policyfile/comparison_base_spec.rb | 20 ++++++------- .../clean_policies_spec.rb | 20 ++++++------- .../clean_policy_cookbooks_spec.rb | 10 +++---- .../policyfile_services/push_archive_spec.rb | 14 ++++----- .../rm_policy_group_spec.rb | 10 +++---- .../policyfile_services/rm_policy_spec.rb | 20 ++++++------- .../policyfile_services/show_policy_spec.rb | 20 ++++++------- .../unit/policyfile_services/undelete_spec.rb | 10 +++---- 16 files changed, 108 insertions(+), 122 deletions(-) diff --git a/lib/chef-cli/policyfile/artifactory_cookbook_source.rb b/lib/chef-cli/policyfile/artifactory_cookbook_source.rb index f3bc20f9..0e838560 100644 --- a/lib/chef-cli/policyfile/artifactory_cookbook_source.rb +++ b/lib/chef-cli/policyfile/artifactory_cookbook_source.rb @@ -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 diff --git a/lib/chef-cli/policyfile/chef_server_cookbook_source.rb b/lib/chef-cli/policyfile/chef_server_cookbook_source.rb index b08453e8..78c092e4 100644 --- a/lib/chef-cli/policyfile/chef_server_cookbook_source.rb +++ b/lib/chef-cli/policyfile/chef_server_cookbook_source.rb @@ -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 @@ -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 diff --git a/lib/chef-cli/policyfile/community_cookbook_source.rb b/lib/chef-cli/policyfile/community_cookbook_source.rb index 56620a81..e637f89d 100644 --- a/lib/chef-cli/policyfile/community_cookbook_source.rb +++ b/lib/chef-cli/policyfile/community_cookbook_source.rb @@ -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 diff --git a/lib/chef-cli/policyfile/delivery_supermarket_source.rb b/lib/chef-cli/policyfile/delivery_supermarket_source.rb index 165f7886..db64d67e 100644 --- a/lib/chef-cli/policyfile/delivery_supermarket_source.rb +++ b/lib/chef-cli/policyfile/delivery_supermarket_source.rb @@ -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 diff --git a/lib/chef-cli/policyfile/policyfile_location_specification.rb b/lib/chef-cli/policyfile/policyfile_location_specification.rb index 91ea19bd..af5aa5bb 100644 --- a/lib/chef-cli/policyfile/policyfile_location_specification.rb +++ b/lib/chef-cli/policyfile/policyfile_location_specification.rb @@ -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 @@ -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 diff --git a/lib/chef-cli/policyfile_services/export_repo.rb b/lib/chef-cli/policyfile_services/export_repo.rb index 70ff6955..56930b79 100644 --- a/lib/chef-cli/policyfile_services/export_repo.rb +++ b/lib/chef-cli/policyfile_services/export_repo.rb @@ -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 diff --git a/lib/chef-cli/skeletons/code_generator/files/default/repo/cookbooks/example/recipes/default.rb b/lib/chef-cli/skeletons/code_generator/files/default/repo/cookbooks/example/recipes/default.rb index e3f5f0e1..82f8fa31 100644 --- a/lib/chef-cli/skeletons/code_generator/files/default/repo/cookbooks/example/recipes/default.rb +++ b/lib/chef-cli/skeletons/code_generator/files/default/repo/cookbooks/example/recipes/default.rb @@ -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 "Welcome to Chef Infra Client, #{node["example"]["name"]}!" do level :info end diff --git a/spec/unit/kitchen/provisioner/chef_zero_capture_spec.rb b/spec/unit/kitchen/provisioner/chef_zero_capture_spec.rb index ace053ba..671a742c 100644 --- a/spec/unit/kitchen/provisioner/chef_zero_capture_spec.rb +++ b/spec/unit/kitchen/provisioner/chef_zero_capture_spec.rb @@ -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 diff --git a/spec/unit/policyfile/comparison_base_spec.rb b/spec/unit/policyfile/comparison_base_spec.rb index d11b4f98..33c2f329 100644 --- a/spec/unit/policyfile/comparison_base_spec.rb +++ b/spec/unit/policyfile/comparison_base_spec.rb @@ -251,11 +251,11 @@ end let(:http_exception) do - begin - response.error! - rescue => e - e - end + + response.error! + rescue => e + e + end before do @@ -285,11 +285,11 @@ end let(:http_exception) do - begin - response.error! - rescue => e - e - end + + response.error! + rescue => e + e + end before do diff --git a/spec/unit/policyfile_services/clean_policies_spec.rb b/spec/unit/policyfile_services/clean_policies_spec.rb index 6c8a010e..e3dfc89d 100644 --- a/spec/unit/policyfile_services/clean_policies_spec.rb +++ b/spec/unit/policyfile_services/clean_policies_spec.rb @@ -46,11 +46,11 @@ end let(:http_exception) do - begin - response.error! - rescue => e - e - end + + response.error! + rescue => e + e + end before do @@ -196,11 +196,11 @@ end let(:http_exception) do - begin - response.error! - rescue => e - e - end + + response.error! + rescue => e + e + end before do diff --git a/spec/unit/policyfile_services/clean_policy_cookbooks_spec.rb b/spec/unit/policyfile_services/clean_policy_cookbooks_spec.rb index d3013310..7fd99602 100644 --- a/spec/unit/policyfile_services/clean_policy_cookbooks_spec.rb +++ b/spec/unit/policyfile_services/clean_policy_cookbooks_spec.rb @@ -103,11 +103,11 @@ end let(:http_exception) do - begin - response.error! - rescue => e - e - end + + response.error! + rescue => e + e + end before do diff --git a/spec/unit/policyfile_services/push_archive_spec.rb b/spec/unit/policyfile_services/push_archive_spec.rb index 1310c4a3..85cb2bb8 100644 --- a/spec/unit/policyfile_services/push_archive_spec.rb +++ b/spec/unit/policyfile_services/push_archive_spec.rb @@ -129,13 +129,13 @@ def create_archive context "with an invalid archive" do let(:exception) do - begin - push_archive_service.run - rescue ChefCLI::PolicyfilePushArchiveError => e - e - else - nil - end + + push_archive_service.run + rescue ChefCLI::PolicyfilePushArchiveError => e + e + else + nil + end let(:exception_cause) { exception.cause } diff --git a/spec/unit/policyfile_services/rm_policy_group_spec.rb b/spec/unit/policyfile_services/rm_policy_group_spec.rb index 5dc71323..73cc32ee 100644 --- a/spec/unit/policyfile_services/rm_policy_group_spec.rb +++ b/spec/unit/policyfile_services/rm_policy_group_spec.rb @@ -93,11 +93,11 @@ end let(:http_exception) do - begin - response.error! - rescue => e - e - end + + response.error! + rescue => e + e + end before do diff --git a/spec/unit/policyfile_services/rm_policy_spec.rb b/spec/unit/policyfile_services/rm_policy_spec.rb index 66e9771e..bb87f6e5 100644 --- a/spec/unit/policyfile_services/rm_policy_spec.rb +++ b/spec/unit/policyfile_services/rm_policy_spec.rb @@ -69,11 +69,11 @@ end let(:http_exception) do - begin - response.error! - rescue => e - e - end + + response.error! + rescue => e + e + end before do @@ -108,11 +108,11 @@ end let(:http_exception) do - begin - response.error! - rescue => e - e - end + + response.error! + rescue => e + e + end before do diff --git a/spec/unit/policyfile_services/show_policy_spec.rb b/spec/unit/policyfile_services/show_policy_spec.rb index e03fa43d..aa985c10 100644 --- a/spec/unit/policyfile_services/show_policy_spec.rb +++ b/spec/unit/policyfile_services/show_policy_spec.rb @@ -65,11 +65,11 @@ end let(:http_exception) do - begin - response.error! - rescue => e - e - end + + response.error! + rescue => e + e + end let(:policies_url) { "/policies" } @@ -823,11 +823,11 @@ end let(:http_exception) do - begin - response.error! - rescue => e - e - end + + response.error! + rescue => e + e + end before do diff --git a/spec/unit/policyfile_services/undelete_spec.rb b/spec/unit/policyfile_services/undelete_spec.rb index 1acddb37..02319bd7 100644 --- a/spec/unit/policyfile_services/undelete_spec.rb +++ b/spec/unit/policyfile_services/undelete_spec.rb @@ -185,11 +185,11 @@ def next_time end let(:http_exception) do - begin - response.error! - rescue => e - e - end + + response.error! + rescue => e + e + end before do From a51a8b962cfeecd370a5a9cd0445197c667a92d0 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 14 Dec 2023 00:38:25 +0530 Subject: [PATCH 08/10] test cases fixes Signed-off-by: nikhil2611 --- spec/unit/command/generator_commands/repo_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/unit/command/generator_commands/repo_spec.rb b/spec/unit/command/generator_commands/repo_spec.rb index 86499b83..77fec47e 100644 --- a/spec/unit/command/generator_commands/repo_spec.rb +++ b/spec/unit/command/generator_commands/repo_spec.rb @@ -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 From 78b46ed7f232f336c8f1e0d22ba230a70792ddc1 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 14 Dec 2023 01:35:38 +0530 Subject: [PATCH 09/10] updated HTTPClientException Signed-off-by: nikhil2611 --- spec/unit/policyfile_services/clean_policies_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/unit/policyfile_services/clean_policies_spec.rb b/spec/unit/policyfile_services/clean_policies_spec.rb index e3dfc89d..a4cf0dcd 100644 --- a/spec/unit/policyfile_services/clean_policies_spec.rb +++ b/spec/unit/policyfile_services/clean_policies_spec.rb @@ -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| From f7a99ace645615791071a196695808fee27af7b7 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 14 Dec 2023 17:23:14 +0530 Subject: [PATCH 10/10] updated pipeline Signed-off-by: nikhil2611 --- .expeditor/verify.pipeline.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index b5708aad..80d167ea 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -28,6 +28,10 @@ steps: host_os: windows shell: ["powershell", "-Command"] image: rubydistros/windows-2019:3.1 + environment: + - FORCE_FFI_YAJL=ext + - EXPIRE_CACHE=true + - CHEF_LICENSE=accept-no-persist - label: cookstyle-generator-cb-tests-ruby-3.1 command: