Removing all traces of 'created_as_type' since that fix is no longer necessary

2 files changed, 0 insertions, 18 deletions

diff --git a/lib/chef/resource/freebsd_package.rb b/lib/chef/resource/freebsd_package.rb
index 40cc63fc55..957c25caf1 100644
--- a/lib/chef/resource/freebsd_package.rb
+++ b/lib/chef/resource/freebsd_package.rb
@@ -31,27 +31,15 @@ class Chef
 
       provides :package, :on_platforms => ["freebsd"]
 
-      attr_accessor :created_as_type
-
       def initialize(name, run_context=nil)
         super
         @resource_name = :freebsd_package
-        @created_as_type = "freebsd_package"
       end
 
       def after_created
         assign_provider
       end
 
-      # This resource can be invoked with multiple names package & freebsd_package.
-      # We override the to_s method to ensure the key in resource collection
-      # matches the type resource is declared as using created_as_type. This
-      # logic can be removed once Chef does this for all resource in Chef 12:
-      # https://github.com/opscode/chef/issues/1817
-      def to_s
-        "#{created_as_type}[#{name}]"
-      end
-
       def supports_pkgng?
         ships_with_pkgng? || !!shell_out!("make -V WITH_PKGNG", :env => nil).stdout.match(/yes/i)
       end
diff --git a/spec/support/lib/chef/resource/zen_follower.rb b/spec/support/lib/chef/resource/zen_follower.rb
index 0fa0c4af5b..713f122f06 100644
--- a/spec/support/lib/chef/resource/zen_follower.rb
+++ b/spec/support/lib/chef/resource/zen_follower.rb
@@ -21,20 +21,14 @@ require 'chef/json_compat'
 class Chef
   class Resource
     class ZenFollower < Chef::Resource
-      attr_accessor :created_as_type
 
       provides :follower, :on_platforms => ["zen"]
 
       def initialize(name, run_context=nil)
         @resource_name = :zen_follower
-        @created_as_type = "zen_follower"
         super
       end
 
-      def to_s
-        "#{created_as_type}[#{name}]"
-      end
-
       def master(arg=nil)
         if !arg.nil?
           @master = arg