Merge branch 'utkarsh079-utkarsh_onlyif_prc_fix_condition'

southalc · Dec 21, 2024 · 46fbfc5 · 46fbfc5
2 parents d6a0be3 + 5cd8512
commit 46fbfc5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## Release 0.7.6
+- Bugfix. fixing the onlyi_prc condition #94. Contributed by utkarsh079
+
 ## Release 0.7.5
 - Bugfix. Resolve image name to ID before fetching digest to resolve false drift #92. Contributed by optiz0r
 

diff --git a/manifests/container.pp b/manifests/container.pp
@@ -249,7 +249,7 @@
 
       $onlyif_prc = @("END"/L)
         test $(podman container inspect --format json ${container_name} |\
-        ${_ruby} -rjson -e 'puts (JSON.parse(STDIN.read))[0]["State"]["Running"]') = 
+        ${_ruby} -rjson -e 'puts (JSON.parse(STDIN.read))[0]["State"]["Running"]') = true
         | END
 
       # Try to stop the container service, then the container directly

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "southalc-podman",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "author": "Chris Southall",
   "summary": "Manage podman containers with puppet",
   "license": "Apache-2.0",

diff --git a/spec/defines/container_spec.rb b/spec/defines/container_spec.rb
@@ -105,11 +105,11 @@
 
       remove_onlyif = if %r{^\/opt\/puppetlabs\/}.match?(os_facts[:ruby]['sitedir'])
                         <<-END.gsub(%r{^\s+\|}, '')
-          |test $(podman container inspect --format json namevar |/opt/puppetlabs/puppet/bin/ruby -rjson -e 'puts (JSON.parse(STDIN.read))[0]["State"]["Running"]') =#{' '}
+          |test $(podman container inspect --format json namevar |/opt/puppetlabs/puppet/bin/ruby -rjson -e 'puts (JSON.parse(STDIN.read))[0]["State"]["Running"]') = true
         END
                       else
                         <<-END.gsub(%r{^\s+\|}, '')
-          |test $(podman container inspect --format json namevar |/usr/bin/ruby -rjson -e 'puts (JSON.parse(STDIN.read))[0]["State"]["Running"]') =#{' '}
+          |test $(podman container inspect --format json namevar |/usr/bin/ruby -rjson -e 'puts (JSON.parse(STDIN.read))[0]["State"]["Running"]') = true
         END
                       end
 
@@ -807,7 +807,7 @@
       it { is_expected.to contain_exec('verify_container_image_namevar').with_unless(unless_ruby) }
 
       onlyif_ruby = <<-END.gsub(%r{^\s+\|}, '')
-        |test $(podman container inspect --format json namevar |/test/ing -rjson -e 'puts (JSON.parse(STDIN.read))[0]["State"]["Running"]') =#{' '}
+        |test $(podman container inspect --format json namevar |/test/ing -rjson -e 'puts (JSON.parse(STDIN.read))[0]["State"]["Running"]') = true
       END
 
       it { is_expected.to contain_exec('podman_remove_container_namevar').with_onlyif(onlyif_ruby) }
@@ -832,7 +832,7 @@
       it { is_expected.to contain_exec('verify_container_image_namevar').with_unless(unless_ruby) }
 
       onlyif_ruby = <<-END.gsub(%r{^\s+\|}, '')
-        |test $(podman container inspect --format json namevar |/test/ing -rjson -e 'puts (JSON.parse(STDIN.read))[0]["State"]["Running"]') =#{' '}
+        |test $(podman container inspect --format json namevar |/test/ing -rjson -e 'puts (JSON.parse(STDIN.read))[0]["State"]["Running"]') = true
       END
 
       it { is_expected.to contain_exec('podman_remove_container_namevar').with_onlyif(onlyif_ruby) }