From 93d6467670a98fefc4471a2f082cd236c085eefa Mon Sep 17 00:00:00 2001
From: Sean OMeara <sean@chef.io>
Date: Fri, 26 Dec 2014 22:52:21 -0500
Subject: [PATCH] Fixing subtle bug where MysqlCookbook::Helper methods were
 polluting Chef::Resource

---
 libraries/resource_mysql_client.rb  | 11 +++++------
 libraries/resource_mysql_config.rb  |  5 ++---
 libraries/resource_mysql_service.rb | 11 +++++------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/libraries/resource_mysql_client.rb b/libraries/resource_mysql_client.rb
index 500d716ee..bab29c043 100644
--- a/libraries/resource_mysql_client.rb
+++ b/libraries/resource_mysql_client.rb
@@ -1,5 +1,4 @@
 require 'chef/resource/lwrp_base'
-require_relative 'helpers'
 
 class Chef
   class Resource
@@ -12,13 +11,13 @@ class MysqlClient < Chef::Resource::LWRPBase
       attribute :package_name, kind_of: Array, default: nil
       attribute :package_version, kind_of: String, default: nil
       attribute :version, kind_of: String, default: nil # mysql_version
-    end
 
-    include MysqlCookbook::Helpers
+      include MysqlCookbook::Helpers
 
-    def client_package_name
-      return package_name if package_name
-      client_package
+      def client_package_name
+        return package_name if package_name
+        client_package
+      end
     end
   end
 end
diff --git a/libraries/resource_mysql_config.rb b/libraries/resource_mysql_config.rb
index 497f58b14..1f7855653 100644
--- a/libraries/resource_mysql_config.rb
+++ b/libraries/resource_mysql_config.rb
@@ -1,5 +1,4 @@
 require 'chef/resource/lwrp_base'
-require_relative 'helpers'
 
 class Chef
   class Resource
@@ -16,8 +15,8 @@ class MysqlConfig < Chef::Resource::LWRPBase
       attribute :source, kind_of: String, default: nil
       attribute :variables, kind_of: [Hash], default: nil
       attribute :version, kind_of: String, default: nil
-    end
 
-    include MysqlCookbook::Helpers
+      include MysqlCookbook::Helpers
+    end
   end
 end
diff --git a/libraries/resource_mysql_service.rb b/libraries/resource_mysql_service.rb
index 20d7db113..5c39ba283 100644
--- a/libraries/resource_mysql_service.rb
+++ b/libraries/resource_mysql_service.rb
@@ -1,5 +1,4 @@
 require 'chef/resource/lwrp_base'
-require_relative 'helpers'
 
 class Chef
   class Resource
@@ -20,13 +19,13 @@ class MysqlService < Chef::Resource::LWRPBase
       attribute :run_group, kind_of: String, default: 'mysql'
       attribute :run_user, kind_of: String, default: 'mysql'
       attribute :version, kind_of: String, default: nil
-    end
 
-    include MysqlCookbook::Helpers
+      include MysqlCookbook::Helpers
 
-    def server_package_name
-      return package_name if package_name
-      server_package
+      def server_package_name
+        return package_name if package_name
+        server_package
+      end
     end
   end
 end