Properly handle idempotently removing image

Signed-off-by: Eric D. Helms <[email protected]>

Author: ehelms

manifests/image.pp

@@ -73,22 +73,19 @@
     }
   }
 
-  case $ensure {
-    'present': {
-      exec { "pull_image_${title}":
-        command => "podman image pull ${_flags} ${image}",
-        unless  => "podman image exists ${image}",
-        path    => '/sbin:/usr/sbin:/bin:/usr/bin',
-        *       => $exec_defaults,
-      }
+  if $ensure == 'present' {
+    exec { "pull_image_${title}":
+      command => "podman image pull ${_flags} ${image}",
+      unless  => "podman image exists ${image}",
+      path    => '/sbin:/usr/sbin:/bin:/usr/bin',
+      *       => $exec_defaults,
     }
-    default: {
-      exec { "pull_image_${title}":
-        command => "podman image pull ${_flags} ${image}",
-        unless  => "podman rmi ${image}",
-        path    => '/sbin:/usr/sbin:/bin:/usr/bin',
-        *       => $exec_defaults,
-      }
+  } elsif $ensure == 'absent' {
+    exec { "remove_image_${title}":
+      command => "podman rmi ${image}",
+      onlyif  => "podman image exists ${image}",
+      path    => '/sbin:/usr/sbin:/bin:/usr/bin',
+      *       => $exec_defaults,
     }
   }
 }

spec/defines/image_spec.rb

@@ -55,10 +55,10 @@
       let(:params) { { ensure: 'absent', image: 'image:test' } }
 
       it do
-        is_expected.to contain_exec('pull_image_title').only_with(
+        is_expected.to contain_exec('remove_image_title').only_with(
           {
-            'command'     => 'podman image pull  image:test',
-            'unless'      => 'podman rmi image:test',
+            'command'     => 'podman rmi image:test',
+            'onlyif'      => 'podman image exists image:test',
             'path'        => '/sbin:/usr/sbin:/bin:/usr/bin',
             'environment' => [],
           },
@@ -84,10 +84,10 @@
       it { is_expected.to contain_podman__rootless('dummy').only_with({}) }
 
       it do
-        is_expected.to contain_exec('pull_image_title').only_with(
+        is_expected.to contain_exec('remove_image_title').only_with(
           {
-            'command'     => 'podman image pull  image:test',
-            'unless'      => 'podman rmi image:test',
+            'command'     => 'podman rmi image:test',
+            'onlyif'      => 'podman image exists image:test',
             'path'        => '/sbin:/usr/sbin:/bin:/usr/bin',
             'environment' => ['HOME=/home/dummy', 'XDG_RUNTIME_DIR=/run/user/3333', 'DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/3333/bus'],
             'cwd'         => '/home/dummy',
@@ -156,9 +156,9 @@
       let(:params) { { flags: { publish: ['242:242'], volume: 'jenkins:/test/ing' }, ensure: 'absent', image: 'image:test' } }
 
       it do
-        is_expected.to contain_exec('pull_image_title').with(
+        is_expected.to contain_exec('remove_image_title').with(
           {
-            'command' => "podman image pull   --publish '242:242' --volume 'jenkins:/test/ing' image:test",
+            'command' => 'podman rmi image:test',
           },
         )
       end
@@ -223,10 +223,10 @@
       it { is_expected.to contain_podman__rootless('testing').only_with({}) }
 
       it do
-        is_expected.to contain_exec('pull_image_title').only_with(
+        is_expected.to contain_exec('remove_image_title').only_with(
           {
-            'command'     => 'podman image pull  image:test',
-            'unless'      => 'podman rmi image:test',
+            'command'     => 'podman rmi image:test',
+            'onlyif'      => 'podman image exists image:test',
             'path'        => '/sbin:/usr/sbin:/bin:/usr/bin',
             'environment' => ['HOME=/home/testing', 'XDG_RUNTIME_DIR=/run/user/3333', 'DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/3333/bus'],
             'cwd'         => '/home/testing',