ubuntu_image: parser improvements #168
Conversation
Use a more strict schema for volume names. Prevent volume names from starting with a hyphen. Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
Enforce uniqueness of structure names within a volume. Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
There was a problem hiding this comment.
Ok, big +1 on this - one change we'll need is the addition of a changelog entry for the new features (and an LP bug). I guess I can do that for you as well. There's also one small change you could do while your at it (see inline comment), but that's generally just a nitpick.
As for failing tests: snap.sh is known to fail for non-xenial systems on CI, sadly. Other than that it looks good (haschangelog is failing because the changelog change is missing). There's one more disco failure, which is something I did not see before - but it's unrelated to this change. Need to take a look at that...
ubuntu_image/parser.py
Outdated
| @@ -347,9 +347,15 @@ def parse(stream_or_string): | |||
| bootloader_seen |= (bootloader is not None) | |||
| image_id = image_spec.get('id') | |||
| structures = [] | |||
| structure_names = [] | |||
There was a problem hiding this comment.
This is more of a nitpick (/preference) really, but could we use a set() instead of a list here? Since the only thing we do is a check name in structure_names and append, we could use a set() + structure_names.add(name) instead.
There was a problem hiding this comment.
Thanks for the suggestion. Updated & pushed.
Tweak the cod and use set() instead of a plain list Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
|
Thank you! |
Some parser improvements that came up while I was working on a similar functionality in snapd snapcore/snapd#6634