diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-03-16 10:58:58 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-03-16 10:58:58 -0700 |
| commit | 259b42cd77e91a0194e17bd2bee639f9240b3b75 (patch) | |
| tree | b7c906c54af8d84be92f1fa4557b98886785dacc /lib | |
| parent | 17ca25869fd9e0ce0a4ec013a5dc39549ecaa6f7 (diff) | |
| download | chef-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')
| -rw-r--r-- | lib/chef/dsl/recipe.rb | 34 | ||||
| -rw-r--r-- | lib/chef/provider.rb | 2 | ||||
| -rw-r--r-- | lib/chef/recipe.rb | 2 |
3 files changed, 18 insertions, 20 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 diff --git a/lib/chef/provider.rb b/lib/chef/provider.rb index 8bf6842f70..014fccbb48 100644 --- a/lib/chef/provider.rb +++ b/lib/chef/provider.rb @@ -392,7 +392,7 @@ class Chef end require "chef/dsl/recipe" - include Chef::DSL::Recipe::FullDSL + include Chef::DSL::Recipe end protected diff --git a/lib/chef/recipe.rb b/lib/chef/recipe.rb index 55b6fd7d52..403d393fcd 100644 --- a/lib/chef/recipe.rb +++ b/lib/chef/recipe.rb @@ -35,7 +35,7 @@ class Chef # A Recipe object is the context in which Chef recipes are evaluated. class Recipe - include Chef::DSL::Recipe::FullDSL + include Chef::DSL::Recipe include Chef::Mixin::FromFile include Chef::Mixin::Deprecation |