From e376d600c603b44fc1b7ba090724a803731c55ab Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Fri, 26 Jan 2024 11:40:56 -0500 Subject: [PATCH] Remove include_concern as it's no longer needed with zeitwerk --- .../providers/amazon/agent_coordinator_worker/runner.rb | 2 +- .../manageiq/providers/amazon/cloud_manager/provision.rb | 6 +++--- .../manageiq/providers/amazon/cloud_manager/template.rb | 2 +- app/models/manageiq/providers/amazon/cloud_manager/vm.rb | 4 ++-- .../providers/amazon/cloud_manager/vm/operations.rb | 5 ++--- .../providers/amazon/cloud_manager/vm_or_template_shared.rb | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/models/manageiq/providers/amazon/agent_coordinator_worker/runner.rb b/app/models/manageiq/providers/amazon/agent_coordinator_worker/runner.rb index 80d7961fc..44fd23a65 100644 --- a/app/models/manageiq/providers/amazon/agent_coordinator_worker/runner.rb +++ b/app/models/manageiq/providers/amazon/agent_coordinator_worker/runner.rb @@ -1,5 +1,5 @@ class ManageIQ::Providers::Amazon::AgentCoordinatorWorker::Runner < MiqWorker::Runner - include_concern 'ResponseThread' + include ResponseThread def do_before_work_loop @coordinators = self.class.all_agent_coordinators_in_zone @coordinators.each(&:cleanup_agents) diff --git a/app/models/manageiq/providers/amazon/cloud_manager/provision.rb b/app/models/manageiq/providers/amazon/cloud_manager/provision.rb index 96651673d..e31e965fc 100644 --- a/app/models/manageiq/providers/amazon/cloud_manager/provision.rb +++ b/app/models/manageiq/providers/amazon/cloud_manager/provision.rb @@ -1,5 +1,5 @@ class ManageIQ::Providers::Amazon::CloudManager::Provision < ManageIQ::Providers::CloudManager::Provision - include_concern 'Cloning' - include_concern 'StateMachine' - include_concern 'Configuration' + include Cloning + include StateMachine + include Configuration end diff --git a/app/models/manageiq/providers/amazon/cloud_manager/template.rb b/app/models/manageiq/providers/amazon/cloud_manager/template.rb index b02f22663..17af197db 100644 --- a/app/models/manageiq/providers/amazon/cloud_manager/template.rb +++ b/app/models/manageiq/providers/amazon/cloud_manager/template.rb @@ -1,5 +1,5 @@ class ManageIQ::Providers::Amazon::CloudManager::Template < ManageIQ::Providers::CloudManager::Template - include_concern 'ManageIQ::Providers::Amazon::CloudManager::VmOrTemplateShared' + include ManageIQ::Providers::Amazon::CloudManager::VmOrTemplateShared supports :provisioning do if ext_management_system diff --git a/app/models/manageiq/providers/amazon/cloud_manager/vm.rb b/app/models/manageiq/providers/amazon/cloud_manager/vm.rb index 388c96f4c..2458c4c26 100644 --- a/app/models/manageiq/providers/amazon/cloud_manager/vm.rb +++ b/app/models/manageiq/providers/amazon/cloud_manager/vm.rb @@ -1,6 +1,6 @@ class ManageIQ::Providers::Amazon::CloudManager::Vm < ManageIQ::Providers::CloudManager::Vm - include_concern 'Operations' - include_concern 'ManageIQ::Providers::Amazon::CloudManager::VmOrTemplateShared' + include Operations + include ManageIQ::Providers::Amazon::CloudManager::VmOrTemplateShared supports :capture diff --git a/app/models/manageiq/providers/amazon/cloud_manager/vm/operations.rb b/app/models/manageiq/providers/amazon/cloud_manager/vm/operations.rb index eb275bb24..f29a8ded4 100644 --- a/app/models/manageiq/providers/amazon/cloud_manager/vm/operations.rb +++ b/app/models/manageiq/providers/amazon/cloud_manager/vm/operations.rb @@ -1,8 +1,7 @@ module ManageIQ::Providers::Amazon::CloudManager::Vm::Operations extend ActiveSupport::Concern - - include_concern 'Guest' - include_concern 'Power' + include Guest + include Power included do supports :terminate do diff --git a/app/models/manageiq/providers/amazon/cloud_manager/vm_or_template_shared.rb b/app/models/manageiq/providers/amazon/cloud_manager/vm_or_template_shared.rb index 5e66ff3aa..bf119155a 100644 --- a/app/models/manageiq/providers/amazon/cloud_manager/vm_or_template_shared.rb +++ b/app/models/manageiq/providers/amazon/cloud_manager/vm_or_template_shared.rb @@ -1,4 +1,4 @@ module ManageIQ::Providers::Amazon::CloudManager::VmOrTemplateShared extend ActiveSupport::Concern - include_concern 'Scanning' + include Scanning end