From a9b3fbd92b54bfdf83dbf16f0583c6bb095e617d Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Wed, 14 Jul 2021 11:38:52 +0000
Subject: [PATCH] test/data: auto-format ostree-bootiso

Re-indent and format the bootiso mpp. No actual content changes.
---
 .../manifests/fedora-ostree-bootiso.mpp.json  | 136 +++++++++++++-----
 1 file changed, 102 insertions(+), 34 deletions(-)

diff --git a/test/data/manifests/fedora-ostree-bootiso.mpp.json b/test/data/manifests/fedora-ostree-bootiso.mpp.json
index 2fd7c213..215cb5e3 100644
--- a/test/data/manifests/fedora-ostree-bootiso.mpp.json
+++ b/test/data/manifests/fedora-ostree-bootiso.mpp.json
@@ -34,49 +34,110 @@
                 ],
                 "packages": [
                   "fedora-release-iot",
-                  "glibc", "glibc-minimal-langpack", "nss-altfiles",
-                  "sssd-client", "libsss_sudo", "shadow-utils",
+                  "glibc",
+                  "glibc-minimal-langpack",
+                  "nss-altfiles",
+                  "sssd-client",
+                  "libsss_sudo",
+                  "shadow-utils",
                   "kernel",
-                  "dracut-config-generic", "dracut-network",
-                  "rpm-ostree", "polkit", "lvm2",
-                  "chrony", "zram-generator-defaults",
-                  "cryptsetup", "pinentry",
+                  "dracut-config-generic",
+                  "dracut-network",
+                  "rpm-ostree",
+                  "polkit",
+                  "lvm2",
+                  "chrony",
+                  "zram-generator-defaults",
+                  "cryptsetup",
+                  "pinentry",
                   "keyutils",
-                  "e2fsprogs", "dosfstools",
+                  "e2fsprogs",
+                  "dosfstools",
                   "gnupg2",
-                  "basesystem", "python3", "bash",
-                  "xz", "gzip",
-                  "coreutils", "which", "curl",
-                  "firewalld", "iptables",
-                  "NetworkManager", "NetworkManager-wifi", "NetworkManager-wwan",
-                  "wpa_supplicant", "iwd",
-                  "dnsmasq", "traceroute",
-                  "hostname", "iproute", "iputils",
-                  "openssh-clients", "openssh-server", "passwd",
-                  "policycoreutils", "procps-ng", "rootfiles", "rpm",
-                  "selinux-policy-targeted", "setup", "shadow-utils",
-                  "sudo", "systemd", "util-linux", "vim-minimal",
-                  "less", "tar",
+                  "basesystem",
+                  "python3",
+                  "bash",
+                  "xz",
+                  "gzip",
+                  "coreutils",
+                  "which",
+                  "curl",
+                  "firewalld",
+                  "iptables",
+                  "NetworkManager",
+                  "NetworkManager-wifi",
+                  "NetworkManager-wwan",
+                  "wpa_supplicant",
+                  "iwd",
+                  "dnsmasq",
+                  "traceroute",
+                  "hostname",
+                  "iproute",
+                  "iputils",
+                  "openssh-clients",
+                  "openssh-server",
+                  "passwd",
+                  "policycoreutils",
+                  "procps-ng",
+                  "rootfiles",
+                  "rpm",
+                  "selinux-policy-targeted",
+                  "setup",
+                  "shadow-utils",
+                  "sudo",
+                  "systemd",
+                  "util-linux",
+                  "vim-minimal",
+                  "less",
+                  "tar",
                   "fwupd",
-                  "greenboot", "greenboot-grub2", "greenboot-rpm-ostree-grub2", "greenboot-reboot", "greenboot-status",
+                  "greenboot",
+                  "greenboot-grub2",
+                  "greenboot-rpm-ostree-grub2",
+                  "greenboot-reboot",
+                  "greenboot-status",
                   "ignition",
                   "rsync",
                   "ima-evm-utils",
                   "bash-completion",
-                  "tmux", "screen",
+                  "tmux",
+                  "screen",
                   "policycoreutils-python-utils",
                   "setools-console",
-                  "audit", "rng-tools",
-                  "bluez", "bluez-libs", "bluez-mesh", "wpan-tools",
-                  "kernel-tools", "libgpiod-utils",
-                  "podman", "container-selinux", "skopeo", "criu",
+                  "audit",
+                  "rng-tools",
+                  "bluez",
+                  "bluez-libs",
+                  "bluez-mesh",
+                  "wpan-tools",
+                  "kernel-tools",
+                  "libgpiod-utils",
+                  "podman",
+                  "container-selinux",
+                  "skopeo",
+                  "criu",
                   "slirp4netns",
-                  "clevis", "clevis-dracut", "clevis-luks",
+                  "clevis",
+                  "clevis-dracut",
+                  "clevis-luks",
                   "attr",
-                  "grub2", "grub2-efi-x64", "efibootmgr", "shim-x64", "microcode_ctl",
-                  "iwl1000-firmware", "iwl100-firmware", "iwl105-firmware", "iwl135-firmware",
-                  "iwl2000-firmware", "iwl2030-firmware", "iwl3160-firmware", "iwl5000-firmware",
-                  "iwl5150-firmware", "iwl6000-firmware", "iwl6050-firmware", "iwl7260-firmware"
+                  "grub2",
+                  "grub2-efi-x64",
+                  "efibootmgr",
+                  "shim-x64",
+                  "microcode_ctl",
+                  "iwl1000-firmware",
+                  "iwl100-firmware",
+                  "iwl105-firmware",
+                  "iwl135-firmware",
+                  "iwl2000-firmware",
+                  "iwl2030-firmware",
+                  "iwl3160-firmware",
+                  "iwl5000-firmware",
+                  "iwl5150-firmware",
+                  "iwl6000-firmware",
+                  "iwl6050-firmware",
+                  "iwl7260-firmware"
                 ],
                 "excludes": [
                   "dracut-config-rescue"
@@ -95,7 +156,10 @@
           "type": "org.osbuild.systemd",
           "options": {
             "enabled_services": [
-              "NetworkManager.service", "firewalld.service", "rngd.service", "sshd.service"
+              "NetworkManager.service",
+              "firewalld.service",
+              "rngd.service",
+              "sshd.service"
             ]
           }
         },
@@ -339,7 +403,9 @@
           "type": "org.osbuild.dracut",
           "options": {
             "kernel": [
-              {"mpp-format-string": "{rpms['ostree-tree']['kernel'].evra}" }
+              {
+                "mpp-format-string": "{rpms['ostree-tree']['kernel'].evra}"
+              }
             ],
             "add_modules": [
               "anaconda",
@@ -453,7 +519,9 @@
               "version": "34"
             },
             "isolabel": "Fedora-34-X86_64",
-            "kernel": {"mpp-format-string": "{rpms['ostree-tree']['kernel'].evra}" },
+            "kernel": {
+              "mpp-format-string": "{rpms['ostree-tree']['kernel'].evra}"
+            },
             "efi": {
               "architectures": [
                 "IA32",