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

Add support for PassengerPreloadBundler #2233

Merged
merged 2 commits into from
Apr 6, 2022

Conversation

smortex
Copy link
Collaborator

@smortex smortex commented Apr 4, 2022

The latest passenger include a new option to load ruby bundles earlier,
working around deployment issues. See:

@smortex smortex requested a review from a team as a code owner April 4, 2022 18:52
@puppet-community-rangefinder
Copy link

apache::mod::passenger is a class

Breaking changes to this file WILL impact these 11 modules (exact match):
Breaking changes to this file MAY impact these 3 modules (near match):

apache::vhost is a type

Breaking changes to this file WILL impact these 128 modules (exact match):
Breaking changes to this file MAY impact these 35 modules (near match):

This module is declared in 174 of 579 indexed public Puppetfiles.


These results were generated with Rangefinder, a tool that helps predict the downstream impact of breaking changes to elements used in Puppet modules. You can run this on the command line to get a full report.

Exact matches are those that we can positively identify via namespace and the declaring modules' metadata. Non-namespaced items, such as Puppet 3.x functions, will always be reported as near matches only.

@smortex smortex marked this pull request as draft April 4, 2022 20:08
@smortex
Copy link
Collaborator Author

smortex commented Apr 4, 2022

@chelnak not sure about what "community-labeller" is supposed to check (failed test in first commit)… I labelled the issue and re-run the test but the outcome was the same 🤷 Then I saw CI was broken, so I added a commit to fix this and that "community-labeller" issue did not trigger. I see you authored this GHA maybe you are interested in this info?

@smortex smortex marked this pull request as ready for review April 4, 2022 22:20
@ekohl
Copy link
Collaborator

ekohl commented Apr 4, 2022

@smortex I think #2232 is supposed to fix it. If this commit is included in your PR then I think we can conclude #2232 didn't fix it.

@smortex smortex force-pushed the passenger_preload_bundler branch 2 times, most recently from 08ccf42 to af8094b Compare April 4, 2022 23:00
@chelnak
Copy link
Contributor

chelnak commented Apr 5, 2022

That's the one @ekohl !

@smortex It turns out getting the right scope for this sort of thing is harder than I thought. However it should be fixed in the commit mentioned above.

Thanks for pointing it out 👍🙂

Copy link
Member

@david22swan david22swan left a comment

Choose a reason for hiding this comment

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

Other than the below, this look's good to me.

manifests/mod/passenger.pp Outdated Show resolved Hide resolved
The latest passenger include a new option to load ruby bundles earlier,
working around deployment issues.  See:
* phusion/passenger#2410
* phusion/passenger#2409
@@ -44,7 +44,7 @@ class { 'apache::mod::php': }
describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
it { is_expected.to contain 'DirectoryIndex index.php' }
end
elsif os[:family] == 'redhat' && os[:release] =~ %r{^8\.}
elsif os[:family] == 'redhat' && os[:release] =~ %r{^8($|\.)}
Copy link
Collaborator

Choose a reason for hiding this comment

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

looks a bit complicated. %r{^8} should be fine?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Quite agree, at the current rate of RedHat releases I think we can ignore the issues that might arise the release following RedHat 79 😁 …

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

/^8\b/ should also do it as expected

CentOS Stream verion is just `8`, not `8.foo`.
Copy link
Member

@david22swan david22swan left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -343,6 +346,7 @@
$passenger_installed_version = undef,
$passenger_instance_registry_dir = undef,
$passenger_load_shell_envvars = undef,
Optional[Boolean] $passenger_preload_bundler = undef,
Copy link
Collaborator

Choose a reason for hiding this comment

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

Wouldn't false be the better default?

Suggested change
Optional[Boolean] $passenger_preload_bundler = undef,
Boolean $passenger_preload_bundler = false,

Copy link
Collaborator

Choose a reason for hiding this comment

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

No. Right now undef means "don't output it at all" and the boolean translates to On/Off. This is the correct behavior IMHO, especially since older Passenger versions don't support this so it'd fail on an unexpected statement.

Copy link
Collaborator

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

Not sure what's up with the CLA check.

@david22swan david22swan merged commit 6a699ef into puppetlabs:main Apr 6, 2022
@david22swan
Copy link
Member

@smortex Thanks for putting the work in :)

As for the CLA test, they do that sometimes

@smortex smortex deleted the passenger_preload_bundler branch April 6, 2022 17:27
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.

5 participants