Merge pull request #9711 from Fryguy/drop_log_collection2

Drop Log Collection validation

Author: jrafanie

app/controllers/application_controller.rb

@@ -425,55 +425,6 @@ def report_only
     render 'shared/show_report', :layout => 'report_only'
   end
 
-  # moved this method here so it can be accessed from pxe_server controller as well
-  # this is a terrible name, it doesn't validate log_depots
-  # TODO: I think we can move this back to the pxe_server_controller and eliminate all non-pxe code paths
-  def log_depot_validate
-    @schedule = nil # setting to nil, since we are using same view for both db_back and log_depot edit
-    # if zone is selected in tree replace tab#3
-    pfx = if x_active_tree == :diagnostics_tree
-            if @sb[:active_tab] == "diagnostics_database"
-              # coming from diagnostics/database tab
-              "dbbackup"
-            end
-          elsif session[:edit]&.key?(:pxe_id)
-            # add/edit pxe server
-            "pxe"
-          else
-            # add/edit dbbackup schedule
-            "schedule"
-          end
-
-    id = params[:id] || "new"
-    if pfx == "pxe"
-      return unless load_edit("#{pfx}_edit__#{id}")
-
-      settings = {:username => @edit[:new][:log_userid], :password => @edit[:new][:log_password]}
-      settings[:uri] = @edit[:new][:uri_prefix] + "://" + @edit[:new][:uri]
-    else
-      settings = {:username => params[:log_userid], :password => params[:log_password]}
-      settings[:uri] = "#{params[:uri_prefix]}://#{params[:uri]}"
-      settings[:uri_prefix] = params[:uri_prefix]
-    end
-
-    begin
-      if pfx == "pxe"
-        msg = _('PXE Credentials successfully validated')
-        PxeServer.verify_depot_settings(settings)
-      else
-        msg = _('Depot Settings successfully validated')
-        MiqSchedule.new.verify_file_depot(settings)
-      end
-    rescue StandardError => bang
-      add_flash(_("Error during 'Validate': %{error_message}") % {:error_message => bang.message}, :error)
-    else
-      add_flash(msg)
-    end
-
-    @changed = (@edit[:new] != @edit[:current]) if pfx == "pxe"
-    javascript_flash
-  end
-
   # to reload currently displayed summary screen in explorer
   def reload
     @_params[:id] = x_node

app/controllers/ops_controller/settings/schedules.rb

@@ -119,18 +119,6 @@ def schedule_edit
       # This is only because ops_controller tries to set form locals, otherwise we should not use the @edit variable
       @edit = {:sched_id => @schedule.id}
 
-      depot                 = @schedule.file_depot
-      full_uri, _query      = depot.try(:uri)&.split('?')
-      @uri_prefix, @uri     = full_uri.to_s.split('://')
-      @log_userid           = depot.try(:authentication_userid)
-      @log_password         = depot.try(:authentication_password)
-      @log_aws_region       = depot.try(:aws_region)
-      @openstack_region     = depot.try(:openstack_region)
-      @keystone_api_version = depot.try(:keystone_api_version)
-      @v3_domain_ident      = depot.try(:v3_domain_ident)
-      @swift_api_port       = full_uri.blank? ? nil : URI(full_uri).port
-      @security_protocol    = depot.try(:security_protocol)
-
       # This is a hack to trick the controller into thinking we loaded an edit variable
       session[:edit] = {:key => "schedule_edit__#{@schedule.id || 'new'}"}
 
@@ -267,29 +255,6 @@ def schedule_disable
     schedule_toggle(false)
   end
 
-  # TODO: I think we can drop this now that log collection is dropped, however, PXE needs FileDepot validation, and
-  # I'm not sure if this method is also used by PXE validation. Note that application_controller has a log_depot_validate
-  # as well, which might be the one used for PXE. By extension, build_uri_settings can probably also be dropped.
-  def log_depot_validate
-    assert_privileges("schedule_admin")
-
-    if params[:log_password]
-      file_depot = FileDepot.new
-    else
-      id = params[:id] || params[:backup_schedule_type]
-      file_depot = MiqSchedule.find(id).file_depot
-    end
-    uri_settings = build_uri_settings(file_depot)
-    begin
-      MiqSchedule.new.verify_file_depot(uri_settings)
-    rescue => bang
-      add_flash(_("Error during 'Validate': %{message}") % {:message => bang.message}, :error)
-    else
-      add_flash(_('Depot Settings successfuly validated'))
-    end
-    javascript_flash
-  end
-
   private
 
   def schedule_check_compliance?(schedule)
@@ -726,18 +691,6 @@ def build_schedule_options_for_select
     ]
   end
 
-  def retrieve_aws_regions
-    ManageIQ::Providers::Amazon::Regions.regions.flat_map { |region| [region[1].values_at(:description, :name)] }
-  end
-
-  def retrieve_openstack_api_versions
-    [['Keystone v2', 'v2'], ['Keystone v3', 'v3']]
-  end
-
-  def retrieve_security_protocols
-    [[_('SSL without validation'), 'ssl'], [_('SSL'), 'ssl-with-validation'], [_('Non-SSL'), 'non-ssl']]
-  end
-
   def schedule_set_basic_record_vars(schedule)
     schedule.name = params[:name]
     schedule.description = params[:description]
@@ -762,27 +715,4 @@ def schedule_set_interval_record_vars(schedule)
     schedule.run_at[:interval][:unit] = params[:timer_typ].downcase
     schedule.run_at[:interval][:value] = params[:timer_value]
   end
-
-  def build_uri_settings(file_depot)
-    uri_settings = {}
-    type = FileDepot.supported_protocols[params[:uri_prefix]]
-    raise _("Invalid or unsupported file depot type.") if type.nil?
-
-    protocols = FileDepot.supported_depots.map { |k, _v| [k, k.constantize] }.to_h
-    if protocols[type].try(:requires_credentials?)
-      log_password = params[:log_password] || file_depot.try(:authentication_password)
-      uri_settings = {:username => params[:log_userid], :password => log_password}
-    end
-    uri_settings[:uri]                  = "#{params[:uri_prefix]}://#{params[:uri]}"
-    uri_settings[:uri_prefix]           = params[:uri_prefix]
-    uri_settings[:log_protocol]         = params[:log_protocol]
-    uri_settings[:aws_region]           = params[:log_aws_region]
-    uri_settings[:openstack_region]     = params[:openstack_region]
-    uri_settings[:keystone_api_version] = params[:keystone_api_version]
-    uri_settings[:v3_domain_ident]      = params[:v3_domain_ident]
-    uri_settings[:security_protocol]    = params[:security_protocol]
-    uri_settings[:swift_api_port]       = params[:swift_api_port]
-    uri_settings[:type] = type
-    uri_settings
-  end
 end

app/controllers/pxe_controller/pxe_servers.rb

@@ -183,7 +183,7 @@ def pxe_server_async_cred_validation
       render :json => {:status => 'error', :message => _("Error during 'Validate': %{error_message}") % {:error_message => bang.message}}
     end
 
-    render :json => {:status => 'success', :message => _('PXE Credentials successfuly validated')}
+    render :json => {:status => 'success', :message => _('PXE Credentials successfully validated')}
   end
 
   private #######################

config/routes.rb

@@ -2666,7 +2666,6 @@
         explorer
         iso_datastore_list
         iso_image_edit
-        log_depot_validate
         pxe_image_edit
         pxe_image_type_edit
         pxe_image_type_list

spec/config/routes.pending.yml

@@ -1040,7 +1040,6 @@ PlacementGroupController:
 - sections_field_changed
 PxeController:
 - accordion_select
-- log_depot_validate
 - pxe_server_async_cred_validation
 - reload
 - report_data

spec/controllers/ops_controller/settings/schedules_spec.rb

@@ -82,35 +82,6 @@
     end
   end
 
-  context "#build_uri_settings" do
-    let(:mocked_filedepot) { double(FileDepotSmb) }
-    it "uses params[:log_password] for validation if one exists" do
-      controller.params = {:log_userid   => "userid",
-                           :log_password => "password2",
-                           :uri_prefix   => "smb",
-                           :uri          => "samba_uri",
-                           :log_protocol => "Samba"}
-      settings = {:username   => "userid",
-                  :password   => "password2",
-                  :uri        => "smb://samba_uri",
-                  :uri_prefix => "smb"}
-      expect(controller.send(:build_uri_settings, mocked_filedepot)).to include(settings)
-    end
-
-    it "uses the stored password for validation if params[:log_password] does not exist" do
-      controller.params = {:log_userid   => "userid",
-                           :uri_prefix   => "smb",
-                           :uri          => "samba_uri",
-                           :log_protocol => "Samba"}
-      expect(mocked_filedepot).to receive(:try).with(:authentication_password).and_return('password')
-      settings = {:username   => "userid",
-                  :password   => "password",
-                  :uri        => "smb://samba_uri",
-                  :uri_prefix => "smb"}
-      expect(controller.send(:build_uri_settings, mocked_filedepot)).to include(settings)
-    end
-  end
-
   context "#schedule_set_record_vars" do
     let(:user) { stub_user(:features => :all) }
     let(:schedule) { FactoryBot.create(:miq_automate_schedule) }

spec/routing/pxe_routing_spec.rb

@@ -27,12 +27,6 @@
     end
   end
 
-  describe "#log_depot_validate" do
-    it "routes with POST" do
-      expect(post("/pxe/log_depot_validate")).to route_to("pxe#log_depot_validate")
-    end
-  end
-
   describe "#pxe_image_edit" do
     it "routes with POST" do
       expect(post("/pxe/pxe_image_edit")).to route_to("pxe#pxe_image_edit")