Fixes #37642 - Drop compatibility with smart_proxy_openscap < 0.6.1

app/controllers/api/v2/compliance/tailoring_files_controller.rb

@@ -6,7 +6,6 @@ class TailoringFilesController < ::Api::V2::BaseController
       include ForemanOpenscap::Api::V2::ScapApiControllerExtensions
 
       before_action :find_resource, :except => %w[index create]
-      before_action :openscap_proxy_check, :only => %w[create]
 
       api :GET, '/compliance/tailoring_files', N_('List Tailoring files')
       param_group :search_and_pagination, ::Api::V2::BaseController
@@ -77,13 +76,6 @@ def action_permission
           super
         end
       end
-
-      def openscap_proxy_check
-        unless ForemanOpenscap::TailoringFile.any?
-          check = ForemanOpenscap::OpenscapProxyVersionCheck.new.run
-          render_error :custom_error, :status => :unprocessable_entity, :locals => { :message => check.message } unless check.pass?
-        end
-      end
     end
   end
 end

app/models/concerns/foreman_openscap/host_extensions.rb

@@ -102,9 +102,7 @@ def policies_enc
     end
 
     def policies_enc_raw
-      check = ForemanOpenscap::OpenscapProxyAssignedVersionCheck.new(self).run
-      method = check.pass? ? :to_enc : :to_enc_legacy
-      combined_policies.map(&method)
+      combined_policies.map(&:to_enc)
     end
 
     def combined_policies

app/models/foreman_openscap/policy.rb

@@ -196,10 +196,6 @@ def to_enc
       }.merge(period_enc)
     end
 
-    def to_enc_legacy
-      to_enc.tap { |hash| hash['download_path'] = "/compliance/policies/#{self.id}/content" }
-    end
-
     def should_validate?(step_name)
       if new_record? && wizard_initiated?
         step_index > step_to_i(step_name)

app/views/tailoring_files/welcome.html.erb

@@ -8,14 +8,7 @@
     <%= (_('In Foreman, tailoring_files represent the custom modifications to default XCCDF profiles and they can be applied to hosts
     via %s') % link_to('compliance policies', policies_path)).html_safe %>
   </p>
-  <% proxy_check = run_tailoring_proxy_check %>
   <div class="blank-slate-pf-main-action">
-    <%= new_link(_('New Tailoring File'), {}, { :class => "btn-lg", :disabled => !proxy_check.pass? }) %>
+    <%= new_link(_('New Tailoring File'), {}, { :class => "btn-lg" }) %>
   </div>
-
-  <p>
-  <% unless proxy_check.pass? %>
-    <%= alert :class => 'alert-warning', :header => '', :text => proxy_check.message.html_safe %>
-  <% end %>
-  </p>
 </div>

test/functional/api/v2/compliance/tailoring_files_controller_test.rb

@@ -24,8 +24,6 @@ class Api::V2::Compliance::TailoringFilesControllerTest < ActionController::Test
   test "should create tailoring_file" do
     tf = FactoryBot.build(:tailoring_file)
     tf_params = { :name => tf.name, :original_filename => tf.original_filename, :scap_file => tf.scap_file }
-    ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:openscap_proxy_versions)
-                                              .returns({})
     post :create, :params => tf_params, :session => set_session_user
     assert_response :success
   end
@@ -50,13 +48,4 @@ class Api::V2::Compliance::TailoringFilesControllerTest < ActionController::Test
     assert_response :ok
     refute ForemanOpenscap::ScapContent.exists?(tailoring_file.id)
   end
-
-  test "should not create tailoring file when there is outdated proxy version" do
-    tf = FactoryBot.build(:tailoring_file)
-    tf_params = { :name => tf.name, :original_filename => tf.original_filename, :scap_file => tf.scap_file }
-    ForemanOpenscap::OpenscapProxyVersionCheck.any_instance.stubs(:openscap_proxy_versions)
-                                              .returns('test-proxy' => '0.5.4')
-    post :create, :params => tf_params, :session => set_session_user
-    assert_response :unprocessable_entity
-  end
 end

test/unit/concerns/host_extensions_test.rb

@@ -9,16 +9,7 @@ class HostExtensionsTest < ActiveSupport::TestCase
     @host = FactoryBot.create(:compliance_host, :policies => [@policy])
   end
 
-  test "should have download_path in enc without digest" do
-    ForemanOpenscap::OpenscapProxyAssignedVersionCheck.any_instance.stubs(:openscap_proxy_versions)
-                                                      .returns('test-proxy' => '0.5.4')
-    enc_out = JSON.parse @host.policies_enc
-    assert_equal 5, enc_out.first['download_path'].split('/').length
-  end
-
   test "should have download_path in enc with digest" do
-    ForemanOpenscap::OpenscapProxyAssignedVersionCheck.any_instance.stubs(:openscap_proxy_versions)
-                                                      .returns({})
     enc_out = JSON.parse @host.policies_enc
     assert_equal 6, enc_out.first['download_path'].split('/').length
   end