From 9c22a17766f8af800f2e950f81cb90546280ddbd Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Tue, 13 Jul 2021 20:33:05 -0700 Subject: Deprecate the old policyfile compat mode Signed-off-by: Lamont Granquist --- lib/chef/policy_builder/policyfile.rb | 2 +- spec/unit/policy_builder/policyfile_spec.rb | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/chef/policy_builder/policyfile.rb b/lib/chef/policy_builder/policyfile.rb index 541db1a9b9..0603acf958 100644 --- a/lib/chef/policy_builder/policyfile.rb +++ b/lib/chef/policy_builder/policyfile.rb @@ -125,7 +125,7 @@ class Chef # determine which versions of cookbooks to use. unless Chef::Config[:policy_document_native_api] - Chef::Log.deprecated(:policyfile_compat_mode, "The chef-server 11 policyfile compat mode is deprecated, please set policy_document_native_api to true in your config") + Chef.deprecated(:policyfile_compat_mode, "The chef-server 11 policyfile compat mode is deprecated, please set policy_document_native_api to true in your config") end node.reset_defaults_and_overrides diff --git a/spec/unit/policy_builder/policyfile_spec.rb b/spec/unit/policy_builder/policyfile_spec.rb index 813cd9081d..d3ad6154c0 100644 --- a/spec/unit/policy_builder/policyfile_spec.rb +++ b/spec/unit/policy_builder/policyfile_spec.rb @@ -194,7 +194,7 @@ describe Chef::PolicyBuilder::Policyfile do end before do - Chef::Config[:policy_document_native_api] = false + Chef::Config[:policy_document_native_api] = true Chef::Config[:deployment_group] = "example-policy-stage" allow(policy_builder).to receive(:api_service).and_return(api_service) end @@ -202,6 +202,8 @@ describe Chef::PolicyBuilder::Policyfile do describe "when using compatibility mode (policy_document_native_api == false)" do before do + Chef::Config[:policy_document_native_api] = false + Chef::Config[:treat_deprecation_warnings_as_errors] = false Chef::Config[:deployment_group] = "example-policy-stage" end @@ -327,6 +329,10 @@ describe Chef::PolicyBuilder::Policyfile do end describe "validating the Policyfile.lock" do + before do + Chef::Config[:policy_group] = "policy-stage" + Chef::Config[:policy_name] = "example" + end it "errors if the policyfile json contains any non-recipe items" do parsed_policyfile_json["run_list"] = ["role[foo]"] @@ -803,6 +809,10 @@ describe Chef::PolicyBuilder::Policyfile do context "when using compatibility mode (policy_document_native_api == false)" do let(:cookbook1_url) { "cookbooks/example1/#{example1_xyz_version}" } let(:cookbook2_url) { "cookbooks/example2/#{example2_xyz_version}" } + before do + Chef::Config[:policy_document_native_api] = false + Chef::Config[:treat_deprecation_warnings_as_errors] = false + end context "when the cookbooks don't exist on the server" do include_examples "fetching cookbooks when they don't exist" -- cgit v1.2.1