opswalrus 1.0.35 → 1.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afddda8670c4bf29ab120d6f80d89f13d6eaa1764f4068fa8fd9cd33b4e6a4a9
-  data.tar.gz: eeac298ab64e7f77e5e589288fe4a69397d7a321ef3887ac378f25aa3060ffee
+  metadata.gz: ab53631e63fd44c1825e7a38721905420b063e4480ace3cb48c9d5aad922dc14
+  data.tar.gz: aecd03aadaab772dfae1e8379036038ed17e0c57b78c75c178f70c4b3a65afeb
 SHA512:
-  metadata.gz: f904e63bcef6b3eb970bb3ef162186268f6e95371655cab071dcb8a7c0a1c655c1f7ade92be63fe387b676d4af80e2de985909ce7a8a1e6f0a032475041eb4f4
-  data.tar.gz: c2d9efb14e0d063d5861e7cafa2a3a44fbeed4ca07a8e748928bfdf16cdf46dda9aabb08f3f5e259e6fbfc5a5d11ffa2254da58140fbfb40e2146214c8df27ec
+  metadata.gz: af2a6bc851e53a1bee7e2b1d9d7dd57f2f953661223d464f57c7e7e8157b4ab725c9db90cc835380c12c6a9f5438a515e435cf4009e753492c6304e7a3b2a750
+  data.tar.gz: 15fbd461e6c794325bee7def61a517b91c840318348b83e83639c175d3efb5f1a5cbd424b6a8634bfdc20c2b2805af383aee3ce1d7870a1dd222e843ef9ed509

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.35)
+    opswalrus (1.0.37)
       amazing_print (~> 1.5)
       bcrypt_pbkdf (~> 1.1)
       binding_of_caller (~> 1.0)

data/lib/opswalrus/app.rb

@@ -189,8 +189,13 @@ module OpsWalrus
       @sudo_password
     end
 
-    # params must be a string representation of a JSON object: '{}' | '{"key1": ... , ...}'
-    def set_params(params)
+    # params is a string that specifies a file path OR it is a string representation of a JSON object: '{}' | '{"key1": ... , ...}'
+    def set_params(file_path_or_json_string)
+      params = if File.exist?(file_path_or_json_string)
+        File.read(file_path_or_json_string)
+      else
+        file_path_or_json_string
+      end
       json_hash = JSON.parse(params) rescue nil
       json_hash = json_hash.is_a?(Hash) ? json_hash : nil
 

data/lib/opswalrus/cli.rb

@@ -156,11 +156,12 @@ module OpsWalrus
     long_desc 'Run the specified operation found within the specified package'
     arg 'args', :multiple
     command :run do |c|
-      c.flag [:u, :user], desc: "Specify the user that the operation will run as"
       c.switch :pass, desc: "Prompt for a sudo password"
-      c.flag [:p, :params], desc: "JSON string that represents the input parameters for the operation. The JSON string must conform to the params schema for the operation."
       c.switch :script, desc: "Script mode"
 
+      c.flag [:u, :user], desc: "Specify the user that the operation will run as"
+      c.flag [:p, :params], desc: "Either specify a file that contains JSON OR specify a JSON encoded string. In both cases, the JSON represents the runtime arguments (i.e. the params) for the operation. The JSON string must conform to the params schema for the operation being run."
+
       # dry run
       c.switch :noop, desc: "Perform a dry run"
       c.switch :dryrun, desc: "Perform a dry run"
@@ -171,18 +172,17 @@ module OpsWalrus
         $app.set_log_level(log_level)
 
         hosts = global_options[:hosts]
-        tags = global_options[:tags]
-
         $app.set_inventory_hosts(hosts)
+
+        tags = global_options[:tags]
         $app.set_inventory_tags(tags)
 
         user = options[:user]
-        params = options[:params]
-
-        $app.set_params(params)
-
         $app.set_sudo_user(user) if user
 
+        params = options[:params]
+        $app.set_params(params) if params
+
         id_files = global_options[:id]
         id_files = OpsWalrus.env_specified_age_ids if id_files.empty?
 

data/lib/opswalrus/host.rb

@@ -224,11 +224,11 @@ module OpsWalrus
     end
 
     def desc(msg)
-      puts msg.mustache
+      puts msg.mustache(2)
     end
 
     def host_prop(name)
-      @props[name]
+      @props[name] || @default_props[name]
     end
 
   end
@@ -344,11 +344,11 @@ module OpsWalrus
     def write_temp_ssh_keys_if_needed(keys)
       keys.map do |key_file_path_or_in_memory_key_text|
         if key_file_path_or_in_memory_key_text.is_a? SecretRef    # we're dealing with an in-memory key file; we need to write it to a tempfile
-          tempfile = Tempfile.new
+          tempfile = Tempfile.create
           @tmp_ssh_key_files << tempfile
           key_file_contents = @hosts_file.read_secret(key_file_path_or_in_memory_key_text.to_s)
           tempfile.write(key_file_contents)
-          tempfile.close(false)   # we want to close the file without unlinking so that the editor can write to it
+          tempfile.close   # we want to close the file without unlinking so that the editor can write to it
           tempfile.path
         else    # we're dealing with a reference to a keyfile - a path - so return it
           key_file_path_or_in_memory_key_text
@@ -372,7 +372,7 @@ module OpsWalrus
       @runtime_env = nil
       @sshkit_backend = nil
       @tmp_bundle_root_dir = nil
-      @tmp_ssh_key_files.each {|tmpfile| tmpfile.close() rescue nil; tmpfile.unlink() rescue nil }
+      @tmp_ssh_key_files.each {|tmpfile| tmpfile.close() rescue nil; File.unlink(tmpfile) rescue nil }
       @tmp_ssh_key_files = []
     end
 

data/lib/opswalrus/hosts_file.rb

@@ -11,9 +11,9 @@ module OpsWalrus
 
   class HostsFile
     def self.edit(file_path)
-      tempfile = Tempfile.new
+      tempfile = Tempfile.create
       begin
-        tempfile.close(false)   # we want to close the file without unlinking so that the editor can write to it
+        tempfile.close   # we want to close the file without unlinking so that the editor can write to it
         HostsFile.new(file_path).decrypt(tempfile.path)
         if TTY::Editor.open(tempfile.path)
           # tempfile.open()
@@ -21,7 +21,7 @@ module OpsWalrus
         end
       ensure
         tempfile.close rescue nil
-        tempfile.unlink   # deletes the temp file
+        File.unlink(tempfile)   # deletes the temp file
       end
     end
 

data/lib/opswalrus/invocation.rb

@@ -1,3 +1,5 @@
+require 'json'
+require 'tempfile'
 
 module OpsWalrus
 
@@ -94,23 +96,50 @@ module OpsWalrus
         remote_run_command_args << args.join(" ")
       end
 
-      unless kwargs.empty?
-        remote_run_command_args << " "
-        remote_run_command_args << kwargs.map do |k, v|
-          case v
-          when Array
-            v.map {|v_element| "#{k}:#{v_element}" }
-          else
-            "#{k}:#{v}"
-          end
-        end.join(" ")
-      end
-
-      # @host_proxy.run_ops(:run, "--script", remote_run_command_args)
-      if @prompt_for_sudo_password
-        @host_proxy.run_ops(:run, "--pass", remote_run_command_args)
-      else
-        @host_proxy.run_ops(:run, remote_run_command_args)
+      # unless kwargs.empty?
+      #   remote_run_command_args << " "
+      #   remote_run_command_args << kwargs.map do |k, v|
+      #     case v
+      #     when Array
+      #       v.map {|v_element| "#{k}:#{v_element}" }
+      #     else
+      #       "#{k}:#{v}"
+      #     end
+      #   end.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 @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)
+        else
+          @host_proxy.run_ops(:run, ops_command_options, remote_run_command_args)
+        end
+
+        retval
+      ensure
+        if json_kwargs_tempfile
+          json_kwargs_tempfile.close rescue nil
+          File.unlink(json_kwargs_tempfile) rescue nil
+        end
+        if remote_json_kwargs_tempfile_basename
+          @host_proxy.execute(:rm, "-f", remote_json_kwargs_tempfile_basename)
+        end
       end
     end
   end

data/lib/opswalrus/ops_file_script.rb

@@ -146,7 +146,7 @@ module OpsWalrus
         end
       INVOKE_METHOD
 
-      invoke_method_line_count_prior_to_ruby_script_from_ops_file = 3
+      invoke_method_line_count_prior_to_ruby_script_from_ops_file = 4
       klass.module_eval(invoke_method_definition, ops_file.ops_file_path.to_s, ops_file.script_line_offset - invoke_method_line_count_prior_to_ruby_script_from_ops_file)
 
       klass

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -208,7 +208,7 @@ module OpsWalrus
     # end
 
     def desc(msg)
-      puts msg.mustache
+      puts msg.mustache(2)
     end
 
     # runs the given command

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.35"
+  VERSION = "1.0.37"
 end

metadata

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