foreman_discovery 24.0.0 → 24.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76f3192238fe98894488060d699286e6dd1a0baf5288aeb121688d8109064868
-  data.tar.gz: d8367489d3500b8c5339fab630f4a88cacf0ba04c4be60964747b8b2f47246a7
+  metadata.gz: 05b8cafa7d0abfcd8fc5f580c4bfbdcb01272ab544f08e928f508fab2032bdd3
+  data.tar.gz: f4bdd5460bdf918d821f9809e6ee947d2c6dde5b721044d210641dd78b5897be
 SHA512:
-  metadata.gz: c1f64acaf2b19c689d5d11f7a9ce557a7f2d7ec1cf612bcd5bc710b303764289507c9e80d9b2541102203d0a125cb37f091ed843db58a1d9ddfd0357f7846a68
-  data.tar.gz: 4de514ded1d66d77b69a4510b26db4c74f549262c52266abedbf7ec573435409e689a23b86beacdcc550bfd0041561454d2fcc00afd9644b00a0a0150d54ac23
+  metadata.gz: b2ef3c4d713cf531a706ee23447534a17a6a0ab4154179da49279b99ca84d5729a10e4074eaf613a63f5ca4320ba23cc34cc7b140a74ed312986ca18d02be620
+  data.tar.gz: cbafe123851d9ebc5afb10ae5c115dbb5ad314e44c647a1da4744ab59bd49a8063e255488c89136dcddba7a6d50211f88f248b83ef7cec0c00483a2a8cced0a0

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

@@ -162,7 +162,7 @@ module Api
 
         total_count = 0
         overall_errors = ""
-        Host::Discovered.all.each do |discovered_host|
+        Host::Discovered.all.find_each do |discovered_host|
           if rule = find_discovery_rule(discovered_host)
             result &= perform_auto_provision(discovered_host, rule)
             unless discovered_host.errors.empty?

data/app/helpers/discovered_hosts_helper.rb

@@ -40,7 +40,7 @@ module DiscoveredHostsHelper
   end
 
   def turn_zero_to_not_available(value)
-    value == 0 ? 'N/A' : value
+    (value == 0) ? 'N/A' : value
   end
 
   def discovery_attribute(host, attr, default_value = _('N/A'))

data/app/models/host/discovered.rb

@@ -222,7 +222,7 @@ class Host::Discovered < ::Host::Base
   end
 
   def self.normalize_string_for_hostname(hostname)
-    hostname = hostname.to_s.downcase.gsub(/(^[^a-z0-9]*|[^a-z0-9\-]|[^a-z0-9]*$)/,'')
+    hostname = hostname.to_s.downcase.gsub(/(^[^a-z0-9]*|[^a-z0-9-]|[^a-z0-9]*$)/,'')
     raise(::Foreman::Exception.new(N_("Invalid hostname: Could not normalize the hostname"))) unless hostname && hostname.present?
     hostname
   end

data/app/views/discovered_hosts/show.html.erb

@@ -96,28 +96,30 @@
   </div>
 </div>
 
-<script type="text/javascript" charset="utf-8">
-  $(document).ready(function(){
-    $("table").css('padding', '0');
-    $("table").css("cssText", 'margin-bottom: 0 !important;');
+<% content_for(:javascripts) do -%>
+  <script type="text/javascript" charset="utf-8">
+    $(document).ready(function(){
+      $("table").css('padding', '0');
+      $("table").css("cssText", 'margin-bottom: 0 !important;');
 
-    provision_class = 'active'
-    primary_class = 'active'
-    var flag_primary = '<i class="glyphicon glyphicon glyphicon-tag primary-flag '+ primary_class +'" title="" data-original-title="'+ __('Primary') +'"></i>';
-    var flags_provision = '<i class="glyphicon glyphicon glyphicon-hdd provision-flag '+ provision_class +'" title="" data-original-title="'+ __('Provisioning') +'"></i>';
+      provision_class = 'active'
+      primary_class = 'active'
+      var flag_primary = '<i class="glyphicon glyphicon glyphicon-tag primary-flag '+ primary_class +'" title="" data-original-title="'+ __('Primary') +'"></i>';
+      var flags_provision = '<i class="glyphicon glyphicon glyphicon-hdd provision-flag '+ provision_class +'" title="" data-original-title="'+ __('Provisioning') +'"></i>';
 
-    $('.flag-primary').html(flag_primary);
-    $('.flag-provision').append(flags_provision);
-    $('.primary-flag').tooltip();
-    $('.provision-flag').tooltip();
+      $('.flag-primary').html(flag_primary);
+      $('.flag-provision').append(flags_provision);
+      $('.primary-flag').tooltip();
+      $('.provision-flag').tooltip();
 
-    expand_all_toggle_action = { 'Expand All': 'show', 'Collapse All': 'hide' };
-    $('#expand_all').on('click', function () {
-      $(this).text(function(i, text){
-          $('#accordion .panel-collapse').collapse(expand_all_toggle_action[text]);
-          return text === "Expand All" ? "Collapse All" : "Expand All";
-      })
-    });
+      expand_all_toggle_action = { 'Expand All': 'show', 'Collapse All': 'hide' };
+      $('#expand_all').on('click', function () {
+        $(this).text(function(i, text){
+            $('#accordion .panel-collapse').collapse(expand_all_toggle_action[text]);
+            return text === "Expand All" ? "Collapse All" : "Expand All";
+        })
+      });
 
-  });
-</script>
+    });
+  </script>
+<% end %>

data/app/views/discovered_hosts/welcome.html.erb

@@ -1,3 +1,7 @@
+<% content_for(:javascripts) do %>
+  <%= webpacked_plugins_js_for :'foreman_discovery' %>
+<% end %>
+
 <% content_for(:title, _("Discovered Hosts")) %>
 
 <% content_for(:content) do %>

data/app/views/discovery_rules/_form.html.erb

@@ -31,9 +31,3 @@
         </div>
     <%= submit_or_cancel f %>
 <% end %>
-
-<script type="text/javascript" charset="utf-8">
-$(document).ready(function() {
-  $('input.counter_spinner').spinner();
-});
-</script>

data/app/views/discovery_rules/welcome.html.erb

@@ -1,3 +1,7 @@
+<% content_for(:javascripts) do %>
+  <%= webpacked_plugins_js_for :'foreman_discovery' %>
+<% end %>
+
 <% content_for(:title, _("Discovered Rules")) %>
 
 <% content_for(:content) do %>

data/db/migrate/20141223142759_fill_discovery_attribute_sets_for_existing_hosts.rb

@@ -4,7 +4,7 @@ end
 
 class FillDiscoveryAttributeSetsForExistingHosts < ActiveRecord::Migration[4.2]
   def up
-    FakeDiscoveredHost.where(:type => "Host::Discovered").all.each do |host|
+    FakeDiscoveredHost.where(:type => "Host::Discovered").all.find_each do |host|
       begin
         say "Populating attribute set for discovered host #{host.name}"
         ForemanDiscovery::ImportHooks::DiscoveryAttribute.new(host: host, facts: host.facts_hash).after_populate

data/db/migrate/20150512150432_remove_old_discovery_reader_permissions.rb

@@ -1,6 +1,6 @@
 class RemoveOldDiscoveryReaderPermissions < ActiveRecord::Migration[4.2]
   def up
-    Permission.where("name like '%_discovery_rules' and resource_type is null").each do |permission|
+    Permission.where("name like '%_discovery_rules' and resource_type is null").find_each do |permission|
       permission.update(:resource_type => 'DiscoveryRule')
     end
   end

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "24.0.0"
+  VERSION = "24.0.2"
 end

data/lib/foreman_discovery.rake

@@ -4,11 +4,7 @@ namespace :test do
   Rake::TestTask.new(:foreman_discovery) do |t|
     test_dir = File.join(File.dirname(__FILE__), '..', 'test')
     t.libs << ["test",test_dir]
-    if ENV['FILE'] || ENV['TEST']
-      t.pattern = ENV['FILE'] || ENV['TEST']
-    else
-      t.pattern = "#{test_dir}/**/*_test.rb"
-    end
+    t.pattern = ENV['FILE'] || ENV['TEST'] || "#{test_dir}/**/*_test.rb"
     t.verbose = true
     t.warning = false
   end

data/package.json

@@ -9,8 +9,6 @@
     "test:watch": "tfm-test --plugin --watchAll",
     "test:current": "tfm-test --plugin --watch",
     "publish-coverage": "tfm-publish-coverage",
-    "stories": "tfm-stories --plugin",
-    "stories:build": "tfm-build-stories --plugin",
     "create-react-component": "yo react-domain"
   },
   "repository": {

data/test/functional/discovered_hosts_controller_test.rb

@@ -41,7 +41,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     [:multiple_destroy, :select_multiple_organization, :select_multiple_location].each do |action|
       process action, method: :post, params: {:host_ids => [host.id]}, session: set_session_user, xhr: true
       assert_response :success
-      assert response.body =~ /#{host.name}/
+      assert_includes(response.body, host.name)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 24.0.0
+  version: 24.0.2
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -76,7 +76,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-16 00:00:00.000000000 Z
+date: 2024-07-18 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -218,56 +218,39 @@ files:
 - lib/foreman_discovery/engine.rb
 - lib/foreman_discovery/version.rb
 - locale/ca/LC_MESSAGES/foreman_discovery.mo
-- locale/ca/foreman_discovery.edit.po
 - locale/ca/foreman_discovery.po
 - locale/cs_CZ/LC_MESSAGES/foreman_discovery.mo
-- locale/cs_CZ/foreman_discovery.edit.po
 - locale/cs_CZ/foreman_discovery.po
 - locale/de/LC_MESSAGES/foreman_discovery.mo
-- locale/de/foreman_discovery.edit.po
 - locale/de/foreman_discovery.po
 - locale/en/LC_MESSAGES/foreman_discovery.mo
-- locale/en/foreman_discovery.edit.po
 - locale/en/foreman_discovery.po
 - locale/en_GB/LC_MESSAGES/foreman_discovery.mo
-- locale/en_GB/foreman_discovery.edit.po
 - locale/en_GB/foreman_discovery.po
 - locale/es/LC_MESSAGES/foreman_discovery.mo
-- locale/es/foreman_discovery.edit.po
 - locale/es/foreman_discovery.po
 - locale/foreman_discovery.pot
 - locale/fr/LC_MESSAGES/foreman_discovery.mo
-- locale/fr/foreman_discovery.edit.po
 - locale/fr/foreman_discovery.po
 - locale/gl/LC_MESSAGES/foreman_discovery.mo
-- locale/gl/foreman_discovery.edit.po
 - locale/gl/foreman_discovery.po
 - locale/it/LC_MESSAGES/foreman_discovery.mo
-- locale/it/foreman_discovery.edit.po
 - locale/it/foreman_discovery.po
 - locale/ja/LC_MESSAGES/foreman_discovery.mo
-- locale/ja/foreman_discovery.edit.po
 - locale/ja/foreman_discovery.po
 - locale/ka/LC_MESSAGES/foreman_discovery.mo
-- locale/ka/foreman_discovery.edit.po
 - locale/ka/foreman_discovery.po
 - locale/ko/LC_MESSAGES/foreman_discovery.mo
-- locale/ko/foreman_discovery.edit.po
 - locale/ko/foreman_discovery.po
 - locale/pt_BR/LC_MESSAGES/foreman_discovery.mo
-- locale/pt_BR/foreman_discovery.edit.po
 - locale/pt_BR/foreman_discovery.po
 - locale/ru/LC_MESSAGES/foreman_discovery.mo
-- locale/ru/foreman_discovery.edit.po
 - locale/ru/foreman_discovery.po
 - locale/sv_SE/LC_MESSAGES/foreman_discovery.mo
-- locale/sv_SE/foreman_discovery.edit.po
 - locale/sv_SE/foreman_discovery.po
 - locale/zh_CN/LC_MESSAGES/foreman_discovery.mo
-- locale/zh_CN/foreman_discovery.edit.po
 - locale/zh_CN/foreman_discovery.po
 - locale/zh_TW/LC_MESSAGES/foreman_discovery.mo
-- locale/zh_TW/foreman_discovery.edit.po
 - locale/zh_TW/foreman_discovery.po
 - package.json
 - test/factories/discovery_host_related.rb
@@ -297,7 +280,6 @@ files:
 - test/integration/discovered_hosts_test.rb
 - test/integration/menu_test.rb
 - test/migrations/20221102075151_migrate_discovery_hostname_and_fact_column_to_array_test.rb
-- test/migrations/20221102075151_migrate_discovery_hostname_and_fact_column_to_array_test.rb.orig
 - test/static_fixtures/redhat_kexec.erb
 - test/test_helper_discovery.rb
 - test/test_plugin_helper.rb
@@ -351,13 +333,13 @@ 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: MaaS Discovery Plugin for Foreman
 test_files:
-- test/factories/discovery_rule_related.rb
 - test/factories/discovery_host_related.rb
+- test/factories/discovery_rule_related.rb
 - test/facts/bond0-eth0-eth1-active-passive.json
 - test/facts/default.json
 - test/facts/dell_npars.json
@@ -377,25 +359,24 @@ test_files:
 - test/functional/api/v2/discovered_hosts_controller_test.rb
 - test/functional/api/v2/discovery_rules_controller_test.rb
 - test/functional/api/v2/fact_value_extensions_test.rb
-- test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
 - test/functional/discovered_hosts_controller_test.rb
 - test/functional/discovery_rules_controller_test.rb
+- test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
 - test/integration/discovered_hosts_test.rb
 - test/integration/menu_test.rb
-- test/unit/ui_notifications/destroy_host_test.rb
-- test/unit/ui_notifications/new_host_test.rb
-- test/unit/discovered_mailer_test.rb
+- test/migrations/20221102075151_migrate_discovery_hostname_and_fact_column_to_array_test.rb
+- test/static_fixtures/redhat_kexec.erb
+- test/test_helper_discovery.rb
+- test/test_plugin_helper.rb
 - test/unit/discovered_extensions_test.rb
+- test/unit/discovered_mailer_test.rb
 - test/unit/discovery_attribute_set_test.rb
 - test/unit/discovery_rule_test.rb
 - test/unit/discovery_taxonomy_extensions_test.rb
 - test/unit/fact_parser_test.rb
 - test/unit/fact_to_category_resolver_test.rb
+- test/unit/host_discovered_test.rb
 - test/unit/lldp_neighbors_test.rb
 - test/unit/managed_extensions_test.rb
-- test/unit/host_discovered_test.rb
-- test/test_plugin_helper.rb
-- test/migrations/20221102075151_migrate_discovery_hostname_and_fact_column_to_array_test.rb.orig
-- test/migrations/20221102075151_migrate_discovery_hostname_and_fact_column_to_array_test.rb
-- test/static_fixtures/redhat_kexec.erb
-- test/test_helper_discovery.rb
+- test/unit/ui_notifications/destroy_host_test.rb
+- test/unit/ui_notifications/new_host_test.rb