Merge branch 'main' into terminate-process

PowerShell · Sep 30, 2023 · 8350129 · 8350129
2 parents 3b0548f + a29556e
commit 8350129
Show file tree

Hide file tree

Showing 56 changed files with 2,492 additions and 751 deletions.
diff --git a/dsc/Cargo.toml b/dsc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dsc"
-version = "0.1.0"
+version = "3.0.0-alpha.4"
 edition = "2021"
 
 [profile.release]

diff --git a/dsc/src/args.rs b/dsc/src/args.rs
@@ -11,7 +11,7 @@ pub enum OutputFormat {
 }
 
 #[derive(Debug, Parser)]
-#[clap(name = "dsc", version = "0.2.0", about = "Apply configuration or invoke specific DSC resources", long_about = None)]
+#[clap(name = "dsc", version = "3.0.0-alpha.4", about = "Apply configuration or invoke specific DSC resources", long_about = None)]
 pub struct Args {
     /// The subcommand to run
     #[clap(subcommand)]

diff --git a/dsc_lib/Cargo.toml b/dsc_lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dsc_lib"
-version = "0.1.0"
+version = "3.0.0-alpha.4"
 edition = "2021"
 
 [dependencies]

diff --git a/schemas/2023/08/bundled/config/document.json b/schemas/2023/08/bundled/config/document.json
@@ -14,7 +14,9 @@
       "description": "This property must be the canonical URL of the DSC Configuration Document schema that the document is implemented for.",
       "type": "string",
       "format": "uri",
-      "enum": ["https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json"]
+      "enum": [
+        "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json"
+      ]
     },
     "parameters": {
       "title": "DSC Configuration document parameters",
@@ -51,7 +53,9 @@
       "title": "Parameter",
       "description": "Defines a runtime option for a DSC Configuration Document.",
       "type": "object",
-      "required": "type",
+      "required": [
+        "type"
+      ],
       "properties": {
         "type": {
           "$ref": "/PowerShell/DSC/main/schemas/2023/08/definitions/parameters/dataTypes.json"
@@ -351,4 +355,4 @@
       "minLength": 1
     }
   }
-}
+}
diff --git a/schemas/2023/08/bundled/config/document.vscode.json b/schemas/2023/08/bundled/config/document.vscode.json
diff --git a/schemas/2023/08/bundled/outputs/config/get.json b/schemas/2023/08/bundled/outputs/config/get.json
@@ -30,7 +30,7 @@
             "$ref": "/PowerShell/DSC/main/schemas/2023/08/definitions/resourceType.json"
           },
           "result": {
-            "$ref": "/PowerShell/DSC/main/schemas/2023/08/results/resource/get.json"
+            "$ref": "/PowerShell/DSC/main/schemas/2023/08/outputs/resource/get.json"
           }
         }
       }
@@ -60,6 +60,23 @@
       "type": "string",
       "pattern": "^\\w+(\\.\\w+){0,2}\\/\\w+$"
     },
+    "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/outputs/resource/get.json": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "$id": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/outputs/resource/get.json",
+      "title": "dsc resource get result",
+      "description": "Describes the return data for a DSC Resource instance from the `dsc resource get` command.",
+      "type": "object",
+      "required": [
+        "actualState"
+      ],
+      "properties": {
+        "actualState": {
+          "title": "Actual state",
+          "description": "This property always represents the current state of the DSC Resource instance as returned by its `get` method. DSC validates this return value against the DSC Resource's schema.",
+          "type": "object"
+        }
+      }
+    },
     "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/definitions/messages.json": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
       "$id": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/definitions/messages.json",

diff --git a/schemas/2023/08/bundled/outputs/config/set.json b/schemas/2023/08/bundled/outputs/config/set.json
@@ -30,7 +30,7 @@
             "$ref": "/PowerShell/DSC/main/schemas/2023/08/definitions/resourceType.json"
           },
           "result": {
-            "$ref": "/PowerShell/DSC/main/schemas/2023/08/results/resource/set.json"
+            "$ref": "/PowerShell/DSC/main/schemas/2023/08/outputs/resource/set.json"
           }
         }
       }
@@ -60,6 +60,39 @@
       "type": "string",
       "pattern": "^\\w+(\\.\\w+){0,2}\\/\\w+$"
     },
+    "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/outputs/resource/set.json": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "$id": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/outputs/resource/set.json",
+      "title": "dsc resource set result",
+      "description": "Describes the return data for a DSC Resource instance from the `dsc resource set` command.",
+      "type": "object",
+      "required": [
+        "beforeState",
+        "afterState",
+        "changedProperties"
+      ],
+      "properties": {
+        "beforeState": {
+          "title": "State before enforcing",
+          "description": "This property always represents the desired state of the DSC Resource instance before the `set` method runs. DSC validates this return value against the DSC Resource's schema.",
+          "type": "object"
+        },
+        "afterState": {
+          "title": "State after enforcing",
+          "description": "This property always represents the current state of the DSC Resource instance as returned by its `set` method after enforcing the desired state. DSC validates this return value against the DSC Resource's schema.",
+          "type": "object"
+        },
+        "changedProperties": {
+          "title": "Changed properties",
+          "description": "This property always represents the list of property names for the DSC Resource instance that the `set` method modified. When this value is an empty array, the `set` method didn't enforce any properties for the instance.",
+          "type": "array",
+          "default": [],
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/definitions/messages.json": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
       "$id": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/definitions/messages.json",

diff --git a/schemas/2023/08/bundled/outputs/config/test.json b/schemas/2023/08/bundled/outputs/config/test.json
@@ -30,7 +30,7 @@
             "$ref": "/PowerShell/DSC/main/schemas/2023/08/definitions/resourceType.json"
           },
           "result": {
-            "$ref": "/PowerShell/DSC/main/schemas/2023/08/results/resource/test.json"
+            "$ref": "/PowerShell/DSC/main/schemas/2023/08/outputs/resource/test.json"
           }
         }
       }
@@ -60,6 +60,45 @@
       "type": "string",
       "pattern": "^\\w+(\\.\\w+){0,2}\\/\\w+$"
     },
+    "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/outputs/resource/test.json": {
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "$id": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/outputs/resource/test.json",
+      "title": "dsc resource test result",
+      "description": "Describes the return data for a DSC Resource instance from the `dsc resource test` command.",
+      "type": "object",
+      "required": [
+        "desiredState",
+        "actualState",
+        "inDesiredState",
+        "differingProperties"
+      ],
+      "properties": {
+        "desiredState": {
+          "title": "Desired state",
+          "description": "This property always represents the desired state of the DSC Resource instance as specified to DSC.",
+          "type": "object"
+        },
+        "actualState": {
+          "title": "Actual state",
+          "description": "This property always represents the current state of the DSC Resource instance as returned by its `test` method or, if the DSC Resource doesn't define the `test` method, by its `get` method. DSC validates this return value against the DSC Resource's schema.",
+          "type": "object"
+        },
+        "inDesiredState": {
+          "title": "Instance is in the desired state",
+          "description": "This property indicates whether the instance is in the desired state.",
+          "type": "boolean"
+        },
+        "differingProperties": {
+          "title": "Differing properties",
+          "description": "This property always represents the list of property names for the DSC Resource instance that aren't in the desired state. When this property is an empty array, the instance is in the desired state.",
+          "type": "array",
+          "default": [],
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/definitions/messages.json": {
       "$schema": "https://json-schema.org/draft/2020-12/schema",
       "$id": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/definitions/messages.json",

diff --git a/schemas/2023/08/bundled/outputs/resource/get.json b/schemas/2023/08/bundled/outputs/resource/get.json
@@ -4,7 +4,9 @@
   "title": "dsc resource get result",
   "description": "Describes the return data for a DSC Resource instance from the `dsc resource get` command.",
   "type": "object",
-  "required": "actualState",
+  "required": [
+    "actualState"
+  ],
   "properties": {
     "actualState": {
       "title": "Actual state",