Merge pull request #812 from tylerjl/plugin-update-pluginname

Parse plugin name when performing provider destroy
voxpupuli · Apr 25, 2017 · a84ee70 · a84ee70
2 parents ae8e06d + 7a8995f
commit a84ee70
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * Support for Shield/X-Pack logging configuration file added.
 
 #### Fixes
+* Fixed a bug that prevented plugins from being updated properly.
 
 ## 5.1.1 (April 13, 2017)
 

diff --git a/lib/puppet/provider/elastic_plugin.rb b/lib/puppet/provider/elastic_plugin.rb
@@ -140,7 +140,7 @@ def create
 
   def destroy
     with_environment do
-      plugin(['remove', @resource[:name]])
+      plugin(['remove', Puppet_X::Elastic::plugin_name(@resource[:name])])
     end
   end
 

diff --git a/spec/unit/provider/elasticsearch_plugin/shared_examples.rb b/spec/unit/provider/elasticsearch_plugin/shared_examples.rb
@@ -124,7 +124,9 @@
 
     describe 'removal' do
       it 'uninstalls the plugin' do
-        provider.expects(:plugin).with(['remove', resource_name])
+        provider.expects(:plugin).with(
+          ['remove', resource_name.split('-').last]
+        )
         provider.destroy
       end
     end