Merge pull request #339 from jpogran/MODULES-6592-update-dsc-resource…

…s-to-oct2017-nov2017-dec2017-releases

(MODULES-6592) Update DSC Resources to Oct-Nov-Dev 2017 Releases

CHANGELOG.md

@@ -6,6 +6,40 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+### Adds
+
+- **BREAKING**: Update SqlServerDsc to 11.0.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update OfficeOnlineServerDsc to 1.2.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update SecurityPolicyDsc to 2.2.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update SharePointDsc to 2.1.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update StorageDsc to 4.0.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update SystemLocaleDsc to 1.2.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update xActiveDirectory to 2.17.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update xAdcsDeployment to 1.4.0.00 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update xCertificate to 4.2.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update xComputerManagement to 4.0.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update xDatabase to 1.7.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update xDnsServer to 1.9.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update xExchange to 1.19.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update xFailOverCluster to 1.9.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update xHyper-V to 3.11.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Pinned xPowerShellExecutionPolicy to 1.1.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update xPSDesiredStateConfiguration to 8.0.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update xNetworking to 5.5.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update xRemoteDesktopSessionHost to 1.5.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update xSharePoint to 2.1.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+- Update xTimeZone to 1.7.0.0 ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+
+### Fixes
+
+- Fix including HQ DSC Resources in yml
+- Correctly ignoring PSDscResources in yml
+- Remove warning for MSFT_WaitFor DSC Resources
+
+### Removed
+
+- **BREAKING**: Removed xSQLServer ([MODULES-6592](https://tickets.puppetlabs.com/browse/MODULES-6592))
+
 ## [1.4.1] - 2018-01-05
 
 ### Added

README.md

@@ -367,6 +367,8 @@ Where available, a link to the external GitHub repo of each resource is also inc
 
 ### Known Issues
 
+- The `WaitFor*` type of DSC Resources may not work with this module. These DSC Resources use sleeps, timers, or locking to 'wait' for other resources to be in a specified state. These waits would 'pause' a Puppet run for an amount of time that varies between DSC Resource implementations, which may cause unintended problems in the Puppet run. Puppet cannot test all possible interactions from these `WaitFor*` DSC Resources, and does not support them at this time.
+
 - The `dsc_log` resource might not appear to work. The ["Log" resource](https://technet.microsoft.com/en-us/library/Dn282117.aspx) writes events to the 'Microsoft-Windows-Desired State Configuration/Analytic' event log, which is [disabled by default](https://technet.microsoft.com/en-us/library/Cc749492.aspx).
 
 - You might have issues if you attempt to use `dsc_ensure => absent` with `dsc_service` with services that are not running.

build/dsc.rake

@@ -73,7 +73,7 @@ eod
         community_dsc_resources_root = "#{dsc_resources_path_tmp}/xDscResources"
         official_dsc_resources_root = "#{dsc_resources_path_tmp}/DscResources"
         composite_resources = [ 'xChrome','xDSCResourceDesigner','xDscDiagnostics',
-          'xFirefox','xSafeHarbor','xSystemSecurity' ]
+          'xFirefox','xSafeHarbor','xSystemSecurity', 'PSDscResources' ]
 
         Rake::Task['dsc:resources:checkout'].invoke(
           community_dsc_resources_root, update_versions, composite_resources)
@@ -189,12 +189,14 @@ eod
           resource_tags["#{dsc_resource_name}"] = checkout_version.encode("UTF-8")
         end
       end
-      
+
       resource_tags = resource_tags.reject do |r|
         blacklist.include?(r)
       end
-
-      File.open("#{dsc_resources_file}", 'w+') { |f| f.write resource_tags.to_yaml }
+
+      # We use YAML.dump here to update the file instead of overwriting it. This ensures
+      # we can write both HQ DSC Resources as well as Expertimental ones to the same yml
+      File.open("#{dsc_resources_file}", 'w+') { |f| YAML.dump(resource_tags, f) }
     end
 
     desc <<-eod
@@ -222,8 +224,6 @@ eod
     task :build, [:module_path] do |t, args|
       module_path = args[:module_path] || default_dsc_module_path
       m = Dsc::Manager.new
-      wait_for_resources = Dir["#{module_path}/**/MSFT_WaitFor*"]
-      fail "MSFT_WaitFor* resources found - aborting type building! Please remove the following MSFT_WaitFor* DSC Resources and run the build again.\n\n#{wait_for_resources}\n" if !wait_for_resources.empty?
       m.target_module_path = module_path
       msgs = m.build_dsc_types
       msgs.each{|m| puts "#{m}"}

dsc_resource_release_tags.yml

@@ -1,45 +1,52 @@
 ---
-xActiveDirectory: 2.16.0.0-PSGallery
-xAdcsDeployment: 1.1.0.0-PSGallery
+AuditPolicyDsc: 1.1.0.0-PSGallery
+OfficeOnlineServerDsc: 1.2.0.0-PSGallery
+SecurityPolicyDsc: 2.2.0.0-PSGallery
+SharePointDsc: 2.1.0.0-PSGallery
+SqlServerDsc: 11.0.0.0-PSGallery
+StorageDsc: 4.0.0.0-PSGallery
+SystemLocaleDsc: 1.2.0.0-PSGallery
+xActiveDirectory: 2.17.0.0-PSGallery
+xAdcsDeployment: 1.4.0.0-PSGallery
 xAzure: 0.2.0.0-PSGallery
 xAzurePack: 1.4.0.0-PSGallery
 xBitlocker: 1.1.0.0-PSGallery
-xCertificate: 3.0.0.0-PSGallery
-xComputerManagement: 2.1.0.0-PSGallery
+xCertificate: 3.2.0.0-PSGallery
+xComputerManagement: 4.0.0.0-PSGallery
 xCredSSP: 1.3.0.0-PSGallery
-xDatabase: 1.6.0.0-PSGallery
+xDatabase: 1.7.0.0-PSGallery
 xDefender: 0.2.0.0-PSGallery
 xDFS: 3.2.0.0-PSGallery
 xDhcpServer: 1.6.0.0-PSGallery
 xDismFeature: 1.2.0.0-PSGallery
-xDnsServer: 1.8.0.0-PSGallery
-xExchange: 1.16.0.0-PSGallery
-xFailOverCluster: 1.8.0.0-PSGallery
-xHyper-V: 3.9.0.0-PSGallery
+xDnsServer: 1.9.0.0-PSGallery
+xExchange: 1.19.0.0-PSGallery
+xFailOverCluster: 1.9.0.0-PSGallery
+xHyper-V: 3.11.0.0-PSGallery
 xInternetExplorerHomePage: 1.0.0-PSGallery
 xJea: 0.3.0.0-PSGallery
 xMySql: 2.1.0.0-PSGallery
-xNetworking: 5.1.0.0-PSGallery
+xNetworking: 5.5.0.0-PSGallery
 xPendingReboot: 0.3.0.0-PSGallery
 xPhp: 1.2.0.0-PSGallery
 xPowerShellExecutionPolicy: 1.1.0.0-PSGallery
-xPSDesiredStateConfiguration: 7.0.0.0-PSGallery
+xPSDesiredStateConfiguration: 8.0.0.0-PSGallery
 xRemoteDesktopAdmin: 1.1.0.0-PSGallery
-xRemoteDesktopSessionHost: 1.4.0.0-PSGallery
+xRemoteDesktopSessionHost: 1.5.0.0-PSGallery
 xRobocopy: 2.0.0.0-PSGallery
 xSCDPM: 1.2.0.0-PSGallery
 xSCOM: 1.3.3.0-PSGallery
 xSCSMA: 1.5.0.0-PSGallery
 xSCSPF: 1.3.1.0-PSGallery
 xSCSR: 1.3.0.0-PSGallery
 xSCVMM: 1.2.4.0-PSGallery
-xSharePoint: 1.8.0.0-PSGallery
+xSharePoint: 2.1.0.0-PSGallery
 xSmbShare: 2.0.0.0-PSGallery
 xSqlPs: 1.4.0.0-PSGallery
-xSQLServer: 7.0.0.0-PSGallery # Keep at version 7.0.0 due to PUP-7888 (long file names)
+xSQLServer: 7.0.0.0-PSGallery
 xStorage: 3.2.0.0-PSGallery
-xTimeZone: 1.6.0.0-PSGallery
-xWebAdministration: 1.18.0.0-PSGallery
+xTimeZone: 1.7.0.0-PSGallery
+xWebAdministration: 1.19.0.0-PSGallery
 xWebDeploy: 1.2.0.0-PSGallery
 xWindowsEventForwarding: 1.0.0.0-PSGallery
 xWindowsRestore: 1.0.0-PSGallery