foreman_expire_hosts 8.0.0 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c1855fd3586ff4abdc25e11e58c006a503c83acc12628890ce4d307ebf113b9
-  data.tar.gz: c5ce62b9345649f1fd7365b0181ef83e53a93086f3b31435498b12eb6af0ce5c
+  metadata.gz: b3e5b913f8041ef79d3fdcb5572d9e0f5a04acb96ac6d18622bf2e4c064e7bf9
+  data.tar.gz: 29203939087fc0aa319796c0f5b8cca08cd65b92e3a7f6d2708eb4d6d35fa8f8
 SHA512:
-  metadata.gz: 15394668d731ba9c01b54e09ef5d13c1f6c3550938fd8fb4ee2188b696da77ad759a3df33ad80285aa378a2e463d496a92d80eb914b56a2af97655889060e23c
-  data.tar.gz: bf2fca5f36c7eee30374e413d1c80f482a6fcf13d833a19e57fe4de61f7a14b731742d3064cd870bbd86533d5a5377c8ebe2217c1a70c94a6ade8dafd5bb9a2e
+  metadata.gz: e8ae87316f890b0b9ffbb0d6ed9aaa97394871806a08b6e840b565565da321d5ca89cc7887388d2c4557d96552528146231d0791e476cc069962ed9b41d5bd20
+  data.tar.gz: fceaa7eb6ad7a554c5e3697ebfe69740d28f102313585c818b640a97d5225339c3deac030172722c530ab1e7600ce97900d4e7eea51606a326721c94290a2329

data/README.md

@@ -19,6 +19,7 @@ This plugin will send two warning notifications before host expiry (see Settings
 | >= 1.17         | ~> 5.0         |
 | >= 1.18         | ~> 6.0         |
 | >= 1.24         | ~> 7.0         |
+| >= 3.0          | ~> 8.0         |
 
 # Screenshots
 ![Expiry date field in host form](https://raw.githubusercontent.com/ingenico-group/screenshots/master/foreman_host_expiry/expiry-date-field-in-host-form.png)

data/app/controllers/concerns/foreman_expire_hosts/host_controller_extensions.rb

@@ -55,13 +55,8 @@ module ForemanExpireHosts
 
     def expiration_date
       @expiration_date ||= begin
-        year = params['host']['expired_on(1i)']
-        month = params['host']['expired_on(2i)']
-        day = params['host']['expired_on(3i)']
-
-        return if year.empty? && month.empty? && day.empty?
-
-        Date.parse("#{year}-#{month}-#{day}")
+        expired_on = params[:host][:expired_on]
+        expired_on.present? ? Date.parse(expired_on) : nil
       end
     end
 

data/app/helpers/foreman_expire_hosts/hosts_helper.rb

@@ -12,5 +12,24 @@ module ForemanExpireHosts
       end
       actions
     end
+
+    def host_expiry_warning_message(host)
+      return nil unless host.expires?
+
+      if host.expired_past_grace_period?
+        message = _('This host has expired %s ago and needs to be deleted manually.') % time_ago_in_words(host.expired_on)
+      elsif host.expired?
+        message = _('This host has expired %{time_ago} ago and will be deleted on %{delete_date}.') % { :delete_date => l(host.expiration_grace_period_end_date), :time_ago => time_ago_in_words(host.expired_on) }
+      elsif host.expires_today?
+        message = _('This host will expire today.')
+      elsif host.pending_expiration?
+        message = _('This host will expire in %{distance_of_time} (on %{expire_date}).') % { :expire_date => l(host.expired_on), :distance_of_time => future_time_in_words(host.expired_on) }
+      end
+      message
+    end
+
+    def future_time_in_words(to_time, options = {})
+      distance_of_time_in_words(to_time, Time.current, options)
+    end
   end
 end

data/app/models/concerns/foreman_expire_hosts/host_ext.rb

@@ -55,20 +55,20 @@ module ForemanExpireHosts
     def expiration_grace_period_end_date
       return nil unless expires?
 
-      expired_on + Setting[:days_to_delete_after_host_expiration].to_i
+      expired_on.to_date + Setting[:days_to_delete_after_host_expiration].to_i.days
     end
 
     def expired_past_grace_period?
       return false unless expires?
 
-      expiration_grace_period_end_date <= Date.today
+      expiration_grace_period_end_date.to_date <= Date.today
     end
 
     def pending_expiration?
       return false unless expires?
       return false if expired?
 
-      expired_on - Setting['notify1_days_before_host_expiry'].to_i <= Date.today
+      expired_on.to_date - Setting['notify1_days_before_host_expiry'].to_i.days <= Date.today
     end
 
     def can_modify_expiry_date?

data/app/models/host_status/expiration_status.rb

@@ -41,15 +41,15 @@ module HostStatus
     def to_label(_options = {})
       case to_status
       when OK
-        N_('Expires on %s') % I18n.l(host.expired_on)
+        N_('Expires on %s') % I18n.l(host.expired_on.to_date)
       when EXPIRES_TODAY
         N_('Expires today')
       when IN_GRACE_PERIOD
-        N_('Expired on %s, in grace period') % I18n.l(host.expired_on)
+        N_('Expired on %s, in grace period') % I18n.l(host.expired_on.to_date)
       when EXPIRED
-        N_('Expired on %s') % I18n.l(host.expired_on)
+        N_('Expired on %s') % I18n.l(host.expired_on.to_date)
       else
-        N_('Pending expiration on %s') % I18n.l(host.expired_on)
+        N_('Pending expiration on %s') % I18n.l(host.expired_on.to_date)
       end
     end
 

data/app/services/foreman_expire_hosts/safe_destroy.rb

@@ -33,7 +33,7 @@ module ForemanExpireHosts
     private
 
     def with_katello?
-      Katello # rubocop:disable Lint/Void
+      Katello::VERSION # rubocop:disable Lint/Void
       true
     rescue StandardError
       false

data/app/views/expire_hosts_mailer/_hosts_table.html.erb

@@ -7,9 +7,6 @@
       <th>
         <%= _('Host group') %>
       </th>
-      <th>
-        <%= _('Environment') %>
-      </th>
       <th>
         <%= _('Expiration Date') %>
       </th>
@@ -28,9 +25,6 @@
         <td class="hosts-rows">
           <%= host.hostgroup %>
         </td>
-        <td class="hosts-rows">
-          <%= host.environment %>
-        </td>
         <td class="hosts-rows">
           <%= "#{l(host.expired_on)} (#{relative_date(host.expired_on)})" if host.expires? %>
         </td>

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

@@ -1,13 +1,12 @@
-<%= datepicker_f f, :expired_on,
-           {
-             :label => _('Expires on'),
-             :autocomplete => false,
-             :include_blank => true,
-             :use_month_numbers => false,
-             :start_year => Date.today.year,
-             :help_block => ('<span class="pficon-warning-triangle-o"></span> '.html_safe + _('You are not allowed to change the expiry date of this host.') unless @host.can_modify_expiry_date?),
-             :disabled => !@host.can_modify_expiry_date?,
-             :help_inline  => popover('Auto Expiry', _('Expired hosts will be deleted automatically after the grace period has passed.') + '<br>'.html_safe +
-                                      _('If you do not want this host to expire and do not want it to be deleted automatically, do not specify an expiry date.'))
-           }
-%>
+<div class="form-group">
+  <label class="col-md-2 control-label"><%= _('Expires on') %></label>
+  <% if @host.can_modify_expiry_date? %>
+    <div class="col-md-4">
+      <%= react_component('DatePicker', { value: @host.expired_on, name: 'host[expired_on]', placement: 'bottom' }.to_json) %>
+      <%= content_tag(:span, _('Expired hosts will be deleted automatically after the grace period has passed. If you do not want this host to expire and do not want it to be deleted automatically, do not specify an expiry date.'), class: 'help-block help-inline') %>
+    </div>
+  <% else %>
+    <%= content_tag(:span, @host.expired_on&.to_s(:long), class: 'col-md-4') %>
+    <%= content_tag(:span, _('You are not allowed to change the expiry date of this host.'), class: 'help-block help-inline') %>
+  <% end %>
+</div>

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

@@ -1,18 +1,9 @@
 <%= render 'selected_hosts', :hosts => @hosts %>
 
-<%= form_for :host, :url => update_multiple_expiration_hosts_path(:host_ids => params[:host_ids]) do |f| %>
-
-<%= _('Hosts will be deleted automatically on the given expiry date. Leave blank to clear expiration date.') %>
-
-<%= datepicker_f f, :expired_on,
-  {
-    :autocomplete => false,
-    :include_blank => true,
-    :use_month_numbers => false,
-    :start_year => Date.today.year
-  },
-  {
-    :onchange => 'tfm.hosts.table.toggleMultipleOkButton(this);'
-  }
-%>
+<%= form_for :host, html: { style: 'padding-bottom: 250px;' }, :url => update_multiple_expiration_hosts_path(:host_ids => params[:host_ids]) do |f| %>
+  <%= date_local_f f, :expired_on,
+    label: _('Expired on'),
+    label_help: _('Hosts will be deleted automatically on the given expiry date. Leave blank to clear expiration date.'),
+    placement: 'bottom'
+  %>
 <% end %>

data/db/migrate/20220923181700_fix_settings_category_to_dsl.rb

@@ -2,6 +2,6 @@
 
 class FixSettingsCategoryToDsl < ActiveRecord::Migration[6.0]
   def up
-    Setting.where(category: 'Setting::ExpireHost').update_all(category: 'Setting')
+    Setting.where(category: 'Setting::ExpireHost').update_all(category: 'Setting') if column_exists?(:settings, :category)
   end
 end

data/db/migrate/20230112104438_change_expired_on_type.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class ChangeExpiredOnType < ActiveRecord::Migration[6.0]
+  def up
+    change_column :hosts, :expired_on, :datetime
+  end
+
+  def down
+    change_column :hosts, :expired_on, :date
+  end
+end

data/lib/foreman_expire_hosts/engine.rb

@@ -39,6 +39,8 @@ module ForemanExpireHosts
           'hosts/update_multiple_expiration'
         ]
 
+        Setting::BLANK_ATTRS << 'host_expiry_email_recipients'
+
         settings do
           category(:expire_hosts, N_('Expire Hosts')) do
             setting('is_host_expiry_date_mandatory',
@@ -85,7 +87,6 @@ module ForemanExpireHosts
     config.to_prepare do
       begin
         ::Host::Managed.include ForemanExpireHosts::HostExt
-        ::HostsHelper.include ForemanExpireHosts::HostsHelperExtensions
         ::HostsController.prepend ForemanExpireHosts::HostControllerExtensions
         ::AuditsHelper.include ForemanExpireHosts::AuditsHelperExtensions
         ::Api::V2::HostsController.include ForemanExpireHosts::Api::V2::HostsControllerExtensions

data/lib/foreman_expire_hosts/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanExpireHosts
-  VERSION = '8.0.0'
+  VERSION = '8.2.0'
 end

data/lib/tasks/expired_hosts.rake

@@ -25,24 +25,9 @@ namespace :test do
   end
 end
 
-namespace :foreman_expire_hosts do
-  task :rubocop => :environment do
-    begin
-      require 'rubocop/rake_task'
-      RuboCop::RakeTask.new(:rubocop_foreman_expire_hosts) do |task|
-        task.patterns = ["#{ForemanExpireHosts::Engine.root}/app/**/*.rb",
-                         "#{ForemanExpireHosts::Engine.root}/lib/**/*.rb",
-                         "#{ForemanExpireHosts::Engine.root}/test/**/*.rb"]
-      end
-    rescue StandardError
-      puts 'Rubocop not loaded.'
-    end
-
-    Rake::Task['rubocop_foreman_expire_hosts'].invoke
-  end
-end
-
 Rake::Task[:test].enhance ['test:foreman_expire_hosts']
 
 load 'tasks/jenkins.rake'
-Rake::Task['jenkins:unit'].enhance ['test:foreman_expire_hosts', 'foreman_expire_hosts:rubocop'] if Rake::Task.task_defined?(:'jenkins:unit')
+if Rake::Task.task_defined?(:'jenkins:unit')
+  Rake::Task['jenkins:unit'].enhance ['test:foreman_expire_hosts']
+end

data/test/functional/concerns/hosts_controller_extensions_test.rb

@@ -4,9 +4,9 @@ require 'test_plugin_helper'
 
 class HostsControllerTest < ActionController::TestCase
   setup do
+    Setting['host_details_ui'] = false if Setting['host_details_ui']
     User.current = users(:admin)
     disable_orchestration
-    setup_settings
   end
 
   describe 'host creation' do
@@ -20,13 +20,11 @@ class HostsControllerTest < ActionController::TestCase
           :domain_id => domains(:mydomain).id,
           :operatingsystem_id => operatingsystems(:redhat).id,
           :architecture_id => architectures(:x86_64).id,
-          :environment_id => environments(:production).id,
           :subnet_id => subnets(:one).id,
           :medium_id => media(:one).id,
           :pxe_loader => 'Grub2 UEFI',
           :realm_id => realms(:myrealm).id,
           :disk => 'empty partition',
-          :puppet_proxy_id => smart_proxies(:puppetmaster).id,
           :root_pass => 'xybxa6JUkz63w',
           :location_id => taxonomies(:location1).id,
           :organization_id => taxonomies(:organization1).id,
@@ -53,7 +51,7 @@ class HostsControllerTest < ActionController::TestCase
   describe 'setting expiration date on multiple hosts' do
     before do
       as_admin do
-        @hosts = FactoryBot.create_list(:host, 2, :with_puppet)
+        @hosts = FactoryBot.create_list(:host, 2)
       end
       @request.env['HTTP_REFERER'] = hosts_path
     end
@@ -70,7 +68,7 @@ class HostsControllerTest < ActionController::TestCase
     test 'should set expiration date' do
       expiration_date = Date.today + 14
       params = { :host_ids => @hosts.map(&:id),
-                 :host => { 'expired_on(1i)' => expiration_date.day.to_s, 'expired_on(2i)' => expiration_date.month.to_s, 'expired_on(3i)' => expiration_date.year.to_s } }
+                 :host => { 'expired_on' => expiration_date.strftime('%Y-%m-%d') } }
 
       post :update_multiple_expiration, params: params, session: set_session_user.merge(:user => users(:admin).id)
 

data/test/helpers/hosts_helper_test.rb

@@ -5,7 +5,11 @@ require 'test_plugin_helper'
 class HostsHelperTest < ActionView::TestCase
   include HostsHelper
   include HostDescriptionHelper
-  include PuppetRelatedHelper
+  # Foreman 3.7 dropped this via
+  # https://github.com/theforeman/foreman/commit/6cdb8c7a9ebd790537510213e43537a4a87189d6
+  # Foreman 3.9 bought it back via
+  # https://github.com/theforeman/foreman/commit/37a99c70ebd9e4d6f03af546dfe36e7678e2bcf3
+  include PuppetRelatedHelper if defined?(PuppetRelatedHelper)
   include ForemanExpireHosts::HostsHelper
   include ApplicationHelper
 

data/test/lib/expire_hosts_notifications_test.rb

@@ -7,7 +7,6 @@ class ExpireHostsNotificationsTest < ActiveSupport::TestCase
   include NotificationBlueprintSeeds
 
   setup do
-    setup_settings
     ActionMailer::Base.deliveries.clear
   end
 

data/test/test_plugin_helper.rb

@@ -16,10 +16,6 @@ require File.join(
 # Foreman's setup doesn't handle cleaning up for Minitest::Spec
 DatabaseCleaner.strategy = :transaction
 
-def setup_settings
-  Setting::ExpireHosts.load_defaults
-end
-
 class Minitest::Spec
   before :each do
     DatabaseCleaner.start

data/test/unit/concerns/host_extensions_test.rb

@@ -7,7 +7,6 @@ class ForemanExpireHostsHostExtTest < ActiveSupport::TestCase
 
   setup do
     User.current = FactoryBot.build(:user, :admin)
-    setup_settings
   end
 
   context 'without required expiration date' do

data/test/unit/expire_hosts_mailer_test.rb

@@ -3,10 +3,6 @@
 require 'test_plugin_helper'
 
 class ExpireHostMailerTest < ActionMailer::TestCase
-  setup do
-    setup_settings
-  end
-
   let(:recipient) { FactoryBot.create(:user, :with_mail) }
   let(:hosts) { FactoryBot.create_list(:host, 2, :managed) }
 
@@ -84,7 +80,7 @@ class ExpireHostMailerTest < ActionMailer::TestCase
 
     test 'mail is delivered to admin address' do
       assert_nil recipient.mail
-      assert_equal ['root@some.host.fqdn'], mail.to
+      assert_equal [Setting[:administrator]], mail.to
     end
   end
 end

data/test/unit/expiry_edit_authorizer_test.rb

@@ -30,7 +30,6 @@ module ForemanExpireHosts
 
       context 'with edit_hosts and owner permission' do
         setup do
-          setup_settings
           FactoryBot.create(:filter, :role => role, :permissions => [edit_permission])
         end
         let(:hosts) { FactoryBot.create_list(:host, 2, :owner => user) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_expire_hosts
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.2.0
 platform: ruby
 authors:
 - Nagarjuna Rachaneni
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2024-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -39,62 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.80.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.80.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.4.2
 description: |
   A Foreman plugin that allows hosts to expire at a configurable date.
   Hosts will be shut down and automatically deleted after a grace period.
@@ -110,7 +54,6 @@ files:
 - app/controllers/concerns/foreman_expire_hosts/api/v2/hosts_controller_extensions.rb
 - app/controllers/concerns/foreman_expire_hosts/host_controller_extensions.rb
 - app/helpers/concerns/foreman_expire_hosts/audits_helper_extensions.rb
-- app/helpers/concerns/foreman_expire_hosts/hosts_helper_extensions.rb
 - app/helpers/expire_hosts_mailer_helper.rb
 - app/helpers/foreman_expire_hosts/hosts_helper.rb
 - app/mailers/expire_hosts_mailer.rb
@@ -146,6 +89,7 @@ files:
 - config/routes.rb
 - db/migrate/20150427101516_add_expiry_on_to_hosts.rb
 - db/migrate/20220923181700_fix_settings_category_to_dsl.rb
+- db/migrate/20230112104438_change_expired_on_type.rb
 - db/seeds.d/80_expire_hosts_ui_notification.rb
 - extra/foreman_expire_hosts.cron
 - lib/expire_hosts_notifications.rb
@@ -183,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Foreman plugin for limiting host lifetime

data/app/helpers/concerns/foreman_expire_hosts/hosts_helper_extensions.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module ForemanExpireHosts
-  module HostsHelperExtensions
-    extend ActiveSupport::Concern
-
-    def host_expiry_warning_message(host)
-      return nil unless host.expires?
-
-      if host.expired_past_grace_period?
-        message = _('This host has expired %s ago and needs to be deleted manually.') % time_ago_in_words(host.expired_on)
-      elsif host.expired?
-        message = _('This host has expired %{time_ago} ago and will be deleted on %{delete_date}.') % { :delete_date => l(host.expiration_grace_period_end_date), :time_ago => time_ago_in_words(host.expired_on) }
-      elsif host.expires_today?
-        message = _('This host will expire today.')
-      elsif host.pending_expiration?
-        message = _('This host will expire in %{distance_of_time} (on %{expire_date}).') % { :expire_date => l(host.expired_on), :distance_of_time => future_time_in_words(host.expired_on) }
-      end
-      message
-    end
-
-    def future_time_in_words(to_time, options = {})
-      distance_of_time_in_words(to_time, Time.current, options)
-    end
-
-    def datepicker_f(form, attr, options = {}, html_options = {})
-      field(form, attr, options) do
-        addClass options, 'form-control'
-        form.date_select(attr, options, html_options)
-      end
-    end
-  end
-end