foreman_ansible 4.0.3.5 → 5.1.0

data/locale/zh_CN/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 3.0.1\n"
+"Project-Id-Version: foreman_ansible 5.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -131,6 +131,9 @@ msgstr ""
 msgid "Create an override value for a specific ansible variable"
 msgstr ""
 
+msgid "Default Ansible inventory report template"
+msgstr ""
+
 msgid "Default Behavior"
 msgstr ""
 
@@ -179,10 +182,13 @@ msgstr ""
 msgid "Foreman"
 msgstr ""
 
-msgid "Foreman will add the this level of verbosity for additional debugging output when running Ansible playbooks."
+msgid "Foreman will add this level of verbosity for additional debugging output when running Ansible playbooks."
+msgstr ""
+
+msgid "Foreman will use this template to schedule the report with Ansible inventory"
 msgstr ""
 
-msgid "Foreman will run Ansible playbooks using this implementation"
+msgid "Hash of input values of type input=>value"
 msgstr ""
 
 msgid "Hidden Value"
@@ -224,9 +230,6 @@ msgstr ""
 msgid "If checked, will raise an error if there is no default value and no matcher provide a value."
 msgstr ""
 
-msgid "Implementation for running Ansible"
-msgstr ""
-
 msgid "Import"
 msgstr ""
 
@@ -248,13 +251,6 @@ msgstr ""
 msgid "Import of roles successfully finished."
 msgstr ""
 
-msgid ""
-"Import of variables successfully finished.\n"
-"Added: #{results[:added].count} \n"
-" Removed: #{results[:obsolete].count} \n"
-"Updated: #{results[:updated].count}"
-msgstr ""
-
 msgid "Imported at"
 msgstr ""
 
@@ -383,69 +379,78 @@ msgstr ""
 msgid "Overriden"
 msgstr ""
 
-msgid "Play Ansible roles"
+msgid "Post-provision timeout"
 msgstr ""
 
-msgid "Play Roles"
+msgid "Prioritize Attribute Order"
 msgstr ""
 
-msgid "Playbook execution failed"
+msgid "Private Key Path"
 msgstr ""
 
-msgid "Plays Ansible roles on a host"
+msgid "Proxy not found"
 msgstr ""
 
-msgid "Plays Ansible roles on a hostgroup"
+msgid "Remediation Plan"
 msgstr ""
 
-msgid "Plays Ansible roles on hostgroups"
+msgid "Remote action:"
 msgstr ""
 
-msgid "Plays Ansible roles on hosts"
+msgid "Remove"
 msgstr ""
 
-msgid "Post-provision timeout"
+msgid "Remove duplicate values (only array type)"
 msgstr ""
 
-msgid "Prioritize Attribute Order"
+msgid "Report format, defaults to '%s'"
 msgstr ""
 
-msgid "Private Key Path"
+msgid "Role ID"
 msgstr ""
 
-msgid "Proxy not found"
+msgid "Roles"
 msgstr ""
 
-msgid "Remediation Plan"
+msgid "Role|Name"
 msgstr ""
 
-msgid "Remote action:"
+msgid "Run Ansible roles"
 msgstr ""
 
-msgid "Remove"
+msgid "Run all Ansible roles"
 msgstr ""
 
-msgid "Remove duplicate values (only array type)"
+msgid "Run all Ansible roles on hosts belonging to this host group"
 msgstr ""
 
-msgid "Role ID"
+msgid "Run an Ansible playbook against given hosts"
 msgstr ""
 
-msgid "Roles"
+msgid "Run playbook"
 msgstr ""
 
-msgid "Role|Name"
+msgid "Runs a given maintenance plan from Red Hat Access Insights given an ID."
 msgstr ""
 
-msgid "Run Ansible roles"
+msgid "Runs all Ansible roles on a host"
 msgstr ""
 
-msgid "Runs a given maintenance plan from Red Hat Access Insights given an ID."
+msgid "Runs all Ansible roles on a hostgroup"
+msgstr ""
+
+msgid "Runs all Ansible roles on hostgroups"
+msgstr ""
+
+msgid "Runs all Ansible roles on hosts"
 msgstr ""
 
 msgid "Runs an Ansible playbook which contains all the roles defined for a host"
 msgstr ""
 
+msgid "Schedule generating of Ansible Inventory report"
+msgstr ""
+
 msgid "Select the changes you want to realize in Foreman"
 msgstr ""
 

data/locale/zh_TW/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 3.0.1\n"
+"Project-Id-Version: foreman_ansible 5.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -131,6 +131,9 @@ msgstr ""
 msgid "Create an override value for a specific ansible variable"
 msgstr ""
 
+msgid "Default Ansible inventory report template"
+msgstr ""
+
 msgid "Default Behavior"
 msgstr ""
 
@@ -179,10 +182,13 @@ msgstr ""
 msgid "Foreman"
 msgstr ""
 
-msgid "Foreman will add the this level of verbosity for additional debugging output when running Ansible playbooks."
+msgid "Foreman will add this level of verbosity for additional debugging output when running Ansible playbooks."
+msgstr ""
+
+msgid "Foreman will use this template to schedule the report with Ansible inventory"
 msgstr ""
 
-msgid "Foreman will run Ansible playbooks using this implementation"
+msgid "Hash of input values of type input=>value"
 msgstr ""
 
 msgid "Hidden Value"
@@ -224,9 +230,6 @@ msgstr ""
 msgid "If checked, will raise an error if there is no default value and no matcher provide a value."
 msgstr ""
 
-msgid "Implementation for running Ansible"
-msgstr ""
-
 msgid "Import"
 msgstr ""
 
@@ -248,13 +251,6 @@ msgstr ""
 msgid "Import of roles successfully finished."
 msgstr ""
 
-msgid ""
-"Import of variables successfully finished.\n"
-"Added: #{results[:added].count} \n"
-" Removed: #{results[:obsolete].count} \n"
-"Updated: #{results[:updated].count}"
-msgstr ""
-
 msgid "Imported at"
 msgstr ""
 
@@ -383,69 +379,78 @@ msgstr ""
 msgid "Overriden"
 msgstr ""
 
-msgid "Play Ansible roles"
+msgid "Post-provision timeout"
 msgstr ""
 
-msgid "Play Roles"
+msgid "Prioritize Attribute Order"
 msgstr ""
 
-msgid "Playbook execution failed"
+msgid "Private Key Path"
 msgstr ""
 
-msgid "Plays Ansible roles on a host"
+msgid "Proxy not found"
 msgstr ""
 
-msgid "Plays Ansible roles on a hostgroup"
+msgid "Remediation Plan"
 msgstr ""
 
-msgid "Plays Ansible roles on hostgroups"
+msgid "Remote action:"
 msgstr ""
 
-msgid "Plays Ansible roles on hosts"
+msgid "Remove"
 msgstr ""
 
-msgid "Post-provision timeout"
+msgid "Remove duplicate values (only array type)"
 msgstr ""
 
-msgid "Prioritize Attribute Order"
+msgid "Report format, defaults to '%s'"
 msgstr ""
 
-msgid "Private Key Path"
+msgid "Role ID"
 msgstr ""
 
-msgid "Proxy not found"
+msgid "Roles"
 msgstr ""
 
-msgid "Remediation Plan"
+msgid "Role|Name"
 msgstr ""
 
-msgid "Remote action:"
+msgid "Run Ansible roles"
 msgstr ""
 
-msgid "Remove"
+msgid "Run all Ansible roles"
 msgstr ""
 
-msgid "Remove duplicate values (only array type)"
+msgid "Run all Ansible roles on hosts belonging to this host group"
 msgstr ""
 
-msgid "Role ID"
+msgid "Run an Ansible playbook against given hosts"
 msgstr ""
 
-msgid "Roles"
+msgid "Run playbook"
 msgstr ""
 
-msgid "Role|Name"
+msgid "Runs a given maintenance plan from Red Hat Access Insights given an ID."
 msgstr ""
 
-msgid "Run Ansible roles"
+msgid "Runs all Ansible roles on a host"
 msgstr ""
 
-msgid "Runs a given maintenance plan from Red Hat Access Insights given an ID."
+msgid "Runs all Ansible roles on a hostgroup"
+msgstr ""
+
+msgid "Runs all Ansible roles on hostgroups"
+msgstr ""
+
+msgid "Runs all Ansible roles on hosts"
 msgstr ""
 
 msgid "Runs an Ansible playbook which contains all the roles defined for a host"
 msgstr ""
 
+msgid "Schedule generating of Ansible Inventory report"
+msgstr ""
+
 msgid "Select the changes you want to realize in Foreman"
 msgstr ""
 

data/package.json

@@ -6,31 +6,26 @@
   "directories": {
     "test": "test"
   },
+  "peerDependencies": {
+    "@theforeman/vendor": ">= 3.3.2"
+  },
   "dependencies": {
-    "@theforeman/vendor": "^1.7.0",
     "react-json-tree": "^0.11.0"
   },
   "devDependencies": {
-    "@theforeman/vendor-dev": "^1.7.0",
-    "babel-eslint": "^8.2.1",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-object-assign": "^6.22.0",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-preset-env": "^1.6.0",
-    "babel-preset-react": "^6.24.1",
+    "@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": "^4.18.1",
-    "eslint-config-airbnb": "^16.0.0",
-    "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-jest": "^21.2.0",
-    "eslint-plugin-jsx-a11y": "^6.0.2",
+    "eslint": "^6.0.0",
     "eslint-plugin-patternfly-react": "^0.2.1",
-    "eslint-plugin-react": "^7.4.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^23.6.0",
-    "prettier": "^1.16.4",
+    "jest": "^24.9.0",
+    "prettier": "^1.19.0",
     "react-redux": "^5.0.7",
     "react-redux-test-utils": "^0.1.1",
     "redux": "^3.7.2",
@@ -57,6 +52,9 @@
       "node_modules",
       "webpack"
     ],
+    "transform": {
+      "^.+\\.js$": "babel-jest"
+    },
     "setupFiles": [
       "raf/polyfill",
       "./webpack/test_setup.js"

data/test/factories/ansible_variables.rb

@@ -6,5 +6,10 @@ FactoryBot.define do
     sequence(:default_value) { |n| "default_value_#{n}" }
     ansible_role
     imported { true }
+    override { false }
+
+    after(:build) do |variable|
+      variable.key_type ||= ForemanAnsible::VariablesImporter::VARIABLE_TYPES[variable.default_value.class.to_s] || 'string'
+    end
   end
 end

data/test/functional/api/v2/ansible_inventories_controller_test.rb

@@ -34,10 +34,10 @@ module Api
 
       test 'schedule inventory by user' do
         report = FactoryBot.create(:report_template)
-        setting = Setting::Ansible.create! :name => 'ansible_inventory_template', :value  => report.name,
-          :default => report.name, :description => 'inventory'
+        Setting::Ansible.create! :name => 'ansible_inventory_template', :value => report.name,
+                                 :default => report.name, :description => 'inventory'
         user = FactoryBot.create(:user)
-        user.roles << Role.find_by_name('Ansible Tower Inventory Reader')
+        user.roles << Role.find_by(:name => 'Ansible Tower Inventory Reader')
         post :schedule, { :session => set_session_user(user) }
         assert_response :success
       end

data/test/functional/api/v2/ansible_variables_controller_test.rb

@@ -46,6 +46,18 @@ module Api
         res = JSON.parse(@response.body)
         refute res['imported']
       end
+
+      test 'should update' do
+        variable = FactoryBot.create(:ansible_variable, :default_value => 'my default value')
+        new_value = 'changed default value'
+        post :update,
+             :params => { :id => variable.id, :default_value => new_value },
+             :session => set_session_user
+
+        assert_response :success
+        res = JSON.parse(@response.body)
+        assert_equal new_value, res['default_value']
+      end
     end
   end
 end

data/test/unit/services/ansible_variables_importer_test.rb

@@ -5,52 +5,77 @@ require 'test_plugin_helper'
 # This service is meant to take in essentially a string coming from
 # the proxy API, and parse that into AnsibleVariables.
 class AnsibleVariablesImporterTest < ActiveSupport::TestCase
-  setup do
-    @importer = ForemanAnsible::VariablesImporter.new
-  end
-  test 'does not reimport already existing variables' do
-    already_existing = FactoryBot.create(:ansible_variable)
-    new_role = FactoryBot.create(:ansible_role)
-    api_response = {
-      new_role.name => { 'new_var' => 'new value' },
-      already_existing.ansible_role.name => { already_existing.key => already_existing.default_value }
-    }
-    changes = @importer.import_variables(api_response, [new_role.name])
-    assert_not_empty changes['new']
-    assert_equal 'new_var', changes['new'].first.key
-    assert_equal new_role, changes['new'].first.ansible_role
-  end
+  let(:importer) { ForemanAnsible::VariablesImporter.new }
 
-  test "variables attempts to remove variables that don't exist anymore" do
-    obsolete_variable = FactoryBot.create(:ansible_variable)
-    changes = @importer.import_variables({}, [])
-    assert_not_empty changes['obsolete']
-    assert_equal obsolete_variable.key, changes['obsolete'].first.key
-    assert_equal(
-      obsolete_variable.ansible_role,
-      changes['obsolete'].first.ansible_role
-    )
-  end
+  describe '#import_variables' do
+    test 'does not reimport already existing variables' do
+      already_existing = FactoryBot.create(:ansible_variable)
+      new_role = FactoryBot.create(:ansible_role)
+      api_response = {
+        new_role.name => { 'new_var' => 'new value' },
+        already_existing.ansible_role.name => { already_existing.key => already_existing.default_value }
+      }
+      changes = importer.import_variables(api_response, [new_role.name])
+      assert_empty changes['update']
+      assert_not_empty changes['new']
+      assert_equal 'new_var', changes['new'].first.key
+      assert_equal new_role, changes['new'].first.ansible_role
+    end
 
-  test 'does not do anything if response is empty' do
-    changes = @importer.import_variables({}, [])
-    assert_equal({ 'new' => [], 'obsolete' => [], 'update' => [] }, changes)
-  end
+    test "variables attempts to remove variables that don't exist anymore" do
+      obsolete_variable = FactoryBot.create(:ansible_variable)
+      changes = importer.import_variables({}, [])
+      assert_not_empty changes['obsolete']
+      assert_equal obsolete_variable.key, changes['obsolete'].first.key
+      assert_equal(
+        obsolete_variable.ansible_role,
+        changes['obsolete'].first.ansible_role
+      )
+    end
 
-  test 'do not update changed defaults' do
-    role = FactoryBot.create(:ansible_role)
-    variable = FactoryBot.create(:ansible_variable, :default_value => 'default value', :ansible_role_id => role.id)
-    api_response = {
-      role.name => { variable.key => 'changed value', 'new_variable' => 'new value' }
-    }
-    changes = @importer.import_variables(api_response, [])
-    assert_empty changes['update']
-    assert_equal 'new_variable', changes['new'].first.key
-  end
+    test 'does not do anything if response is empty' do
+      changes = importer.import_variables({}, [])
+      assert_equal({ 'new' => [], 'obsolete' => [], 'update' => [] }, changes)
+    end
+
+    test 'update changed defaults' do
+      role = FactoryBot.create(:ansible_role)
+      variable = FactoryBot.create(:ansible_variable, :default_value => 'default value', :ansible_role => role)
+      api_response = {
+        role.name => { variable.key => 'changed value' }
+      }
+      changes = importer.import_variables(api_response, [])
+      assert_not_empty changes['update']
+      assert_equal variable.key, changes['update'].first.key
+    end
+
+    test 'does not update overriden defaults' do
+      role = FactoryBot.create(:ansible_role)
+      variable = FactoryBot.create(:ansible_variable, :default_value => 'default value', :override => true, :ansible_role => role)
+      api_response = {
+        role.name => { variable.key => 'changed value' }
+      }
+      changes = importer.import_variables(api_response, [])
+      assert_empty changes['update']
+    end
+
+    test 'reimports variable with same key for different role' 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_equal 'new value', changes['new'].first.default_value
+    end
 
-  test 'should ignore custom variables' do
-    FactoryBot.create(:ansible_variable, :imported => false)
-    changes = @importer.import_variables({}, [])
-    assert_empty changes['obsolete']
+    test 'ignores custom variables' do
+      FactoryBot.create(:ansible_variable, :imported => false)
+      changes = importer.import_variables({}, [])
+      assert_empty changes['obsolete']
+    end
   end
 end