foreman_dlm 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbea781adcb410612c6d6fde4e13f116f31f50f393ac518c55cdf8ff0bc0ab22
-  data.tar.gz: 201b1a484408da1971ebd7b33285d5738a1a707bd84ec06a04ed05510c85d065
+  metadata.gz: 3b80fdd6f962a1cb1ab338f061bea43d0ea641f7b34f647c225bf6abc2a366f4
+  data.tar.gz: b7860026fa2dd1c7885011297483b79de657678123e1b25960c974ee4505e9cc
 SHA512:
-  metadata.gz: 961720c5a51b86f720e61f1463bc9b413419be9876d93d36070053d14961db07b9f42f0a82c99c0b917f621296b401da1caf49f123882402e943d8994228f734
-  data.tar.gz: c9cab6e1b37b3321ce4d862dc8599f9af2d8b9b5ce911eaa4141f28816364cfed1d29e372cbe5a1583df2876d47681b7c4c66c70c11dc5ef3164611965ccd99b
+  metadata.gz: d647bbeaeaefac4d7eb91396e68815348da49713d149b000b30619ef8b808ca86b9f0a90bb2b5409454023286399136d847d15aab1c54785c0430a455b1d480c
+  data.tar.gz: dc5b9bd8d089fbbecaae290e501aa7536f689cd0c8af96f154cff9fef449c8d68dea560e7051e967180c9457aa29dffd7e9bba388406e82d7a605011ef9f06e9

data/README.md

@@ -1,6 +1,6 @@
 # Foreman Distributed Lock Manager
 
-[<img src="https://opensourcelogos.aws.dmtech.cloud/dmTECH_opensource_logo%401x.svg" height="21" width="130">](https://www.dmtech.de/)
+[<img src="https://raw.githubusercontent.com/dm-drogeriemarkt/.github/refs/heads/main/assets/dmtech-open-source-badge.svg">](https://www.dmtech.de/)
 
 This is a plugin for Foreman that allows Foreman to act as a distributed lock manager.
 Updates are key to security, but updates of an operating system are hard to apply and existing tools are hard to manage at scale. This might lead to a large drift between important security updates becoming available and all your hosts being successfully patched. Security experts recommend to install updates as soon as they come available. The ability to easily update software is the most effective way to improve server security. Automation is key to ensure this goal is reached.
@@ -16,6 +16,7 @@ With this plugin servers can acquire a lock in Foreman to ensure only one server
 | >= 1.17         | ~> 1.0         |
 | >= 3.0          | ~> 2.0         |
 | >= 3.9          | ~> 3.0         |
+| >= 3.13         | ~> 4.0         |
 
 ## Installation
 

data/db/migrate/20180627150003_rename_dlmlock_sti_models.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class RenameDlmlockStiModels < ActiveRecord::Migration[5.1]
+class RenameDlmlockSTIModels < ActiveRecord::Migration[5.1]
   def up
     execute "UPDATE dlmlocks set type='ForemanDlm::Dlmlock::Update' where type='Dlmlock::Update';"
   end

data/lib/foreman_dlm/engine.rb

@@ -4,10 +4,6 @@ module ForemanDlm
   class Engine < ::Rails::Engine
     engine_name 'foreman_dlm'
 
-    config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/jobs"]
-
     # Add any db migrations
     initializer 'foreman_dlm.load_app_instance_data' do |app|
       ForemanDlm::Engine.paths['db/migrate'].existent.each do |path|
@@ -15,77 +11,79 @@ module ForemanDlm
       end
     end
 
-    initializer 'foreman_dlm.register_plugin', :before => :finisher_hook do |_app|
-      Foreman::Plugin.register :foreman_dlm do
-        requires_foreman '>= 3.0'
-
-        apipie_documented_controllers ["#{ForemanDlm::Engine.root}/app/controllers/api/v2/*.rb"]
-
-        settings do
-          category(:general) do
-            setting('dlm_stale_time',
-              type: :integer,
-              default: 4,
-              description: N_('Number of hours after which locked Distributed Lock is stale'),
-              full_name: N_('Distributed Lock stale time'),
-              validate: { numericality: { greater_than: 0 } })
+    initializer 'foreman_dlm.register_plugin', :before => :finisher_hook do |app|
+      app.reloader.to_prepare do
+        Foreman::Plugin.register :foreman_dlm do
+          requires_foreman '>= 3.13'
+
+          apipie_documented_controllers ["#{ForemanDlm::Engine.root}/app/controllers/api/v2/*.rb"]
+
+          settings do
+            category(:general) do
+              setting('dlm_stale_time',
+                type: :integer,
+                default: 4,
+                description: N_('Number of hours after which locked Distributed Lock is stale'),
+                full_name: N_('Distributed Lock stale time'),
+                validate: { numericality: { greater_than: 0 } })
+            end
           end
-        end
 
-        # Add permissions
-        security_block :foreman_dlm do
-          permission :view_dlmlocks, {
-            :'foreman_dlm/dlmlocks' => [:index, :show, :auto_complete_search],
-            :'api/v2/dlmlocks' => [:index, :show],
-          }, :resource_type => 'ForemanDlm::Dlmlock'
-
-          permission :create_dlmlocks, {
-            :'api/v2/dlmlocks' => [:create],
-          }, :resource_type => 'ForemanDlm::Dlmlock'
-
-          permission :edit_dlmlocks, {
-            :'foreman_dlm/dlmlocks' => [:release, :enable, :disable],
-            :'api/v2/dlmlocks' => [:update, :acquire, :release],
-          }, :resource_type => 'ForemanDlm::Dlmlock'
-
-          permission :destroy_dlmlocks, {
-            :'foreman_dlm/dlmlocks' => [:destroy],
-            :'api/v2/dlmlocks' => [:destroy],
-          }, :resource_type => 'ForemanDlm::Dlmlock'
-
-          permission :view_dlmlock_events, {
-            :'api/v2/dlmlock_events' => [:index],
-          }, :resource_type => 'ForemanDlm::DlmlockEvent'
-        end
+          # Add permissions
+          security_block :foreman_dlm do
+            permission :view_dlmlocks, {
+              :'foreman_dlm/dlmlocks' => [:index, :show, :auto_complete_search],
+              :'api/v2/dlmlocks' => [:index, :show],
+            }, :resource_type => 'ForemanDlm::Dlmlock'
+
+            permission :create_dlmlocks, {
+              :'api/v2/dlmlocks' => [:create],
+            }, :resource_type => 'ForemanDlm::Dlmlock'
+
+            permission :edit_dlmlocks, {
+              :'foreman_dlm/dlmlocks' => [:release, :enable, :disable],
+              :'api/v2/dlmlocks' => [:update, :acquire, :release],
+            }, :resource_type => 'ForemanDlm::Dlmlock'
+
+            permission :destroy_dlmlocks, {
+              :'foreman_dlm/dlmlocks' => [:destroy],
+              :'api/v2/dlmlocks' => [:destroy],
+            }, :resource_type => 'ForemanDlm::Dlmlock'
+
+            permission :view_dlmlock_events, {
+              :'api/v2/dlmlock_events' => [:index],
+            }, :resource_type => 'ForemanDlm::DlmlockEvent'
+          end
 
-        # Add a new role called 'Distributed Lock Manager' if it doesn't exist
-        role 'Distributed Lock Manager', [:view_dlmlocks,
-                                          :create_dlmlocks,
-                                          :edit_dlmlocks,
-                                          :destroy_dlmlocks,
-                                          :view_dlmlock_events],
-          'Role granting full access permissions to distributed locks'
-
-        # add menu entry
-        menu :top_menu, :foreman_dlm_dlmlocks,
-          url_hash: { controller: :'foreman_dlm/dlmlocks', action: :index },
-          caption: N_('Distributed Locks'),
-          parent: :monitor_menu,
-          after: :audits
-
-        # Dlm Facet
-        register_facet(ForemanDlm::DlmFacet, :dlm_facet) do
-          api_view list: 'foreman_dlm/api/v2/dlm_facets/base_with_root', single: 'foreman_dlm/api/v2/dlm_facets/show'
-        end
+          # Add a new role called 'Distributed Lock Manager' if it doesn't exist
+          role 'Distributed Lock Manager', [:view_dlmlocks,
+                                            :create_dlmlocks,
+                                            :edit_dlmlocks,
+                                            :destroy_dlmlocks,
+                                            :view_dlmlock_events],
+            'Role granting full access permissions to distributed locks'
+
+          # add menu entry
+          menu :top_menu, :foreman_dlm_dlmlocks,
+            url_hash: { controller: :'foreman_dlm/dlmlocks', action: :index },
+            caption: N_('Distributed Locks'),
+            parent: :monitor_menu,
+            after: :audits
+
+          # Dlm Facet
+          register_facet(ForemanDlm::DlmFacet, :dlm_facet) do
+            api_view list: 'foreman_dlm/api/v2/dlm_facets/base_with_root', single: 'foreman_dlm/api/v2/dlm_facets/show'
+          end
 
-        register_custom_status HostStatus::DlmlockStatus
+          register_custom_status HostStatus::DlmlockStatus
 
-        # extend host show page
-        extend_page('hosts/show') do |context|
-          context.add_pagelet :main_tabs,
-            :name => N_('Locks'),
-            :partial => 'hosts/dlmlocks_tab',
-            :onlyif => proc { |host| host.dlm_facet }
+          # extend host show page
+          extend_page('hosts/show') do |context|
+            context.add_pagelet :main_tabs,
+              :name => N_('Locks'),
+              :partial => 'hosts/dlmlocks_tab',
+              :onlyif => proc { |host| host.dlm_facet }
+          end
         end
       end
     end

data/lib/foreman_dlm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanDlm
-  VERSION = '3.0.0'
+  VERSION = '4.0.0'
 end

data/test/integration/foreman_dlm/dlmlocks_test.rb

@@ -22,7 +22,12 @@ class DlmlocksTest < IntegrationTestWithJavascript
     search_bar.first('input').set('ho')
 
     autocomplete_list = page.first('div[data-ouia-component-id="search-autocomplete-menu"]')
-    list = autocomplete_list.find_all('span.pf-c-menu__item-text').map(&:text)
+    version = Foreman::Version.new
+    list = if version.major.to_i == 3 && version.minor.to_i <= 14
+             autocomplete_list.find_all('span.pf-c-menu__item-text').map(&:text)
+           else
+             autocomplete_list.find_all('span.pf-v5-c-menu__item-text').map(&:text)
+           end
 
     assert_includes list, 'host'
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_dlm
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Timo Goebel
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -133,7 +132,6 @@ licenses:
 metadata:
   rubygems_mfa_required: 'true'
   is_foreman_plugin: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -151,8 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Distributed Lock Manager for Foreman.
 test_files: