Skip to content

Commit

Permalink
feat: Add warning message about release version to dnf plugin
Browse files Browse the repository at this point in the history
* Card ID: CCT-171
* New feature: when a release is set by subscription-manager,
  then dnf plugin "subscription-manager" prints warning about
  this release
* I'm not convinced that it is good to do that, because it
  requires to do another REST API call for any dnf command and
  it will slow down dnf even more
  • Loading branch information
jirihnidek committed Mar 13, 2024
1 parent 4ad1403 commit 0933640
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 7 deletions.
11 changes: 11 additions & 0 deletions src/plugins/dnf/subscription_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from subscription_manager.utils import chroot, is_simple_content_access
from subscription_manager.injectioninit import init_dep_injection
from subscription_manager.i18n import ungettext, ugettext as _
from subscription_manager.release import get_consumer_release
from rhsm import logutil
from rhsm import config

Expand Down Expand Up @@ -70,6 +71,12 @@
"""
)

release_lock_waring = _(
"""
This system has release set to {release_version} and it receives updates only for this release.
"""
)

log = logging.getLogger("rhsm-app." + __name__)


Expand Down Expand Up @@ -206,6 +213,10 @@ def _warn_or_give_usage_message():
msg = not_registered_warning
elif len(ent_dir.list_valid()) == 0 and not is_simple_content_access(identity=identity):
msg = no_subs_warning
else:
release_version = get_consumer_release(identity=identity)
if release_version is not None:
msg = release_lock_waring.format(release_version=release_version)
finally:
if msg:
logger.info(msg)
Expand Down
11 changes: 5 additions & 6 deletions src/subscription_manager/cli_command/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from subscription_manager.cli import system_exit
from subscription_manager.cli_command.cli import CliCommand, conf
from subscription_manager.i18n import ugettext as _
from subscription_manager.release import ReleaseBackend, MultipleReleaseProductsError
from subscription_manager.release import ReleaseBackend, MultipleReleaseProductsError, get_consumer_release
from subscription_manager.repolib import RepoActionInvoker
from subscription_manager.utils import parse_baseurl_info
import subscription_manager.injection as inj
Expand Down Expand Up @@ -60,11 +60,10 @@ def __init__(self):
)

def _get_consumer_release(self):
err_msg = _("Error: The 'release' command is not supported by the server.")
consumer = self.cp.getConsumer(self.identity.uuid)
if "releaseVer" not in consumer:
system_exit(os.EX_UNAVAILABLE, err_msg)
return consumer["releaseVer"]["releaseVer"]
release_ver = get_consumer_release(self.identity, self.cp)
if release_ver is None:
system_exit(os.EX_UNAVAILABLE, _("Error: The 'release' command is not supported by the server."))
return release_ver

def show_current_release(self):
release = self._get_consumer_release()
Expand Down
19 changes: 18 additions & 1 deletion src/subscription_manager/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@
from subscription_manager import listing
from subscription_manager import rhelproduct
from subscription_manager.i18n import ugettext as _
from subscription_manager.identity import Identity
from rhsm.connection import UEPConnection

if TYPE_CHECKING:
from rhsm.connection import ContentConnection
from rhsm.connection import ContentConnection, UEPConnection

Check warning on line 38 in src/subscription_manager/release.py

View workflow job for this annotation

GitHub Actions / black & flake8 & rpmlint

F811 redefinition of unused 'UEPConnection' from line 35
from rhsm.certificate2 import Certificate, Content, EntitlementCertificate, Product, ProductCertificate
from subscription_manager.cp_provider import CPProvider
from subscription_manager.certdirectory import EntitlementDirectory, ProductDirectory
Expand All @@ -44,6 +46,21 @@
cfg = rhsm.config.get_config_parser()


def get_consumer_release(identity: Identity = None, cp: UEPConnection = None) -> Optional[str]:
"""
Try to get consumer release
"""
if identity is None:
identity = inj.require(inj.IDENTITY)
if cp is None:
cp_provider: CPProvider = inj.require(inj.CP_PROVIDER)
cp = cp_provider.get_consumer_auth_cp()
consumer = cp.getConsumer(identity.uuid)
if "releaseVer" not in consumer:
return None
return consumer["releaseVer"]["releaseVer"]


class MultipleReleaseProductsError(ValueError):
def __init__(self, certificates: Iterable["Certificate"]):
self.certificates = certificates
Expand Down

0 comments on commit 0933640

Please sign in to comment.