jackal-cfn 0.2.18 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d68462a480bb426c377656d7bc2ba63725dd1e61
-  data.tar.gz: 35b702d77313eaead8aac1d61e66ddbdbfb55f5c
+  metadata.gz: bda5713d227f3483f95292f4c1d5637d2108e487
+  data.tar.gz: 64a6507a873182488b9a749b31158cb893441fd1
 SHA512:
-  metadata.gz: a49947efa919dc54ded09b699239054a7648747b474d2317ae7bef30f82a980c2a06ec6274462956abbbb4824c56d62502365f3368bc9984230a01b789a857fd
-  data.tar.gz: 0012138672f9a8c7eaccadba908166d0a053b441c292f11c6fa4de86b9caf1189efa8fa2af68ef72956f93208a2900718d5365114ee091570f10da4f06b61533
+  metadata.gz: 66d968cd6e691ec841d2cbdd45bbfc9631db91250ef1b26e93d6f280f58b01c63adbdbd3899762b8b3e11a8998c2b9aab0b2bfd2cf489b103be5194ebb2c4165
+  data.tar.gz: f3695b27166715d0cb32da79f4c13e1ae1b5ee7c474c211c123bb791aed6d1f39625fb45f1187fbd9c1906ac6b9062937575f5b5aec157e4dad07a602cfaf9ba

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.2.20
+* [enhancement] Allow raw result removal from OrchestrationUnit resource
+
 # v0.2.18
 * [feature] Add OrchestrationUnit resource
 

data/README.md

@@ -336,28 +336,31 @@ Resource Usage:
     "Env": {
       "CUSTOM_ENV_VARS": "FOR_COMMAND"
     },
+    "RawResult": true,
     "OnCreate": {
       "Exec": "STRING_COMMAND",
       "ExecZip": "REMOTE_URL_TO_ZIP",
       "Env": {
         "CUSTOM_ENV_VARS": "FOR_COMMAND"
-      }
+      },
+      "RawResult": true
     },
     "OnUpdate": {
       "Exec": "STRING_COMMAND",
       "ExecZip": "REMOTE_URL_TO_ZIP",
       "Env": {
         "CUSTOM_ENV_VARS": "FOR_COMMAND"
-      }
+      },
+      "RawResult": true
     },
     "OnDelete": {
       "Exec": "STRING_COMMAND",
       "ExecZip": "REMOTE_URL_TO_ZIP",
       "Env": {
         "CUSTOM_ENV_VARS": "FOR_COMMAND"
-      }
-    },
-
+      },
+      "RawResult": true
+    }
   }
 }
 ```
@@ -374,7 +377,7 @@ If command result is a non-JSON value:
 
 ```json
 {
-  "OrchestrationUnitValue": "RESULT_OF_COMMAND"
+  "OrchestrationUnitResult": "RESULT_OF_COMMAND"
 }
 ```
 
@@ -383,7 +386,7 @@ If the result of the command is a JSON value (for example `{"MyKey": "MyValue"}`
 ```json
 {
   "MyKey": "MyValue",
-  "OrchestrationUnitValue": "{\"MyKey\": \"MyValue\"}"
+  "OrchestrationUnitResult": "{\"MyKey\": \"MyValue\"}"
 }
 ```
 

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

@@ -12,31 +12,38 @@ module Jackal
     #         "OnCreate": {
     #           "Exec": "SHELL_COMMAND",
     #           "ExecZip": "DOWNLOAD_URI",
+    #           "RawResult": true,
     #           "Env": {
     #           }
     #         },
     #         "OnUpdate": {
     #           "Exec": "SHELL_COMMAND",
     #           "ExecZip": "DOWNLOAD_URI",
+    #           "RawResult": true,
     #           "Env": {
     #           }
     #         },
     #         "OnDelete": {
     #           "Exec": "SHELL_COMMAND",
     #           "ExecZip": "DOWNLOAD_URI",
+    #           "RawResult": true,
     #           "Env": {
     #           }
     #         },
     #         "Exec": "SHELL_COMMAND",
     #         "ExecZip": "DOWNLOAD_URI",
     #         "Env": {
-    #         }
+    #         },
+    #         "RawResult": true
     #       }
     #     }
     #   }
     #
     class OrchestrationUnit < Jackal::Cfn::Resource
 
+      # Max result size
+      MAX_RESULT_SIZE = 4096
+
       # Execute orchestration unit
       #
       # @param message [Carnivore::Message]
@@ -124,11 +131,13 @@ module Jackal
             result[:stop_time] = Time.now.to_i
             result[:exit_code] = process.exit_code
             stdout.rewind
-            # TODO: size check
-            result[:content] = stdout.read
+            if(stdout.size > MAX_RESULT_SIZE)
+              warn "Command result greater than allowed size: #{stdout.size} > #{MAX_RESULT_SIZE}"
+            end
+            result[:content] = stdout.readpartial(0, MAX_RESULT_SIZE)
             if(process.exit_code != 0)
               stderr.rewind
-              result[:error_message] = stderr.read
+              result[:error_message] = stderr.readpartial(0, MAX_RESULT_SIZE)
             end
           end
           if(result[:exit_code] == 0)
@@ -136,6 +145,9 @@ module Jackal
             begin
               j_result = MultiJson.load(result[:content])
               response['Data'] = j_result.merge(response['Data'])
+              unless(unit[:raw_result])
+                response['Data'].delete('OrchestrationUnitResult')
+              end
             rescue MultiJson::ParseError => e
               debug 'Command result not JSON data'
             end
@@ -158,7 +170,7 @@ module Jackal
         base_key = "on_#{request_type.to_s.downcase}"
         result = Smash.new
         if(direct_unit = parameters[base_key])
-          [:exec, :exec_zip, :env].each do |p_key|
+          [:exec, :exec_zip, :env, :raw_result].each do |p_key|
             if(direct_unit[p_key])
               result[p_key] = direct[p_key]
             end
@@ -178,6 +190,9 @@ module Jackal
             result[:env] = parameters[:env]
           end
         end
+        unless(result.key?('raw_result'))
+          result[:raw_result] = parameters.fetch('raw_result', true)
+        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.18')
+    VERSION = Gem::Version.new('0.2.20')
   end
 end

metadata

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