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

stdlib v9 support, use namespaced stdlib functions #1208

Closed
wants to merge 6 commits into from
+3 −8
Closed

stdlib v9 support, use namespaced stdlib functions #1208

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d6ca26c
stdlib v9 and puppet v8 support
ggabijaa Dec 4, 2023
c3a2f8c
Update stdlib version
ggabijaa Dec 6, 2023
147c743
Merge branch 'master' into update_stdlib_puppet
ggabijaa Feb 21, 2024
4e1de2a
Update config.pp
ggabijaa Feb 21, 2024
658ac0f
Update config.pp
ggabijaa Feb 21, 2024
feb25ad
lint
ggabijaa Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

$init_defaults = {
'MAX_OPEN_FILES' => '65535',
}.merge($elasticsearch::init_defaults)
}.stdlib::merge($elasticsearch::init_defaults)
Copy link
Member

Choose a reason for hiding this comment

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

you can add the hashes with +. then you don't need merge and don't need stdlib.

Copy link
Contributor

Choose a reason for hiding this comment

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

#1217 and just close this PR?


if ($elasticsearch::ensure == 'present') {
file {
Expand Down Expand Up @@ -164,7 +164,7 @@
# }

# Generate Elasticsearch config
$data = merge(
$data = stdlib::merge(
Copy link
Contributor

Choose a reason for hiding this comment

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

I would really like to release a new version that allow 9.x before we start requiring 9.x
This makes it a bit easier to upgrade without breaking dependencies.

$elasticsearch::config,
{ 'path.data' => $elasticsearch::datadir },
{ 'path.logs' => $elasticsearch::logdir },
Expand Down
4 changes: 2 additions & 2 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 4.13.0 < 9.0.0"
"version_requirement": ">= 4.13.0 < 10.0.0"
Copy link
Member

Choose a reason for hiding this comment

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

The namespaced version of merge() was added in 04d1f0c5cccb93d0bc928c7623c4b0c0ebda5b6b which require version 9.0.0 of the stdlib module:

Suggested change
"version_requirement": ">= 4.13.0 < 10.0.0"
"version_requirement": ">= 9.0.0 < 10.0.0"

Copy link
Author

Choose a reason for hiding this comment

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

updated accordingly, thanks

}
],
"operatingsystem_support": [
Expand Down Expand Up @@ -78,7 +78,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 7.0.0 < 8.0.0"
"version_requirement": ">= 7.0.0 < 9.0.0"
ggabijaa marked this conversation as resolved.
Show resolved Hide resolved
}
]
}
Loading