smart_proxy_salt 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 978fe04cd0b2ee65be99fc84f20599f295d51498b8aa1ba0541cc9569f56ee9a
-  data.tar.gz: 732c3b575790b37ec8570816f76d10af534b10cf3fb7ea217b7378f645c951f9
+  metadata.gz: f3ac4ad731748d62d1ec922520aa60ce1a7db4b001b2aeaabfe9c2e0709e3f9e
+  data.tar.gz: b345c0ae059918e924a6ec771664a38e687d3b8a288559cd48274e271f69c551
 SHA512:
-  metadata.gz: d291974d5e815bb0a8d84f46d8f4e8509d0c70dc8dc76fa9d35d0f836ff7e55f3fe7f67c3cd0d5fc1452d2747b528ccca05c0de7d881042468b652a30824dd5e
-  data.tar.gz: e41c156691bb2c1c86381658104a4fb54fb4d6a22a8e1778b7dc6ce9f39d40183d649699c49b8c835815c16b073886d68d0988bf0a019c79d8fbb001cdc7133c
+  metadata.gz: 20b39c0f2ef2a6ea13cf94d996141ee1e28ff542fd8def32275560085b8f6c31e57d0d834e6179744c98a4eccfcb3efa4dc8ce74e178b0751103933253d1c465
+  data.tar.gz: d1dd34e0c168829fe049c8db0bb751782b3548a39566c530d148a00485fcf0c96c2fd52b96a7bb71b7a0ac3b9e5ea74629ab39e7b4ef166b1f0ba1163aa6fbd7

data/bin/foreman-node

@@ -60,38 +60,9 @@ end
 def plain_grains(minion)
   # We have to get the grains from the cache, because the client
   # is probably running 'state.highstate' right now.
-  #
-  # salt-run doesn't support directly outputting to json,
-  # so we have resort to python to extract the grains.
-  # Based on https://github.com/saltstack/salt/issues/9444
-
-  script = <<-EOF
-#!/usr/bin/env python
-import json
-import os
-import sys
-
-import salt.config
-import salt.runner
-
-if __name__ == '__main__':
-    __opts__ = salt.config.master_config(
-            os.environ.get('SALT_MASTER_CONFIG', '/etc/salt/master'))
-    runner = salt.runner.Runner(__opts__)
-
-    stdout_bak = sys.stdout
-    with open(os.devnull, 'wb') as f:
-        sys.stdout = f
-        ret = runner.cmd('cache.grains', ['#{minion}'])
-    sys.stdout = stdout_bak
-
-    print json.dumps(ret)
-EOF
-
-  result = IO.popen('python 2>/dev/null', 'r+') do |python|
-    python.write script
-    python.close_write
-    result = python.read
+
+  result = IO.popen(['salt-run', '--output=json', 'cache.grains', minion]) do |io|
+    io.read
   end
 
   grains = JSON.parse(result)

data/lib/smart_proxy_salt/version.rb

@@ -3,6 +3,6 @@
 module Proxy
   # Salt module
   module Salt
-    VERSION = '3.0.0'
+    VERSION = '3.1.0'
   end
 end

data/lib/smart_proxy_salt_core/version.rb

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

data/sbin/upload-salt-reports

@@ -1,14 +1,20 @@
 #!/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
@@ -20,7 +26,7 @@ import salt.runner
 
 
 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,7 +36,7 @@ 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]
 
@@ -47,7 +53,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,7 +65,7 @@ def read_last_uploaded():
 
 
 def write_last_uploaded(last_uploaded):
-    with open(LAST_UPLOADED, 'w+') as f:
+    with io.open(LAST_UPLOADED, 'w+') as f:
         f.write(last_uploaded)
 
 
@@ -68,7 +74,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)
@@ -83,7 +89,7 @@ def jobs_to_upload():
     })
     last_uploaded = read_last_uploaded()
 
-    job_ids = [jid for (jid, value) in jobs.iteritems()
+    job_ids = [jid for (jid, value) in jobs.items()
                if int(jid) > last_uploaded]
 
     for job_id in sorted(job_ids):
@@ -99,12 +105,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 +127,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()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_salt
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Michael Moll
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json