foreman_dlm 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5be1f946127eae4cab43fdd6ec4337fc1b3980ed40de368aa895c89f0714c459
-  data.tar.gz: 3f9df625f01d5c1bc64f36628388a5de2e1a38f84aac3f00be0a36c9b33a75f3
+  metadata.gz: 46b88d4ab255520440c5a8aeb4222e8ab62e167027ca0a833eaa03bf4ee32885
+  data.tar.gz: 9b953cde9907b2e7be6282aedbf44fad05d447f13d97e420c62ffd47a3ccf685
 SHA512:
-  metadata.gz: 752c99cf8b373c6aec85803c3bd8c16104bdb50cee490138da55dcf1e924174f27121308f3a319b9632c97843b2e8f69277fc6900f881a8159b2679d6bdacbbf
-  data.tar.gz: 9b4d6b7903914234db467d42d44e33dd3d78126a3219a15b221e5a9080e84881e249b64f6fd506440fa3eb509d00e12eb3d5526445ab8bf455a0e7a5d57042e6
+  metadata.gz: 3f07de80a511db25bbfdc37d01726a611678b8be5c360c1020ad6ff3e69fdac0d269fe2312fbed24770d8ebec21f05148eb5d629ea69e8b6f2298597adfdea1f
+  data.tar.gz: 9ced134c94780300383e6096e968fdadf1035ac6323f053a0ffcffa8027c660447ce1fd49c830a9d9c103389c7412021e96243fe63e8581fbe743f314b8a605d

data/README.md

@@ -14,6 +14,7 @@ With this plugin servers can acquire a lock in Foreman to ensure only one server
 | --------------- | -------------- |
 | >= 1.15         | ~> 0.1         |
 | >= 1.17         | ~> 1.0         |
+| >= 3.0          | ~> 2.0         |
 
 ## Installation
 
@@ -34,6 +35,7 @@ Use the HTTP method `GET` to show a lock, `PUT` to acquire a lock and `DELETE` t
 Foreman will respond with the HTTP status code `200 OK` if the action was successful and `412 Precondition Failed` if the lock could not be acquired or release. This may happen, if the lock is taken by another host.
 
 To process the HTTP status code in a bash script, you can do something like this:
+
 ```
 curl --write-out %{http_code} -H 'Content-Type: application/json' -sS -o /dev/null -X PUT --key $(puppet config print hostprivkey) --cert $(puppet config print hostcert) https://foreman.example.com/api/dlmlocks/test/lock
 ```
@@ -59,17 +61,19 @@ $ brew link curl --force
 ```
 
 After that `curl --version` changes from
+
 ```
 $ curl --version
 curl 7.54.0 (x86_64-apple-darwin16.0) libcurl/7.54.0 SecureTransport zlib/1.2.8
 ```
+
 to
+
 ```
 $ curl --version
 curl 7.56.1 (x86_64-apple-darwin16.7.0) libcurl/7.56.1 OpenSSL/1.0.2m zlib/1.2.8
 ```
 
-
 ## Contributing
 
 Fork and send a Pull Request. Thanks!
@@ -85,9 +89,8 @@ the Free Software Foundation, either version 3 of the License, or
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+along with this program. If not, see <http://www.gnu.org/licenses/>.

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

@@ -34,6 +34,7 @@ module Api
       def resource_class_for(resource)
         return ForemanDlm::Dlmlock if resource == 'dlmlock'
         return ForemanDlm::DlmlockEvent if resource == 'dlmlock_event'
+
         super
       end
     end

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

@@ -73,7 +73,7 @@ module Api
 
         == Authentication & Host Identification
         The host is authenticated via a client certificate and identified via the CN of that certificate.
-        DOCS
+      DOCS
 
       def acquire
         process_lock_response @dlmlock.acquire!(@host)
@@ -91,7 +91,7 @@ module Api
 
         == Authentication & Host Identification
          The host is authenticated via a client certificate and identified via the CN of that certificate.
-        DOCS
+      DOCS
 
       def release
         process_lock_response @dlmlock.release!(@host)
@@ -108,6 +108,7 @@ module Api
       rescue ActiveRecord::RecordNotFound
         result = scope.find_by(:name => id)
         raise ActiveRecord::RecordNotFound unless result
+
         result
       end
 

data/app/controllers/concerns/foreman_dlm/find_host_by_client_cert.rb

@@ -46,17 +46,11 @@ module ForemanDlm
     end
 
     def get_client_cert_hostname
-      verify = request.env[Setting[:ssl_client_verify_env]]
-      unless verify == 'SUCCESS'
-        logger.info { "Client certificate is invalid: #{verify}" }
-        return
-      end
-
-      dn = request.env[Setting[:ssl_client_dn_env]]
-      return unless dn && dn =~ /CN=([^\s\/,]+)/i
+      client_certificate = Foreman::ClientCertificate.new(request: request)
+      return unless client_certificate.verified?
 
-      hostname = Regexp.last_match(1).downcase
-      logger.debug "Extracted hostname '#{hostname}' from client certificate."
+      hostname = client_certificate.subject
+      logger.debug "Extracted hostname '#{hostname}' from client certificate." if hostname
       hostname
     end
   end

data/app/controllers/concerns/foreman_dlm/update_checkin_time.rb

@@ -13,6 +13,7 @@ module ForemanDlm
     # Updates the last_checkin timestamp of a user
     def update_detected_host_checkin_time
       return unless @detected_host
+
       facet = @detected_host.dlm_facet || @detected_host.build_dlm_facet
       facet.save unless facet.persisted?
       facet.touch(:last_checkin_at)

data/app/controllers/foreman_dlm/dlmlocks_controller.rb

@@ -59,6 +59,15 @@ module ForemanDlm
       ForemanDlm::Dlmlock
     end
 
+    # see https://projects.theforeman.org/issues/25976
+    # can be removed for Foreman 1.22+
+    def auto_complete_controller_name
+      current_version = Gem::Version.new(Foreman::Version.new.notag)
+      return '/foreman_dlm/dlmlocks' if current_version >= Gem::Version.new('1.20') && current_version < Gem::Version.new('1.22')
+
+      controller_name
+    end
+
     private
 
     def action_permission

data/app/helpers/foreman_dlm/dlmlock_helper.rb

@@ -3,12 +3,14 @@ module ForemanDlm
     def dlmlock_status_icon_class(lock)
       return 'ban' if lock.disabled?
       return 'lock' if lock.taken?
+
       'unlock'
     end
 
     def dlmlock_status_icon_color_class(lock)
       return 'text-danger' if lock.disabled?
       return 'text-success' if lock.taken?
+
       'text-info'
     end
 

data/app/models/concerns/foreman_dlm/expirable.rb

@@ -22,6 +22,7 @@ module ForemanDlm
           total_count += count
 
           break if event_ids.blank?
+
           sleep sleep_time
         end
         duration = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time) / 60).to_i

data/app/models/concerns/foreman_dlm/host_extensions.rb

@@ -19,6 +19,13 @@ module ForemanDlm
       define_model_callbacks :unlock, :only => :after
     end
 
+    def can_acquire_update_locks?
+      param = host_param('can_acquire_update_locks')
+      return true if param.blank?
+
+      Foreman::Cast.to_bool(param)
+    end
+
     def refresh_dlmlock_status
       refresh_statuses([HostStatus::DlmlockStatus])
     end

data/app/models/concerns/foreman_dlm/host_monitoring_extensions.rb

@@ -9,6 +9,7 @@ module ForemanDlm
 
     def add_lock_monitoring_downtime
       return unless monitored?
+
       logger.info "Setting Monitoring downtime for #{self}"
       monitoring.set_downtime_host(self, lock_monitoring_downtime_options)
       true
@@ -18,6 +19,7 @@ module ForemanDlm
 
     def remove_lock_monitoring_downtime
       return unless monitored?
+
       logger.info "Deleting Monitoring downtime for #{self}"
       monitoring.del_downtime_host(self, lock_monitoring_downtime_options)
       true

data/app/models/foreman_dlm/dlmlock.rb

@@ -7,14 +7,13 @@ module ForemanDlm
     end
 
     def self.dlm_stale_time
-      (Setting::General[:dlm_stale_time] || 4).hours
+      (Setting[:dlm_stale_time] || 4).hours
     end
 
     belongs_to_host
 
     has_many :dlmlock_events,
              class_name: '::ForemanDlm::DlmlockEvent',
-             foreign_key: 'dlmlock_id',
              dependent: :destroy,
              inverse_of: :dlmlock
 
@@ -46,6 +45,8 @@ module ForemanDlm
     attr_accessor :old
 
     def acquire!(host)
+      return false unless host.can_acquire_update_locks?
+
       result = atomic_update(nil, host)
       ForemanDlm::RefreshDlmlockStatus.set(wait: self.class.dlm_stale_time).perform_later([host.id]) if result
       result

data/app/views/foreman_dlm/dlmlocks/index.html.erb

@@ -1,2 +1,2 @@
-<% title _("Locks") %>
+<% title _('Distributed Locks') %>
 <%= render :partial => 'list' %>

data/app/views/foreman_dlm/dlmlocks/show.html.erb

@@ -1,6 +1,6 @@
 <% title @dlmlock.name %>
 <% breadcrumbs(
-   resource_url: api_dlmlocks_path
+  resource_url: api_dlmlocks_path
 ) if respond_to?(:breadcrumbs) # Requires Foreman >= 1.18 %>
 
 <%= title_actions link_to(_('Back'), foreman_dlm_dlmlocks_path, :class => 'btn btn-default'),

data/app/views/foreman_dlm/dlmlocks/welcome.html.erb

@@ -6,9 +6,9 @@
   <p>
   <%= _('You don\'t seem to have any locks.') %></br>
   <%= _('The distributed lock manager allows you to automatically schedule system updates across a cluster of hosts.') %>
-  <%= link_to _('Learn more about this in the documentation.'), 'https://github.com/timogoebel/foreman_dlm', :rel => "external" %>.
+  <%= link_to _('Learn more about this in the documentation.'), 'https://github.com/dm-drogeriemarkt/foreman_dlm', :rel => "external" %>.
   </p>
   <div class="blank-slate-pf-main-action">
-    <%= link_to _('Documentation'), 'https://github.com/timogoebel/foreman_dlm', :rel => 'external', :class => 'btn btn-primary btn-lg' %>
+    <%= link_to _('Documentation'), 'https://github.com/dm-drogeriemarkt/foreman_dlm', :rel => 'external', :class => 'btn btn-primary btn-lg' %>
   </div>
 </div>

data/app/views/hosts/_dlmlocks_tab.html.erb

@@ -2,14 +2,14 @@
   <%= alert class: 'alert-info',
     header: '',
     text: n_(
-      'This host holds %s lock.',
+      'This host holds one lock.',
       'This host holds %s locks.',
       @host.dlmlocks.count
     ) % @host.dlmlocks.count
   %>
 <% end %>
 
-<table class="<%= table_css_classes %> table-fixed">
+<table class="<%= table_css_classes %>">
   <thead>
     <tr>
       <th colspan="2"><%= _('Locks') %></th>
@@ -17,7 +17,7 @@
   </thead>
   <tbody>
     <tr>
-      <td><%= _('Last checkin') %></td>
+      <td class="text-nowrap"><%= _('Last check-in') %></td>
       <td><%= @host.dlm_facet && @host.dlm_facet.last_checkin_at ? date_time_relative(@host.dlm_facet.last_checkin_at) : _('N/A') %></td>
     </tr>
     <tr>

data/lib/foreman_dlm/engine.rb

@@ -6,14 +6,6 @@ module ForemanDlm
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/jobs"]
 
-    initializer 'foreman_dlm.load_default_settings', before: :load_config_initializers do
-      require_dependency File.expand_path('../../app/models/settings/dlm.rb', __dir__) if begin
-                                                                                         Setting.table_exists?
-                                                                                       rescue StandardError
-                                                                                         (false)
-                                                                                       end
-    end
-
     # Add any db migrations
     initializer 'foreman_dlm.load_app_instance_data' do |app|
       ForemanDlm::Engine.paths['db/migrate'].existent.each do |path|
@@ -23,10 +15,21 @@ module ForemanDlm
 
     initializer 'foreman_dlm.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_dlm do
-        requires_foreman '>= 1.17'
+        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 } })
+          end
+        end
+
         # Add permissions
         security_block :foreman_dlm do
           permission :view_dlmlocks, {
@@ -58,10 +61,11 @@ module ForemanDlm
                                           :create_dlmlocks,
                                           :edit_dlmlocks,
                                           :destroy_dlmlocks,
-                                          :view_dlmlock_events]
+                                          :view_dlmlock_events],
+             'Role granting full access permissions to distributed locks'
 
         # add menu entry
-        menu :top_menu, :distributed_locks,
+        menu :top_menu, :foreman_dlm_dlmlocks,
              url_hash: { controller: :'foreman_dlm/dlmlocks', action: :index },
              caption: N_('Distributed Locks'),
              parent: :monitor_menu,
@@ -86,19 +90,17 @@ module ForemanDlm
 
     # Include concerns in this config.to_prepare block
     config.to_prepare do
-      begin
-        Host::Managed.send(:include, ForemanDlm::HostExtensions)
-        User.send(:include, ForemanDlm::UserExtensions)
-        Host::Managed.send(:include, ForemanDlm::DlmFacetHostExtensions)
-
-        Host::Managed.send(:include, ForemanDlm::HostMonitoringExtensions) if ForemanDlm.with_monitoring?
-      rescue StandardError => e
-        Rails.logger.warn "ForemanDlm: skipping engine hook (#{e})"
-      end
+      Host::Managed.include ForemanDlm::HostExtensions
+      User.include ForemanDlm::UserExtensions
+      Host::Managed.include ForemanDlm::DlmFacetHostExtensions
+
+      Host::Managed.include ForemanDlm::HostMonitoringExtensions if ForemanDlm.with_monitoring?
+    rescue StandardError => e
+      Rails.logger.warn "ForemanDlm: skipping engine hook (#{e})"
     end
 
     initializer 'foreman_dlm.register_gettext', after: :load_config_initializers do |_app|
-      locale_dir = File.join(File.expand_path('../../..', __FILE__), 'locale')
+      locale_dir = File.join(File.expand_path('../..', __dir__), 'locale')
       locale_domain = 'foreman_dlm'
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end

data/lib/foreman_dlm/version.rb

@@ -1,3 +1,3 @@
 module ForemanDlm
-  VERSION = '1.1.0'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/test/controllers/api/v2/dlmlocks_controller_test.rb

@@ -44,7 +44,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
         get :show, params: { :id => dlmlock.to_param }
         assert_response :success
         body = ActiveSupport::JSON.decode(@response.body)
-        refute_empty body
+        assert_not_empty body
         assert_equal dlmlock.name, body['name']
         assert_equal dlmlock.type, body['type']
         assert_equal true, body['enabled']
@@ -56,7 +56,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
         get :show, params: { :id => dlmlock.to_param }
         assert_response :success
         body = ActiveSupport::JSON.decode(@response.body)
-        refute_empty body
+        assert_not_empty body
         assert_equal dlmlock.name, body['name']
         assert_equal dlmlock.type, body['type']
         assert_equal false, body['enabled']
@@ -68,13 +68,13 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
         get :show, params: { :id => dlmlock.name }
         assert_response :success
         body = ActiveSupport::JSON.decode(@response.body)
-        refute_empty body
+        assert_not_empty body
         assert_equal dlmlock.id, body['id']
         assert_equal dlmlock.name, body['name']
         host = body['host']
         assert host
         assert_equal host1.name, host['name']
-        refute host.key?('self')
+        assert_not host.key?('self')
       end
 
       test 'should not find dlmlock with invalid id' do
@@ -178,7 +178,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
         get :show, params: { :id => dlmlock.to_param }
         assert_response :success
         body = ActiveSupport::JSON.decode(@response.body)
-        refute_empty body
+        assert_not_empty body
         assert_equal dlmlock.name, body['name']
         assert_equal dlmlock.type, body['type']
         assert_equal true, body['enabled']
@@ -191,7 +191,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
         get :show, params: { :id => dlmlock.to_param }
         assert_response :success
         body = ActiveSupport::JSON.decode(@response.body)
-        refute_empty body
+        assert_not_empty body
         assert_equal dlmlock.name, body['name']
         assert_equal dlmlock.type, body['type']
         assert_equal true, body['enabled']
@@ -207,7 +207,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
         get :show, params: { :id => dlmlock.to_param }
         assert_response :success
         body = ActiveSupport::JSON.decode(@response.body)
-        refute_empty body
+        assert_not_empty body
         assert_equal dlmlock.name, body['name']
         assert_equal dlmlock.type, body['type']
         assert_equal true, body['enabled']
@@ -220,7 +220,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
 
       test 'should update checkin time' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock) }
-        refute as_admin { host1.dlm_facet }
+        assert_not as_admin { host1.dlm_facet }
         put :show, params: { :id => dlmlock.to_param }
         assert as_admin { host1.reload.dlm_facet.last_checkin_at }
       end
@@ -260,7 +260,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
 
       test 'should update checkin time' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock) }
-        refute as_admin { host1.dlm_facet }
+        assert_not as_admin { host1.dlm_facet }
         put :acquire, params: { :id => dlmlock.to_param }
         assert as_admin { host1.reload.dlm_facet.last_checkin_at }
       end
@@ -300,7 +300,7 @@ class Api::V2::DlmlocksControllerTest < ActionController::TestCase
 
       test 'should update checkin time' do
         dlmlock = as_admin { FactoryBot.create(:dlmlock) }
-        refute as_admin { host1.dlm_facet }
+        assert_not as_admin { host1.dlm_facet }
         put :release, params: { :id => dlmlock.to_param }
         assert as_admin { host1.reload.dlm_facet.last_checkin_at }
       end

data/test/controllers/foreman_dlm/dlmlocks_test.rb

@@ -27,7 +27,7 @@ module ForemanDlm
       dlmlock = FactoryBot.create(:dlmlock)
       delete :destroy, params: { :id => dlmlock.id }, session: set_session_user
       assert_redirected_to foreman_dlm_dlmlocks_url
-      refute Dlmlock.exists?(dlmlock.id)
+      assert_not Dlmlock.exists?(dlmlock.id)
     end
 
     test '#enable' do
@@ -49,7 +49,7 @@ module ForemanDlm
       dlmlock = FactoryBot.create(:dlmlock, host: host)
       put :release, params: { :id => dlmlock.id }, session: set_session_user
       assert_redirected_to foreman_dlm_dlmlocks_url
-      refute dlmlock.reload.taken?
+      assert_not dlmlock.reload.taken?
     end
   end
 end

data/test/factories/dlmlock.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :dlmlock, class: ::ForemanDlm::Dlmlock::Update do
     sequence(:name) { |n| "Lock #{n}" }
-    type 'ForemanDlm::Dlmlock::Update'
+    type { 'ForemanDlm::Dlmlock::Update' }
 
     trait :locked do
       host

data/test/factories/dlmlock_events.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :dlmlock_event, class: ::ForemanDlm::DlmlockEvent do
     dlmlock
-    event_type 'release'
+    event_type { 'release' }
     host
 
     trait :old_event do

data/test/integration/foreman_dlm/dlmlocks_test.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+require 'integration_test_helper'
+
+class DlmlocksTest < IntegrationTestWithJavascript
+  setup do
+    User.current = users(:admin)
+  end
+
+  test 'the index page works' do
+    FactoryBot.create_list(:dlmlock, 10)
+    assert_index_page(foreman_dlm_dlmlocks_path, 'Distributed Locks')
+  end
+
+  test 'the search bar has autocomplete' do
+    skip if Gem::Version.new(Foreman::Version.new.notag) < Gem::Version.new('1.20')
+    FactoryBot.create_list(:dlmlock, 10)
+
+    visit foreman_dlm_dlmlocks_path
+
+    search_bar = page.first('#search-bar')
+    search_bar.first('input').set('ho')
+
+    list = search_bar.find_all('a.dropdown-item').map(&:text)
+    assert_includes list, 'host'
+  end
+end

data/test/models/foreman_dlm/dlmlock_test.rb

@@ -82,6 +82,18 @@ module ForemanDlm
         assert dlmlock.acquire!(host)
         assert_equal ['callback1'], host.callbacks
       end
+
+      context 'with a parameter disabeling the locking' do
+        setup do
+          FactoryBot.create(:host_parameter, host: host1, name: 'can_acquire_update_locks', value: 'false')
+        end
+
+        test 'can not be acquired' do
+          assert_nil dlmlock.host
+          assert_not dlmlock.acquire!(host1)
+          assert_nil dlmlock.reload.host
+        end
+      end
     end
 
     context 'a free and disabled DLM lock' do
@@ -212,15 +224,11 @@ module ForemanDlm
         not_locked = FactoryBot.create(:dlmlock)
 
         assert_includes subject, locked
-        refute_includes subject, not_locked
+        assert_not_includes subject, not_locked
       end
     end
 
     describe '#stale' do
-      setup do
-        FactoryBot.create(:setting, category: Setting::General, name: 'dlm_stale_time', value: 4)
-      end
-
       subject { Dlmlock.stale }
 
       it 'includes only Distributed Locks that are stale' do
@@ -232,8 +240,8 @@ module ForemanDlm
           not_locked = FactoryBot.create(:dlmlock)
 
           assert_includes subject, stale
-          refute_includes subject, not_stale
-          refute_includes subject, not_locked
+          assert_not_includes subject, not_stale
+          assert_not_includes subject, not_locked
         end
       end
     end

data/test/models/host_managed_test.rb

@@ -6,6 +6,24 @@ module Host
     should have_many(:dlmlock_events)
     should have_one(:dlm_facet)
 
+    describe '#can_acquire_update_locks?' do
+      let(:host) { FactoryBot.create(:host, :managed) }
+
+      it 'should be true without a host parameter' do
+        assert host.can_acquire_update_locks?
+      end
+
+      it 'should be true if parameter is true' do
+        FactoryBot.create(:host_parameter, host: host, name: 'can_acquire_update_locks', value: 'true')
+        assert host.can_acquire_update_locks?
+      end
+
+      it 'should be false if parameter is false' do
+        FactoryBot.create(:host_parameter, host: host, name: 'can_acquire_update_locks', value: 'false')
+        assert_not host.can_acquire_update_locks?
+      end
+    end
+
     context 'scoped search on' do
       context 'a host' do
         let(:host) { FactoryBot.create(:host, :with_dlm_facet) }

data/test/models/host_status/dlmlock_status_test.rb

@@ -3,10 +3,6 @@
 require 'test_plugin_helper'
 
 class DlmlockStatusTest < ActiveSupport::TestCase
-  setup do
-    FactoryBot.create(:setting, category: Setting::General, name: 'dlm_stale_time', value: 4)
-  end
-
   let(:host) { FactoryBot.create(:host, :managed) }
 
   describe '#to_status' do
@@ -17,7 +13,7 @@ class DlmlockStatusTest < ActiveSupport::TestCase
         FactoryBot.create(:dlmlock, :locked, host: host, updated_at: now - 5.hours)
         status = host.get_status(HostStatus::DlmlockStatus)
 
-        refute_empty host.dlmlocks.stale
+        assert_not_empty host.dlmlocks.stale
         assert_equal HostStatus::DlmlockStatus::STALE, status.to_status
       end
     end
@@ -35,7 +31,7 @@ class DlmlockStatusTest < ActiveSupport::TestCase
       FactoryBot.create(:dlmlock, host: host)
       status = host.get_status(HostStatus::DlmlockStatus)
 
-      refute_empty host.dlmlocks
+      assert_not_empty host.dlmlocks
       assert_equal true, status.relevant?
     end
 

data/test/test_plugin_helper.rb

@@ -3,5 +3,9 @@ require 'test_helper'
 
 # Add plugin to FactoryBot's paths
 FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
+
+# Add factories of external plugin dependencies
 FactoryBot.definition_file_paths << "#{ForemanMonitoring::Engine.root}/test/factories" if ForemanDlm.with_monitoring?
+
+# Reload factory paths
 FactoryBot.reload

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_dlm
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Timo Goebel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -28,16 +28,44 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 1.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 1.25.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.13.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.13.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.1
 description: Adds a Distributed Lock Manager to Foreman. This enables painless system
   updates for clusters.
 email:
@@ -69,7 +97,6 @@ files:
 - app/models/foreman_dlm/dlmlock/update.rb
 - app/models/foreman_dlm/dlmlock_event.rb
 - app/models/host_status/dlmlock_status.rb
-- app/models/settings/dlm.rb
 - app/views/api/v2/dlmlock_events/index.json.rabl
 - app/views/api/v2/dlmlocks/acquire.json.rabl
 - app/views/api/v2/dlmlocks/base.json.rabl
@@ -117,6 +144,7 @@ files:
 - test/factories/dlmlock.rb
 - test/factories/dlmlock_events.rb
 - test/factories/host.rb
+- test/integration/foreman_dlm/dlmlocks_test.rb
 - test/jobs/refresh_dlmlock_status_test.rb
 - test/models/foreman_dlm/dlm_facet_test.rb
 - test/models/foreman_dlm/dlmlock_event_test.rb
@@ -129,8 +157,10 @@ files:
 homepage: https://github.com/dm-drogeriemarkt/foreman_dlm
 licenses:
 - GPL-3.0
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+  is_foreman_plugin: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -145,28 +175,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Distributed Lock Manager for Foreman.
 test_files:
-- test/models/host_managed_test.rb
-- test/models/foreman_dlm/dlmlock_event_test.rb
+- test/controllers/api/v2/dlmlocks_controller_test.rb
+- test/controllers/api/v2/dlmlocks_dlmlock_events_controller_test.rb
+- test/controllers/api/v2/hosts_controller_test.rb
+- test/controllers/find_host_by_client_cert_test.rb
+- test/controllers/foreman_dlm/dlmlocks_test.rb
+- test/controllers/hosts_controller_test.rb
+- test/factories/dlm_facets.rb
+- test/factories/dlmlock.rb
+- test/factories/dlmlock_events.rb
+- test/factories/host.rb
+- test/integration/foreman_dlm/dlmlocks_test.rb
+- test/jobs/refresh_dlmlock_status_test.rb
 - test/models/foreman_dlm/dlm_facet_test.rb
+- test/models/foreman_dlm/dlmlock_event_test.rb
 - test/models/foreman_dlm/dlmlock_test.rb
-- test/models/host_status/dlmlock_status_test.rb
+- test/models/host_managed_test.rb
 - test/models/host_monitoring_test.rb
+- test/models/host_status/dlmlock_status_test.rb
 - test/models/user_test.rb
-- test/factories/dlm_facets.rb
-- test/factories/host.rb
-- test/factories/dlmlock_events.rb
-- test/factories/dlmlock.rb
 - test/test_plugin_helper.rb
-- test/jobs/refresh_dlmlock_status_test.rb
-- test/controllers/foreman_dlm/dlmlocks_test.rb
-- test/controllers/api/v2/dlmlocks_controller_test.rb
-- test/controllers/api/v2/hosts_controller_test.rb
-- test/controllers/api/v2/dlmlocks_dlmlock_events_controller_test.rb
-- test/controllers/hosts_controller_test.rb
-- test/controllers/find_host_by_client_cert_test.rb

data/app/models/settings/dlm.rb

@@ -1,20 +0,0 @@
-class Setting
-  class Dlm < ::Setting
-    def self.load_defaults
-      return unless ActiveRecord::Base.connection.table_exists?('settings')
-      return unless super
-
-      Setting.transaction do
-        [
-          set('dlm_stale_time', N_('Number of hours after which locked Distributed Lock is stale'), 4, N_('Distributed Lock stale time'))
-        ].compact.each { |s| Setting::General.create s.update(category: 'Setting::General') }
-      end
-
-      true
-    end
-
-    def self.humanized_category
-      N_('Distributed Locks')
-    end
-  end
-end