D-Bus API for registration

service/etc/agama.yaml

@@ -46,6 +46,7 @@ ALP-Dolomite:
         archs: ppc64
     optional_packages: null
     base_product: ALP-Dolomite
+    version: "1.0"
 
   security:
     tpm_luks_open: true

service/lib/agama/config.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2022] SUSE LLC
+# Copyright (c) [2022-2023] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -92,10 +92,7 @@ def products
 
       # cannot use `data` here to avoid endless loop as in data we use
       # pick_product that select product from products
-      @products = @pure_data["products"].select do |_key, value|
-        value["archs"].nil? ||
-          Yast2::ArchFilter.from_string(value["archs"]).match?
-      end
+      @products = @pure_data["products"].select { |_k, v| arch_match?(v["archs"]) }
     end
 
     # Whether there are more than one product
@@ -120,6 +117,20 @@ def merge(config)
       Config.new(simple_merge(data, config.data))
     end
 
+    def arch_elements_from(*keys, property: nil)
+      keys.map!(&:to_s)
+      elements = pure_data.dig(*keys)
+      return [] unless elements
+
+      elements.map do |element|
+        if !element.is_a?(Hash)
+          element
+        elsif arch_match?(element["archs"])
+          property ? element[property.to_s] : element
+        end
+      end.compact
+    end
+
   private
 
     # Simple deep merge
@@ -138,5 +149,11 @@ def simple_merge(a_hash, another_hash)
         end
       end
     end
+
+    def arch_match?(archs)
+      return true if archs.nil?
+
+      Yast2::ArchFilter.from_string(archs).match?
+    end
   end
 end

service/lib/agama/dbus/clients/software.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2022] SUSE LLC
+# Copyright (c) [2022-2023] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -20,18 +20,18 @@
 # find current contact information at www.suse.com.
 
 require "agama/dbus/clients/base"
-require "agama/dbus/clients/with_service_status"
+require "agama/dbus/clients/with_issues"
 require "agama/dbus/clients/with_progress"
-require "agama/dbus/clients/with_validation"
+require "agama/dbus/clients/with_service_status"
 
 module Agama
   module DBus
     module Clients
       # D-Bus client for software configuration
       class Software < Base
-        include WithServiceStatus
+        include WithIssues
         include WithProgress
-        include WithValidation
+        include WithServiceStatus
 
         TYPES = [:package, :pattern].freeze
         private_constant :TYPES
@@ -55,7 +55,7 @@ def service_name
         #
         # @return [Array<Array<String, String>>] name and display name of each product
         def available_products
-          dbus_object["org.opensuse.Agama.Software1"]["AvailableBaseProducts"].map do |l|
+          dbus_object["org.opensuse.Agama.Software1"]["AvailableProducts"].map do |l|
             l[0..1]
           end
         end
@@ -64,7 +64,7 @@ def available_products
         #
         # @return [String, nil] name of the product
         def selected_product
-          product = dbus_object["org.opensuse.Agama.Software1"]["SelectedBaseProduct"]
+          product = dbus_object["org.opensuse.Agama.Software1"]["SelectedProduct"]
           return nil if product.empty?
 
           product
@@ -170,8 +170,8 @@ def remove_resolvables(unique_id, type, resolvables, optional: false)
         # @param block [Proc] Callback to run when a product is selected
         def on_product_selected(&block)
           on_properties_change(dbus_object) do |_, changes, _|
-            base_product = changes["SelectedBaseProduct"]
-            block.call(base_product) unless base_product.nil?
+            product = changes["SelectedProduct"]
+            block.call(product) unless product.nil?
           end
         end