jackal-cfn 0.2.26 → 0.2.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e0eb97177871e4d5e59799e6dcd6348e3f37f82
-  data.tar.gz: b965abfa8ca1b3a6bfda081d8db644d8591699d4
+  metadata.gz: 088e25e5d30d7eb4a390ca828fab69c6975d064f
+  data.tar.gz: 16fddf96b436841f9a527fa7391633feb6562b37
 SHA512:
-  metadata.gz: 1dddef4c1cca5592238e40fcc0a31bbcf95d1ff6a43ad1da9542306017c91983bc6f21d82666f83bc421bdf64bcf5f0f790cda7d09446501575f42e03ec6cede
-  data.tar.gz: 02f44b55eb33008fc49d28166ccc083db25b94858dc9981c3ebaba96c12205095d6d3eb0880aefb658e3377ef507e0700f18f381b1552644e03a6e9aeee7b6e5
+  metadata.gz: 8e8ec86af5481f38ba6325abcd606de0d6222d39068df53e71da0ca1bc9e398ed51b3d0933de286dd7a2ab4ae10513848b0b3521cc52e83537a557d5820c2815
+  data.tar.gz: b819b5eb2f5af7b4c48db3362a706e5b31866a3edc81de7d422eb3a916f73362452331718d9ff78eda94c89ee21db0bac981f8492398b71997e9bfcc1a1a4b6d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.2.28
+* [fix] Break out of command loop at correct context in OrchestrationUnit
+* [enhancement] Reduce maximum allowed size of result included within response in OrchestrationUnit
+* [enhancement] Add keepalive while OrchestrationUnit is processed
+* [enhancement] Add conditional support to unit execution in OrchestrationUnit
+
 # v0.2.26
 * [fix] Update readpartial usage in OrchestrationUnit
 * [enhancement] Add debug output to OrchestrationUnit execution

data/README.md

@@ -337,13 +337,17 @@ Resource Usage:
       "CUSTOM_ENV_VARS": "FOR_COMMAND"
     },
     "RawResult": true,
+    "OnlyIf": "STRING_COMMAND",
+    "NotIf": "STRING_COMMAND",
     "OnCreate": {
       "Exec": "STRING_COMMAND",
       "ExecZip": "REMOTE_URL_TO_ZIP",
       "Env": {
         "CUSTOM_ENV_VARS": "FOR_COMMAND"
       },
-      "RawResult": true
+      "RawResult": true,
+      "OnlyIf": "STRING_COMMAND",
+      "NotIf": "STRING_COMMAND"
     },
     "OnUpdate": {
       "Exec": "STRING_COMMAND",
@@ -351,7 +355,9 @@ Resource Usage:
       "Env": {
         "CUSTOM_ENV_VARS": "FOR_COMMAND"
       },
-      "RawResult": true
+      "RawResult": true,
+      "OnlyIf": "STRING_COMMAND",
+      "NotIf": "STRING_COMMAND"
     },
     "OnDelete": {
       "Exec": "STRING_COMMAND",
@@ -359,7 +365,9 @@ Resource Usage:
       "Env": {
         "CUSTOM_ENV_VARS": "FOR_COMMAND"
       },
-      "RawResult": true
+      "RawResult": true,
+      "OnlyIf": "STRING_COMMAND",
+      "NotIf": "STRING_COMMAND"
     }
   }
 }

data/lib/jackal-cfn/resource/orchestration_unit.rb

@@ -14,27 +14,36 @@ module Jackal
     #           "ExecZip": "DOWNLOAD_URI",
     #           "RawResult": true,
     #           "Env": {
-    #           }
+    #           },
+    #           OnlyIf": "SHELL_COMMAND",
+    #           NotIf": "SHELL_COMMAND"
     #         },
     #         "OnUpdate": {
     #           "Exec": "SHELL_COMMAND",
     #           "ExecZip": "DOWNLOAD_URI",
     #           "RawResult": true,
     #           "Env": {
-    #           }
+    #           },
+    #           },
+    #           OnlyIf": "SHELL_COMMAND",
+    #           NotIf": "SHELL_COMMAND"
     #         },
     #         "OnDelete": {
     #           "Exec": "SHELL_COMMAND",
     #           "ExecZip": "DOWNLOAD_URI",
     #           "RawResult": true,
     #           "Env": {
-    #           }
+    #           },
+    #           OnlyIf": "SHELL_COMMAND",
+    #           NotIf": "SHELL_COMMAND"
     #         },
     #         "Exec": "SHELL_COMMAND",
     #         "ExecZip": "DOWNLOAD_URI",
     #         "Env": {
     #         },
-    #         "RawResult": true
+    #         "RawResult": true,
+    #         "OnlyIf": "SHELL_COMMAND",
+    #         "NotIf": "SHELL_COMMAND"
     #       }
     #     }
     #   }
@@ -42,7 +51,7 @@ module Jackal
     class OrchestrationUnit < Jackal::Cfn::Resource
 
       # Max result size
-      MAX_RESULT_SIZE = 4096
+      MAX_RESULT_SIZE = 2048
 
       # Execute orchestration unit
       #
@@ -54,9 +63,18 @@ module Jackal
           parameters = rekey_hash(properties[:parameters])
           cfn_response = build_response(cfn_resource)
           unit = unit_for(cfn_resource[:request_type], parameters)
-          working_dir = create_working_directory(payload[:id])
-          run_unit(unit, working_dir, cfn_response)
-          FileUtils.rm_rf(working_dir)
+          if(unit_runnable?(unit))
+            working_dir = create_working_directory(payload[:id])
+            keepalive = every(10){ message.touch! }
+            begin
+              run_unit(unit, working_dir, cfn_response)
+            ensure
+              keepalive.cancel
+            end
+            FileUtils.rm_rf(working_dir)
+          else
+            debug "Received unit for #{message} is not runnable due to conditions! #{unit}"
+          end
           respond_to_stack(cfn_response, cfn_resource[:response_url])
           job_completed(:jackal_cfn, payload, message)
         end
@@ -78,6 +96,57 @@ module Jackal
         dir_path
       end
 
+      # Determine if unit should be run based on conditional
+      # fields
+      #
+      # @param unit [Hash]
+      # @return [TrueClass, FalseClass]
+      def unit_runnable?(unit)
+        result = true
+        conditionals = Smash[
+          [:only_if, :not_if].map do |conditional_key|
+            stdout = process_manager.create_io_tmp(Carnivore.uuid, 'stdout')
+            stderr = process_manager.create_io_tmp(Carnivore.uuid, 'stderr')
+            if(unit[conditional_key])
+              debug "Executing conditional `#{conditional_key}`: #{unit[conditional_key]}"
+              conditional_result = false
+              process_manager.process(unit.hash, unit[conditional_key]) do |process|
+                process.io.stdout = stdout
+                process.io.stderr = stderr
+                process.cwd = '/tmp'
+                if(unit[:env])
+                  debug "Custom environment defined: #{unit[:env]}"
+                  process.environment.replace(unit[:env])
+                end
+                process.leader = true
+                process.start
+                begin
+                  process.poll_for_exit(config.fetch(:max_execution_time, 60))
+                  debug "Result of conditional `#{conditional_key}`: #{process.exit_code}"
+                  stdout.rewind
+                  stderr.rewind
+                  debug "Result of conditional `#{conditional_key}` output STDOUT: #{stdout.read}"
+                  debug "Result of conditional `#{conditional_key}` output STDERR: #{stderr.read}"
+                  conditional_result = process.exit_code == 0
+                rescue ChildProcess::TimeoutError
+                  process.stop
+                  conditional_result = false
+                end
+              end
+              [conditional_key, conditional_result]
+            end
+          end.compact
+        ]
+        if(conditionals.key?(:not_if) && conditionals.key?(:only_if))
+          result = !conditionals[:not_if] && conditionals[:only_if]
+        elsif(conditionals.key?(:not_if))
+          result = !conditionals.key?(:not_if)
+        elsif(conditionals.key?(:only_if))
+          result = conditionals[:only_if]
+        end
+        result
+      end
+
       # Fetch compressed zip file from remote location and unpack into
       # provided working directory
       #
@@ -128,9 +197,8 @@ module Jackal
               process.leader = true
               process.start
               begin
-                process.poll_for_exit(config.fetch(:max_execution_time, 60))
+                process.poll_for_exit(config.fetch(:max_execution_time, 500))
                 result[:exit_code] = process.exit_code
-                break if result[:exit_code] != 0
                 debug "Execution of command successful - #{exec_command}"
               rescue ChildProcess::TimeoutError
                 process.stop
@@ -138,17 +206,18 @@ module Jackal
                 result[:exit_code] = process.exit_code
               end
             end
+            break if result[:exit_code] != 0
           end
           result[:stop_time] = Time.now.to_i
           stdout.rewind
           if(stdout.size > MAX_RESULT_SIZE)
             warn "Command result greater than allowed size: #{stdout.size} > #{MAX_RESULT_SIZE}"
           end
-          result[:content] = stdout.readpartial(MAX_RESULT_SIZE)
+          result[:content] = stdout.size > 0 ? stdout.readpartial(MAX_RESULT_SIZE) : ''
           if(result[:exit_code] != 0)
             debug "Execution of unit failed - #{unit}"
             stderr.rewind
-            result[:error_message] = stderr.readpartial(MAX_RESULT_SIZE)
+            result[:error_message] = stderr.size > 0 ? stderr.readpartial(MAX_RESULT_SIZE) : ''
             stderr.rewind
             stdout.rewind
             debug "Failed unit STDOUT: #{stdout.read}"
@@ -184,9 +253,10 @@ module Jackal
         base_key = "on_#{request_type.to_s.downcase}"
         result = Smash.new
         if(direct_unit = parameters[base_key])
-          [:exec, :exec_zip, :env, :raw_result].each do |p_key|
+          direct_unit = rekey_hash(direct_unit)
+          [:exec, :exec_zip, :env, :raw_result, :only_if, :not_if].each do |p_key|
             if(direct_unit[p_key])
-              result[p_key] = direct[p_key]
+              result[p_key] = direct_unit[p_key]
             end
           end
         end
@@ -207,6 +277,11 @@ module Jackal
         unless(result.key?('raw_result'))
           result[:raw_result] = parameters.fetch('raw_result', true)
         end
+        [:only_if, :not_if].each do |conditional_key|
+          if(!result.key?(conditional_key) && parameters.key?(conditional_key))
+            result[conditional_key] = parameters[conditional_key]
+          end
+        end
         result[:env] ||= Smash.new
         result[:env]['CFN_REQUEST_TYPE'] = request_type.to_s.upcase
         result

data/lib/jackal-cfn/version.rb

@@ -1,6 +1,6 @@
 module Jackal
   module Cfn
     # Current version
-    VERSION = Gem::Version.new('0.2.26')
+    VERSION = Gem::Version.new('0.2.28')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jackal-cfn
 version: !ruby/object:Gem::Version
-  version: 0.2.26
+  version: 0.2.28
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jackal