From 2a96e49e24859e63e67c0d824ad05fe216a0ecd3 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Mon, 23 Sep 2024 07:31:22 -0400 Subject: [PATCH] Make SUSEConnect -d error message on Public Cloud generic SUSEConnect -d is disabled on Public Cloud instances when registrecloudguest is present. This is to ensure that the correct de-registration action happens whether the system is connected to SCC or the update infrastructure. Initially this only mattered for PAYG. However with BYOS instances being able to connect to the update infrastructure we need the message to not refer to PAYG anymore. --- build/packaging/suseconnect-ng.changes | 3 +++ internal/connect/client.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/packaging/suseconnect-ng.changes b/build/packaging/suseconnect-ng.changes index be36868c..aa802e91 100644 --- a/build/packaging/suseconnect-ng.changes +++ b/build/packaging/suseconnect-ng.changes @@ -3,6 +3,9 @@ Fri Sep 13 15:56:05 UTC 2024 - Miquel Sabate Sola - IN PROGRESS: 1.13 - Integrating uptime-tracker + - Update error message for Public Cloud instances with registercloudguest + installed. SUSEConnect -d is disabled on PYAG and BYOS when the + registercloudguest command is available. (bsc#1230861) ------------------------------------------------------------------- Fri Sep 13 14:11:22 UTC 2024 - Miquel Sabate Sola diff --git a/internal/connect/client.go b/internal/connect/client.go index 356c7e20..4e4adac8 100644 --- a/internal/connect/client.go +++ b/internal/connect/client.go @@ -179,7 +179,7 @@ func registerProductTree(product Product, jsonOutput bool, out *RegisterOut) err func Deregister(jsonOutput bool) error { if util.FileExists("/usr/sbin/registercloudguest") && CFG.Product.isEmpty() { return fmt.Errorf("SUSE::Connect::UnsupportedOperation: " + - "De-registration is disabled for on-demand instances. " + + "De-registration via SUSEConnect is disabled by registercloudguest." + "Use `registercloudguest --clean` instead.") }