smart_proxy_salt 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e76b784ec95950584ee9dc9601fd4b16502d24e948570f5c2e5cca2fc37cf48
-  data.tar.gz: be2a3a41b1bda928582f8f3f97b47e2fe544272efdba65ae11ca06d937b44551
+  metadata.gz: 5c5e6d0a2348b06d27789269578966ec1b2ae1413341ca1dc5bb318630653c44
+  data.tar.gz: 8238c8469d73c893ead9a9cba3692652b9227a5aa6bdc400cc53e1c83e28e7db
 SHA512:
-  metadata.gz: 3ae10fb0bc8ca6451ef5c519fa9a229d34cb72e4fa06a4c1446e286bfb3f7abebb3019e0d8ad0911efee1304104d369da7214698716f285bfc011acc6c5b2adc
-  data.tar.gz: b1414a95f7fa718cf1b8720b5e592ab23177ff60c7180df87e9d928b6629925343276bb057e26ac56da4e77bf34826f7079f7daebb3bd6af910243d7abd0a80c
+  metadata.gz: 2873b74a8f42b9e979c38da137674d92e3d0cccdfea62924d27b89ca3c76f4ffc3a5ed961c3e9935311ca1ca51868e44f4315d3cd4d86752d315de0434955b62
+  data.tar.gz: '091bdeb081d90458404ad84baba32db5830b170a28678f554174030722563935186e7fd9abcb52fa743edf5148aae76b65177e7e13e5b2113f48fb0f8f1c8b75'

data/bin/foreman-node

@@ -61,7 +61,7 @@ def plain_grains(minion)
   # We have to get the grains from the cache, because the client
   # is probably running 'state.highstate' right now.
 
-  result = IO.popen(['salt-run', '--output=json', 'cache.grains', minion]) do |io|
+  result = IO.popen(['salt-run', '-l', 'quiet', '--output=json', 'cache.grains', minion]) do |io|
     io.read
   end
 

data/lib/smart_proxy_salt/version.rb

@@ -3,6 +3,6 @@
 module Proxy
   # Salt module
   module Salt
-    VERSION = '3.1.1'
+    VERSION = '3.1.2'
   end
 end

data/salt/report_upload/srv/salt/_runners/foreman_report_upload.py

@@ -65,7 +65,8 @@ def upload(report):
 def create_report(json_str):
     msg = json.loads(json_str)
 
-    return {'job':
+    if msg['fun'] == 'state.highstate':
+        return {'job':
              {
                'result': {
                  msg['id']: msg['return'],
@@ -74,6 +75,19 @@ def create_report(json_str):
                'job_id': msg['jid']
              }
            }
+    elif msg['fun'] == 'state.template_str':
+        for key, entry in msg['return'].items():
+            if key.startswith('module_') and entry['__id__'] == 'state.highstate':
+                return {'job':
+                     {
+                       'result': {
+                         msg['id']: entry['changes']['ret'],
+                       },
+                       'function': 'state.highstate',
+                       'job_id': msg['jid']
+                     }
+                   }
+    raise Exception('No state.highstate found')
 
 
 def now(highstate):
@@ -85,7 +99,7 @@ def now(highstate):
     log.debug('Upload highstate to Foreman')
 
     try:
-        report = create_report(highstate)
+        report = create_report(base64.decodestring(highstate))
         upload(report)
     except Exception as exc:
         log.error('Exception encountered: %s', exc)

data/salt/report_upload/srv/salt/foreman_report_upload.sls

@@ -1,6 +1,10 @@
-{% if 'cmd' in data and data['cmd'] == '_return' and 'fun' in data and data['fun'] == 'state.highstate' %}
-foreman_report_upload:
+{% if 'cmd' in data and data['cmd'] == '_return' and 'fun' in data and (
+    data['fun'] == 'state.highstate' or (data['fun'] == 'state.template_str' and
+                                         'fun_args' in data and
+                                         data['fun_args'][0].startswith('state.highstate:')
+)) %}
+ foreman_report_upload:
   runner.foreman_report_upload.now:
-    - args: 
-      - highstate: '{{data|json}}'
+    - args:
+      - highstate: '{{data|json|base64_encode}}'
 {% endif %}

data/sbin/upload-salt-reports

@@ -18,12 +18,13 @@ import io
 import os
 import sys
 import base64
-
 import traceback
-
 import salt.config
 import salt.runner
 
+if sys.version_info.major == 3:
+    unicode = str
+
 
 def salt_config():
     with io.open(FOREMAN_CONFIG, 'r') as f:
@@ -39,6 +40,11 @@ def get_job(job_id):
     for minion, value in result.items():
         if type(value) == str:
             result[minion] = [value]
+        else:
+            for key, entry in value.items():
+                if key.startswith('module_') and entry['__id__'] == 'state.highstate':
+                    result[minion] = entry['changes']['ret']
+                    break
 
     return {'job':
              {
@@ -66,7 +72,7 @@ def read_last_uploaded():
 
 def write_last_uploaded(last_uploaded):
     with io.open(LAST_UPLOADED, 'w+') as f:
-        f.write(last_uploaded)
+        f.write(unicode(last_uploaded))
 
 
 def run(*args, **kwargs):
@@ -85,12 +91,11 @@ def run(*args, **kwargs):
 
 def jobs_to_upload():
     jobs = run('jobs.list_jobs', kwarg={
-        "search_function": "state.highstate",
+        "search_function": ["state.highstate","state.template_str"],
     })
     last_uploaded = read_last_uploaded()
 
-    job_ids = [jid for (jid, value) in jobs.items()
-               if int(jid) > last_uploaded]
+    job_ids = [jid for jid in jobs.keys() if int(jid) > last_uploaded]
 
     for job_id in sorted(job_ids):
         yield job_id, get_job(job_id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_salt
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Michael Moll
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -118,10 +118,6 @@ files:
 - lib/smart_proxy_salt/salt_api.rb
 - lib/smart_proxy_salt/salt_http_config.ru
 - lib/smart_proxy_salt/version.rb
-- lib/smart_proxy_salt_core.rb
-- lib/smart_proxy_salt_core/salt_runner.rb
-- lib/smart_proxy_salt_core/salt_task_launcher.rb
-- lib/smart_proxy_salt_core/version.rb
 - salt/report_upload/README.md
 - salt/report_upload/master.snippet
 - salt/report_upload/srv/salt/_runners/foreman_report_upload.py

data/lib/smart_proxy_salt_core.rb

@@ -1,17 +0,0 @@
-require 'foreman_tasks_core'
-require 'foreman_remote_execution_core'
-
-module SmartProxySaltCore
-  extend ForemanTasksCore::SettingsLoader
-  register_settings(:salt,
-                    :saltfile => '/etc/foreman-proxy/settings.d/salt.saltfile')
-
-  if ForemanTasksCore.dynflow_present?
-    require 'smart_proxy_salt_core/salt_runner'
-    require 'smart_proxy_salt_core/salt_task_launcher'
-
-    if defined?(SmartProxyDynflowCore)
-      SmartProxyDynflowCore::TaskLauncherRegistry.register('salt', SaltTaskLauncher)
-    end
-  end
-end

data/lib/smart_proxy_salt_core/salt_runner.rb

@@ -1,51 +0,0 @@
-require 'foreman_tasks_core/runner/command_runner'
-
-module SmartProxySaltCore
-  class SaltRunner < ForemanTasksCore::Runner::CommandRunner
-    DEFAULT_REFRESH_INTERVAL = 1
-
-    attr_reader :jid
-
-    def initialize(options, suspended_action:)
-      super(options, :suspended_action => suspended_action)
-      @options = options
-    end
-
-    def start
-      command = generate_command
-      logger.debug("Running command '#{command.join(' ')}'")
-      initialize_command(*command)
-    end
-
-    def kill
-      publish_data('== TASK ABORTED BY USER ==', 'stdout')
-      publish_exit_status(1)
-      ::Process.kill('SIGTERM', @command_pid)
-    end
-
-    def publish_data(data, type)
-      if @jid.nil? && (match = data.match(/jid: ([0-9]+)/))
-        @jid = match[1]
-      end
-      super
-    end
-
-    def publish_exit_status(status)
-      # If there was no salt job associated with this run, mark the job as failed
-      status = 1 if @jid.nil?
-      super status
-    end
-
-    private
-
-    def generate_command
-      saltfile_path = SmartProxySaltCore.settings[:saltfile]
-      command = %w(salt --show-jid)
-      command << "--saltfile=#{saltfile_path}" if File.file?(saltfile_path)
-      command << @options['name']
-      command << 'state.template_str'
-      command << @options['script']
-      command
-    end
-  end
-end

data/lib/smart_proxy_salt_core/salt_task_launcher.rb

@@ -1,21 +0,0 @@
-module SmartProxySaltCore
-  class SaltTaskLauncher < ForemanTasksCore::TaskLauncher::Batch
-    class SaltRunnerAction < ForemanTasksCore::Runner::Action
-      def initiate_runner
-        additional_options = {
-          :step_id => run_step_id,
-          :uuid => execution_plan_id
-        }
-        ::SmartProxySaltCore::SaltRunner.new(
-          input.merge(additional_options),
-          :suspended_action => suspended_action
-        )
-      end
-    end
-
-    def child_launcher(parent)
-      ForemanTasksCore::TaskLauncher::Single.new(world, callback, :parent => parent,
-        :action_class_override => SaltRunnerAction)
-    end
-  end
-end

data/lib/smart_proxy_salt_core/version.rb

@@ -1,3 +0,0 @@
-module SmartProxySaltCore
-  VERSION = '0.0.2'.freeze
-end