foreman_ansible 13.0.6 → 14.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78a598c4115838d6d1c9894d431755931e6ae6741d688031215b254d5f1c80be
-  data.tar.gz: fbe12bcb0d253149468c7d89820780768c2cdfd843047eda5a13f9845a6a6348
+  metadata.gz: 173634631b4f95f6e86f02775e026c17ba5a9a9f57d99e3f5491b57c89d8c9ca
+  data.tar.gz: 7dc19084e2cae6883903ef8cbb17fa221e9aea972efa851da351022989e603c8
 SHA512:
-  metadata.gz: 46ebd9739a430b8d173c4311b4535ca1f32fa05dbb41bcb4e65ee9d538b79445cd545646c9db2804149a4b73aa7d720c817871990e115a332ca16b2c18da90d8
-  data.tar.gz: 847832cea55007df47f64baaeecc9965e0d6ad2df1935a95c468a785061bdf2cf4f993233a3b1abd4d431d72b8bcb7c4e2c24c75105b336fddf8b5fca1c3e0ef
+  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/views/foreman_ansible/job_templates/convert_to_rhel.erb

@@ -19,6 +19,22 @@ template_inputs:
   options: "yes\r\nno"
   advanced: false
   value_type: plain
+  resource_type: Katello::ActivationKey
+  hidden_value: false
+- name: Data telemetry
+  required: true
+  input_type: user
+  description: "The convert2rhel utility uploads the following data about the system
+    conversion to Red Hat servers for the purpose of the utility usage analysis:<br>\r\n-
+    The convert2rhel command as executed<br>\r\n- The convert2rhel RPM version and
+    GPG signature<br>\r\n- Success or failure status of the conversion<br>\r\n- Conversion
+    start and end timestamps<br>\r\n- Source OS vendor and version<br>\r\n- Target
+    RHEL version<br>\r\n- convert2rhel related environment variables<br>"
+  options: "yes\r\nno"
+  advanced: false
+  value_type: plain
+  resource_type: Katello::ActivationKey
+  default: 'yes'
   hidden_value: false
 model: JobTemplate
 job_category: Convert 2 RHEL
@@ -27,34 +43,21 @@ kind: job_template
 %>
 ---
 - hosts: all
+<%- if input('Data telemetry') != "yes" -%>
   environment:
-    CONVERT2RHEL_THROUGH_FOREMAN: 1
+    CONVERT2RHEL_DISABLE_TELEMETRY: 1
+<%- end -%>
   tasks:
     - name: Install convert2rhel
       ansible.builtin.package:
         name: convert2rhel
         state: present
-
-    - name: Gather package facts
-      package_facts:
-        manager: auto
-
-    - name: Set fact for package version
-      set_fact:
-        convert2rhel_version: "{{ ansible_facts.packages['convert2rhel'][0].version }}"
-      when: "'convert2rhel' in ansible_facts.packages"
-      no_log: true
-
     - name: Prepopulate katello-ca-consumer
       get_url:
         url: <%= subscription_manager_configuration_url(@host) %>
         dest: /usr/share/convert2rhel/subscription-manager/katello-ca-consumer-latest.noarch.rpm
-      when:
-        - "convert2rhel_version is version('2.0.0', '<')"
-
     - name: Start convert2rhel
-      command: convert2rhel -y --activationkey "<%= input_resource('Activation Key').name %>" --org "<%= @host.organization.label %>"
-
+      command: convert2rhel -y --activationkey "<%= input_resource('Activation Key').name %>" --org "<%= @host.organization.label %>" --keep-rhsm
 <%- if input('Restart') == "yes" -%>
     - name: Reboot the machine
       reboot:

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.6'
+  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.6
+  version: 14.0.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-21 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -500,7 +500,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)