Fixes #36797 - Update API in preparation for SCA-only #10760
Merged
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
|
Issues: #36797 |
jeremylenz
reviewed
Oct 3, 2023
| param :organization_id, :number, :desc => N_("Organization ID"), :required => true | ||
| def status | ||
| status = @organization.simple_content_access? | ||
| render json: { simple_content_access: status } | ||
| end | ||
|
|
||
| api :PUT, "/organizations/:organization_id/simple_content_access/enable", | ||
| N_("Enable simple content access for a manifest") | ||
| N_("Enable simple content access for a manifest. %s") % sca_only_deprecation_text, deprecated: true |
There was a problem hiding this comment.
Adding the warning text here (when you're enabling) might be confusing. I'd keep it deprecated but don't add the sca_only_deprecation_text for this one.
| @@ -47,6 +48,7 @@ def create | |||
| def update | |||
| return if params[:simple_content_access].nil? | |||
| sca_param = ::Foreman::Cast.to_bool(params[:simple_content_access]) | |||
| Rails.logger.warn "DEPRECATION WARNING: Simple Content Access will be required for all organizations in Katello 4.12." | |||
There was a problem hiding this comment.
Can we use ::Foreman::Deprecation.api_deprecation_warning here?
|
[test katello] |
|
Local test passed. |
|
[test katello] |
jeremylenz
reviewed
Oct 9, 2023
| @@ -17,6 +17,12 @@ def current_user | |||
| User.current | |||
| end | |||
|
|
|||
| class_methods do | |||
| def sca_only_deprecation_text | |||
| N_("WARNING: Entitlement-based subscription management is deprecated and will be removed in Katello 4.12.") | |||
There was a problem hiding this comment.
Suggested change
| N_("WARNING: Entitlement-based subscription management is deprecated and will be removed in Katello 4.12.") | |
| N_("WARNING: Simple Content Access will be required for all organizations in Katello 4.12.") |
I feel like in the API context it's more clear to just stick with this wording everywhere.
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.
What are the changes introduced in this pull request?
Prepare API endpoints and params for the retirement of entitlement mode in Katello 4.12.
Considerations taken when implementing this change?
What are the testing steps for this pull request?
2023-10-03T20:04:59 [W|app|19e3e9b9] DEPRECATION WARNING: Simple Content Access will be required for all organizations in Katello 4.12.