foreman_expire_hosts 7.0.4 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5afc13d619d302e3e05ae902ff90f65d5eefd05e03b00369c7e3ca538260555
-  data.tar.gz: 9cdf5ad3a41cdc45a2fe0d4f5c0dc850e0a658abc72e20c83a436b5279a19268
+  metadata.gz: 7c1855fd3586ff4abdc25e11e58c006a503c83acc12628890ce4d307ebf113b9
+  data.tar.gz: c5ce62b9345649f1fd7365b0181ef83e53a93086f3b31435498b12eb6af0ce5c
 SHA512:
-  metadata.gz: e65dddbebf6e2140e12fd05adf1b4584284c7e422a5399642eaf7e59e423b86561dbc9a7c0071835fbbffa50d3e34985ce31b1d1d3f955147e0849b2d8ea0d50
-  data.tar.gz: 4786bb290163e8f868dbe81d377d3747143cd5bcf3e00194625ea7f1c88f2ef0f6840fb2ccce7f5561a005140cacd6ea625a98b1b9fb45da4bf3444387a6047e
+  metadata.gz: 15394668d731ba9c01b54e09ef5d13c1f6c3550938fd8fb4ee2188b696da77ad759a3df33ad80285aa378a2e463d496a92d80eb914b56a2af97655889060e23c
+  data.tar.gz: bf2fca5f36c7eee30374e413d1c80f482a6fcf13d833a19e57fe4de61f7a14b731742d3064cd870bbd86533d5a5377c8ebe2217c1a70c94a6ade8dafd5bb9a2e

data/db/migrate/20220923181700_fix_settings_category_to_dsl.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class FixSettingsCategoryToDsl < ActiveRecord::Migration[6.0]
+  def up
+    Setting.where(category: 'Setting::ExpireHost').update_all(category: 'Setting')
+  end
+end

data/lib/foreman_expire_hosts/engine.rb

@@ -19,13 +19,9 @@ module ForemanExpireHosts
       end
     end
 
-    initializer 'foreman_expire_hosts.load_default_settings', :before => :load_config_initializers do
-      require_dependency File.expand_path('../../app/models/setting/expire_hosts.rb', __dir__) if (Setting.table_exists? rescue(false))
-    end
-
     initializer 'foreman_expire_hosts.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_expire_hosts do
-        requires_foreman '>= 1.24'
+        requires_foreman '>= 3.0.0'
         register_custom_status HostStatus::ExpirationStatus
 
         # strong parameters
@@ -43,6 +39,41 @@ module ForemanExpireHosts
           'hosts/update_multiple_expiration'
         ]
 
+        settings do
+          category(:expire_hosts, N_('Expire Hosts')) do
+            setting('is_host_expiry_date_mandatory',
+                    type: :boolean,
+                    description: N_('Make expiry date field mandatory on host creation/update'),
+                    default: false,
+                    full_name: N_('Require host expiry date'))
+            setting('can_owner_modify_host_expiry_date',
+                    type: :boolean,
+                    description: N_('Allow host owner to modify host expiry date field. If the field is false then admin only can edit expiry field'),
+                    default: false,
+                    full_name: N_('Host owner can modify host expiry date'))
+            setting('notify1_days_before_host_expiry',
+                    type: :integer,
+                    description: N_('Send first notification to owner of hosts about his hosts expiring in given days. Must be integer only'),
+                    default: 7,
+                    full_name: N_('First expiry notification'))
+            setting('notify2_days_before_host_expiry',
+                    type: :integer,
+                    description: N_('Send second notification to owner of hosts about his hosts expiring in given days. Must be integer only'),
+                    default: 1,
+                    full_name: N_('Second expiry notification'))
+            setting('days_to_delete_after_host_expiration',
+                    type: :integer,
+                    description: N_('Delete expired hosts after given days of hosts expiry date. Must be integer only'),
+                    default: 3,
+                    full_name: N_('Expiry grace period in days'))
+            setting('host_expiry_email_recipients',
+                    type: :string,
+                    description: N_('All notifications will be delivered to its owner. If any other users/admins need to receive those expiry warning notifications then those emails can be configured comma separated here.'),
+                    default: nil,
+                    full_name: N_('Expiry e-mail recipients'))
+          end
+        end
+
         extend_rabl_template 'api/v2/hosts/main', 'api/v2/hosts/expiration'
 
         describe_host do

data/lib/foreman_expire_hosts/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_expire_hosts
 version: !ruby/object:Gem::Version
-  version: 7.0.4
+  version: 8.0.0
 platform: ruby
 authors:
 - Nagarjuna Rachaneni
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -116,7 +116,6 @@ files:
 - app/mailers/expire_hosts_mailer.rb
 - app/models/concerns/foreman_expire_hosts/host_ext.rb
 - app/models/host_status/expiration_status.rb
-- app/models/setting/expire_hosts.rb
 - app/overrides/add_expired_on_field_to_host_form.rb
 - app/overrides/add_expired_on_field_to_host_show.rb
 - app/overrides/deleted_expired_host_comment_in_audits.rb
@@ -146,6 +145,7 @@ files:
 - app/views/hosts/select_multiple_expiration.html.erb
 - config/routes.rb
 - db/migrate/20150427101516_add_expiry_on_to_hosts.rb
+- db/migrate/20220923181700_fix_settings_category_to_dsl.rb
 - db/seeds.d/80_expire_hosts_ui_notification.rb
 - extra/foreman_expire_hosts.cron
 - lib/expire_hosts_notifications.rb
@@ -183,19 +183,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Foreman plugin for limiting host lifetime
 test_files:
-- test/unit/expire_hosts_mailer_test.rb
-- test/unit/host_status/expiration_status_test.rb
-- test/unit/safe_destroy_test.rb
-- test/unit/expiry_edit_authorizer_test.rb
-- test/unit/concerns/host_extensions_test.rb
 - test/factories/foreman_expire_hosts_factories.rb
-- test/lib/expire_hosts_notifications_test.rb
-- test/test_plugin_helper.rb
-- test/helpers/hosts_helper_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
 - test/functional/concerns/hosts_controller_extensions_test.rb
+- test/helpers/hosts_helper_test.rb
+- test/lib/expire_hosts_notifications_test.rb
+- test/test_plugin_helper.rb
+- test/unit/concerns/host_extensions_test.rb
+- test/unit/expire_hosts_mailer_test.rb
+- test/unit/expiry_edit_authorizer_test.rb
+- test/unit/host_status/expiration_status_test.rb
+- test/unit/safe_destroy_test.rb

data/app/models/setting/expire_hosts.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-class Setting::ExpireHosts < Setting
-  Setting::BLANK_ATTRS.push('host_expiry_email_recipients')
-
-  def self.load_defaults
-    # Check the table exists
-    return unless super
-
-    self.transaction do
-      [
-        self.set('is_host_expiry_date_mandatory', N_('Make expiry date field mandatory on host creation/update'), false, N_('Require host expiry date')),
-        self.set('can_owner_modify_host_expiry_date', N_('Allow host owner to modify host expiry date field. If the field is false then admin only can edit expiry field'), false, N_('Host owner can modify host expiry date')),
-        self.set('notify1_days_before_host_expiry', N_('Send first notification to owner of hosts about his hosts expiring in given days. Must be integer only'), 7, N_('First expiry notification')),
-        self.set('notify2_days_before_host_expiry', N_('Send second notification to owner of hosts about his hosts expiring in given days. Must be integer only'), 1, N_('Second expiry notification')),
-        self.set('days_to_delete_after_host_expiration', N_('Delete expired hosts after given days of hosts expiry date. Must be integer only'), 3, N_('Expiry grace period in days')),
-        self.set('host_expiry_email_recipients', N_('All notifications will be delivered to its owner. If any other users/admins need to receive those expiry warning notifications then those emails can be configured comma separated here.'), nil, N_('Expiry e-mail recipients'))
-      ].each { |s| self.create! s.update(:category => 'Setting::ExpireHosts') }
-    end
-
-    true
-  end
-end