Fixes #30507: Use enabled hook helpers for Katello and Foreman #546
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ekohl
reviewed
Jul 28, 2020
Comment on lines
+21
to
23
| if app_value('certs_update_server_ca') && !katello_enabled? | ||
| fail_and_exit("--certs-update-server-ca needs to be used with katello", 101) | ||
| end |
There was a problem hiding this comment.
This part should really be a pre_commit hook IMHO. In pre the answers are already saved to disk. You should fail on invalid user input in pre.
It should also check if the certs module is enabled, rather than katello, right? It checks if the certs params are passed in and I think that server_ca_cert can also be used on a content proxy.
There was a problem hiding this comment.
File an issue if you don't mind, touching our certs code requires a Friday :P
|
Added candlepin_enabled? helper |
|
This could use another round of review |
ekohl
reviewed
Aug 19, 2020
ekohl
reviewed
Aug 24, 2020
| @@ -15,7 +15,7 @@ def error_exit(message, code) | |||
| kafo.class.exit code | |||
| end | |||
|
|
|||
| if module_enabled?('katello') | |||
| if candlepin_enabled? | |||
| java_version_string = `/usr/bin/java -version 2>&1` | |||
| java_version = java_version_string.split("\n")[0].split('"')[1] | |||
There was a problem hiding this comment.
On an unrelated note: I think this check itself should ensure JDK 1.8 is used since 1.7 is too old.
ekohl
approved these changes
Aug 27, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.