Merge ~spencerrunde/ubuntu/+source/landscape-client:noble-devel into ubuntu/+source/landscape-client:ubuntu/noble-devel

[Spencer Runde]

Fix inadvertent removal of Ubuntu Pro info during registration with Landscape Server and add test to cover that case.

[Spencer Runde (spencerrunde)]

Confirmed successful build on noble daily

[Andreas Hasenack (ahasenack)]

+1

review: Approve

[Andreas Hasenack (ahasenack)]

Sponsored:

Uploading landscape-client_24.02-0ubuntu3.dsc
Uploading landscape-client_24.02-0ubuntu3.debian.tar.xz
Uploading landscape-client_24.02-0ubuntu3_source.buildinfo
Uploading landscape-client_24.02-0ubuntu3_source.changes

diff --git a/debian/changelog b/debian/changelog
index 79a5c0b..b6ca536 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+landscape-client (24.02-0ubuntu3) noble; urgency=medium
+
+  * d/p/2057976-fix-ubuntu-pro-registration.patch: fix ubuntu pro info not
+    being sent on registration exchange with Landscape Server (LP: #2057976)
+
+ -- Spencer Runde <[e-mail]>  Thu, 14 Mar 2024 17:47:11 -0500
+
 landscape-client (24.02-0ubuntu2) noble; urgency=medium
 
   * d/p/2055348-fix-expandvars-arb-exec.patch: fix potential arbitrary shell
diff --git a/debian/patches/2057976-fix-ubuntu-pro-registration.patch b/debian/patches/2057976-fix-ubuntu-pro-registration.patch
new file mode 100644
index 0000000..2f7ce05
--- /dev/null
+++ b/debian/patches/2057976-fix-ubuntu-pro-registration.patch
@@ -0,0 +1,54 @@
+Description: Fix Ubuntu Pro info not being included in registration message with Landscape Server
+Origin: upstream, https://github.com/canonical/landscape-client/commit/9683f2016372b90cb2e54bdf56467fa62349a712
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/landscape-client/+bug/2057976
+Last-Update: 2024-03-14
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+Index: landscape-client/landscape/client/broker/registration.py
+===================================================================
+--- landscape-client.orig/landscape/client/broker/registration.py	2024-03-14 17:35:26.213606859 -0500
++++ landscape-client/landscape/client/broker/registration.py	2024-03-14 17:39:03.768352695 -0500
+@@ -8,11 +8,13 @@
+ credentials yet and that the server accepts registration messages, so it
+ will craft an appropriate one and send it out.
+ """
++import json
+ import logging
+ 
+ from twisted.internet.defer import Deferred
+ 
+ from landscape.client.broker.exchange import maybe_bytes
++from landscape.client.manager.ubuntuproinfo import get_ubuntu_pro_info
+ from landscape.lib.juju import get_juju_info
+ from landscape.lib.network import get_fqdn
+ from landscape.lib.tag import is_valid_tag_list
+@@ -239,6 +241,8 @@
+         with_tags = f"and tags {tags} " if tags else ""
+         with_group = f"in access group '{group}' " if group else ""
+ 
++        message["ubuntu_pro_info"] = json.dumps(get_ubuntu_pro_info())
++
+         logging.info(
+             f"Queueing message to register with account {account_name!r} "
+             f"{with_group}{with_tags}{with_word} a password.",
+Index: landscape-client/landscape/client/broker/tests/test_registration.py
+===================================================================
+--- landscape-client.orig/landscape/client/broker/tests/test_registration.py	2024-03-14 17:35:26.213606859 -0500
++++ landscape-client/landscape/client/broker/tests/test_registration.py	2024-03-14 17:39:03.768352695 -0500
+@@ -660,6 +660,15 @@
+         messages = self.mstore.get_pending_messages()
+         self.assertEqual(socket.getfqdn(), messages[0]["hostname"])
+ 
++    def test_ubuntu_pro_info_present_in_registration(self):
++        """Ubuntu Pro info is included to handle licensing in Server"""
++        self.mstore.set_server_api(b"3.3")
++        self.mstore.set_accepted_types(["register"])
++        self.config.computer_title = "Computer Title"
++        self.config.account_name = "account_name"
++        self.reactor.fire("pre-exchange")
++        messages = self.mstore.get_pending_messages()
++        self.assertIn("ubuntu_pro_info", messages[0])
+ 
+ class JujuRegistrationHandlerTest(RegistrationHandlerTestBase):
+ 
diff --git a/debian/patches/series b/debian/patches/series
index b372d1f..feace99 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 2055348-fix-expandvars-arb-exec.patch
+2057976-fix-ubuntu-pro-registration.patch