foreman_ansible 6.0.1 → 6.3.0

data/test/unit/concerns/host_managed_extensions_test.rb

@@ -9,8 +9,8 @@ class HostManagedExtensionsTest < ActiveSupport::TestCase
     @role2 = FactoryBot.create(:ansible_role)
     @role3 = FactoryBot.create(:ansible_role)
 
-    @hostgroup_parent = FactoryBot.create(:hostgroup,
-                                          :ansible_roles => [@role2])
+    @hostgroup_parent = FactoryBot.create(:hostgroup)
+    FactoryBot.create(:hostgroup_ansible_role, hostgroup_id: @hostgroup_parent.id, ansible_role_id: @role2.id)
     @hostgroup = FactoryBot.create(:hostgroup, :parent => @hostgroup_parent)
     @host = FactoryBot.build_stubbed(:host, :ansible_roles => [@role1])
     @another_host = FactoryBot.build_stubbed(:host, :ansible_roles => [@role3])
@@ -23,7 +23,7 @@ class HostManagedExtensionsTest < ActiveSupport::TestCase
 
     test 'returns assigned and inherited roles for host with a hostgroup' do
       @host.hostgroup = @hostgroup
-      @host.all_ansible_roles.must_equal [@role1, @role2]
+      @host.all_ansible_roles.must_equal [@role2, @role1]
     end
   end
 
@@ -48,4 +48,18 @@ class HostManagedExtensionsTest < ActiveSupport::TestCase
       assert Host::Managed.import_host('192.168.128.27').new_record?
     end
   end
+
+  test 'should correctly order roles for host' do
+    host = FactoryBot.create(:host)
+    FactoryBot.create(:host_ansible_role, :ansible_role_id => @role1.id, :position => 1, :host_id => host.id)
+    FactoryBot.create(:host_ansible_role, :ansible_role_id => @role2.id, :position => 2, :host_id => host.id)
+    FactoryBot.create(:host_ansible_role, :ansible_role_id => @role3.id, :position => 0, :host_id => host.id)
+    host.ansible_roles.must_equal [@role3, @role1, @role2]
+  end
+
+  test 'should order hostgroup roles before host roles' do
+    host = FactoryBot.create(:host, :hostgroup => @hostgroup)
+    FactoryBot.create(:host_ansible_role, :ansible_role_id => @role1.id, :position => 0, :host_id => host.id)
+    host.all_ansible_roles.must_equal [@role2, @role1]
+  end
 end

data/test/unit/concerns/hostgroup_extensions_test.rb

@@ -9,22 +9,23 @@ class HostgroupExtensionsTest < ActiveSupport::TestCase
     @role2 = FactoryBot.create(:ansible_role)
     @role3 = FactoryBot.create(:ansible_role)
 
-    @hostgroup_parent = FactoryBot.create(:hostgroup,
-                                          :ansible_roles => [@role2])
-    @hostgroup = FactoryBot.create(:hostgroup, :ansible_roles => [@role1])
-    @host = FactoryBot.create(:host,
-                              :ansible_roles => [@role3],
-                              :hostgroup => @hostgroup)
+    @hostgroup_parent = FactoryBot.create(:hostgroup)
+    FactoryBot.create(:hostgroup_ansible_role, :hostgroup_id => @hostgroup_parent.id, :ansible_role_id => @role2.id, :position => 1)
+    @hostgroup = FactoryBot.create(:hostgroup)
+    FactoryBot.create(:hostgroup_ansible_role, :hostgroup_id => @hostgroup.id, :ansible_role_id => @role1.id, :position => 10)
+    @host = FactoryBot.create(:host, :hostgroup => @hostgroup)
+    FactoryBot.create(:host_ansible_role, :host_id => @host.id, :ansible_role_id => @role3.id)
   end
 
   describe '#all_ansible_roles' do
     test 'returns assigned roles without any parent hostgroup' do
+      @hostgroup.host_ansible_roles
       @hostgroup.all_ansible_roles.must_equal [@role1, @role3]
     end
 
     test 'returns assigned and inherited roles with from parent hostgroup' do
       @hostgroup.parent = @hostgroup_parent
-      @hostgroup.all_ansible_roles.must_equal [@role1, @role2, @role3]
+      @hostgroup.all_ansible_roles.must_equal [@role2, @role1, @role3]
     end
   end
 
@@ -49,4 +50,9 @@ class HostgroupExtensionsTest < ActiveSupport::TestCase
       @hostgroup.inherited_and_own_ansible_roles.must_equal [@role2, @role1]
     end
   end
+
+  test 'should return ordered roles for hostgroup' do
+    @hostgroup.parent = @hostgroup_parent
+    @hostgroup.inherited_and_own_ansible_roles.must_equal [@role2, @role1]
+  end
 end

data/test/unit/host_ansible_role_test.rb

@@ -12,7 +12,8 @@ class HostAnsibleRoleTest < ActiveSupport::TestCase
   describe 'uniqueness' do
     subject do
       HostAnsibleRole.new(:host => FactoryBot.build(:host),
-                          :ansible_role => FactoryBot.build(:ansible_role))
+                          :ansible_role => FactoryBot.build(:ansible_role),
+                          :position => 0)
     end
     should validate_uniqueness_of(:ansible_role_id).scoped_to(:host_id)
   end

data/test/unit/hostgroup_ansible_role_test.rb

@@ -13,7 +13,8 @@ class HostgroupAnsibleRoleTest < ActiveSupport::TestCase
     subject do
       HostgroupAnsibleRole.new(
         :hostgroup => FactoryBot.build(:hostgroup),
-        :ansible_role => FactoryBot.build(:ansible_role)
+        :ansible_role => FactoryBot.build(:ansible_role),
+        :position => 0
       )
     end
     should validate_uniqueness_of(:ansible_role_id).scoped_to(:hostgroup_id)

data/test/unit/ignore_roles_test.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+# Tests for testing the ignore list
+class IgnoreRolesTest < ActiveSupport::TestCase
+  include ForemanAnsible::AnsibleRolesDataPreparations
+
+  role1 = AnsibleRole.new(:name => 'foo')
+  role2 = AnsibleRole.new(:name => 'bar')
+  role3 = AnsibleRole.new(:name => 'hello.txt')
+  role4 = AnsibleRole.new(:name => 'hello.yml')
+  role5 = AnsibleRole.new(:name => 'foo.yml')
+
+  describe 'It should Ignore Role' do
+    test 'If role starts with h' do
+      Setting.stubs(:[]).with(:ansible_roles_to_ignore).returns(['h*'])
+      assert_not role_match_excluded_roles(role1.name)
+      assert_not role_match_excluded_roles(role2.name)
+      assert role_match_excluded_roles(role3.name)
+      assert role_match_excluded_roles(role4.name)
+      assert_not role_match_excluded_roles(role5.name)
+    end
+
+    test 'If role ends with .yml' do
+      Setting.stubs(:[]).with(:ansible_roles_to_ignore).returns(['*.yml'])
+      assert_not role_match_excluded_roles(role1.name)
+      assert_not role_match_excluded_roles(role2.name)
+      assert_not role_match_excluded_roles(role3.name)
+      assert role_match_excluded_roles(role4.name)
+      assert role_match_excluded_roles(role5.name)
+    end
+
+    test 'If role have o char in the middle' do
+      Setting.stubs(:[]).with(:ansible_roles_to_ignore).returns(['*o*'])
+      assert role_match_excluded_roles(role1.name)
+      assert_not role_match_excluded_roles(role2.name)
+      assert role_match_excluded_roles(role3.name)
+      assert role_match_excluded_roles(role4.name)
+      assert role_match_excluded_roles(role5.name)
+    end
+  end
+end

data/test/unit/import_roles_and_variables.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+# Tests for testing the ignore list
+class ImportRolesAndVariables < ActiveSupport::TestCase
+  include ForemanAnsible::AnsibleRolesDataPreparations
+
+  # existing Roles -> should be updated
+  role1 = AnsibleRole.new(:name => 'ntp', :id => 10)
+  role2 = AnsibleRole.new(:name => 'bar', :id => 11)
+
+  # New Roles -> Should be imported
+  role3 = AnsibleRole.new(:name => 'foo', :id => nil)
+  role4 = AnsibleRole.new(:name => 'world', :id => nil)
+
+  # Existing Role -> should be removed
+  role5 = AnsibleRole.new(:name => 'h', :id => 12)
+
+  # role1 variables -> add
+  variable1 = AnsibleVariable.new(:key => 'ntp_statistics', :ansible_role_id => 10, :id => nil)
+  variable2 = AnsibleVariable.new(:key => 'ntp_broadcast', :ansible_role_id  => 10, :id => nil)
+
+  # role1 variables -> update
+  variable3 = AnsibleVariable.new(:key => 'ntp_statistics', :ansible_role_id => 10, :id => 4)
+  variable4 = AnsibleVariable.new(:key => 'ntp_crypto', :ansible_role_id => 10, :id => 5)
+
+  # role1 variables -> obsolete
+  variable5 = AnsibleVariable.new(:key => 'ntp_controlkey', :ansible_role_id => 10, :id => 6)
+  variable6 = AnsibleVariable.new(:key => 'ntp_key', :ansible_role_id  => 10, :id => 7)
+
+  # role2 variable -> Update
+  variable7 = AnsibleVariable.new(:key => 'bar_key', :ansible_role_id  => 11, :id => 7, :override => false, :hidden_value => true)
+  changed = { 'old' => [role1, role2], 'new' => [role3, role4], 'obsolete' => [role5] }
+  old_roles_variables = { 'new' => [variable1, variable2], 'update' => [variable3, variable4, variable7], 'obsolete' => [variable5, variable6] }
+
+  describe 'It should prepare the rows correctly' do
+    setup do
+      @variables_importer = mock('mock_variables_importer')
+    end
+
+    test 'prepare 5 rows' do
+      expected = [{ :cells => [role1.name, 'Update Role Variables', 'Add: 2, Remove: 2, Update: 2', '', ''],
+                    :role => role1, :kind => 'old', :id => role1.name },
+                  { :cells => [role2.name, 'Update Role Variables', 'Update: 1', '', ''], :role => role2, :kind => 'old', :id => role2.name },
+                  { :cells => [role3.name, 'Import Role', 'Add: 3', '', ''], :role => role3, :kind => 'new', :id => role3.name },
+                  { :cells => [role4.name, 'Import Role', 'Add: 2', '', ''], :role => role4, :kind => 'new', :id => role4.name },
+                  { :cells => [role5.name, 'Remove Role', '', 0, 0], :role => role5, :kind => 'obsolete', :id => role5.name }]
+      # role3 and role4 importing new variables
+      @variables_importer.expects(:get_variables_names).with(role3.name).returns({ 'a' => true, 'b' => false, 'c' => [] })
+      @variables_importer.expects(:get_variables_names).with(role4.name).returns({ 'd' => true, 'e' => false })
+
+      @variables_importer.expects(:import_variable_names).with([role3, role4]).returns(old_roles_variables)
+      @variables_importer.expects(:import_variable_names).with([role1, role2]).returns(old_roles_variables)
+      @variables_importer.expects(:import_variable_names).with([role5]).returns(old_roles_variables)
+      result = prepare_ansible_import_rows(changed, @variables_importer)
+      assert_equal result, expected
+    end
+  end
+end

data/test/unit/lib/foreman_ansible_core/ansible_runner_test.rb

@@ -24,7 +24,7 @@ module ForemanAnsibleCore
             '_meta' => { 'hostvars' => { 'foreman.example.com' => {} } } }
         end
         let(:input) do
-          host_secrets = { 'ansible_ssh_pass' => 'letmein', 'ansible_become_password' => 'iamroot' }
+          host_secrets = { 'ansible_password' => 'letmein', 'ansible_become_password' => 'iamroot' }
           secrets = { 'per-host' => { 'foreman.example.com' => host_secrets } }
           host_input = { 'input' => { 'action_input' => { 'secrets' => secrets } } }
           { 'foreman.example.com' => host_input }
@@ -35,14 +35,14 @@ module ForemanAnsibleCore
           test_inventory = inventory.merge('ssh_password' => 'sshpass', 'effective_user_password' => 'mypass')
           rebuilt = runner.send(:rebuild_secrets, test_inventory, input)
           host_vars = rebuilt.dig('_meta', 'hostvars', 'foreman.example.com')
-          assert_equal 'sshpass', host_vars['ansible_ssh_pass']
+          assert_equal 'sshpass', host_vars['ansible_password']
           assert_equal 'mypass', host_vars['ansible_become_password']
         end
 
         test 'host secrets are used when not overriden by inventory secrest' do
           rebuilt = runner.send(:rebuild_secrets, inventory, input)
           host_vars = rebuilt.dig('_meta', 'hostvars', 'foreman.example.com')
-          assert_equal 'letmein', host_vars['ansible_ssh_pass']
+          assert_equal 'letmein', host_vars['ansible_password']
           assert_equal 'iamroot', host_vars['ansible_become_password']
         end
       end

data/test/unit/lib/foreman_ansible_core/playbook_runner_test.rb

@@ -87,7 +87,7 @@ class PlaybookRunnerTest < ActiveSupport::TestCase
         '_meta' => { 'hostvars' => { 'foreman.example.com' => {} } } }
     end
     let(:secrets) do
-      host_secrets = { 'ansible_ssh_pass' => 'letmein', 'ansible_become_password' => 'iamroot' }
+      host_secrets = { 'ansible_password' => 'letmein', 'ansible_become_password' => 'iamroot' }
       { 'per-host' => { 'foreman.example.com' => host_secrets } }
     end
     let(:runner) { ForemanAnsibleCore::Runner::Playbook.allocate }
@@ -96,14 +96,14 @@ class PlaybookRunnerTest < ActiveSupport::TestCase
       test_inventory = inventory.merge('ssh_password' => 'sshpass', 'effective_user_password' => 'mypass')
       rebuilt = runner.send(:rebuild_secrets, test_inventory, secrets)
       host_vars = rebuilt.dig('_meta', 'hostvars', 'foreman.example.com')
-      assert_equal 'sshpass', host_vars['ansible_ssh_pass']
+      assert_equal 'sshpass', host_vars['ansible_password']
       assert_equal 'mypass', host_vars['ansible_become_password']
     end
 
     test 'host secrets are used when not overriden by inventory secrest' do
       rebuilt = runner.send(:rebuild_secrets, inventory, secrets)
       host_vars = rebuilt.dig('_meta', 'hostvars', 'foreman.example.com')
-      assert_equal 'letmein', host_vars['ansible_ssh_pass']
+      assert_equal 'letmein', host_vars['ansible_password']
       assert_equal 'iamroot', host_vars['ansible_become_password']
     end
   end

data/test/unit/services/ansible_variables_importer_test.rb

@@ -59,6 +59,19 @@ class AnsibleVariablesImporterTest < ActiveSupport::TestCase
       assert_empty changes['update']
     end
 
+    test 'sets hidden value to false by default' do
+      role = FactoryBot.create(:ansible_role)
+      variable = FactoryBot.create(:ansible_variable)
+      api_response = {
+        role.name => { variable.key => 'new value' }
+      }
+      changes = importer.import_variables(api_response, [role.name])
+      assert_empty changes['update']
+      assert_not_empty changes['new']
+      assert_equal variable.key, changes['new'].first.key
+      assert_not changes['new'].first.hidden_value?
+    end
+
     test 'reimports variable with same key for different role' do
       role = FactoryBot.create(:ansible_role)
       variable = FactoryBot.create(:ansible_variable)

data/test/unit/services/api_roles_importer_test.rb

@@ -12,11 +12,28 @@ class ApiRolesImporterTest < ActiveSupport::TestCase
   end
 
   test 'should import roles' do
-    @importer.stubs(:import_role_names).returns(:new => @test_roles)
-    res = @importer.import!
-    assert_equal 2, res.count
-    assert AnsibleRole.find_by :name => @test_roles.first.name
-    assert AnsibleRole.find_by :name => @test_roles.last.name
+    @importer.stubs(:prepare_ansible_import_rows).returns(
+      [{
+        :name => 'test_user.test_name',
+        :id => nil,
+        :role_action => 'Import Role',
+        :variables => 'Add: 7',
+        :hosts_count => '',
+        :hostgroup_count => '',
+        :kind => 'new'
+      },
+       {
+         :name => 'some_user.some_role',
+         :id => nil,
+         :role_action => 'Import Role',
+         :variables => 'Add: 3',
+         :hosts_count => '',
+         :hostgroup_count => '',
+         :kind => 'new'
+       }]
+    )
+    res = @importer.import!([@test_roles.first.name, @test_roles.last.name])
+    assert_equal 2, res['changed']['new'].count
   end
 
   test 'should obsolete roles' do

data/test/unit/services/fact_parser_test.rb

@@ -29,6 +29,22 @@ module ForemanAnsible
       refute @facts_parser.environment
     end
 
+    test 'calculates virtual reported data' do
+      refute @facts_parser.virtual
+    end
+
+    test 'calculates ram reported data' do
+      assert_equal 7899, @facts_parser.ram
+    end
+
+    test 'calculates sockets reported data' do
+      assert_equal 1, @facts_parser.sockets
+    end
+
+    test 'calculates cores reported data' do
+      assert_equal 2, @facts_parser.cores
+    end
+
     test 'creates operatingsystem from operating system options' do
       sample_mock = mock
       major_fact = @facts_parser.facts['ansible_distribution_major_version']

data/test/unit/services/inventory_creator_test.rb

@@ -61,15 +61,14 @@ module ForemanAnsible
                    connection_params['ansible_user']
       refute_equal Setting['remote_execution_ssh_port'],
                    connection_params['ansible_port']
-      assert_equal ForemanRemoteExecutionCore.settings[:ssh_identity_key_file],
-                   connection_params['ansible_ssh_private_key_file']
+      assert_nil   connection_params['ansible_ssh_private_key_file']
       assert_equal extra_options['ansible_port'],
                    connection_params['ansible_port']
       assert_equal Setting['ansible_winrm_server_cert_validation'],
                    connection_params['ansible_winrm_server_cert_validation']
       assert_equal Setting['remote_execution_effective_user_method'],
                    connection_params['ansible_become_method']
-      refute connection_params.key?('ansible_ssh_pass')
+      refute connection_params.key?('ansible_password')
       refute connection_params.key?('ansible_become_password')
     end
 
@@ -128,11 +127,15 @@ module ForemanAnsible
     end
 
     test 'ansible_roles are passed as top-level "hostvars"' do
+      host = FactoryBot.create(:host)
       roles = [].tap do |array|
-        2.times { array << FactoryBot.create(:ansible_role) }
+        2.times do |idx|
+          role = FactoryBot.create(:ansible_role)
+          FactoryBot.create(:host_ansible_role, :host_id => host.id, :ansible_role_id => role.id, :position => idx)
+          array << role
+        end
       end
 
-      host = FactoryBot.create(:host, :ansible_roles => roles)
       inventory = ForemanAnsible::InventoryCreator.new([host]).to_hash
       inventory_roles = inventory['_meta']['hostvars'][host.name]['foreman_ansible_roles']
       assert_equal 2, inventory_roles.count
@@ -156,7 +159,9 @@ module ForemanAnsible
         end
       end
 
-      host = FactoryBot.create(:host, :ansible_roles => [role])
+      host = FactoryBot.create(:host)
+      FactoryBot.create(:host_ansible_role, :host_id => host.id, :ansible_role_id => role.id, :position => 0)
+
       inventory = ForemanAnsible::InventoryCreator.new([host]).to_hash
       host_inventory = inventory['_meta']['hostvars'][host.name]
       assert host_inventory[variables.first.key]
@@ -174,7 +179,9 @@ module ForemanAnsible
         end
       end
 
-      host = FactoryBot.create(:host, :ansible_roles => [role])
+      host = FactoryBot.create(:host)
+      FactoryBot.create(:host_ansible_role, :host_id => host.id, :ansible_role_id => role.id, :position => 0)
+
       inventory = ForemanAnsible::InventoryCreator.new([host]).to_hash
       inventory_roles = inventory['_meta']['hostvars'][host.name]['foreman']
       refute inventory_roles[variables.first.key]
@@ -188,7 +195,8 @@ module ForemanAnsible
                         :ansible_role_id => role.id,
                         :default_value => "variable value",
                         :override => true)
-      host = FactoryBot.create(:host, :ansible_roles => [role])
+      host = FactoryBot.create(:host)
+      FactoryBot.create(:host_ansible_role, :host_id => host.id, :ansible_role_id => role.id, :position => 0)
       host.expects(:host_params).returns('test_var' => 'param value').at_least_once
       inventory = ForemanAnsible::InventoryCreator.new([host]).to_hash
       assert_equal 'variable value', inventory['_meta']['hostvars'][host.name]['test_var']

data/test/unit/services/ui_roles_importer_test.rb

@@ -26,7 +26,7 @@ class UiRolesImporterTest < ActiveSupport::TestCase
     @role = FactoryBot.create(:ansible_role)
     new_role_name = 'test_role.foreman'
     @new_role = { :id => nil, :name => new_role_name }
-    @changes = { 'new' => { 'test_role.foreman' => @new_role.to_json },
-                 'obsolete' => { @role.name => @role.to_json } }
+    @changes = { 'new' => { 'test_role.foreman' => @new_role },
+                 'obsolete' => { @role.name => @role } }
   end
 end

data/webpack/__mocks__/foremanReact/common/helpers.js

@@ -0,0 +1,13 @@
+import { camelCase } from 'lodash';
+
+export const propsToCamelCase = ob =>
+  propsToCase(camelCase, 'propsToCamelCase only takes objects', ob);
+
+const propsToCase = (casingFn, errorMsg, ob) => {
+  if (typeof ob !== 'object') throw Error(errorMsg);
+
+  return Object.keys(ob).reduce((memo, key) => {
+    memo[casingFn(key)] = ob[key];
+    return memo;
+  }, {});
+};

data/webpack/__mocks__/foremanReact/components/common/forms/OrderableSelect/helpers.js

@@ -0,0 +1,5 @@
+import React from 'react';
+
+export const orderable = (Component, orderableProps) => props => (
+  <Component {...orderableProps} {...props} />
+);

data/webpack/__mocks__/foremanReact/redux/API.js

@@ -0,0 +1,7 @@
+export const API = {
+  get: jest.fn(),
+  put: jest.fn(),
+  post: jest.fn(),
+  delete: jest.fn(),
+  patch: jest.fn(),
+};