Remove unncessary context property

Author: Steve Lee (POWERSHELL HE/HIM) (from Dev Box)

dsc_lib/src/configure/config_doc.rs

@@ -9,13 +9,6 @@ use std::collections::HashMap;
 
 use crate::{dscerror::DscError, schemas::DscRepoSchema};
 
-#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub enum ContextKind {
-    Configuration,
-    Resource,
-}
-
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize, JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub enum SecurityContextKind {
@@ -63,9 +56,6 @@ pub struct MicrosoftDscMetadata {
     /// The security context of the configuration operation, can be specified to be required
     #[serde(rename = "securityContext", skip_serializing_if = "Option::is_none")]
     pub security_context: Option<SecurityContextKind>,
-    /// Identifies if the operation is part of a configuration
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub context: Option<ContextKind>,
 }
 
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize, JsonSchema)]

dsc_lib/src/configure/mod.rs

@@ -709,7 +709,6 @@ impl Configurator {
         Metadata {
             microsoft: Some(
                 MicrosoftDscMetadata {
-                    context: None,
                     version: Some(env!("CARGO_PKG_VERSION").to_string()),
                     operation: Some(operation),
                     execution_type: Some(self.context.execution_type.clone()),

powershell-adapter/psDscAdapter/psDscAdapter.psm1

@@ -362,27 +362,14 @@ function Get-DscResourceObject {
     $inputObj = $jsonInput | ConvertFrom-Json
     $desiredState = [System.Collections.Generic.List[Object]]::new()
 
-    # catch potential for improperly formatted configuration input
-    if ($inputObj.resources -and -not $inputObj.metadata.'Microsoft.DSC'.context -eq 'configuration') {
-        'The input has a top level property named "resources" but is not a configuration. If the input should be a configuration, include the property: "metadata": {"Microsoft.DSC": {"context": "Configuration"}}' | Write-DscTrace -Operation Warn
-    }
-
-    $adapterName = 'Microsoft.DSC/PowerShell'
-
-    if ($null -ne $inputObj.metadata -and $null -ne $inputObj.metadata.'Microsoft.DSC' -and $inputObj.metadata.'Microsoft.DSC'.context -eq 'configuration') {
-        # change the type from pscustomobject to dscResourceObject
-        $inputObj.resources | ForEach-Object -Process {
-            $desiredState += [dscResourceObject]@{
-                name       = $_.name
-                type       = $_.type
-                properties = $_.properties
-            }
+    $inputObj.resources | ForEach-Object -Process {
+        $desiredState += [dscResourceObject]@{
+            name       = $_.name
+            type       = $_.type
+            properties = $_.properties
         }
     }
-    else {
-        Write-DscTrace -Operation Error -Message 'Unexpected input format. The input must be a configuration object.'
-        exit 1
-    }
+
     return $desiredState
 }
 
@@ -535,7 +522,7 @@ class dscResourceCache {
     [dscResourceCacheEntry[]] $ResourceCache
 }
 
-# format expected for configuration and resource output
+# format expected for configuration output
 class dscResourceObject {
     [string] $name
     [string] $type

powershell-adapter/psDscAdapter/win_psDscAdapter.psm1

@@ -268,11 +268,6 @@ function Get-DscResourceObject {
     $inputObj = $jsonInput | ConvertFrom-Json
     $desiredState = [System.Collections.Generic.List[Object]]::new()
 
-    # catch potential for improperly formatted configuration input
-    if ($inputObj.resources -and -not $inputObj.metadata.'Microsoft.DSC'.context -eq 'configuration') {
-        'The input has a top level property named "resources" but is not a configuration. If the input should be a configuration, include the property: "metadata": {"Microsoft.DSC": {"context": "Configuration"}}' | Write-DscTrace -Operation Warn
-    }
-
     # match adapter to version of powershell
     if ($PSVersionTable.PSVersion.Major -le 5) {
         $adapterName = 'Microsoft.Windows/WindowsPowerShell'
@@ -281,20 +276,15 @@ function Get-DscResourceObject {
         $adapterName = 'Microsoft.DSC/PowerShell'
     }
 
-    if ($null -ne $inputObj.metadata -and $null -ne $inputObj.metadata.'Microsoft.DSC' -and $inputObj.metadata.'Microsoft.DSC'.context -eq 'configuration') {
-        # change the type from pscustomobject to dscResourceObject
-        $inputObj.resources | ForEach-Object -Process {
-            $desiredState += [dscResourceObject]@{
-                name       = $_.name
-                type       = $_.type
-                properties = $_.properties
-            }
+    # change the type from pscustomobject to dscResourceObject
+    $inputObj.resources | ForEach-Object -Process {
+        $desiredState += [dscResourceObject]@{
+            name       = $_.name
+            type       = $_.type
+            properties = $_.properties
         }
     }
-    else {
-        Write-DscTrace -Operation Error -Message 'Unexpected input format. Please ensure the input is a valid DSC configuration.'
-        exit 1
-    }
+
     return $desiredState
 }