Merge branch 'main' into arg-object

Author: SteveL-MSFT

.github/workflows/rust.yml

@@ -5,6 +5,10 @@ on:
     branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
+    paths-ignore:
+      - "docs/**"
+      - "*.md"
+      - ".vscode/*.json"
 
 env:
   CARGO_TERM_COLOR: always

dsc/src/util.rs

@@ -272,26 +272,30 @@ pub fn enable_tracing(trace_level: &TraceLevel, trace_format: &TraceFormat) {
         .add_directive(tracing_level.into());
     let indicatif_layer = IndicatifLayer::new();
     let layer = tracing_subscriber::fmt::Layer::default().with_writer(indicatif_layer.get_stderr_writer());
+    let with_source = tracing_level == Level::DEBUG || tracing_level == Level::TRACE;
     let fmt = match trace_format {
         TraceFormat::Default => {
             layer
                 .with_ansi(true)
                 .with_level(true)
-                .with_line_number(true)
+                .with_target(with_source)
+                .with_line_number(with_source)
                 .boxed()
         },
         TraceFormat::Plaintext => {
             layer
                 .with_ansi(false)
                 .with_level(true)
-                .with_line_number(false)
+                .with_target(with_source)
+                .with_line_number(with_source)
                 .boxed()
         },
         TraceFormat::Json => {
             layer
                 .with_ansi(false)
                 .with_level(true)
-                .with_line_number(true)
+                .with_target(with_source)
+                .with_line_number(with_source)
                 .json()
                 .boxed()
         }

dsc/tests/dsc_discovery.tests.ps1

@@ -67,4 +67,45 @@ Describe 'tests for resource discovery' {
         $resources = dsc resource list | ConvertFrom-Json
         $resources.Count | Should -Be 0
     }
+
+    It 'warns on invalid semver' {
+        $manifest = @'
+        {
+            "$schema": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/bundled/resource/manifest.json",
+            "type": "Test/Echo",
+            "version": "1.1.0..1",
+            "get": {
+                "executable": "dsctest",
+                "args": [
+                    "echo",
+                    "--input",
+                    "{json}"
+                ],
+                "input": {
+                    "arg": "{json}"
+                }
+            },
+            "schema": {
+                "command": {
+                    "executable": "dsctest",
+                    "args": [
+                        "schema",
+                        "-s",
+                        "echo"
+                    ]
+                }
+            }
+        }
+'@
+        $oldPath = $env:DSC_RESOURCE_PATH
+        try {
+            $env:DSC_RESOURCE_PATH = $testdrive
+            Set-Content -Path "$testdrive/test.dsc.resource.json" -Value $manifest
+            $out = dsc resource list 2>&1
+            $out | Should -Match 'WARN.*?Validation.*?Invalid manifest.*?version'
+        }
+        finally {
+            $env:DSC_RESOURCE_PATH = $oldPath
+        }
+    }
 }

dsc/tests/dsc_tracing.tests.ps1

@@ -7,7 +7,7 @@ Describe 'tracing tests' {
         # @{ level = 'WARNING' } TODO: currently no warnings are emitted
         @{ level = 'info' }
         @{ level = 'debug' }
-        # @{ level = 'trace' } TODO: currently no trace is emitted
+        @{ level = 'trace' }
     ) {
         param($level)
 
@@ -44,4 +44,23 @@ Describe 'tracing tests' {
             $trace.fields.message | Should -Not -BeNullOrEmpty
         }
     }
+
+    It 'trace level <level> emits source info: <sourceExpected>' -TestCases @(
+        @{ level = 'error'; sourceExpected = $false }
+        @{ level = 'warning'; sourceExpected = $false }
+        @{ level = 'info'; sourceExpected = $false }
+        @{ level = 'debug'; sourceExpected = $true }
+        @{ level = 'trace'; sourceExpected = $true }
+    ) {
+        param($level, $sourceExpected)
+
+        $logPath = "$TestDrive/dsc_trace.log"
+        $null = '{}' | dsc -l $level resource get -r 'DoesNotExist' 2> $logPath
+        $log = Get-Content $logPath -Raw
+        if ($sourceExpected) {
+            $log | Should -BeLike "*dsc*: *"
+        } else {
+            $log | Should -Not -BeLike "*dsc*: *"
+        }
+    }
 }

dsc_lib/Cargo.toml

@@ -4,23 +4,24 @@ version = "3.0.0-preview.7"
 edition = "2021"
 
 [dependencies]
-base64 = "0.21"
+base64 = "0.22"
+chrono = "0.4.26"
 derive_builder ="0.20"
 indicatif = { version = "0.17" }
 jsonschema = "0.17"
 num-traits = "0.2"
 regex = "1.7"
-reqwest = { version = "0.11", features = ["blocking"] }
+reqwest = { version = "0.12", features = ["blocking"] }
 schemars = { version = "0.8.12", features = ["preserve_order"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["preserve_order"] }
 serde_yaml = { version = "0.9.3" }
 thiserror = "1.0"
-chrono = "0.4.26"
 security_context_lib = { path = "../security_context_lib" }
+semver = "1.0"
 tracing = "0.1.37"
 tracing-indicatif = { version = "0.3.6" }
-tree-sitter = "0.20"
+tree-sitter = "0.22"
 tree-sitter-dscexpression = { path = "../tree-sitter-dscexpression" }
 
 [dev-dependencies]

dsc_lib/src/discovery/command_discovery.rs

@@ -4,7 +4,7 @@
 use crate::discovery::discovery_trait::ResourceDiscovery;
 use crate::discovery::convert_wildcard_to_regex;
 use crate::dscresources::dscresource::{Capability, DscResource, ImplementedAs};
-use crate::dscresources::resource_manifest::{import_manifest, Kind, ResourceManifest};
+use crate::dscresources::resource_manifest::{import_manifest, validate_semver, Kind, ResourceManifest};
 use crate::dscresources::command_resource::invoke_command;
 use crate::dscresources::command_resource::log_resource_traces;
 use crate::dscerror::DscError;
@@ -380,6 +380,10 @@ fn load_manifest(path: &Path) -> Result<DscResource, DscError> {
         }
     };
 
+    if let Err(err) = validate_semver(&manifest.version) {
+        return Err(DscError::Validation(format!("Invalid manifest {path:?} version value: {err}")));
+    }
+
     let kind = if let Some(kind) = manifest.kind.clone() {
         kind
     } else if manifest.adapter.is_some() {

dsc_lib/src/dscresources/dscresource.rs

@@ -130,13 +130,13 @@ pub trait Invoke {
     fn test(&self, expected: &str) -> Result<TestResult, DscError>;
 
     /// Invoke the delete operation on the resource.
-    /// 
+    ///
     /// # Arguments
-    /// 
+    ///
     /// * `filter` - The filter as JSON to apply to the resource.
-    /// 
+    ///
     /// # Errors
-    /// 
+    ///
     /// This function will return an error if the underlying resource fails.
     fn delete(&self, filter: &str) -> Result<(), DscError>;
 
@@ -256,7 +256,7 @@ impl Invoke for DscResource {
                 let resource_manifest = import_manifest(manifest.clone())?;
                 command_resource::invoke_delete(&resource_manifest, &self.directory, filter)
             },
-        }        
+        }
     }
 
     fn validate(&self, config: &str) -> Result<ValidateResult, DscError> {

dsc_lib/src/dscresources/resource_manifest.rs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 use schemars::JsonSchema;
+use semver::Version;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::collections::HashMap;
@@ -27,7 +28,7 @@ pub struct ResourceManifest {
     /// The kind of resource.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub kind: Option<Kind>,
-    /// The version of the resource.
+    /// The version of the resource using semantic versioning.
     pub version: String,
     /// The description of the resource.
     pub description: Option<String>,
@@ -248,11 +249,29 @@ pub struct ListMethod {
 ///
 /// * `DscError` - The JSON value is invalid or the schema version is not supported.
 pub fn import_manifest(manifest: Value) -> Result<ResourceManifest, DscError> {
+    // TODO: enable schema version validation, if not provided, use the latest
     // const MANIFEST_SCHEMA_VERSION: &str = "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/bundled/resource/manifest.json";
     let manifest = serde_json::from_value::<ResourceManifest>(manifest)?;
     // if !manifest.schema_version.eq(MANIFEST_SCHEMA_VERSION) {
     //     return Err(DscError::InvalidManifestSchemaVersion(manifest.schema_version, MANIFEST_SCHEMA_VERSION.to_string()));
     // }
-
     Ok(manifest)
 }
+
+/// Validate a semantic version string.
+///
+/// # Arguments
+///
+/// * `version` - The semantic version string to validate.
+///
+/// # Returns
+///
+/// * `Result<(), Error>` - The result of the validation.
+///
+/// # Errors
+///
+/// * `Error` - The version string is not a valid semantic version.
+pub fn validate_semver(version: &str) -> Result<(), semver::Error> {
+    Version::parse(version)?;
+    Ok(())
+}

dsc_lib/src/parser/mod.rs

@@ -26,7 +26,7 @@ impl Statement {
     /// This function will return an error if the underlying parser fails to initialize.
     pub fn new() -> Result<Self, DscError> {
         let mut parser = Parser::new();
-        parser.set_language(tree_sitter_dscexpression::language())?;
+        parser.set_language(&tree_sitter_dscexpression::language())?;
         let function_dispatcher = FunctionDispatcher::new();
         Ok(Self {
             parser,

tree-sitter-dscexpression/.gitignore

@@ -0,0 +1,38 @@
+# Rust artifacts
+Cargo.lock
+target/
+
+# Node artifacts
+build/
+prebuilds/
+node_modules/
+*.tgz
+
+# Swift artifacts
+.build/
+
+# Go artifacts
+go.sum
+_obj/
+
+# Python artifacts
+.venv/
+dist/
+*.egg-info
+*.whl
+
+# C artifacts
+*.a
+*.so
+*.so.*
+*.dylib
+*.dll
+*.pc
+
+# Example dirs
+/examples/*/
+
+# Grammar volatiles
+*.wasm
+*.obj
+*.o