smart_proxy_salt 2.1.8 → 3.1.2

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

@@ -0,0 +1,10 @@
+{% 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|base64_encode}}'
+{% endif %}

data/sbin/upload-salt-reports

@@ -1,26 +1,33 @@
 #!/usr/bin/env python
 # Uploads reports from the Salt job cache to Foreman
 
+from __future__ import print_function
+
 LAST_UPLOADED = '/etc/salt/last_uploaded'
 FOREMAN_CONFIG = '/etc/salt/foreman.yaml'
 LOCK_FILE = '/var/lock/salt-report-upload.lock'
 
-import httplib
+try:
+    from http.client import HTTPConnection, HTTPSConnection
+except ImportError:
+    from httplib import HTTPSConnection, HTTPSConnection
 import ssl
 import json
 import yaml
+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 open(FOREMAN_CONFIG, 'r') as f:
+    with io.open(FOREMAN_CONFIG, 'r') as f:
         config = yaml.load(f.read())
     return config
 
@@ -30,9 +37,14 @@ def get_job(job_id):
 
     # If any minion's results are strings, they're exceptions
     # and should be wrapped in a list like other errors
-    for minion, value in result.iteritems():
+    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':
              {
@@ -47,7 +59,7 @@ def read_last_uploaded():
     if not os.path.isfile(LAST_UPLOADED):
         return 0
     else:
-        with open(LAST_UPLOADED, 'r') as f:
+        with io.open(LAST_UPLOADED, 'r') as f:
             result = f.read().strip()
         if len(result) == 20:
             try:
@@ -59,8 +71,8 @@ def read_last_uploaded():
 
 
 def write_last_uploaded(last_uploaded):
-    with open(LAST_UPLOADED, 'w+') as f:
-        f.write(last_uploaded)
+    with io.open(LAST_UPLOADED, 'w+') as f:
+        f.write(unicode(last_uploaded))
 
 
 def run(*args, **kwargs):
@@ -68,7 +80,7 @@ def run(*args, **kwargs):
             os.environ.get('SALT_MASTER_CONFIG', '/etc/salt/master'))
 
     runner = salt.runner.Runner(__opts__)
-    with open(os.devnull, 'wb') as f:
+    with io.open(os.devnull, 'w') as f:
         stdout_bak, sys.stdout = sys.stdout, f
         try:
             ret = runner.cmd(*args, **kwargs)
@@ -79,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.iteritems()
-               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)
@@ -99,12 +110,12 @@ def upload(jobs):
         ctx = ssl.create_default_context()
         ctx.load_cert_chain(certfile=config[':ssl_cert'], keyfile=config[':ssl_key'])
         if config[':ssl_ca']:
-          ctx.load_verify_locations(cafile=config[':ssl_ca'])
-        connection = httplib.HTTPSConnection(config[':host'],
-                port=config[':port'], context=ctx)
+            ctx.load_verify_locations(cafile=config[':ssl_ca'])
+        connection = HTTPSConnection(config[':host'],
+                                     port=config[':port'], context=ctx)
     else:
-        connection = httplib.HTTPConnection(config[':host'],
-                port=config[':port'])
+        connection = HTTPConnection(config[':host'],
+                                    port=config[':port'])
         if ':username' in config and ':password' in config:
             token = base64.b64encode('{}:{}'.format(config[':username'],
                                                     config[':password']))
@@ -121,23 +132,24 @@ def upload(jobs):
 
         if response.status == 200:
             write_last_uploaded(job_id)
-            print "Success %s: %s" % (job_id, response.read())
+            print("Success %s: %s" % (job_id, response.read()))
         else:
-            print "Unable to upload job - aborting report upload"
-            print response.read()
+            print("Unable to upload job - aborting report upload")
+            print(response.read())
 
 
 def get_lock():
     if os.path.isfile(LOCK_FILE):
         raise Exception("Unable to obtain lock.")
     else:
-        open(LOCK_FILE, 'w+').close()
+        io.open(LOCK_FILE, 'w+').close()
 
 
 def release_lock():
     if os.path.isfile(LOCK_FILE):
         os.remove(LOCK_FILE)
 
+
 if __name__ == '__main__':
     try:
         get_lock()

data/settings.d/salt.saltfile.example

@@ -0,0 +1,3 @@
+salt:
+  log_file: /var/log/foreman-proxy/salt.log
+  log_level_logfile: debug

data/settings.d/salt.yml.example

@@ -9,3 +9,4 @@
 :api_auth: pam
 :api_username: saltuser
 :api_password: password
+# :saltfile: '/etc/foreman-proxy/settings.d/salt.saltfile'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_salt
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 3.1.2
 platform: ruby
 authors:
 - Michael Moll
@@ -9,8 +9,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
-dependencies: []
+date: 2020-06-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.32.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.32.1
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: SaltStack Plug-In for Foreman's Smart Proxy
 email: foreman-dev@googlegroups.com
 executables:
@@ -34,11 +118,16 @@ files:
 - lib/smart_proxy_salt/salt_api.rb
 - lib/smart_proxy_salt/salt_http_config.ru
 - lib/smart_proxy_salt/version.rb
+- salt/report_upload/README.md
+- salt/report_upload/master.snippet
+- salt/report_upload/srv/salt/_runners/foreman_report_upload.py
+- salt/report_upload/srv/salt/foreman_report_upload.sls
 - sbin/upload-salt-reports
+- settings.d/salt.saltfile.example
 - settings.d/salt.yml.example
 homepage: https://github.com/theforeman/smart_proxy_salt
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -56,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: SaltStack Plug-In for Foreman's Smart Proxy