smart_proxy_salt 5.0.1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ba18b31812c408bbbef40601e2f7279ee6f04d55a62b999b7b993f0158aede8
-  data.tar.gz: 82822b47407c7c5e66151627a7935d294566c6e5dc17c4bbf7c2674890653826
+  metadata.gz: fd14287d87c9ed2e41a86539f25b52f741549f20501b5f6dc7936075cca3fdad
+  data.tar.gz: af25b8597c836c1b5a8fd726612f6c49d05a87b50e877c19f42e2836d97c1717
 SHA512:
-  metadata.gz: d95ddd85199c088db57c6248d99d7a370e36c74191aeda0d74fd4f7fb7d573ee50a0b4a107092d2f8f6c3018c131e6127236cc5818f84c835eecabd0b21ef6bf
-  data.tar.gz: d9866d18feed738e03d0e47784ee75b41921b65bcbbd33e88aec5856cfd5160e4b0b5e5485d5c25c3a6c601d6c519bde984599b734f7f081b7adce9de53c3277
+  metadata.gz: ecdaa039f92b673ab76340da06d92397d01980baf5c7956687cd2314ff1e8e579af6beed07f1a966312c285adc30606895a3c1545ffb0e38b8a68bc087328b76
+  data.tar.gz: 23853c34472f6cbb3a674c5c88806167c5f6be692032ecc08a474ae335ad842e477ce8425a8ef35787878b51128bad278bf90bca014b3fbc5c6937062e297889

data/bin/foreman-node

@@ -45,7 +45,7 @@ end
 
 def get_grains(minion)
   grains = {
-    :name  => minion,
+    :name => minion,
     :facts => plain_grains(minion).merge(:_timestamp => Time.now, :_type => 'foreman_salt')
   }
 
@@ -94,9 +94,10 @@ end
 def plainify(hash, prefix = nil)
   result = []
   hash.each_pair do |key, value|
-    if value.is_a?(Hash)
+    case value
+    when Hash
       result.push plainify(value, get_key(key, prefix))
-    elsif value.is_a?(Array)
+    when Array
       result.push plainify(array_to_hash(value), get_key(key, prefix))
     else
       new = {}
@@ -169,12 +170,14 @@ def enc(minion)
   res = http.start { |conn| conn.request(req) }
 
   raise "Error retrieving node #{minion}: #{res.class}\nCheck Foreman's /var/log/foreman/production.log for more information." unless res.code == '200'
+
   res.body
 end
 
 minion = ARGV[0] || raise('Must provide minion as an argument')
 
 raise 'Invalid hostname' unless valid_hostname? minion
+
 begin
   result = ''
 

data/lib/smart_proxy_salt/cli.rb

@@ -56,16 +56,15 @@ module Proxy
 
         def autosign_list
           return [] unless File.exist?(autosign_file)
+
           File.read(autosign_file).split("\n").reject do |v|
             v =~ /^\s*#.*|^$/ ## Remove comments and empty lines
           end.map(&:chomp)
         end
 
         def append_value_to_file(filepath, value)
-          File.open(filepath, File::CREAT|File::RDWR) do |file|
-            unless file.any? { |line| line.chomp == value}
-              file.puts value
-            end
+          File.open(filepath, File::CREAT | File::RDWR) do |file|
+            file.puts value unless file.any? { |line| line.chomp == value }
           end
           logger.info "Added an entry to '#{filepath}' successfully."
           true
@@ -75,7 +74,6 @@ module Proxy
         end
 
         def remove_value_from_file(filepath, value)
-
           return true unless File.exist?(filepath)
 
           found = false
@@ -84,14 +82,14 @@ module Proxy
             if entry == value
               found = true
               nil
-            elsif entry == ""
+            elsif entry == ''
               nil
             else
               line
             end
           end.uniq.compact
           if found
-            File.write(filepath, entries.join())
+            File.write(filepath, entries.join)
             logger.info "Removed an entry from '#{filepath}' successfully."
           end
           true

data/lib/smart_proxy_salt/rest.rb

@@ -23,6 +23,7 @@ module Proxy
 
           files.each do |file|
             next unless file =~ /\.sls\Z/ && file != 'top.sls'
+
             states << file.gsub('.sls', '').gsub('/init', '').chomp('/').tr('/', '.')
           end
 

data/lib/smart_proxy_salt/salt.rb

@@ -12,11 +12,11 @@ module Proxy
     class Plugin < ::Proxy::Plugin
       plugin 'salt', Proxy::Salt::VERSION
 
-      default_settings :autosign_file      => '/etc/salt/autosign.conf',
-                       :autosign_key_file  => '/var/lib/foreman-proxy/salt/grains/autosign_key',
-                       :salt_command_user  => 'root',
-                       :use_api            => false,
-                       :saltfile           => '/etc/foreman-proxy/settings.d/salt.saltfile'
+      default_settings :autosign_file => '/etc/salt/autosign.conf',
+                       :autosign_key_file => '/var/lib/foreman-proxy/salt/grains/autosign_key',
+                       :salt_command_user => 'root',
+                       :use_api => false,
+                       :saltfile => '/etc/foreman-proxy/settings.d/salt.saltfile'
 
       requires :dynflow, '>= 0.5.0'
 

data/lib/smart_proxy_salt/salt_runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'smart_proxy_dynflow/runner/base'
 require 'smart_proxy_dynflow/runner/command_runner'
 

data/lib/smart_proxy_salt/salt_task_launcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'smart_proxy_dynflow/task_launcher'
 
 module Proxy

data/lib/smart_proxy_salt/version.rb

@@ -3,6 +3,6 @@
 module Proxy
   # Salt module
   module Salt
-    VERSION = '5.0.1'.freeze
+    VERSION = '6.0.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

@@ -1,4 +1,4 @@
-#!/usr/bin/salt_python_wrapper
+#!/usr/bin/python3
 # Uploads reports from the Salt job cache to Foreman
 
 from __future__ import print_function
@@ -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,104 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_salt
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Michael Moll
 - Stephen Benjamin
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 1980-01-02 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: '13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.50.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.50.0
-- !ruby/object:Gem::Dependency
-  name: rack-test
+  name: smart_proxy_dynflow
   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'
-- !ruby/object:Gem::Dependency
-  name: smart_proxy_dynflow
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
@@ -106,23 +24,24 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
-description: SaltStack Plug-In for Foreman's Smart Proxy
+description: This plug-in adds support for Salt to Foreman's Smart Proxy
 email: foreman-dev@googlegroups.com
 executables:
 - foreman-node
-- salt_python_wrapper
 extensions: []
 extra_rdoc_files:
-- README.md
 - LICENSE
+- README.md
 files:
 - LICENSE
 - README.md
 - bin/foreman-node
-- bin/salt_python_wrapper
 - bundler.d/salt.rb
 - etc/foreman.conf.example
 - etc/foreman.yaml.example
@@ -150,9 +69,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
@@ -160,16 +78,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: SaltStack Plug-In for Foreman's Smart Proxy
 test_files: []

data/bin/salt_python_wrapper

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -u
-
-for py in 'python3' 'python'; do
-  exe=$(type -p ${py})
-  if [ -n "${exe}" ]; then
-    if ${exe} -c 'import salt.config'; then
-      ${exe} "$@"
-      exit $?
-    fi
-  fi
-done
-
-echo "No usable python version found, check if python or python3 can import salt.config!" 1>&2
-exit 1