Skip to content

Commit

Permalink
xSslSettings: Updated xSslSettings casing across project (#504)
Browse files Browse the repository at this point in the history
- Changes to xSslSettings
  - Updated casing of `xSslSettings` in all file names, folder names, schema, and documentation
  • Loading branch information
mcbobke authored and johlju committed Oct 2, 2019
1 parent ab0a0d4 commit dfec51d
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 33 deletions.
17 changes: 9 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
- Remove example 'Creating the default website using configuration data' from README.md ([issue #488](https://github.com/PowerShell/xWebAdministration/issues/488)).
- Removed examples README.md as it was obsolete ([issue #482](https://github.com/PowerShell/xWebAdministration/issues/482)).
- Updated `Ensure` property description for `xIisHandler` resource to match schema.mof
- Moved examples from Readme.md to respective `/Examples/Resources/`
folders ([issue #486](https://github.com/PowerShell/xWebAdministration/issues/486)).
- Created new folder structure for examples so that examples will be
placed in `/Examples/Resources/$resourceName` ([issue #483](https://github.com/PowerShell/xWebAdministration/issues/483))
- Changes to xIisHandler
- Updated schema.mof to include descriptions for each property ([issue #453](https://github.com/PowerShell/xWebAdministration/issues/453)).
- Changes to xWebsite
Expand All @@ -18,11 +22,8 @@
- Fix `Get-TargetResource` so that `LogFlags` are returned as expected
array of strings (one for each flag) rather than an array containing a
single comma-separated string of flags ([issue #332](https://github.com/PowerShell/xWebAdministration/issues/332)).
- Changes to Examples
- Created new folder structure for examples so that examples will be
placed in `/Examples/Resources/$resourceName` ([issue #483](https://github.com/PowerShell/xWebAdministration/issues/483))
- Moved examples out of Readme
- Moved examples from Readme.md to respective `/Examples/Resources/` folders. ([issue #486](https://github.com/PowerShell/xWebAdministration/issues/486))
- Changes to xSslSettings
- Updated casing of `xSslSettings` in all file names, folder names, schema, and documentation

## 2.8.0.0

Expand Down Expand Up @@ -180,8 +181,8 @@
- Bugfix for #131 The site name should be passed in as argument for Test-AuthenticationInfo
- Improved **BindingInfo** validation: the **HostName** property is required for use with Server Name Indication (i.e., when the **SslFlags** property is set to `1` or `3`).
- Adding conditional logic to install the test helper module from the gallery if the user downloaded the module from the gallery.
- Added **xSSLSettings** integration tests
- Added fixes to **xSSLSettings**. Corrected spelling and formatting in base resource and tests. Added misc comments. Added ValidateSet to bindings param.
- Added **xSslSettings** integration tests
- Added fixes to **xSslSettings**. Corrected spelling and formatting in base resource and tests. Added misc comments. Added ValidateSet to bindings param.

- Added **xIISLogging** resource which supports for the following options:
- LogPath
Expand Down Expand Up @@ -234,7 +235,7 @@
## 1.9.0.0

- Added the following resources:
- xSSLSettings
- xSslSettings
- Fixed an issue in xWebApplication where Set-TargetResource attempted to modify a folder instead of an application.
- Added Tests to xWebApplication which will allow more changes if desired.
- Modified README.MD to clean up Code Formatting
Expand Down
4 changes: 2 additions & 2 deletions DSCResources/MSFT_xSSLSettings/MSFT_xSSLSettings.schema.mof
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[ClassVersion("1.0.0"), FriendlyName("xSSLSettings")]
class MSFT_xSSLSettings : OMI_BaseResource
[ClassVersion("1.0.0"), FriendlyName("xSslSettings")]
class MSFT_xSslSettings : OMI_BaseResource
{
[Key, Description("Name of website in which to modify the SSL Settings")] String Name;
[Required, Description("The Bindings in which to modify for the website"), ValueMap{"","Ssl","SslNegotiateCert","SslRequireCert","Ssl128"},Values{"","Ssl","SslNegotiateCert","SslRequireCert","Ssl128"}] String Bindings[];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
configuration Sample_xSSLSettings_RequireCert
configuration Sample_xSslSettings_RequireCert
{
param
(
Expand All @@ -11,7 +11,7 @@ configuration Sample_xSSLSettings_RequireCert

Node $NodeName
{
xSSLSettings SiteDefaults
xSslSettings SiteDefaults
{
Ensure = 'Present'
Name = 'contoso.com'
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# xWebAdministration

The **xWebAdministration** module contains the **xIISModule**, **xIISLogging**, **xWebAppPool**, **xWebsite**, **xWebApplication**, **xWebVirtualDirectory**, **xSSLSettings**, **xWebConfigKeyValue**, **xWebConfigProperty**, **xWebConfigPropertyCollection** and **WebApplicationHandler** DSC resources for creating and configuring various IIS artifacts.
The **xWebAdministration** module contains the **xIISModule**, **xIISLogging**, **xWebAppPool**, **xWebsite**, **xWebApplication**, **xWebVirtualDirectory**, **xSslSettings**, **xWebConfigKeyValue**, **xWebConfigProperty**, **xWebConfigPropertyCollection** and **WebApplicationHandler** DSC resources for creating and configuring various IIS artifacts.

This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
Expand Down Expand Up @@ -320,7 +320,7 @@ Ensures the value of an identified property collection item's property in the we
* **ItemPropertyValue**: Value of the property of the property collection item to update.
* **Ensure**: Indicates if the property and value should be present or absent. Defaults to 'Present'. { *Present* | Absent }

### xSSLSettings
### xSslSettings

* **Name**: The Name of website in which to modify the SSL Settings
* **Bindings**: The SSL bindings to implement.
Expand Down
20 changes: 10 additions & 10 deletions Tests/Integration/MSFT_xSSLSettings.Integration.Tests.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$script:DSCModuleName = 'xWebAdministration'
$script:DSCResourceName = 'MSFT_xSSLSettings'
$script:DSCResourceName = 'MSFT_xSslSettings'

#region HEADER

Expand All @@ -15,15 +15,15 @@ Import-Module (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\
$TestEnvironment = Initialize-TestEnvironment `
-DSCModuleName $script:DSCModuleName `
-DSCResourceName $script:DSCResourceName `
-TestType Integration
-TestType Integration
#endregion

[String] $tempName = "$($script:DSCResourceName)_" + (Get-Date).ToString('yyyyMMdd_HHmmss')

try
{
$null = Backup-WebConfiguration -Name $tempName

# Now that xWebAdministration should be discoverable load the configuration data
$configFile = Join-Path -Path $PSScriptRoot -ChildPath "$($script:DSCResourceName).config.ps1"
. $configFile
Expand All @@ -42,7 +42,7 @@ try
[String] $Website

)

Get-WebConfiguration `
-PSPath IIS:\Sites `
-Location "$Website" `
Expand Down Expand Up @@ -81,12 +81,12 @@ try
#endregion

It 'Should add SSLBindings to a Website' -test {

Invoke-Expression -Command "$($script:DSCResourceName)_Present -ConfigurationData `$DSCConfg -OutputPath `$TestDrive"

# Test SslFlags
Get-SslFlags -Website $DSCConfig.AllNodes.Website | Should Be $DSCConfig.AllNodes.Bindings

}

}
Expand All @@ -104,14 +104,14 @@ try
{ Get-DscConfiguration -Verbose -ErrorAction Stop } | Should Not throw
}
#endregion

It 'Should remove SSLBindings from a Website' -test {

Invoke-Expression -Command "$($script:DSCResourceName)_Absent -ConfigurationData `$DSCConfg -OutputPath `$TestDrive"

# Test SslFlags
Get-SslFlags -Website $DSCConfig.AllNodes.Website | Should BeNullOrEmpty

}

}
Expand Down
14 changes: 7 additions & 7 deletions Tests/Integration/MSFT_xSSLSettings.config.ps1
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#requires -Version 4

configuration MSFT_xSSLSettings_Present
configuration MSFT_xSslSettings_Present
{
Import-DscResource -ModuleName xWebAdministration

Node $AllNodes.NodeName
{
xSSLSettings Website
{
xSslSettings Website
{
Ensure = 'Present'
Name = $Node.Website
Expand All @@ -15,13 +15,13 @@ configuration MSFT_xSSLSettings_Present
}
}

configuration MSFT_xSSLSettings_Absent
configuration MSFT_xSslSettings_Absent
{
Import-DscResource -ModuleName xWebAdministration

Node $AllNodes.NodeName
{
xSSLSettings Website
Node $AllNodes.NodeName
{
xSslSettings Website
{
Ensure = 'Absent'
Name = $Node.Website
Expand Down
4 changes: 2 additions & 2 deletions Tests/Unit/MSFT_xSSLSettings.Tests.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

$script:DSCModuleName = 'xWebAdministration'
$script:DSCResourceName = 'MSFT_xSSLSettings'
$script:DSCResourceName = 'MSFT_xSslSettings'

#region HEADER
$script:moduleRoot = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
Expand All @@ -27,7 +27,7 @@ try
#region Pester Tests

InModuleScope $DSCResourceName {
$script:DSCResourceName = 'MSFT_xSSLSettings'
$script:DSCResourceName = 'MSFT_xSslSettings'

Describe "$script:DSCResourceName\Test-TargetResource" {
Context 'Ensure is Present and SSLSettings is Present' {
Expand Down

0 comments on commit dfec51d

Please sign in to comment.