extend Helpers within individual actions to avoid blanket definition …

…name conflicts

attributes/default.rb

@@ -14,7 +14,7 @@
 
 case node['platform_family']
 when 'rhel', 'fedora'
-  default['al_agents']['agent']['service_name'] = 'al-agent'
+  default['al_agents']['agent']['al_agent_service'] = 'al-agent'
   if node['platform_version'].to_i >= 6
     default['al_agents']['syslog_ng']['source_log'] = 's_all'
   else
@@ -26,15 +26,15 @@
     default['al_agents']['package']['url'] = 'https://scc.alertlogic.net/software/al-agent-LATEST-1.i386.rpm'
   end
 when 'debian'
-  default['al_agents']['agent']['service_name'] = 'al-agent'
+  default['al_agents']['agent']['al_agent_service'] = 'al-agent'
   default['al_agents']['syslog_ng']['source_log'] = 's_src'
   if node['kernel']['machine'] == 'x86_64'
     default['al_agents']['package']['url'] = 'https://scc.alertlogic.net/software/al-agent_LATEST_amd64.deb'
   else
     default['al_agents']['package']['url'] = 'https://scc.alertlogic.net/software/al-agent_LATEST_i386.deb'
   end
 when 'windows'
-  default['al_agents']['agent']['service_name'] = 'al_agent'
+  default['al_agents']['agent']['al_agent_service'] = 'al_agent'
   default['al_agents']['package']['url'] = 'https://scc.alertlogic.net/software/al_agent-LATEST.msi'
   if node['kernel']['machine'] == 'x86_64'
     default['al_agents']['windows_install_guard'] = 'C:\Program Files (x86)\Common Files\AlertLogic\host_key.pem'

libraries/helpers.rb

@@ -18,8 +18,8 @@ def agent_basename
       agent_file(node['al_agents']['package']['url'])
     end
 
-    def service_name
-      node['al_agents']['agent']['service_name']
+    def al_agent_service
+      node['al_agents']['agent']['al_agent_service']
     end
 
     def windows_install_guard

recipes/_windows.rb

@@ -1,10 +1,10 @@
 ::Chef::Recipe.send(:include, AlAgents::Helpers)
-::Chef::Resource::Batch.send(:include, AlAgents::Helpers)
 
 cache_dir = Chef::Config[:file_cache_path]
 cached_package = ::File.join(cache_dir, agent_basename)
 
 remote_file agent_basename do
+  extend(AlAgents::Helpers)
   path cached_package
   source node['al_agents']['package']['url']
   action :create_if_missing
@@ -13,6 +13,7 @@
 # test kitchen issue: the reinstall causes an issue
 #   https://github.com/chef/chef/issues/3055s
 package agent_basename do
+  extend(AlAgents::Helpers)
   source cached_package
   action :install
   options windows_options

recipes/configure_agent.rb

@@ -6,9 +6,9 @@
 #
 
 ::Chef::Recipe.send(:include, AlAgents::Helpers)
-::Chef::Resource::Batch.send(:include, AlAgents::Helpers)
 
 execute "configure #{agent_basename}" do
+  extend(AlAgents::Helpers)
   user 'root'
   cwd '/etc/init.d'
   command "./al-agent configure #{configure_options}"

recipes/install.rb

@@ -6,19 +6,20 @@
 #
 
 ::Chef::Recipe.send(:include, AlAgents::Helpers)
-::Chef::Resource::Batch.send(:include, AlAgents::Helpers)
 
 cache_dir = Chef::Config[:file_cache_path]
 cached_package = ::File.join(cache_dir, agent_basename)
 
 remote_file agent_basename do
+  extend(AlAgents::Helpers)
   path cached_package
   source node['al_agents']['package']['url']
   action :create_if_missing
 end
 
 # let ubuntu know to use dpkg not apt
 package agent_basename do
+  extend(AlAgents::Helpers)
   source cached_package
   action :install
   version '>=0'

recipes/provision_agent.rb

@@ -6,9 +6,9 @@
 #
 
 ::Chef::Recipe.send(:include, AlAgents::Helpers)
-::Chef::Resource::Batch.send(:include, AlAgents::Helpers)
 
 execute "provision #{agent_basename}" do
+  extend(AlAgents::Helpers)
   user 'root'
   cwd '/etc/init.d'
   command "./al-agent provision #{provision_options}"

recipes/start.rb

@@ -1,4 +1,4 @@
 ::Chef::Recipe.send(:include, AlAgents::Helpers)
-service service_name do
+service al_agent_service do
   action :start
 end