-
Notifications
You must be signed in to change notification settings - Fork 83
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
Fixes #36964 - SCA deprecation message - next release #918
Conversation
@@ -77,7 +77,7 @@ def request_params | |||
params["organization"] = params.fetch('organization', {}).merge( | |||
"_simple_content_access" => params['simple_content_access']) | |||
unless params['simple_content_access'] | |||
warn "Simple Content Access will be required for all organizations in Katello 4.12." | |||
warn "Simple Content Access will be required for all organizations in the next release." |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add N_()
.
@@ -47,7 +49,7 @@ class DisableCommand < HammerCLIKatello::SingleResourceCommand | |||
build_options | |||
|
|||
def execute | |||
warn "Simple Content Access will be required for all organizations in Katello 4.12." | |||
warn "Simple Content Access will be required for all organizations in the next release." |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same here.
80f0f54
to
29b15fb
Compare
|
|
Test failure is related. |
29b15fb
to
674c130
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 👍🏻
(cherry picked from commit 3b5cce2)
(cherry picked from commit 3b5cce2)
Changes the Katello 4.12 message to say "next release" so that projects using Katello don't have to worry about translating the name.
To test:
hammer simple-content-access disable --organization-id 1
-> See the warning
hammer organization update --id 1 --simple-content-access false
-> See the same warning
This will need to be CP'd to the 1.11.z branch.
Also fixes an issue I found:
The simple content access class was missing a
:resource
.