Skip to content

Commit

Permalink
Merge pull request #156 from michaeltlombardi/maint/main/update-confi…
Browse files Browse the repository at this point in the history
…g-schema-uri

(MAINT) Update config schema
  • Loading branch information
SteveL-MSFT authored Aug 22, 2023
2 parents 48770b3 + e2520f2 commit ac47873
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions dsc/examples/assertion.dsc.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Example configuration that uses assertions to validate the environment before running the configuration.
$schema: https://schemas.microsoft.com/dsc/2023/03/configuration.schema.json
$schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
resources:
- name: my assertions
type: DSC/AssertionGroup
properties:
$schema: https://schemas.microsoft.com/dsc/2023/03/configuration.schema.json
$schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
resources:
- name: os
type: Microsoft/OSInfo
Expand Down
2 changes: 1 addition & 1 deletion dsc/examples/invalid_schema.dsc.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Sample configuration with invalid properties that don't match the resource schema.
$schema: https://schemas.microsoft.com/dsc/2023/03/configuration.schema.json
$schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
resources:
- name: os
type: Microsoft/OSInfo
Expand Down
2 changes: 1 addition & 1 deletion dsc/examples/osinfo.dsc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.microsoft.com/dsc/2023/03/configuration.schema.json",
"$schema": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json",
"resources": [
{
"name": "os",
Expand Down
2 changes: 1 addition & 1 deletion dsc/examples/osinfo_registry.dsc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schemas.microsoft.com/dsc/2023/03/configuration.schema.json",
"$schema": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json",
"metadata": {
"description": "Simple example using two different resources and one of them twice."
},
Expand Down
2 changes: 1 addition & 1 deletion dsc/examples/osinfo_registry.dsc.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Simple example using two different resources and one of them twice.
$schema: https://schemas.microsoft.com/dsc/2023/03/configuration.schema.json
$schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
resources:
- name: os
type: Microsoft/OSInfo
Expand Down
2 changes: 1 addition & 1 deletion dsc/examples/parallel.dsc.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Example on how concurrency would be defined in the configuration.
$schema: https://schemas.microsoft.com/dsc/2023/03/configuration.schema.json
$schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
metadata:
_timeoutSeconds: 600 # example of setting timeout for orchestration, should be namespaced?
resources:
Expand Down
2 changes: 1 addition & 1 deletion dsc/examples/powershell.dsc.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Example configuration mixing native app resources with classic PS resources
$schema: https://schemas.microsoft.com/dsc/2023/03/configuration.schema.json
$schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
resources:
- name: Use class PowerShell resources
type: DSC/PowerShellGroup
Expand Down
2 changes: 1 addition & 1 deletion dsc_lib/src/configure/config_doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ pub struct Resource {
pub properties: Option<HashMap<String, Value>>,
}

const SCHEMA: &str = "https://schemas.microsoft.com/dsc/2023/03/configuration.schema.json";
const SCHEMA: &str = "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json";

impl Default for Configuration {
fn default() -> Self {
Expand Down

0 comments on commit ac47873

Please sign in to comment.