Skip to content
This repository has been archived by the owner on Aug 18, 2022. It is now read-only.

Conversation

Iristyle
Copy link
Contributor

  • Remove WaitFor* resources
  • Fix a bug that wasn't excluding all samples due to case-sensitivity
  • Abort type generation if WaitFor* resources have been accidentally re-included

 - Kill the rake building task completely if any WaitFor* resources
   are found.
 - The WaitFor* resources are typically added manually by copying the
   schemas from a Windows machine with WMF5.  Since these resources are
   not supported, manually delete them and regenerate the code
   generated types as well.
 - A couple of straggler files were included based on our Rake tasks
   being case sensitive
@ferventcoder
Copy link
Contributor

This looks good. I'm not totally sold on the need for a rake abort if WaitFor* resources are found, but if a user trying to build their own custom items runs into that, I guess they will follow up with an issue.

@@ -110,6 +110,8 @@ 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}/**/*WaitFor*"]
fail "WaitFor* resources found - aborting type building!\n\n#{wait_for_resources}\n" if !wait_for_resources.empty?
Copy link
Contributor

Choose a reason for hiding this comment

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

This is interesting...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, this is not an ideal way of doing this I agree.

It's mainly a guard against accidentally re-vendoring anything related to WaitFor. The hope would be that we can replace our current manual vendoring process with something automated in the future, and remove the need for this altogether.

ferventcoder added a commit that referenced this pull request Oct 19, 2015
…tional-blacklist

(MODULES-2244) Additional blacklist excludes
@ferventcoder ferventcoder merged commit fb69742 into puppetlabs-toy-chest:master Oct 19, 2015
@Iristyle Iristyle deleted the ticket/master/MODULES-2244-additional-blacklist branch October 19, 2015 22:59
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants