summaryrefslogtreecommitdiff
path: root/lib/chef/dsl
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-03-16 10:58:58 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2016-03-16 10:58:58 -0700
commit259b42cd77e91a0194e17bd2bee639f9240b3b75 (patch)
treeb7c906c54af8d84be92f1fa4557b98886785dacc /lib/chef/dsl
parent17ca25869fd9e0ce0a4ec013a5dc39549ecaa6f7 (diff)
downloadchef-259b42cd77e91a0194e17bd2bee639f9240b3b75.tar.gz
deprecate Chef::DSL::Recipe::FullDSLlcg/deprecate-fulldsl
this module was created out of a bit of excessive paranoia instead of simply adding mixins that we always use with Chef::DSL::Recipe directly to Chef::DSL::Recipe. lets try and YAGNI this class and just add it directly. these modules are already injected into everyone's recipes and providers, so I can't imagine a huge amount of backcompat breaks.
Diffstat (limited to 'lib/chef/dsl')
-rw-r--r--lib/chef/dsl/recipe.rb34
1 files changed, 16 insertions, 18 deletions
diff --git a/lib/chef/dsl/recipe.rb b/lib/chef/dsl/recipe.rb
index 22be303c5b..306465b586 100644
--- a/lib/chef/dsl/recipe.rb
+++ b/lib/chef/dsl/recipe.rb
@@ -23,6 +23,14 @@ require "chef/mixin/powershell_out"
require "chef/dsl/resources"
require "chef/dsl/definitions"
require "chef/dsl/declare_resource"
+require "chef/dsl/data_query"
+require "chef/dsl/platform_introspection"
+require "chef/dsl/include_recipe"
+require "chef/dsl/registry_helper"
+require "chef/dsl/reboot_pending"
+require "chef/dsl/audit"
+require "chef/dsl/powershell"
+require "chef/mixin/lazy_module_include"
require "chef/mixin/lazy_module_include"
class Chef
@@ -34,6 +42,13 @@ class Chef
include Chef::Mixin::ShellOut
include Chef::Mixin::PowershellOut
+ include Chef::DSL::DataQuery
+ include Chef::DSL::PlatformIntrospection
+ include Chef::DSL::IncludeRecipe
+ include Chef::DSL::RegistryHelper
+ include Chef::DSL::RebootPending
+ include Chef::DSL::Audit
+ include Chef::DSL::Powershell
include Chef::DSL::Resources
include Chef::DSL::Definitions
include Chef::DSL::DeclareResource
@@ -105,27 +120,10 @@ class Chef
end
end
+ # This module is deprecated and will be removed in Chef 13
module FullDSL
- require "chef/dsl/data_query"
- require "chef/dsl/platform_introspection"
- require "chef/dsl/include_recipe"
- require "chef/dsl/registry_helper"
- require "chef/dsl/reboot_pending"
- require "chef/dsl/audit"
- require "chef/dsl/powershell"
- require "chef/mixin/lazy_module_include"
-
- include Chef::DSL::DataQuery
- include Chef::DSL::PlatformIntrospection
- include Chef::DSL::IncludeRecipe
include Chef::DSL::Recipe
- include Chef::DSL::RegistryHelper
- include Chef::DSL::RebootPending
- include Chef::DSL::Audit
- include Chef::DSL::Powershell
-
extend Chef::Mixin::LazyModuleInclude
-
end
end
end