Merge pull request #190 from linc01n/travis/fc113

Remove use_inline_resource
bflad · Apr 1, 2018 · 1fc8c78 · 1fc8c78
2 parents ed3875d + 15f7190
commit 1fc8c78
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 17 deletions.
diff --git a/libraries/stash.rb b/libraries/stash.rb
@@ -43,12 +43,12 @@ def handle_old_stash_attributes!
         Chef::Log.warn "node['stash']['backup_client']['#{attr}'] has been changed to node['stash']['backup']['#{attr}']"
         show_warn = true
       end
-      Chef::Log.warn <<-EOH if show_warn
+      Chef::Log.warn <<-WARN if show_warn
         This renaming introduces the common approach for both of backup strategies:
         'backup_client' and 'backup_diy'. Attributes mentioned above will be gracefully
         converted for you, but this warning and conversion will be removed in the next
         major release of the 'stash' cookbook.
-      EOH
+      WARN
     end
     # rubocop:enable Metrics/AbcSize
 
@@ -62,7 +62,7 @@ def settings_from_data_bag
         item = data_bag_item(node['stash']['data_bag_name'],
                              node['stash']['data_bag_item'])['stash']
         return item if item.is_a?(Hash)
-      rescue
+      rescue StandardError
         Chef::Log.info('No stash data bag found')
       end
       {}

diff --git a/providers/deploy.rb b/providers/deploy.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-use_inline_resources
-
 action :deploy do
   git new_resource.destination do
     repository "ssh://git@#{node['stash']['ssh']['hostname']}:#{node['stash']['ssh']['port']}/#{new_resource.project}/#{new_resource.repository}.git"

diff --git a/providers/deploy_key.rb b/providers/deploy_key.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-use_inline_resources
 action :create do
   key_path = "#{node['stash']['install_path']}/#{new_resource.alias}_ssh_key.pem"
   wrapper_path = "#{node['stash']['install_path']}/#{new_resource.alias}_ssh_wrapper.sh"
@@ -28,4 +27,3 @@
     variables(:key_path => key_path)
   end
 end
-# rubocop:enable Metrics/BlockLength
diff --git a/providers/hook.rb b/providers/hook.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-use_inline_resources
-
+# rubocop:disable Style/MixinUsage
 include Stash::Helper
+# rubocop:enable Style/MixinUsage
 
 def whyrun_supported?
   true

diff --git a/providers/repo.rb b/providers/repo.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-use_inline_resources
-
+# rubocop:disable Style/MixinUsage
 include Stash::Helper
+# rubocop:enable Style/MixinUsage
 
 def whyrun_supported?
   true

diff --git a/recipes/backup_client_cron.rb b/recipes/backup_client_cron.rb
@@ -2,12 +2,12 @@
 
 handle_old_stash_attributes!
 
-Chef::Log.warn <<~EOH
+Chef::Log.warn <<~WARN
   Recipe 'stash::backup_client_cron' is deprecated. Please, set attrite
   `node['stash']['backup']['crone']['enable'] = true` to configure crond to run
   Stash backup periodically. This recipe will be removed in the next major release
   of the 'stash' cookbook.
-EOH
+WARN
 
 settings = settings = merge_stash_settings
 

diff --git a/recipes/configuration.rb b/recipes/configuration.rb
@@ -26,9 +26,9 @@
   end
 
   bash 'update home path permission' do
-    code <<-EOH
+    code <<-SHELL
       chown -R #{node['stash']['user']}:#{node['stash']['user']} #{node['stash']['home_path']}
-    EOH
+    SHELL
   end
 else
   config_path = '/stash-config.properties'

diff --git a/spec/default_spec.rb b/spec/default_spec.rb
@@ -49,13 +49,13 @@
   end
 
   it 'renders start-webapp' do
-    chef_run.node.set['stash']['version'] = '5.0.0'
+    chef_run.node.set['stash']['version'] = '5.9.0'
     chef_run.converge(described_recipe)
     expect(chef_run).to render_file('/opt/atlassian/bitbucket/bin/_start-webapp.sh')
   end
 
   it 'renders set-jre-home' do
-    chef_run.node.set['stash']['version'] = '5.0.0'
+    chef_run.node.set['stash']['version'] = '5.9.0'
     chef_run.converge(described_recipe)
     expect(chef_run).to render_file('/opt/atlassian/bitbucket/bin/set-jre-home.sh')
   end