Skip to content

Commit 9ef3fc9

Browse files
committed
Revert workaround in "Attempt to use DSCv3 resources even if they were not found microsoft#5443"
1 parent 512bc31 commit 9ef3fc9

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

src/Microsoft.Management.Configuration.Processor/DSCv3/Helpers/ProcessorRunSettings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ public static ProcessorRunSettings CreateFromFindUnitProcessorsOptions(FindUnitP
4747
/// </summary>
4848
/// <param name="resourceDetails">The resource details to be used.</param>
4949
/// <returns>A ProcessorRunSettings.</returns>
50-
public static ProcessorRunSettings CreateFromResourceDetails(ResourceDetails? resourceDetails)
50+
public static ProcessorRunSettings CreateFromResourceDetails(ResourceDetails resourceDetails)
5151
{
5252
return new ProcessorRunSettings
5353
{
54-
ResourceSearchPaths = Path.GetDirectoryName(resourceDetails?.Path) ?? string.Empty,
54+
ResourceSearchPaths = Path.GetDirectoryName(resourceDetails.Path) ?? string.Empty,
5555
ResourceSearchPathsExclusive = false,
5656
};
5757
}

src/Microsoft.Management.Configuration.Processor/DSCv3/Set/DSCv3ConfigurationSetProcessor.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ protected override IConfigurationUnitProcessor CreateUnitProcessorInternal(Confi
4141
if (resourceDetails == null)
4242
{
4343
this.OnDiagnostics(DiagnosticLevel.Verbose, $"Resource not found: {configurationUnitInternal.QualifiedName}");
44-
45-
// Don't throw when the resource is not found until https://github.com/PowerShell/DSC/issues/786 is resolved
46-
// throw new Exceptions.FindDscResourceNotFoundException(configurationUnitInternal.QualifiedName, null);
44+
throw new Exceptions.FindDscResourceNotFoundException(configurationUnitInternal.QualifiedName, null);
4745
}
4846

4947
return new DSCv3ConfigurationUnitProcessor(this.processorSettings, resourceDetails, configurationUnitInternal, this.IsLimitMode) { SetProcessorFactory = this.SetProcessorFactory };

src/Microsoft.Management.Configuration.Processor/DSCv3/Unit/DSCv3ConfigurationUnitProcessor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace Microsoft.Management.Configuration.Processor.DSCv3.Unit
2121
internal sealed partial class DSCv3ConfigurationUnitProcessor : ConfigurationUnitProcessorBase, IConfigurationUnitProcessor, IGetAllSettingsConfigurationUnitProcessor, IGetAllUnitsConfigurationUnitProcessor, IDiagnosticsSink
2222
{
2323
private readonly ProcessorSettings processorSettings;
24-
private readonly ResourceDetails? resourceDetails;
24+
private readonly ResourceDetails resourceDetails;
2525

2626
/// <summary>
2727
/// Initializes a new instance of the <see cref="DSCv3ConfigurationUnitProcessor"/> class.
@@ -30,7 +30,7 @@ internal sealed partial class DSCv3ConfigurationUnitProcessor : ConfigurationUni
3030
/// <param name="resourceDetails">The resource to use.</param>
3131
/// <param name="unitInternal">Internal unit.</param>
3232
/// <param name="isLimitMode">Whether it is under limit mode.</param>
33-
internal DSCv3ConfigurationUnitProcessor(ProcessorSettings processorSettings, ResourceDetails? resourceDetails, ConfigurationUnitInternal unitInternal, bool isLimitMode = false)
33+
internal DSCv3ConfigurationUnitProcessor(ProcessorSettings processorSettings, ResourceDetails resourceDetails, ConfigurationUnitInternal unitInternal, bool isLimitMode = false)
3434
: base(unitInternal, isLimitMode)
3535
{
3636
this.processorSettings = processorSettings;

src/Microsoft.Management.Configuration.UnitTests/Tests/DSCv3ProcessorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void Set_UnitPropertyDetailsCached()
9393
/// <summary>
9494
/// Test for unit processor creation requiring resource to be found.
9595
/// </summary>
96-
[Fact(Skip = "Disable this test while we have the bypass in place")]
96+
[Fact]
9797
public void Set_ResourceNotFoundIsError()
9898
{
9999
var (factory, dsc) = CreateTestFactory();

0 commit comments

Comments
 (0)