foreman_ansible 10.4.0 → 10.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c30c3eac6e4a49a8d43c6a654d84b672ef9fa58bbacb8fe2044cc74f33b5a28
-  data.tar.gz: 8084c75afc69d788093952a8988e3ff883f3726779a94f1de5016c1b857d7435
+  metadata.gz: 5d5fe936def15be1cc84456bb6d1fa5df9a5a895c2aea3da888908dbaa59c6fb
+  data.tar.gz: 7cb834bfefdcfc73743d06c06e70b61965bd49d3b5aa263963ec7998d4ab70dc
 SHA512:
-  metadata.gz: e541db04ed8d5bb3ed65b8239a06366efbda044d57263e4e507534c61a89d566e1270b67593a5c33d423abf13bc7896f76208aa81efc36f58382bd972d40cd7f
-  data.tar.gz: 5df022f589352f580358303a3172f8062e476884607e1dafd21ee8f140646e106a93419c018b896df55b4bc4cac102374bb92bd3c46e8dc9e42998c52c2bb26e
+  metadata.gz: 437ca9c045cb2e07982d4ca9a73913d80a8f155c1d5f5324e29f544554a3defddbf1295ee1093ac5cbbf87f60cb18981be394c26df7466c4b53943f77da99f23
+  data.tar.gz: 5eb239a127d53b9b97b9a7bc2a6145f7bb96af3e8d3cb079b6b6e8d546b48ba441273062258429c8b35cfa3c387e993996e91a9d95a18b8300f8d9eaea1ddb80

data/app/helpers/foreman_ansible/ansible_hostgroups_helper.rb

@@ -4,18 +4,38 @@ module ForemanAnsible
   module AnsibleHostgroupsHelper
     def ansible_hostgroups_actions(hostgroup)
       actions = []
-      play_roles = if hostgroup.all_ansible_roles.empty?
-                     { action: { content: (link_to _('Run all Ansible roles'), 'javascript:void(0);', disabled: true, title: 'No roles assigned', class: 'disabled'), options: { class: 'disabled' } }, priority: 31 }
-                   else
-                     { action: display_link_if_authorized(_('Run all Ansible roles'), hash_for_play_roles_hostgroup_path(id: hostgroup), 'data-no-turbolink': true, title: _('Run all Ansible roles on hosts belonging to this host group')), priority: 31 }
-                   end
+      is_hostgroup_empty = hostgroup.all_ansible_roles.empty? || hostgroup.hosts_count.zero?
 
-      assign_jobs = { action: { content: (link_to _('Configure Ansible Job'), "/ansible/hostgroups/#{hostgroup.id}", class: 'la') }, priority: 32 }
+      if User.current.can?(:create_job_invocations)
+        actions << {
+          action: if is_hostgroup_empty
+                    disabled_action_link(_('Run all Ansible roles'))
+                  else
+                    display_link_if_authorized(_('Run all Ansible roles'), hash_for_play_roles_hostgroup_path(id: hostgroup), 'data-no-turbolink': true, title: _('Run all Ansible roles on hosts belonging to this host group'))
+                  end,
+          priority: 31
+        }
+      end
 
-      actions.push play_roles if User.current.can?(:create_job_invocations)
-      actions.push assign_jobs if User.current.can?(:view_job_invocations) && User.current.can?(:view_recurring_logics)
+      if User.current.can?(:view_job_invocations) && User.current.can?(:view_recurring_logics)
+        actions << {
+          action: if is_hostgroup_empty
+                    disabled_action_link(_('Configure Ansible Job'))
+                  else
+                    link_to(_('Configure Ansible Job'), "/ansible/hostgroups/#{hostgroup.id}", class: 'la')
+                  end,
+          priority: 32
+        }
+      end
 
       actions
     end
+
+    def disabled_action_link(text)
+      {
+        content: link_to(text, 'javascript:void(0);', disabled: true, title: _('No roles/hosts assigned'), class: 'disabled'),
+        options: { class: 'disabled' }
+      }
+    end
   end
 end

data/app/helpers/foreman_ansible/smart_proxies_helper.rb

@@ -27,7 +27,13 @@ module ForemanAnsible
     end
 
     def proxy_update_button(proxy)
-      feature = RemoteExecutionFeature.feature(:ansible_run_capsule_upgrade)
+      name = if Foreman::Plugin.find('foreman_theme_satellite').present?
+               :ansible_run_capsule_upgrade
+             else
+               :ansible_run_smart_proxy_upgrade
+             end
+
+      feature = RemoteExecutionFeature.feature(name)
       return if feature.nil?
 
       path = new_job_invocation_path(:host_ids => proxy.infrastructure_host_facets.pluck(:host_id),

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

@@ -1,5 +1,5 @@
 <%#
-name: Smart Proxy Upgrade Playbook
+name: Capsule Upgrade Playbook
 snippet: false
 template_inputs:
 - name: target_version
@@ -26,8 +26,8 @@ feature: ansible_run_capsule_upgrade
 - hosts: all
   vars:
     target_version: "<%= input('target_version').present? ? input('target_version') : product_short_version %>"
-<% if plugin_present?('foreman_theme_satellite') -%>
   tasks:
+<% if plugin_present?('foreman_theme_satellite') -%>
     - name: Gather the rpm package facts
       package_facts:
         manager: auto
@@ -75,35 +75,7 @@ feature: ansible_run_capsule_upgrade
           fail:
             msg: "Failed! Capsule server upgrade failed. See /var/log/foreman-installer/capsule.log in the Capsule server for more information"
 <% else -%>
-  tasks:
-    - name: Gather the rpm package facts
-      package_facts:
-        manager: auto
-
-    - name: Fail if the target server is a Foreman server
+    - name: Fail if foreman_theme_satellite is missing
       fail:
-        msg: "This playbook cannot be executed on a Foreman server. Use only on a Smart Proxy server."
-      when: "'foreman' in ansible_facts.packages"
-
-    - name: Install foreman release gpg key
-      rpm_key:
-        state: present
-        key: http://yum.theforeman.org/releases/{{ target_version }}/RPM-GPG-KEY-foreman
-      when: target_version != "nightly"
-
-    - name: Update foreman repositories
-      package:
-        name: https://yum.theforeman.org/releases/{{ target_version }}/el{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/foreman-release.rpm
-        state: installed
-
-    - name: Clean yum metadata
-      command: yum clean all
-
-    - name: Update all packages
-      package:
-        name: '*'
-        state: latest
-
-    - name: Run the installer
-      shell: foreman-installer
+        msg: "Failed! The plugin foreman_theme_satellite is not present. This playbook is only for use with Satellite."
 <% end -%>

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

@@ -0,0 +1,59 @@
+<%#
+name: Smart Proxy Upgrade Playbook
+snippet: false
+template_inputs:
+- name: target_version
+  required: false
+  input_type: user
+  advanced: false
+  value_type: plain
+  hidden_value: false
+- name: whitelist_options
+  required: false
+  input_type: user
+  advanced: false
+  value_type: plain
+  hidden_value: false
+model: JobTemplate
+job_category: Maintenance Operations
+description_format: "%{template_name}"
+provider_type: Ansible
+kind: job_template
+feature: ansible_run_smart_proxy_upgrade
+%>
+
+---
+- hosts: all
+  vars:
+    target_version: "<%= input('target_version').present? ? input('target_version') : product_short_version %>"
+  tasks:
+    - name: Gather the rpm package facts
+      package_facts:
+        manager: auto
+
+    - name: Fail if the target server is a Foreman server
+      fail:
+        msg: "This playbook cannot be executed on a Foreman server. Use only on a Smart Proxy server."
+      when: "'foreman' in ansible_facts.packages"
+
+    - name: Install foreman release gpg key
+      rpm_key:
+        state: present
+        key: http://yum.theforeman.org/releases/{{ target_version }}/RPM-GPG-KEY-foreman
+      when: target_version != "nightly"
+
+    - name: Update foreman repositories
+      package:
+        name: https://yum.theforeman.org/releases/{{ target_version }}/el{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/foreman-release.rpm
+        state: installed
+
+    - name: Clean yum metadata
+      command: yum clean all
+
+    - name: Update all packages
+      package:
+        name: '*'
+        state: latest
+
+    - name: Run the installer
+      shell: foreman-installer

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 = '10.4.0'
+  VERSION = '10.4.2'
 end

data/package.json

@@ -7,7 +7,7 @@
     "test": "test"
   },
   "peerDependencies": {
-    "@theforeman/vendor": ">= 8.16.0"
+    "@theforeman/vendor": "^10.0"
   },
   "dependencies": {
     "react-json-tree": "^0.11.0"

data/test/integration/hostgroup_js_test.rb

@@ -10,21 +10,23 @@ class HostgroupJsTest < IntegrationTestWithJavascript
     FactoryBot.create(:host, :hostgroup_id => hostgroup_with_roles.id)
   end
 
-  test 'hostgroup without roles should have disabled link' do
+  test 'hostgroup without roles should have disabled links' do
     visit hostgroups_path(search: hostgroup.name)
 
     first_row = page.find('table > tbody > tr:nth-child(1)')
     first_row.find('td:nth-child(4) > div > a').click
 
     assert_includes first(:link, 'Run all Ansible roles')[:class], 'disabled'
+    assert_includes first(:link, 'Configure Ansible Job')[:class], 'disabled'
   end
 
-  test 'hostgroup with roles should have clickable link' do
+  test 'hostgroup with roles should have clickable links' do
     visit hostgroups_path(search: hostgroup_with_roles.name)
 
     first_row = page.find('table > tbody > tr:nth-child(1)')
     first_row.find('td:nth-child(4) > div > a').click
 
     assert_not first(:link, 'Run all Ansible roles')[:class].include?('disabled')
+    assert_not first(:link, 'Configure Ansible Job')[:class].include?('disabled')
   end
 end

data/webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/AnsibleVariableOverridesTableHelper.js

@@ -86,12 +86,16 @@ const validateRegexp = (variable, value) => {
 };
 
 const validateList = (variable, value) => {
-  if (variable.validatorRule.split(',').find(item => item.trim() === value)) {
+  let { validatorRule } = variable;
+  if (typeof validatorRule !== 'string') {
+    validatorRule = validatorRule.toString();
+  }
+  if (validatorRule.split(',').find(item => item.trim() === value)) {
     return validationSuccess;
   }
   return {
     key: 'error',
-    msg: sprintf(__('Invalid, expected one of: %s'), variable.validatorRule),
+    msg: sprintf(__('Invalid, expected one of: %s'), validatorRule),
   };
 };
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 10.4.0
+  version: 10.4.2
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-12 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -42,36 +42,30 @@ dependencies:
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '8.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '8.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
 description: Ansible integration with Foreman
 email:
 - elobatocs@gmail.com
@@ -204,6 +198,7 @@ files:
 - app/views/foreman_ansible/job_templates/run_playbook-ansible_default.erb
 - app/views/foreman_ansible/job_templates/service_action_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/service_action_-_enable_web_console.erb
+- app/views/foreman_ansible/job_templates/smart_proxy_upgrade_-_ansible_default.erb
 - app/views/ui_ansible_roles/index.json.rabl
 - app/views/ui_ansible_roles/main.json.rabl
 - app/views/ui_ansible_roles/show.json.rabl
@@ -484,10 +479,10 @@ test_files:
 - test/foreman_ansible/helpers/ansible_roles_helper_test.rb
 - 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_playbooks_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/ansible_inventories_controller_test.rb
 - test/functional/api/v2/hostgroups_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
 - test/functional/hosts_controller_test.rb