foreman_ansible 15.0.2 → 15.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db50537ce55c457541ececd7bc377118b92ceb796e0517db0475fc602b1ed1db
-  data.tar.gz: f7fe803efe0d47d5c78ba9893db6f59618703f1e6bfbb304953e884e018f50ae
+  metadata.gz: cd46a9ca54ca84849a36222c25c731058929507ea35f650a54cc164b32ff9514
+  data.tar.gz: fb95c371f6ef1b9a1f4090ff9a34744f1cb3d037d59fdee288d92c1e9e64f869
 SHA512:
-  metadata.gz: 8aba188174e0f15a47315054e742bb39db1617a85dafb069c6ed0a02459c84e6e563283bed45099f6042ab4045b0545bdb4526412af63948496685cffe1c2d80
-  data.tar.gz: d69e35a71aacb8ac5c7bfde43fec71eaa6176914b98bddc4544f453b58d00afc8a709b9829239690ba3c7d67b184165920dcb0c68a85dfe752978d9a3a6fbd1e
+  metadata.gz: 95eb9c7e60988b2a401d69cb8b417b052703de34ab74a1dc49143c0d2d213a00c3ec0d37783ac2cc2543f06629b6b3ebe7546a0c27f7a036f4cc2549d081a9b5
+  data.tar.gz: 5e371aa4b5c25b3e96232aac2d84a5378ec7e56a8a977f08c076fb4f061626e9b107447a0979fe3c80fe1a9a10036c7a7da1e6081cb431ac60a6bc64b5728ee8

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

@@ -31,6 +31,23 @@ module Api
         render 'api/v2/ansible_override_values/show'
       end
 
+      api :PUT, "/ansible_override_values/:id", N_("Update an override value")
+      param :id, :identifier, :required => true
+      param_group :ansible_override_value, :as => :update
+
+      def update
+        @ansible_variable = AnsibleVariable.authorized(:edit_ansible_variables).
+                            find_by(:id => params[:id].to_i)
+        @override_value = @ansible_variable.lookup_values.find_by(:match => lookup_value_params['override_value']['match'])
+
+        if @override_value
+          @override_value.update(lookup_value_params['override_value'])
+          render 'api/v2/ansible_override_values/show'
+        else
+          not_found
+        end
+      end
+
       api :DELETE, "/ansible_override_values/:id", N_("Destroy an override value")
       param :id, :identifier, :required => true
 

data/app/views/api/v2/ansible_variables/show.json.rabl

@@ -2,7 +2,7 @@ object @ansible_variable
 
 attribute :parameter
 attributes :id, :variable, :ansible_role, :ansible_role_id, :description, :override,
-           :variable_type, :hidden_value?, :validator_type,
+           :variable_type, :validator_type,
            :validator_rule, :merge_overrides, :merge_default,
            :avoid_duplicates, :override_value_order, :created_at, :updated_at,
            :default_value, :imported
@@ -19,3 +19,5 @@ end
 node :override_values_count do |lk|
   lk.lookup_values.count
 end
+
+node :hidden_value, &:hidden_value?

data/app/views/foreman_ansible/job_templates/convert_to_rhel.erb

@@ -20,11 +20,25 @@ template_inputs:
   advanced: false
   value_type: plain
   hidden_value: false
+- name: ELS
+  required: false
+  input_type: user
+  description: Use an Extended Lifecycle Support (ELS) add-on subscription
+  advanced: false
+  value_type: plain
+  options: "yes\r\nno"
+  default: "no"
+  hidden_value: false
 model: JobTemplate
 job_category: Convert 2 RHEL
 provider_type: Ansible
 kind: job_template
 %>
+<%-
+  ack = " --activationkey \"#{input_resource('Activation Key').name}\""
+  org = " --org \"#{@host.organization.label}\""
+  els = input('ELS') == "yes" ? " --els" : ""
+-%>
 ---
 - hosts: all
   environment:
@@ -53,7 +67,7 @@ kind: job_template
         - "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 <%= ack + org + els %>
 
 <%- if input('Restart') == "yes" -%>
     - name: Reboot the machine

data/config/routes.rb

@@ -7,14 +7,14 @@ Rails.application.routes.draw do
           :defaults => { apiv: 'v2' },
           :apiv => /v2/,
           :constraints => ApiConstraints.new(version: 2, default: true) do
-      constraints(:id => %r{[^\/]+}) do
-        resources :hosts, :except => [:new, :edit] do
+      constraints(:id => /[^\/]+/) do
+        resources :hosts, :only => [] do
           member do
             post :play_roles
             get :ansible_roles
             post :assign_ansible_roles
-            put 'ansible_roles/:ansible_role_id', :to => 'hosts#add_ansible_role', :constraints => { id: %r{[^\/]+} }
-            delete 'ansible_roles/:ansible_role_id', :to => 'hosts#remove_ansible_role', :constraints => { id: %r{[^\/]+} }
+            put 'ansible_roles/:ansible_role_id', :to => 'hosts#add_ansible_role', :constraints => { id: /[^\/]+/ }
+            delete 'ansible_roles/:ansible_role_id', :to => 'hosts#remove_ansible_role', :constraints => { id: /[^\/]+/ }
           end
           collection do
             post :multiple_play_roles
@@ -25,8 +25,8 @@ Rails.application.routes.draw do
             post :play_roles
             get :ansible_roles
             post :assign_ansible_roles
-            put 'ansible_roles/:ansible_role_id', :to => 'hostgroups#add_ansible_role', :constraints => { id: %r{[^\/]+} }
-            delete 'ansible_roles/:ansible_role_id', :to => 'hostgroups#remove_ansible_role', :constraints => { id: %r{[^\/]+} }
+            put 'ansible_roles/:ansible_role_id', :to => 'hostgroups#add_ansible_role', :constraints => { id: /[^\/]+/ }
+            delete 'ansible_roles/:ansible_role_id', :to => 'hostgroups#remove_ansible_role', :constraints => { id: /[^\/]+/ }
           end
           collection do
             post :multiple_play_roles
@@ -36,7 +36,7 @@ Rails.application.routes.draw do
     end
   end
   scope '/ansible' do
-    constraints(:id => %r{[^\/]+}) do
+    constraints(:id => /[^\/]+/) do
       resources :hosts, :only => [] do
         member do
           get :play_roles
@@ -100,7 +100,7 @@ Rails.application.routes.draw do
           end
         end
 
-        resources :ansible_override_values, :only => [:create, :destroy]
+        resources :ansible_override_values, :only => [:create, :destroy, :update]
 
         resources :ansible_inventories, :only => [] do
           collection do

data/lib/foreman_ansible/register.rb

@@ -120,7 +120,7 @@ Foreman::Plugin.register :foreman_ansible do
                { :lookup_values => [:update],
                  :ansible_variables => [:edit, :update],
                  :'api/v2/ansible_variables' => [:update],
-                 :'api/v2/ansible_override_values' => [:create, :destroy] },
+                 :'api/v2/ansible_override_values' => [:create, :destroy, :update] },
                :resource_type => 'AnsibleVariable'
     permission :destroy_ansible_variables,
                {

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 = '15.0.2'
+  VERSION = '15.0.4'
 end

data/webpack/components/AnsibleRolesSwitcher/components/AvailableRolesList.js

@@ -17,13 +17,11 @@ const AvailableRolesList = ({
   <ListView>
     <div className="sticky-pagination">
       <Pagination
-        viewType="list"
         itemCount={itemCount}
         updateParamsByUrl={false}
         page={pagination.page}
         perPage={pagination.perPage}
         onChange={onListingChange}
-        dropdownButtonId="available-ansible-roles-pagination-row-dropdown"
       />
     </div>
     <LoadingState loading={loading}>

data/webpack/components/AnsibleRolesSwitcher/components/__snapshots__/AvailableRolesList.test.js.snap

@@ -9,7 +9,6 @@ exports[`AvailableRolesList should render 1`] = `
   >
     <Pagination
       className={null}
-      dropdownButtonId="available-ansible-roles-pagination-row-dropdown"
       itemCount={2}
       noSidePadding={false}
       onChange={[Function]}
@@ -19,7 +18,6 @@ exports[`AvailableRolesList should render 1`] = `
       perPage={25}
       updateParamsByUrl={false}
       variant="bottom"
-      viewType="list"
     />
   </div>
   <LoadingState

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 15.0.2
+  version: 15.0.4
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-19 00:00:00.000000000 Z
+date: 2025-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -280,83 +280,45 @@ files:
 - lib/foreman_ansible/version.rb
 - locale/Makefile
 - locale/ca/LC_MESSAGES/foreman_ansible.mo
-- locale/ca/foreman_ansible.edit.po
 - locale/ca/foreman_ansible.po
-- locale/ca/foreman_ansible.po.time_stamp
 - locale/cs_CZ/LC_MESSAGES/foreman_ansible.mo
-- locale/cs_CZ/foreman_ansible.edit.po
 - locale/cs_CZ/foreman_ansible.po
-- locale/cs_CZ/foreman_ansible.po.time_stamp
 - locale/de/LC_MESSAGES/foreman_ansible.mo
-- locale/de/foreman_ansible.edit.po
 - locale/de/foreman_ansible.po
-- locale/de/foreman_ansible.po.time_stamp
 - locale/en/LC_MESSAGES/foreman_ansible.mo
-- locale/en/foreman_ansible.edit.po
 - locale/en/foreman_ansible.po
-- locale/en/foreman_ansible.po.time_stamp
 - locale/en_GB/LC_MESSAGES/foreman_ansible.mo
-- locale/en_GB/foreman_ansible.edit.po
 - locale/en_GB/foreman_ansible.po
-- locale/en_GB/foreman_ansible.po.time_stamp
 - locale/es/LC_MESSAGES/foreman_ansible.mo
-- locale/es/foreman_ansible.edit.po
 - locale/es/foreman_ansible.po
-- locale/es/foreman_ansible.po.time_stamp
 - locale/foreman_ansible.pot
 - locale/fr/LC_MESSAGES/foreman_ansible.mo
-- locale/fr/foreman_ansible.edit.po
 - locale/fr/foreman_ansible.po
-- locale/fr/foreman_ansible.po.time_stamp
 - locale/gemspec.rb
 - locale/gl/LC_MESSAGES/foreman_ansible.mo
-- locale/gl/foreman_ansible.edit.po
 - locale/gl/foreman_ansible.po
-- locale/gl/foreman_ansible.po.time_stamp
 - locale/it/LC_MESSAGES/foreman_ansible.mo
-- locale/it/foreman_ansible.edit.po
 - locale/it/foreman_ansible.po
-- locale/it/foreman_ansible.po.time_stamp
 - locale/ja/LC_MESSAGES/foreman_ansible.mo
-- locale/ja/foreman_ansible.edit.po
 - locale/ja/foreman_ansible.po
-- locale/ja/foreman_ansible.po.time_stamp
 - locale/ka/LC_MESSAGES/foreman_ansible.mo
-- locale/ka/foreman_ansible.edit.po
 - locale/ka/foreman_ansible.po
-- locale/ka/foreman_ansible.po.time_stamp
 - locale/ko/LC_MESSAGES/foreman_ansible.mo
-- locale/ko/foreman_ansible.edit.po
 - locale/ko/foreman_ansible.po
-- locale/ko/foreman_ansible.po.time_stamp
 - locale/nl_NL/LC_MESSAGES/foreman_ansible.mo
-- locale/nl_NL/foreman_ansible.edit.po
 - locale/nl_NL/foreman_ansible.po
-- locale/nl_NL/foreman_ansible.po.time_stamp
 - locale/pl/LC_MESSAGES/foreman_ansible.mo
-- locale/pl/foreman_ansible.edit.po
 - locale/pl/foreman_ansible.po
-- locale/pl/foreman_ansible.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/foreman_ansible.mo
-- locale/pt_BR/foreman_ansible.edit.po
 - locale/pt_BR/foreman_ansible.po
-- locale/pt_BR/foreman_ansible.po.time_stamp
 - locale/ru/LC_MESSAGES/foreman_ansible.mo
-- locale/ru/foreman_ansible.edit.po
 - locale/ru/foreman_ansible.po
-- locale/ru/foreman_ansible.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/foreman_ansible.mo
-- locale/sv_SE/foreman_ansible.edit.po
 - locale/sv_SE/foreman_ansible.po
-- locale/sv_SE/foreman_ansible.po.time_stamp
 - locale/zh_CN/LC_MESSAGES/foreman_ansible.mo
-- locale/zh_CN/foreman_ansible.edit.po
 - locale/zh_CN/foreman_ansible.po
-- locale/zh_CN/foreman_ansible.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/foreman_ansible.mo
-- locale/zh_TW/foreman_ansible.edit.po
 - locale/zh_TW/foreman_ansible.po
-- locale/zh_TW/foreman_ansible.po.time_stamp
 - package.json
 - test/factories/ansible_proxy.rb
 - test/factories/ansible_roles.rb
@@ -548,7 +510,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)