Manage deb822 format and apt-key removal in trixie #1437

maisim · 2025-08-22T07:57:54Z

WIP

Pull request is based on the default branch (3.x at this time)
Pull request includes tests for any new/updated operations/facts
Pull request includes documentation for any new/updated operations/facts
Tests pass (see scripts/dev-test.sh)
Type checking & code style passes (see scripts/dev-lint.sh)

maisim · 2025-08-22T07:58:57Z

Just to let know you I am working on, comments are welcome

DonDebonair · 2025-09-07T12:36:03Z

pyinfra/facts/apt.py

 from __future__ import annotations

 import re
+from typing import List


You don't actually need to import this, as it's deprecated. You should use list now as type annotation

DonDebonair · 2025-09-07T12:37:13Z

pyinfra/facts/apt.py



-class AptSources(FactBase):
+def parse_deb822_stanza(lines: list[str]):


Add return type annotation.

DonDebonair · 2025-09-07T12:37:25Z

pyinfra/facts/apt.py

+    return repos
+
+
+def parse_apt_list_file(lines: List[str]):


Add return type annotation, use list[str] for lines

DonDebonair · 2025-09-07T12:37:37Z

pyinfra/facts/apt.py

+    return repos
+
+
+def parse_deb822_sources_file(lines: List[str]):


Add return type annotation, use list[str] for lines

DonDebonair · 2025-09-07T12:39:55Z

pyinfra/facts/apt.py

+    stanza. Returns a combined list of repo dicts for all stanzas.
+    """
+    repos = []
+    stanza: List[str] = []


Suggested change

stanza: List[str] = []

stanza: list[str] = []

DonDebonair · 2025-09-07T12:56:35Z

pyinfra/operations/apt.py

+            # then export and dearmor to the APT keyring destination.
+            yield (
+                "sh -c 'set -e;"
+                " install -d -m 0755 /etc/apt/keyrings;"


Why not use a fact to check if that dir already exists and only emit a files.directory command if it doesn't?

DonDebonair · 2025-09-07T13:10:35Z

Hey @maisim, I hope you don't mind me leaving some comments. I agreed with @Fizzadar to help him out a bit with reviewing PRs.

This is great work! Support for the new DEB822-style apt sources and a replacement for apt-key are sorely needed. apt-key has in fact been removed in the latest stable Debian release (Trixie).

I have a couple of general suggestions, and I'll leave it to @Fizzadar if he agrees:

I would split this PR into 2: one for supporting DEB822 apt sources and one for replacing apt-key. Makes it easier to review and keeps PRs nicely compact
The work related to DEB822 apt sources could really benefit from some unit tests. There is a lot of parsing going on, which is both error-prone and easy to test. Also AptSources.process(...) is a complex function, trying to process multiple files at once. The algorithm that you wrote (using file markers, very neat!) looks sound to me, but it took me quite some time to truly understand what is going on. Writing one or more tests for that helps with both understanding what's going on and preventing bugs.
parse_deb822_stanza and parse_apt_list_file both return a list of dicts. I think there is an opportunity for type-safety here, because the fields that define an apt source are well defined, even down to the options. So my suggestion would be for both functions to return list[AptRepo] where AptRepo is a dataclass. This dataclass can even be reused across .sources and .list style definitions. I think the only real difference would be that for the latter, the components field would only ever have 1 entry.
Ideally, I would even say that the AptSources fact should return a list[AptRepo], but as that would break backwards compatibility, we could add an argument to that fact to optionally return list[AptRepo] instead of list[dict] (something like return_type_safe: bool = False)

What do you think @maisim @Fizzadar ?

maisim · 2025-09-12T06:22:44Z

Hi @DonDebonair !
Thank you very much for your review! I agree with your comments. Regarding the 2-PR split, I need to get back into it; it may indeed be possible to take care of the new format support in a PR and then the changes in the apt part.

DonDebonair · 2025-09-12T06:45:04Z

Let me know if you need any help @maisim !

maisim · 2025-09-13T08:46:11Z

Hi @DonDebonair ,

Big changes here, this is still a WIP. Don't waste your time and let me double check tomorrow before :)
Thanx again for your feedback, it gave me energy to continue the work 👍

maisim · 2025-09-13T08:48:08Z

It's a big all in one push but i will take care to split all this when I will get this all working ;)

… and keyrings

maisim · 2025-09-24T14:11:34Z

I started separating this into several PRs, the first one is here #1460

maisim · 2025-10-16T09:46:58Z

replaced by 3 prs:
#1460
#1465
#1487

maisim force-pushed the 3.x_Manage_deb822_format_and_apt-key_removal_in_trixie branch 2 times, most recently from 5d70a6b to 5c4cebf Compare August 22, 2025 08:50

DonDebonair reviewed Sep 7, 2025

View reviewed changes

maisim force-pushed the 3.x_Manage_deb822_format_and_apt-key_removal_in_trixie branch from 5c4cebf to 18070e3 Compare September 13, 2025 08:43

maisim added 4 commits September 18, 2025 08:20

operations/gpg: add GPG key management operations and tests

a3ded84

operations/apt: manage deb822 format and apt-key removal in trixie

c09c6ec

operations/gpg: enhance key management to support removal of GPG keys…

23a2234

… and keyrings

transitory commit: tests fixes

2c1bdf5

maisim force-pushed the 3.x_Manage_deb822_format_and_apt-key_removal_in_trixie branch from d8a1cbe to 2c1bdf5 Compare September 22, 2025 16:10

maisim closed this Oct 16, 2025



		class AptSources(FactBase):
		def parse_deb822_stanza(lines: list[str]):

		return repos


		def parse_deb822_sources_file(lines: List[str]):

Uh oh!

Manage deb822 format and apt-key removal in trixie #1437

Manage deb822 format and apt-key removal in trixie #1437

Uh oh!

Conversation

maisim commented Aug 22, 2025

Uh oh!

maisim commented Aug 22, 2025

Uh oh!

DonDebonair Sep 7, 2025

Choose a reason for hiding this comment

Uh oh!

DonDebonair Sep 7, 2025

Choose a reason for hiding this comment

Uh oh!

DonDebonair Sep 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DonDebonair Sep 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DonDebonair Sep 7, 2025

Choose a reason for hiding this comment

Uh oh!

DonDebonair Sep 7, 2025

Choose a reason for hiding this comment

Uh oh!

DonDebonair commented Sep 7, 2025

Uh oh!

maisim commented Sep 12, 2025

Uh oh!

DonDebonair commented Sep 12, 2025

Uh oh!

maisim commented Sep 13, 2025

Uh oh!

maisim commented Sep 13, 2025

Uh oh!

maisim commented Sep 24, 2025

Uh oh!

maisim commented Oct 16, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

DonDebonair Sep 7, 2025 •

edited

Loading

DonDebonair Sep 7, 2025 •

edited

Loading