opswalrus 1.0.90 → 1.0.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be30907e45b6057c4144c751d217cbf29257467a43a774bb8af77aa3800e57ee
-  data.tar.gz: 64cf47f93ca059c651a7d7d18d2ce413ff777f9227919010113775bfbf19abe4
+  metadata.gz: 12092a91a60682fa8bf763b91fcc872428f770204623883e5e4ede606facaec9
+  data.tar.gz: 0c6eab4a21a4dcaa665cae384e45ad5dbdf49be909bcd026838ea67017c006d5
 SHA512:
-  metadata.gz: 99e694d84109d972405d1a261db3a87c20c1bf5c61ea1fb02404602f4010e4e0b5fa7ff48f891ae4951aabfd835034f26d491413c3a8866a5b87dd2e15d269f9
-  data.tar.gz: bb839633cd249d2d4144c63665035b56800014563fef80db45f38a15952f872dca6e8a3925c39be4759964d9d31fcb36a2e22f5d3994cc39dcc11b3db2080451
+  metadata.gz: b96e1b0f743884e7e57830716d36e207d00cc9864391a5df41c8cde0eaf22dc53e9f43a7733401c1cf60f2405aac527e0569e1da8355e1b6b30e81659bd8a0e8
+  data.tar.gz: 8b219159bdf7cffb9b8fe7e3f75ad5d07c727647370b4a0d16285505eb376373636b8de09ad3e86da651d77ae4b2ac17a70c91affd75352c6356bb0aec085194

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.90)
+    opswalrus (1.0.92)
       activesupport (~> 7.0)
       bcrypt_pbkdf (~> 1.1)
       binding_of_caller (~> 1.0)

data/lib/opswalrus/app.rb

@@ -320,11 +320,7 @@ module OpsWalrus
           when Invocation::Success
             result.value
           when Invocation::Error
-            {
-              error_type: result.value.class,
-              error: result.value,
-              backtrace: result.value.backtrace.take(10).join("\n")
-            }
+            result.serialize_error
           end
           io.puts JSON.pretty_generate(obj)
           io.string

data/lib/opswalrus/errors.rb

@@ -2,6 +2,9 @@ module OpsWalrus
   class Error < StandardError
   end
 
+  class InvocationError < Error
+  end
+
   class SymbolResolutionError < Error
   end
 end

data/lib/opswalrus/invocation.rb

@@ -215,7 +215,11 @@ module OpsWalrus
       retval = JSON.parse(json_string)
       case retval
       when Hash
-        retval.with_indifferent_access.easynav
+        if retval["type"] == 'Invocation::Error'
+          raise InvocationError.new("#{retval["error_type"]}: #{retval["error"]}#{retval["backtrace"] && "\n  Backtrace: #{retval['backtrace']}"}")
+        else
+          retval.with_indifferent_access.easynav
+        end
       when Array
         retval.easynav
       else

data/lib/opswalrus/operation_runner.rb

@@ -86,17 +86,17 @@ module OpsWalrus
           Invocation::Success.new(ruby_script_return)
         end
       rescue SSHKit::Command::Failed => e
-        App.instance.error "[!] Command failed: #{e.message}"
+        App.instance.error "Runtime error, command failed: #{e.message}"
         Invocation::Error.new(e)
       rescue Error => e
         # puts "OperationRunner#run - #{Time.now.strftime('%s%L')}"
-        App.instance.error "Error: Ops script crashed."
+        App.instance.error "Runtime error: Ops script crashed."
         App.instance.error e.message
         App.instance.error e.backtrace.take(10).join("\n")
         Invocation::Error.new(e)
       rescue => e
         # puts "OperationRunner#run - #{Time.now.strftime('%s%L')}"
-        App.instance.error "Unhandled Error: Ops script crashed."
+        App.instance.error "Unhandled runtime error: Ops script crashed."
         App.instance.error e.class
         App.instance.error e.message
         App.instance.error e.backtrace.take(10).join("\n")

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -40,6 +40,14 @@ module OpsWalrus
       def initialize(value, exit_status = 1)
         super(value, exit_status == 0 ? 1 : exit_status)
       end
+      def serialize_error
+        {
+          type: "Invocation::Error",
+          error_type: value.class.name,
+          error: value,
+          backtrace: value.is_a?(Exception) ? value.backtrace.take(10).join("\n") : nil,
+        }
+      end
       def failure?
         true
       end
@@ -170,10 +178,11 @@ module OpsWalrus
             App.instance.error "[!] The host '#{host}' doesn't accept password authentication method."
           rescue Errno::EHOSTUNREACH => e
             App.instance.error "[!] The host '#{host}' is unreachable"
-          rescue => e
-            App.instance.error e.class
-            App.instance.error e.message
-            App.instance.error e.backtrace.join("\n")
+          # rescue => e
+          #   App.instance.error "[!] Command failed:"
+          #   App.instance.error e.class
+          #   App.instance.error e.message
+          #   App.instance.error e.backtrace.join("\n")
           ensure
             host.clear_ssh_session
           end

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.90"
+  VERSION = "1.0.92"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.90
+  version: 1.0.92
 platform: ruby
 authors:
 - David Ellis