separate out resources and extensions

Author: SteveL-MSFT

lib/dsc-lib/src/discovery/command_discovery.rs

@@ -38,16 +38,10 @@ static RESOURCES: LazyLock<RwLock<BTreeMap<String, Vec<DscResource>>>> = LazyLoc
 static EXTENSIONS: LazyLock<RwLock<BTreeMap<String, DscExtension>>> = LazyLock::new(|| RwLock::new(BTreeMap::new()));
 static ADAPTED_RESOURCES: LazyLock<RwLock<BTreeMap<String, Vec<DscResource>>>> = LazyLock::new(|| RwLock::new(BTreeMap::new()));
 
-#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, JsonSchema)]
-#[serde(untagged)]
-pub enum Manifest {
-    Resource(Box<ResourceManifest>),
-    Extension(Box<ExtensionManifest>),
-}
-
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize, JsonSchema)]
 pub struct ManifestList {
-    pub manifests: Vec<Manifest>,
+    pub resources: Option<Vec<ResourceManifest>>,
+    pub extensions: Option<Vec<ExtensionManifest>>,
 }
 
 #[derive(Clone, Serialize, Deserialize, JsonSchema)]
@@ -683,16 +677,16 @@ pub fn load_manifest(path: &Path) -> Result<Vec<ImportedManifest>, DscError> {
             }
         };
         let mut resources = vec![];
-        for res_manifest in manifest_list.manifests {
-            match res_manifest {
-                Manifest::Extension(ext_manifest) => {
-                    let extension = load_extension_manifest(path, &ext_manifest)?;
-                    resources.push(ImportedManifest::Extension(extension));
-                },
-                Manifest::Resource(res_manifest) => {
-                    let resource = load_resource_manifest(path, &res_manifest)?;
-                    resources.push(ImportedManifest::Resource(resource));
-                }
+        if let Some(resource_manifests) = &manifest_list.resources {
+            for res_manifest in resource_manifests {
+                let resource = load_resource_manifest(path, res_manifest)?;
+                resources.push(ImportedManifest::Resource(resource));
+            }
+        }
+        if let Some(extension_manifests) = &manifest_list.extensions {
+            for ext_manifest in extension_manifests {
+                let extension = load_extension_manifest(path, ext_manifest)?;
+                resources.push(ImportedManifest::Extension(extension));
             }
         }
         return Ok(resources);

tools/dsctest/dsctest.dsc.manifests.json

@@ -1,5 +1,5 @@
 {
-  "manifests": [
+  "resources": [
     {
       "$schema": "https://aka.ms/dsc/schemas/v3/bundled/resource/manifest.json",
       "type": "Test/Delete",