dsccommunity · PlagueHO · Jul 14, 2018 · Jul 7, 2018 · Jul 7, 2018 · Jul 7, 2018
diff --git a/.vscode/RunAllTests.ps1 b/.vscode/RunAllTests.ps1
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@
 - Enabled PSSA rule violations to fail build - Fixes [Issue #6](https://github.com/PlagueHO/FileContentDsc/issues/6).
 - Updated tests to meet Pester v4 standard.
 - Added Open Code of Conduct.
+- Refactored module folder structure to move resource
+  to root folder of repository and remove test harness - Fixes [Issue #11](https://github.com/PlagueHO/FileContentDsc/issues/11).
 
 ## 1.0.0.0
 

diff --git a/..._IniSettingsFile/DSR_IniSettingsFile.psm1 → ..._IniSettingsFile/DSR_IniSettingsFile.psm1 b/..._IniSettingsFile/DSR_IniSettingsFile.psm1 → ..._IniSettingsFile/DSR_IniSettingsFile.psm1
diff --git a/...ttingsFile/DSR_IniSettingsFile.schema.mof → ...ttingsFile/DSR_IniSettingsFile.schema.mof b/...ttingsFile/DSR_IniSettingsFile.schema.mof → ...ttingsFile/DSR_IniSettingsFile.schema.mof
diff --git a/...SCResources/DSR_IniSettingsFile/README.md → DSCResources/DSR_IniSettingsFile/README.md b/...SCResources/DSR_IniSettingsFile/README.md → DSCResources/DSR_IniSettingsFile/README.md
diff --git a/...File/en-US/DSR_IniSettingsFile.schema.mfl → ...File/en-US/DSR_IniSettingsFile.schema.mfl b/...File/en-US/DSR_IniSettingsFile.schema.mfl → ...File/en-US/DSR_IniSettingsFile.schema.mfl
diff --git a/...le/en-US/DSR_IniSettingsFile.strings.psd1 → ...le/en-US/DSR_IniSettingsFile.strings.psd1 b/...le/en-US/DSR_IniSettingsFile.strings.psd1 → ...le/en-US/DSR_IniSettingsFile.strings.psd1
diff --git a/...eyValuePairFile/DSR_KeyValuePairFile.psm1 → ...eyValuePairFile/DSR_KeyValuePairFile.psm1 b/...eyValuePairFile/DSR_KeyValuePairFile.psm1 → ...eyValuePairFile/DSR_KeyValuePairFile.psm1
diff --git a/...ePairFile/DSR_KeyValuePairFile.schema.mof → ...ePairFile/DSR_KeyValuePairFile.schema.mof b/...ePairFile/DSR_KeyValuePairFile.schema.mof → ...ePairFile/DSR_KeyValuePairFile.schema.mof
diff --git a/...CResources/DSR_KeyValuePairFile/README.md → DSCResources/DSR_KeyValuePairFile/README.md b/...CResources/DSR_KeyValuePairFile/README.md → DSCResources/DSR_KeyValuePairFile/README.md
diff --git a/...ile/en-US/DSR_KeyValuePairFile.schema.mfl → ...ile/en-US/DSR_KeyValuePairFile.schema.mfl b/...ile/en-US/DSR_KeyValuePairFile.schema.mfl → ...ile/en-US/DSR_KeyValuePairFile.schema.mfl
diff --git a/...e/en-US/DSR_KeyValuePairFile.strings.psd1 → ...e/en-US/DSR_KeyValuePairFile.strings.psd1 b/...e/en-US/DSR_KeyValuePairFile.strings.psd1 → ...e/en-US/DSR_KeyValuePairFile.strings.psd1
diff --git a/...rces/DSR_ReplaceText/DSR_ReplaceText.psm1 → ...rces/DSR_ReplaceText/DSR_ReplaceText.psm1 b/...rces/DSR_ReplaceText/DSR_ReplaceText.psm1 → ...rces/DSR_ReplaceText/DSR_ReplaceText.psm1
diff --git a/...SR_ReplaceText/DSR_ReplaceText.schema.mof → ...SR_ReplaceText/DSR_ReplaceText.schema.mof b/...SR_ReplaceText/DSR_ReplaceText.schema.mof → ...SR_ReplaceText/DSR_ReplaceText.schema.mof
diff --git a/...sc/DSCResources/DSR_ReplaceText/README.md → DSCResources/DSR_ReplaceText/README.md b/...sc/DSCResources/DSR_ReplaceText/README.md → DSCResources/DSR_ReplaceText/README.md
diff --git a/...laceText/en-US/DSR_ReplaceText.schema.mfl → ...laceText/en-US/DSR_ReplaceText.schema.mfl b/...laceText/en-US/DSR_ReplaceText.schema.mfl → ...laceText/en-US/DSR_ReplaceText.schema.mfl
diff --git a/...ceText/en-US/DSR_ReplaceText.strings.psd1 → ...ceText/en-US/DSR_ReplaceText.strings.psd1 b/...ceText/en-US/DSR_ReplaceText.strings.psd1 → ...ceText/en-US/DSR_ReplaceText.strings.psd1
diff --git a/...e/1-IniSettingsFile_SetPlainTextEntry.ps1 → ...SettingsFile_SetPlainTextEntry_Config.ps1 b/...e/1-IniSettingsFile_SetPlainTextEntry.ps1 → ...SettingsFile_SetPlainTextEntry_Config.ps1
@@ -1,20 +1,15 @@
+#Requires -module FileContentDsc
+
 <#
-    .EXAMPLE
+    .DESCRIPTION
     Set the `Level` entry in the [Logging] section to `Information`
     in the file `c:\myapp\myapp.ini`.
 #>
 Configuration Example
 {
-    param
-    (
-        [Parameter()]
-        [System.String[]]
-        $NodeName = 'localhost'
-    )
-
     Import-DSCResource -ModuleName FileContentDsc
 
-    Node $NodeName
+    Node localhost
     {
         IniSettingsFile SetLogging
         {

diff --git a/.../2-IniSettingsFile_SetSecretTextEntry.ps1 → ...ettingsFile_SetSecretTextEntry_Config.ps1 b/.../2-IniSettingsFile_SetSecretTextEntry.ps1 → ...ettingsFile_SetSecretTextEntry_Config.ps1
@@ -1,16 +1,14 @@
+#Requires -module FileContentDsc
+
 <#
-    .EXAMPLE
+    .DESCRIPTION
     Set the `ConnectionString` entry in the [Database] section to the password
     provided in the $Secret credential object in the file `c:\myapp\myapp.ini`.
 #>
 Configuration Example
 {
     param
     (
-        [Parameter()]
-        [System.String[]]
-        $NodeName = 'localhost',
-
         [Parameter()]
         [ValidateNotNullorEmpty()]
         [PSCredential]
@@ -19,7 +17,7 @@ Configuration Example
 
     Import-DSCResource -ModuleName FileContentDsc
 
-    Node $NodeName
+    Node localhost
     {
         IniSettingsFile SetConnectionString
         {

diff --git a/...-KeyValuePairFile_RemovePlainTextPair.ps1 → ...uePairFile_RemovePlainTextPair_Config.ps1 b/...-KeyValuePairFile_RemovePlainTextPair.ps1 → ...uePairFile_RemovePlainTextPair_Config.ps1
@@ -1,19 +1,14 @@
+#Requires -module FileContentDsc
+
 <#
-    .EXAMPLE
+    .DESCRIPTION
     Remove all `Core.Logging` keys in the file `c:\myapp\myapp.conf`.
 #>
 Configuration Example
 {
-    param
-    (
-        [Parameter()]
-        [System.String[]]
-        $NodeName = 'localhost'
-    )
-
     Import-DSCResource -ModuleName FileContentDsc
 
-    Node $NodeName
+    Node localhost
     {
         KeyValuePairFile RemoveCoreLogging
         {

diff --git a/...e/1-KeyValuePairFile_SetPlainTextPair.ps1 → ...ValuePairFile_SetPlainTextPair_Config.ps1 b/...e/1-KeyValuePairFile_SetPlainTextPair.ps1 → ...ValuePairFile_SetPlainTextPair_Config.ps1
@@ -1,20 +1,15 @@
+#Requires -module FileContentDsc
+
 <#
-    .EXAMPLE
+    .DESCRIPTION
     Set all `Core.Logging` keys to `Information` or add it
     if it is missing in the file `c:\myapp\myapp.conf`.
 #>
 Configuration Example
 {
-    param
-    (
-        [Parameter()]
-        [System.String[]]
-        $NodeName = 'localhost'
-    )
-
     Import-DSCResource -ModuleName FileContentDsc
 
-    Node $NodeName
+    Node localhost
     {
         KeyValuePairFile SetCoreLogging
         {

diff --git a/.../3-KeyValuePairFile_SetSecretTextPair.ps1 → ...aluePairFile_SetSecretTextPair_Config.ps1 b/.../3-KeyValuePairFile_SetSecretTextPair.ps1 → ...aluePairFile_SetSecretTextPair_Config.ps1
@@ -1,16 +1,14 @@
+#Requires -module FileContentDsc
+
 <#
-    .EXAMPLE
+    .DESCRIPTION
     Set all `Core.Password` keys to the password provided in the $Secret
     credential object or add it if it is missing in the file `c:\myapp\myapp.conf`.
 #>
 Configuration Example
 {
     param
     (
-        [Parameter()]
-        [System.String[]]
-        $NodeName = 'localhost',
-
         [Parameter()]
         [ValidateNotNullorEmpty()]
         [PSCredential]
@@ -19,7 +17,7 @@ Configuration Example
 
     Import-DSCResource -ModuleName FileContentDsc
 
-    Node $NodeName
+    Node localhost
     {
         KeyValuePairFile SetCorePassword
         {

diff --git a/.../3-ReplaceText_ReplacePlainSecretText.ps1 → ...aceText_ReplacePlainSecretText_Config.ps1 b/.../3-ReplaceText_ReplacePlainSecretText.ps1 → ...aceText_ReplacePlainSecretText_Config.ps1
@@ -1,5 +1,7 @@
+#Requires -module FileContentDsc
+
 <#
-    .EXAMPLE
+    .DESCRIPTION
     Set all occrurances of the string `%secret%` to be the value in
     the password set in the parameter $Secret PSCredential object
     in the file `c:\inetpub\wwwroot\default.htm`.
@@ -8,10 +10,6 @@ Configuration Example
 {
     param
     (
-        [Parameter()]
-        [System.String[]]
-        $NodeName = 'localhost',
-
         [Parameter()]
         [ValidateNotNullorEmpty()]
         [PSCredential]
@@ -20,7 +18,7 @@ Configuration Example
 
     Import-DSCResource -ModuleName FileContentDsc
 
-    Node $NodeName
+    Node localhost
     {
         ReplaceText SetSecretText
         {

diff --git a/...ceText/1-ReplaceText_ReplacePlainText.ps1 → ...t/ReplaceText_ReplacePlainText_Config.ps1 b/...ceText/1-ReplaceText_ReplacePlainText.ps1 → ...t/ReplaceText_ReplacePlainText_Config.ps1
@@ -1,20 +1,15 @@
+#Requires -module FileContentDsc
+
 <#
-    .EXAMPLE
+    .DESCRIPTION
     Set all occrurances of the string `%appname%` to be Awesome App`
     in the file `c:\inetpub\wwwroot\default.htm`.
 #>
 Configuration Example
 {
-    param
-    (
-        [Parameter()]
-        [System.String[]]
-        $NodeName = 'localhost'
-    )
-
     Import-DSCResource -ModuleName FileContentDsc
 
-    Node $NodeName
+    Node localhost
     {
         ReplaceText SetText
         {

diff --git a/...ceText/2-ReplaceText_ReplaceRegexText.ps1 → ...t/ReplaceText_ReplaceRegexText_Config.ps1 b/...ceText/2-ReplaceText_ReplaceRegexText.ps1 → ...t/ReplaceText_ReplaceRegexText_Config.ps1
@@ -1,21 +1,16 @@
+#Requires -module FileContentDsc
+
 <#
-    .EXAMPLE
-    Set all occrurances of a string matching the regular expression 
+    .DESCRIPTION
+    Set all occrurances of a string matching the regular expression
     `<img src=['``"][a-zA-Z0-9.]*['``"]>` with the text `<img src="imgs/placeholder.jpg">`
     in the file `c:\inetpub\wwwroot\default.htm`
 #>
 Configuration Example
 {
-    param
-    (
-        [Parameter()]
-        [System.String[]]
-        $NodeName = 'localhost'
-    )
-
     Import-DSCResource -ModuleName FileContentDsc
 
-    Node $NodeName
+    Node localhost
     {
         ReplaceText SetTextWithRegex
         {

diff --git a/Modules/FileContentDsc/FileContentDsc.psd1 → FileContentDsc.psd1 b/Modules/FileContentDsc/FileContentDsc.psd1 → FileContentDsc.psd1
diff --git a/...tentDsc.Common/FileContentDsc.Common.psm1 → ...tentDsc.Common/FileContentDsc.Common.psm1 b/...tentDsc.Common/FileContentDsc.Common.psm1 → ...tentDsc.Common/FileContentDsc.Common.psm1
diff --git a/.../en-us/FileContentDsc.Common.strings.psd1 → .../en-us/FileContentDsc.Common.strings.psd1 b/.../en-us/FileContentDsc.Common.strings.psd1 → .../en-us/FileContentDsc.Common.strings.psd1
diff --git a/...Helper/FileContentDsc.ResourceHelper.psm1 → ...Helper/FileContentDsc.ResourceHelper.psm1 b/...Helper/FileContentDsc.ResourceHelper.psm1 → ...Helper/FileContentDsc.ResourceHelper.psm1
diff --git a/Tests/Integration/DSR_IniSettingsFile.Integration.Tests.ps1 b/Tests/Integration/DSR_IniSettingsFile.Integration.Tests.ps1
@@ -1,12 +1,26 @@
 [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingConvertToSecureStringWithPlainText", "")]
 param ()
 
-Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1')
+$script:DSCModuleName   = 'FileContentDsc'
+$script:DSCResourceName = 'DSR_IniSettingsFile'
 
-$script:testEnvironment = Enter-DscResourceTestEnvironment `
-    -DscResourceModuleName 'FileContentDsc' `
-    -DscResourceName 'DSR_IniSettingsFile' `
-    -TestType 'Integration'
+#region HEADER
+# Integration Test Template Version: 1.1.1
+[System.String] $script:moduleRoot = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
+
+if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
+     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
+{
+    & git @('clone','https://github.com/PowerShell/DscResource.Tests.git',(Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
+}
+
+Import-Module (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
+Import-Module (Join-Path -Path $script:moduleRoot -ChildPath "$($script:DSCModuleName).psd1") -Force
+$TestEnvironment = Initialize-TestEnvironment `
+    -DSCModuleName $script:DSCModuleName `
+    -DSCResourceName $script:DSCResourceName `
+    -TestType Integration
+#endregion
 
 try
 {
@@ -84,8 +98,14 @@ SettingThree=Value3
                         -OutputPath $TestDrive `
                         -ConfigurationData $configData
 
-                    Start-DscConfiguration -Path $TestDrive -ErrorAction 'Stop' -Wait -Force -Verbose
-                } | Should -Not -Throw
+                    Start-DscConfiguration `
+                        -Path $TestDrive `
+                        -ComputerName localhost `
+                        -Wait `
+                        -Verbose `
+                        -Force `
+                        -ErrorAction Stop
+                    } | Should -Not -Throw
             }
 
             It 'Should be able to call Get-DscConfiguration without throwing' {
@@ -146,7 +166,13 @@ SettingThree=Value3
                         -OutputPath $TestDrive `
                         -ConfigurationData $configData
 
-                    Start-DscConfiguration -Path $TestDrive -ErrorAction 'Stop' -Wait -Force -Verbose
+                    Start-DscConfiguration `
+                        -Path $TestDrive `
+                        -ComputerName localhost `
+                        -Wait `
+                        -Verbose `
+                        -Force `
+                        -ErrorAction Stop
                 } | Should -Not -Throw
             }
 
@@ -180,6 +206,7 @@ SettingThree=Value3
 }
 finally
 {
-    Exit-DscResourceTestEnvironment -TestEnvironment $script:testEnvironment
-    Remove-Module -Name CommonTestHelper
+    #region FOOTER
+    Restore-TestEnvironment -TestEnvironment $TestEnvironment
+    #endregion
 }
diff --git a/Tests/Integration/DSR_IniSettingsFile.config.ps1 b/Tests/Integration/DSR_IniSettingsFile.config.ps1
@@ -1,4 +1,4 @@
-param
+param
 (
     [Parameter(Mandatory = $true)]
     [String]