foreman_wreckingball 4.0.0 → 6.0.0

data/test/models/foreman_wreckingball/vmware_facet_test.rb

@@ -19,12 +19,12 @@ module ForemanWreckingball
       let(:vmware_facet) { host.vmware_facet }
 
       test 'is true when vm is powered on' do
-        assert_equal true, vmware_facet.vm_ready?
+        assert vmware_facet.vm_ready?
       end
 
       test 'is false when vm is not powered on' do
         vmware_facet.power_state = 'suspended'
-        assert_equal false, vmware_facet.vm_ready?
+        assert_not vmware_facet.vm_ready?
       end
     end
 
@@ -36,7 +36,7 @@ module ForemanWreckingball
             featureRequirement: [
               'cpuid.SSE3',
               'cpuid.AES',
-              'cpuid.Intel'
+              'cpuid.Intel',
             ].map do |cpu_feature|
               OpenStruct.new(key: cpu_feature)
             end
@@ -45,7 +45,7 @@ module ForemanWreckingball
       end
 
       let(:compute_resource) do
-        cr = FactoryBot.create(:compute_resource, :vmware, :with_taxonomy, :uuid => 'Solutions')
+        cr = FactoryBot.create(:compute_resource, :vmware, :with_taxonomy, uuid: 'Solutions')
         ComputeResource.find(cr.id)
       end
 
@@ -62,12 +62,12 @@ module ForemanWreckingball
 
       setup do
         ::Fog.mock!
-        ::ForemanWreckingball.fog_vsphere_namespace::Mock.any_instance.stubs(:get_vm_ref).returns(vm)
+        Fog::Vsphere::Compute::Mock.any_instance.stubs(:get_vm_ref).returns(vm)
         # this is not stubbed correctly in fog-vsphere
-        ::ForemanWreckingball.fog_vsphere_namespace::Server.any_instance.stubs(:cpuHotAddEnabled).returns(false)
-        ::ForemanWreckingball.fog_vsphere_namespace::Server.any_instance.stubs(:hardware_version).returns('vmx-9')
-        ::ForemanWreckingball.fog_vsphere_namespace::Server.any_instance.stubs(:corespersocket).returns(1)
-        ::ForemanWreckingball.fog_vsphere_namespace::Server.any_instance.stubs(:power_state).returns('poweredOn')
+        Fog::Vsphere::Compute::Server.any_instance.stubs(:cpuHotAddEnabled).returns(false)
+        Fog::Vsphere::Compute::Server.any_instance.stubs(:hardware_version).returns('vmx-9')
+        Fog::Vsphere::Compute::Server.any_instance.stubs(:corespersocket).returns(1)
+        Fog::Vsphere::Compute::Server.any_instance.stubs(:power_state).returns('poweredOn')
       end
       teardown { ::Fog.unmock! }
 
@@ -79,7 +79,7 @@ module ForemanWreckingball
         assert_equal 'rhel6_64Guest', vmware_facet.guest_id
         assert_equal 'toolsOk', vmware_facet.tools_state
         assert_equal 'poweredOn', vmware_facet.power_state
-        assert_equal false, vmware_facet.cpu_hot_add
+        assert_not vmware_facet.cpu_hot_add
         assert_equal ['cpuid.SSE3', 'cpuid.AES', 'cpuid.Intel'], vmware_facet.cpu_features
         assert_equal 'vmx-9', vmware_facet.hardware_version
       end

data/test/models/foreman_wreckingball/vmware_hypervisor_facet_test.rb

@@ -20,22 +20,22 @@ module ForemanWreckingball
 
       test 'should be true when IBRS is available' do
         facet.feature_capabilities = ['cpuid.IBRS']
-        assert_equal true, facet.provides_spectre_features?
+        assert facet.provides_spectre_features?
       end
 
       test 'should be true when IBPB is available' do
         facet.feature_capabilities = ['cpuid.IBPB']
-        assert_equal true, facet.provides_spectre_features?
+        assert facet.provides_spectre_features?
       end
 
       test 'should be true when STIBP is available' do
         facet.feature_capabilities = ['cpuid.STIBP']
-        assert_equal true, facet.provides_spectre_features?
+        assert facet.provides_spectre_features?
       end
 
       test 'should be false when neither IBRS, IBPB nor STIBP is available' do
         facet.feature_capabilities = ['cpuid.WHATEVER']
-        assert_equal false, facet.provides_spectre_features?
+        assert_not facet.provides_spectre_features?
       end
     end
   end

data/test/models/host_test.rb

@@ -2,72 +2,74 @@
 
 require 'test_plugin_helper'
 
-class Host::ManagedTest < ActiveSupport::TestCase
-  should have_one(:vmware_facet)
-  should have_one(:vmware_cluster)
-  should have_one(:vmware_hypervisor_facet)
+module Host
+  class ManagedTest < ActiveSupport::TestCase
+    should have_one(:vmware_facet)
+    should have_one(:vmware_cluster)
+    should have_one(:vmware_hypervisor_facet)
 
-  HostStatus.wreckingball_statuses.each do |status|
-    should have_one(status.host_association)
-  end
+    HostStatus.wreckingball_statuses.each do |status|
+      should have_one(status.host_association)
+    end
 
-  describe '#owned_by_current_user_or_group_with_current_user' do
-    test 'returns only hosts owned by current user' do
-      usergroup_with_user = FactoryBot.create(:usergroup, users: [User.current], usergroups: [FactoryBot.create(:usergroup, users: [])])
+    describe '#owned_by_current_user_or_group_with_current_user' do
+      test 'returns only hosts owned by current user' do
+        usergroup_with_user = FactoryBot.create(:usergroup, users: [User.current], usergroups: [FactoryBot.create(:usergroup, users: [])])
 
-      FactoryBot.create :host, :managed, owner: FactoryBot.create(:user)
-      FactoryBot.create :host, :managed, owner: FactoryBot.create(:usergroup, users: [])
-      FactoryBot.create :host, :managed, owner: usergroup_with_user.usergroups.first
+        FactoryBot.create :host, :managed, owner: FactoryBot.create(:user)
+        FactoryBot.create :host, :managed, owner: FactoryBot.create(:usergroup, users: [])
+        FactoryBot.create :host, :managed, owner: usergroup_with_user.usergroups.first
 
-      expected = [
-        FactoryBot.create(:host, :managed, owner: User.current),
-        FactoryBot.create(:host, :managed, owner: usergroup_with_user),
-        FactoryBot.create(:host, :managed, owner: FactoryBot.create(:usergroup, usergroups: [usergroup_with_user]))
-      ]
-      actual = Host::Managed.owned_by_current_user_or_group_with_current_user.all
+        expected = [
+          FactoryBot.create(:host, :managed, owner: User.current),
+          FactoryBot.create(:host, :managed, owner: usergroup_with_user),
+          FactoryBot.create(:host, :managed, owner: FactoryBot.create(:usergroup, usergroups: [usergroup_with_user])),
+        ]
+        actual = Host::Managed.owned_by_current_user_or_group_with_current_user.all
 
-      assert_same_elements expected, actual
+        assert_same_elements expected, actual
+      end
     end
-  end
 
-  context 'scoped search' do
-    setup do
-      @host = FactoryBot.create(:host, :with_vmware_facet)
-    end
+    context 'scoped search' do
+      setup do
+        @host = FactoryBot.create(:host, :with_vmware_facet)
+      end
 
-    test 'search by hardware_version' do
-      hosts = Host.search_for('vsphere_hardware_version = vmx-10')
-      assert_includes hosts, @host
-    end
+      test 'search by hardware_version' do
+        hosts = Host.search_for('vsphere_hardware_version = vmx-10')
+        assert_includes hosts, @host
+      end
 
-    test 'search by power_state' do
-      hosts = Host.search_for('vsphere_power_state = poweredOn')
-      assert_includes hosts, @host
-    end
+      test 'search by power_state' do
+        hosts = Host.search_for('vsphere_power_state = poweredOn')
+        assert_includes hosts, @host
+      end
 
-    test 'search by tools_state' do
-      hosts = Host.search_for('vsphere_tools_state = toolsOk')
-      assert_includes hosts, @host
-    end
+      test 'search by tools_state' do
+        hosts = Host.search_for('vsphere_tools_state = toolsOk')
+        assert_includes hosts, @host
+      end
 
-    test 'search by guest_id' do
-      hosts = Host.search_for('vsphere_guest_id = rhel6_64Guest')
-      assert_includes hosts, @host
-    end
+      test 'search by guest_id' do
+        hosts = Host.search_for('vsphere_guest_id = rhel6_64Guest')
+        assert_includes hosts, @host
+      end
 
-    test 'search by cpus' do
-      hosts = Host.search_for('vsphere_cpus = 2')
-      assert_includes hosts, @host
-    end
+      test 'search by cpus' do
+        hosts = Host.search_for('vsphere_cpus = 2')
+        assert_includes hosts, @host
+      end
 
-    test 'search by corespersocket' do
-      hosts = Host.search_for('vsphere_corespersocket = 1')
-      assert_includes hosts, @host
-    end
+      test 'search by corespersocket' do
+        hosts = Host.search_for('vsphere_corespersocket = 1')
+        assert_includes hosts, @host
+      end
 
-    test 'search by memory_mb' do
-      hosts = Host.search_for('vsphere_memory_mb = 8192')
-      assert_includes hosts, @host
+      test 'search by memory_mb' do
+        hosts = Host.search_for('vsphere_memory_mb = 8192')
+        assert_includes hosts, @host
+      end
     end
   end
 end

data/test/test_plugin_helper.rb

@@ -5,7 +5,7 @@ require 'test_helper'
 require 'database_cleaner'
 require 'dynflow/testing'
 
-Dir["#{__dir__}/helpers/foreman_wreckingball/**.rb"].each { |f| require f }
+Dir["#{__dir__}/helpers/foreman_wreckingball/**.rb"].sort.each { |f| require f }
 
 # Add plugin to FactoryBot's paths
 FactoryBot.definition_file_paths << File.join(ForemanTasks::Engine.root, 'test', 'factories')

data/test/unit/foreman_wreckingball/access_permissions_test.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+require 'unit/shared/access_permissions_test_base'
+
+# Permissions are added in AccessPermissions with lists of controllers and
+# actions that they enable access to.  For non-admin users, we need to test
+# that there are permissions available that cover every controller action, else
+# it can't be delegated and this will lead to parts of the application that
+# aren't functional for non-admin users.
+#
+# In particular, it's important that actions for AJAX requests are added to
+# an appropriate permission so views using those requests function.
+class AccessPermissionsTest < ActiveSupport::TestCase
+  include AccessPermissionsTestBase
+
+  check_routes(ForemanWreckingball::Engine.routes, [])
+end

data/test/unit/foreman_wreckingball/vmware_cluster_importer_test.rb

@@ -10,7 +10,7 @@ module ForemanWreckingball
     end
     teardown { Fog.unmock! }
 
-    let(:compute_resource) { FactoryBot.create(:vmware_cr, :uuid => 'Solutions') }
+    let(:compute_resource) { FactoryBot.create(:vmware_cr, uuid: 'Solutions') }
     let(:importer) do
       VmwareClusterImporter.new(
         compute_resource: compute_resource
@@ -28,10 +28,10 @@ module ForemanWreckingball
 
       test 'removes old clusters without associated records' do
         old_cluster = FactoryBot.create(:vmware_cluster,
-                                        :with_hosts,
-                                        :with_vmware_facets,
-                                        :with_vmware_hypervisor_facets,
-                                        compute_resource: compute_resource)
+          :with_hosts,
+          :with_vmware_facets,
+          :with_vmware_hypervisor_facets,
+          compute_resource: compute_resource)
 
         compute_resource_id = old_cluster.compute_resource.id
         host_ids = old_cluster.hosts.pluck(:id)
@@ -39,7 +39,7 @@ module ForemanWreckingball
         vmware_hypervisor_facet_ids = old_cluster.vmware_hypervisor_facets.pluck(:id)
 
         importer.import!
-        refute ForemanWreckingball::VmwareCluster.find_by(id: old_cluster.id)
+        assert_not ForemanWreckingball::VmwareCluster.find_by(id: old_cluster.id)
 
         assert Foreman::Model::Vmware.find_by(id: compute_resource_id)
         assert_equal host_ids.count, Host.where(id: host_ids).count

data/test/unit/foreman_wreckingball/vmware_hypervisor_importer_test.rb

@@ -44,7 +44,7 @@ module ForemanWreckingball
 
       test 'imports hypervisors' do
         importer.import!
-        host = Host::Managed.joins(:vmware_hypervisor_facet).find_by(:name => 'host1.example.com')
+        host = Host::Managed.joins(:vmware_hypervisor_facet).find_by(name: 'host1.example.com')
 
         # Test host attributes are set correctly
         assert_equal 'example.com', host.domain.name
@@ -74,11 +74,11 @@ module ForemanWreckingball
         assert_not_nil Host::Managed.find_by(id: host_on_other_cluster.id).vmware_hypervisor_facet
       end
 
-      test 'updates host by katello name' do
+      test 'does not touch hosts created by katello/virt-who' do
         host = FactoryBot.create(:host,  organization: organization)
-        host.update!(:name => "virt-who-host1.example.com-#{organization.id}")
+        host.update!(name: "virt-who-host1.example.com-#{organization.id}")
         importer.import!
-        assert_equal 'host1.example.com', host.reload.name
+        assert_equal "virt-who-host1.example.com-#{organization.id}", host.reload.name
       end
     end
   end

metadata

@@ -1,29 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: foreman_wreckingball
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Timo Goebel
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: foreman_puppet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +52,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: theforeman-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.1.2
 description: Adds status checks of the VMWare VMs to Foreman.
 email:
 - timo.goebel@dm.de
@@ -69,7 +82,7 @@ files:
 - app/assets/stylesheets/foreman_wreckingball/status_hosts_table.css.scss
 - app/assets/stylesheets/foreman_wreckingball/status_managed_hosts_dashboard.css.scss
 - app/controllers/foreman_wreckingball/hosts_controller.rb
-- app/helpers/concerns/foreman_wreckingball/hosts_helper_extensions.rb
+- app/helpers/foreman_wreckingball/hosts_helper.rb
 - app/helpers/foreman_wreckingball/hypervisors_helper.rb
 - app/helpers/foreman_wreckingball/statuses_helper.rb
 - app/jobs/update_hosts_vmware_facets.rb
@@ -103,7 +116,6 @@ files:
 - app/models/foreman_wreckingball/vmware_cluster.rb
 - app/models/foreman_wreckingball/vmware_facet.rb
 - app/models/foreman_wreckingball/vmware_hypervisor_facet.rb
-- app/models/setting/wreckingball.rb
 - app/services/foreman_wreckingball/vmware_cluster_importer.rb
 - app/services/foreman_wreckingball/vmware_hypervisor_importer.rb
 - app/views/compute_resources/_hypervisors_tab.html.erb
@@ -128,6 +140,7 @@ files:
 - db/migrate/20180614105545_add_feature_capabilities_to_vmware_hypervisor_facets.rb
 - db/migrate/20181020174609_add_power_state_to_vmware_facets.rb
 - db/migrate/20181021111543_add_indexes_to_vmware_hypervisor_facets.rb
+- db/migrate/20240201094513_fix_wreckingball_settings_category_to_dsl.rb
 - lib/foreman_wreckingball.rb
 - lib/foreman_wreckingball/engine.rb
 - lib/foreman_wreckingball/scheduled_jobs.rb
@@ -168,13 +181,13 @@ files:
 - test/models/host_test.rb
 - test/models/usergroup_test.rb
 - test/test_plugin_helper.rb
+- test/unit/foreman_wreckingball/access_permissions_test.rb
 - test/unit/foreman_wreckingball/vmware_cluster_importer_test.rb
 - test/unit/foreman_wreckingball/vmware_hypervisor_importer_test.rb
 homepage: https://github.com/dm-drogeriemarkt/foreman_wreckingball
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -182,48 +195,51 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Adds status checks of the VMWare VMs to Foreman.
 test_files:
-- test/unit/foreman_wreckingball/vmware_cluster_importer_test.rb
-- test/unit/foreman_wreckingball/vmware_hypervisor_importer_test.rb
+- test/actions/foreman_wreckingball/bulk_remediate_test.rb
+- test/actions/foreman_wreckingball/host/refresh_vmware_facet_test.rb
+- test/actions/foreman_wreckingball/host/remediate_hardware_version_test.rb
+- test/actions/foreman_wreckingball/host/remediate_spectre_v2_test.rb
+- test/actions/foreman_wreckingball/host/remediate_vmware_operatingsystem_test.rb
+- test/actions/foreman_wreckingball/vmware/schedule_vmware_sync_test.rb
+- test/actions/foreman_wreckingball/vmware/sync_compute_resource_test.rb
+- test/controllers/compute_resources_controller_test.rb
+- test/controllers/foreman_wreckingball/hosts_controller_test.rb
+- test/factories/compute_resource.rb
+- test/factories/foreman_wreckingball_factories.rb
+- test/factories/host.rb
+- test/factories/task.rb
+- test/helpers/foreman_wreckingball/status_helper.rb
 - test/integration/hosts_status_dashboard_test.rb
 - test/integration/hosts_status_managed_hosts_test.rb
+- test/integration_test_plugin_helper.rb
 - test/models/compute_resource_test.rb
-- test/models/host_test.rb
-- test/models/usergroup_test.rb
+- test/models/compute_resources/vmware_test.rb
+- test/models/foreman_wreckingball/cpu_hot_add_status_test.rb
+- test/models/foreman_wreckingball/hardware_version_status_test.rb
 - test/models/foreman_wreckingball/operatingsystem_status_test.rb
 - test/models/foreman_wreckingball/spectre_v2_status_test.rb
-- test/models/foreman_wreckingball/vmware_hypervisor_facet_test.rb
-- test/models/foreman_wreckingball/hardware_version_status_test.rb
-- test/models/foreman_wreckingball/cpu_hot_add_status_test.rb
+- test/models/foreman_wreckingball/tools_status_test.rb
 - test/models/foreman_wreckingball/vmware_cluster_test.rb
 - test/models/foreman_wreckingball/vmware_facet_test.rb
-- test/models/foreman_wreckingball/tools_status_test.rb
+- test/models/foreman_wreckingball/vmware_hypervisor_facet_test.rb
 - test/models/host_status_test.rb
-- test/models/compute_resources/vmware_test.rb
-- test/factories/compute_resource.rb
-- test/factories/host.rb
-- test/factories/foreman_wreckingball_factories.rb
-- test/factories/task.rb
-- test/actions/foreman_wreckingball/host/remediate_vmware_operatingsystem_test.rb
-- test/actions/foreman_wreckingball/host/remediate_hardware_version_test.rb
-- test/actions/foreman_wreckingball/host/refresh_vmware_facet_test.rb
-- test/actions/foreman_wreckingball/host/remediate_spectre_v2_test.rb
-- test/actions/foreman_wreckingball/bulk_remediate_test.rb
-- test/actions/foreman_wreckingball/vmware/sync_compute_resource_test.rb
-- test/actions/foreman_wreckingball/vmware/schedule_vmware_sync_test.rb
+- test/models/host_test.rb
+- test/models/usergroup_test.rb
 - test/test_plugin_helper.rb
-- test/controllers/compute_resources_controller_test.rb
-- test/controllers/foreman_wreckingball/hosts_controller_test.rb
-- test/helpers/foreman_wreckingball/status_helper.rb
-- test/integration_test_plugin_helper.rb
+- test/unit/foreman_wreckingball/access_permissions_test.rb
+- test/unit/foreman_wreckingball/vmware_cluster_importer_test.rb
+- test/unit/foreman_wreckingball/vmware_hypervisor_importer_test.rb

data/app/models/setting/wreckingball.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-class Setting
-  class Wreckingball < ::Setting
-    def self.default_settings
-      [
-        set('min_vsphere_hardware_version', N_('Minimum required Hardware version for vSphere VMs'), 13, N_('Hardware version'))
-      ]
-    end
-
-    def self.load_defaults
-      return unless ActiveRecord::Base.connection.table_exists?('settings')
-      return unless super
-
-      Setting.transaction do
-        default_settings.compact.each { |s| Setting::Wreckingball.create s.update(category: 'Setting::Wreckingball') }
-      end
-
-      true
-    end
-
-    def self.humanized_category
-      N_('Wreckingball')
-    end
-  end
-end