Merge branch 'main' into add-sshdconfig

Author: tgauth

.github/workflows/rust.yml

@@ -2,9 +2,9 @@ name: Rust
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "release/v3.0.0", "release/v3.1" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "release/v3.0.0", "release/v3.1" ]
     paths-ignore:
       - "docs/**"
       - "*.md"

build.ps1

@@ -262,7 +262,7 @@ if (!$SkipBuild) {
     }
 
     # make sure dependencies are built first so clippy runs correctly
-    $windows_projects = @("pal", "registry", "reboot_pending", "wmi-adapter", "configurations/windows", 'extensions/appx')
+    $windows_projects = @("pal", "registry_lib", "registry", "reboot_pending", "wmi-adapter", "configurations/windows", 'extensions/appx')
     $macOS_projects = @("resources/brew")
     $linux_projects = @("resources/apt")
 

dsc/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "dsc"
-version = "3.1.0-preview.7"
+version = "3.2.0-preview.1"
 edition = "2021"
 
 [profile.release]

dsc/Cargo.toml

@@ -116,6 +116,7 @@ pub fn get_all(dsc: &DscManager, resource_type: &str, format: Option<&GetOutputF
         let format = match format {
             Some(&GetOutputFormat::PrettyJson) => Some(&OutputFormat::PrettyJson),
             Some(&GetOutputFormat::Yaml) => Some(&OutputFormat::Yaml),
+            None => None,
             _ => Some(&OutputFormat::Json),
         };
         write_object(&json, format, include_separator);

dsc/src/resource_command.rs

@@ -6,20 +6,22 @@ Describe 'WindowsPowerShell adapter resource tests - requires elevated permissio
   BeforeAll {
     if ($isWindows) {
       winrm quickconfig -quiet -force
-    }
-    $OldPSModulePath = $env:PSModulePath
-    $env:PSModulePath += [System.IO.Path]::PathSeparator + $PSScriptRoot
+      $OldPSModulePath = $env:PSModulePath
+      $env:PSModulePath += [System.IO.Path]::PathSeparator + $PSScriptRoot
 
-    $winpsConfigPath = Join-path $PSScriptRoot "winps_resource.dsc.yaml"
-    if ($isWindows) {
-      $cacheFilePath_v5 = Join-Path $env:LocalAppData "dsc" "WindowsPSAdapterCache.json"
+      $winpsConfigPath = Join-path $PSScriptRoot "winps_resource.dsc.yaml"
+      if ($isWindows) {
+        $cacheFilePath_v5 = Join-Path $env:LocalAppData "dsc" "WindowsPSAdapterCache.json"
+      }
     }
   }
   AfterAll {
-    $env:PSModulePath = $OldPSModulePath
+    if ($isWindows) {
+      $env:PSModulePath = $OldPSModulePath
 
-    # Remove after all the tests are done
-    Remove-Module $script:winPSModule -Force -ErrorAction Ignore
+      # Remove after all the tests are done
+      Remove-Module $script:winPSModule -Force -ErrorAction Ignore
+    }
   }
 
   BeforeEach {
@@ -161,7 +163,7 @@ resources:
       - "[resourceId('Microsoft.Windows/WindowsPowerShell', 'File')]"
   - name: TestPSRepository
     type: PSTestModule/TestPSRepository
-    properties: 
+    properties:
       Name: NuGet
     dependsOn:
       - "[resourceId('Microsoft.Windows/WindowsPowerShell', 'File')]"
@@ -201,7 +203,7 @@ resources:
         type: PsDesiredStateConfiguration/Service
         properties:
           Name: Spooler
-          State: $SecondState    
+          State: $SecondState
 "@
 
     $inDesiredState = if ($FirstState -eq $SecondState) {
@@ -242,11 +244,11 @@ resources:
     # Instead of calling dsc.exe we call the cmdlet directly to be able to test the output and mocks
     $resourceObject = Get-DscResourceObject -jsonInput $jsonInput
     $cacheEntry = Invoke-DscCacheRefresh -Module PSDesiredStateConfiguration
-  
+
     $out = Invoke-DscOperation -Operation Test -DesiredState $resourceObject -dscResourceCache $cacheEntry
     $LASTEXITCODE | Should -Be 0
     $out.properties.InDesiredState.InDesiredState | Should -Be $false
-    
+
     Should -Invoke -CommandName ConvertTo-SecureString -Exactly -Times 1 -Scope It
   }
 
@@ -261,7 +263,7 @@ resources:
             Credential:
               UserName: 'User'
               OtherProperty: 'Password'
-"@  
+"@
     # Compared to PowerShell we use test here as it filters out the properties
     $out = dsc config test -i $yaml 2>&1 | Out-String
     $LASTEXITCODE | Should -Be 2
@@ -339,7 +341,7 @@ class PSClassResource {
     }
 
     [void] Set() {
-        
+
     }
 
     static [PSClassResource[]] Export()
@@ -374,23 +376,23 @@ class PSClassResource {
   }
 
   It 'Get works with class-based PS DSC resources' -Skip:(!$IsWindows) {
-    
+
     $out = dsc resource get -r PSClassResource/PSClassResource --input (@{Name = 'TestName' } | ConvertTo-Json) | ConvertFrom-Json
     $LASTEXITCODE | Should -Be 0
     $out.actualState.Name | Should -Be 'TestName'
-    $propCount = $out.actualState | Get-Member -MemberType NoteProperty 
+    $propCount = $out.actualState | Get-Member -MemberType NoteProperty
     $propCount.Count | Should -Be 1 # Only the DscProperty should be returned
   }
 
   It 'Set works with class-based PS DSC resources' -Skip:(!$IsWindows) {
-    
+
     $out = dsc resource set -r PSClassResource/PSClassResource --input (@{Name = 'TestName' } | ConvertTo-Json) | ConvertFrom-Json
     $LASTEXITCODE | Should -Be 0
     $out.afterstate.InDesiredState | Should -Be $true
   }
 
   It 'Export works with class-based PS DSC resources' -Skip:(!$IsWindows) {
-    
+
     $out = dsc resource export -r PSClassResource/PSClassResource | ConvertFrom-Json
     $LASTEXITCODE | Should -Be 0
     $out | Should -Not -BeNullOrEmpty

powershell-adapter/Tests/win_powershellgroup.tests.ps1

@@ -13,12 +13,18 @@ fn get_task_list() -> Vec<ProcessInfo>
     let mut result = Vec::new();
     let mut s = System::new();
     s.refresh_processes(ProcessesToUpdate::All, true);
+    let mut count = 0;
     for (pid, process) in s.processes() {
         let mut p = ProcessInfo::new();
         p.pid = pid.as_u32();
         p.name = process.name().to_string_lossy().to_string();
         p.cmdline = format!("{:?}", process.cmd());
         result.push(p);
+        count += 1;
+        if count > 3 {
+            // limit to 3 processes as this is just for testing
+            break;
+        }
     }
 
     result

process/src/main.rs

@@ -21,6 +21,7 @@ strip = "symbols"           # See split-debuginfo - allows us to drop the size b
 clap = { version = "4.5", features = ["derive"] }
 crossterm = "0.29"
 registry = "1.3"
+registry_lib = { path = "../registry_lib" }
 rust-i18n = { version = "3.1" }
 schemars = "0.9"
 serde = "1.0"

registry/Cargo.lock

@@ -27,26 +27,8 @@ findArgsKeysOnlyHelp = "Only find keys."
 findArgsValuesOnlyHelp = "Only find values."
 schemaAbout = "Retrieve JSON schema."
 
-[config]
-# No localizable strings
-
-[error]
-invalidHive = "Invalid hive"
-json = "JSON"
-registry = "Registry"
-registryKey = "Registry key"
-registryKeyNotFound = "Registry key not found"
-registryValue = "Registry value"
-utf16Conversion = "UTF-16 conversion failed due to interior NULL values for"
-unsupportedValueDataType = "Unsupported registry value data type"
-
 [main]
 tracingInitError = "Unable to set global default tracing subscriber. Tracing is disabled."
 debugAttach = "attach debugger to pid %{pid} and press any key to continue"
 debugEventReadError = "Error: Failed to read event: %{err}"
 debugEventUnexpectedError = "Unexpected event: %{e}"
-
-[registry_helper]
-whatIfCreateKey = "Key '%{subkey}' not found, would create it"
-removeErrorKeyNotExist = "Key already does not exist"
-removeDeletingSubKey = "Deleting subkey '%{name}' using %{parent}"