foreman_salt 14.1.0 → 15.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '083d09f673c4a240a307a4392a31ce92f1c17c7a11706f751caa13482059ebcb'
-  data.tar.gz: ffd19624c13fc45f5c68c280e0700c16d8ef0d60a9df88371e5b14f783d63212
+  metadata.gz: 70d9aa772eb864b39ab763151da7ca8238f2c7da9a06772353cd95af7a5d395a
+  data.tar.gz: 7e7dd610cef59615ba6cf805499bdbff69faddec9a122b4c980ebd1e0ea34f0e
 SHA512:
-  metadata.gz: 2ed29a4e256bc28f857fc6c3597f6b25a1d828b44ee4e50f851dcf3928b21b9d2d6f13c93848e06ca630f55bf3f824ea33a71c2e641591ae28925e1f6b73aa26
-  data.tar.gz: ba3b5cefb64dd18a6c3817fd6abf8016ecbfa86111e52349ebd68676225a003093998265deea497f57c14000971c06c074224f55d646721384cabf2c22173740
+  metadata.gz: 31f7da6eaf92919ca5821f98c050701c583d7ee719fe1f1a50d313b2d4821b7088041b6c5f67cb0898ea7fb84a27e14acf875d3cca1cd76d8c8e96900c16978d
+  data.tar.gz: 063771b9e0f2446fb8103c12ee8b642bdaf7c52a00191623e012dad2be8cbac2d04723056a44b57bd1474cac3a4b438abc5372b2967bd13545bb0be38d21ab0b

data/app/controllers/foreman_salt/minions_controller.rb

@@ -3,7 +3,7 @@ module ForemanSalt
     include ::Foreman::Controller::SmartProxyAuth
     include ::Foreman::Controller::Parameters::Host
 
-    before_action :find_resource, only: %i[node run]
+    before_action :find_resource, only: %i[node]
     add_smart_proxy_filters :node, features: 'Salt'
 
     def node
@@ -27,15 +27,6 @@ module ForemanSalt
       render(plain: _('Unable to generate output, Check log files\n'), status: :precondition_failed) && return
     end
 
-    def run
-      if @minion.saltrun!
-        success _('Successfully executed, check log files for more details')
-      else
-        error @minion.errors[:base].to_sentence
-      end
-      redirect_to host_path(@minion)
-    end
-
     def salt_environment_selected
       if params[:host][:salt_environment_id].present?
         @salt_environment = ::ForemanSalt::SaltEnvironment.friendly.find(params[:host][:salt_environment_id])
@@ -48,8 +39,6 @@ module ForemanSalt
 
     def action_permission
       case params[:action]
-      when 'run'
-        :saltrun
       when 'node'
         :view
       when 'salt_environment_selected'

data/app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb

@@ -11,20 +11,6 @@ module ForemanSalt
            end)]).flatten.compact
       end
 
-      def host_title_actions(host)
-        unless Setting[:salt_hide_run_salt_button]
-          title_actions(
-            button_group(
-              if host.try(:salt_proxy)
-                link_to_if_authorized(_('Run Salt'), { controller: :'foreman_salt/minions', action: :run, id: host },
-                  title: _('Trigger a state.highstate run on a node'), class: 'btn btn-primary')
-              end
-            )
-          )
-        end
-        super(host)
-      end
-
       def multiple_actions
         actions = super
         if authorized_for(controller: :hosts, action: :edit)

data/app/models/foreman_salt/concerns/host_managed_extensions.rb

@@ -80,18 +80,6 @@ module ForemanSalt
         salt_proxy.to_s
       end
 
-      def saltrun!
-        if salt_proxy.blank?
-          errors.add(:base, _("No Salt master defined - can't continue"))
-          logger.warn 'Unable to execute salt run, no salt proxies defined'
-          return false
-        end
-        ProxyAPI::Salt.new(url: salt_proxy.url).highstate name
-      rescue StandardError => e
-        errors.add(:base, _('Failed to execute state.highstate: %s') % e)
-        false
-      end
-
       def salt_modules_in_host_environment
         return unless salt_modules.any?
 
@@ -102,7 +90,7 @@ module ForemanSalt
         end
       end
 
-      def derive_salt_grains(use_autosign: False)
+      def derive_salt_grains(use_autosign: false)
         grains = {}
         begin
           Rails.logger.info('Derive Salt Grains from host_params and autosign_key')

data/app/models/setting/salt.rb

@@ -3,13 +3,7 @@ class Setting
     def self.default_settings
       [
         set('salt_namespace_pillars', N_("Namespace Foreman pillars under 'foreman' key"), false),
-        set('salt_hide_run_salt_button', N_('Hide the Run Salt state.highstate button on the host details page'), false),
       ]
     end
-
-    def self.load_defaults
-      super
-      Setting['salt_hide_run_salt_button'] = true if ForemanSalt.with_remote_execution?
-    end
   end
 end

data/app/services/foreman_salt/report_importer.rb

@@ -72,7 +72,7 @@ module ForemanSalt
                   :notice
                 end
 
-        source = Source.find_or_create(resource)
+        source = Source.find_or_create_by(value: resource)
 
         message = if result['changes']['diff']
                     result['changes']['diff']
@@ -84,7 +84,7 @@ module ForemanSalt
                     'No message available'
                   end
 
-        message = Message.find_or_create(message)
+        message = Message.find_or_create_by(value: message)
         Log.create(message_id: message.id, source_id: source.id, report: @report, level: level)
       end
     end
@@ -161,9 +161,9 @@ module ForemanSalt
       status = ConfigReportStatusCalculator.new(counters: { 'failed' => @raw.size }).calculate
       @report = ConfigReport.create(host: @host, reported_at: Time.zone.now, status: status, metrics: {})
 
-      source = Source.find_or_create('Salt')
+      source = Source.find_or_create_by(value: 'Salt')
       @raw.each do |failure|
-        message = Message.find_or_create(failure)
+        message = Message.find_or_create_by(value: failure)
         Log.create(message_id: message.id, source_id: source.id, report: @report, level: :err)
       end
     end

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

@@ -17,5 +17,4 @@
   <% end %>
 </table>
 
-<%= page_entries_info @autosign %>
-<%= will_paginate @autosign %>
+<%= will_paginate_with_info @autosign %>

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

@@ -24,6 +24,4 @@
   <% end %>
 </table>
 
-<%= page_entries_info @salt_environments %>
-<%= will_paginate @salt_environments %>
-
+<%= will_paginate_with_info @salt_environments %>

data/app/views/foreman_salt/salt_keys/index.erb

@@ -29,6 +29,4 @@
   <% end %>
 </table>
 
-<%= page_entries_info @keys  %>
-<%= will_paginate @keys %>
-
+<%= will_paginate_with_info @keys %>

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

@@ -39,5 +39,4 @@
   <% end %>
 </table>
 
-<%= page_entries_info @salt_modules %>
-<%= will_paginate @salt_modules %>
+<%= will_paginate_with_info @salt_modules %>

data/db/migrate/20220118160349_drop_salt_hide_run_salt_button_setting.rb

@@ -0,0 +1,5 @@
+class DropSaltHideRunSaltButtonSetting < ActiveRecord::Migration[6.0]
+  def up
+    Setting.where(name: 'salt_hide_run_salt_button').delete_all
+  end
+end

data/db/seeds.d/76-job_templates.rb

@@ -15,8 +15,10 @@ if ForemanSalt.with_remote_execution?
         ForemanSalt.register_rex_feature
       end
       JobTemplate.without_auditing do
-        Dir[File.join("#{ForemanSalt::Engine.root}/app/views/foreman_salt/"\
-                    'job_templates/**/*.erb')].each do |template|
+        templates = Dir[File.join("#{ForemanSalt::Engine.root}/app/views/foreman_salt/"\
+                    'job_templates/**/*.erb')]
+        first = templates.select { |d| File.basename(d).start_with?('salt_run_function') }
+        (first + (templates - first)).each do |template|
           sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
           template = JobTemplate.import_raw!(File.read(template),
             default: true,

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '14.1.0'.freeze
+  VERSION = '15.0.0'.freeze
 end

data/test/functional/minions_controller_test.rb

@@ -6,7 +6,6 @@ module ForemanSalt
       User.current = User.anonymous_admin
       Setting::Salt.load_defaults
       Setting[:restrict_registered_smart_proxies] = true
-      Setting[:require_ssl_smart_proxies] = false
 
       @proxy = FactoryBot.create(:smart_proxy, :with_salt_feature)
       Resolv.any_instance.stubs(:getnames).returns([@proxy.to_s])

data/test/integration/hosts_js_test.rb

@@ -20,22 +20,6 @@ module ForemanSalt
       end
     end
 
-    describe 'hosts details run salt button' do
-      test 'verify run salt button availabilty' do
-        Setting[:salt_hide_run_salt_button] = false
-        visit hosts_path
-        click_link @host.fqdn
-        assert page.has_link?('Run Salt')
-      end
-
-      test 'verify run salt button absence' do
-        Setting[:salt_hide_run_salt_button] = true
-        visit hosts_path
-        click_link @host.fqdn
-        assert_not page.has_link?('Run Salt')
-      end
-    end
-
     describe 'hosts index salt multiple actions' do
       test 'change salt master action' do
         visit hosts_path

data/test/integration/salt_autosign_test.rb

@@ -26,7 +26,6 @@ module ForemanSalt
       visit smart_proxy_salt_autosign_index_path(smart_proxy_id: @proxy.id)
       assert find_link('Keys').visible?, 'Keys is not visible'
       assert has_title?("Autosign entries for #{@proxy.hostname}"), 'Page title does not appear'
-      assert has_content?('Displaying'), 'Pagination "Display ..." does not appear'
     end
 
     test 'has list of autosign' do

data/test/integration/salt_keys_test.rb

@@ -28,7 +28,6 @@ module ForemanSalt
     test 'index page' do
       visit smart_proxy_salt_keys_path(smart_proxy_id: @proxy.id)
       assert has_title?("Salt Keys on #{@proxy}"), 'Page title does not appear'
-      assert has_content?('Displaying'), 'Pagination "Display ..." does not appear'
     end
 
     test 'has list of keys' do

data/test/unit/grains_importer_test.rb

@@ -14,7 +14,7 @@ module ForemanSalt
 
       grains = JSON.parse(File.read(File.join(Foreman::Application.root, 'test', 'static_fixtures', 'facts', 'grains_centos.json')))
       @imported_host = ::Host::Managed.import_host grains['name'], 'salt'
-      @imported_host.import_facts grains['facts'].with_indifferent_access
+      ::HostFactImporter.new(@imported_host).import_facts grains['facts'].with_indifferent_access
     end
 
     test 'importing salt grains creates a host' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 14.1.0
+  version: 15.0.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -196,6 +196,7 @@ files:
 - db/migrate/20190515112233_add_salt_module_id_to_lookup_keys.rb
 - db/migrate/20210312150333_add_salt_autosign_to_host.rb
 - db/migrate/20211108211312_add_missing_permissions.rb
+- db/migrate/20220118160349_drop_salt_hide_run_salt_button_setting.rb
 - db/seeds.d/75-salt_seeds.rb
 - db/seeds.d/76-job_templates.rb
 - lib/foreman_salt.rb