foreman_ansible 5.1.3 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb75d29fae2f8916406b532fe9d95e6b63ce1968da6862f9a2bb0ae9d9b45554
-  data.tar.gz: 4639fbbea9b4aed0dbd4f3be9e7654aff78364e5470bc14d3ee9d5f8c19817b0
+  metadata.gz: '059c70bd67d597c230eea6135f738afd7c203c27cb1e1d1a7d5b3b88bada984f'
+  data.tar.gz: 2509eb475c69a745d46f726700a5308ee128823f90aaa8e852067b941797141e
 SHA512:
-  metadata.gz: f2ec3425352140a16674b3d17d8ffbcd7cd225a77f8c2723bc3b9e4f8a3c91bbf557b50af78580af907668d88f085ebe2605603c8b5af2f45124913c118aa2d1
-  data.tar.gz: 10bca14c92388bae60e128effd5a5e2b5d9aa1fb387845d40a4a7a47d7e3ad602560aaa2971356c36d5015f29a3075eee5668defb77fa935bc65c2ce830efb31
+  metadata.gz: 212613afe4068af042fcb9340bddab879afd4c0b7ced2a6748861561cd76ed185609d2582fed69b03af76f7753b83cb5a18923f2d2170480a1deb3e17fb34338
+  data.tar.gz: 4134c4f15af8a5567ddc319978f5c1538e982bc83923d9ba8a1c45a524fb0d7628f236079d6355c9ab5f5d5ca931a85f1bd1c52673efb2ae2e7f2ed8a21d4b9d

data/app/controllers/api/v2/ansible_inventories_controller.rb

@@ -72,8 +72,8 @@ module Api
           process_resource_error(:resource => @ansible_inventory)
         end
       rescue StandardError => e
-        render_error 'standard_error', :status => :internal_error,
-                                       :locals => { :exception => e }
+        render_error :custom_error, :status => :unprocessable_entity,
+                                    :locals => { :message => _("Scheduling Report template failed for: #{e.message}") }
       end
 
       def action_permission

data/app/helpers/foreman_ansible/ansible_reports_helper.rb

@@ -68,7 +68,7 @@ module ForemanAnsible
       prettyp.gsub!(/^(\[|\])/, '')
       prettyp.gsub!(/^[\s]*$\n/, '')
       paragraph_style = 'white-space:pre;padding: 2em 0'
-      content_tag(:p, prettyp, :style => paragraph_style)
+      tag(:p, prettyp, :style => paragraph_style)
     end
 
     def hash_with_keys_removed(hash)

data/app/models/ansible_role.rb

@@ -28,6 +28,12 @@ class AnsibleRole < ApplicationRecord
   scoped_search :relation => :hostgroups,
                 :on => :name, :rename => :hostgroup, :only_explicit => true
 
+  apipie :class, "A class representing #{model_name.human} object" do
+    name 'Ansible role'
+    refs 'AnsibleRole'
+    sections only: %w[all additional]
+    property :name, String, desc: 'Returns name of the ansible role'
+  end
   # Methods to be allowed in any template with safemode enabled
   class Jail < Safemode::Jail
     allow :name

data/app/models/concerns/foreman_ansible/host_managed_extensions.rb

@@ -67,6 +67,11 @@ end
 
 module Host
   class Managed
+    apipie :class do
+      property :all_ansible_roles, array_of: 'AnsibleRole', desc: 'Returns all ansible roles assigned to the host, both its own and inherited from the host group and its parents'
+      property :ansible_roles, array_of: 'AnsibleRole', desc: 'Returns ansible roles directly assigned to the host'
+      property :inherited_ansible_roles, array_of: 'AnsibleRole', desc: 'Returns only ansible roles assigned to the host\'s host group and its parents'
+    end
     # Methods to be allowed in any template with safemode enabled
     class Jail < Safemode::Jail
       allow :all_ansible_roles, :ansible_roles, :inherited_ansible_roles

data/app/models/concerns/foreman_ansible/hostgroup_extensions.rb

@@ -36,3 +36,15 @@ module ForemanAnsible
     end
   end
 end
+
+class Hostgroup
+  apipie :class do
+    property :all_ansible_roles, array_of: 'AnsibleRole', desc: 'Returns all ansible roles assigned to the host group, both its own and inherited from parent host groups'
+    property :ansible_roles, array_of: 'AnsibleRole', desc: 'Returns ansible roles directly assigned to the host group'
+    property :inherited_ansible_roles, array_of: 'AnsibleRole', desc: 'Returns only the inherited ansible roles assigned to the host group\'s parents'
+  end
+  # Methods to be allowed in any template with safemode enabled
+  class Jail < Safemode::Jail
+    allow :all_ansible_roles, :ansible_roles, :inherited_ansible_roles
+  end
+end

data/app/models/foreman_ansible/ansible_provider.rb

@@ -35,8 +35,8 @@ if defined? ForemanRemoteExecution
           {
             'per-host' => {
               host.name => {
-                'ansible_ssh_pass' => rex_ssh_password(host),
-                'ansible_sudo_pass' => rex_sudo_password(host)
+                'ansible_password' => rex_ssh_password(host),
+                'ansible_become_password' => rex_effective_user_password(host)
               }
             }
           }
@@ -46,8 +46,8 @@ if defined? ForemanRemoteExecution
           host_setting(host, 'remote_execution_ssh_password')
         end
 
-        def rex_sudo_password(host)
-          host_setting(host, 'remote_execution_sudo_password')
+        def rex_effective_user_password(host)
+          host_setting(host, 'remote_execution_effective_user_password')
         end
 
         def host_setting(host, setting)
@@ -62,12 +62,8 @@ if defined? ForemanRemoteExecution
           'ansible-runner'
         end
 
-        def required_proxy_selector_for(template)
-          if template.remote_execution_features.where(:label => 'ansible_run_capsule_upgrade').any?
-            ::DefaultProxyProxySelector.new
-          else
-            super
-          end
+        def proxy_action_class
+          'ForemanAnsibleCore::TaskLauncher::Playbook::PlaybookRunnerAction'
         end
 
         private

data/app/services/foreman_ansible/ansible_report_importer.rb

@@ -9,7 +9,7 @@ module ForemanAnsible
     included do
       def host
         hostname = name.downcase
-        if AnsibleReportScanner.ansible_report?(raw['logs']) &&
+        if AnsibleReportScanner.ansible_report?(raw) &&
            IPAddress.valid?(hostname) &&
            Nic::Interface.find_by(:ip => hostname)
           @host = Nic::Interface.find_by(:ip => hostname).host

data/app/services/foreman_ansible/ansible_report_scanner.rb

@@ -5,14 +5,17 @@ module ForemanAnsible
   # sets the origin of the report to 'Ansible'
   class AnsibleReportScanner
     class << self
-      def scan(report, logs)
-        if (is_ansible = ansible_report?(logs))
-          report.origin = 'Ansible'
-        end
-        is_ansible
+      def add_reporter_data(report, raw); end
+
+      def identify_origin(raw)
+        'Ansible' if ansible_report?(raw)
+      end
+
+      def ansible_report?(raw)
+        raw['reporter'] == 'ansible' || ansible_legacy_report?(raw['logs'])
       end
 
-      def ansible_report?(logs)
+      def ansible_legacy_report?(logs)
         return false if logs.blank?
         logs.any? do |log|
           log['log'].fetch('messages', {}).

data/app/services/foreman_ansible/operating_system_parser.rb

@@ -80,8 +80,14 @@ module ForemanAnsible
         facts[:ansible_os_name].tr(" \n\t", '') ||
           facts[:ansible_distribution].tr(" \n\t", '')
       else
-        facts[:ansible_distribution] ||
-          facts[:ansible_lsb] && facts[:ansible_lsb]['id']
+        distribution = facts[:ansible_distribution] || facts[:ansible_lsb].try(:[], 'id')
+
+        if distribution == 'RedHat' &&
+           facts[:ansible_lsb].try(:[], 'id') == 'RedHatEnterpriseWorkstation'
+          distribution += '_Workstation'
+        end
+
+        distribution
       end
     end
 

data/app/services/foreman_ansible/renderer_methods.rb

@@ -4,7 +4,18 @@ module ForemanAnsible
   # Macro to fetch RH Insights plan playbook
   module RendererMethods
     extend ActiveSupport::Concern
+    extend ApipieDSL::Module
 
+    apipie :class, 'Macros related to Ansible playbooks' do
+      name 'Ansible'
+      sections only: %w[all jobs]
+    end
+
+    apipie :method, 'Returns Insights maintenance plan for host' do
+      required :plan_id, String, desc: 'The playbook for the rule coming from insights'
+      optional :organization_id, Integer, desc: 'The Foreman organization associated with the Insights account', default: 'Current organization ID'
+      returns String, desc: 'Insights maintenance plan for host'
+    end
     def insights_remediation(plan_id, organization_id = Organization.current.id)
       return "$INSIGHTS_REMEDIATION[#{plan_id}, #{organization_id}]" if preview?
 

data/app/services/foreman_ansible/variables_importer.rb

@@ -78,7 +78,7 @@ module ForemanAnsible
     def create_new_variables(variables)
       iterate_over_variables(variables) do |role, memo, attrs|
         variable = AnsibleVariable.new(
-          JSON.parse(attrs)['ansible_variable']
+          JSON.parse(attrs)
         )
         variable.ansible_role = ::AnsibleRole.find_by(:name => role)
         variable.save
@@ -88,7 +88,7 @@ module ForemanAnsible
 
     def update_variables(variables)
       iterate_over_variables(variables) do |_role, memo, attrs|
-        attributes = JSON.parse(attrs)['ansible_variable']
+        attributes = JSON.parse(attrs)
         var = AnsibleVariable.find attributes['id']
         var.update(attributes)
         memo << var
@@ -98,7 +98,7 @@ module ForemanAnsible
     def delete_old_variables(variables)
       iterate_over_variables(variables) do |_role, memo, attrs|
         variable = AnsibleVariable.find(
-          JSON.parse(attrs)['ansible_variable']['id']
+          JSON.parse(attrs)['id']
         )
         memo << variable.key
         variable.destroy

data/app/views/ansible_roles/welcome.html.erb

@@ -4,7 +4,7 @@
     <%= icon_text("play", "", :kind => "fa") %>
   </div>
   <h1><%= _('Ansible Roles') %></h1>
-  <p><%= _('No ansible roles were found in Foreman. If you want to assign roles to your hosts,
+  <p><%= _('No Ansible Roles were found in Foreman. If you want to assign roles to your hosts,
              you have to import them first.').html_safe %>
   </p>
   <p><%= link_to(_('Learn more about this in the documentation.'), documentation_url('#4.1ImportingRoles', :root_url => ansible_doc_url), target: '_blank') %></p>

data/app/views/foreman_ansible/job_templates/capsule_upgrade_-_ansible_default.erb

@@ -15,7 +15,7 @@ template_inputs:
   value_type: plain
   hidden_value: false
 model: JobTemplate
-job_category: Ansible Playbook
+job_category: Maintenance Operations
 description_format: "%{template_name}"
 provider_type: Ansible
 kind: job_template
@@ -34,11 +34,10 @@ feature: ansible_run_capsule_upgrade
         msg: "This playbook cannot be executed on a Satellite server. Use only on a Capsule server."
       when: "'satellite' in ansible_facts.packages"
 
-    - name: Install satellite-maintain if not present
+    - name: Install|Update satellite-maintain if not present
       package:
         name: rubygem-foreman_maintain
-        state: present
-      when: "'rubygem-foreman_maintain' not in ansible_facts.packages"
+        state: latest
 
     - block:
       <%- whitelist_option = if input('whitelist_options').present?

data/app/views/foreman_ansible/job_templates/configure_cloud_connector_-_ansible_default.erb

@@ -22,10 +22,11 @@ template_inputs:
   hidden_value: false
   description: You can specify a HTTP proxy address that should be used for Cloud Connector connection to the cloud.redhat.com. Note that it must be HTTP proxy, not HTTPS. The tunelling of SSL (secured web socket connection) in SSL (HTTPS proxy) is currently unsupported.
 model: JobTemplate
-job_category: Ansible Playbook
+job_category: Maintenance Operations
 description_format: "%{template_name}"
 provider_type: Ansible
 kind: job_template
+feature: ansible_configure_cloud_connector
 %>
 
 ---

data/lib/foreman_ansible/register.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Foreman::Plugin.register :foreman_ansible do
-  requires_foreman '>= 2.0'
+  requires_foreman '>= 2.2'
 
   security_block :foreman_ansible do
     permission :play_roles_on_host,
@@ -109,6 +109,10 @@ Foreman::Plugin.register :foreman_ansible do
   apipie_documented_controllers [
     "#{ForemanAnsible::Engine.root}/app/controllers/api/v2/*.rb"
   ]
+  ApipieDSL.configuration.dsl_classes_matchers += [
+    "#{ForemanAnsible::Engine.root}/app/models/*.rb",
+    "#{ForemanAnsible::Engine.root}/app/services/foreman_ansible/*.rb"
+  ]
 
   register_info_provider ForemanAnsible::AnsibleInfo
 

data/lib/foreman_ansible/remote_execution.rb

@@ -45,7 +45,14 @@ module ForemanAnsible
       RemoteExecutionFeature.register(
         :ansible_run_capsule_upgrade,
         N_('Upgrade Capsules on given hosts'),
-        :description => N_('Upgrade Capsules on given Capsule server hosts')
+        :description => N_('Upgrade Capsules on given Capsule server hosts'),
+        :proxy_selector_override => ::RemoteExecutionProxySelector::INTERNAL_PROXY
+      )
+      RemoteExecutionFeature.register(
+        :ansible_configure_cloud_connector,
+        N_('Configure Cloud Connector on given hosts'),
+        :description => N_('Configure Cloud Connector on given hosts'),
+        :proxy_selector_override => ::RemoteExecutionProxySelector::INTERNAL_PROXY
       )
     end
   end

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 = '5.1.3'
+  VERSION = '6.1.1'
 end

data/test/fixtures/report.json

@@ -1,4 +1,5 @@
 {
+  "reporter": "ansible",
   "reported_at":"2018-01-15 17:31:36 521275",
   "metrics": {
     "time":
@@ -17,7 +18,7 @@
           "source": "common : Install Common packages"
         },
         "messages": {
-          "message": "{\"msg\": \"All items completed\", \"changed\": false, \"results\": [{\"_ansible_parsed\": true, \"changed\": false, \"_ansible_no_log\": false, \"cache_updated\": false, \"_ansible_item_result\": true, \"failed\": false, \"item\": \"git\", \"invocation\": {\"module_args\": {\"dpkg_options\": \"force-confdef,force-confold\", \"upgrade\": null, \"force\": false, \"force_apt_get\": false, \"package\": [\"git\"], \"autoclean\": false, \"name\": \"git\", \"purge\": false, \"allow_unauthenticated\": false, \"state\": \"present\", \"autoremove\": false, \"update_cache\": null, \"default_release\": null, \"only_upgrade\": false, \"cache_valid_time\": 0, \"deb\": null, \"install_recommends\": null}}, \"_ansible_ignore_errors\": null, \"cache_update_time\": 1515797094}, {\"_ansible_parsed\": true, \"changed\": false, \"_ansible_no_log\": false, \"cache_updated\": false, \"_ansible_item_result\": true, \"failed\": false, \"item\": \"htop\", \"invocation\": {\"module_args\": {\"dpkg_options\": \"force-confdef,force-confold\", \"upgrade\": null, \"force\": false, \"force_apt_get\": false, \"package\": [\"htop\"], \"autoclean\": false, \"name\": \"htop\", \"purge\": false, \"allow_unauthenticated\": false, \"state\": \"present\", \"autoremove\": false, \"update_cache\": null, \"default_release\": null, \"only_upgrade\": false, \"cache_valid_time\": 0, \"deb\": null, \"install_recommends\": null}}, \"_ansible_ignore_errors\": null, \"cache_update_time\": 1515797094}, {\"_ansible_parsed\": true, \"changed\": false, \"_ansible_no_log\": false, \"cache_updated\": false, \"_ansible_item_result\": true, \"failed\": false, \"item\": \"zsh\", \"invocation\": {\"module_args\": {\"dpkg_options\": \"force-confdef,force-confold\", \"upgrade\": null, \"force\": false, \"force_apt_get\": false, \"package\": [\"zsh\"], \"autoclean\": false, \"name\": \"zsh\", \"purge\": false, \"allow_unauthenticated\": false, \"state\": \"present\", \"autoremove\": false, \"update_cache\": null, \"default_release\": null, \"only_upgrade\": false, \"cache_valid_time\": 0, \"deb\": null, \"install_recommends\": null}}, \"_ansible_ignore_errors\": null, \"cache_update_time\": 1515797094}]}"},"level":"info"}},{"log":{"sources":{"source":"common : Copy default motd"},"messages":{"message":"{\"_ansible_parsed\": true, \"group\": \"root\", \"uid\": 0, \"checksum\": \"0a381ff6a86081af6dc957a77c7e2017a3244c4c\", \"changed\": false, \"owner\": \"root\", \"state\": \"file\", \"gid\": 0, \"mode\": \"0644\", \"diff\": {\"after\": {\"path\": \"/etc/motd\"}, \"before\": {\"path\": \"/etc/motd\"}}, \"invocation\": {\"module_args\": {\"directory_mode\": null, \"force\": false, \"remote_src\": null, \"path\": \"/etc/motd\", \"owner\": \"root\", \"follow\": false, \"group\": \"root\", \"unsafe_writes\": null, \"state\": \"file\", \"content\": null, \"serole\": null, \"diff_peek\": null, \"setype\": null, \"dest\": \"/etc/motd\", \"selevel\": null, \"original_basename\": \"motd.txt\", \"regexp\": null, \"validate\": null, \"src\": \"motd.txt\", \"seuser\": null, \"recurse\": false, \"delimiter\": null, \"mode\": null, \"attributes\": null, \"backup\": null}}, \"path\": \"/etc/motd\", \"size\": 1090, \"_ansible_no_log\": false}"
+          "message": "{\"msg\": \"All items completed\", \"changed\": false, \"results\": [{\"changed\": false, \"_ansible_no_log\": false, \"cache_updated\": false, \"_ansible_item_result\": true, \"failed\": false, \"item\": \"git\", \"invocation\": {\"module_args\": {\"dpkg_options\": \"force-confdef,force-confold\", \"upgrade\": null, \"force\": false, \"force_apt_get\": false, \"package\": [\"git\"], \"autoclean\": false, \"name\": \"git\", \"purge\": false, \"allow_unauthenticated\": false, \"state\": \"present\", \"autoremove\": false, \"update_cache\": null, \"default_release\": null, \"only_upgrade\": false, \"cache_valid_time\": 0, \"deb\": null, \"install_recommends\": null}}, \"_ansible_ignore_errors\": null, \"cache_update_time\": 1515797094}, {\"_ansible_parsed\": true, \"changed\": false, \"_ansible_no_log\": false, \"cache_updated\": false, \"_ansible_item_result\": true, \"failed\": false, \"item\": \"htop\", \"invocation\": {\"module_args\": {\"dpkg_options\": \"force-confdef,force-confold\", \"upgrade\": null, \"force\": false, \"force_apt_get\": false, \"package\": [\"htop\"], \"autoclean\": false, \"name\": \"htop\", \"purge\": false, \"allow_unauthenticated\": false, \"state\": \"present\", \"autoremove\": false, \"update_cache\": null, \"default_release\": null, \"only_upgrade\": false, \"cache_valid_time\": 0, \"deb\": null, \"install_recommends\": null}}, \"_ansible_ignore_errors\": null, \"cache_update_time\": 1515797094}, {\"_ansible_parsed\": true, \"changed\": false, \"_ansible_no_log\": false, \"cache_updated\": false, \"_ansible_item_result\": true, \"failed\": false, \"item\": \"zsh\", \"invocation\": {\"module_args\": {\"dpkg_options\": \"force-confdef,force-confold\", \"upgrade\": null, \"force\": false, \"force_apt_get\": false, \"package\": [\"zsh\"], \"autoclean\": false, \"name\": \"zsh\", \"purge\": false, \"allow_unauthenticated\": false, \"state\": \"present\", \"autoremove\": false, \"update_cache\": null, \"default_release\": null, \"only_upgrade\": false, \"cache_valid_time\": 0, \"deb\": null, \"install_recommends\": null}}, \"_ansible_ignore_errors\": null, \"cache_update_time\": 1515797094}]}"},"level":"info"}},{"log":{"sources":{"source":"common : Copy default motd"},"messages":{"message":"{\"_ansible_parsed\": true, \"group\": \"root\", \"uid\": 0, \"checksum\": \"0a381ff6a86081af6dc957a77c7e2017a3244c4c\", \"changed\": false, \"owner\": \"root\", \"state\": \"file\", \"gid\": 0, \"mode\": \"0644\", \"diff\": {\"after\": {\"path\": \"/etc/motd\"}, \"before\": {\"path\": \"/etc/motd\"}}, \"invocation\": {\"module_args\": {\"directory_mode\": null, \"force\": false, \"remote_src\": null, \"path\": \"/etc/motd\", \"owner\": \"root\", \"follow\": false, \"group\": \"root\", \"unsafe_writes\": null, \"state\": \"file\", \"content\": null, \"serole\": null, \"diff_peek\": null, \"setype\": null, \"dest\": \"/etc/motd\", \"selevel\": null, \"original_basename\": \"motd.txt\", \"regexp\": null, \"validate\": null, \"src\": \"motd.txt\", \"seuser\": null, \"recurse\": false, \"delimiter\": null, \"mode\": null, \"attributes\": null, \"backup\": null}}, \"path\": \"/etc/motd\", \"size\": 1090, \"_ansible_no_log\": false}"
         },
         "level": "info"
       }

data/test/unit/ansible_provider_test.rb

@@ -35,13 +35,13 @@ class AnsibleProviderTest < ActiveSupport::TestCase
       it 'generates secrets properly' do
         params = {
           'remote_execution_ssh_password' => 'password',
-          'remote_execution_sudo_password' => 'letmein'
+          'remote_execution_effective_user_password' => 'letmein'
         }
         host.expects(:params).twice.returns(params)
         secrets = ForemanAnsible::AnsibleProvider.secrets(host)
         host_secrets = secrets['per-host'][host.name]
-        assert_equal host_secrets['ansible_ssh_pass'], 'password'
-        assert_equal host_secrets['ansible_sudo_pass'], 'letmein'
+        assert_equal host_secrets['ansible_password'], 'password'
+        assert_equal host_secrets['ansible_become_password'], 'letmein'
       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_sudo_pass' => '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 }
@@ -32,18 +32,18 @@ module ForemanAnsibleCore
         let(:runner) { ForemanAnsibleCore::Runner::AnsibleRunner.allocate }
 
         test 'uses secrets from inventory' do
-          test_inventory = inventory.merge('ssh_password' => 'sshpass', 'sudo_password' => 'sudopass')
+          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 'sudopass', host_vars['ansible_sudo_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 'iamroot', host_vars['ansible_sudo_pass']
+          assert_equal 'letmein', host_vars['ansible_password']
+          assert_equal 'iamroot', host_vars['ansible_become_password']
         end
       end
     end

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

@@ -87,24 +87,24 @@ class PlaybookRunnerTest < ActiveSupport::TestCase
         '_meta' => { 'hostvars' => { 'foreman.example.com' => {} } } }
     end
     let(:secrets) do
-      host_secrets = { 'ansible_ssh_pass' => 'letmein', 'ansible_sudo_pass' => 'iamroot' }
+      host_secrets = { 'ansible_password' => 'letmein', 'ansible_become_password' => 'iamroot' }
       { 'per-host' => { 'foreman.example.com' => host_secrets } }
     end
     let(:runner) { ForemanAnsibleCore::Runner::Playbook.allocate }
 
     test 'uses secrets from inventory' do
-      test_inventory = inventory.merge('ssh_password' => 'sshpass', 'sudo_password' => 'sudopass')
+      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 'sudopass', host_vars['ansible_sudo_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 'iamroot', host_vars['ansible_sudo_pass']
+      assert_equal 'letmein', host_vars['ansible_password']
+      assert_equal 'iamroot', host_vars['ansible_become_password']
     end
   end
 end

data/test/unit/services/inventory_creator_test.rb

@@ -10,7 +10,7 @@ module ForemanAnsible
       @host = FactoryBot.build(:host)
       @template_invocation = OpenStruct.new(
         :job_invocation => OpenStruct.new(:password => 'foobar',
-                                          :sudo_password => 'foobar'),
+                                          :effective_user_password => 'foobar'),
         :effective_user => 'foobar'
       )
     end
@@ -69,8 +69,8 @@ module ForemanAnsible
                    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_sudo_pass')
+      refute connection_params.key?('ansible_password')
+      refute connection_params.key?('ansible_become_password')
     end
 
     test 'ssh private key is passed when available' do

data/webpack/components/ReportJsonViewer.js

@@ -10,7 +10,7 @@ const theme = {
 
 const ReportJsonViewer = ({ data }) => (
   <div className="report-json-viewer">
-    <JSONTree data={this.props.data} hideRoot theme={theme} />
+    <JSONTree data={data} hideRoot theme={theme} />
   </div>
 );
 

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 5.1.3
+  version: 6.1.1
 platform: ruby
 authors:
 - Daniel Lobato Garcia
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-09 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.80.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.80.0
 - !ruby/object:Gem::Dependency
   name: foreman_ansible_core
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
@@ -347,7 +333,7 @@ homepage: https://github.com/theforeman/foreman_ansible
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -362,8 +348,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
 test_files:
@@ -371,41 +357,41 @@ test_files:
 - test/factories/ansible_roles.rb
 - test/factories/ansible_variables.rb
 - test/fixtures/insights_playbook.yaml
-- test/fixtures/sample_facts.json
 - test/fixtures/report.json
+- test/fixtures/sample_facts.json
+- test/functional/ansible_roles_controller_test.rb
+- test/functional/ansible_variables_controller_test.rb
+- test/functional/api/v2/ansible_inventories_controller_test.rb
 - test/functional/api/v2/ansible_roles_controller_test.rb
+- test/functional/api/v2/ansible_variables_controller_test.rb
 - test/functional/api/v2/hostgroups_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
-- test/functional/api/v2/ansible_inventories_controller_test.rb
-- test/functional/api/v2/ansible_variables_controller_test.rb
-- test/functional/ansible_roles_controller_test.rb
-- test/functional/ansible_variables_controller_test.rb
-- test/functional/ui_ansible_roles_controller_test.rb
 - test/functional/hosts_controller_test.rb
+- test/functional/ui_ansible_roles_controller_test.rb
+- test/test_plugin_helper.rb
 - test/unit/actions/run_ansible_job_test.rb
 - test/unit/actions/run_proxy_ansible_command_test.rb
+- test/unit/ansible_role_test.rb
+- test/unit/ansible_variable_test.rb
 - test/unit/concerns/config_reports_extensions_test.rb
 - test/unit/concerns/host_managed_extensions_test.rb
 - test/unit/concerns/hostgroup_extensions_test.rb
 - test/unit/helpers/ansible_reports_helper_test.rb
+- test/unit/host_ansible_role_test.rb
+- test/unit/hostgroup_ansible_role_test.rb
 - test/unit/lib/foreman_ansible_core/command_creator_test.rb
 - test/unit/lib/foreman_ansible_core/ansible_runner_test.rb
 - test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
 - test/unit/lib/proxy_api/ansible_test.rb
+- test/unit/services/ansible_report_importer_test.rb
+- test/unit/services/ansible_variables_importer_test.rb
 - test/unit/services/api_roles_importer_test.rb
+- test/unit/services/fact_importer_test.rb
+- test/unit/services/fact_parser_test.rb
 - test/unit/services/fact_sparser_test.rb
 - test/unit/services/insights_plan_runner_test.rb
 - test/unit/services/roles_importer_test.rb
 - test/unit/services/structured_fact_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb
-- test/unit/services/ansible_report_importer_test.rb
-- test/unit/services/fact_importer_test.rb
-- test/unit/services/fact_parser_test.rb
-- test/unit/services/ansible_variables_importer_test.rb
 - test/unit/services/inventory_creator_test.rb
-- test/unit/ansible_role_test.rb
-- test/unit/host_ansible_role_test.rb
-- test/unit/hostgroup_ansible_role_test.rb
-- test/unit/ansible_variable_test.rb
 - test/unit/ansible_provider_test.rb
-- test/test_plugin_helper.rb