diff --git a/docs/reference/schemas/config/functions/overview.md b/docs/reference/schemas/config/functions/overview.md index fa27a628c..e03436442 100644 --- a/docs/reference/schemas/config/functions/overview.md +++ b/docs/reference/schemas/config/functions/overview.md @@ -308,7 +308,7 @@ parameters: list: { type: array } resources: - - name: Acess the properties of an object + - name: Access the properties of an object type: Test/Echo properties: output: @@ -394,7 +394,7 @@ results: - metadata: Microsoft.DSC: duration: PT0.0760186S - name: Acess the properties of an object + name: Access the properties of an object type: Test/Echo result: actualState: @@ -417,7 +417,7 @@ parameters: list: { type: array } resources: - - name: Acess items in an array + - name: Access items in an array type: Test/Echo properties: output: @@ -441,7 +441,7 @@ results: - metadata: Microsoft.DSC: duration: PT0.0750682S - name: Acess items in an array + name: Access items in an array type: Test/Echo result: actualState: @@ -476,7 +476,7 @@ parameters: list: { type: array } resources: - - name: Acess items in a nested array + - name: Access items in a nested array type: Test/Echo properties: output: @@ -496,7 +496,7 @@ results: - metadata: Microsoft.DSC: duration: PT0.1349442S - name: Acess items in a nested array + name: Access items in a nested array type: Test/Echo result: actualState: diff --git a/dsc/locales/en-us.toml b/dsc/locales/en-us.toml index baa687b6a..aca7372d8 100644 --- a/dsc/locales/en-us.toml +++ b/dsc/locales/en-us.toml @@ -58,7 +58,7 @@ failedToOpenFile = "Failed to open included file" invalidFileContent = "Invalid UTF-8 sequence in included file" invalidFile = "Failed to read the configuration file as YAML or JSON" resolvingParameters = "Resolving parameters from file" -failedParseParametersFile = "Failed to parse parameters file or conetnt to JSON" +failedParseParametersFile = "Failed to parse parameters file or content to JSON" couldNotReadParametersFile = "Could not read parameters file" invalidPath = "Include path must not contain '..'" failedGetCurrentDirectory = "Failed to get current directory" @@ -79,7 +79,7 @@ currentDirectory = "current directory" noParameters = "No parameters specified" parameters = "Parameters specified" failedConvertJson = "Failed to convert YAML to JSON" -invalidParamters = "Parameters are not valid JSON or YAML" +invalidParameters = "Parameters are not valid JSON or YAML" invalidPath = "Target path does not exist" failedSetParameters = "Parameter input failure" invalidInclude = "Failed to deserialize Include input" @@ -109,7 +109,7 @@ invalidManifest = "Error in manifest for" failedToConvertJsonToString = "Failed to convert JSON to string" failedToReadTracingSetting = "Could not read 'tracing' setting" invalidTraceLevel = "Default to 'warn', invalid DSC_TRACE_LEVEL value" -failedToSetTracing = "Unable to set global default tracing subscriber. Tracing is diabled." +failedToSetTracing = "Unable to set global default tracing subscriber. Tracing is disabled." validatingSchema = "Validating against schema" failedToCompileSchema = "JSON Schema Compilation" validationFailed = "Failed validation" diff --git a/dsc/src/main.rs b/dsc/src/main.rs index ddcb475ef..cf977777c 100644 --- a/dsc/src/main.rs +++ b/dsc/src/main.rs @@ -137,7 +137,7 @@ fn check_debug() { } } -// Check if the dsc binary parent process is WinStore.App or Exploerer.exe +// Check if the dsc binary parent process is WinStore.App or Explorer.exe #[cfg(windows)] fn check_store() { use std::io::Read; diff --git a/dsc/src/subcommand.rs b/dsc/src/subcommand.rs index 321cb795b..177638649 100644 --- a/dsc/src/subcommand.rs +++ b/dsc/src/subcommand.rs @@ -329,7 +329,7 @@ pub fn config(subcommand: &ConfigSubCommand, parameters: &Option, mounte } }, Err(err) => { - error!("{}: {err}", t!("subcommand.invalidParamters")); + error!("{}: {err}", t!("subcommand.invalidParameters")); exit(EXIT_INVALID_INPUT); } } diff --git a/dsc/tests/dsc_resource_test.tests.ps1 b/dsc/tests/dsc_resource_test.tests.ps1 index 44971e4b3..ad898e54e 100644 --- a/dsc/tests/dsc_resource_test.tests.ps1 +++ b/dsc/tests/dsc_resource_test.tests.ps1 @@ -21,9 +21,9 @@ Describe 'Invoke a resource test directly' { $out.inDesiredState | Should -Be $true } - It 'test returns proper error code if no input is provded' { + It 'test returns proper error code if no input is provided' { $out = dsc resource test -r Microsoft/OSInfo 2>&1 $LASTEXITCODE | Should -Be 1 $out | Should -BeLike '*ERROR*' } -} +} \ No newline at end of file diff --git a/dsc/tests/dsc_variables.tests.ps1 b/dsc/tests/dsc_variables.tests.ps1 index 95d3d3483..6d28325e0 100644 --- a/dsc/tests/dsc_variables.tests.ps1 +++ b/dsc/tests/dsc_variables.tests.ps1 @@ -2,15 +2,15 @@ # Licensed under the MIT License. Describe 'Configruation variables tests' { - It 'Variables example config works' { - $configFile = "$PSSCriptRoot/../examples/variables.dsc.yaml" - $out = dsc config get -f $configFile | ConvertFrom-Json - $LASTEXITCODE | Should -Be 0 - $out.results[0].result.actualState.output | Should -BeExactly 'myOutput is: Hello world!, myObject is: baz' - } + It 'Variables example config works' { + $configFile = "$PSSCriptRoot/../examples/variables.dsc.yaml" + $out = dsc config get -f $configFile | ConvertFrom-Json + $LASTEXITCODE | Should -Be 0 + $out.results[0].result.actualState.output | Should -BeExactly 'myOutput is: Hello world!, myObject is: baz' + } - It 'Duplicated variable takes last value' { - $configYaml = @' + It 'Duplicated variable takes last value' { + $configYaml = @' $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/config/document.json variables: myVariable: foo @@ -21,14 +21,14 @@ resources: properties: output: "[variables('myVariable')]" '@ - $out = dsc config get -i $configYaml | ConvertFrom-Json - Write-Verbose -Verbose $out - $LASTEXITCODE | Should -Be 0 - $out.results[0].result.actualState.output | Should -Be 'bar' - } + $out = dsc config get -i $configYaml | ConvertFrom-Json + Write-Verbose -Verbose $out + $LASTEXITCODE | Should -Be 0 + $out.results[0].result.actualState.output | Should -Be 'bar' + } - It 'Missing variable returns error' { - $configYaml = @' + It 'Missing variable returns error' { + $configYaml = @' $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2024/04/config/document.json variables: hello: world @@ -38,9 +38,9 @@ resources: properties: output: "[variables('myVariable')]" '@ - $out = dsc config get -i $configYaml 2>&1 | Out-String - Write-Verbose -Verbose $out - $LASTEXITCODE | Should -Be 2 - $out | Should -BeLike "*Variable 'myVariable' does not exist or has not been initialized yet*" - } + $out = dsc config get -i $configYaml 2>&1 | Out-String + Write-Verbose -Verbose $out + $LASTEXITCODE | Should -Be 2 + $out | Should -BeLike "*Variable 'myVariable' does not exist or has not been initialized yet*" + } } diff --git a/dsc_lib/src/dscresources/dscresource.rs b/dsc_lib/src/dscresources/dscresource.rs index 868a9098d..ab673522b 100644 --- a/dsc_lib/src/dscresources/dscresource.rs +++ b/dsc_lib/src/dscresources/dscresource.rs @@ -46,7 +46,7 @@ pub struct DscResource { #[derive(Clone, Debug, PartialEq, Deserialize, Serialize, JsonSchema)] pub enum Capability { - /// The resource supports retriving configuration. + /// The resource supports retrieving configuration. Get, /// The resource supports applying configuration. Set, diff --git a/registry/src/main.rs b/registry/src/main.rs index 7b078d79c..d76663a11 100644 --- a/registry/src/main.rs +++ b/registry/src/main.rs @@ -135,7 +135,7 @@ pub fn enable_tracing() { let subscriber = tracing_subscriber::Registry::default().with(fmt).with(filter); if tracing::subscriber::set_global_default(subscriber).is_err() { - eprintln!("Unable to set global default tracing subscriber. Tracing is diabled."); + eprintln!("Unable to set global default tracing subscriber. Tracing is disabled."); } } diff --git a/runcommandonset/locales/en-us.toml b/runcommandonset/locales/en-us.toml index 5c043751d..c9b08fdde 100644 --- a/runcommandonset/locales/en-us.toml +++ b/runcommandonset/locales/en-us.toml @@ -19,4 +19,4 @@ failedReadStderr = "Failed to read stderr for" failedReadStdout = "Failed to read stdout for" failedWait = "Failed to wait for" invalidInput = "Input is not valid" -unableToTrace = "Unable to set global default tracing subscriber. Tracing is diabled." +unableToTrace = "Unable to set global default tracing subscriber. Tracing is disabled."