Merge branch 'main' into winget-manifest-uploader

Author: Gijsreyn

dsc/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "dsc"
-version = "3.2.0-preview.3"
+version = "3.2.0-preview.4"
 edition = "2021"
 
 [profile.release]
@@ -19,7 +19,7 @@ crossterm = { version = "0.29" }
 ctrlc = { version = "3.4" }
 dsc_lib = { path = "../dsc_lib" }
 indicatif = { version = "0.18" }
-jsonschema = { version = "0.30", default-features = false }
+jsonschema = { version = "0.32", default-features = false }
 path-absolutize = { version = "3.1" }
 regex = "1.11"
 rust-i18n = { version = "3.1" }
@@ -28,7 +28,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["preserve_order"] }
 serde_yaml = { version = "0.9" }
 syntect = { version = "5.0", features = ["default-fancy"], default-features = false }
-sysinfo = { version = "0.36" }
+sysinfo = { version = "0.37" }
 thiserror = "2.0"
 tracing = { version = "0.1" }
 tracing-subscriber = { version = "0.3", features = ["ansi", "env-filter", "json"] }

dsc/Cargo.toml

@@ -181,4 +181,36 @@ resources:
         $out.resources[0].properties.psobject.properties.name | Should -Not -Contain '_securityContext'
         $out.resources[0].properties.psobject.properties.name | Should -Not -Contain '_name'
     }
+
+    It 'Export can be used with a resource that only implements Get with filter' {
+      $yaml = @'
+$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+resources:
+  - name: NoExport
+    type: Test/Get
+    properties:
+      name: two
+'@
+      $out = dsc config export -i $yaml | ConvertFrom-Json
+      $LASTEXITCODE | Should -Be 0
+      $out.resources.count | Should -Be 1
+      $out.resources[0].type | Should -BeExactly 'Test/Get'
+      $out.resources[0].properties.name | Should -BeExactly 'two'
+      $out.resources[0].properties.id | Should -Be 2
+    }
+
+    It 'Export can be used with a resource that only implements Get with no filter' {
+      $yaml = @'
+$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+resources:
+  - name: NoFilter
+    type: Test/Get
+'@
+      $out = dsc config export -i $yaml | ConvertFrom-Json
+      $LASTEXITCODE | Should -Be 0
+      $out.resources.count | Should -Be 1
+      $out.resources[0].type | Should -BeExactly 'Test/Get'
+      $out.resources[0].properties.name | Should -BeExactly 'one'
+      $out.resources[0].properties.id | Should -Be 1
+    }
 }

dsc/tests/dsc_export.tests.ps1

@@ -84,10 +84,12 @@ Describe 'Tests for listing resources' {
     }
 
     It 'Capabilities are returned' {
-        $resource = dsc resource list Microsoft/OSInfo | ConvertFrom-Json
+        $resource = dsc resource list Microsoft.DSC.Debug/Echo | ConvertFrom-Json
         $LASTEXITCODE | Should -Be 0
-        $resource.capabilities.Count | Should -Be 2
+        $resource.capabilities.Count | Should -Be 4
         $resource.capabilities | Should -Contain 'get'
+        $resource.capabilities | Should -Contain 'set'
+        $resource.capabilities | Should -Contain 'test'
         $resource.capabilities | Should -Contain 'export'
     }
 

dsc/tests/dsc_resource_list.tests.ps1

@@ -1,6 +1,6 @@
 [package]
 name = "dsc_lib"
-version = "3.1.0"
+version = "3.2.0"
 edition = "2021"
 
 [profile.release]
@@ -19,7 +19,7 @@ chrono = { version = "0.4", features = ["alloc"] }
 clap = { version = "4.5", features = ["derive"] }
 derive_builder ="0.20"
 indicatif = "0.18"
-jsonschema = { version = "0.30", default-features = false }
+jsonschema = { version = "0.32", default-features = false }
 linked-hash-map = "0.5"
 murmurhash64 = "0.3"
 num-traits = "0.2"

dsc_lib/Cargo.lock

@@ -146,6 +146,7 @@ resourceInvalidJson = "Resource reported input JSON is not valid"
 invalidArrayKey = "Unsupported array value for key '%{key}'.  Only string and number is supported."
 invalidKey = "Unsupported value for key '%{key}'.  Only string, bool, number, and array is supported."
 inDesiredStateNotBool = "'_inDesiredState' is not a boolean"
+exportNotSupportedUsingGet = "Export is not supported by resource '%{resource}' using get operation"
 
 [dscresources.dscresource]
 invokeGet = "Invoking get for '%{resource}'"

dsc_lib/Cargo.toml

@@ -487,6 +487,26 @@ pub fn get_schema(resource: &ResourceManifest, cwd: &str) -> Result<String, DscE
 /// Error returned if the resource does not successfully export the current state
 pub fn invoke_export(resource: &ResourceManifest, cwd: &str, input: Option<&str>) -> Result<ExportResult, DscError> {
     let Some(export) = resource.export.as_ref() else {
+        // see if get is supported and use that instead
+        if resource.get.is_some() {
+            info!("{}", t!("dscresources.commandResource.exportNotSupportedUsingGet", resource = &resource.resource_type));
+            let get_result = invoke_get(resource, cwd, input.unwrap_or(""))?;
+            let mut instances: Vec<Value> = Vec::new();
+            match get_result {
+                GetResult::Group(group_response) => {
+                    for result in group_response {
+                        instances.push(serde_json::to_value(result)?);
+                    }
+                },
+                GetResult::Resource(response) => {
+                    instances.push(response.actual_state);
+                }
+            }
+            return Ok(ExportResult {
+                actual_state: instances,
+            });
+        }
+        // if neither export nor get is supported, return an error
         return Err(DscError::Operation(t!("dscresources.commandResource.exportNotSupported", resource = &resource.resource_type).to_string()))
     };
 
@@ -840,7 +860,7 @@ fn json_to_hashmap(json: &str) -> Result<HashMap<String, String>, DscError> {
                 },
                 Value::Null => {
                     // ignore null values
-                },  
+                },
                 Value::Object(_) => {
                     return Err(DscError::Operation(t!("dscresources.commandResource.invalidKey", key = key).to_string()));
                 },

dsc_lib/locales/en-us.toml

@@ -13,4 +13,4 @@ opt-level = 2
 lto = true
 
 [build-dependencies]
-cc = "1.1"
+cc = "*"