foreman_salt 15.1.0 → 15.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dceadd793e7c98f49fff2d4c176995a0ed11def096c54133e9d3c8d12368c1f6
-  data.tar.gz: 0cc545f144919677a951bdb770a8eb2a3834c8e16fe3ab4c8c7760372b70ba42
+  metadata.gz: 427d080c653c6fc8f5e1b7a9de11f4201076d2b4064937aca48c35e9fc509fed
+  data.tar.gz: 1916aba7a82b01da5218ad02e8268d4b457d0271b66d49945e63f2aa751b668b
 SHA512:
-  metadata.gz: 13143280af923e4f4e5cadc8ca97988383d8562eafe139adcdce0712bf088c1d2159e1733e8ac17f730abc626642124708ad7399262b0b456f1b404eed04c4ac
-  data.tar.gz: 3154c9e3e6000fad2c96f4ceaaa88801bd49acd7088ee0f76ae82b11b4dc3a1416f9b5f606af2de8dedc979d82a86db216f773f8912b0aed345460ed164762d7
+  metadata.gz: 5f4f683d6eaff8fffd168a93f6eb78fccb0bdb115394bbba95f9eae982ec274d62e6f3ae2c3538ad06d771a0bde10ed1ff886b6b743ded3404ad1cf569b389e8
+  data.tar.gz: 5637e7e79635bd0ce9b3923ba55605480d75735fb60d4252be2c463d6fc58fc06ef8dbbe81c59b26dc49272165b6bca054e980a7d0c96fd268bcd933eef1e2cc

data/README.md

@@ -1,4 +1,3 @@
-[![Build Status](https://img.shields.io/jenkins/s/http/ci.theforeman.org/test_plugin_foreman_salt_master.svg)](http://ci.theforeman.org/job/test_plugin_foreman_salt_master)
 [![Gem Version](https://img.shields.io/gem/v/foreman_salt.svg)](https://rubygems.org/gems/foreman_salt)
 [![Code Climate](https://codeclimate.com/github/theforeman/foreman_salt/badges/gpa.svg)](https://codeclimate.com/github/theforeman/foreman_salt)
 [![GPL License](https://img.shields.io/github/license/theforeman/foreman_salt.svg)](https://github.com/theforeman/foreman_salt/blob/master/LICENSE)
@@ -18,10 +17,11 @@ This plug-in adds support for Salt to Foreman.
 | >= 1.23         | 11.0.1         |
 | >= 1.24         | 13.2.0         |
 | >= 2.5          | 14.0.0         |
+| >= 3.2          | 15.0.0         |
 
 ## Documentation
 
-[Using Salt for Configuration Management](https://docs.theforeman.org/nightly/Managing_Hosts/index-foreman-el.html#using-salt-for-configuration-management_managing-hosts)
+[Using Salt for Configuration Management](https://docs.theforeman.org/nightly/Managing_Hosts/index-foreman-el.html#Using_Salt_for_Configuration_Management_managing-hosts)
 
 ## Contributing
 
@@ -29,7 +29,7 @@ Fork and send a Pull Request. Thanks!
 
 ## Copyright
 
-Copyright (c) 2014 Stephen Benjamin
+Copyright (c) 2023 The Foreman community
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -42,4 +42,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+along with this program. If not, see <http://www.gnu.org/licenses/>.

data/app/controllers/foreman_salt/minions_controller.rb

@@ -24,7 +24,7 @@ module ForemanSalt
       end
     rescue StandardError
       logger.warn "Failed to generate external nodes for #{@minion} with #{$ERROR_INFO}"
-      render(plain: _('Unable to generate output, Check log files\n'), status: :precondition_failed) && return
+      render(plain: "#{_('Unable to generate output, Check log files')}\n", status: :precondition_failed) && return
     end
 
     def salt_environment_selected

data/app/helpers/foreman_salt/salt_plugin_helper.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
-require "#{ForemanSalt::Engine.root}/lib/foreman_salt/version"
-
 module ForemanSalt
   # General helper functions for foreman_salt
   module SaltPluginHelper
     def salt_doc_url
-      major_version = ::ForemanSalt::VERSION.split('.')[0]
-      "https://theforeman.org/plugins/foreman_salt/#{major_version}.x/index.html"
+      'https://docs.theforeman.org/nightly/Managing_Hosts/index-foreman-el.html#Using_Salt_for_Configuration_Management_managing-hosts'
     end
   end
 end

data/app/services/foreman_salt/report_importer.rb

@@ -34,8 +34,8 @@ module ForemanSalt
       @host.salt_proxy_id ||= @proxy_id
       @host.last_report = start_time
 
-      if @raw.is_a? Array
-        process_failures # If Salt sends us only an array, it's a list of fatal failures
+      if [Array, String].member? @raw.class
+        process_failures # If Salt sends us only an array (or string), it's a list of fatal failures
       else
         process_normal
       end
@@ -158,6 +158,7 @@ module ForemanSalt
     end
 
     def process_failures
+      @raw = [@raw] unless @raw.is_a? Array
       status = ConfigReportStatusCalculator.new(counters: { 'failed' => @raw.size }).calculate
       @report = ConfigReport.create(host: @host, reported_at: Time.zone.now, status: status, metrics: {})
 

data/app/views/foreman_salt/salt_variables/_fields.erb

@@ -64,7 +64,7 @@
     </fieldset>
     </br>
     <fieldset>
-      <h2><%= _("Specify Matchers") %>  <%= documentation_button('4.2.6SmartMatchers') %></h2>
+      <h2><%= _("Specify Matchers") %>  <%= documentation_button('4.2.5SmartMatchers') %></h2>
       <div class="children_fields lookup_values">
         <%= render 'lookup_keys/values', :f => f, :is_param => false %>
       </div>

data/app/views/foreman_salt/salt_variables/index.html.erb

@@ -1,7 +1,7 @@
 <% title _("Salt Variables") %>
 
 <%= title_actions display_link_if_authorized(_('New Salt Variable'), hash_for_new_salt_variable_path, :class => "btn btn-default no-float"),
-                  documentation_button('#4.3Variables', :root_url => salt_doc_url) %>
+                  documentation_button('', :root_url => salt_doc_url) %>
 
 <table class="<%= table_css_classes 'table-fixed' %>">
   <thead>

data/db/migrate/20211108211312_add_missing_permissions.rb

@@ -1,6 +1,6 @@
 class AddMissingPermissions < ActiveRecord::Migration[6.0]
   def up
-    Permission.create!(name: 'auth_smart_proxies_salt_autosign', resource_type: 'SmartProxy')
+    Permission.where(name: 'auth_smart_proxies_salt_autosign', resource_type: 'SmartProxy').first_or_create
   end
 
   def down

data/db/migrate/20220406185204_fix_salt_setting_category_to_dsl.rb

@@ -1,5 +1,5 @@
 class FixSaltSettingCategoryToDsl < ActiveRecord::Migration[6.0]
   def up
-    Setting.where(category: 'Setting::Salt').update_all(category: 'Setting')
+    Setting.where(category: 'Setting::Salt').update_all(category: 'Setting') if column_exists?(:settings, :category)
   end
 end

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '15.1.0'.freeze
+  VERSION = '15.2.0'.freeze
 end

data/locale/Makefile

@@ -6,8 +6,8 @@
 # make tx-update - download and merge translations from Transifex
 # make clean - clean everything
 #
-DOMAIN = foreman_salt
-VERSION = $(shell ruby -e 'require "rubygems";spec = Gem::Specification::load(Dir.glob("../*.gemspec")[0]);puts spec.version')
+DOMAIN = $(shell ruby -rrubygems -e 'puts Gem::Specification::load(Dir.glob("../*.gemspec")[0]).name')
+VERSION = $(shell ruby -rrubygems -e 'puts Gem::Specification::load(Dir.glob("../*.gemspec")[0]).version')
 POTFILE = $(DOMAIN).pot
 MOFILE = $(DOMAIN).mo
 POFILES = $(shell find . -name '$(DOMAIN).po')
@@ -41,7 +41,10 @@ uniq-po:
 		msguniq $$f -o $$f ; \
 	done
 
-tx-pull: $(EDITFILES)
+tx-new:
+	tx pull --minimum-perc 50 --all
+
+tx-pull: tx-new $(EDITFILES)
 	tx pull -f
 	for f in $(EDITFILES) ; do \
 		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
@@ -54,6 +57,7 @@ tx-update: tx-pull
 
 mo-files: $(MOFILES)
 	git add $(POFILES) $(POTFILE) ../locale/*/LC_MESSAGES
+	[[ ! -f locale/action_names.rb ]] || git add locale/action_names.rb
 	git commit -m "i18n - pulling from tx"
 	@echo
 	@echo Changes commited!

data/locale/de/foreman_salt.po

@@ -51,6 +51,9 @@ msgstr "Aktionen"
 msgid "Added"
 msgstr "Hinzugefügt"
 
+msgid "Array of Salt state IDs"
+msgstr ""
+
 msgid "Array of State ids"
 msgstr "Array von State IDs"
 
@@ -87,6 +90,9 @@ msgstr "Alle auswählen/abwählen"
 msgid "Check/Uncheck Removed"
 msgstr "Gelöschte auswählen/abwählen"
 
+msgid "Config Management"
+msgstr ""
+
 msgid "Continue to look for matches after first find (only array/hash type)? Note: merging overrides ignores all matchers that are omitted."
 msgstr "Nach dem ersten Treffer nach weiterhin nach Treffern suchen (nur Array-/Hash-Typ)? Hinweis: Das Zusammenlegen von Überschreibungen ignoriert alle Prüfwerte, die weggelassen werden."
 
@@ -162,9 +168,6 @@ msgstr "Umgebungen"
 msgid "FQDN of host that key belongs to"
 msgstr "FQDN des Hosts zu welchem der Schlüssel gehört"
 
-msgid "Failed to execute state.highstate: %s"
-msgstr "Fehler bei der Ausführung von state.highstate: %s"
-
 msgid "Filter %s"
 msgstr "Filter %s"
 
@@ -180,9 +183,6 @@ msgstr "Verborgener Wert"
 msgid "Hide all values for this parameter."
 msgstr "Alle Werte für diesen Parameter verbergen."
 
-msgid "Hide the Run Salt state.highstate button on the host details page"
-msgstr "'Salt state.highstate' Button auf der Hoststatus Seite ausblenden"
-
 msgid "Host groups"
 msgstr "Hostgruppen"
 
@@ -195,6 +195,9 @@ msgstr "Hosts"
 msgid "ID of Salt Proxy"
 msgstr "ID des Salt Proxy"
 
+msgid "ID of host group"
+msgstr ""
+
 msgid "If checked, will raise an error if there is no default value and no matcher provide a value."
 msgstr "Falls aktiviert, wird dies einen Fehler erzeugen, wenn kein Standardwert vorhanden ist und kein Treffer einen Wert vorschlägt."
 
@@ -294,9 +297,6 @@ msgstr "Neuen Salt State"
 msgid "New Salt Variable"
 msgstr "Neue Salt Variable"
 
-msgid "No Salt master defined - can't continue"
-msgstr "Kein Salt Master definiert - kann nicht fortfahren"
-
 msgid "No changes found"
 msgstr "Keine Änderungen festgestellt"
 
@@ -396,6 +396,12 @@ msgstr "Salt Umgebungskennung"
 msgid "Salt external nodes YAML dump"
 msgstr "YAML-Ausgabe des externen Salt-Knotens"
 
+msgid "Salt master/smart proxy ID"
+msgstr ""
+
+msgid "Salt namespace pillars"
+msgstr ""
+
 msgid "Salt state"
 msgstr "Salt State"
 
@@ -420,6 +426,9 @@ msgstr "Wählen Sie die Änderungen, die Sie in Foreman anwenden möchten"
 msgid "Set the order in which values are resolved."
 msgstr "Reihenfolge festlegen, in der die Werte aufgelöst werden."
 
+msgid "Set the salt_status as \\'successful authentication\\' and remove the corresponding autosign key from the Smart Proxy"
+msgstr ""
+
 msgid "Show a Salt environment"
 msgstr "Salt Umgebung anzeigen"
 
@@ -429,6 +438,9 @@ msgstr "Minion anzeigen"
 msgid "Show a state"
 msgstr "Salt State anzeigen"
 
+msgid "Show the Salt parameters of a host group"
+msgstr ""
+
 msgid "Show variable"
 msgstr "Variable anzeigen"
 
@@ -447,15 +459,9 @@ msgstr "State kann \"accepted\" oder \"rejected\" sein"
 msgid "States"
 msgstr "States"
 
-msgid "Successfully executed, check log files for more details"
-msgstr "Erfolgreich ausgeführt, für weitere Informationen bitte die Protokolldateien prüfen"
-
 msgid "Successfully imported"
 msgstr "Erfolgreich importiert"
 
-msgid "Successfully updated %s."
-msgstr "%s wurde aktualisiert."
-
 msgid "The order in which matchers keys are processed, first match wins.<br> You may use multiple attributes as a matcher key, for example, an order of <code>host group, environment</code> would expect a matcher such as <code>hostgroup = \"web servers\", environment = production</code>"
 msgstr "Die Reihenfolge, in der Prüfwertschlüssel verarbeitet werden. Die erste Übereinstimmung ist maßgeblich.<br> Sie können mehrere Attribute als Prüfwertschlüssel verwenden. Beispielsweise würde die Reihenfolge <code>host group, environment</code> einen Prüfwert wie etwa <code>hostgroup = \"web servers\", environment = production</code> erwarten."
 
@@ -465,9 +471,6 @@ msgstr "Reihenfolge, in der Werte aufgelöst werden"
 msgid "Toggle"
 msgstr "Umschalten"
 
-msgid "Trigger a state.highstate run on a node"
-msgstr "Salt state.highstate Lauf auf einem Knoten auslösen"
-
 msgid "Type"
 msgstr "Typ"
 
@@ -480,8 +483,14 @@ msgstr "Typen von Variablenwerten"
 msgid "Unable to accept Salt key for %s"
 msgstr "Salt Schlüssel für %s konnte nicht akzeptiert werden"
 
-msgid "Unable to delete Salt autosign for %s"
-msgstr "Salt Autosign für %s konnte nicht gelöscht werden"
+msgid "Unable to create Salt autosign key %s"
+msgstr ""
+
+msgid "Unable to delete Salt autosign hostname for %s"
+msgstr ""
+
+msgid "Unable to delete Salt autosign key %s"
+msgstr ""
 
 msgid "Unable to delete Salt key for %s"
 msgstr "Salt Schlüssel für %s konnte nicht gelöscht werden"
@@ -498,10 +507,8 @@ msgstr "Salt States Liste konnten nicht abgerufen werden"
 msgid "Unable to fetch autosign list"
 msgstr "Autosign Liste konnten nicht abgerufen werden"
 
-msgid ""
-"Unable to generate output, Check log files\n"
-msgstr ""
-"Kann keine Ausgabe erzeugen, Bitte Logdateien prüfen\n"
+msgid "Unable to generate output, Check log files"
+msgstr "Kann keine Ausgabe erzeugen, Bitte Logdateien prüfen"
 
 msgid "Unable to reject Salt key for %s"
 msgstr "Salt Schlüssel für %s konnte nicht zurückgewiesen werden"
@@ -509,8 +516,8 @@ msgstr "Salt Schlüssel für %s konnte nicht zurückgewiesen werden"
 msgid "Unable to run Salt state.highstate for %s"
 msgstr "Start von Salt state.highstate für %s fehlgeschlagen"
 
-msgid "Unable to set Salt autosign for %s"
-msgstr "Salt Autosign für %s konnte nicht festgelegt werden"
+msgid "Unable to set Salt autosign hostname for %s"
+msgstr ""
 
 msgid "Unaccepted"
 msgstr "Abgelehnt"
@@ -524,6 +531,9 @@ msgstr "Salt Schlüssel bearbeiten"
 msgid "Update a minion"
 msgstr "Minion bearbeiten"
 
+msgid "Update the Salt parameters of a host group"
+msgstr ""
+
 msgid "Updated hosts: changed salt environment"
 msgstr "Hosts aktualisiert: Salt Umgebung geändert"
 

data/locale/en/foreman_salt.po

@@ -34,6 +34,9 @@ msgstr ""
 msgid "Added"
 msgstr "Added"
 
+msgid "Array of Salt state IDs"
+msgstr ""
+
 msgid "Array of State ids"
 msgstr "Array of State ids"
 
@@ -70,6 +73,9 @@ msgstr "Check/Uncheck All"
 msgid "Check/Uncheck Removed"
 msgstr "Check/Uncheck Removed"
 
+msgid "Config Management"
+msgstr ""
+
 msgid "Continue to look for matches after first find (only array/hash type)? Note: merging overrides ignores all matchers that are omitted."
 msgstr ""
 
@@ -145,9 +151,6 @@ msgstr "Environments"
 msgid "FQDN of host that key belongs to"
 msgstr "FQDN of host that key belongs to"
 
-msgid "Failed to execute state.highstate: %s"
-msgstr "Failed to execute state.highstate: %s"
-
 msgid "Filter %s"
 msgstr "Filter %s"
 
@@ -163,9 +166,6 @@ msgstr ""
 msgid "Hide all values for this parameter."
 msgstr ""
 
-msgid "Hide the Run Salt state.highstate button on the host details page"
-msgstr ""
-
 msgid "Host groups"
 msgstr "Host groups"
 
@@ -178,6 +178,9 @@ msgstr "Hosts"
 msgid "ID of Salt Proxy"
 msgstr "ID of Salt Proxy"
 
+msgid "ID of host group"
+msgstr ""
+
 msgid "If checked, will raise an error if there is no default value and no matcher provide a value."
 msgstr ""
 
@@ -277,9 +280,6 @@ msgstr "New Salt State"
 msgid "New Salt Variable"
 msgstr ""
 
-msgid "No Salt master defined - can't continue"
-msgstr "No Salt master defined - can't continue"
-
 msgid "No changes found"
 msgstr "No changes found"
 
@@ -379,6 +379,12 @@ msgstr "Salt environment ID"
 msgid "Salt external nodes YAML dump"
 msgstr "Salt external nodes YAML dump"
 
+msgid "Salt master/smart proxy ID"
+msgstr ""
+
+msgid "Salt namespace pillars"
+msgstr ""
+
 msgid "Salt state"
 msgstr "Salt state"
 
@@ -403,6 +409,9 @@ msgstr "Select the changes you want to realize in Foreman"
 msgid "Set the order in which values are resolved."
 msgstr ""
 
+msgid "Set the salt_status as \\'successful authentication\\' and remove the corresponding autosign key from the Smart Proxy"
+msgstr ""
+
 msgid "Show a Salt environment"
 msgstr "Show a Salt environment"
 
@@ -412,6 +421,9 @@ msgstr "Show a minion"
 msgid "Show a state"
 msgstr "Show a state"
 
+msgid "Show the Salt parameters of a host group"
+msgstr ""
+
 msgid "Show variable"
 msgstr ""
 
@@ -430,15 +442,9 @@ msgstr "State can be \"accepted\" or \"rejected\""
 msgid "States"
 msgstr "States"
 
-msgid "Successfully executed, check log files for more details"
-msgstr "Successfully executed, check log files for more details"
-
 msgid "Successfully imported"
 msgstr "Successfully imported"
 
-msgid "Successfully updated %s."
-msgstr "Successfully updated %s."
-
 msgid "The order in which matchers keys are processed, first match wins.<br> You may use multiple attributes as a matcher key, for example, an order of <code>host group, environment</code> would expect a matcher such as <code>hostgroup = \"web servers\", environment = production</code>"
 msgstr ""
 
@@ -448,9 +454,6 @@ msgstr ""
 msgid "Toggle"
 msgstr "Toggle"
 
-msgid "Trigger a state.highstate run on a node"
-msgstr "Trigger a state.highstate run on a node"
-
 msgid "Type"
 msgstr ""
 
@@ -463,8 +466,14 @@ msgstr ""
 msgid "Unable to accept Salt key for %s"
 msgstr "Unable to accept Salt key for %s"
 
-msgid "Unable to delete Salt autosign for %s"
-msgstr "Unable to delete Salt autosign for %s"
+msgid "Unable to create Salt autosign key %s"
+msgstr ""
+
+msgid "Unable to delete Salt autosign hostname for %s"
+msgstr ""
+
+msgid "Unable to delete Salt autosign key %s"
+msgstr ""
 
 msgid "Unable to delete Salt key for %s"
 msgstr "Unable to delete Salt key for %s"
@@ -481,10 +490,8 @@ msgstr "Unable to fetch Salt states list"
 msgid "Unable to fetch autosign list"
 msgstr "Unable to fetch autosign list"
 
-msgid ""
-"Unable to generate output, Check log files\n"
-msgstr ""
-"Unable to generate output, Check log files\n"
+msgid "Unable to generate output, Check log files"
+msgstr "Unable to generate output, Check log files"
 
 msgid "Unable to reject Salt key for %s"
 msgstr "Unable to reject Salt key for %s"
@@ -492,8 +499,8 @@ msgstr "Unable to reject Salt key for %s"
 msgid "Unable to run Salt state.highstate for %s"
 msgstr "Unable to run Salt state.highstate for %s"
 
-msgid "Unable to set Salt autosign for %s"
-msgstr "Unable to set Salt autosign for %s"
+msgid "Unable to set Salt autosign hostname for %s"
+msgstr ""
 
 msgid "Unaccepted"
 msgstr "Unaccepted"
@@ -507,6 +514,9 @@ msgstr "Update a Salt Key"
 msgid "Update a minion"
 msgstr "Update a minion"
 
+msgid "Update the Salt parameters of a host group"
+msgstr ""
+
 msgid "Updated hosts: changed salt environment"
 msgstr ""