From 9469d3a5ab22655fe13a4dd09823bd371fce3c10 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Sun, 18 Oct 2015 20:39:42 -0700 Subject: Update messaging to match LWRP -> Custom Resource rename If you showed up in a post-LWRP world these would be confusing --- lib/chef/resource/lwrp_base.rb | 12 ++++++------ spec/unit/lwrp_spec.rb | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/chef/resource/lwrp_base.rb b/lib/chef/resource/lwrp_base.rb index 443e0ed819..a9a669f18c 100644 --- a/lib/chef/resource/lwrp_base.rb +++ b/lib/chef/resource/lwrp_base.rb @@ -1,8 +1,8 @@ # -# Author:: Adam Jacob () -# Author:: Christopher Walters () -# Author:: Daniel DeLeo () -# Copyright:: Copyright (c) 2008-2012 Opscode, Inc. +# Author:: Adam Jacob () +# Author:: Christopher Walters () +# Author:: Daniel DeLeo () +# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -45,7 +45,7 @@ class Chef def build_from_file(cookbook_name, filename, run_context) if LWRPBase.loaded_lwrps[filename] - Chef::Log.info("LWRP resource #{filename} from cookbook #{cookbook_name} has already been loaded! Skipping the reload.") + Chef::Log.info("Custom resource #{filename} from cookbook #{cookbook_name} has already been loaded! Skipping the reload.") return loaded_lwrps[filename] end @@ -60,7 +60,7 @@ class Chef # Make a useful string for the class (rather than ) resource_class.instance_eval do define_singleton_method(:to_s) do - "LWRP resource #{resource_name} from cookbook #{cookbook_name}" + "Custom resource #{resource_name} from cookbook #{cookbook_name}" end define_singleton_method(:inspect) { to_s } end diff --git a/spec/unit/lwrp_spec.rb b/spec/unit/lwrp_spec.rb index bcb64cb21e..7f6d315bbb 100644 --- a/spec/unit/lwrp_spec.rb +++ b/spec/unit/lwrp_spec.rb @@ -190,7 +190,7 @@ describe "LWRP" do end it "should have a class that outputs a reasonable string" do - expect(get_lwrp(:lwrp_foo).to_s).to eq "LWRP resource lwrp_foo from cookbook lwrp" + expect(get_lwrp(:lwrp_foo).to_s).to eq "Custom resource lwrp_foo from cookbook lwrp" end it "should add the specified actions to the allowed_actions array" do -- cgit v1.2.1 From 0d5c468e445e4a6a694bf90a527e9c0bef16187f Mon Sep 17 00:00:00 2001 From: Steven Murawski Date: Wed, 21 Oct 2015 09:25:58 -0500 Subject: Add CHANGELOG entry for #4068 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26823c1866..3e6be4a71f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ * [pr#4034](https://github.com/chef/chef/pull/4034) add optional ruby-profiling with --profile-ruby * [pr#3119](https://github.com/chef/chef/pull/3119) allow removing user, even if their GID isn't resolvable +* [pr#4068](https://github.com/chef/chef/pull/4068) update messaging from LWRP to Custom Resource in logging and spec ## 12.5.1 -- cgit v1.2.1