smart_proxy_salt 5.1.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea43480d38aa6f8d3694e61899d0b5dadeacaacc775a82d8ab2a456810bb8bcd
-  data.tar.gz: 6101554d6bf03679d29399f4ad92fbc51c4bfe1250e928433eca682ad015bac7
+  metadata.gz: a197d5fdfffc912f35d6342a2b04384e35fd88a83de7c47c644c798521931ce5
+  data.tar.gz: 32ea0a30d5215bd86646cc36ae3b97915d3ad6c22bc70bd798f07f838c247c0b
 SHA512:
-  metadata.gz: 9de7cddee069d666c6cc4a7400c2df16d647c4e244286a0376e8c1416555c85e1d295975017b28041305be31e2cbe02343c9da5e9688c8666b8141c0d1a8fbb1
-  data.tar.gz: 30464b1b58712d5a022c49b4e104fe29e5b82ad44d356cd50d59fb3b54dca0ce6b8fc7ead55e93f6ecf193c24a04782a924fbc650129c570b4606bf04f5b4408
+  metadata.gz: 0a4d9ee99a8826789102b83094d5d38dc8adfc262d8ec360aec0cb15aecb7ae58aab4f6364cc6f721c0c03098a719acaf28caa57c26a038f3dd7637ad35d78cc
+  data.tar.gz: 29b88c7eba04cb207e68570f0a9d0809a97a3a6479c7bf85e57f0905a50836938bda78ec04c4ef9565434c4873aca0e4331dd031d7d321b27330ea3a49667af3

data/etc/foreman.yaml.example

@@ -3,9 +3,9 @@
 :host: foreman.example.com
 :port: 443
 # if using http with ssl certificates
-:ssl_ca: "/var/lib/puppet/ssl/certs/ca.pem"
-:ssl_cert: "/var/lib/puppet/ssl/private_keys/foreman.example.com.pem"
-:ssl_key: "/var/lib/puppet/ssl/certs/foreman.example.com.pem"
+:ssl_ca: "/etc/foreman-proxy/foreman_ssl_ca.pem"
+:ssl_cert: "/etc/foreman-proxy/foreman_ssl_cert.pem"
+:ssl_key: "/etc/foreman-proxy/foreman_ssl_key.pem"
 # if using http with username and password instead of https with certicates
 #:username: admin
 #:password: changeme

data/lib/smart_proxy_salt/salt_runner.rb

@@ -45,7 +45,7 @@ module Proxy
 
       def generate_command
         saltfile_path = ::Proxy::Salt::Plugin.settings[:saltfile]
-        command = %w[salt --show-jid]
+        command = %w[sudo salt --show-jid]
         command << "--saltfile=#{saltfile_path}" if File.file?(saltfile_path)
         command << @options['name']
         command << 'state.template_str'

data/lib/smart_proxy_salt/version.rb

@@ -3,6 +3,6 @@
 module Proxy
   # Salt module
   module Salt
-    VERSION = '5.1.0'
+    VERSION = '6.1.0'
   end
 end

data/salt/minion_auth/srv/salt/_runners/foreman_https.py

@@ -19,8 +19,8 @@ def salt_config():
     """
     Read the foreman configuratoin from FOREMAN_CONFIG
     """
-    with open(FOREMAN_CONFIG, 'r') as config_file:
-        config = yaml.load(config_file.read())
+    with open(FOREMAN_CONFIG) as config_file:
+        config = yaml.safe_load(config_file.read())
     return config
 
 

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

@@ -1,45 +1,32 @@
-# -*- coding: utf-8 -*-
 '''
 Uploads reports from the Salt job cache to Foreman
 '''
-from __future__ import absolute_import, print_function, unicode_literals
 
-LAST_UPLOADED = '/etc/salt/last_uploaded'
-FOREMAN_CONFIG = '/etc/salt/foreman.yaml'
-LOCK_FILE = '/var/lock/salt-report-upload.lock'
+from http.client import HTTPConnection, HTTPSConnection
 
-try:
-    from http.client import HTTPConnection, HTTPSConnection
-except ImportError:
-    from httplib import HTTPSConnection, HTTPSConnection
-
-import io
 import ssl
 import json
 import yaml
 import os
-import sys
 import base64
-
-# Import python libs
 import logging
 
-log = logging.getLogger(__name__)
-
+LAST_UPLOADED = '/etc/salt/last_uploaded'
+FOREMAN_CONFIG = '/etc/salt/foreman.yaml'
+LOCK_FILE = '/var/lock/salt-report-upload.lock'
 
-if sys.version_info.major == 3:
-    unicode = str
+log = logging.getLogger(__name__)
 
 
 def salt_config():
-    with open(FOREMAN_CONFIG, 'r') as f:
-        config = yaml.load(f.read())
+    with open(FOREMAN_CONFIG) as f:
+        config = yaml.safe_load(f.read())
     return config
 
 
 def write_last_uploaded(last_uploaded):
-    with io.open(LAST_UPLOADED, 'w+') as f:
-        f.write(unicode(last_uploaded))
+    with open(LAST_UPLOADED, 'w+') as f:
+        f.write(str(last_uploaded))
 
 
 def upload(report):
@@ -51,7 +38,7 @@ def upload(report):
         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'])
+            ctx.load_verify_locations(cafile=config[':ssl_ca'])
         connection = HTTPSConnection(config[':host'],
                 port=config[':port'], context=ctx)
     else:
@@ -68,7 +55,7 @@ def upload(report):
 
     if response.status == 200:
         write_last_uploaded(report['job']['job_id'])
-        info_msg = 'Success {0}: {1}'.format(report['job']['job_id'], response.read())
+        info_msg = 'Success {}: {}'.format(report['job']['job_id'], response.read())
         log.info(info_msg)
     else:
         log.error("Unable to upload job - aborting report upload")
@@ -107,7 +94,7 @@ def get_lock():
     if os.path.isfile(LOCK_FILE):
         raise Exception("Unable to obtain lock.")
     else:
-        io.open(LOCK_FILE, 'w+').close()
+        open(LOCK_FILE, 'w+').close()
 
 
 def release_lock():
@@ -131,4 +118,3 @@ def now(highstate):
         log.error('Exception encountered: %s', exc)
     finally:
         release_lock()
-

data/sbin/upload-salt-reports

@@ -28,7 +28,7 @@ if sys.version_info.major == 3:
 
 def salt_config():
     with io.open(FOREMAN_CONFIG, 'r') as f:
-        config = yaml.load(f.read())
+        config = yaml.safe_load(f.read())
     return config
 
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_salt
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Michael Moll
 - Stephen Benjamin
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smart_proxy_dynflow
@@ -17,28 +16,36 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '3.1'
 description: This plug-in adds support for Salt to Foreman's Smart Proxy
 email: foreman-dev@googlegroups.com
 executables:
 - foreman-node
 extensions: []
 extra_rdoc_files:
-- README.md
 - LICENSE
+- README.md
 files:
 - LICENSE
 - README.md
@@ -70,9 +77,8 @@ files:
 - settings.d/salt.yml.example
 homepage: https://github.com/theforeman/smart_proxy_salt
 licenses:
-- GPL-3.0
+- GPL-3.0-only
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -90,8 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: SaltStack Plug-In for Foreman's Smart Proxy
 test_files: []