Skip to content

Conversation

@Iristyle
Copy link
Contributor

@Iristyle Iristyle commented Nov 15, 2017

Builds on #3, which has now been reduced to removing nearly all vendored content / acceptance tests

This commit moves the PowerShellManager class and dependent files from
the dsc namespace to the dsc_lite namespace. Where it was possible,
template files were moved closer to the classes that used them. In all
cases a namespace was added to all types and classes to differentiate
the new module from any prior dsc module installs. Changes include:

  • Ruby PuppetX::Dsc -> PuppetX::DscLite
  • Ruby PuppetX::PuppetLabs::Dsc -> PuppetX::PuppetLabs::DscLite
  • renaming Puppet type base_dsc -> base_dcslite
  • using a dsc_lite path to namespace in the filesystem
  • updating existing wrappers (like the fake resource) to use the
    new names and paths

Iristyle and others added 6 commits November 9, 2017 01:20
 - Additionally remove references to both stdlib and powershell
   modules as dependencies. The LCM config manifest wsa the only thing
   using these modules, and without it, they can be removed!
 - Remove all the generated types from lib/puppet/type/dsc_* and their
   corresponding specs from spec/unit/puppet/type/dsc_*.

 - Remove all vendored content inside of lib/puppet_x/dsc_resources/,
   except for xService in xPSDesiredStateConfiguration. xService is
   used in an acceptance test that may need to have a more generic
   equivalent built.

 - Remove most acceptance tests on basic dsc resources that won't be
   part of this module any longer from tests/acceptance/tests/,
   tests/integration/tests/ and corresponding test fixture data from
   tests/files/test_installer/ and tests/manifests/.
   More generic tests that use dsc_file were left (for now).

 - Exceptions:

   * Leave dsc_file.rb type for now to allow specs to pass.
   * Leave dsc_service.rb and dsc_xservice.rb to allow acceptance
     tests to pass.
 - This commit updates the changelog, metadata.json and other misc
   files.

   Metadata update to reflect the new module name, resets the version
   back to 0.1.0 and removes all prior versions of the dsc module from
   the changelog.
This commit moves the PowerShellManager class and dependent files from
the `dsc` namespace to the `dsc_lite` namespace. Where it was possible,
template files were moved closer to the classes that used them. In all
cases a namespace was added to all types and classes to differentiate
the new module from any prior dsc module installs. Changes include:

 * Ruby PuppetX::Dsc -> PuppetX::DscLite
 * Ruby PuppetX::PuppetLabs::Dsc -> PuppetX::PuppetLabs::DscLite
 * renaming Puppet type base_dsc -> base_dcslite
 * using a dsc_lite path to namespace in the filesystem
 * updating existing wrappers (like the fake resource) to use the
   new names and paths
 - Move into the same directory as the provider code given there is
   no need for a separate templates directory, and given the prior
   path would conflict with the existing module.
@@ -1,10 +1,10 @@
require 'pathname'
require Pathname.new(__FILE__).dirname + '../' + 'puppet_x/puppetlabs/powershell_version'
require Pathname.new(__FILE__).dirname + '../' + 'puppet_x/puppetlabs/dsc_lite/powershell_version'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that powershell_version still conflicts on a filename and fact name basis with all the other modules that do this - powershell, dsc and iis (so far). Fortunately we haven't been bit by this given all these modules implement the fact the same way, but something to think about for another day.

@glennsarti glennsarti merged commit ab46664 into puppetlabs:master Nov 17, 2017
@Iristyle Iristyle deleted the MODULES-5844-re-namespace-dsc_lite branch November 21, 2017 00:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants