Merge pull request #23 from jrafanie/drop_require_nested_include_concern

Drop require_nested
ManageIQ · Feb 6, 2024 · facdc2e · facdc2e
2 parents 155894b + 8f72403
commit facdc2e
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 42 deletions.
diff --git a/app/models/manageiq/providers/awx/automation_manager.rb b/app/models/manageiq/providers/awx/automation_manager.rb
@@ -27,33 +27,6 @@ class << self
 
   after_save :change_maintenance_for_provider, :if => proc { |ems| ems.saved_change_to_enabled? }
 
-  require_nested :Credential
-  require_nested :AmazonCredential
-  require_nested :AzureCredential
-  require_nested :CloudCredential
-  require_nested :GoogleCredential
-  require_nested :MachineCredential
-  require_nested :VaultCredential
-  require_nested :NetworkCredential
-  require_nested :OpenstackCredential
-  require_nested :ScmCredential
-  require_nested :Satellite6Credential
-  require_nested :VmwareCredential
-  require_nested :RhvCredential
-
-  require_nested :ConfigurationScript
-  require_nested :ConfigurationScriptSource
-  require_nested :ConfigurationWorkflow
-  require_nested :ConfiguredSystem
-  require_nested :EventCatcher
-  require_nested :EventParser
-  require_nested :Inventory
-  require_nested :Job
-  require_nested :Playbook
-  require_nested :Refresher
-  require_nested :RefreshWorker
-  require_nested :WorkflowJob
-
   supports :catalog
   supports :create
 

diff --git a/app/models/manageiq/providers/awx/automation_manager/event_catcher.rb b/app/models/manageiq/providers/awx/automation_manager/event_catcher.rb
@@ -1,3 +1,2 @@
 class ManageIQ::Providers::Awx::AutomationManager::EventCatcher < ManageIQ::Providers::BaseManager::EventCatcher
-  require_nested :Runner
 end
diff --git a/app/models/manageiq/providers/awx/automation_manager/job.rb b/app/models/manageiq/providers/awx/automation_manager/job.rb
@@ -1,7 +1,6 @@
 require 'ansible_tower_client'
 class ManageIQ::Providers::Awx::AutomationManager::Job <
   ManageIQ::Providers::ExternalAutomationManager::OrchestrationStack
-  require_nested :Status
 
   belongs_to :ext_management_system, :foreign_key => :ems_id, :class_name => "ManageIQ::Providers::AutomationManager"
   belongs_to :job_template, :foreign_key => :configuration_script_id, :class_name => "ConfigurationScript"

diff --git a/app/models/manageiq/providers/awx/automation_manager/refresh_worker.rb b/app/models/manageiq/providers/awx/automation_manager/refresh_worker.rb
@@ -1,6 +1,4 @@
 class ManageIQ::Providers::Awx::AutomationManager::RefreshWorker < MiqEmsRefreshWorker
-  require_nested :Runner
-
   def self.settings_name
     :ems_refresh_worker_awx_automation
   end

diff --git a/app/models/manageiq/providers/awx/automation_manager/workflow_job.rb b/app/models/manageiq/providers/awx/automation_manager/workflow_job.rb
@@ -1,8 +1,6 @@
 class ManageIQ::Providers::Awx::AutomationManager::WorkflowJob <
   ManageIQ::Providers::ExternalAutomationManager::OrchestrationStack
 
-  require_nested :Status
-
   belongs_to :ext_management_system, :foreign_key => :ems_id, :class_name => "ManageIQ::Providers::AutomationManager"
   belongs_to :workflow_template, :foreign_key => :orchestration_template_id, :class_name => "ManageIQ::Providers::Awx::AutomationManager::ConfigurationWorkflow"
 

diff --git a/app/models/manageiq/providers/awx/inventory.rb b/app/models/manageiq/providers/awx/inventory.rb
@@ -1,8 +1,4 @@
 class ManageIQ::Providers::Awx::Inventory < ManageIQ::Providers::Inventory
-  require_nested :Collector
-  require_nested :Parser
-  require_nested :Persister
-
   def self.default_manager_name
     "AutomationManager"
   end

diff --git a/app/models/manageiq/providers/awx/inventory/collector.rb b/app/models/manageiq/providers/awx/inventory/collector.rb
@@ -1,4 +1,2 @@
 class ManageIQ::Providers::Awx::Inventory::Collector < ManageIQ::Providers::Inventory::Collector
-  require_nested :AutomationManager
-  require_nested :TargetCollection
 end
diff --git a/app/models/manageiq/providers/awx/inventory/parser.rb b/app/models/manageiq/providers/awx/inventory/parser.rb
@@ -1,3 +1,2 @@
 class ManageIQ::Providers::Awx::Inventory::Parser < ManageIQ::Providers::Inventory::Parser
-  require_nested :AutomationManager
 end
diff --git a/app/models/manageiq/providers/awx/inventory/persister.rb b/app/models/manageiq/providers/awx/inventory/persister.rb
@@ -1,4 +1,2 @@
 class ManageIQ::Providers::Awx::Inventory::Persister < ManageIQ::Providers::Inventory::Persister
-  require_nested :AutomationManager
-  require_nested :TargetCollection
 end