foreman_ansible 6.0.2 → 6.4.0

data/lib/foreman_ansible/engine.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require 'deface'
+require 'acts_as_list'
 require 'fast_gettext'
 require 'gettext_i18n_rails'
-require 'foreman_ansible_core' if Rails.env.test?
 require 'foreman_ansible/remote_execution'
 
 module ForemanAnsible

data/lib/foreman_ansible/register.rb

@@ -25,7 +25,7 @@ Foreman::Plugin.register :foreman_ansible do
                :resource_type => 'AnsibleRole'
     permission :import_ansible_roles,
                { :ansible_roles => [:import, :confirm_import],
-                 :'api/v2/ansible_roles' => [:import] },
+                 :'api/v2/ansible_roles' => [:import, :sync] },
                :resource_type => 'AnsibleRole'
     permission :view_ansible_variables,
                {
@@ -91,10 +91,12 @@ Foreman::Plugin.register :foreman_ansible do
   extend_template_helpers ForemanAnsible::RendererMethods
   allowed_template_helpers :insights_remediation
 
-  role_assignment_params = { :ansible_role_ids => [],
-                             :ansible_roles => [] }
-  parameter_filter Host::Managed, role_assignment_params
-  parameter_filter Hostgroup, role_assignment_params
+  base_role_assignment_params = { :ansible_role_ids => [],
+                                  :ansible_roles => [] }
+  parameter_filter Host::Managed, base_role_assignment_params.merge(:host_ansible_roles_attributes => {})
+  parameter_filter Hostgroup, base_role_assignment_params.merge(:hostgroup_ansible_roles_attributes => {})
+
+  register_global_js_file 'global'
 
   divider :top_menu, :caption => N_('Ansible'), :parent => :configure_menu
   menu :top_menu, :ansible_roles,

data/lib/foreman_ansible/version.rb

@@ -4,5 +4,5 @@
 # This way other parts of Foreman can just call ForemanAnsible::VERSION
 # and detect what version the plugin is running.
 module ForemanAnsible
-  VERSION = '6.0.2'
+  VERSION = '6.4.0'
 end

data/locale/ca/foreman_ansible.po

@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-11-14 21:36+0000\n"
 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2019\n"

data/locale/cs_CZ/foreman_ansible.po

@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-11-14 21:36+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2020\n"

data/locale/de/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/en/foreman_ansible.po

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2014-08-20 08:54+0100\n"
 "Last-Translator: Foreman Team <foreman-dev@googlegroups.com>\n"

data/locale/en_GB/foreman_ansible.po

@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-11-14 21:36+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>, 2019\n"

data/locale/es/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/fr/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/gl/foreman_ansible.po

@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-11-14 21:36+0000\n"
 "Last-Translator: Carmela Rubiños <carmela.rubinos@gmail.com>, 2019\n"

data/locale/it/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/ja/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/ko/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/nl_NL/foreman_ansible.po

@@ -13,7 +13,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-11-14 21:36+0000\n"
 "Last-Translator: dschutterop <daniel@schutterop.nl>, 2019\n"

data/locale/pl/foreman_ansible.po

@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-11-14 21:36+0000\n"
 "Last-Translator: Michał Foryt <michal.foryt@gmail.com>, 2019\n"

data/locale/pt_BR/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/ru/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/sv_SE/foreman_ansible.po

@@ -10,7 +10,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-11-14 21:36+0000\n"
 "Last-Translator: johnny.westerlund <johnny.westerlund@gmail.com>, 2019\n"

data/locale/zh_CN/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/zh_TW/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/package.json

@@ -7,33 +7,26 @@
     "test": "test"
   },
   "peerDependencies": {
-    "@theforeman/vendor": ">= 3.3.2"
+    "@theforeman/vendor": ">= 6.0.0"
   },
   "dependencies": {
     "react-json-tree": "^0.11.0"
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/builder": "^4.0.2",
-    "@theforeman/vendor-dev": "^3.3.2",
-    "babel-eslint": "^10.0.0",
-    "babel-jest": "^24.9.0",
-    "enzyme": "^3.7.0",
-    "enzyme-adapter-react-16": "^1.7.0",
-    "enzyme-to-json": "^3.3.5",
-    "eslint": "^6.0.0",
-    "eslint-plugin-patternfly-react": "^0.2.1",
-    "identity-obj-proxy": "^3.0.0",
-    "jest": "^24.9.0",
-    "prettier": "^1.19.0",
-    "react-redux": "^5.0.7",
-    "react-redux-test-utils": "^0.1.1",
-    "redux": "^3.7.2",
-    "redux-thunk": "^2.3.0"
+    "@theforeman/builder": "^8.4.1",
+    "@theforeman/eslint-plugin-foreman": "^8.4.1",
+    "@theforeman/find-foreman": "^8.4.1",
+    "@theforeman/stories": "^8.4.1",
+    "@theforeman/test": "^8.4.1",
+    "@theforeman/vendor-dev": "^8.4.1",
+    "babel-eslint": "^10.0.3",
+    "eslint": "^6.7.2",
+    "prettier": "^1.13.5"
   },
   "scripts": {
-    "test": "node node_modules/.bin/jest webpack",
-    "lint": "eslint ./webpack"
+    "test": "tfm-test --plugin --config jest.config.js",
+    "lint": "tfm-lint --plugin -d webpack"
   },
   "repository": {
     "type": "git",
@@ -44,27 +37,5 @@
   "bugs": {
     "url": "https://projects.theforeman.org/projects/ansible"
   },
-  "homepage": "https://theforeman.org/plugins/foreman_ansible/",
-  "jest": {
-    "verbose": true,
-    "moduleDirectories": [
-      "node_modules/@theforeman/vendor-core/node_modules",
-      "node_modules",
-      "webpack"
-    ],
-    "transform": {
-      "^.+\\.js$": "babel-jest"
-    },
-    "setupFiles": [
-      "raf/polyfill",
-      "./webpack/test_setup.js"
-    ],
-    "testPathIgnorePatterns": [
-      "/node_modules/",
-      "<rootDir>/foreman/"
-    ],
-    "moduleNameMapper": {
-      "^.+\\.(css|scss)$": "identity-obj-proxy"
-    }
-  }
+  "homepage": "https://theforeman.org/plugins/foreman_ansible/"
 }

data/test/factories/ansible_roles.rb

@@ -4,4 +4,16 @@ FactoryBot.define do
   factory :ansible_role do
     sequence(:name) { |n| "ansible_role_#{n}" }
   end
+
+  factory :host_ansible_role do
+    position { nil }
+    host
+    ansible_role
+  end
+
+  factory :hostgroup_ansible_role do
+    position { nil }
+    hostgroup
+    ansible_role
+  end
 end

data/test/factories/host_ansible_enhancements.rb

@@ -0,0 +1,23 @@
+FactoryBot.modify do
+  factory :host do
+    trait :with_ansible_roles do
+      transient do
+        roles_count { 2 }
+      end
+      after(:build) do |host, evaluator|
+        host.host_ansible_roles = FactoryBot.build_list(:host_ansible_role, evaluator.roles_count, host: host)
+      end
+    end
+  end
+
+  factory :hostgroup do
+    trait :with_ansible_roles do
+      transient do
+        roles_count { 2 }
+      end
+      after(:build) do |hostgroup, evaluator|
+        hostgroup.hostgroup_ansible_roles = FactoryBot.build_list(:hostgroup_ansible_role, evaluator.roles_count, hostgroup: hostgroup)
+      end
+    end
+  end
+end

data/test/foreman_ansible/helpers/ansible_roles_helper_test.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+class AnsibleRolesHelperTest < ActiveSupport::TestCase
+  include ForemanAnsible::AnsibleRolesHelper
+
+  describe '#role_attributes_for_roles_switcher' do
+    let(:hg_with_roles) { FactoryBot.create(:hostgroup, :with_ansible_roles) }
+
+    context 'with hostgroup' do
+      let(:child) { FactoryBot.build(:hostgroup, :with_ansible_roles, parent: hg_with_roles) }
+
+      it 'show inherited and positioned own roles' do
+        role_attributes = role_attributes_for_roles_switcher(child)
+        expected_ids = hg_with_roles.ansible_roles.pluck(:id) + child.hostgroup_ansible_roles.map(&:ansible_role_id)
+        assert_equal(expected_ids, role_attributes.map { |ra| ra[:id] })
+      end
+
+      it 'includes inherited roles just once' do
+        child.host_ansible_roles << FactoryBot.build(:hostgroup_ansible_role, hostgroup: child, ansible_role: hg_with_roles.ansible_roles.first)
+        role_attributes = role_attributes_for_roles_switcher(child)
+        expected_ids = hg_with_roles.ansible_roles.pluck(:id) + child.hostgroup_ansible_roles.map(&:ansible_role_id)
+        assert_equal(expected_ids.uniq, role_attributes.map { |ra| ra[:id] })
+      end
+    end
+
+    context 'with host' do
+      let(:host_new) { FactoryBot.build(:host, :with_ansible_roles, hostgroup: hg_with_roles) }
+
+      it 'show inherited and positioned own roles' do
+        role_attributes = role_attributes_for_roles_switcher(host_new)
+        expected_ids = hg_with_roles.ansible_roles.pluck(:id) + host_new.host_ansible_roles.map(&:ansible_role_id)
+        assert_equal(expected_ids, role_attributes.map { |ra| ra[:id] })
+      end
+
+      it 'includes inherited roles just once' do
+        host_new.host_ansible_roles << FactoryBot.build(:host_ansible_role, host: host_new, ansible_role: hg_with_roles.ansible_roles.first)
+        role_attributes = role_attributes_for_roles_switcher(host_new)
+        expected_ids = hg_with_roles.ansible_roles.pluck(:id) + host_new.host_ansible_roles.map(&:ansible_role_id)
+        assert_equal(expected_ids.uniq, role_attributes.map { |ra| ra[:id] })
+      end
+    end
+  end
+end

data/test/functional/ansible_variables_controller_test.rb

@@ -34,21 +34,6 @@ class AnsibleVariablesControllerTest < ActionController::TestCase
     assert_redirected_to ansible_variables_url
   end
 
-  test 'should show import page' do
-    ForemanAnsible::UiRolesImporter.any_instance.
-      expects(:import_role_names).returns({})
-
-    ForemanAnsible::VariablesImporter.any_instance.
-      expects(:import_variable_names).returns({
-        :obsolete => [@model]
-      })
-
-    get :import,
-        :params => { :proxy => @proxy.id },
-        :session => set_session_user
-    assert_response :success
-  end
-
   test 'should create ansible variable' do
     params = { :ansible_variable => { :key => 'great name', :ansible_role_id => FactoryBot.create(:ansible_role).id } }
     assert_difference('AnsibleVariable.count', 1) do