From f4838e2a1be04f222520b68fbbdc5b5e5486a1b4 Mon Sep 17 00:00:00 2001 From: Tobias Wolf Date: Mon, 4 Aug 2025 09:19:21 +0200 Subject: [PATCH] Add generic `log` extension mime type with `application/io.gardenlinux.log` Signed-off-by: Tobias Wolf --- .github/actions/features_parse/action.yml | 2 +- .github/actions/flavors_parse/action.yml | 2 +- .github/actions/setup/action.yml | 2 +- pyproject.toml | 2 +- src/gardenlinux/constants.py | 32 ++--------------------- 5 files changed, 6 insertions(+), 34 deletions(-) diff --git a/.github/actions/features_parse/action.yml b/.github/actions/features_parse/action.yml index a0327bef..71797cf0 100644 --- a/.github/actions/features_parse/action.yml +++ b/.github/actions/features_parse/action.yml @@ -11,7 +11,7 @@ outputs: runs: using: composite steps: - - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.8 + - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.9 - id: result shell: bash run: | diff --git a/.github/actions/flavors_parse/action.yml b/.github/actions/flavors_parse/action.yml index d0075e0f..f30aa571 100644 --- a/.github/actions/flavors_parse/action.yml +++ b/.github/actions/flavors_parse/action.yml @@ -13,7 +13,7 @@ outputs: runs: using: composite steps: - - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.8 + - uses: gardenlinux/python-gardenlinux-lib/.github/actions/setup@0.8.9 - id: matrix shell: bash run: | diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 416b1bb3..67ebe453 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -3,7 +3,7 @@ description: Installs the given GardenLinux Python library inputs: version: description: GardenLinux Python library version - default: "0.8.8" + default: "0.8.9" runs: using: composite steps: diff --git a/pyproject.toml b/pyproject.toml index 92eea208..59f62d9f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "gardenlinux" -version = "0.8.8" +version = "0.8.9" description = "Contains tools to work with the features directory of gardenlinux, for example deducting dependencies from feature sets or validating cnames" authors = ["Garden Linux Maintainers "] license = "Apache-2.0" diff --git a/src/gardenlinux/constants.py b/src/gardenlinux/constants.py index d73c29fc..9d054913 100644 --- a/src/gardenlinux/constants.py +++ b/src/gardenlinux/constants.py @@ -59,7 +59,6 @@ GL_MEDIA_TYPES = [ "secureboot.aws-efivars", "secureboot.kek.auth", - "gcpimage.tar.gz.log", "secureboot.pk.auth", "secureboot.kek.crt", "secureboot.kek.der", @@ -76,28 +75,14 @@ "chroot.test.log", "chroot.test.xml", "initrd.unified", - "pxe.tar.gz.log", "root.squashfs", - "manifest.log", "requirements", - "squashfs.log", - "release.log", - "vmlinuz.log", - "initrd.log", "pxe.tar.gz", - "qcow2.log", "test-log", "squashfs", "manifest", - "vmdk.log", - "tar.log", - "uki.log", "vmlinuz", "release", - "vhd.log", - "ova.log", - "raw.log", - "oci.log", "initrd", "tar.gz", "qcow2", @@ -110,11 +95,13 @@ "efi", "uki", "raw", + "log", ] GL_MEDIA_TYPE_LOOKUP = { "tar": "application/io.gardenlinux.image.archive.format.tar", "tar.gz": "application/io.gardenlinux.image.archive.format.tar.gz", + "log": "application/io.gardenlinux.log", "pxe.tar.gz": "application/io.gardenlinux.image.archive.format.pxe.tar.gz", "iso": "application/io.gardenlinux.image.archive.format.iso", "oci": "application/io.gardenlinux.image.archive.format.oci", @@ -127,34 +114,19 @@ "requirements": "application/io.gardenlinux.image.requirements", "efi": "application/io.gardenlinux.efi", "uki": "application/io.gardenlinux.uki", - "uki.log": "application/io.gardenlinux.log", "raw": "application/io.gardenlinux.image.archive.format.raw", - "manifest.log": "application/io.gardenlinux.log", - "release.log": "application/io.gardenlinux.log", "test-log": "application/io.gardenlinux.test-log", "manifest": "application/io.gardenlinux.manifest", - "tar.log": "application/io.gardenlinux.log", "release": "application/io.gardenlinux.release", - "raw.log": "application/io.gardenlinux.log", - "qcow2.log": "application/io.gardenlinux.log", - "pxe.tar.gz.log": "application/io.gardenlinux.log", - "gcpimage.tar.gz.log": "application/io.gardenlinux.log", - "vmdk.log": "application/io.gardenlinux.log", - "vhd.log": "application/io.gardenlinux.log", - "ova.log": "application/io.gardenlinux.log", "vmlinuz": "application/io.gardenlinux.kernel", - "vmlinuz.log": "application/io.gardenlinux.log", "initrd": "application/io.gardenlinux.initrd", - "initrd.log": "application/io.gardenlinux.log", "initrd.unified": "application/io.gardenlinux.initrd", "root.squashfs": "application/io.gardenlinux.squashfs", "squashfs": "application/io.gardenlinux.squashfs", - "squashfs.log": "application/io.gardenlinux.log", "platform.test.log": "application/io.gardenlinux.io.platform.test.log", "platform.test.xml": "application/io.gardenlinux.io.platform.test.xml", "chroot.test.log": "application/io.gardenlinux.io.chroot.test.log", "chroot.test.xml": "application/io.gardenlinux.io.chroot.test.xml", - "oci.log": "application/io.gardenlinux.log", "secureboot.pk.crt": "application/io.gardenlinux.cert.secureboot.pk.crt", "secureboot.pk.der": "application/io.gardenlinux.cert.secureboot.pk.der", "secureboot.pk.auth": "application/io.gardenlinux.cert.secureboot.pk.auth",