From 3bc7d4c6182eb9b615ef7123a4ea06a0fd701df8 Mon Sep 17 00:00:00 2001 From: Lucy Fu Date: Tue, 3 Oct 2023 12:56:18 -0400 Subject: [PATCH] Fixes #36795 - Prepare for SCA-Only (#911) --- lib/hammer_cli_katello/organization.rb | 3 +++ lib/hammer_cli_katello/simple_content_access.rb | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/lib/hammer_cli_katello/organization.rb b/lib/hammer_cli_katello/organization.rb index 296e7c9a..636428e1 100644 --- a/lib/hammer_cli_katello/organization.rb +++ b/lib/hammer_cli_katello/organization.rb @@ -76,6 +76,9 @@ def request_params if params.key?('simple_content_access') 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." + end end params end diff --git a/lib/hammer_cli_katello/simple_content_access.rb b/lib/hammer_cli_katello/simple_content_access.rb index 6b48c37c..5397b0e7 100644 --- a/lib/hammer_cli_katello/simple_content_access.rb +++ b/lib/hammer_cli_katello/simple_content_access.rb @@ -45,6 +45,11 @@ class DisableCommand < HammerCLIKatello::SingleResourceCommand failure_message _("Could not disable Simple Content Access for this organization") build_options + + def execute + warn "Simple Content Access will be required for all organizations in Katello 4.12." + super + end end autoload_subcommands