Fixes #35961 - Simple Content Access API shouldn't check upstream con…

…nection (#10422)

app/controllers/katello/api/v2/simple_content_access_controller.rb

@@ -1,7 +1,6 @@
 module Katello
   class Api::V2::SimpleContentAccessController < Api::V2::ApiController
     before_action :find_organization
-    before_action :check_upstream_connection
 
     resource_description do
       description "Red Hat subscriptions management platform."
@@ -11,7 +10,8 @@ class Api::V2::SimpleContentAccessController < Api::V2::ApiController
     api :GET, "/organizations/:organization_id/simple_content_access/eligible",
       N_("Check if the specified organization is eligible for Simple Content Access")
     def eligible
-      eligible = @organization.upstream_consumer.simple_content_access_eligible?
+      ::Foreman::Deprecation.api_deprecation_warning("This endpoint is deprecated and will be removed in a future release. All organizations are now eligible for Simple Content Access.")
+      eligible = @organization.simple_content_access_eligible?
       render json: { simple_content_access_eligible: eligible }
     end
 

app/models/katello/concerns/organization_extensions.rb

@@ -90,6 +90,10 @@ def anonymous_provider
           self.providers.anonymous.first
         end
 
+        def simple_content_access_eligible?
+          self.content_access_mode_list.include?('org_environment')
+        end
+
         def manifest_imported?(cached: false)
           Rails.cache.fetch("#{self.label}_manifest_imported?", expires_in: 1.minute, force: !cached) do
             owner_details['upstreamConsumer'].present?
@@ -238,10 +242,6 @@ def audit_manifest_action(message)
           # doesn't provide much benefit for the frustration it creates.
           self.save(validate: false)
         end
-
-        def upstream_consumer
-          Katello::Candlepin::UpstreamConsumer.new(self)
-        end
       end
     end
   end

app/models/katello/glue/candlepin/owner.rb

@@ -45,6 +45,10 @@ def content_access_mode
         self.owner_details['contentAccessMode']
       end
 
+      def content_access_mode_list
+        self.owner_details['contentAccessModeList'].split(',')
+      end
+
       def simple_content_access?(cached: true)
         Rails.cache.fetch("#{self.label}_simple_content_access?", expires_in: 1.minute, force: !cached) do
           content_access_mode == "org_environment"

test/controllers/api/v2/simple_content_access_controller_test.rb

@@ -18,7 +18,6 @@ def setup
       setup_controller_defaults_api
       login_user(User.find(users(:admin).id))
       models
-      Katello::UpstreamConnectionChecker.any_instance.expects(:assert_connection)
     end
 
     def test_enable_protected
@@ -104,7 +103,7 @@ def test_status_protected
     end
 
     def test_eligible
-      Katello::Candlepin::UpstreamConsumer.any_instance.expects(:simple_content_access_eligible?).returns(true)
+      Organization.any_instance.expects(:simple_content_access_eligible?).returns(true)
 
       get :eligible, params: { organization_id: @organization.id }
 

test/models/concerns/organization_extensions_test.rb

@@ -31,9 +31,5 @@ def test_manifest_history
       @org.expects(:imports).returns([{'foo' => 'bar' }, {'foo' => 'bar'}])
       assert_equal 'bar', @org.manifest_history[0].foo
     end
-
-    def test_upstream_consumer
-      assert @org.upstream_consumer
-    end
   end
 end