Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(MODULES-5364) All version negative/prop_file fix #110

Conversation

Iristyle
Copy link
Contributor

@Iristyle Iristyle commented Aug 15, 2017

  • 0284928 made a naive fix to the acceptance test negative/prop_file
    under the assumption that the test output changed based on just
    recent module changes in 4c73468.

  • In reality, the 4c73468 bugfix changed how the output appears in
    both Puppet 4 and Puppet 5, as Puppet 5 changed formatting around
    basic Ruby types.

    That bugfix stopped emitting a [Puppet::Type::Acl::Ace] and instead
    emits a [Hash] representing Aces.

    Those formatting changes apply to pupept apply and puppet agent
    for the ACL module, but not for puppet resource.

  • The test updates in this commit vary how output is checked based
    on which version of Puppet the test is running on.

    For Puppet 4, the manifest application emits a message like:

   Notice: /Stage[main]/Main/Acl[c:/temp/prop_file]/permissions: permissions changed [
   ] to [
    { affects => 'self_only', identity => 'IHTEWFY92S03JZM\bob', rights => ['full'
   ] },
    { affects => 'self_only', identity => 'BUILTIN\Administrators', rights => ['full'
   ] }
   ]

For Puppet 5, the manifest application emits a mesaage like:

   Notice: /Stage[main]/Main/Acl[c:/temp/prop_file]/permissions: permissions changed [] to [{"identity"=>"AAR8J38RQU6AJ62\\bob", "rights"=>["full"], "affects"=>:self_only}, {"identity"=>"BUILTIN\\Administrators", "rights"=>["full"], "affects"=>:self_only}]
  • This fix is temporary to resolve CI failures, until more time can
    be dedicated to some refactorings around the type structure inside
    the module.

 - 0284928 made a naive fix to the acceptance test negative/prop_file
   under the assumption that the test output changed based on just
   recent module changes in 4c73468.

 - In reality, the 4c73468 bugfix changed how the output appears in
   *both* Puppet 4 and Puppet 5, as Puppet 5 changed formatting around
   basic Ruby types.

   That bugfix stopped emitted a [Puppet::Type::Acl::Ace] and instead
   emits a [Hash] representing Aces.

   Those formatting changes apply to `pupept apply` and `puppet agent`
   but for the ACL module, not for `puppet resource`.

 - The test updates in this commit vary how output is checked based
   on which version of Puppet the test is running on.

   For Puppet 4, the manifest application emits a message like:

   Notice: /Stage[main]/Main/Acl[c:/temp/prop_file]/permissions: permissions changed [
   ] to [
    { affects => 'self_only', identity => 'IHTEWFY92S03JZM\bob', rights => ['full'
   ] },
    { affects => 'self_only', identity => 'BUILTIN\Administrators', rights => ['full'
   ] }
   ]

   For Puppet 5, the manifest application emits a mesaage like:

   Notice: /Stage[main]/Main/Acl[c:/temp/prop_file]/permissions: permissions changed [] to [{"identity"=>"AAR8J38RQU6AJ62\\bob", "rights"=>["full"], "affects"=>:self_only}, {"identity"=>"BUILTIN\\Administrators", "rights"=>["full"], "affects"=>:self_only}]

 - This fix is temporary to resolve CI failures, until more time can
   be dedicated to some refactorings around the type structure inside
   the module.
@ghost
Copy link

ghost commented Aug 15, 2017

This commit, combined with the test documentation in PA-1374, looks good to me. Merging.

@ghost ghost merged commit 4485111 into puppetlabs:master Aug 15, 2017
@Iristyle Iristyle deleted the maint/master/MODULES-5364-fix-ACL-manifest-output-across-Puppet-versions branch August 15, 2017 19:12
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants