diff options
author | Tim Smith <tsmith@chef.io> | 2018-01-01 10:39:22 -0800 |
---|---|---|
committer | Tim Smith <tsmith@chef.io> | 2018-01-01 10:44:07 -0800 |
commit | 2cd379b12eac02246ecc12b5e3cbb51069c9cedc (patch) | |
tree | e82f1be3ff2883ebfb61199b0c60a97da37e5182 /lib/chef/dsl | |
parent | bfe8487a26f99d3cd3e08fffea8cf6457631cf69 (diff) | |
download | chef-2cd379b12eac02246ecc12b5e3cbb51069c9cedc.tar.gz |
Remove previously deprecated mixins and Chef::DSL::Recipe::FullDSLchef14_deprecations
We wired these up previously with deprecations. They've been deprecated for a long time and are pretty rarely used on the Supermarket. Additionally we have Foodcritic rules to detect their usage:
FC102: Deprecated Chef::DSL::Recipe::FullDSL class used
FC100: Deprecated Chef::Mixin::Language mixin used
FC099: Deprecated Chef::Mixin::LanguageIncludeRecipe mixin used
FC098: Deprecated Chef::Mixin::RecipeDefinitionDSLCore mixin used
FC097: Deprecated Chef::Mixin::LanguageIncludeAttribute mixin used
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'lib/chef/dsl')
-rw-r--r-- | lib/chef/dsl/data_query.rb | 6 | ||||
-rw-r--r-- | lib/chef/dsl/include_attribute.rb | 6 | ||||
-rw-r--r-- | lib/chef/dsl/include_recipe.rb | 6 | ||||
-rw-r--r-- | lib/chef/dsl/platform_introspection.rb | 6 | ||||
-rw-r--r-- | lib/chef/dsl/recipe.rb | 14 |
5 files changed, 6 insertions, 32 deletions
diff --git a/lib/chef/dsl/data_query.rb b/lib/chef/dsl/data_query.rb index b966885724..8ec466ea35 100644 --- a/lib/chef/dsl/data_query.rb +++ b/lib/chef/dsl/data_query.rb @@ -1,6 +1,6 @@ # # Author:: Adam Jacob (<adam@chef.io>) -# Copyright:: Copyright 2008-2016, Chef Software Inc. +# Copyright:: Copyright 2008-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -83,7 +83,3 @@ class Chef end end end - -# **DEPRECATED** -# This used to be part of chef/mixin/language. Load the file to activate the deprecation code. -require "chef/mixin/language" diff --git a/lib/chef/dsl/include_attribute.rb b/lib/chef/dsl/include_attribute.rb index 6d27fefc25..9f73143722 100644 --- a/lib/chef/dsl/include_attribute.rb +++ b/lib/chef/dsl/include_attribute.rb @@ -1,6 +1,6 @@ # # Author:: Adam Jacob (<adam@chef.io>) -# Copyright:: Copyright 2008-2016, Chef Software Inc. +# Copyright:: Copyright 2008-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -55,7 +55,3 @@ class Chef end end end - -# **DEPRECATED** -# This used to be part of chef/mixin/language_include_attribute. Load the file to activate the deprecation code. -require "chef/mixin/language_include_attribute" diff --git a/lib/chef/dsl/include_recipe.rb b/lib/chef/dsl/include_recipe.rb index 9abd7d135b..d217c91d4b 100644 --- a/lib/chef/dsl/include_recipe.rb +++ b/lib/chef/dsl/include_recipe.rb @@ -1,6 +1,6 @@ # # Author:: Adam Jacob (<adam@chef.io>) -# Copyright:: Copyright 2008-2016, Chef Software Inc. +# Copyright:: Copyright 2008-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -38,7 +38,3 @@ class Chef end end end - -# **DEPRECATED** -# This used to be part of chef/mixin/language_include_recipe. Load the file to activate the deprecation code. -require "chef/mixin/language_include_recipe" diff --git a/lib/chef/dsl/platform_introspection.rb b/lib/chef/dsl/platform_introspection.rb index dc309f9acb..2e31e0b95b 100644 --- a/lib/chef/dsl/platform_introspection.rb +++ b/lib/chef/dsl/platform_introspection.rb @@ -1,6 +1,6 @@ # # Author:: Adam Jacob (<adam@chef.io>) -# Copyright:: Copyright 2008-2016, Chef Software Inc. +# Copyright:: Copyright 2008-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -262,7 +262,3 @@ class Chef end end end - -# **DEPRECATED** -# This used to be part of chef/mixin/language. Load the file to activate the deprecation code. -require "chef/mixin/language" diff --git a/lib/chef/dsl/recipe.rb b/lib/chef/dsl/recipe.rb index dedf291857..9da812cec0 100644 --- a/lib/chef/dsl/recipe.rb +++ b/lib/chef/dsl/recipe.rb @@ -1,7 +1,7 @@ -#-- +# # Author:: Adam Jacob (<adam@chef.io>) # Author:: Christopher Walters (<cw@chef.io>) -# Copyright:: Copyright 2008-2017, Chef Software Inc. +# Copyright:: Copyright 2008-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -74,19 +74,9 @@ class Chef def exec(args) raise Chef::Exceptions::ResourceNotFound, "exec was called, but you probably meant to use an execute resource. If not, please call Kernel#exec explicitly. The exec block called was \"#{args}\"" end - - # @deprecated Use Chef::DSL::Recipe instead, will be removed in Chef 13 - module FullDSL - include Chef::DSL::Recipe - extend Chef::Mixin::LazyModuleInclude - end end end end # Avoid circular references for things that are only used in instance methods require "chef/resource" - -# **DEPRECATED** -# This used to be part of chef/mixin/recipe_definition_dsl_core. Load the file to activate the deprecation code. -require "chef/mixin/recipe_definition_dsl_core" |