opswalrus 1.0.94 → 1.0.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1feb628ace7896079569c7182d0d47da191a270f36940ee650066e5e9e5a914a
-  data.tar.gz: c70d205d174e4bfca3ede989cc53952bddd876244ceb3795ea6274a0bdb7a240
+  metadata.gz: 8fb52bd8ac55bffca7f34fc6213c004bc8ccc2e01d0e0682682ce077fe273bcb
+  data.tar.gz: 4613f02bf1f7479eff1ab78ed2c407507f20bb546a8bd005dd469430e38b15ba
 SHA512:
-  metadata.gz: fa9760a94e936e1498bd9cdd763f20fb31f6c15f14407b8e924de3e1a2502b64b26ea0defae96c4729c11d024dff31a0fc4712d7899d1586ac7f82d5fdd0558c
-  data.tar.gz: d55ad916d7f17ae0d82ad0ec531129c1b6a198ff33b4ad257c08975e42c9096367d52b9bad20efcdd8510bc7f6539e68387f89759dd3201f8546fb919b874722
+  metadata.gz: 901644932c68e186a15f94b77e179cf8412f9a791e7981fa79b0a4a035696c80e298aabf2a6ceb362dccec370ee2f63a6e174ffe31bb67c49966b7d296a32baf
+  data.tar.gz: 3291a2be3c530e81bd6a0ad6706c4281de16df914d0d67aa8adc57b842e74c94305ae60c17c5556b06fe70ecc02ea19467cea323542fac9336ac43a813763abc

data/Gemfile.lock

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

data/lib/opswalrus/app.rb

@@ -25,6 +25,7 @@ require_relative "version"
 
 module OpsWalrus
   Style = Pastel.new(enabled: $stdout.tty?)
+  DefaultLookbackWindowCharCount = 2000
 
   class App
     def self.instance(*args)

data/lib/opswalrus/errors.rb

@@ -3,6 +3,10 @@ module OpsWalrus
   end
 
   class RemoteInvocationError < Error
+    def initialize(msg, deserialized_invocation_error_hash)
+      super(msg)
+      @hash = deserialized_invocation_error_hash
+    end
   end
 
   class SymbolResolutionError < Error

data/lib/opswalrus/interaction_handlers.rb

@@ -9,7 +9,7 @@ module OpsWalrus
 
     attr_accessor :input_mappings   # Hash[ String | Regex => (String | Proc) ]
 
-    def initialize(mappings, lookback_window_chars = 2000)
+    def initialize(mappings, lookback_window_chars = DefaultLookbackWindowCharCount)
       @input_mappings = mappings
       @online_matcher = Kleene::NaiveOnlineRegex.new(mappings.keys, lookback_window_chars)
     end
@@ -42,7 +42,7 @@ module OpsWalrus
     # when the given block returns, then the temporary mapping is removed from the interaction handler
     #
     # mapping : Hash[ String | Regex => (String | Proc) ] | Nil
-    def with_mapping(mapping = nil, sudo_password: nil, ops_sudo_password: nil, inherit_existing_mappings: true, lookback_window_chars: 200)
+    def with_mapping(mapping = nil, sudo_password: nil, ops_sudo_password: nil, inherit_existing_mappings: true, lookback_window_chars: DefaultLookbackWindowCharCount)
       new_mapping = inherit_existing_mappings ? @input_mappings.clone : {}
 
       if mapping

data/lib/opswalrus/invocation.rb

@@ -216,7 +216,16 @@ module OpsWalrus
       case retval
       when Hash
         if retval["type"] == 'Invocation::Error'
-          raise RemoteInvocationError.new("Remote Invocation Error:\n  #{retval["error_type"]}: #{retval["error"]}#{retval["backtrace"] && "\n  Backtrace: #{retval['backtrace']}"}")
+          # this structure comes from OpsWalrus::Invocation::Error being serialized in App#print_script_result being called from App#run
+          # {
+          #   type: "Invocation::Error",
+          #   error_variant: self.class.name,
+          #   error_class: value.class.name,
+          #   error: value,
+          #   backtrace: value.is_a?(Exception) ? value.backtrace.take(10).join("\n") : nil,
+          # }
+          # raise RemoteInvocationError.new("Remote Invocation Error:\n  #{retval["error_class"]}: #{retval["error"]}#{retval["backtrace"] && "\n  Backtrace: #{retval['backtrace']}"}")
+          raise RemoteInvocationError.new("Remote Invocation Error:\n  #{retval["error_class"]}: #{retval["error"]}#{retval["backtrace"] && "\n  Backtrace: #{retval['backtrace']}"}", retval)
         else
           retval.with_indifferent_access.easynav
         end

data/lib/opswalrus/operation_runner.rb

@@ -87,20 +87,20 @@ module OpsWalrus
         end
       rescue SSHKit::Command::Failed => e
         App.instance.error "Runtime error, command failed: #{e.message}"
-        Invocation::Error.new(e)
+        Invocation::SshError.new(e)
       rescue Error => e
         # puts "OperationRunner#run - #{Time.now.strftime('%s%L')}"
         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)
+        Invocation::RuntimeError.new(e)
       rescue => e
         # puts "OperationRunner#run - #{Time.now.strftime('%s%L')}"
         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")
-        Invocation::Error.new(e)
+        Invocation::UnhandledError.new(e)
       end
 
       result

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -43,7 +43,8 @@ module OpsWalrus
       def serialize_error
         {
           type: "Invocation::Error",
-          error_type: value.class.name,
+          error_variant: self.class.name,
+          error_class: value.class.name,
           error: value,
           backtrace: value.is_a?(Exception) ? value.backtrace.take(10).join("\n") : nil,
         }
@@ -52,6 +53,14 @@ module OpsWalrus
         true
       end
     end
+    class EarlyExitError < Error
+    end
+    class SshError < Error
+    end
+    class RuntimeError < Error
+    end
+    class UnhandledError < Error
+    end
   end
 
 
@@ -178,6 +187,8 @@ 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 RemoteInvocationError => e
+            results[host] = e
           # rescue => e
           #   App.instance.error "[!] Command failed:"
           #   App.instance.error e.class
@@ -211,7 +222,7 @@ module OpsWalrus
       result = if exit_status == 0
         Invocation::Success.new(nil)
       else
-        Invocation::Error.new(nil, exit_status)
+        Invocation::EarlyExitError.new(message, exit_status)
       end
       throw :exit_now, result
     end
@@ -303,7 +314,7 @@ module OpsWalrus
         if App.instance.dry_run?
           ["", "", 0]
         else
-          sshkit_cmd = @runtime_env.handle_input(input, inherit_existing_mappings: true, lookback_window_chars: 200) do |interaction_handler|
+          sshkit_cmd = @runtime_env.handle_input(input, inherit_existing_mappings: true, lookback_window_chars: DefaultLookbackWindowCharCount) do |interaction_handler|
             # puts "self=#{self.class.superclass}"
             # self is an instance of one of the dynamically defined subclasses of OpsFileScript
             App.instance.debug("OpsFileScriptDSL#shell! cmd=#{cmd} with input mappings #{interaction_handler.input_mappings.inspect} given input: #{input.inspect})")

data/lib/opswalrus/patches.rb

@@ -1,6 +1,7 @@
 require 'active_support'
 require 'active_support/core_ext/hash'
 require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/string'
 require 'json'
 require 'pathname'
 

data/lib/opswalrus/runtime_environment.rb

@@ -267,7 +267,7 @@ module OpsWalrus
 
     # input_mapping : Hash[ String | Regex => String ]
     # sudo_password : String
-    def handle_input(input_mapping, sudo_password: nil, ops_sudo_password: nil, inherit_existing_mappings: true, lookback_window_chars: 200, &block)
+    def handle_input(input_mapping, sudo_password: nil, ops_sudo_password: nil, inherit_existing_mappings: true, lookback_window_chars: DefaultLookbackWindowCharCount, &block)
       @interaction_handler.with_mapping(
         input_mapping,
         sudo_password: sudo_password,

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.94"
+  VERSION = "1.0.96"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.94
+  version: 1.0.96
 platform: ruby
 authors:
 - David Ellis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-17 00:00:00.000000000 Z
+date: 2023-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport