floe 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6602a2b11185c6d720b8be59bc69f0e5b115af19e23f64a0e8718fdc8828321
-  data.tar.gz: cf88494cf2e4e3ae9227a5f0e7a19cf91c6e7d20f691fc36643b870e10255afd
+  metadata.gz: 68fc7de6c5112f8717f2941c4f89f22d688092a2ab15a6fe5b859c0f6684c177
+  data.tar.gz: 23172e12b50792acbc0891dd9b0fa0a9e4d0583aa6e52e85fae408faa33ffdd4
 SHA512:
-  metadata.gz: b1ffab71c8fc58a0190aa6e2a7db223f7b9968bb78d8cb08fadfcbd3b8edcac2f155aa92125f92e259f3c1423fe98ac61508cec71ee6aaca52b2135e819e9b26
-  data.tar.gz: 500f7734ecd0e6731d0324db59eecb50f1f0b99efbb33e6a0acc0e9dfbdde6f6c18a3a2b074c271f16b8dd64971aec4ae42e2810819eb9765c39e8c2b6ce0c1b
+  metadata.gz: 157482ec4fd0914d18cb87c06d1ee61f91668baf9c6592451f6c8c1e5de206f088256ef8c45ff29e6d26fb175e3750e1b0ed1008a76910f6520bd424977a0763
+  data.tar.gz: 7c5c586d0087914944e577a6af4f8ca99ebc8ef15798fcb6ed5f50b46a99e368c8315b087c1ad823e2809b24e8539f479f26699b56618324b4850e98bed9b63e

data/CHANGELOG.md

@@ -4,33 +4,50 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [0.2.3] - 2023-07-28
+### Fixed
+- Fix storing next_state in Context ([#76])(https://github.com/ManageIQ/floe/pull/76)
+
+## [0.2.2] - 2023-07-24
+### Fixed
+- Don't pick up real KUBECONFIG for tests ([#73](https://github.com/ManageIQ/floe/pull/73))
+- Fix double json.parse and context default value ([#69](https://github.com/ManageIQ/floe/pull/69))
+
+### Added
+- Configure Renovate ([#46](https://github.com/ManageIQ/floe/pull/46))
+
+### Changed
+- Simplify next state handling ([#66](https://github.com/ManageIQ/floe/pull/66))
+- Refactor Input/Output path handling ([#68](https://github.com/ManageIQ/floe/pull/68))
+
 ## [0.2.1] - 2023-07-12
 ### Fixed
-- Fix State EnteredTime and FinishedTime (#59)
+- Fix State EnteredTime and FinishedTime ([#59](https://github.com/ManageIQ/floe/pull/59))
 
 ### Added
-- Add workflow output (#57)
+- Add workflow output ([#57](https://github.com/ManageIQ/floe/pull/57))
 
 ## [0.2.0] - 2023-07-05
 ### Added
-- Add ability to pass options to `Floe::Workflow::Runner` (#48)
-- Add kubeconfig file support to `Floe::Workflow::Runner::Kubernetes` (#53)
+- Add ability to pass options to `Floe::Workflow::Runner` ([#48](https://github.com/ManageIQ/floe/pull/48))
+- Add kubeconfig file support to `Floe::Workflow::Runner::Kubernetes` ([#53](https://github.com/ManageIQ/floe/pull/53))
 
 ### Removed
-- Remove to_dot/to_svg code (#54)
+- Remove to_dot/to_svg code ([#54](https://github.com/ManageIQ/floe/pull/54))
 
 ### Fixed
-- Fixed default rake task to spec (#55)
+- Fixed default rake task to spec ([#55](https://github.com/ManageIQ/floe/pull/55))
 
 ## [0.1.1] - 2023-06-05
 ### Fixed
-- Fix States::Wait Path initializer arguments (#47)
+- Fix States::Wait Path initializer arguments ([#47](https://github.com/ManageIQ/floe/pull/47))
 
 ## [0.1.0] - 2023-03-13
 ### Added
 - Initial release
 
-[Unreleased]: https://github.com/ManageIQ/floe/compare/v0.2.1...HEAD
+[Unreleased]: https://github.com/ManageIQ/floe/compare/v0.2.2...HEAD
+[0.2.2]: https://github.com/ManageIQ/floe/compare/v0.2.1...v0.2.2
 [0.2.1]: https://github.com/ManageIQ/floe/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/ManageIQ/floe/compare/v0.1.1...v0.2.0
 [0.1.1]: https://github.com/ManageIQ/floe/compare/v0.1.0...v0.1.1

data/lib/floe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Floe
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

data/lib/floe/workflow/state.rb

@@ -41,22 +41,6 @@ module Floe
       def status
         end? ? "success" : "running"
       end
-
-      def run!(input)
-        logger.info("Running state: [#{name}] with input [#{input}]")
-
-        input = input_path.value(context, input)
-
-        output, next_state = block_given? ? yield(input) : input
-        next_state ||= workflow.states_by_name[payload["Next"]] unless end?
-
-        output ||= input
-        output   = output_path&.value(context, output)
-
-        logger.info("Running state: [#{name}] with input [#{input}]...Complete - next state: [#{next_state&.name}] output: [#{output}]")
-
-        [next_state, output]
-      end
     end
   end
 end

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

@@ -16,15 +16,12 @@ module Floe
           @output_path = Path.new(payload.fetch("OutputPath", "$"))
         end
 
-        def run!(*)
-          super do |input|
-            next_state_name = choices.detect { |choice| choice.true?(context, input) }&.next || default
-            next_state      = workflow.states_by_name[next_state_name]
+        def run!(input)
+          input      = input_path.value(context, input)
+          next_state = choices.detect { |choice| choice.true?(context, input) }&.next || default
+          output     = output_path.value(context, input)
 
-            output = input
-
-            [output, next_state]
-          end
+          [next_state, output]
         end
       end
     end

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

@@ -11,21 +11,11 @@ module Floe
 
           @cause = payload["Cause"]
           @error = payload["Error"]
+          @end   = true
         end
 
         def run!(input)
-          logger.info("Running state: [#{name}] with input [#{input}]")
-
-          next_state = nil
-          output     = input
-
-          logger.info("Running state: [#{name}] with input [#{input}]...Complete - next state: [#{next_state&.name}]")
-
-          [next_state, output]
-        end
-
-        def end?
-          true
+          [nil, input]
         end
 
         def status

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

@@ -18,12 +18,12 @@ module Floe
           @result_path = ReferencePath.new(payload.fetch("ResultPath", "$"))
         end
 
-        def run!(*)
-          super do |input|
-            output = input
-            output = result_path.set(output, result) if result && result_path
-            output
-          end
+        def run!(input)
+          output = input_path.value(context, input)
+          output = result_path.set(output, result) if result && result_path
+          output = output_path.value(context, output)
+
+          [@next, output]
         end
       end
     end

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

@@ -9,12 +9,11 @@ module Floe
         def initialize(workflow, name, payload)
           super
 
-          @input_path  = Path.new(payload.fetch("InputPath", "$"))
-          @output_path = Path.new(payload.fetch("OutputPath", "$"))
+          @end = true
         end
 
-        def end?
-          true # TODO: Handle if this is ending a parallel or map state
+        def run!(input)
+          [nil, input]
         end
       end
     end

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

@@ -25,24 +25,23 @@ module Floe
           @credentials       = PayloadTemplate.new(payload["Credentials"])    if payload["Credentials"]
         end
 
-        def run!(*)
-          super do |input|
-            input = parameters.value(context, input) if parameters
+        def run!(input)
+          input = input_path.value(context, input)
+          input = parameters.value(context, input) if parameters
 
-            runner = Floe::Workflow::Runner.for_resource(resource)
-            _exit_status, results = runner.run!(resource, input, credentials&.value({}, workflow.credentials))
+          runner = Floe::Workflow::Runner.for_resource(resource)
+          _exit_status, results = runner.run!(resource, input, credentials&.value({}, workflow.credentials))
 
-            output = input
-            process_output!(output, results)
-          rescue => err
-            retrier = self.retry.detect { |r| (r.error_equals & [err.to_s, "States.ALL"]).any? }
-            retry if retry!(retrier)
+          output = process_output!(input, results)
+          [@next, output]
+        rescue => err
+          retrier = self.retry.detect { |r| (r.error_equals & [err.to_s, "States.ALL"]).any? }
+          retry if retry!(retrier)
 
-            catcher = self.catch.detect { |c| (c.error_equals & [err.to_s, "States.ALL"]).any? }
-            raise if catcher.nil?
+          catcher = self.catch.detect { |c| (c.error_equals & [err.to_s, "States.ALL"]).any? }
+          raise if catcher.nil?
 
-            [output, workflow.states_by_name[catcher.next]]
-          end
+          [catcher.next, output]
         end
 
         private
@@ -75,7 +74,8 @@ module Floe
           end
 
           results = result_selector.value(context, results) if result_selector
-          result_path.set(output, results)
+          output  = result_path.set(output, results)
+          output_path.value(context, output)
         end
       end
     end

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

@@ -16,11 +16,11 @@ module Floe
           @output_path = Path.new(payload.fetch("OutputPath", "$"))
         end
 
-        def run!(*)
-          super do
-            sleep(seconds)
-            nil
-          end
+        def run!(input)
+          input = input_path.value(context, input)
+          sleep(seconds)
+          output = output_path.value(context, input)
+          [@next, output]
         end
       end
     end

data/lib/floe/workflow.rb

@@ -5,6 +5,8 @@ require "json"
 
 module Floe
   class Workflow
+    include Logging
+
     class << self
       def load(path_or_io, context = nil, credentials = {})
         payload = path_or_io.respond_to?(:read) ? path_or_io.read : File.read(path_or_io)
@@ -16,20 +18,21 @@ module Floe
 
     def initialize(payload, context = nil, credentials = {})
       payload     = JSON.parse(payload)     if payload.kind_of?(String)
-      context     = JSON.parse(context)     if context.kind_of?(String)
       credentials = JSON.parse(credentials) if credentials.kind_of?(String)
       context     = Context.new(context)    unless context.kind_of?(Context)
 
       @payload     = payload
-      @context     = context || {"global" => {}}
+      @context     = context
       @credentials = credentials
 
       @states         = payload["States"].to_a.map { |name, state| State.build!(self, name, state) }
       @states_by_name = @states.each_with_object({}) { |state, result| result[state.name] = state }
       start_at        = @payload["StartAt"]
 
-      current_state_name = context.state["Name"] || start_at
-      @current_state = @states_by_name[current_state_name]
+      context.state["Name"] ||= start_at
+
+      current_state_name = context.state["Name"]
+      @current_state     = @states_by_name[current_state_name]
 
       @status = current_state_name == start_at ? "pending" : current_state.status
     rescue JSON::ParserError => err
@@ -40,30 +43,30 @@ module Floe
       @status = "running" if @status == "pending"
       context.execution["StartTime"] ||= Time.now.utc
 
-      input = context.state["Output"] || context.execution["Input"].dup
+      context.state["Guid"]    = SecureRandom.uuid
+      context.state["Input"] ||= context.execution["Input"].dup
 
-      context.state = {
-        "Guid"        => SecureRandom.uuid,
-        "EnteredTime" => Time.now.utc,
-        "Input"       => input,
-        "Name"        => current_state.name
-      }
+      logger.info("Running state: [#{current_state.name}] with input [#{context.state["Input"]}]...")
+
+      context.state["EnteredTime"] = Time.now.utc
 
       tick = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      next_state, output = current_state.run!(input)
+      next_state, output = current_state.run!(context.state["Input"])
       tock = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
       context.state["FinishedTime"] = Time.now.utc
       context.state["Duration"]     = (tock - tick) / 1_000_000.0
       context.state["Output"]       = output
 
+      logger.info("Running state: [#{current_state.name}] with input [#{context["Input"]}]...Complete - next state: [#{next_state}] output: [#{output}]")
+
       context.states << context.state
 
-      @status = current_state.status
-      @output = output if end?
+      @status        = current_state.status
+      @current_state = next_state && @states_by_name[next_state]
+      @output        = output if end?
 
-      next_state_name = next_state&.name
-      @current_state = next_state_name && @states_by_name[next_state_name]
+      context.state = {"Name" => next_state, "Input" => output} unless end?
 
       self
     end

data/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: floe
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-12 00:00:00.000000000 Z
+date: 2023-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_spawn
@@ -168,6 +168,7 @@ files:
 - lib/floe/workflow/states/succeed.rb
 - lib/floe/workflow/states/task.rb
 - lib/floe/workflow/states/wait.rb
+- renovate.json
 - sig/floe.rbs/floe.rbs
 homepage: https://github.com/ManageIQ/floe
 licenses: []