Merge branch 'master' into revert-1214-revert-1210-change_local_path_…

…type
SUSE · Sep 20, 2024 · 42d2fda · 42d2fda
2 parents bfc5a92 + 085f907
commit 42d2fda
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/app/serializers/v3/product_serializer.rb b/app/serializers/v3/product_serializer.rb
@@ -33,8 +33,11 @@ def eula_url
   end
 
   def free
-    # Everything is free on RMT :-)
+    # Everything is free on RMT :-) outside of the Public Cloud (i.e. LTSS)
     # Otherwise Yast and SUSEConnect will request a regcode when activating an extension
+    # FIXME
+    return object.free if defined?(SccProxy::Engine) && object.extension?
+
     true
   end
 

diff --git a/...es/instance_verification/spec/requests/api/connect/v3/systems/products_controller_spec.rb b/...es/instance_verification/spec/requests/api/connect/v3/systems/products_controller_spec.rb
@@ -540,6 +540,7 @@
           context 'when no regcode is provided' do
             it 'activates the product' do
               data = JSON.parse(response.body)
+              expect(data['product']['free']).to eq(false)
               expect(data['id']).to eq(product.id)
             end
           end

diff --git a/engines/registry/app/models/access_scope.rb b/engines/registry/app/models/access_scope.rb
@@ -87,7 +87,7 @@ def allowed_paths(system = nil)
     allowed_product_classes = (active_product_classes & access_policies_yml.keys)
     if system && system.hybrid?
       # if the system is hybrid => check if the non free product subscription is still valid for accessing images
-      allowed_non_free_product_classes = allowed_product_classes.map { |s| s unless Product.find_by(product_class: s).free? }
+      allowed_non_free_product_classes = allowed_product_classes.map { |s| s unless Product.find_by(product_class: s, product_type: 'extension').free? }.compact
       unless allowed_non_free_product_classes.empty?
         auth_header = {
           'HTTP_AUTHORIZATION' => ActionController::HttpAuthentication::Basic.encode_credentials(system.login, system.password)

diff --git a/engines/registry/spec/app/models/access_scope_spec.rb b/engines/registry/spec/app/models/access_scope_spec.rb
@@ -194,7 +194,7 @@
           system
         end
         let(:product1) do
-          product = FactoryBot.create(:product, :with_mirrored_repositories)
+          product = FactoryBot.create(:product, :with_mirrored_repositories, :extension)
           product.repositories.where(enabled: false).update(mirroring_enabled: false)
           product.update(product_class: 'SLES15-SP4-LTSS-X86')
           product

diff --git a/engines/scc_proxy/lib/scc_proxy/engine.rb b/engines/scc_proxy/lib/scc_proxy/engine.rb
@@ -312,6 +312,7 @@ def announce_system
               password: response['password'],
               hostname: params[:hostname],
               proxy_byos_mode: :byos,
+              proxy_byos: true,
               system_information: system_information,
               instance_data: instance_data
             )