simplerubysteps 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8be19b6aa108f0bad7ca85714f134b3ae8876a43a2da627f685fc1f181a1e81b
-  data.tar.gz: feb25d925cc950177873b1e6a5a2bf19406d7b7a796ee0983d03a44461d49d6c
+  metadata.gz: 1db80d874fc5708a39f631983f7bf584ed63eb3840a2f212db85efff25b06486
+  data.tar.gz: 14ee38786322a3962cb48bcc64ba5c5d0606750fc24f422ef2c0ed17d962680b
 SHA512:
-  metadata.gz: '04878fef3099b7798994503ceb9c373d559a0bee170ac9747b26a4f27548cd978810627c08ffe579a05eaf0e2bec1ab6d82e7288852c07cec9438b9403181ec4'
-  data.tar.gz: 6c719c0cc7ae0e8a9e25387131f552ece86774eed9b45649589070d3e32f1f593e6bcac3915dca64ec836d0cdce647868b2b6a1f6d73c1e6f6efecc2379eadad
+  metadata.gz: 9b43275998e160fb9d47db290b973d73b56da8b829ff5e35f408f6cdb093a3dcbf7c990ceabf063733730cbd131be6a9b0369c29113a11f18317c124391656ac
+  data.tar.gz: 5d224524a8d5f42f69cdd5e5b1fc778744e847d918e5cefca08f2115cd23503b8828f154b1f98292df0d1fd4082f79645444f67ddcccb16ff86e15a9bfffed1f

data/README.md

@@ -59,6 +59,13 @@ After checking out the repo, run `bin/setup` to install dependencies.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+### TODOs
+
+* Custom IAM role policies (Step Functions and Lambda)
+* sls-like tooling in ruby with AWS SDK
+* Workflow action unit test support
+* ...
+
 ## Contributing
 
 Bug reports and pull requests are (soon - after alpha phase) welcome on GitHub at https://github.com/chtz/simplerubysteps

data/exe/simplerubysteps-workflow-run-sync

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+bin_dir = File.expand_path(File.dirname(__FILE__))
+shell_script_path = File.join(bin_dir, "../lib/workflow-run-sync.sh")
+
+Kernel.exec(shell_script_path)

data/lib/deploy.sh

@@ -66,13 +66,14 @@ fi
 echo "Uploading state machine JSON"
 
 ruby -e 'require "./workflow.rb";puts $sm.render.to_json' > /tmp/my-state-machine-definition.json
+export WF_TYPE=$(ruby -e 'require "./workflow.rb";puts $sm.kind')
 export STATE_MACHINE_JSON_SHA=$(shasum /tmp/my-state-machine-definition.json | awk '{print $1}')
 export UPLOADED_STATE_MACHINE_JSON=statemachine-$STATE_MACHINE_JSON_SHA.zip
 aws s3 cp /tmp/my-state-machine-definition.json s3://$DEPLOY_BUCKET/$UPLOADED_STATE_MACHINE_JSON
 
 echo "Updating CloudFormation Stack"
 
-echo '[{"ParameterKey":"DeployLambda","ParameterValue":"yes"},{"ParameterKey":"DeployStepfunctions","ParameterValue":"yes"},{"ParameterKey":"LambdaS3","ParameterValue":"'$UPLOADED_LAMBDA_ZIP'"},{"ParameterKey":"StepFunctionsS3","ParameterValue":"'$UPLOADED_STATE_MACHINE_JSON'"}]' > /tmp/params.json
+echo '[{"ParameterKey":"DeployLambda","ParameterValue":"yes"},{"ParameterKey":"DeployStepfunctions","ParameterValue":"yes"},{"ParameterKey":"LambdaS3","ParameterValue":"'$UPLOADED_LAMBDA_ZIP'"},{"ParameterKey":"StepFunctionsS3","ParameterValue":"'$UPLOADED_STATE_MACHINE_JSON'"},{"ParameterKey":"StateMachineType","ParameterValue":"'$WF_TYPE'"}]' > /tmp/params.json
 
 aws cloudformation deploy \
   --template-file $CF_TEMPLATE \

data/lib/simplerubysteps/version.rb

@@ -1,3 +1,3 @@
 module Simplerubysteps
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/lib/simplerubysteps.rb

@@ -14,9 +14,11 @@ module Simplerubysteps
   class StateMachine
     attr_reader :states
     attr_reader :start_at
+    attr_accessor :kind
 
     def initialize()
       @states = {}
+      @kind = "STANDARD"
     end
 
     def add(state)
@@ -76,7 +78,24 @@ module Simplerubysteps
     end
 
     def perform_action(input)
-      @action_block.call(input) if @action_block
+      output = nil
+      output = @action_block.call(input) if @action_block
+
+      if @implicit_choice
+        output = {} unless output
+        @implicit_choice.perform_action(output)
+      end
+
+      output
+    end
+
+    def implicit_choice
+      unless @implicit_choice
+        @implicit_choice = Choice.new("#{name}_choice")
+        $sm.add @implicit_choice
+        self.next = @implicit_choice
+      end
+      @implicit_choice
     end
   end
 
@@ -105,6 +124,8 @@ module Simplerubysteps
   end
 
   class ChoiceItem
+    attr_accessor :implicit_condition_block
+
     def initialize(dict = {}, state = nil)
       @dict = dict
       self.next = state if state
@@ -117,6 +138,12 @@ module Simplerubysteps
     def render
       @dict
     end
+
+    def perform_action(choice_name, output)
+      if @implicit_condition_block
+        output["#{choice_name}_#{@dict[:Next]}"] = @implicit_condition_block.call(output) ? "yes" : "no"
+      end
+    end
   end
 
   class Choice < State
@@ -152,12 +179,22 @@ module Simplerubysteps
       dict[:Choices] = @choices.map { |item| item.render }
       dict
     end
+
+    def perform_action(output)
+      @choices.each do |choice|
+        choice.perform_action name, output
+      end
+    end
   end
 
   # Workflow DSL
 
   $sm = StateMachine.new
   $tasks = []
+  
+  def kind(k)
+    $sm.kind = k
+  end
 
   def task(name)
     t = $sm.add Task.new(name)
@@ -187,6 +224,25 @@ module Simplerubysteps
     $tasks.last.next = state
   end
 
+  def transition_to(state, &condition_block)
+    choice = $tasks.last.implicit_choice
+
+    c = ChoiceItem.new({
+      :Variable => "$.#{choice.name}_#{state}",
+      :StringMatches => "yes",
+    })
+    c.next = state
+    c.implicit_condition_block = condition_block
+
+    choice.add c
+  end
+
+  def default_transition_to(state)
+    choice = $tasks.last.implicit_choice
+
+    choice.default = state
+  end
+
   def choice(name)
     t = $sm.add Choice.new(name)
 

data/lib/statemachine.yaml

@@ -25,6 +25,10 @@ Parameters:
       - "yes"
       - "no"
     ConstraintDescription: must specify yes or no.    
+  StateMachineType:
+    Description: StateMachineType.
+    Default: STANDARD
+    Type: String    
 Conditions:
   CreateLambda: !Equals 
     - !Ref DeployLambda
@@ -53,6 +57,7 @@ Resources:
         Bucket: !Ref DeployBucket
         Key: !Ref StepFunctionsS3
       RoleArn: !GetAtt StepFunctionsRole.Arn
+      StateMachineType: !Ref StateMachineType
   MyLambdaRole:
     Type: AWS::IAM::Role
     Condition: CreateLambda

data/lib/workflow-run-sync.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+export STACK_NAME=$(basename "$PWD")
+
+export STEP_FUNCTIONS_ARN=$(aws cloudformation describe-stacks --stack-name $STACK_NAME --output text --query "Stacks[].Outputs[]"|grep StepFunctionsStateMachineARN|awk '{print $2}')
+
+tee /tmp/statemachineinput.json > /dev/null
+STATE_MACHINE_INPUT="$(cat /tmp/statemachineinput.json)"
+
+aws stepfunctions start-sync-execution --state-machine-arn $STEP_FUNCTIONS_ARN --input "$STATE_MACHINE_INPUT" --query "output" --output text

data/samples/sample1/workflow.rb

@@ -13,8 +13,7 @@ task :t1 do
     string_matches "$.Foo1", "ja" do
       callback :t3 do
         action do |input, token|
-          puts "Callback t3: #{input}, #{token}"
-          # input.merge({ "Foo3": "Bar3x" })
+          puts "Callback t3: #{input}, #{token}" # The logged token is picked up by continue-callbackbranch.sh
         end
 
         transition :t5

data/samples/sample2/workflow.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/ruby
+
+require "simplerubysteps"
+include Simplerubysteps
+
+kind "EXPRESS"
+
+task :t1 do
+  action do |input|
+    puts "Task t1: #{input}"
+    input.merge({ "t1" => (input["bar"] ? input["bar"] : "") + "t1" })
+  end
+
+  transition_to :t2 do |output|
+    output["t1"] == "foot1"
+  end
+
+  default_transition_to :t3
+end
+
+task :t2 do
+  action do |input|
+    puts "Task t2: #{input}"
+    input.merge({ "t2" => "yes" })
+  end
+
+  transition :t4
+end
+
+task :t3 do
+  action do |input|
+    puts "Task t3: #{input}"
+    input.merge({ "t3" => "yes" })
+  end
+
+  task :t4 do
+    action do |input|
+      puts "Task t4: #{input}"
+      input.merge({ "t4" => "yes" })
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplerubysteps
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Christian Tschenett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,6 +46,7 @@ executables:
 - simplerubysteps-destroy
 - simplerubysteps-logs
 - simplerubysteps-workflow-run
+- simplerubysteps-workflow-run-sync
 extensions: []
 extra_rdoc_files: []
 files:
@@ -60,6 +61,7 @@ files:
 - exe/simplerubysteps-destroy
 - exe/simplerubysteps-logs
 - exe/simplerubysteps-workflow-run
+- exe/simplerubysteps-workflow-run-sync
 - lib/deploy.sh
 - lib/destroy.sh
 - lib/function.rb
@@ -67,12 +69,14 @@ files:
 - lib/simplerubysteps.rb
 - lib/simplerubysteps/version.rb
 - lib/statemachine.yaml
+- lib/workflow-run-sync.sh
 - lib/workflow-run.sh
 - samples/sample1/continue-callbackbranch.sh
 - samples/sample1/send-task-success.sh
 - samples/sample1/start-callbackbranch.sh
 - samples/sample1/start-directbranch.sh
 - samples/sample1/workflow.rb
+- samples/sample2/workflow.rb
 - simplerubysteps.gemspec
 homepage: https://github.com/chtz/simplerubysteps
 licenses: