opswalrus 1.0.95 → 1.0.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95840cd4d5d5c4e6931039eb2fa780183c17a6c88fde247f8d425855d0a2ff0e
-  data.tar.gz: 97ba07f54f39a995982edd6f0ac6497d22b6c3063763379d06a4a9294620b583
+  metadata.gz: ccf8e333c2a08306ce5afc14a557c69fe01d8681ffeb5e3957b80b09b68bcafa
+  data.tar.gz: b8d586b564c368d7e055746c515c7ea5883765b4a5ca3a9d389f89cd04e06e2c
 SHA512:
-  metadata.gz: cc97ad6aa85c13f9fc990d57754e6930464c7a7a4379bb7342ae73ac9cbd75ceb5fb8e9311b28dbdfd896b90b7e0fb068398ce9868e22b35f689611a1f24079d
-  data.tar.gz: 74f423605ce4dbe496c839fa93fed03cf6ae7c49bbbe12fa655b7bfe187af1221d007263819f9cce0cb1f222ee15c37787aff2492a3737bab281b9dff87ac23f
+  metadata.gz: 2d7a74e6e3872014452eaa8a19203e1da2b81c9af00c9a6e5f0499caff2a3309f18af2122e00097e7276d80bcd89fb937ab3de7e3b01373187611387e0e23b38
+  data.tar.gz: 5b24d54d03bbb5f9bdd03f2d5ddd1644f94819e54803b6d51f5812f5a8758c31f24a58b273c1d42600f00788c0b4e5777e8e3204a8c3a061e10e532c5a150ac9

data/Gemfile.lock

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

data/lib/opswalrus/_bootstrap.ops

@@ -1,5 +1,7 @@
 # ssh_noprep in: :sequence do
-ssh_noprep do
+host_to_value_map = ssh_noprep do
   puts "Bootstrapping #{to_s} (alias=#{self.alias})"
   _bootstrap_host(true)
 end
+
+host_to_value_map.transform_keys(&:to_s)

data/lib/opswalrus/_reboot.ops

@@ -10,7 +10,7 @@ timeout = params.timeout.integer!(default: 300)
 
 delay = 1 if delay < 1
 
-ssh_noprep in: :sequence do
+host_to_value_map = ssh_noprep in: :sequence do
 # ssh_noprep do
 
   # survey of command options:
@@ -62,3 +62,5 @@ ssh_noprep in: :sequence do
   # }
   reboot(delay: delay, sync: sync, timeout: timeout)
 end
+
+host_to_value_map.transform_keys(&:to_s)

data/lib/opswalrus/_run_remote.ops

@@ -2,9 +2,11 @@ params:
   ops_file: OpsFile
   operation_kv_args: array string
 ...
-ssh in: :sequence do
+host_to_value_map = ssh in: :sequence do
 # ssh_noprep do
   # puts params.stringify_keys!
   # desc "Running `#{params.ops_file.ops_file_path} #{params.operation_kv_args.join(' ')}` on #{to_s} (alias=#{self.alias})"
   _invoke_remote(params.ops_file, *params.operation_kv_args)
 end
+
+host_to_value_map.transform_keys(&:to_s)

data/lib/opswalrus/_shell.ops

@@ -1,9 +1,11 @@
 params:
   command: string
 ...
-ssh_noprep in: :sequence do
+host_to_value_map = ssh_noprep in: :sequence do
 # ssh_noprep do
   command = params.command
   desc "Running `#{command}` on #{to_s} (alias=#{self.alias})"
   shell(command)
 end
+
+host_to_value_map.transform_keys(&:to_s)

data/lib/opswalrus/app.rb

@@ -231,7 +231,10 @@ module OpsWalrus
       result = op.run([], params_json_hash: params)
       # puts "result class=#{result.class}"
       exit_status = result.exit_status
-      stdout = JSON.pretty_generate(result.value)
+      # when we are using the shell method
+      # puts result.value.class   # EasyNavProxy
+      # puts result.value         # Hash looking object
+      stdout = JSON.pretty_generate(result.value.to_h)
       output = if exit_status == 0
         Style.green(stdout)
       else

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/host.rb

@@ -178,7 +178,7 @@ module OpsWalrus
             # 1. Net::SSH::Disconnect < Net::SSH::Exception with message: "connection closed by remote host"
             # 2. Errno::ECONNRESET < SystemCallError with message: "Connection reset by peer"
             # 3. Errno::ECONNREFUSED < SystemCallError with message: "Connection refused - connect(2) for 192.168.56.10:22"
-          rescue Net::SSH::Disconnect, Errno::ECONNRESET, Errno::ECONNREFUSED => e
+          rescue Net::SSH::Disconnect, Net::SSH::ConnectionTimeout, Errno::ECONNRESET, Errno::ECONNREFUSED => e
             # noop; we expect these while we're trying to reconnect
           rescue => e
             puts "#{e.class} < #{e.class.superclass}"

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
 
 
@@ -109,6 +118,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 e.class
             App.instance.error e.message
@@ -178,6 +189,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 +224,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

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/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.95"
+  VERSION = "1.0.97"
 end

metadata

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