foreman_salt 10.3.1 → 11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac88c976fbe0257ffcbdc2b960359a59948fe4035345b04adf81d9ba3d2e2cc1
-  data.tar.gz: '086fbe02ad064f3070d62f388e6a10ed3cbb5e6f6b7efc1b42b93e69f8a02129'
+  metadata.gz: 237aa18aa45a9c6138228eb0149eff14f13f9cfae8fbab62300feaa4b887e67e
+  data.tar.gz: 683c9bbb3f7db41096c7cd7110bbe2e2d385ea3c54083ad3b80908f5a53d7c36
 SHA512:
-  metadata.gz: dbb3d6bf6e6e8e9ad63c4933098be1937d41b16b6a34b41bc9c33507694a214c8b825f9c7cbf397801fe36acaa24a0756de948ef825b5c338d57cb0b4525982b
-  data.tar.gz: dd9ee2e2ef2ef0aa08a460d298f97bcc9e76ac477a088e0ab9967e9797fbc982b77b4e8d8073a2cfd519919c4c26a20f355ccd09484640d37ae99f93a7479b3b
+  metadata.gz: f4f535cfb2bf52e8f32ae4a6041c7aae31599103916bb9248656bd433261c30383d4cc1892536f84006df10ff4232bdad941c748731c7c340d7949afc41d4b97
+  data.tar.gz: 84961ea84824648272a657042422694ac658ed87d7fc120e235608430d6a5f6873b0f62df46023adfabad0ddc69adab294486626adb9f241839a4e2a2332f624

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

@@ -10,14 +10,16 @@ module ForemanSalt
       end
 
       def host_title_actions(host)
-        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
+        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
 

data/app/models/setting/salt.rb

@@ -4,8 +4,10 @@ class Setting::Salt < Setting
 
     transaction do
       [
-        set('salt_namespace_pillars', N_("Namespace Foreman pillars under 'foreman' key"), false)
+        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)
       ].each { |s| self.create! s.update(:category => 'Setting::Salt') }
+      Setting['salt_hide_run_salt_button'] = true if ForemanSalt.with_remote_execution?
     end
     true
   end

data/app/views/foreman_salt/job_templates/salt_run_function_-_ssh_default.erb

@@ -0,0 +1,23 @@
+<%#
+name: Salt Run function - SSH default
+job_category: Salt
+description_format: Run Salt function on host
+provider_type: SSH
+snippet: false
+template_inputs:
+- name: function
+  required: true
+  input_type: user
+  description: "Salt function to run on the host, e.g: \r\n\r\ncmd.run 'df -h'"
+  advanced: false
+- name: test-run
+  required: false
+  input_type: user
+  description: Enables test run
+  options: "no\r\nyes"
+  advanced: true
+kind: job_template
+%>
+
+salt-call <%= input('function') %> \
+<%= ' test=true' if !input('test-run').blank? && input('test-run') == 'yes' -%>

data/app/views/foreman_salt/job_templates/salt_run_state_highstate_-_ssh_default.erb

@@ -0,0 +1,14 @@
+<%#
+name: Salt Run state.highstate - SSH default
+job_category: Salt
+description_format: Run Salt state.highstate on host
+feature: foreman_salt_run_state_highstate
+provider_type: SSH
+snippet: false
+foreign_input_sets:
+- template: Salt Run function - SSH default
+  exclude: function
+kind: job_template
+%>
+
+<%= render_template('Salt Run function - SSH default', :function => 'state.highstate') %>

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+organizations = Organization.unscoped.all
+locations = Location.unscoped.all
+if ForemanSalt.with_remote_execution?
+  User.as_anonymous_admin do
+    JobTemplate.without_auditing do
+      Dir[File.join("#{ForemanSalt::Engine.root}/app/views/foreman_salt/"\
+                    'job_templates/**/*.erb')].each do |template|
+        sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
+        template = JobTemplate.import_raw!(File.read(template),
+                                           :default => true,
+                                           :locked => true,
+                                           :update => sync)
+        template.organizations = organizations if SETTINGS[:organizations_enabled] && template.present?
+        template.locations = locations if SETTINGS[:locations_enabled] && template.present?
+      end
+    end
+  end
+end

data/lib/foreman_salt/engine.rb

@@ -63,4 +63,9 @@ module ForemanSalt
       require 'foreman_salt/extensions'
     end
   end
+
+  # check whether foreman_remote_execution to integrate is available in the system
+  def self.with_remote_execution?
+    RemoteExecutionFeature rescue false
+  end
 end

data/lib/foreman_salt/plugin.rb

@@ -144,5 +144,14 @@ Foreman::Plugin.register :foreman_salt do
   parameter_filter Host::Managed, :salt_proxy_id, :salt_proxy_name,
     :salt_environment_id, :salt_environment_name, :salt_modules => [],
     :salt_module_ids => []
+
+  if ForemanSalt.with_remote_execution? && Gem::Version.new(ForemanRemoteExecution::VERSION) >= Gem::Version.new('1.2.3')
+    options = {
+      :description => N_("Run Salt state.highstate"),
+      :host_action_button => true
+    }
+
+    RemoteExecutionFeature.register(:foreman_salt_run_state_highstate, N_("Run Salt"), options)
+  end
 end
 # rubocop:enable BlockLength

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '10.3.1'
+  VERSION = '11.0.0'
 end

data/test/integration/hosts_js_test.rb

@@ -16,6 +16,23 @@ module ForemanSalt
         proxy = FactoryBot.create(:smart_proxy, :with_salt_feature)
         salt_environment = FactoryBot.create(:salt_environment)
         @host = FactoryBot.create(:host, :salt_proxy => proxy, :salt_environment => salt_environment)
+        Setting::Salt.load_defaults
+      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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 10.3.1
+  version: 11.0.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -114,6 +114,8 @@ files:
 - app/views/foreman_salt/api/v2/salt_states/index.json.rabl
 - app/views/foreman_salt/api/v2/salt_states/main.json.rabl
 - app/views/foreman_salt/api/v2/salt_states/show.json.rabl
+- app/views/foreman_salt/job_templates/salt_run_function_-_ssh_default.erb
+- app/views/foreman_salt/job_templates/salt_run_state_highstate_-_ssh_default.erb
 - app/views/foreman_salt/salt_autosign/_form.html.erb
 - app/views/foreman_salt/salt_autosign/index.html.erb
 - app/views/foreman_salt/salt_autosign/new.html.erb
@@ -142,6 +144,7 @@ files:
 - db/migrate/20150509101505_add_primary_keys.rb
 - db/migrate/20161103104146_add_index_to_join_tables.rb
 - db/seeds.d/75-salt_seeds.rb
+- db/seeds.d/76-job_templates.rb
 - lib/foreman_salt.rb
 - lib/foreman_salt/engine.rb
 - lib/foreman_salt/extensions.rb