Merge pull request #6468 from coderanger/deprecate-deploy

Deprecate the deploy resource and family

3 files changed, 28 insertions, 1 deletions

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 3ffac73161..2d293a9b28 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,16 @@
 _This file holds "in progress" release notes for the current release under development and is intended for consumption by the Chef Documentation team. Please see <https://docs.chef.io/release_notes.html> for the official Chef release notes._
 
+# Chef Client Release Notes 13.6:
+
+## `deploy` Resource Is Deprecated
+
+The `deploy` resource (and its alter ego `deploy_revision`) have been deprecated,
+to be removed in Chef 14. This is being done because this resource is considered
+overcomplicated and error-prone in the modern Chef ecosystem. A compatibility
+cookbook will be available to help users migrate during the Chef 14 release
+cycle. See [the deprecation documentation](https://docs.chef.io/deprecations_deploy_resource.html)
+for more information.
+
 # Chef Client Release Notes 13.5:
 
 ## Mount's password property is now marked as sensitive
@@ -74,7 +85,7 @@ It is now possible to set `ETHTOOL_OPTS`, `BONDING_OPTS`, `MASTER` and
     **Platforms:** Fedora, RHEL, Amazon Linux
     Whether the interface is controlled by the channel bonding interface
     defined by `master`, above.
-  
+
 ## Chef Vault is now included
 
 Chef Client 13.4 now includes the `chef-vault` gem, making it easier for
diff --git a/lib/chef/deprecated.rb b/lib/chef/deprecated.rb
index 2cf0f3d1bc..183f8e4c24 100644
--- a/lib/chef/deprecated.rb
+++ b/lib/chef/deprecated.rb
@@ -258,6 +258,16 @@ class Chef
       end
     end
 
+    class DeployResource < Base
+      def id
+        21
+      end
+
+      def target
+        "deploy_resource.html"
+      end
+    end
+
     # id 3694 was deleted
 
     class Generic < Base
diff --git a/lib/chef/resource/deploy.rb b/lib/chef/resource/deploy.rb
index b8e6a26f97..f74fe86c12 100644
--- a/lib/chef/resource/deploy.rb
+++ b/lib/chef/resource/deploy.rb
@@ -84,6 +84,12 @@ class Chef
         @checkout_branch = "deploy"
       end
 
+      # This resource is deprecated.
+      def after_created
+        Chef.deprecated(:deploy_resource, "The #{resource_name} resource (#{source_line}) is deprecated and will be removed from Chef core in 14.0 (April 2018). " \
+          "A migration cookbook will be available in the future, see the deprecation documentation for more information.")
+      end
+
       # where the checked out/cloned code goes
       def destination
         @destination ||= shared_path + "/#{@repository_cache}"