opswalrus 1.0.53 → 1.0.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 007f1ac465143fdd629539509b94a8bf7230b034817526d1265768f97eae0786
-  data.tar.gz: 9d0cc607ce7c9fcd06d9e402254b3eb5a75a68687a1ee485aa915b3cd488e2b6
+  metadata.gz: 50b82ac565a56bb1585653a90c4c0c09b06ba3490c3121da8717e9bdf085f48b
+  data.tar.gz: f38e88fa6db2769cd7ae59291ce28f337c1ca8a9bcd00509f8ccc00cd47b0890
 SHA512:
-  metadata.gz: 83b67721de074efa3ad368ed21ec469d40928351c4ccc6f32d530e3bbda2cdd81b62f2b72692a4796b74d1efb7bbbfa31721db0eefb93864069dc277f8aa66fe
-  data.tar.gz: b54d628df099de1f4c2eea591b86449b5fd254d495ccae38f89dd95f5d1137171aaf9e6c1bd2023613f1c33561b5e49bd12d5696d6bc197bc065ead0a79aed1d
+  metadata.gz: 751dfb54af8521b4e33a45cd8d38c0aa0b2c433006bd7030e412605584ffb4b7cba44d49fe26b64c7c2c4d0f2cea08a53cd02aea40c1d2341de7d20fbbe1ac35
+  data.tar.gz: a52102d80e0b0f966d7b357173f87cafcb6ddcfdf0e9d0b3aa369e115c5b7da03ef0ce1fb6ba8d25486ac296e2f3e06dc717ab0fe61f96cf3c904b0a14b3d87c

data/Gemfile.lock

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

data/lib/opswalrus/_run_remote.ops

@@ -7,6 +7,5 @@ ssh in: :sequence do
   puts params.stringify_keys!
   desc "Running `#{params.ops_file.ops_file_path} #{params.operation_kv_args.join(' ')}` on #{to_s} (alias=#{self.alias})"
   # run_ops(ops_command, ops_command_options = nil, command_arguments, in_bundle_root_dir: true, ops_prompt_for_sudo_password: false)
-  puts self.inspect
-  self._invoke_remote(params.ops_file, *params.operation_kv_args)
+  _invoke_remote(params.ops_file, *params.operation_kv_args)
 end

data/lib/opswalrus/bundler.rb

@@ -56,7 +56,11 @@ module OpsWalrus
     # end
 
     def update()
-      delete_pwd_bundle_directory
+      # delete_pwd_bundle_directory   # this was causing problems when we do: ops run -r -b ... because a dynamic package reference was being
+                                      # downloaded to the bundle dir, and then update was being called afterward, which was blowing away
+                                      # the entire bundle dir, so when the bundle dir was copied to the remote host, the ops file being
+                                      # invoked was not present on the remote host, since it had never been copied over as a result
+                                      # of the bundle dir being blown away after the dynamic package reference had been downloaded
       ensure_pwd_bundle_directory_exists
 
       package_yaml_files = pwd.glob("./**/package.yaml") - pwd.glob("./**/#{BUNDLE_DIR}/**/package.yaml")
@@ -204,6 +208,8 @@ module OpsWalrus
 
       destination_package_path ||= dynamic_package_path_for_git_package(package_url, version)
 
+      App.instance.debug "Download git package #{package_url} version #{version.inspect} to #{destination_package_path}"
+
       return destination_package_path if destination_package_path.exist?
 
       if version
@@ -212,6 +218,8 @@ module OpsWalrus
         ::Git.clone(package_url, destination_package_path, config: ['submodule.recurse=true'])
       end
 
+      App.instance.debug "Downloaded git package #{package_url} version #{version.inspect} to #{destination_package_path}"
+
       destination_package_path
     end
 

data/lib/opswalrus/host.rb

@@ -82,10 +82,9 @@ module OpsWalrus
     end
 
     def _invoke_remote(ops_file, *args, **kwargs)
-      puts "boom"
-      is_invocation_a_call_to_package_in_bundle_dir = true
-      invocation_context = RemoteImportInvocationContext.new(@runtime_env, self, ops_file, is_invocation_a_call_to_package_in_bundle_dir, ops_prompt_for_sudo_password: !!ssh_password)
-      invocation_context._invoke(*args, **kwargs)
+      App.instance.debug "Remove invoke #{ops_file.relative_path_to_app_pwd} on host `#{to_s}` with args:\n  #{args.inspect}\nkwargs:\n  #{kwargs.inspect}"
+
+      RemoteInvocation.new(self, ops_file, ops_prompt_for_sudo_password: !!ssh_password).invoke(*args, **kwargs)
     end
 
     # returns [stdout, stderr, exit_status]

data/lib/opswalrus/invocation.rb

@@ -196,4 +196,62 @@ module OpsWalrus
 
   end
 
+
+
+
+
+  class RemoteInvocation
+    def initialize(host_proxy, ops_file, ops_prompt_for_sudo_password: nil)
+      @host_proxy = host_proxy
+      @ops_file = ops_file
+      @ops_prompt_for_sudo_password = ops_prompt_for_sudo_password
+    end
+
+    def invoke(*args, **kwargs)
+      # when there are args or kwargs, then the method invocation represents an attempt to run an OpsFile on a remote host,
+      # so we want to build up a command and send it to the remote host via HostDSL#run_ops
+      remote_run_command_args = @ops_file.relative_path_to_app_pwd.to_s
+
+      unless args.empty?
+        remote_run_command_args << " "
+        remote_run_command_args << args.join(" ")
+      end
+
+      begin
+        json = JSON.dump(kwargs) unless kwargs.empty?
+        if json
+          # write the kwargs to a tempfile
+          json_kwargs_tempfile = Tempfile.create('ops_invoke_kwargs')
+          json_kwargs_tempfile.write(json)
+          json_kwargs_tempfile.close()   # we want to close the file without unlinking so that we can copy it to the remote host before deleting it
+
+          # upload the kwargs file to the remote host
+          json_kwargs_tempfile_path = json_kwargs_tempfile.path.to_pathname
+          remote_json_kwargs_tempfile_basename = json_kwargs_tempfile_path.basename
+          @host_proxy.upload(json_kwargs_tempfile_path, remote_json_kwargs_tempfile_basename)
+        end
+
+        # invoke the ops command on the remote host to run the specified ops script on the remote host
+        ops_command_options = ""
+        ops_command_options << "--pass" if @ops_prompt_for_sudo_password
+        ops_command_options << " --params #{remote_json_kwargs_tempfile_basename}" if remote_json_kwargs_tempfile_basename
+        retval = if ops_command_options.empty?
+          @host_proxy.run_ops(:run, remote_run_command_args, ops_prompt_for_sudo_password: @ops_prompt_for_sudo_password)
+        else
+          @host_proxy.run_ops(:run, ops_command_options, remote_run_command_args, ops_prompt_for_sudo_password: @ops_prompt_for_sudo_password)
+        end
+
+        retval
+      ensure
+        if json_kwargs_tempfile
+          json_kwargs_tempfile.close rescue nil
+          File.unlink(json_kwargs_tempfile) rescue nil
+        end
+        # todo: make sure this cleanup is present
+        if remote_json_kwargs_tempfile_basename
+          @host_proxy.execute(:rm, "-f", remote_json_kwargs_tempfile_basename)
+        end
+      end
+    end
+  end
 end

data/lib/opswalrus/ops_file.rb

@@ -233,6 +233,13 @@ module OpsWalrus
     #   end
     # end
 
+    # if ops_file_path is /home/david/sync/projects/ops/davidinfra/opswalrus_bundle/pkg_https---github.com-opswalrus-core_version_/file/exists.ops
+    # and the @app.pwd is /home/david/sync/projects/ops/davidinfra
+    # then this returns opswalrus_bundle/pkg_https---github.com-opswalrus-core_version_/file/exists.ops
+    def relative_path_to_app_pwd
+      @ops_file_path.relative_path_from(@app.pwd)
+    end
+
     # "/home/david/sync/projects/ops/ops/core/host/info.ops" => "/home/david/sync/projects/ops/ops/core/host"
     def dirname
       @ops_file_path.dirname

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -48,6 +48,7 @@ module OpsWalrus
 
 
   module OpsFileScriptDSL
+    # we run the block in the context of the host proxy object, s.t. `self` within the block evaluates to the host proxy object
     def ssh_noprep(*args, **kwargs, &block)
       runtime_env = @runtime_env
 
@@ -112,6 +113,7 @@ module OpsWalrus
       results
     end # def ssh
 
+    # we run the block in the context of the host proxy object, s.t. `self` within the block evaluates to the host proxy object
     def ssh(*args, **kwargs, &block)
       runtime_env = @runtime_env
 
@@ -122,7 +124,6 @@ module OpsWalrus
 
       results_lock = Thread::Mutex.new
       results = {}
-      # bootstrap_shell_script = BootstrapLinuxHostShellScript
       # on sshkit_hosts do |sshkit_host|
       SSHKit::Coordinator.new(sshkit_hosts).each(in: kwargs[:in] || :parallel) do |sshkit_host|
         # in this context, self is an instance of one of the subclasses of SSHKit::Backend::Abstract, e.g. SSHKit::Backend::Netssh

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.53"
+  VERSION = "1.0.54"
 end

metadata

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