Repository navigation
Conversation
Prepare .sync.yml for pdk update to pdk-templates main (8ca954f): set the hand edits to pdk-managed files that are still needed, so the template renders them, and drop settings main makes obsolete (the PR body lists each one kept or dropped). Co-Authored-By: Claude <noreply@anthropic.com>
Safe autocorrect (rubocop --autocorrect) of the offenses the pdk-templates main (8ca954f) rubocop profile adds, so the pdk update commit does not park them in .rubocop_todo.yml. Safe cops only: no behaviour change. Co-Authored-By: Claude <noreply@anthropic.com>
Run pdk update (PDK 4.0.1) against pdk-templates main at 8ca954f. Pure pdk output, plus .rubocop_todo.yml regenerated with `rubocop --auto-gen-config --no-exclude-limit` (kept as is when only its header would change). Co-Authored-By: Claude <noreply@anthropic.com>
span786
left a comment
There was a problem hiding this comment.
Thanks @imaqsood, this looks good. It's the same shape as waves 1 and 2.
I checked the parts a template update can quietly break. The .sync.yml acceptance_flags reproduce the Puppet 9 excludes from main exactly in both workflows, including --arch-exclude arm. The disabled puppet-lint checks carry over (strict_indent still disabled). .rubocop.yml inherits the regenerated .rubocop_todo.yml. Dropping ruby_version: "3.2" matches the shared workflows' default. Dropping additional_packages: libcurl4-openssl-dev is backed by the Puppet 9 / Ruby 4 spec lane passing without it: bolt now comes from puppetcore, so patron no longer needs building. CI is green, including that lane and the static/syntax checks, and the branch is up to date with main.
The safe-autocorrect commit is trailing commas in specs plus File.dirname(path, 3) in java_default_home. That form needs Ruby ≥ 3.1, which is fine given metadata.json requires Puppet ≥ 8 (agent Ruby 3.2+), and I confirmed it matches the nested dirname calls.
Non-blocking: the Rakefile loses the comment explaining why strict_indent is disabled (the 3.x vs 5.x indentation conflict, MODULES-11700). The .sync.yml comment now only says it was disabled by hand. Worth adding the reason or ticket there in a later wave so the next update doesn't drop it as unexplained.
Approving.
Summary
pdk update of puppetlabs/puppetlabs-java to pdk-templates main (8ca954f), with PDK 4.0.1.
Jira: https://perforce.atlassian.net/browse/MODULES-12011 (epic MODULES-11997)
Commits
Hand edits kept in .sync.yml
strict_indentstays disabled (was in Rakefile)Hand edits dropped
additional_packages: "libcurl4-openssl-dev"(the template Gemfile resolves bolt 5 / faraday 2 without patron)ruby_version: "3.2"(module_ci / module_acceptance default)additional_packages: "libcurl4-openssl-dev"(the template Gemfile resolves bolt 5 / faraday 2 without patron)ruby_version: "3.2"(module_ci / module_acceptance default)gem "voxpupuli-puppet-lint-plugins", '~> 7.0', require: false(template main's pin/condition for voxpupuli-puppet-lint-plugins)gem "puppetlabs_spec_helper", '~> 9.0', require: false(template main's pin/condition for puppetlabs_spec_helper)require 'puppetlabs-syntax/tasks/puppetlabs-syntax'(template main requires puppetlabs-syntax when puppetlabs_spec_helper 9 loads it)Tests
cat-module(static, unit; full suite): pass, 426 passed, 0 failed🤖 Generated with Claude Code