simplerubysteps 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32057d9ea30569964077a231e6e5ed88aff396dabc03151c1ef77bbac237a7e2
-  data.tar.gz: 81d13b619c57a3b793ed7039a06e0ec2a730aa8844d70c8603f35277799090e0
+  metadata.gz: cbf93121e4c57f68c9353ad4eda79f37ad26b5208828ac25ba4d2ea59ff30cf3
+  data.tar.gz: bfc81ca54385937d13a69cd6a6e38aa303dd146fc28c98791357b62e80577def
 SHA512:
-  metadata.gz: 68f92e9f3b4e7d0e5249e7df03f97a9e133ab51274117b2538b8672bf8e6221c6c8d2130679395ff0e1e57ee18f6e0bf4c321fe8ce034e0fe14c53ca37150e65
-  data.tar.gz: 1185695c5f0bc3c3d093cb7984c2947ec1ef2f4be737586f73ae058d2266ba90121d9d48b37608993877784eee729010867c15754309584beafe88c01d6b5836
+  metadata.gz: f5bb0d06cefb48b94ea846f24838f8cc90a915abe1ca7f8806b2f0d8f4ec4a60edc5a25c33f65d90eb81603dd70a3390f38d27e8a036ccbd70bf0a94dcc47006
+  data.tar.gz: cc120cf28d4ba8c4f8e8bb85c0a26245c9f1027e113d2a42aa232dafa0ffc0f903ce2ae8f17f3d22f7fd0aa7aa79581bd30dac596dfb7c060cbbec0ecf6d2275

data/lib/function.rb

@@ -1,5 +1,25 @@
 require "simplerubysteps"
 
+if ENV["QUEUE"]
+  require "aws-sdk-sqs"
+  require "json"
+
+  class QueueClient
+    def initialize(sqs_client, queue)
+      @sqs_client = sqs_client
+      @queue = queue
+    end
+
+    def send(data)
+      @sqs_client.send_message(queue_url: @queue, message_body: data.to_json)
+    end
+  end
+
+  $queue_client = QueueClient.new(Aws::SQS::Client.new, ENV["QUEUE"])
+else
+  $queue_client = nil
+end
+
 require "./workflow.rb"
 
 include Simplerubysteps
@@ -10,7 +30,11 @@ def handler(event:, context:)
   puts context.inspect if ENV["DEBUG"]
 
   if event["Token"]
-    $sm.states[ENV["task"].to_sym].perform_action event["Input"], event["Token"]
+    unless $queue_client
+      $sm.states[ENV["task"].to_sym].perform_action event["Input"], event["Token"]
+    else
+      $sm.states[ENV["task"].to_sym].perform_queue_action event["Input"], event["Token"], $queue_client
+    end
   else
     $sm.states[ENV["task"].to_sym].perform_action event["Input"]
   end

data/lib/simplerubysteps/cloudformation.rb

@@ -38,8 +38,11 @@ Resources:
       Runtime: ruby2.7
       Environment:
         Variables:
-<% resource.each do |k, v| %>        
-          <%= k %>: <%= v %>
+<% if resource["queue"] %>
+          QUEUE: !Ref MyQueue<%= index %>        
+<% end %>          
+<% resource["env"].each do |k, v| %>        
+          <%= k %>: <%= v.inspect %>
 <% end %>
   LogGroup<%= index %>:
     Type: AWS::Logs::LogGroup
@@ -68,6 +71,32 @@ Resources:
                   - logs:CreateLogStream
                   - logs:PutLogEvents
                 Resource: arn:aws:logs:*:*:*
+<% if resource["iam_permissions"] %>
+  MyCustomPolicy<%= index %>:
+    Type: AWS::IAM::Policy
+    Properties:
+      PolicyName: custom
+      Roles:
+        - !Ref MyLambdaRole<%= index %>
+      PolicyDocument: <%= resource["iam_permissions"].inspect %>
+<% end %>
+<% if resource["queue"] %>
+  MyQueue<%= index %>:
+    Type: AWS::SQS::Queue
+  MyQueuePolicy<%= index %>:
+    Type: AWS::IAM::Policy
+    Properties:
+      PolicyName: queue
+      Roles:
+        - !Ref MyLambdaRole<%= index %>
+      PolicyDocument: 
+        Version: '2012-10-17'
+        Statement:
+          - Effect: Allow
+            Action:
+              - 'sqs:SendMessage'
+            Resource: !GetAtt MyQueue<%= index %>.Arn
+<% end %>
 <% end %>
 <% end %>
   
@@ -135,6 +164,16 @@ Outputs:
   StepFunctionsRoleARN:
     Value: !GetAtt StepFunctionsRole.Arn
 <% end %>    
+
+<% if resources[:functions] %>
+<% resources[:functions].each_with_index do |resource, index| %>
+<% if resource["queue"] %>
+  <%= resource["env"]["task"] %>Queue:
+    Value: !Ref MyQueue<%= index %>
+<% end %>  
+<% end %>    
+<% end %>    
+
 YAML
 
   def self.cloudformation_yaml(resources)

data/lib/simplerubysteps/dsl.rb

@@ -28,6 +28,23 @@ module Simplerubysteps
     $tasks.pop
   end
 
+  def sqs_callback(name)
+    t = $sm.add Callback.new(name)
+    t.queue = true
+
+    $tasks.last.next = t if $tasks.last
+
+    $tasks.push t
+    action do |input, token, queue_client|
+      queue_client.send({
+        input: input,
+        token: token,
+      })
+    end
+    yield if block_given?
+    $tasks.pop
+  end
+
   def action(&action_block)
     $tasks.last.action &action_block
   end
@@ -55,6 +72,10 @@ module Simplerubysteps
     choice.default = state
   end
 
+  def iam_permissions(permissions)
+    $tasks.last.iam_permissions = permissions
+  end
+
   def choice(name)
     t = $sm.add Choice.new(name)
 

data/lib/simplerubysteps/model.rb

@@ -37,7 +37,11 @@ module Simplerubysteps
       states.each do |name, state|
         if state.is_a? Task or state.is_a? Callback
           data.push({
-            task: name,
+            env: {
+              task: name,
+            },
+            iam_permissions: state.iam_permissions,
+            queue: ((state.is_a? Callback) ? state.queue : nil),
           })
         end
       end
@@ -77,6 +81,8 @@ module Simplerubysteps
   end
 
   class Task < State
+    attr_accessor :iam_permissions
+
     def initialize(name)
       super
       @dict[:Type] = "Task"
@@ -115,6 +121,9 @@ module Simplerubysteps
   end
 
   class Callback < State
+    attr_accessor :iam_permissions
+    attr_accessor :queue
+
     def initialize(name)
       super
       @dict[:Type] = "Task"
@@ -136,6 +145,10 @@ module Simplerubysteps
     def perform_action(input, token)
       @action_block.call(input, token) if @action_block
     end
+
+    def perform_queue_action(input, token, queue_client)
+      @action_block.call(input, token, queue_client) if @action_block
+    end
   end
 
   class ChoiceItem

data/lib/simplerubysteps/tool.rb

@@ -402,6 +402,25 @@ module Simplerubysteps
       response
     end
 
+    def stack_output(version, optional_output)
+      stack = nil
+      if version
+        stack = versioned_stack_name_from_current_dir(version)
+      else
+        stack = most_recent_stack_with_prefix unversioned_stack_name_from_current_dir
+      end
+      raise "State Machine is not deployed" unless stack
+
+      current_stack_outputs = stack_outputs(stack)
+      raise "State Machine is not deployed" unless current_stack_outputs
+
+      if optional_output
+        puts current_stack_outputs[optional_output]
+      else
+        puts current_stack_outputs.to_json
+      end
+    end
+
     def start(wait, input, version)
       stack = nil
       if version
@@ -539,6 +558,22 @@ module Simplerubysteps
             options[:token] = value
           end
 
+          opts.on("-h", "--help", "Display this help message") do
+            puts opts
+            exit
+          end
+        end,
+        "stack" => OptionParser.new do |opts|
+          opts.banner = "Usage: #{$0} stack [options]"
+
+          opts.on("--output VALUE", "Stack output") do |value|
+            options[:output] = value
+          end
+
+          opts.on("--version VALUE", "fix version (\"latest\" per default)") do |value|
+            options[:version] = value
+          end
+
           opts.on("-h", "--help", "Display this help message") do
             puts opts
             exit
@@ -587,6 +622,8 @@ module Simplerubysteps
         log options[:extract_pattern], options[:version]
       elsif options[:command] == "task-success"
         send_task_success options[:token], options[:input]
+      elsif options[:command] == "stack"
+        stack_output options[:version], options[:output]
       elsif options[:command] == "destroy"
         if options[:destroy_all]
           destroy(nil)

data/lib/simplerubysteps/version.rb

@@ -1,3 +1,3 @@
 module Simplerubysteps
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplerubysteps
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Christian Tschenett