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

Fixes #36964 - SCA deprecation message - next release #918

Merged
merged 1 commit into from
Dec 8, 2023

Conversation

ianballou
Copy link
Member

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:

  1. hammer simple-content-access disable --organization-id 1
    -> See the warning
  2. 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:

[vagrant@centos7-hammer-devel hammer-cli-katello]$ hammer simple-content-access
...
Options:
 -h, --help                    Print help



Unfortunately the server does not support such operation.

The simple content access class was missing a :resource.

@@ -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."
Copy link
Member

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."
Copy link
Member

Choose a reason for hiding this comment

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

Same here.

@ianballou ianballou force-pushed the 36946-sca-dep-next-release branch from 80f0f54 to 29b15fb Compare December 7, 2023 20:21
@ianballou ianballou requested a review from lfu December 7, 2023 20:22
@lfu
Copy link
Member

lfu commented Dec 7, 2023

$ hammer simple-content-access disable --organization-id 1
Simple Content Access will be required for all organizations in the next release.
[..........................................................................................................................................................................................................] [100%]

@lfu
Copy link
Member

lfu commented Dec 7, 2023

$ hammer simple-content-access
Usage:
    hammer simple-content-access [OPTIONS] SUBCOMMAND [ARG] ...

Parameters:
 SUBCOMMAND                    Subcommand
 [ARG] ...                     Subcommand arguments

Subcommands:
 disable                       Disable simple content access for a manifest. WARNING: Simple Content Access
                               will be required for all organizations in Katello 4.12.
 enable                        Enable simple content access for a manifest
 status                        Check if the specified organization has Simple Content Access enabled. WARNING:
                               Simple Content Access will be required for all organizations in Katello 4.12.

Options:
 -h, --help                    Print help


@lfu
Copy link
Member

lfu commented Dec 7, 2023

Test failure is related.

@ianballou ianballou force-pushed the 36946-sca-dep-next-release branch from 29b15fb to 674c130 Compare December 7, 2023 21:28
Copy link
Member

@lfu lfu left a comment

Choose a reason for hiding this comment

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

LGTM 👍🏻

@ianballou ianballou merged commit 3b5cce2 into Katello:master Dec 8, 2023
3 checks passed
@ianballou ianballou deleted the 36946-sca-dep-next-release branch December 8, 2023 21:41
ianballou added a commit to ianballou/hammer-cli-katello that referenced this pull request Dec 11, 2023
ianballou added a commit that referenced this pull request Dec 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants