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.

Sign up for GitHub

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

Jump to bottom

(maint) backport minor fixes from master to 1.6.x #184

Merged
merged 2 commits into from
Jun 12, 2019
Merged

(maint) backport minor fixes from master to 1.6.x #184

merged 2 commits into from
Jun 12, 2019

Commits on Jun 12, 2019

  1. (maint) Fixup Gemfile for JRuby 1.7 installs

    @DavidS
    DavidS committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    8ee1220 View commit details
    Browse the repository at this point in the history

  2. (FM-7839) Implement 'to_json' method for ResourceShim for bolt 

    bolt's `get_resources` uses the `libexec/query_resources.rb` to retrieve
resources as json from the target nodes. Especially https://github.com/puppetlabs/bolt/blob/7dec6e49d66c7f9ae06088d46ee3330de0ed2fed/libexec/query_resources.rb#L71
causes `ResourceShims` to fail as they did not implement `to_json`.

This integration test models what `libexec/query_resources.rb` is doing.
The added `to_json(*)` method now passes this test, and - shown in manual
testing - works for bolt.
    @DavidS
    DavidS committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    c6d1b3a View commit details
    Browse the repository at this point in the history