foreman_salt 10.2.0 → 10.3.0

data/test/functional/hosts_controller_test.rb

@@ -0,0 +1,122 @@
+require 'test_plugin_helper'
+
+module ForemanSalt
+  class HostsControllerExtensionsTest < ActionController::TestCase
+    tests ::HostsController
+
+    describe "setting salt master proxy on multiple hosts" do
+      before do
+        setup_user "edit"
+        as_admin do
+          @hosts = FactoryBot.create_list(:host, 2)
+          @proxy = FactoryBot.create(:smart_proxy, :with_salt_feature)
+        end
+      end
+
+      test 'user without edit permission should not be able to change salt master' do
+        @request.env['HTTP_REFERER'] = hosts_path
+
+        params = { :host_ids => @hosts.map(&:id),
+                   :proxy => { :proxy_id => '' } }
+
+        post :update_multiple_salt_master, params: params,
+          session: set_session_user.merge(:user => users(:one).id)
+        assert_response :forbidden
+      end
+
+      test "should change the salt master proxy" do
+        @request.env['HTTP_REFERER'] = hosts_path
+
+        params = { :host_ids => @hosts.map(&:id),
+                   :proxy => { :proxy_id => @proxy.id } }
+
+        post :update_multiple_salt_master, params: params,
+        session: set_session_user.merge(:user => users(:admin).id)
+
+        assert_empty flash[:error]
+
+        @hosts.each do |host|
+          as_admin do
+            assert_equal @proxy, host.reload.salt_proxy
+          end
+        end
+      end
+
+      test "should clear the salt master proxy of multiple hosts" do
+        @request.env['HTTP_REFERER'] = hosts_path
+
+        params = { :host_ids => @hosts.map(&:id),
+                   :proxy => { :proxy_id => '' } }
+
+        post :update_multiple_salt_master, params: params,
+          session: set_session_user.merge(:user => users(:admin).id)
+
+        assert_empty flash[:error]
+
+        @hosts.each do |host|
+          as_admin do
+            assert_nil host.reload.salt_proxy
+          end
+        end
+      end
+    end
+
+    describe "setting salt environment on multiple hosts" do
+      before do
+        setup_user "edit"
+        as_admin do
+          @hosts = FactoryBot.create_list(:host, 2)
+          @proxy = FactoryBot.create(:smart_proxy, :with_salt_feature)
+          @salt_environment = FactoryBot.create :salt_environment
+        end
+      end
+
+      test 'user without edit permission should not be able to change salt environment' do
+        @request.env['HTTP_REFERER'] = hosts_path
+
+        params = { :host_ids => @hosts.map(&:id),
+                   :salt_environment => { :id => @salt_environment.id } }
+
+        post :update_multiple_salt_environment, params: params,
+        session: set_session_user.merge(:user => users(:one).id)
+        assert_response :forbidden
+      end
+
+      test "should change the salt environment" do
+        @request.env['HTTP_REFERER'] = hosts_path
+
+        params = { :host_ids => @hosts.map(&:id),
+                   :salt_environment => { :id => @salt_environment.id } }
+
+        post :update_multiple_salt_environment, params: params,
+        session: set_session_user.merge(:user => users(:admin).id)
+
+        assert_empty flash[:error]
+
+        @hosts.each do |host|
+          as_admin do
+            assert_equal @salt_environment, host.reload.salt_environment
+          end
+        end
+      end
+
+      test "should clear the salt environment of multiple hosts" do
+        @request.env['HTTP_REFERER'] = hosts_path
+
+        params = { :host_ids => @hosts.map(&:id),
+                   :salt_environment => { :id => '' } }
+
+        post :update_multiple_salt_environment, params: params,
+          session: set_session_user.merge(:user => users(:admin).id)
+
+        assert_empty flash[:error]
+
+        @hosts.each do |host|
+          as_admin do
+            assert_nil host.reload.salt_environment
+          end
+        end
+      end
+    end
+  end
+end

data/test/integration/hosts_js_test.rb

@@ -0,0 +1,82 @@
+require 'test_plugin_helper'
+require 'integration_test_helper'
+
+module ForemanSalt
+  class HostJSTest < IntegrationTestWithJavascript
+    def index_modal
+      page.find('#confirmation-modal')
+    end
+
+    def multiple_actions_div
+      page.find('#submit_multiple')
+    end
+
+    setup do
+      as_admin do
+        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)
+      end
+    end
+
+    describe "hosts index salt multiple actions" do
+      test 'change salt master action' do
+        visit hosts_path
+        page.find('#check_all').trigger('click')
+
+        # Ensure and wait for all hosts to be checked, and that no unchecked hosts remain
+        assert page.has_no_selector?('input.host_select_boxes:not(:checked)')
+
+        # Dropdown visible?
+        assert multiple_actions_div.find('.dropdown-toggle').visible?
+        multiple_actions_div.find('.dropdown-toggle').click
+        assert multiple_actions_div.find('ul').visible?
+
+        # Hosts are added to cookie
+        host_ids_on_cookie = JSON.parse(CGI.unescape(page.driver.cookies['_ForemanSelectedhosts'].value))
+        assert(host_ids_on_cookie.include?(@host.id))
+
+        within('#submit_multiple') do
+          click_on('Change Salt Master')
+        end
+
+        assert index_modal.visible?, "Modal window was shown"
+        page.find('#proxy_proxy_id').find("option[value='#{@host.salt_proxy.id}']").select_option
+
+        # remove hosts cookie on submit
+        index_modal.find('.btn-primary').click
+        assert_current_path hosts_path
+        assert_empty(page.driver.cookies['_ForemanSelectedhosts'])
+      end
+
+      test 'change salt environment action' do
+        visit hosts_path
+        page.find('#check_all').trigger('click')
+
+        # Ensure and wait for all hosts to be checked, and that no unchecked hosts remain
+        assert page.has_no_selector?('input.host_select_boxes:not(:checked)')
+
+        # Dropdown visible?
+        assert multiple_actions_div.find('.dropdown-toggle').visible?
+        multiple_actions_div.find('.dropdown-toggle').click
+        assert multiple_actions_div.find('ul').visible?
+
+        # Hosts are added to cookie
+        host_ids_on_cookie = JSON.parse(CGI.unescape(page.driver.cookies['_ForemanSelectedhosts'].value))
+        assert(host_ids_on_cookie.include?(@host.id))
+
+        within('#submit_multiple') do
+          click_on('Change Salt Environment')
+        end
+
+        assert index_modal.visible?, "Modal window was shown"
+        page.find('#salt_environment_id').find("option[value='#{@host.salt_environment.id}']").select_option
+
+        # remove hosts cookie on submit
+        index_modal.find('.btn-primary').click
+        assert_current_path hosts_path
+        assert_empty(page.driver.cookies['_ForemanSelectedhosts'])
+      end
+    end
+  end
+end

data/test/unit/highstate_pchanges.json

@@ -0,0 +1,18 @@
+{
+    "saltclient713.example.com": {
+        "file_|-/etc/motd_|-/etc/motd_|-managed": {
+            "comment": "The file /etc/motd is set to be changed",
+            "pchanges": {
+                "diff": "--- \n+++ \n@@ -8,7 +8,7 @@\n Kernel: 4.12.14-23-default\n Memory: 1986 MB\n \n-The server is managed using a configuration management system (saltstack.org).\n+This server is managed using a configuration management system (saltstack.org).\n Changes made to this box directly will likely be over-written by SALT. Instead\n modify server configuration via the configuration management git repository.\n ------------------------------------------------------------------------------\n"
+            },
+            "name": "/etc/motd",
+            "start_time": "19:15:44.510229",
+            "result": null,
+            "duration": 175.936,
+            "__run_num__": 0,
+            "__sls__": "motd",
+            "changes": {},
+            "__id__": "/etc/motd"
+        }
+    }
+}

data/test/unit/hostgroup_extensions_test.rb

@@ -21,20 +21,26 @@ module ForemanSalt
 
     test 'child host group inherits salt proxy from child parent' do
       parent = FactoryBot.create :hostgroup
-      child_one = FactoryBot.create :hostgroup, :parent => parent
-      child_one.salt_proxy = @proxy
-      child_one.reload
+      child_one = FactoryBot.create :hostgroup, :parent => parent, :salt_proxy => @proxy
       child_two = FactoryBot.create :hostgroup, :parent => child_one
+      assert_not_nil parent
+      assert_not_nil child_one
+      assert_not_nil child_two
+      assert_not_nil child_one.salt_proxy
+      assert_not_nil child_two.salt_proxy
       assert_equal child_two.salt_proxy, child_one.salt_proxy
     end
 
     test 'child host group inherits salt environment from child parent' do
       environment = FactoryBot.create :salt_environment
       parent = FactoryBot.create :hostgroup
-      child_one = FactoryBot.create :hostgroup, :parent => parent
-      child_one.salt_environment = environment
-      child_one.reload
+      child_one = FactoryBot.create :hostgroup, :parent => parent, :salt_environment => environment
       child_two = FactoryBot.create :hostgroup, :parent => child_one
+      assert_not_nil parent
+      assert_not_nil child_one
+      assert_not_nil child_two
+      assert_not_nil child_one.salt_environment
+      assert_not_nil child_two.salt_environment
       assert_equal child_two.salt_environment, child_one.salt_environment
     end
 

data/test/unit/report_importer_test.rb

@@ -7,6 +7,7 @@ module ForemanSalt
       Setting[:create_new_host_when_facts_are_uploaded] = true
 
       @report = JSON.parse(File.read(File.join(Engine.root, 'test', 'unit', 'highstate.json')))
+      @report_pchanges = JSON.parse(File.read(File.join(Engine.root, 'test', 'unit', 'highstate_pchanges.json')))
 
       @host = 'saltclient713.example.com'
     end
@@ -29,5 +30,22 @@ module ForemanSalt
       assert_equal status['applied'], 9
       assert_equal status['failed'], 3
     end
+
+    test 'report has salt origin and expected content' do
+      ForemanSalt::ReportImporter.import(@report)
+      report = Host.find_by_name(@host).reports.last
+      assert_equal 'Salt', report.origin
+      assert_equal 'pkg_|-postfix_|-postfix_|-installed', report.logs.first.source.value
+      assert_equal 'Package postfix is already installed.', report.logs.first.message.value
+    end
+
+    test 'report with pchanges has salt origin and expected content' do
+      ForemanSalt::ReportImporter.import(@report_pchanges)
+      report = Host.find_by_name(@host).reports.last
+      status = report.status
+      assert_equal 'Salt', report.origin
+      assert_equal 'file_|-/etc/motd_|-/etc/motd_|-managed', report.logs.first.source.value
+      assert_equal status['pending'], 1
+    end
   end
 end

data/test/unit/salt_fact_importer_test.rb

@@ -0,0 +1,23 @@
+require 'test_plugin_helper'
+
+module ForemanSalt
+  class SaltFactImpoterTest < ActiveSupport::TestCase
+    def setup
+      @host = FactoryBot.build(:host)
+    end
+
+    test 'should have fact set' do
+      importer = FactImporter.new(@host, 'a' => 'b')
+      assert_equal({ 'a' => 'b' }, importer.send(:facts))
+    end
+
+    test 'should have Salt as origin' do
+      importer = FactImporter.new(@host, 'a' => 'b')
+      importer.stubs(:ensure_no_active_transaction).returns(true)
+      importer.import!
+      imported_fact = FactName.find_by_name('a')
+      assert_equal 'a', imported_fact.name
+      assert_equal 'foreman_salt/Salt', imported_fact.origin
+    end
+  end
+end

data/test/unit/salt_fact_parser_test.rb

@@ -2,22 +2,20 @@ require 'test_plugin_helper'
 
 module ForemanSalt
   class SaltFactsParserTest < ActiveSupport::TestCase
-    attr_reader :importer
-
     def setup
       grains = JSON.parse(File.read(File.join(Engine.root, 'test', 'unit', 'grains_centos.json')))
-      @importer = FactParser.new grains["facts"]
+      @facts_parser = FactParser.new grains["facts"]
       User.current = users :admin
     end
 
     test "should return list of interfaces" do
-      assert importer.interfaces.present?
-      assert_not_nil importer.suggested_primary_interface(FactoryBot.build(:host))
-      assert importer.interfaces.key?(importer.suggested_primary_interface(FactoryBot.build(:host)).first)
+      assert @facts_parser.interfaces.present?
+      assert_not_nil @facts_parser.suggested_primary_interface(FactoryBot.build(:host))
+      assert @facts_parser.interfaces.key?(@facts_parser.suggested_primary_interface(FactoryBot.build(:host)).first)
     end
 
     test "should set operatingsystem correctly" do
-      os = importer.operatingsystem
+      os = @facts_parser.operatingsystem
       assert os.present?
       assert_equal 'CentOS', os.name
       assert_equal '6', os.major
@@ -26,21 +24,21 @@ module ForemanSalt
     end
 
     test "should set domain correctly" do
-      domain = importer.domain
+      domain = @facts_parser.domain
       assert domain.present?
       assert_equal 'example.com', domain.name
     end
 
     test "should set ip correctly" do
-      assert_equal '10.7.13.141', importer.ip
+      assert_equal '10.7.13.141', @facts_parser.ip
     end
 
     test "should set primary_interface correctly" do
-      assert_equal 'eth0', importer.primary_interface
+      assert_equal 'eth0', @facts_parser.primary_interface
     end
 
     test "should set mac correctly" do
-      assert_equal '52:54:00:35:30:2a', importer.mac
+      assert_equal '52:54:00:35:30:2a', @facts_parser.mac
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 10.2.0
+  version: 10.3.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -48,6 +48,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/images/foreman_salt/Salt.png
 - app/assets/javascripts/foreman_salt/states.js
 - app/controllers/foreman_salt/api/v2/base_controller.rb
 - app/controllers/foreman_salt/api/v2/jobs_controller.rb
@@ -71,6 +72,7 @@ files:
 - app/helpers/concerns/foreman_salt/smart_proxies_helper_extensions.rb
 - app/helpers/foreman_salt/salt_keys_helper.rb
 - app/helpers/foreman_salt/salt_modules_helper.rb
+- app/helpers/foreman_salt/salt_reports_helper.rb
 - app/lib/actions/foreman_salt/report_import.rb
 - app/lib/proxy_api/salt.rb
 - app/models/foreman_salt/concerns/host_managed_extensions.rb
@@ -127,6 +129,8 @@ files:
 - app/views/foreman_salt/salt_modules/import.html.erb
 - app/views/foreman_salt/salt_modules/index.html.erb
 - app/views/foreman_salt/salt_modules/new.html.erb
+- app/views/hosts/select_multiple_salt_environment.html.erb
+- app/views/hosts/select_multiple_salt_master.html.erb
 - config/routes.rb
 - db/migrate/20140813081913_add_salt_proxy_to_host_and_host_group.rb
 - db/migrate/20140817210214_create_salt_modules.rb
@@ -144,12 +148,20 @@ files:
 - lib/foreman_salt/plugin.rb
 - lib/foreman_salt/version.rb
 - lib/tasks/foreman_salt_tasks.rake
+- locale/Makefile
+- locale/action_names.rb
+- locale/de/foreman_salt.edit.po
+- locale/de/foreman_salt.po
+- locale/en/foreman_salt.po
+- locale/foreman_salt.pot
 - test/factories/foreman_salt_factories.rb
 - test/functional/api/v2/salt_autosign_controller_test.rb
 - test/functional/api/v2/salt_environments_controller_test.rb
 - test/functional/api/v2/salt_keys_controller_test.rb
 - test/functional/api/v2/salt_states_controller_test.rb
+- test/functional/hosts_controller_test.rb
 - test/functional/minions_controller_test.rb
+- test/integration/hosts_js_test.rb
 - test/integration/salt_autosign_test.rb
 - test/integration/salt_environment_test.rb
 - test/integration/salt_keys_test.rb
@@ -158,9 +170,11 @@ files:
 - test/unit/grains_centos.json
 - test/unit/grains_importer_test.rb
 - test/unit/highstate.json
+- test/unit/highstate_pchanges.json
 - test/unit/host_extensions_test.rb
 - test/unit/hostgroup_extensions_test.rb
 - test/unit/report_importer_test.rb
+- test/unit/salt_fact_importer_test.rb
 - test/unit/salt_fact_parser_test.rb
 - test/unit/salt_keys_test.rb
 - test/unit/salt_modules_test.rb
@@ -191,15 +205,18 @@ summary: Foreman Plug-in for Salt
 test_files:
 - test/integration/salt_environment_test.rb
 - test/integration/salt_module_test.rb
+- test/integration/hosts_js_test.rb
 - test/integration/salt_autosign_test.rb
 - test/integration/salt_keys_test.rb
 - test/factories/foreman_salt_factories.rb
 - test/unit/grains_importer_test.rb
+- test/unit/highstate_pchanges.json
 - test/unit/hostgroup_extensions_test.rb
 - test/unit/highstate.json
 - test/unit/salt_fact_parser_test.rb
 - test/unit/salt_modules_test.rb
 - test/unit/grains_centos.json
+- test/unit/salt_fact_importer_test.rb
 - test/unit/report_importer_test.rb
 - test/unit/salt_keys_test.rb
 - test/unit/host_extensions_test.rb
@@ -209,3 +226,4 @@ test_files:
 - test/functional/api/v2/salt_states_controller_test.rb
 - test/functional/api/v2/salt_environments_controller_test.rb
 - test/functional/api/v2/salt_keys_controller_test.rb
+- test/functional/hosts_controller_test.rb