floe 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58ace49051c911efbe352b2b882cc663aea3be231e6c8dcf138864e340ae2de6
-  data.tar.gz: d422be1ce106663dd1dc40b7ddb52024f9eb9b0e85f807572d66f31fcdf16e51
+  metadata.gz: b92b3c488e49ea77447b370e9152c49e11036e8295c6a781feda666662927f9e
+  data.tar.gz: c553deab6491c9876e28a816cb2422a1318ac6f91a9f9f75cbfc5a144a84d248
 SHA512:
-  metadata.gz: e5eab9d1763c723d8bb913e31bb736d0ba3c3e6d6d63585031e30adc5cbd3049105c756b89eee6999df2d6a0dcfd35e6a1ae4a39c10ce949387e91aae30acf32
-  data.tar.gz: 3249cce513b7195ce5ed791c300d9df62159febeb522c45db36dda38244c76f9290af3157ac744fa0757417ce327f95eea80c704375310ed3181e05426208e3b
+  metadata.gz: 3f5c210d2a745aaed8e3419e228465203dcebb02ee678c1d2b47285083e1f154118c25864e51360d3d062ca0cfade9baa84f5a932804b586f26607a195acc710
+  data.tar.gz: 238fd469915e8682c449abd26e1950f68fd4b032a32fcace11130109d46dc6962b29e4ce381734d167f5328ef16ee2fdd4bb250f844644abebc571fc001ab2dd

data/CHANGELOG.md

@@ -4,6 +4,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [0.6.1] - 2023-11-21
+### Fixed
+- Return an error payload if run_async! fails ([#143](https://github.com/ManageIQ/floe/pull/143))
+
+### Changed
+- Extract run_container_params for docker/podman ([#142](https://github.com/ManageIQ/floe/pull/142))
+
 ## [0.6.0] - 2023-11-09
 ### Added
 - Prefix pod names with 'floe-' ([#132](https://github.com/ManageIQ/floe/pull/132))
@@ -99,7 +106,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Initial release
 
-[Unreleased]: https://github.com/ManageIQ/floe/compare/v0.6.0...HEAD
+[Unreleased]: https://github.com/ManageIQ/floe/compare/v0.6.1...HEAD
+[0.6.1]: https://github.com/ManageIQ/floe/compare/v0.6.0...v0.6.1
 [0.6.0]: https://github.com/ManageIQ/floe/compare/v0.5.0...v0.6.0
 [0.5.0]: https://github.com/ManageIQ/floe/compare/v0.4.1...v0.5.0
 [0.4.1]: https://github.com/ManageIQ/floe/compare/v0.4.0...v0.4.1

data/lib/floe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Floe
-  VERSION = "0.6.0".freeze
+  VERSION = "0.6.1".freeze
 end

data/lib/floe/workflow/runner/docker.rb

@@ -30,12 +30,11 @@ module Floe
 
           begin
             runner_context["container_ref"] = run_container(image, env, runner_context["secrets_ref"])
-          rescue
+            runner_context
+          rescue AwesomeSpawn::CommandResultError => err
             cleanup(runner_context)
-            raise
+            {"Error" => "States.TaskFailed", "Cause" => err.to_s}
           end
-
-          runner_context
         end
 
         def cleanup(runner_context)
@@ -46,11 +45,13 @@ module Floe
         end
 
         def status!(runner_context)
+          return if runner_context.key?("Error")
+
           runner_context["container_state"] = inspect_container(runner_context["container_ref"]).first&.dig("State")
         end
 
         def running?(runner_context)
-          runner_context.dig("container_state", "Running")
+          !!runner_context.dig("container_state", "Running")
         end
 
         def success?(runner_context)
@@ -58,6 +59,8 @@ module Floe
         end
 
         def output(runner_context)
+          return runner_context.slice("Error", "Cause") if runner_context.key?("Error")
+
           output = docker!("logs", runner_context["container_ref"], :combined_output => true).output
           runner_context["output"] = output
         end
@@ -67,6 +70,15 @@ module Floe
         attr_reader :network
 
         def run_container(image, env, secrets_file)
+          params = run_container_params(image, env, secrets_file)
+
+          logger.debug("Running #{AwesomeSpawn.build_command_line("docker", params)}")
+
+          result = docker!(*params)
+          result.output
+        end
+
+        def run_container_params(image, env, secrets_file)
           params  = ["run"]
           params << :detach
           params += env.map { |k, v| [:e, "#{k}=#{v}"] }
@@ -75,11 +87,6 @@ module Floe
           params << [:v, "#{secrets_file}:/run/secrets:z"] if secrets_file
           params << [:name, container_name(image)]
           params << image
-
-          logger.debug("Running docker: #{AwesomeSpawn.build_command_line("docker", params)}")
-
-          result = docker!(*params)
-          result.output
         end
 
         def inspect_container(container_id)

data/lib/floe/workflow/runner/kubernetes.rb

@@ -56,15 +56,16 @@ module Floe
 
           begin
             create_pod!(name, image, env, secret)
-          rescue
+            runner_context
+          rescue Kubeclient::HttpError => err
             cleanup(runner_context)
-            raise
+            {"Error" => "States.TaskFailed", "Cause" => err.to_s}
           end
-
-          runner_context
         end
 
         def status!(runner_context)
+          return if runner_context.key?("Error")
+
           runner_context["container_state"] = pod_info(runner_context["container_ref"]).to_h.deep_stringify_keys["status"]
         end
 
@@ -83,13 +84,14 @@ module Floe
         end
 
         def output(runner_context)
-          runner_context["output"] =
-            if container_failed?(runner_context)
-              failed_state = failed_container_states(runner_context).first
-              {"Error" => failed_state["reason"], "Cause" => failed_state["message"]}
-            else
-              kubeclient.get_pod_log(runner_context["container_ref"], namespace).body
-            end
+          if runner_context.key?("Error")
+            runner_context.slice("Error", "Cause")
+          elsif container_failed?(runner_context)
+            failed_state = failed_container_states(runner_context).first
+            {"Error" => failed_state["reason"], "Cause" => failed_state["message"]}
+          else
+            runner_context["output"] = kubeclient.get_pod_log(runner_context["container_ref"], namespace).body
+          end
         end
 
         def cleanup(runner_context)

data/lib/floe/workflow/runner/podman.rb

@@ -30,7 +30,7 @@ module Floe
 
         private
 
-        def run_container(image, env, secret)
+        def run_container_params(image, env, secret)
           params  = ["run"]
           params << :detach
           params += env.map { |k, v| [:e, "#{k}=#{v}"] }
@@ -39,11 +39,6 @@ module Floe
           params << [:secret, secret] if secret
           params << [:name, container_name(image)]
           params << image
-
-          logger.debug("Running podman: #{AwesomeSpawn.build_command_line("podman", params)}")
-
-          result = podman!(*params)
-          result.output
         end
 
         def create_secret(secrets)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: floe
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2023-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_spawn