Merge pull request #1266 from SUSE/sle-micro-rename

Check for Micro for 6.0 and 6.1

app/controllers/api/connect/v3/systems/products_controller.rb

@@ -16,7 +16,7 @@ def show
     if @product.identifier.casecmp?('sles')
       # if system has SLE Micro
       # it should access to SLES products
-      sle_micro = @system.products.any? { |p| p.identifier.downcase.include?('sle-micro') }
+      sle_micro = @system.products.any? { |p| p.identifier.downcase.include?('micro') }
       sle_micro_same_arch = @system.products.pluck(:arch).include?(@product.arch) if sle_micro
     end
     if @system.products.include?(@product) || sle_micro_same_arch

engines/strict_authentication/app/controllers/strict_authentication/authentication_controller.rb

@@ -40,7 +40,7 @@ def all_allowed_paths(headers)
       all_product_versions = @system.products.map { |p| Product.where(identifier: p.identifier, arch: p.arch) }.flatten
       allowed_paths = all_product_versions.map { |prod| prod.repositories.pluck(:local_path) }.flatten
       # Allow SLE Micro to access all free SLES repositories
-      sle_micro = @system.products.any? { |p| p.identifier.downcase.include?('sle-micro') }
+      sle_micro = @system.products.any? { |p| p.identifier.downcase.include?('micro') }
       if sle_micro
         system_products_archs = @system.products.pluck(:arch)
         product_free_sles_modules_only = Product.where(
@@ -59,7 +59,7 @@ def all_allowed_paths(headers)
       manager_prod = @system.products.any? do |p|
         manager = p.identifier.downcase.include?('manager-server')
         # SUMA 5.0 must have access to SUMA 4.3, 4.2 and so on
-        micro = p.identifier.downcase.include?('sle-micro')
+        micro = p.identifier.downcase.include?('micro')
         instance_id_header = headers.fetch('X-Instance-Identifier', '').casecmp('suse-manager-server').zero?
         instance_version_header = headers.fetch('X-Instance-Version', '0').split('.')[0] >= '5'
         manager || (micro && instance_id_header && instance_version_header)

package/obs/rmt-server.changes

@@ -1,3 +1,10 @@
+Mon Dec 23 14:07:00 UTC 2024 - Luís Caparroz <[email protected]>
+
+- Version 2.21
+  * Allow users to configure the SUMA product tree base URL to download
+    'product_tree.json' from host other than 'scc.suse.com'. (bsc#1234844)
+  * Update Micro check due to Micro 6.0 and 6.1 identifier to keep bsc#1230419 in place
+
 -------------------------------------------------------------------
 Mon Dec 23 08:03:56 UTC 2024 - Parag Jain <[email protected]>