Merge branch 'main' into check-cert-expired

Author: arudell

.github/workflows/devskim.yml

@@ -29,6 +29,6 @@ jobs:
         uses: microsoft/DevSkim-Action@v1
 
       - name: Upload DevSkim scan results to GitHub Security tab
-        uses: github/codeql-action/[email protected].7
+        uses: github/codeql-action/[email protected].10
         with:
           sarif_file: devskim-results.sarif

.github/workflows/powershell.yml

@@ -49,6 +49,6 @@ jobs:
 
       # Upload the SARIF file generated in the previous step
       - name: Upload SARIF results file
-        uses: github/codeql-action/upload-sarif@149d184a5153ea45e6fbcef5588ac7b8c7af9835 # v3.29.5
+        uses: github/codeql-action/upload-sarif@a2d9de63c2916881d0621fdb7e65abe32141606d # v3.29.5
         with:
           sarif_file: results.sarif

.github/workflows/scorecards.yml

@@ -63,14 +63,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@149d184a5153ea45e6fbcef5588ac7b8c7af9835 # v3.29.5
+        uses: github/codeql-action/upload-sarif@a2d9de63c2916881d0621fdb7e65abe32141606d # v3.29.5
         with:
           sarif_file: results.sarif

src/modules/SdnDiag.Common.psm1

@@ -795,8 +795,7 @@ function Start-EtwTraceSession {
     )
 
     try {
-        $logmanCmd = "logman create trace $TraceName -ow -o $TraceFile -nb 16 16 -bs 1024 -mode Circular -f bincirc -max $MaxTraceSize -ets"
-        $result = Invoke-Expression -Command $logmanCmd
+        $result = & logman create trace $TraceName -ow -o $TraceFile -nb 16 16 -bs 1024 -mode Circular -f bincirc -max $MaxTraceSize -ets
 
         # Session create failure error need to be reported to user to be aware, this means we have one trace session missing.
         # Provider add failure might be ignored and exposed via verbose trace/log file only to debug.
@@ -808,8 +807,7 @@ function Start-EtwTraceSession {
         }
 
         foreach ($provider in $TraceProviders) {
-            $logmanCmd = 'logman update trace $TraceName -p "$provider" 0xffffffffffffffff 0xff -ets'
-            $result = Invoke-Expression -Command $logmanCmd
+            $result = & logman Update trace $TraceName -p $provider 0xffffffffffffffff 0xff -ets
             "Added provider {0} with result {1}" -f $provider, "$result" | Trace-Output -Level:Verbose
         }
     }
@@ -958,8 +956,7 @@ function Stop-EtwTraceSession {
     )
 
     try {
-        $logmanCmd = "logman stop $TraceName -ets"
-        $result = Invoke-Expression -Command $logmanCmd
+        $result = & logman stop $TraceName -ets
         if ("$result".Contains("Error")) {
             "Stop session {0} failed with error {1}" -f $TraceName, "$result" | Trace-Output -Level:Warning
         }

src/modules/SdnDiag.Gateway.psm1

@@ -113,7 +113,7 @@ function Disable-SdnRasGatewayTracing {
 
     try {
         # since there has not been a time when this as returned an error, just invoking the expression and not doing any error handling
-        Invoke-Expression -Command "netsh ras set tracing * disabled"
+        & netsh ras set tracing * disabled
 
         Start-Sleep -Seconds 5
         $files = Get-Item -Path "$($config.properties.commonPaths.rasGatewayTraces)\*" -Include '*.log','*.etl'
@@ -155,7 +155,7 @@ function Enable-SdnRasGatewayTracing {
         }
 
         # enable ras tracing
-        $expression = Invoke-Expression -Command "netsh ras set tracing * enabled"
+        $expression = & netsh ras set tracing * enabled
         if($expression -ilike "*Unable to start ETW*"){
             $msg = $expression[1]
             throw New-Object -TypeName System.Exception($msg)

src/modules/SdnDiag.Server.psm1

@@ -351,8 +351,7 @@ function Get-OvsdbDatabase {
         throw New-Object System.NullReferenceException("No endpoint listening on port 6641. Ensure NCHostAgent service is running.")
     }
 
-    $cmdline = "ovsdb-client.exe dump tcp:127.0.0.1:6641 -f json {0}" -f $Table
-    $databaseResults = Invoke-Expression $cmdline | ConvertFrom-Json
+    $databaseResults = & ovsdb-client.exe dump tcp:127.0.0.1:6641 -f json $Table | ConvertFrom-Json
 
     if($null -eq $databaseResults){
         $msg = "Unable to retrieve OVSDB results`n`t{0}" -f $_
@@ -480,7 +479,7 @@ function Get-ServerConfigState {
         $hnvDiag | ForEach-Object {
             try {
                 $cmd = $_
-                Invoke-Expression -Command $cmd | Export-ObjectToFile -FilePath $outDir -Name $cmd -FileType txt -Format List
+                & $cmd | Export-ObjectToFile -FilePath $outDir -Name $cmd -FileType txt -Format List
             }
             catch {
                 "Failed to execute {0}" -f $cmd | Trace-Output -Level:Error
@@ -3343,8 +3342,7 @@ function Test-SdnVfpPortTuple {
         # DestinationIP: Destination IP address or direction of the traffic relative to the direction
         # DestinationPort: Destination port or direction of the traffic relative to the direction
         # flags: 1 = TCP SYN, 2 = Monitoring Ping
-        $cmd = "vfpctrl /port $PortName /process-tuples '$protocolId $SourceIP $SourcePort $DestinationIP $DestinationPort $Direction 1'"
-        Invoke-Expression $cmd
+        & vfpctrl /port $PortName /process-tuples "$protocolID $SourceIP $SourcePort $DestinationIP $DestinationPort $Direction 1"
     }
     catch {
         $_ | Trace-Exception

src/modules/SdnDiag.Utilities.psm1

@@ -1897,7 +1897,7 @@ function New-PSRemotingSession {
                     $trustedHosts = Get-Item -Path "WSMan:\localhost\client\TrustedHosts"
                     if ($trustedHosts.Value -notlike "*$objectName*" -and $trustedHosts.Value -ne "*") {
                         "Adding {0} to {1}" -f $objectName, $trustedHosts.PSPath | Trace-Output
-                        Set-Item -Path "WSMan:\localhost\client\TrustedHosts" -Value $objectName -Concatenate
+                        Set-Item -Path "WSMan:\localhost\client\TrustedHosts" -Value $objectName.ToString() -Concatenate -Force
                     }
                 }
                 catch {

tests/online/RunTests.ps1

@@ -5,7 +5,7 @@ param(
 $Global:PesterOnlineTests  = @{
 }
 
-$Global:PesterOnlineTests.ConfigData = [hashtable] (Invoke-Expression (Get-Content -Path $ConfigurationFile | Out-String))
+$Global:PesterOnlineTests.ConfigData = [hashtable] (Get-Content -Path $ConfigurationFile | Out-String)
 
 $Global:PesterOnlineTests.NcRestCredential = [System.Management.Automation.PSCredential]::Empty
 #$ncAdminCredential = [System.Management.Automation.PSCredential]::Empty
@@ -37,4 +37,4 @@ if($testResult.Result -ne "Passed")
 }
 
 # Exit code 0 indicate success
-return $testFailed
+return $testFailed