Skip to content

(CAT-2385) Puppetcore update - #1646

Merged
shubhamshinde360 merged 5 commits into
mainfrom
CAT-2385
Jan 9, 2026
Merged

(CAT-2385) Puppetcore update#1646
shubhamshinde360 merged 5 commits into
mainfrom
CAT-2385

Conversation

@shubhamshinde360

Copy link
Copy Markdown
Contributor

Summary

Puppetcore update

Checklist

  • 🟢 Spec tests.
  • 🟢 Acceptance tests.
  • Manually verified. (For example puppet apply)

@shubhamshinde360
shubhamshinde360 force-pushed the CAT-2385 branch 2 times, most recently from 940e023 to d8dd30d Compare September 29, 2025 14:38
@bastelfreak

Copy link
Copy Markdown
Collaborator

@shubhamshinde360 can you please rebase? The unit tests were fixed in #1647

Comment thread .fixtures.yml Outdated
Comment thread .fixtures.yml Outdated
Comment thread Gemfile
Comment thread Gemfile
shubhamshinde360 and others added 5 commits January 8, 2026 19:05
 - Removes redhat-7 testing in python_spec.
 - Replaces redhat-7 with redhat-8 in default_privileges_spec. Note that since redhat-8 has a newer version of postgresql, so default privileges should compile successfully for it.
@shubhamshinde360

Copy link
Copy Markdown
Contributor Author

SLES failures are unrelated and are being worked upon in https://perforce.atlassian.net/browse/CAT-2511

EL-7 based platforms (CentOS-7, OracleLinux-7, Scientific-7) have had their images deprecated from GCP and will require efforts for fixing it. They are in the discussion for deprecation so we'll hold off on them till a decision regarding deprecation is made.

@shubhamshinde360
shubhamshinde360 marked this pull request as ready for review January 9, 2026 06:26
@shubhamshinde360
shubhamshinde360 merged commit 8aa4f50 into main Jan 9, 2026
26 of 31 checks passed
@shubhamshinde360
shubhamshinde360 deleted the CAT-2385 branch January 9, 2026 07:30
imaqsood added a commit that referenced this pull request Jul 7, 2026
10.6.2 (PR #1646, "CAT-2385 Puppetcore update") bumped .rubocop.yml
TargetRubyVersion to 3.1, so `rubocop -A` rewrote hash literals to Ruby
3.1 shorthand (`salt:` instead of `salt: salt`) in three custom
functions/providers. That shorthand is a hard syntax error on Ruby <
3.1, and Puppet 7 ships Ruby 2.7 -- so any Puppet 7 catalog using
postgresql::postgresql_password, postgresql_conf or
postgresql_replication_slot failed to compile with "syntax error,
unexpected ','" (issue #1685).

Fix the Ruby side so existing Puppet 7 installations keep working:

  - .rubocop.yml: TargetRubyVersion back to '2.6' so autocorrect can't
    reintroduce the shorthand.
  - Revert the Ruby 3.1 shorthand hash syntax in the three lib files
    (keeping the unrelated postgresql_conf entry_regex bugfix from
    #1657).
  - Revert the same shorthand autocorrection in four spec files so they
    parse under the 2.6 target.

Verified with `pdk validate`, the full unit suite (685 examples, 0
failures), and Litmus end-to-end applies on both Puppet 7.34/Ruby 2.7
and Puppet 8.10/Ruby 3.2 (install, idempotency, and a SCRAM-SHA-256
password hash stored in the live database).

Fixes #1685

Co-Authored-By: Claude <noreply@anthropic.com>
ikonia pushed a commit to ikonia/puppetlabs-postgresql that referenced this pull request Aug 13, 2026
ikonia pushed a commit to ikonia/puppetlabs-postgresql that referenced this pull request Aug 13, 2026
10.6.2 (PR puppetlabs#1646, "CAT-2385 Puppetcore update") bumped .rubocop.yml
TargetRubyVersion to 3.1, so `rubocop -A` rewrote hash literals to Ruby
3.1 shorthand (`salt:` instead of `salt: salt`) in three custom
functions/providers. That shorthand is a hard syntax error on Ruby <
3.1, and Puppet 7 ships Ruby 2.7 -- so any Puppet 7 catalog using
postgresql::postgresql_password, postgresql_conf or
postgresql_replication_slot failed to compile with "syntax error,
unexpected ','" (issue puppetlabs#1685).

Fix the Ruby side so existing Puppet 7 installations keep working:

  - .rubocop.yml: TargetRubyVersion back to '2.6' so autocorrect can't
    reintroduce the shorthand.
  - Revert the Ruby 3.1 shorthand hash syntax in the three lib files
    (keeping the unrelated postgresql_conf entry_regex bugfix from
    puppetlabs#1657).
  - Revert the same shorthand autocorrection in four spec files so they
    parse under the 2.6 target.

Verified with `pdk validate`, the full unit suite (685 examples, 0
failures), and Litmus end-to-end applies on both Puppet 7.34/Ruby 2.7
and Puppet 8.10/Ruby 3.2 (install, idempotency, and a SCRAM-SHA-256
password hash stored in the live database).

Fixes puppetlabs#1685

Co-Authored-By: Claude <noreply@anthropic.com>
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.

4 participants