floe 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2bab2c07fd71a45bcf896aa219993770c83eedd5c4e3268c318d8b9ba0413ed
-  data.tar.gz: 786064609be7fee8a19855cb97fd160984b5a8a7aedc85344eab01302155a988
+  metadata.gz: 0aac9121f1d393173b2fb11f9422f9e689693318a97dada576f054d827901024
+  data.tar.gz: 8118d4632e54c6fa3beb94384be517d5f3bf494890855901ce36af7ea94ee1c2
 SHA512:
-  metadata.gz: 45a9fd8a85bb5b1059574c0dc63b0434496b6c75634c567aba9f0008400867b4dbf8c33337b3940084c644606dc3fe6065fc4f79ac5732449ca0d9675d0e2531
-  data.tar.gz: f4147cd4e1633d2af02b7cbbd04735a9ffdc733359eb7f349b23a2fb8bada9de18a4f37fad82de543f2eb8060fa6fa52d1864a159f3ab3f780cbdab1824b6ab1
+  metadata.gz: 3872e70c2bb41e46570bcba95ef63716cdf3ea93bed77e9654db6614f8225982e13e3a83256b97854b6aa4376799e803f2edd5066dc3e304e75e2970c55d60f2
+  data.tar.gz: fac7e8815bcff8d93e443653759a6cdf8371c78f9114e3fef133212c0a1ef49d76bb35a0f491ef5abfeb134a21dc11cbbc00a6694d1f05d0e90f5bdae3471c41

data/CHANGELOG.md

@@ -4,6 +4,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [0.5.0] - 2023-10-12
+### Added
+- For task errors, use the json on the last line ([#128](https://github.com/ManageIQ/floe/pull/128))
+- Add ability to pass task service account to kube runner ([#131](https://github.com/ManageIQ/floe/pull/131))
+
+### Fixed
+- Don't put credentials file into input ([#124](https://github.com/ManageIQ/floe/pull/124))
+- exe/floe return success status if the workflow was successful ([#129](https://github.com/ManageIQ/floe/pull/129))
+- For error output, drop trailing newline ([#126](https://github.com/ManageIQ/floe/pull/126))
+
 ## [0.4.1] - 2023-10-06
 ### Added
 - Add Fail#CausePath and Fail#ErrorPath ([#110](https://github.com/ManageIQ/floe/pull/110))

data/examples/workflow.asl

@@ -4,7 +4,7 @@
   "States": {
     "FirstState": {
       "Type": "Task",
-      "Resource": "docker://agrare/hello-world:latest",
+      "Resource": "docker://docker.io/agrare/hello-world:latest",
       "Credentials": {
         "mysecret": "dont tell anyone"
       },
@@ -49,13 +49,13 @@
 
     "FirstMatchState": {
       "Type" : "Task",
-      "Resource": "docker://agrare/hello-world:latest",
+      "Resource": "docker://docker.io/agrare/hello-world:latest",
       "Next": "PassState"
     },
 
     "SecondMatchState": {
       "Type" : "Task",
-      "Resource": "docker://agrare/hello-world:latest",
+      "Resource": "docker://docker.io/agrare/hello-world:latest",
       "Next": "NextState"
     },
 
@@ -87,7 +87,7 @@
 
     "NextState": {
       "Type": "Task",
-      "Resource": "docker://agrare/hello-world:latest",
+      "Resource": "docker://docker.io/agrare/hello-world:latest",
       "Secrets": ["vmdb:aaa-bbb-ccc"],
       "End": true
     }

data/exe/floe

@@ -37,3 +37,4 @@ workflow = Floe::Workflow.load(opts[:workflow], context, opts[:credentials])
 workflow.run!
 
 puts workflow.output.inspect
+exit workflow.status == "success" ? 0 : 1

data/lib/floe/version.rb

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

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

@@ -13,24 +13,6 @@ module Floe
           @network = options.fetch("network", "bridge")
         end
 
-        def run!(resource, env = {}, secrets = {})
-          raise ArgumentError, "Invalid resource" unless resource&.start_with?("docker://")
-
-          image = resource.sub("docker://", "")
-
-          secrets_file = nil
-          if secrets && !secrets.empty?
-            secrets_file = create_secret(secrets)
-            env["_CREDENTIALS"] = "/run/secrets"
-          end
-
-          output = run_container(image, env, secrets_file)
-
-          {"exit_code" => 0, "output" => output}
-        ensure
-          cleanup({"secrets_ref" => secrets_file})
-        end
-
         def run_async!(resource, env = {}, secrets = {})
           raise ArgumentError, "Invalid resource" unless resource&.start_with?("docker://")
 
@@ -40,11 +22,10 @@ module Floe
 
           if secrets && !secrets.empty?
             runner_context["secrets_ref"] = create_secret(secrets)
-            env["_CREDENTIALS"] = "/run/secrets"
           end
 
           begin
-            runner_context["container_ref"] = run_container(image, env, runner_context["secrets_ref"], :detached => true)
+            runner_context["container_ref"] = run_container(image, env, runner_context["secrets_ref"])
           rescue
             cleanup(runner_context)
             raise
@@ -81,10 +62,11 @@ module Floe
 
         attr_reader :network
 
-        def run_container(image, env, secrets_file, detached: false)
+        def run_container(image, env, secrets_file)
           params  = ["run"]
-          params << (detached ? :detach : :rm)
+          params << :detach
           params += env.map { |k, v| [:e, "#{k}=#{v}"] }
+          params << [:e, "_CREDENTIALS=/run/secrets"] if secrets_file
           params << [:net, "host"] if @network == "host"
           params << [:v, "#{secrets_file}:/run/secrets:z"] if secrets_file
           params << image

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

@@ -35,35 +35,9 @@ module Floe
 
           @namespace = options.fetch("namespace", "default")
 
-          super
-        end
-
-        def run!(resource, env = {}, secrets = {})
-          raise ArgumentError, "Invalid resource" unless resource&.start_with?("docker://")
-
-          image  = resource.sub("docker://", "")
-          name   = pod_name(image)
-          secret = create_secret!(secrets) if secrets && !secrets.empty?
-
-          begin
-            runner_context = {"container_ref" => name}
+          @task_service_account = options["task_service_account"]
 
-            create_pod!(name, image, env, secret)
-            loop do
-              case pod_info(name).dig("status", "phase")
-              when "Pending", "Running"
-                sleep(1)
-              else # also "Succeeded"
-                runner_context["exit_code"] = 0
-                output(runner_context)
-                break
-              end
-            end
-
-            runner_context
-          ensure
-            cleanup({"container_ref" => name, "secrets_ref" => secret})
-          end
+          super
         end
 
         def run_async!(resource, env = {}, secrets = {})
@@ -148,6 +122,8 @@ module Floe
             }
           }
 
+          spec[:spec][:serviceAccountName] = @task_service_account if @task_service_account
+
           if secret
             spec[:spec][:volumes] = [
               {

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

@@ -26,23 +26,6 @@ module Floe
           @volumepath      = options["volumepath"]
         end
 
-        def run!(resource, env = {}, secrets = {})
-          raise ArgumentError, "Invalid resource" unless resource&.start_with?("docker://")
-
-          image = resource.sub("docker://", "")
-
-          if secrets && !secrets.empty?
-            secret = create_secret(secrets)
-            env["_CREDENTIALS"] = "/run/secrets/#{secret}"
-          end
-
-          output = run_container(image, env, secret)
-
-          {"exit_code" => 0, :output => output}
-        ensure
-          delete_secret(secret) if secret
-        end
-
         def run_async!(resource, env = {}, secrets = {})
           raise ArgumentError, "Invalid resource" unless resource&.start_with?("docker://")
 
@@ -50,11 +33,10 @@ module Floe
 
           if secrets && !secrets.empty?
             secret_guid = create_secret(secrets)
-            env["_CREDENTIALS"] = "/run/secrets/#{secret_guid}"
           end
 
           begin
-            container_id = run_container(image, env, secret_guid, :detached => true)
+            container_id = run_container(image, env, secret_guid)
           rescue
             cleanup({"container_ref" => container_id, "secrets_ref" => secret_guid})
             raise
@@ -89,10 +71,11 @@ module Floe
 
         private
 
-        def run_container(image, env, secret, detached: false)
+        def run_container(image, env, secret)
           params  = ["run"]
-          params << (detached ? :detach : :rm)
+          params << :detach
           params += env.map { |k, v| [:e, "#{k}=#{v}"] }
+          params << [:e, "_CREDENTIALS=/run/secrets/#{secret}"] if secret
           params << [:net, "host"] if @network == "host"
           params << [:secret, secret] if secret
           params << image

data/lib/floe/workflow/states/task.rb

@@ -127,9 +127,9 @@ module Floe
         def parse_error(output)
           return if output.nil?
 
-          JSON.parse(output)
+          JSON.parse(output.split("\n").last)
         rescue JSON::ParserError
-          {"Error" => output}
+          {"Error" => output.chomp}
         end
 
         def parse_output(output)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: floe
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 2023-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_spawn
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Simple Workflow Runner.