Revert workaround in "Attempt to use DSCv3 resources even if they were not found microsoft#5443"

yao-msft · yao-msft · commit 9ef3fc9259d3 · 2025-06-06T15:54:02.000-07:00
diff --git a/src/Microsoft.Management.Configuration.Processor/DSCv3/Helpers/ProcessorRunSettings.cs b/src/Microsoft.Management.Configuration.Processor/DSCv3/Helpers/ProcessorRunSettings.cs
@@ -47,11 +47,11 @@ public static ProcessorRunSettings CreateFromFindUnitProcessorsOptions(FindUnitP
         /// </summary>
         /// <param name="resourceDetails">The resource details to be used.</param>
         /// <returns>A ProcessorRunSettings.</returns>
-        public static ProcessorRunSettings CreateFromResourceDetails(ResourceDetails? resourceDetails)
+        public static ProcessorRunSettings CreateFromResourceDetails(ResourceDetails resourceDetails)
         {
             return new ProcessorRunSettings
             {
-                ResourceSearchPaths = Path.GetDirectoryName(resourceDetails?.Path) ?? string.Empty,
+                ResourceSearchPaths = Path.GetDirectoryName(resourceDetails.Path) ?? string.Empty,
                 ResourceSearchPathsExclusive = false,
             };
         }
diff --git a/src/Microsoft.Management.Configuration.Processor/DSCv3/Set/DSCv3ConfigurationSetProcessor.cs b/src/Microsoft.Management.Configuration.Processor/DSCv3/Set/DSCv3ConfigurationSetProcessor.cs
@@ -41,9 +41,7 @@ protected override IConfigurationUnitProcessor CreateUnitProcessorInternal(Confi
             if (resourceDetails == null)
             {
                 this.OnDiagnostics(DiagnosticLevel.Verbose, $"Resource not found: {configurationUnitInternal.QualifiedName}");
-
-                // Don't throw when the resource is not found until https://github.com/PowerShell/DSC/issues/786 is resolved
-                // throw new Exceptions.FindDscResourceNotFoundException(configurationUnitInternal.QualifiedName, null);
+                throw new Exceptions.FindDscResourceNotFoundException(configurationUnitInternal.QualifiedName, null);
             }
 
             return new DSCv3ConfigurationUnitProcessor(this.processorSettings, resourceDetails, configurationUnitInternal, this.IsLimitMode) { SetProcessorFactory = this.SetProcessorFactory };
diff --git a/src/Microsoft.Management.Configuration.Processor/DSCv3/Unit/DSCv3ConfigurationUnitProcessor.cs b/src/Microsoft.Management.Configuration.Processor/DSCv3/Unit/DSCv3ConfigurationUnitProcessor.cs
@@ -21,7 +21,7 @@ namespace Microsoft.Management.Configuration.Processor.DSCv3.Unit
     internal sealed partial class DSCv3ConfigurationUnitProcessor : ConfigurationUnitProcessorBase, IConfigurationUnitProcessor, IGetAllSettingsConfigurationUnitProcessor, IGetAllUnitsConfigurationUnitProcessor, IDiagnosticsSink
     {
         private readonly ProcessorSettings processorSettings;
-        private readonly ResourceDetails? resourceDetails;
+        private readonly ResourceDetails resourceDetails;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DSCv3ConfigurationUnitProcessor"/> class.
@@ -30,7 +30,7 @@ internal sealed partial class DSCv3ConfigurationUnitProcessor : ConfigurationUni
         /// <param name="resourceDetails">The resource to use.</param>
         /// <param name="unitInternal">Internal unit.</param>
         /// <param name="isLimitMode">Whether it is under limit mode.</param>
-        internal DSCv3ConfigurationUnitProcessor(ProcessorSettings processorSettings, ResourceDetails? resourceDetails, ConfigurationUnitInternal unitInternal, bool isLimitMode = false)
+        internal DSCv3ConfigurationUnitProcessor(ProcessorSettings processorSettings, ResourceDetails resourceDetails, ConfigurationUnitInternal unitInternal, bool isLimitMode = false)
             : base(unitInternal, isLimitMode)
         {
             this.processorSettings = processorSettings;
diff --git a/src/Microsoft.Management.Configuration.UnitTests/Tests/DSCv3ProcessorTests.cs b/src/Microsoft.Management.Configuration.UnitTests/Tests/DSCv3ProcessorTests.cs
@@ -93,7 +93,7 @@ public void Set_UnitPropertyDetailsCached()
         /// <summary>
         /// Test for unit processor creation requiring resource to be found.
         /// </summary>
-        [Fact(Skip = "Disable this test while we have the bypass in place")]
+        [Fact]
         public void Set_ResourceNotFoundIsError()
         {
             var (factory, dsc) = CreateTestFactory();
