Skip to content

Commit

Permalink
Fixes #32611: Drop Puppet < 7 support & require Ruby 2.7+
Browse files Browse the repository at this point in the history
  • Loading branch information
ekohl committed May 5, 2023
1 parent 34550f0 commit b2772a2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem 'json_pure'
if ENV['PUPPET_VERSION']
gem 'puppet', "~> #{ENV['PUPPET_VERSION']}"
else
gem 'puppet', '>= 4.5.0', '< 8.0.0'
gem 'puppet', '>= 7.0.0', '< 8.0.0'
end

gem 'puppet-strings', '>= 1.2.1'
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -207,13 +207,12 @@ When using Puppet via a Gemfile, Bundler should set up PATH to point at the
gem version. If using a system/packaged version, it will typically find and
execute /usr/bin/puppet from the regular PATH.

When using an AIO/PC1 packaged version of Puppet, other versions of Puppet from
When using an AIO packaged version of Puppet, other versions of Puppet from
PATH will be preferred if they exist, so they should either be removed or PATH
set to prefer /opt/puppetlabs/bin, i.e. `export PATH=/opt/puppetlabs/bin:$PATH`.
Debug logs from Kafo should indicate the full path of the binary used.

Note that Kafo parsers supports specific versions of Puppet, and may require
extra modules (such as puppet-strings on Puppet 4+) to parse manifests.
Note that Kafo parsers relies on puppet-strings to parse manifests.

## Parameters prefixes

Expand Down Expand Up @@ -728,7 +727,7 @@ If you use "params_path" for this purpose, "params_name" is ignored.
## Validations
If class parameters are declared with Puppet 4 data types then Kafo will
If class parameters are declared with Puppet data types then Kafo will
validate user inputs against Puppet's type validation rules.
## Enabling or disabling module
Expand Down
2 changes: 1 addition & 1 deletion kafo.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]

spec.required_ruby_version = '>= 2.4.0'
spec.required_ruby_version = '>= 2.7'

spec.add_development_dependency 'bundler', '>= 1.3', '< 3'
spec.add_development_dependency 'rake'
Expand Down

0 comments on commit b2772a2

Please sign in to comment.