Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 42 additions & 9 deletions DSCResources/ResourceController/ResourceController.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ function Get-TargetResource
[System.String]
$ResourceName,

[Parameter()]
[System.String]
$ResourceModuleName,

[Parameter()]
[System.String]
$Properties,
Expand All @@ -34,7 +38,7 @@ function Get-TargetResource
$ResourceVersion,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance[]]
[Microsoft.Management.Infrastructure.CimInstance[]]
$Credentials
)

Expand All @@ -43,7 +47,14 @@ function Get-TargetResource
$PropertiesHashTable = [scriptblock]::Create($Properties).Invoke()
$PropertiesHashTable = ConvertTo-Hashtable -Hashtable $PropertiesHashTable -Credentials $Credentials

$dscResource = (Get-DscResource -Name $ResourceName).Where( {$_.Version -eq $ResourceVersion})[0]
if ($ResourceModuleName)
{
$dscResource = (Get-DscResource -Name $ResourceName -Module $ResourceModuleName).Where( {$_.Version -eq $ResourceVersion})[0]
}
else
{
$dscResource = (Get-DscResource -Name $ResourceName).Where( {$_.Version -eq $ResourceVersion})[0]
}

try
{
Expand Down Expand Up @@ -114,6 +125,10 @@ function Test-TargetResource
[string]
$ResourceName,

[Parameter()]
[System.String]
$ResourceModuleName,

[Parameter()]
[System.String]
$Properties,
Expand All @@ -131,7 +146,7 @@ function Test-TargetResource
$ResourceVersion,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance[]]
[Microsoft.Management.Infrastructure.CimInstance[]]
$Credentials
)

Expand All @@ -140,7 +155,14 @@ function Test-TargetResource
$PropertiesHashTable = [scriptblock]::Create($Properties).Invoke()
$PropertiesHashTable = ConvertTo-Hashtable -Hashtable $PropertiesHashTable -Credentials $Credentials

$dscResource = (Get-DscResource -Name $ResourceName).Where( {$_.Version -eq $ResourceVersion})[0]
if ($ResourceModuleName)
{
$dscResource = (Get-DscResource -Name $ResourceName -Module $ResourceModuleName).Where( {$_.Version -eq $ResourceVersion})[0]
}
else
{
$dscResource = (Get-DscResource -Name $ResourceName).Where( {$_.Version -eq $ResourceVersion})[0]
}

try
{
Expand Down Expand Up @@ -184,6 +206,10 @@ function Set-TargetResource
[string]
$ResourceName,

[Parameter()]
[System.String]
$ResourceModuleName,

[Parameter()]
[System.String]
$Properties,
Expand All @@ -201,7 +227,7 @@ function Set-TargetResource
$ResourceVersion,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance[]]
[Microsoft.Management.Infrastructure.CimInstance[]]
$Credentials
)

Expand Down Expand Up @@ -238,12 +264,19 @@ function Set-TargetResource
return
}

$functionName = "Set-TargetResource"
$functionName = "Set-TargetResource"

$PropertiesHashTable = [scriptblock]::Create($Properties).Invoke()
$PropertiesHashTable = ConvertTo-Hashtable -Hashtable $PropertiesHashTable -Credentials $Credentials

$dscResource = (Get-DscResource -Name $ResourceName).Where( {$_.Version -eq $ResourceVersion})[0]
if ($ResourceModuleName)
{
$dscResource = (Get-DscResource -Name $ResourceName -Module $ResourceModuleName).Where( {$_.Version -eq $ResourceVersion})[0]
}
else
{
$dscResource = (Get-DscResource -Name $ResourceName).Where( {$_.Version -eq $ResourceVersion})[0]
}

try
{
Expand Down Expand Up @@ -550,7 +583,7 @@ function ConvertTo-Hashtable
$Hashtable,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance[]]
[Microsoft.Management.Infrastructure.CimInstance[]]
$Credentials
)

Expand All @@ -561,7 +594,7 @@ function ConvertTo-Hashtable
{
$split = $Hashtable.$row -split ':', 2
$credential = $Credentials | Where-Object -FilterScript { $_.Name -eq $split[1] } | Select-Object -First 1

$password = ConvertTo-SecureString -String $credential.Credential.Password -AsPlainText -Force
$credentialObject = [PsCredential]::new($credential.Credential.UserName, $password)

Expand Down
5 changes: 3 additions & 2 deletions DSCResources/ResourceController/ResourceController.schema.mof
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ class ResourceController : OMI_BaseResource
{
[Key] String InstanceName;
[Required] String ResourceName;
[Write, Description("")] String Properties;
[Write] String ResourceModuleName;
[Write, Description("")] String Properties;
[Read, EmbeddedInstance("MSFT_KeyValuePair"), Description("")] String Result[];
[Write] Boolean SuppressReboot;
[Write, EmbeddedInstance("MaintenanceWindow")] string MaintenanceWindow[];
Expand All @@ -26,7 +27,7 @@ class MaintenanceWindow

[ClassVersion("1.0.0.0")]
class Credential
{
{
[Required] String Name;
[Required,EmbeddedInstance("MSFT_Credential")] string Credential;
};
13 changes: 7 additions & 6 deletions Examples/ResourceController_Examples.ps1
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
ResourceController 'newtest'
{
InstanceName = 'newtest'
ResourceName = 'Registry'
ResourceVersion = '1.1'
Credentials = @(
InstanceName = 'newtest'
ResourceName = 'Registry'
ResourceModuleName = 'PSDscResources'
ResourceVersion = '1.1'
Credentials = @(
Credential {
Name = 'Cred1'
Name = 'Cred1'
Credential = $cred
}
Credential {
Name = 'Cred2'
Name = 'Cred2'
Credential = $cred2
}
)
Expand Down
2 changes: 1 addition & 1 deletion ResourceControllerDSC.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

# Version number of this module.

ModuleVersion = '2.0.1'
ModuleVersion = '2.0.2'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down
Loading