Merge branch 'PowerShell:main' into main

Author: Gijsreyn

build.ps1

@@ -112,10 +112,6 @@ if ($null -ne $packageType) {
         }
     }
 
-    if ($IsLinux -and (Test-Path /etc/mariner-release)) {
-        tdnf install -y openssl-devel
-    }
-
     $BuildToolsPath = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC"
 
     & $rustup default stable

dsc/Cargo.toml

@@ -20,6 +20,7 @@ dsc_lib = { path = "../dsc_lib" }
 indicatif = { version = "0.17" }
 jsonschema = "0.18"
 path-absolutize = { version = "3.1.1" }
+reqwest = { version = "0.12", features = ["rustls-tls"], default-features = false }
 schemars = { version = "0.8.12" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["preserve_order"] }

dsc/src/resource_command.rs

@@ -96,7 +96,7 @@ pub fn get_all(dsc: &DscManager, resource_type: &str, format: &Option<OutputForm
 
 pub fn set(dsc: &DscManager, resource_type: &str, mut input: String, format: &Option<OutputFormat>) {
     if input.is_empty() {
-        error!("Error: Input is empty");
+        error!("Error: Desired input is empty");
         exit(EXIT_INVALID_ARGS);
     }
 
@@ -137,6 +137,11 @@ pub fn set(dsc: &DscManager, resource_type: &str, mut input: String, format: &Op
 }
 
 pub fn test(dsc: &DscManager, resource_type: &str, mut input: String, format: &Option<OutputFormat>) {
+    if input.is_empty() {
+        error!("Error: Expected input is required");
+        exit(EXIT_INVALID_ARGS);
+    }
+
     let Some(mut resource) = get_resource(dsc, resource_type) else {
         error!("{}", DscError::ResourceNotFound(resource_type.to_string()).to_string());
         return

dsc/tests/dsc_resource_list.tests.ps1

@@ -66,4 +66,10 @@ Describe 'Tests for listing resources' {
         $resource.capabilities | Should -Contain 'Get'
         $resource.capabilities | Should -Contain 'Export'
     }
+
+    It 'Invalid adapter returns an error' {
+        $out = dsc resource list --adapter 'foo*' 2>&1 | Out-String
+        $LASTEXITCODE | Should -Be 0
+        $out | Should -BeLike "*ERROR*Adapter 'foo`*' not found*"
+    }
 }

dsc/tests/dsc_resource_test.tests.ps1

@@ -0,0 +1,29 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe 'Invoke a resource test directly' {
+    It 'test can be called on a resource' {
+        $os = if ($IsWindows) {
+            'Windows'
+        } elseif ($IsLinux) {
+            'Linux'
+        } elseif ($IsMacOS) {
+            'macOS'
+        } else {
+            'Unknown'
+        }
+
+        $out = @"
+        { "family": "$os" }
+"@ | dsc resource test -r Microsoft/OSInfo | ConvertFrom-Json
+        $LASTEXITCODE | Should -Be 0
+        $out.actualState.family | Should -BeExactly $os
+        $out.inDesiredState | Should -Be $true
+    }
+
+    It 'test returns proper error code if no input is provded' {
+        $out = dsc resource test -r Microsoft/OSInfo 2>&1
+        $LASTEXITCODE | Should -Be 1
+        $out | Should -BeLike '*ERROR*'
+    }
+}

dsc_lib/Cargo.toml

@@ -8,9 +8,10 @@ base64 = "0.22"
 chrono = { version = "0.4.26" }
 derive_builder ="0.20"
 indicatif = { version = "0.17" }
-jsonschema = "0.17"
+jsonschema = "0.18"
 num-traits = "0.2"
 regex = "1.7"
+reqwest = { version = "0.12", features = ["rustls-tls"], default-features = false }
 schemars = { version = "0.8.12", features = ["preserve_order"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["preserve_order"] }

dsc_lib/src/discovery/command_discovery.rs

@@ -204,12 +204,14 @@ impl ResourceDiscovery for CommandDiscovery {
 
         let mut adapted_resources = BTreeMap::<String, Vec<DscResource>>::new();
 
+        let mut found_adapter: bool = false;
         for (adapter_name, adapters) in &self.adapters {
             for adapter in adapters {
                 if !regex.is_match(adapter_name) {
                     continue;
                 }
 
+                found_adapter = true;
                 info!("Enumerating resources for adapter '{}'", adapter_name);
                 let pb_adapter_span = warn_span!("");
                 pb_adapter_span.pb_set_style(&ProgressStyle::with_template(
@@ -272,6 +274,10 @@ impl ResourceDiscovery for CommandDiscovery {
             }
         }
 
+        if !found_adapter {
+            return Err(DscError::AdapterNotFound(adapter_filter.to_string()));
+        }
+
         self.adapted_resources = adapted_resources;
         Ok(())
     }

dsc_lib/src/dscerror.rs

@@ -10,6 +10,9 @@ use tree_sitter::LanguageError;
 
 #[derive(Error, Debug)]
 pub enum DscError {
+    #[error("Adapter '{0}' not found")]
+    AdapterNotFound(String),
+
     #[error("Function boolean argument conversion error: {0}")]
     BooleanConversion(#[from] std::str::ParseBoolError),
 

powershell-adapter/Tests/TestClassResource/0.0.1/TestClassResource.psd1

@@ -34,7 +34,7 @@ VariablesToExport = @()
 AliasesToExport = @()
 
 # DSC resources to export from this module
-DscResourcesToExport = 'TestClassResource'
+DscResourcesToExport = @('TestClassResource', 'NoExport')
 
 # Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
 PrivateData = @{

powershell-adapter/Tests/TestClassResource/0.0.1/TestClassResource.psm1

@@ -74,6 +74,33 @@ class TestClassResource : BaseTestClass
     }
 }
 
+[DscResource()]
+class NoExport: BaseTestClass
+{
+    [DscProperty(Key)]
+    [string] $Name
+
+    [DscProperty()]
+    [string] $Prop1
+
+    [DscProperty()]
+    [string] $EnumProp
+
+    [void] Set()
+    {
+    }
+
+    [bool] Test()
+    {
+        return $true
+    }
+
+    [NoExport] Get()
+    {
+        return $this
+    }
+}
+
 function Test-World()
 {
     "Hello world from PSTestModule!"