Misc kits logic update

lib/engines/hckinstall/hckinstall.rb

@@ -13,7 +13,7 @@ class HCKInstall
     PLATFORMS_JSON_DIR = 'lib/engines/hcktest/platforms'
     CONFIG_JSON = 'lib/engines/hckinstall/hckinstall.json'
     ISO_JSON = 'lib/engines/hckinstall/iso.json'
-    KIT_JSON = 'lib/engines/hckinstall/kit.json'
+    KIT_JSON_DIR = 'lib/engines/hckinstall/kits'
     FW_JSON = 'lib/setupmanagers/qemuhck/fw.json'
     DRIVERS_JSON_DIR = 'lib/engines/hcktest/drivers'
     ENGINE_MODE = 'install'
@@ -50,12 +50,12 @@ def read_iso(platform_name)
       res || raise(InvalidConfigFile, "ISO info for #{platform_name} does not exist")
     end
 
+    sig { params(kit_name: String).returns(Models::Kit) }
     def read_kit(kit_name)
-      kit_list = Json.read_json(KIT_JSON, @logger)
+      kit_json = "#{KIT_JSON_DIR}/#{kit_name}.json"
+
       @logger.info("Loading kit by name: #{kit_name}")
-      res = kit_list[kit_name]
-      @logger.fatal("Kit info with name #{kit_name} does not exist") unless res
-      res || raise(InvalidConfigFile, "Kit info with name #{kit_name} does not exist")
+      Models::Kit.from_json_file(kit_json, @logger)
     end
 
     def init_config
@@ -68,7 +68,7 @@ def init_config
     end
 
     def studio_platform(kit)
-      res = @kit_info['studio_platform']
+      res = @kit_info.studio_platform
       @logger.info("Loading studio platform for kit: #{kit}")
       @logger.fatal("Kit studio platform for kit #{kit} does not exist") unless res
       res || raise(InvalidConfigFile, "Kit studio platform for kit #{kit} does not exist")
@@ -93,13 +93,11 @@ def init_class_variables
     end
 
     def prepare_extra_sw
-      [@kit_info, @project.engine_platform].each do |source|
-        next if source['extra_software'].nil?
+      extra_software = [*@kit_info.extra_software, *@project.engine_platform['extra_software']]
 
-        @project.extra_sw_manager.prepare_software_packages(
-          source['extra_software'], @project.engine_platform['kit'], ENGINE_MODE
-        )
-      end
+      @project.extra_sw_manager.prepare_software_packages(
+        extra_software, @project.engine_platform['kit'], ENGINE_MODE
+      )
 
       @project.extra_sw_manager.copy_to_setup_scripts(@hck_setup_scripts_path)
     end
@@ -255,11 +253,11 @@ def prepare_setup_scripts_config
       @kit_path = find_kit(kit_type, kit_version)
 
       if @kit_path.nil?
-        if @kit_info['download_url'].nil?
+        if @kit_info.download_url.nil?
           raise(EngineError, 'HLK installer download URL is not provided and installer is not found')
         end
 
-        @kit_path = download_kit_installer(@kit_info['download_url'],
+        @kit_path = download_kit_installer(@kit_info.download_url,
                                            "#{kit_type}#{kit_version}", @hck_setup_scripts_path)
       else
         @logger.info("HLK installer #{kit_type}#{kit_version} already exists")

lib/engines/hckinstall/kits/HCK.json

@@ -0,0 +1,4 @@
+{
+  "studio_platform": "Win2012R2x64",
+  "name": "HCK"
+}

lib/engines/hckinstall/kits/HLK11_22H2.json

@@ -0,0 +1,8 @@
+{
+  "download_url": "https://go.microsoft.com/fwlink/?linkid=2250318",
+  "extra_software": [
+    "winfsp"
+  ],
+  "studio_platform": "Win2022x64",
+  "name": "HLK11_22H2"
+}

lib/engines/hckinstall/kits/HLK11_23H2.json

@@ -0,0 +1,8 @@
+{
+  "download_url": "https://go.microsoft.com/fwlink/?linkid=2250318",
+  "extra_software": [
+    "winfsp"
+  ],
+  "studio_platform": "Win2022x64",
+  "name": "HLK11_23H2"
+}

lib/engines/hckinstall/kits/HLK11_24H2.json

@@ -0,0 +1,8 @@
+{
+  "download_url": "https://go.microsoft.com/fwlink/?linkid=2289283",
+  "extra_software": [
+    "winfsp"
+  ],
+  "studio_platform": "Win2022x64",
+  "name": "HLK11_24H2"
+}

lib/engines/hckinstall/kits/HLK11_next.json

@@ -0,0 +1,8 @@
+{
+  "extra_software": [
+    "Disable_SNV",
+    "winfsp"
+  ],
+  "studio_platform": "Win2022x64",
+  "name": "HLK11_next"
+}

lib/engines/hckinstall/kits/HLK1507.json

@@ -0,0 +1,4 @@
+{
+  "studio_platform": "Win2016x64",
+  "name": "HLK1507"
+}

lib/engines/hckinstall/kits/HLK1511.json

@@ -0,0 +1,4 @@
+{
+  "studio_platform": "Win2016x64",
+  "name": "HLK1511"
+}

lib/engines/hckinstall/kits/HLK1607.json

@@ -0,0 +1,8 @@
+{
+  "download_url": "https://go.microsoft.com/fwlink/p/?LinkID=404112",
+  "extra_software": [
+    "winfsp"
+  ],
+  "studio_platform": "Win2016x64",
+  "name": "HLK1607"
+}

lib/engines/hckinstall/kits/HLK1703.json

@@ -0,0 +1,4 @@
+{
+  "studio_platform": "Win2016x64",
+  "name": "HLK1703"
+}

lib/engines/hckinstall/kits/HLK1709.json

@@ -0,0 +1,4 @@
+{
+  "studio_platform": "Win2016x64",
+  "name": "HLK1709"
+}

lib/engines/hckinstall/kits/HLK1803.json

@@ -0,0 +1,4 @@
+{
+  "studio_platform": "Win2016x64",
+  "name": "HLK1803"
+}

lib/engines/hckinstall/kits/HLK1809.json

@@ -0,0 +1,10 @@
+{
+  "download_url": "https://go.microsoft.com/fwlink/?linkid=2026646",
+  "extra_software": [
+    "HLK_GRFX_FOD",
+    "WDTFNetData_1809",
+    "winfsp"
+  ],
+  "studio_platform": "Win2019x64",
+  "name": "HLK1809"
+}

lib/engines/hckinstall/kits/HLK1809server.json

@@ -0,0 +1,11 @@
+{
+  "download_url": "https://go.microsoft.com/fwlink/?linkid=2026646",
+  "extra_software": [
+    "FOD_2019",
+    "HLK_GRFX_FOD",
+    "WDTFNetData_1809",
+    "winfsp"
+  ],
+  "studio_platform": "Win2019x64",
+  "name": "HLK1809server"
+}

lib/engines/hckinstall/kits/HLK1903.json

@@ -0,0 +1,4 @@
+{
+  "studio_platform": "Win2016x64",
+  "name": "HLK1903"
+}

lib/engines/hckinstall/kits/HLK1909.json

@@ -0,0 +1,4 @@
+{
+  "studio_platform": "Win2016x64",
+  "name": "HLK1909"
+}

lib/engines/hckinstall/kits/HLK2004.json

@@ -0,0 +1,8 @@
+{
+  "download_url": "https://go.microsoft.com/fwlink/?linkid=2128655",
+  "extra_software": [
+    "winfsp"
+  ],
+  "studio_platform": "Win2016x64",
+  "name": "HLK2004"
+}

lib/engines/hckinstall/kits/HLK2022.json

@@ -0,0 +1,10 @@
+{
+  "download_url": "https://go.microsoft.com/fwlink/?linkid=2164257",
+  "extra_software": [
+    "FOD_2022",
+    "Test-NETHLK",
+    "winfsp"
+  ],
+  "studio_platform": "Win2022x64",
+  "name": "HLK2022"
+}

lib/engines/hckinstall/kits/HLK2022_next.json

@@ -0,0 +1,8 @@
+{
+  "extra_software": [
+    "Disable_SNV",
+    "winfsp"
+  ],
+  "studio_platform": "Win2022x64",
+  "name": "HLK2022_next"
+}

lib/engines/hckinstall/kits/HLK2025.json

@@ -0,0 +1,9 @@
+{
+  "download_url": "https://go.microsoft.com/fwlink/?linkid=2289283",
+  "extra_software": [
+    "Test-NETHLK",
+    "winfsp"
+  ],
+  "studio_platform": "Win2022x64",
+  "name": "HLK2025"
+}

lib/engines/hckinstall/kits/HLK20H2.json

@@ -0,0 +1,4 @@
+{
+  "studio_platform": "Win2016x64",
+  "name": "HLK20H2"
+}

lib/models.rb

@@ -7,6 +7,7 @@ module Models
     autoload_relative :CommandInfo, 'models/command_info'
     autoload_relative :DriverInstallMethods, 'models/driver_install_methods'
     autoload_relative :Driver, 'models/driver'
+    autoload_relative :Kit, 'models/kit'
     autoload_relative :HCKTestConfig, 'models/hcktest_config'
     autoload_relative :JsonHelper, 'models/json_helper'
     autoload_relative :SVVPConfig, 'models/svvp_config'

lib/models/kit.rb

@@ -0,0 +1,17 @@
+# typed: strict
+# frozen_string_literal: true
+
+module AutoHCK
+  module Models
+    class Kit < T::Struct
+      extend T::Sig
+      extend JsonHelper
+
+      const :name, String
+      const :studio_platform, String
+      const :extra_software, T::Array[String], default: []
+
+      const :download_url, T.nilable(String)
+    end
+  end
+end

spec/srb_json_load_spec.rb

@@ -2,6 +2,7 @@
 
 JSON_TYPES_MAP = {
   './lib/engines/hcktest/drivers/*.json' => AutoHCK::Models::Driver,
+  './lib/engines/hckinstall/kits/*.json' => AutoHCK::Models::Kit,
   './lib/engines/hcktest/hcktest.json' => AutoHCK::Models::HCKTestConfig,
   './svvp.json' => AutoHCK::Models::SVVPConfig,
   './lib/setupmanagers/qemuhck/devices/*.json' => AutoHCK::Models::QemuHCKDevice