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-7844) Update stdlib and concat dependencies #28

Merged

Conversation

Sharpie
Copy link
Member

@Sharpie Sharpie commented Sep 24, 2018

This patchset updates the stdlib and concat dependencies so that puppet_authorization can be installed into an environment using the recently released 5.0 versions of both modules. The test suite is also extended to cover Puppet 5.x and Puppet 6.x.

This commit moves the upper bound for both the stdlib and concat dependencies
from "< 5.0.0" to "< 6.0.0".
@Sharpie Sharpie force-pushed the MODULES-7844-update-dependencies branch from af99885 to a471443 Compare September 24, 2018 22:49
@Sharpie
Copy link
Member Author

Sharpie commented Sep 24, 2018

The update to using version 1.x of the hocon gem seems to have hit a fragile spot in the tests for Puppet::Type::Puppet_authorization_hocon_rule::ProviderRuby. All failures are in equality tests, but the diffs show what is essentially a no-op:

@@ -1,13 +1,13 @@
-authorization : {
-  rules : [
+authorization: {
+  rules: [
      {
-          "allow" : "bar",
-          "match-request" : {
-              "path" : "/bar",
-              "type" : "path"
+          "allow": "bar",
+          "match-request": {
+              "path": "/bar",
+              "type": "path"
          },
-          "name" : "bar-rule",
-          "sort-order" : 777
+          "name": "bar-rule",
+          "sort-order": 777
      }

  ]

My guess is something changed around whitespace since the content is correct.

@Sharpie
Copy link
Member Author

Sharpie commented Sep 25, 2018

Yup, the problem is the removal of spaces before the : in hash maps:

puppetlabs/ruby-hocon@12a31ca

Will update the relevant test fixtures.

@Sharpie Sharpie force-pushed the MODULES-7844-update-dependencies branch from a471443 to 2e9908c Compare September 25, 2018 15:16
@Sharpie
Copy link
Member Author

Sharpie commented Sep 25, 2018

One testcase is still failing on Puppet 6 due to a nil value being returned where the fixture expects undef. This is due to an intentional change in Puppet 6:

puppetlabs/puppet@c8e945f

This commit updates metadata.json to add Puppet 6, and Ubuntu 16.04 and 18.04
to the list of configurations supported by the puppetlabs-puppet_authorization
module.

The Travis CI matrix and Gemfile are also updated to address several issues:

  - Test cells for Puppet 5.x and Puppet 6.x are added.

  - The correct PUPPET_VERSION environment variable is now set by Travis
    instead of PUPPET_GEM_VERSION.

  - The test for Puppet 4.x is updated to use Ruby 2.1.9.

  - The Gemfile is updated to allow the latest 1.x version of the hocon gem
    which is the version bundled with puppet-agent 4.10 -- 6.0.
@Sharpie Sharpie force-pushed the MODULES-7844-update-dependencies branch from 2e9908c to 9edfe38 Compare September 26, 2018 04:32
@david22swan david22swan merged commit 85c7b60 into puppetlabs:master Oct 3, 2018
@Sharpie Sharpie deleted the MODULES-7844-update-dependencies branch October 3, 2018 23:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants