Merge branch 'main' into reference-doc-psscript

Author: Gijsreyn

archive/registry/Cargo.toml

@@ -14,9 +14,8 @@ lto = true
 lto = true
 
 [dependencies]
-atty = { version = "0.2" }
 clap = { version = "4.1", features = ["derive"] }
-crossterm = { version = "0.26" }
+crossterm = { version = "0.29" }
 ntreg = { path = "../ntreg" }
 ntstatuserror = { path = "../ntstatuserror" }
 schemars = { version = "1.0" }

archive/registry/src/main.rs

@@ -7,8 +7,8 @@ use crossterm::event;
 use std::env;
 
 use args::Arguments;
-use atty::Stream;
 use clap::Parser;
+use crossterm::tty::{is_tty, Stream};
 use schemars::schema_for;
 use std::{io::{self, Read}, process::exit};
 
@@ -32,7 +32,7 @@ fn main() {
     check_debug();
 
     let args = Arguments::parse();
-    let input: Option<String> = if atty::is(Stream::Stdin) {
+    let input: Option<String> = if is_tty(Stream::Stdin) {
         None
     } else {
         let mut buffer: Vec<u8> = Vec::new();

build.ps1

@@ -26,6 +26,11 @@ param(
 $env:RUSTC_LOG=$null
 $env:RUSTFLAGS='-Dwarnings'
 
+trap {
+    Write-Error "An error occurred: $($_ | Out-String)"
+    exit 1
+}
+
 if ($Verbose) {
     $env:RUSTC_LOG='rustc_codegen_ssa::back::link=info'
 }
@@ -569,11 +574,7 @@ if ($Test) {
         (Get-Module -Name Pester -ListAvailable).Path
     }
 
-    try {
-        Invoke-Pester -ErrorAction Stop
-    } catch {
-        throw "Pester had unexpected error: $($_.Exception.Message)"
-    }
+    Invoke-Pester -Output Detailed -ErrorAction Stop
 }
 
 function Find-MakeAppx() {

dsc/Cargo.lock

@@ -115,7 +115,7 @@ tableHeader_functionName = "Function"
 tableHeader_functionCategory = "Category"
 tableHeader_minArgs = "MinArgs"
 tableHeader_maxArgs = "MaxArgs"
-tableHeader_argTypes = "ArgTypes"
+tableHeader_argTypes = "ReturnTypes"
 invalidFunctionFilter = "Invalid function filter"
 maxInt = "maxInt"
 invalidManifest = "Error in manifest for"

dsc/locales/en-us.toml

@@ -6,7 +6,7 @@ use crate::resolve::{get_contents, Include};
 use crate::resource_command::{get_resource, self};
 use crate::tablewriter::Table;
 use crate::util::{get_input, get_schema, in_desired_state, set_dscconfigroot, validate_json, write_object, DSC_CONFIG_ROOT, EXIT_DSC_ASSERTION_FAILED, EXIT_DSC_ERROR, EXIT_INVALID_ARGS, EXIT_INVALID_INPUT, EXIT_JSON_ERROR};
-use dsc_lib::functions::AcceptedArgKind;
+use dsc_lib::functions::FunctionArgKind;
 use dsc_lib::{
     configure::{
         config_doc::{
@@ -697,12 +697,12 @@ fn list_functions(functions: &FunctionDispatcher, function_name: Option<&String>
         write_table = true;
     }
     let mut include_separator = false;
-    let accepted_arg_types= [
-        (AcceptedArgKind::Array, "a"),
-        (AcceptedArgKind::Boolean, "b"),
-        (AcceptedArgKind::Number, "n"),
-        (AcceptedArgKind::String, "s"),
-        (AcceptedArgKind::Object, "o"),
+    let returned_types= [
+        (FunctionArgKind::Array, "a"),
+        (FunctionArgKind::Boolean, "b"),
+        (FunctionArgKind::Number, "n"),
+        (FunctionArgKind::String, "s"),
+        (FunctionArgKind::Object, "o"),
     ];
 
     let asterisks = String::from("*");
@@ -724,9 +724,9 @@ fn list_functions(functions: &FunctionDispatcher, function_name: Option<&String>
 
         if write_table {
             // construct arg_types from '-' times number of accepted_arg_types
-            let mut arg_types = "-".repeat(accepted_arg_types.len());
-            for (i, (arg_type, letter)) in accepted_arg_types.iter().enumerate() {
-                if function.accepted_arg_types.contains(arg_type) {
+            let mut arg_types = "-".repeat(returned_types.len());
+            for (i, (arg_type, letter)) in returned_types.iter().enumerate() {
+                if function.return_types.contains(arg_type) {
                     arg_types.replace_range(i..=i, letter);
                 }
             }

dsc/src/subcommand.rs

@@ -83,6 +83,6 @@ Describe 'dsc config test tests' {
         $null = dsc config test -i $configYaml 2> "$TestDrive/trace.log"
         $LASTEXITCODE | Should -Be 2
         $log = Get-Content "$TestDrive/trace.log" -Raw
-        $log | Should -Match ".*Resource named 'MyTest' is specified more than once.*" -Because ($log | Out-String)
+        $log | Should -Match ".*Resource named 'MyTest' for type 'Microsoft.DSC.Debug/Echo' is specified more than once.*" -Because ($log | Out-String)
     }
 }

dsc/tests/dsc_config_test.tests.ps1

@@ -1,6 +1,14 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
+BeforeDiscovery {
+    try {
+        $windowWidth = [Console]::WindowWidth
+    } catch {
+        $consoleUnavailable = $true
+    }
+}
+
 Describe 'Discover extension tests' {
     BeforeAll {
         $oldPath = $env:PATH
@@ -15,15 +23,31 @@ Describe 'Discover extension tests' {
     It 'Discover extensions' {
         $out = dsc extension list | ConvertFrom-Json
         $LASTEXITCODE | Should -Be 0
-        $out.Count | Should -Be 2 -Because ($out | Out-String)
-        $out[0].type | Should -Be 'Microsoft.DSC.Extension/Bicep'
-        $out[0].version | Should -Be '0.1.0'
-        $out[0].capabilities | Should -BeExactly @('import')
-        $out[0].manifest | Should -Not -BeNullOrEmpty
-        $out[1].type | Should -BeExactly 'Test/Discover'
-        $out[1].version | Should -BeExactly '0.1.0'
-        $out[1].capabilities | Should -BeExactly @('discover')
-        $out[1].manifest | Should -Not -BeNullOrEmpty
+        if ($IsWindows) {
+            $out.Count | Should -Be 3 -Because ($out | Out-String)
+            $out[0].type | Should -Be 'Microsoft.DSC.Extension/Bicep'
+            $out[0].version | Should -Be '0.1.0'
+            $out[0].capabilities | Should -BeExactly @('import')
+            $out[0].manifest | Should -Not -BeNullOrEmpty
+            $out[1].type | Should -Be 'Microsoft.Windows.Appx/Discover'
+            $out[1].version | Should -Be '0.1.0'
+            $out[1].capabilities | Should -BeExactly @('discover')
+            $out[1].manifest | Should -Not -BeNullOrEmpty
+            $out[2].type | Should -BeExactly 'Test/Discover'
+            $out[2].version | Should -BeExactly '0.1.0'
+            $out[2].capabilities | Should -BeExactly @('discover')
+            $out[2].manifest | Should -Not -BeNullOrEmpty
+        } else {
+            $out.Count | Should -Be 2 -Because ($out | Out-String)
+            $out[0].type | Should -Be 'Microsoft.DSC.Extension/Bicep'
+            $out[0].version | Should -Be '0.1.0'
+            $out[0].capabilities | Should -BeExactly @('import')
+            $out[0].manifest | Should -Not -BeNullOrEmpty
+            $out[1].type | Should -BeExactly 'Test/Discover'
+            $out[1].version | Should -BeExactly '0.1.0'
+            $out[1].capabilities | Should -BeExactly @('discover')
+            $out[1].manifest | Should -Not -BeNullOrEmpty
+        }
     }
 
     It 'Filtering works for extension discovered resources' {
@@ -94,12 +118,12 @@ Describe 'Discover extension tests' {
         }
     }
 
-    It 'Table can be not truncated' {
+    It 'Table can be not truncated' -Skip:($consoleUnavailable) {
         $output = dsc extension list --output-format table-no-truncate
         $LASTEXITCODE | Should -Be 0
         $foundWideLine = $false
         foreach ($line in $output) {
-            if ($line.Length -gt [Console]::WindowWidth) {
+            if ($line.Length -gt $windowWidth) {
                 $foundWideLine = $true
             }
         }

dsc/tests/dsc_extension_discover.tests.ps1

@@ -19,7 +19,7 @@ Describe 'Tests for function list subcommand' {
         $out.name | Should -BeExactly 'resourceId'
         $out.minArgs | Should -Be 2
         $out.maxArgs | Should -Be 2
-        $out.acceptedArgTypes | Should -Be @('String')
+        $out.returnTypes | Should -Be @('String')
         $out.description | Should -Not -BeNullOrEmpty
     }
 }