Merge lp:~orndorffgrant/ubuntu-motd/aptnews-pkg-selectors into lp:ubuntu-motd

[Grant Orndorff]

This adds new selectors to the schema to help only show apt news when it is pertinent to users.

These selectors were specced in (canonical internal link) https://docs.google.com/document/d/10-UdSnmJUBTZ7pMcJde53KRrMn9qCmbbTW-Hap92P_8/edit

The client side implementation of these selectors is being added to ubuntu-pro-client version 32, scheduled to be released May 21, 2024. As such, this proposal should not be merged before a successful release of version 32 - tracking in https://bugs.launchpad.net/ubuntu/+source/ubuntu-advantage-tools/+bug/2060732

The presence of these selectors will not cause errors on older versions of ubuntu-pro-client; they will be ignored.

[Christian Ehrhardt  (paelzer)]

I checked this and it does indeed match the specification.

I'm glad to heard that (as planned) it does not cause issues on older versions of the client.

You asked for only landing this after version 32 is released.
But I assume it would also not cause errors in the new client - right?
Neither if we land this earlier nor if we land it later?

AFAIU (please correct me if I'm wrong) then the landing of this only enables allowing these qualifiers to be used in the news definition.

review: Approve

[Grant Orndorff (orndorffgrant)]

You are right that the landing of this only enables the use of these selectors and that won't harm any version of pro-client.

I only suggest waiting because the presence of these selectors in the schema implies that they will work, but they won't actually work until v32 of pro-client is released.

[Steve Langasek (vorlon)]

Christian, as you have marked this approved and Grant has answered your question, are you planning to land the branch?

[Grant Orndorff (orndorffgrant)]

v32 of pro-client was released today, so I think this MP is ready to land.

Unmerged revisions

99. By Grant Orndorff on 2024-04-26

add new selectors to apt-news schema

=== modified file 'aptnews-schema.json'
--- aptnews-schema.json	2022-12-13 19:59:54 +0000
+++ aptnews-schema.json	2024-04-29 18:46:04 +0000
@@ -32,6 +32,37 @@
                             },
                             "pro": {
                                 "type": "boolean"
+                            },
+                            "architectures": {
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                }
+                            },
+                            "packages": {
+                                "type": "array",
+                                "items": {
+                                    "type": "array",
+                                    "minItems": 3,
+                                    "maxItems": 3,
+                                    "prefixItems": [
+                                        {
+                                            "type": "string"
+                                        },
+                                        {
+                                            "enum": [
+                                                "<",
+                                                "<=",
+                                                "==",
+                                                ">=",
+                                                ">"
+                                            ]
+                                        },
+                                        {
+                                            "type": "string"
+                                        }
+                                    ]
+                                }
                             }
                         },
                         "additionalProperties": false