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

replace deprecated merge() with native puppet code #1154

Merged
merged 1 commit into from
Dec 15, 2023

Conversation

bastelfreak
Copy link
Collaborator

@bastelfreak bastelfreak commented Dec 15, 2023

merge() was a function from stdlib. It got namespaced in stdlib 9 to stdlib::merge(). To stay compatible with both stdlib versions, we can just replace the code with the puppet-native +.

@bastelfreak bastelfreak self-assigned this Dec 15, 2023
@bastelfreak bastelfreak requested review from smortex and a team as code owners December 15, 2023 15:20
Copy link
Collaborator

@smortex smortex left a comment

Choose a reason for hiding this comment

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

LGTM.

Maybe adjusting the PR to indicate why we do this? I feel like merge was deprecated and removed and these are leftovers in a code path not tested?

@bastelfreak bastelfreak changed the title replace merge with native puppet code replace deprecated merge() with native puppet code Dec 15, 2023
@bastelfreak
Copy link
Collaborator Author

@smortex I adjusted it.

@bastelfreak bastelfreak merged commit b092c9c into puppetlabs:main Dec 15, 2023
17 of 19 checks passed
@bastelfreak bastelfreak deleted the stdlib branch December 15, 2023 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants