Merge pull request #514 from koshatul/fix-for-aliased-plugins

Fix aliased plugin names

Author: florindragos

lib/puppet/parser/functions/docker_plugin_enable_flags.rb

@@ -10,7 +10,11 @@ module Puppet::Parser::Functions
     opts = args[0] || {}
     flags = []
     flags << '--force' if opts['force_remove'] == true
-    flags << "'#{opts['plugin_name']}'" if opts['plugin_name'] && opts['plugin_name'].to_s != 'undef'
+    if opts['plugin_alias'] && opts['plugin_alias'].to_s != 'undef'
+      flags << "'#{opts['plugin_alias']}'"
+    elsif opts['plugin_name'] && opts['plugin_name'].to_s != 'undef'
+      flags << "'#{opts['plugin_name']}'"
+    end
     flags.flatten.join(' ')
   end
 end

manifests/plugin.pp

@@ -79,7 +79,7 @@
     })
 
     $exec_install = "${docker_command} install ${docker_plugin_install_flags}"
-    $unless_install = "${docker_command} ls | grep -w ${plugin_name}"
+    $unless_install = "${docker_command} ls --format='{{.PluginReference}}' | grep -w ${plugin_name}"
 
     exec { "plugin install ${plugin_name}":
       command     => $exec_install,
@@ -95,7 +95,7 @@
     })
 
     $exec_rm = "${docker_command} rm ${docker_plugin_remove_flags}"
-    $onlyif_rm = "${docker_command} ls | grep -w ${plugin_name}"
+    $onlyif_rm = "${docker_command} ls --format='{{.PluginReference}}' | grep -w ${plugin_name}"
 
     exec { "plugin remove ${plugin_name}":
       command     => $exec_rm,
@@ -109,11 +109,12 @@
   if $enabled {
     $docker_plugin_enable_flags = docker_plugin_enable_flags({
       plugin_name => $plugin_name,
+      plugin_alias => $plugin_alias,
       timeout => $timeout,
     })
 
     $exec_enable = "${docker_command} enable ${docker_plugin_enable_flags}"
-    $onlyif_enable = "${docker_command} ls -f enabled=false | grep -w ${plugin_name}"
+    $onlyif_enable = "${docker_command} ls -f enabled=false --format='{{.PluginReference}}' | grep -w ${plugin_name}"
 
     exec { "plugin enable ${plugin_name}":
       command     => $exec_enable,
@@ -129,7 +130,7 @@
       environment => 'HOME=/root',
       path        => ['/bin', '/usr/bin'],
       timeout     => 0,
-      unless      => "${docker_command} ls -f enabled=false | grep -w ${plugin_name}",
+      unless      => "${docker_command} ls -f enabled=false --format='{{.PluginReference}}' | grep -w ${plugin_name}",
     }
   }
 }

spec/defines/plugin_spec.rb

@@ -16,19 +16,29 @@
   context 'with defaults for all parameters' do
     it { is_expected.to compile.with_all_deps }
     it { is_expected.to contain_exec('plugin install foo/plugin:latest').with_command(%r{docker plugin install}) }
+    it { is_expected.to contain_exec('plugin install foo/plugin:latest').with_unless(%r{docker ls --format='{{.PluginReference}}' | grep -w foo/plugin:latest}) }
   end
 
   context 'with enabled => false' do
     let(:params) { { 'enabled' => false } }
 
     it { is_expected.to compile.with_all_deps }
     it { is_expected.to contain_exec('disable foo/plugin:latest').with_command(%r{docker plugin disable}) }
+    it { is_expected.to contain_exec('disable foo/plugin:latest').with_unless(%r{docker ls --format='{{.PluginReference}}' | grep -w foo/plugin:latest}) }
   end
 
   context 'with ensure => absent' do
     let(:params) { { 'ensure' => 'absent' } }
 
     it { is_expected.to compile.with_all_deps }
     it { is_expected.to contain_exec('plugin remove foo/plugin:latest').with_command(%r{docker plugin rm}) }
+    it { is_expected.to contain_exec('plugin remove foo/plugin:latest').with_onlyif(%r{docker ls --format='{{.PluginReference}}' | grep -w foo/plugin:latest}) }
+  end
+
+  context 'with alias => foo-plugin' do
+    let(:params) { { 'plugin_alias' => 'foo-plugin' } }
+
+    it { is_expected.to contain_exec('plugin install foo/plugin:latest').with_command(%r{docker plugin install}) }
+    it { is_expected.to contain_exec('plugin install foo/plugin:latest').with_unless(%r{docker ls --format='{{.PluginReference}}' | grep -w foo/plugin:latest}) }
   end
 end