foreman_ansible 13.0.3 → 14.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72f523c6510ef86f864e87e6861cacd4e3d60aa051775c7a2c8fcc358f9c5dd3
-  data.tar.gz: 4b3286903ba586efe5cded3fc51d4e62ea4379531a9880eda70b0e16b220fda8
+  metadata.gz: 173634631b4f95f6e86f02775e026c17ba5a9a9f57d99e3f5491b57c89d8c9ca
+  data.tar.gz: 7dc19084e2cae6883903ef8cbb17fa221e9aea972efa851da351022989e603c8
 SHA512:
-  metadata.gz: 222813ad1bafba9d441710ecc46c0c2a046441235d88872c68c869c786798761657ff0461bc416f392c4757cf7142433abc0522bea4d43b770e49fe71eba50e2
-  data.tar.gz: b975529508ecec0dca43053d04145519aa104a2233c5420cc55bce56247b79588a9328bda0571b6216fb5954cef9696889c0f52db1e1f791581ca717bada89e6
+  metadata.gz: e16ac25e290b715368ea2d5a315aca31bd8c6723f9f19a974efedd926710c145c3f8532e33259599117d36497d7d0899783c324fa7db6ab3c2f035b2dfa4ecff
+  data.tar.gz: b492b84c46d9633770d1f75a7c151f7e4d55c52c1da465d834184248e66b0b1e6fe5a709376916142b29669f4bdb704ed9d5f2271be534387a3bdb86a7249adb

data/app/controllers/ui_ansible_roles_controller.rb

@@ -8,7 +8,7 @@ class UiAnsibleRolesController < ::Api::V2::BaseController
   end
 
   # restore original method from find_common to ignore resource nesting
-  def resource_scope(options = {})
-    @resource_scope ||= scope_for(resource_class, options)
+  def resource_scope(**kwargs)
+    @resource_scope ||= scope_for(resource_class, **kwargs)
   end
 end

data/app/services/foreman_ansible/inventory_creator.rb

@@ -97,7 +97,7 @@ module ForemanAnsible
 
     def remote_execution_options(host)
       params = {
-        'ansible_user' => host_setting(host, 'remote_execution_ssh_user'),
+        'ansible_user' => @template_invocation&.job_invocation&.ssh_user || host_setting(host, 'remote_execution_ssh_user'),
         'ansible_become_method' => host_setting(host, 'remote_execution_effective_user_method'),
         'ansible_ssh_private_key_file' => ansible_ssh_private_key(host),
         'ansible_port' => host_setting(host, 'remote_execution_ssh_port'),

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

@@ -30,8 +30,7 @@ template_inputs:
 provider_type: Ansible
 kind: job_template
 model: JobTemplate
-%>
-
+-%>
 # For Windows targets use the win_package module instead.
 ---
 - hosts: all
@@ -41,7 +40,7 @@ model: JobTemplate
   <%- end -%>
   tasks:
     - package:
-        name: <%= input('name') %>
+<%= indent(8) { to_yaml({"name" => input('name')}).gsub(/---\n/, '') } -%>
         state: <%= input('state') %>
   <%- if input('post_script').present? -%>
   post_tasks:

data/lib/foreman_ansible/register.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Foreman::Plugin.register :foreman_ansible do
-  requires_foreman '>= 3.8.1'
+  requires_foreman '>= 3.10.0'
   register_gettext
 
   settings do

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 = '13.0.3'
+  VERSION = '14.0.0'
 end

data/webpack/testHelper.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { Provider } from 'react-redux';
 import thunk from 'redux-thunk';
 import { applyMiddleware, createStore, compose, combineReducers } from 'redux';
@@ -42,20 +42,21 @@ export const withReactRouter = Component => props => {
 };
 
 export const withMockedProvider = Component => props => {
-  const ForemanContext = getForemanContext(ctx);
-  // eslint-disable-next-line react/prop-types
-  const { mocks, ...rest } = props;
-
-  const ctx = {
+  const [context, setContext] = useState({
     metadata: {
       UISettings: {
         perPage: 20,
       },
     },
-  };
+  });
+  const contextData = { context, setContext };
+  const ForemanContext = getForemanContext(contextData);
+
+  // eslint-disable-next-line react/prop-types
+  const { mocks, ...rest } = props;
 
   return (
-    <ForemanContext.Provider value={ctx}>
+    <ForemanContext.Provider value={contextData}>
       <MockedProvider mocks={mocks}>
         <Component {...rest} />
       </MockedProvider>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 13.0.3
+  version: 14.0.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-18 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -47,7 +47,7 @@ dependencies:
         version: '9.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '9.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '14'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -500,7 +500,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
@@ -511,23 +511,26 @@ test_files:
 - test/factories/host_ansible_enhancements.rb
 - test/fixtures/insights_playbook.yaml
 - test/fixtures/playbooks_example_output.json
+- test/fixtures/report.json
 - test/fixtures/sample_facts.json
 - test/fixtures/sample_playbooks.json
-- test/fixtures/report.json
 - 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/hostgroups_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
-- test/functional/api/v2/ansible_inventories_controller_test.rb
 - test/functional/hosts_controller_test.rb
 - test/functional/ui_ansible_roles_controller_test.rb
 - test/graphql/mutations/hosts/assign_ansible_roles_mutation_test.rb
 - test/graphql/queries/ansible_roles_query_test.rb
 - test/graphql/queries/host_ansible_roles_query_test.rb
+- test/integration/hostgroup_js_test.rb
+- test/test_plugin_helper.rb
+- test/unit/ansible_provider_test.rb
 - test/unit/ansible_role_test.rb
 - test/unit/ansible_variable_test.rb
 - test/unit/concerns/config_reports_extensions_test.rb
@@ -548,6 +551,3 @@ test_files:
 - test/unit/services/override_resolver_test.rb
 - test/unit/services/roles_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb
-- test/unit/ansible_provider_test.rb
-- test/integration/hostgroup_js_test.rb
-- test/test_plugin_helper.rb