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

Add Puppet 6 support #226

Merged
merged 8 commits into from Dec 16, 2020
Merged

Add Puppet 6 support #226

merged 8 commits into from Dec 16, 2020

Conversation

seanmil
Copy link
Contributor

@seanmil seanmil commented Sep 15, 2020

Overview

This pull request introduces Puppet 6 support for computed catalogs and fixes issue #186 .

This change is based on the information contained in that issue and contains the conditional handling to make this change non-disruptive with existing Octocatalog-diff uses on older versions. It also contains updates to the testing suite to include tests covering the changes as well as updates to the CI pipeline to introduce Puppet 6 into the testing matrix.

Checklist

  • Make sure that all of the tests pass, and fix any that don't. Just run rake in your checkout directory, or review the CI job triggered whenever you push to a pull request.
  • Make sure that there is 100% test coverage by running rake coverage:spec or ignoring untestable sections of code with # :nocov comments. If you need help getting to 100% coverage please ask; however, don't just submit code with no tests.
  • If you have added a new command line option, we would greatly appreciate a corresponding integration test that exercises it from start to finish. This is optional but recommended.
  • If you have added any new gem dependencies, make sure those gems are licensed under the MIT or Apache 2.0 license. We cannot add any dependencies on gems licensed under GPL.
  • If you have added any new gem dependencies, make sure you've checked in a copy of the .gem file into the vendor/cache directory.

A handful of the SSL tests would not pass successfully
without specifying the SSL version range in the test server.
@seanmil seanmil mentioned this pull request Sep 15, 2020
5 tasks
@KlavsKlavsen
Copy link

Hoping this gets merged.. Fantastic work @seanmil - I was really hoping to see this tool work for recent puppet installations again :)

Add support for Puppet >= 6.5.0. The Puppet command Octocatalog-diff
used was removed in 6.0.0 and an equivalent command was added back
in 6.5.0.

With this change, Octocatalog-diff detects the Puppet version and
adjusts the Puppet command line as needed based on the version.
@seanmil
Copy link
Contributor Author

seanmil commented Dec 11, 2020

@ashish1099 I re-ran the CI job. It passed, but I'm not sure why the results above still show "Waiting for status to be reported". Please see https://github.com/seanmil/octocatalog-diff/actions/runs/415637932 for the results. If we could get this merged, that would be great. Thank you.

@ashish1099
Copy link

@seanmil hmm, I don't think I have any rights on this repo to merge this MR :)

@seanmil
Copy link
Contributor Author

seanmil commented Dec 14, 2020

@seanmil hmm, I don't think I have any rights on this repo to merge this MR :)

Oh, shucks, I thought you were with GitHub. Perhaps that was just my hope that someone there was paying attention to this project.

@seanmil seanmil mentioned this pull request Dec 14, 2020
@ashish1099
Copy link

@seanmil hmm, I don't think I have any rights on this repo to merge this MR :)

Oh, shucks, I thought you were with GitHub. Perhaps that was just my hope that someone there was paying attention to this project.

But thanks for the PR, I have been using this branch for my testing setup 👍

Copy link
Contributor

@ahayworth ahayworth left a comment

Choose a reason for hiding this comment

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

🎉 🎉 🎉 🎉 🎉
Amazing. I'm so happy to see this PR, and I'm so happy that it looks like it wasn't too much work (after Puppet added back the catalog compilation bits, of course).
🎉 🎉 🎉 🎉 🎉

@ahayworth ahayworth merged commit 5ae7f1b into github:master Dec 16, 2020
@ashish1099
Copy link

next step would be a release of tag ? so I can just download the required tag.

currently I have to mess around in my docker image to get things running, but no rush 👍

@ahayworth
Copy link
Contributor

Yes - I'm planning on doing a release sometime this week (or maybe as a Christmas present, who knows 🎄 🎅) with this and a few other PRs rolled into it. 😄

@ahayworth ahayworth added this to the 2.0.0 milestone Dec 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants