summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2019-12-17 15:09:50 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2020-01-21 10:33:54 -0800
commit22318a90a26e2cd3d3358fb279c6a91ff75d47ea (patch)
tree272a170b9b827dbd31ec9e51b830143f74c12263
parent8657e94c3b9b6dea8be73a52ce872ee015836211 (diff)
downloadchef-22318a90a26e2cd3d3358fb279c6a91ff75d47ea.tar.gz
more unified_mode
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--lib/chef/resource/chef_gem.rb3
-rw-r--r--lib/chef/resource/chef_handler.rb4
-rw-r--r--lib/chef/resource/chef_sleep.rb2
-rw-r--r--lib/chef/resource/chocolatey_config.rb3
-rw-r--r--lib/chef/resource/chocolatey_feature.rb3
-rw-r--r--lib/chef/resource/chocolatey_package.rb2
-rw-r--r--lib/chef/resource/chocolatey_source.rb3
-rw-r--r--lib/chef/resource/gem_package.rb3
8 files changed, 16 insertions, 7 deletions
diff --git a/lib/chef/resource/chef_gem.rb b/lib/chef/resource/chef_gem.rb
index 04492e2a26..f37809b7c5 100644
--- a/lib/chef/resource/chef_gem.rb
+++ b/lib/chef/resource/chef_gem.rb
@@ -1,6 +1,6 @@
#
# Author:: Bryan McLellan <btm@loftninjas.org>
-# Copyright:: Copyright 2012-2017, Chef Software Inc.
+# Copyright:: Copyright 2012-2019, Chef Software Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,6 +35,7 @@ class Chef
# - Runs Gem.clear_paths after the action, ensuring that gem is aware of changes so that it can be required
# immediately after it is installed
class ChefGem < Chef::Resource::Package::GemPackage
+ unified_mode true
resource_name :chef_gem
property :gem_binary, default: "#{RbConfig::CONFIG["bindir"]}/gem", default_description: "Chef's built-in gem binary.",
diff --git a/lib/chef/resource/chef_handler.rb b/lib/chef/resource/chef_handler.rb
index 2fa5173401..b8272cddea 100644
--- a/lib/chef/resource/chef_handler.rb
+++ b/lib/chef/resource/chef_handler.rb
@@ -1,6 +1,6 @@
#
# Author:: Seth Chisamore <schisamo@chef.io>
-# Copyright:: 2011-2018, Chef Software, Inc <legal@chef.io>
+# Copyright:: 2011-2019, Chef Software Inc.<legal@chef.io>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@ require_relative "../dist"
class Chef
class Resource
class ChefHandler < Chef::Resource
+ unified_mode true
+
resource_name :chef_handler
provides(:chef_handler) { true }
diff --git a/lib/chef/resource/chef_sleep.rb b/lib/chef/resource/chef_sleep.rb
index 8bd7d2421d..51778f5fa5 100644
--- a/lib/chef/resource/chef_sleep.rb
+++ b/lib/chef/resource/chef_sleep.rb
@@ -1,5 +1,5 @@
#
-# Copyright:: 2019, Chef Software Inc.
+# Copyright:: 2019-2019, Chef Software Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/lib/chef/resource/chocolatey_config.rb b/lib/chef/resource/chocolatey_config.rb
index 216dc85fc9..3c49061f25 100644
--- a/lib/chef/resource/chocolatey_config.rb
+++ b/lib/chef/resource/chocolatey_config.rb
@@ -1,5 +1,5 @@
#
-# Copyright:: 2018-2019, Chef Software, Inc.
+# Copyright:: 2018-2019, Chef Software Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ class Chef
class Resource
class ChocolateyConfig < Chef::Resource
resource_name :chocolatey_config
+ unified_mode true
description "Use the chocolatey_config resource to add or remove Chocolatey configuration keys."
introduced "14.3"
diff --git a/lib/chef/resource/chocolatey_feature.rb b/lib/chef/resource/chocolatey_feature.rb
index 37ca9c0228..3789247f57 100644
--- a/lib/chef/resource/chocolatey_feature.rb
+++ b/lib/chef/resource/chocolatey_feature.rb
@@ -1,5 +1,5 @@
#
-# Copyright:: 2019, Chef Software, Inc.
+# Copyright:: 2019-2019, Chef Software Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
class Chef
class Resource
class ChocolateyFeature < Chef::Resource
+ unified_mode true
resource_name :chocolatey_feature
description "Use the chocolatey_feature resource to enable and disable Chocolatey features."
diff --git a/lib/chef/resource/chocolatey_package.rb b/lib/chef/resource/chocolatey_package.rb
index d42a247c95..d80a79d65b 100644
--- a/lib/chef/resource/chocolatey_package.rb
+++ b/lib/chef/resource/chocolatey_package.rb
@@ -21,6 +21,8 @@ require_relative "package"
class Chef
class Resource
class ChocolateyPackage < Chef::Resource::Package
+ unified_mode true
+
resource_name :chocolatey_package
provides :chocolatey_package
diff --git a/lib/chef/resource/chocolatey_source.rb b/lib/chef/resource/chocolatey_source.rb
index f002d7d28b..b79443ae67 100644
--- a/lib/chef/resource/chocolatey_source.rb
+++ b/lib/chef/resource/chocolatey_source.rb
@@ -1,5 +1,5 @@
#
-# Copyright:: 2018-2019, Chef Software, Inc.
+# Copyright:: 2018-2019, Chef Software Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
class Chef
class Resource
class ChocolateySource < Chef::Resource
+ unified_mode true
resource_name :chocolatey_source
description "Use the chocolatey_source resource to add, remove, enable, or disable Chocolatey sources."
diff --git a/lib/chef/resource/gem_package.rb b/lib/chef/resource/gem_package.rb
index 30e9edf0b4..8497923a50 100644
--- a/lib/chef/resource/gem_package.rb
+++ b/lib/chef/resource/gem_package.rb
@@ -1,6 +1,6 @@
#
# Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2017, Chef Software Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,6 +22,7 @@ require_relative "../dist"
class Chef
class Resource
class GemPackage < Chef::Resource::Package
+ unified_mode true
resource_name :gem_package
description "Use the gem_package resource to manage gem packages that are only included in recipes. When a package is installed from a local file, it must be added to the node using the remote_file or cookbook_file resources."