Drop Log Collection Backend 2

Fryguy · Fryguy · commit 85e2f0893b8d · 2025-11-04T17:57:39.000-05:00
Follow up to ManageIQ#23647. This drops the FileDepot#miq_schedules linkage, and also drops FileDepotFtp and FileDepotFtpAnonymous, since the only user of FileDepot stuff, PxeServer, doesn't support Ftp. By extension this also drops the net-ftp gem.
diff --git a/Gemfile b/Gemfile
@@ -56,7 +56,6 @@ gem "manageiq-ssh-util",                "~>0.2.0",           :require => false
 gem "memoist",                          "~>0.16.0",          :require => false
 gem "money",                            "~>6.13.5",          :require => false
 gem "more_core_extensions"                                                     # min version should be set in manageiq-gems-pending, not here
-gem "net-ftp",                          "~>0.1.2",           :require => false
 gem "net-ldap",                         "~>0.16.1",          :require => false
 gem "net-ping",                         "~>1.7.4",           :require => false
 gem "openscap",                         "~>0.4.8",           :require => false
diff --git a/app/models/file_depot.rb b/app/models/file_depot.rb
@@ -4,8 +4,6 @@ class FileDepot < ApplicationRecord
   include ImportExport
   include YamlImportExportMixin
 
-  has_many :miq_schedules, :dependent => :nullify
-
   validates_presence_of :uri
 
   def self.supported_depots
diff --git a/app/models/file_depot_ftp.rb b/app/models/file_depot_ftp.rb
diff --git a/app/models/file_depot_ftp_anonymous.rb b/app/models/file_depot_ftp_anonymous.rb
diff --git a/app/models/miq_schedule.rb b/app/models/miq_schedule.rb
@@ -16,7 +16,6 @@ class MiqSchedule < ApplicationRecord
   virtual_column :v_zone_name,     :type => :string, :uses => :zone
   virtual_column :next_run_on,     :type => :datetime
 
-  belongs_to :file_depot
   belongs_to :miq_search
   belongs_to :resource, :polymorphic => true
   belongs_to :zone
@@ -302,26 +301,6 @@ def validate_run_at
     end
   end
 
-  def verify_file_depot(params)  # TODO: This logic belongs in the UI, not sure where
-    depot_class                = FileDepot.supported_protocols[params[:uri_prefix]]
-    depot                      = file_depot.class.name == depot_class ? file_depot : build_file_depot(:type => depot_class)
-    depot.name                 = params[:name]
-    uri                        = params[:uri]
-    api_port                   = params[:swift_api_port]
-    depot.aws_region           = params[:aws_region]
-    depot.openstack_region     = params[:openstack_region]
-    depot.keystone_api_version = params[:keystone_api_version]
-    depot.v3_domain_ident      = params[:v3_domain_ident]
-    depot.security_protocol    = params[:security_protocol]
-    depot.uri                  = api_port.blank? ? uri : depot.merged_uri(URI(uri), api_port)
-    if params[:save]
-      file_depot.save!
-      file_depot.update_authentication(:default => {:userid => params[:username], :password => params[:password]}) if (params[:username] || params[:password]) && depot.class.requires_credentials?
-    elsif depot.class.requires_credentials?
-      depot.verify_credentials(nil, params)
-    end
-  end
-
   def next_interval_time
     unless valid? || errors[:run_at].blank?
       _log.warn("Invalid schedule [#{id}] [#{name}]: #{Array.wrap(errors[:run_at]).join(", ")}")
diff --git a/app/models/miq_schedule/import_export.rb b/app/models/miq_schedule/import_export.rb
@@ -19,8 +19,6 @@ def handle_attributes(export_attributes)
 
     export_attributes['MiqSearchContent'] = MiqSearch.find_by(:id => export_attributes['miq_search_id']).export_to_array if export_attributes['miq_search_id']
 
-    export_attributes['FileDepotContent'] = FileDepot.find_by(:id => export_attributes['file_depot_id']).export_to_array if export_attributes['file_depot_id']
-
     if export_attributes['resource_id']
       schedule_resource = export_attributes["resource_type"].safe_constantize.find_by(:id => export_attributes['resource_id'])
       export_attributes['resource_name'] = schedule_resource&.name
@@ -71,7 +69,6 @@ def import_from_hash(miq_schedule, options = nil)
       filter_resource_name = miq_schedule.delete("filter_resource_name")
 
       miq_search = miq_schedule.delete("MiqSearchContent")
-      file_depot = miq_schedule.delete("FileDepotContent")
       resource_name = miq_schedule.delete("resource_name")
 
       was_new_record = new_or_existing_schedule.new_record?
@@ -95,27 +92,6 @@ def import_from_hash(miq_schedule, options = nil)
           schedule_attributes[:miq_search_id] = search.id
         end
 
-        if file_depot
-          authentication_content = file_depot[0].values[0].delete("AuthenticationsContent")
-          fd = FileDepot.where(file_depot[0].values[0]).first_or_create
-
-          authentication_content[0].each do |auth|
-            x = auth.values[0]
-            x['resource'] = fd
-
-            group_description = x.delete('miq_group_description')
-            miq_group = MiqGroup.find_by(:description => group_description) || User.find_by(:userid=>'admin').current_group
-            x['miq_group_id'] = miq_group.id
-
-            tenant_name = x.delete('tenant_name')
-            tenant = Tenant.find_by(:name => tenant_name) || Tenant.tenant_root
-            x['tenant_id'] = tenant.id
-
-            Authentication.where(x).first_or_create
-          end
-          new_or_existing_schedule.file_depot_id = fd.id
-        end
-
         if resource_name
           schedule_resource = miq_schedule["resource_type"].safe_constantize.find_by(:name => resource_name)
           schedule_attributes['resource_id'] = schedule_resource.id if schedule_resource
diff --git a/locale/en.yml b/locale/en.yml
@@ -1435,8 +1435,6 @@ en:
       EmsFolder:                      Folder
       ExtManagementSystem:            Provider
       ExtManagementSystemPerformance: Performance - Provider
-      FileDepotFtp:                   FTP
-      FileDepotFtpAnonymous:          Anonymous FTP
       FileDepotNfs:                   NFS
       FileDepotS3:                    AWS S3
       FileDepotSwift:                 OpenStack Swift
@@ -1568,7 +1566,7 @@ en:
       ManageIQ::Providers::Vmware::CloudManager:                                          Cloud Provider (VMware vCloud)
       ManageIQ::Providers::IbmCic::CloudManager:                                          Cloud Provider (IBM CIC)
       ManageIQ::Providers::IbmCloud::VPC::CloudManager:                                   Cloud Provider (IBM Cloud VPC)
-      ManageIQ::Providers::AzureStack::CloudManager:                                      Cloud Provider (Microsoft Azure Stack)                          
+      ManageIQ::Providers::AzureStack::CloudManager:                                      Cloud Provider (Microsoft Azure Stack)
       ManageIQ::Providers::IbmCloud::PowerVirtualServers::CloudManager:                   Cloud Provider (IBM Cloud Power Systems Virtual Servers)
       ManageIQ::Providers::IbmPowerVc::CloudManager:                                      Cloud Provider (IBM PowerVC)
       ManageIQ::Providers::OracleCloud::CloudManager:                                     Cloud Provider (Oracle Cloud)
diff --git a/spec/factories/file_depot.rb b/spec/factories/file_depot.rb
@@ -4,11 +4,7 @@
     uri  { "nfs://somehost/export" }
   end
 
-  factory(:file_depot_ftp, :class => "FileDepotFtp", :parent => :file_depot) { uri { "ftp://somehost/export" } }
   factory(:file_depot_swift, :class => "FileDepotSwift", :parent => :file_depot) { uri { "swift://swifthost/swiftbucket" } }
-  factory :file_depot_ftp_with_authentication, :parent => :file_depot_ftp do
-    after(:create) { |x| x.authentications << FactoryBot.create(:authentication) }
-  end
   factory :file_depot_swift_with_authentication, :parent => :file_depot_swift do
     after(:create) { |x| x.authentications << FactoryBot.create(:authentication) }
   end
diff --git a/spec/lib/task_helpers/imports/data/widgets/Test_Widget.yaml b/spec/lib/task_helpers/imports/data/widgets/Test_Widget.yaml
@@ -124,5 +124,4 @@
       userid: system
       prod_default: system
       adhoc:
-      file_depot_id:
       resource_id:
diff --git a/spec/lib/task_helpers/imports/data/widgets/Test_Widget_Import.yaml b/spec/lib/task_helpers/imports/data/widgets/Test_Widget_Import.yaml
@@ -123,5 +123,4 @@
       userid: system
       prod_default: system
       adhoc:
-      file_depot_id:
       resource_id:
diff --git a/spec/lib/task_helpers/imports/data/widgets/Test_Widget_attr_error.yml b/spec/lib/task_helpers/imports/data/widgets/Test_Widget_attr_error.yml
@@ -124,5 +124,4 @@
       userid: system
       prod_default: system
       adhoc:
-      file_depot_id:
       resource_id:
diff --git a/spec/lib/task_helpers/imports/data/widgets/Test_Widget_runtime_error.yml b/spec/lib/task_helpers/imports/data/widgets/Test_Widget_runtime_error.yml
@@ -124,5 +124,4 @@
       userid: system
       prod_default: system
       adhoc:
-      file_depot_id:
       resource_id:
diff --git a/spec/lib/task_helpers/imports/data/widgets/Test_Widget_update.yml b/spec/lib/task_helpers/imports/data/widgets/Test_Widget_update.yml
@@ -111,5 +111,4 @@
       userid: system
       prod_default: system
       adhoc:
-      file_depot_id:
       resource_id:
diff --git a/spec/models/dictionary_spec.rb b/spec/models/dictionary_spec.rb
@@ -16,7 +16,7 @@
       it("and a nested key")      { expect(described_class.gettext("availability_zone.total_vms")).to eq("Total Instances") }
     end
 
-    it("with :type option") { expect(described_class.gettext("FileDepotFtp", :type => "model")).to eq("FTP") }
+    it("with :type option") { expect(described_class.gettext("FileDepotNfs", :type => "model")).to eq("NFS") }
 
     context "with :notfound option" do
       it("and plain text")  { expect(described_class.gettext("abc",     :notfound => :titleize)).to eq("Abc") }
diff --git a/spec/models/file_depot_ftp_anonymous_spec.rb b/spec/models/file_depot_ftp_anonymous_spec.rb
diff --git a/spec/models/file_depot_ftp_spec.rb b/spec/models/file_depot_ftp_spec.rb
diff --git a/spec/models/miq_widget/import_export_spec.rb b/spec/models/miq_widget/import_export_spec.rb
@@ -171,7 +171,6 @@
               userid: system
               prod_default: system
               adhoc:
-              file_depot_id:
               resource_id:
       YAML
 
@@ -203,7 +202,6 @@
         :userid        => "system",
         :prod_default  => "system",
         :adhoc         => nil,
-        :file_depot_id => nil,
         :resource_id   => nil
       )
 
