Skip to content

pkg/osbuild: generate osbuild result from status scanner entries#1941

Merged
supakeen merged 3 commits into
osbuild:mainfrom
croissanne:statusscanner-metadata
Oct 21, 2025
Merged

pkg/osbuild: generate osbuild result from status scanner entries#1941
supakeen merged 3 commits into
osbuild:mainfrom
croissanne:statusscanner-metadata

Conversation

@croissanne

@croissanne croissanne commented Oct 8, 2025

Copy link
Copy Markdown
Member

osbuild/monitor: generate osbuild result from status entries

Adds StatusScanner.Result() which constructs a osbuild.Result struct
from entries in the status scanner.

Even with JSONSeqMonitor set, osbuild still returns an osbuild.Result
for validation errors. Capture these by unmarshaling and checking the
type field.


@croissanne
croissanne force-pushed the statusscanner-metadata branch 5 times, most recently from ecb2eee to 9a76129 Compare October 13, 2025 11:09
@croissanne
croissanne marked this pull request as ready for review October 15, 2025 09:32
@croissanne
croissanne requested a review from a team as a code owner October 15, 2025 09:32
@croissanne
croissanne requested review from bcl, lzap and mvo5 October 15, 2025 09:33
@croissanne
croissanne force-pushed the statusscanner-metadata branch from 9a76129 to 891b084 Compare October 15, 2025 09:45
thozza
thozza previously approved these changes Oct 16, 2025

@thozza thozza left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@croissanne
croissanne marked this pull request as draft October 16, 2025 18:06
@croissanne

croissanne commented Oct 16, 2025

Copy link
Copy Markdown
Member Author

Just noticed I didn't even add the metadata part 🤦 (and left a TODO in there)

@croissanne
croissanne force-pushed the statusscanner-metadata branch from 891b084 to cad458c Compare October 16, 2025 19:49
@croissanne
croissanne marked this pull request as ready for review October 16, 2025 20:17
@croissanne
croissanne force-pushed the statusscanner-metadata branch from cad458c to b4a8d99 Compare October 16, 2025 20:17
@croissanne
croissanne requested a review from thozza October 17, 2025 08:52
@croissanne
croissanne force-pushed the statusscanner-metadata branch from b4a8d99 to f30b72f Compare October 17, 2025 09:31
@supakeen supakeen self-assigned this Oct 20, 2025
achilleas-k
achilleas-k previously approved these changes Oct 20, 2025

@achilleas-k achilleas-k left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you. LGTM.

Tiniest of nitpicks below.

Comment thread pkg/osbuild/monitor.go Outdated
Comment thread test/config-list.json
lzap
lzap previously approved these changes Oct 21, 2025
@supakeen
supakeen added this pull request to the merge queue Oct 21, 2025
This version includes the metadata field in results entries when using
`JSONSeqMonitor`.
Adds `StatusScanner.Result()` which constructs a `osbuild.Result` struct
from entries in the status scanner.

Even with JSONSeqMonitor set, osbuild still returns an `osbuild.Result`
for validation errors. Capture these by unmarshaling and checking the
type field.
The same problem as 9.0 and 9.2 seems to have hit 9.4 aarch64 VHDs.
@croissanne
croissanne force-pushed the statusscanner-metadata branch from f30b72f to 07764da Compare October 21, 2025 09:02
Merged via the queue into osbuild:main with commit 35e0268 Oct 21, 2025
8 checks passed
@croissanne
croissanne deleted the statusscanner-metadata branch October 21, 2025 09:54
croissanne added a commit to croissanne/osbuild-composer that referenced this pull request Oct 21, 2025
Changes with 0.205.0
----------------
  - Convert the test config map to a config list (osbuild/image-builder#1900)
    - Author: Achilleas Koutsou, Reviewers: Sanne Raymaekers, Simon de Vlieger
  - Repos: Add definitions for AlmaLinux 9.7, 9.8, 10.1 and 10.2 (osbuild/image-builder#1926)
    - Author: Eduard Abdullin, Reviewers: Achilleas Koutsou, Brian C. Lane, Simon de Vlieger
  - Support uploading to OpenStack (osbuild/image-builder#1921)
    - Author: Jakub Kadlčík, Reviewers: Michael Vogt, Simon de Vlieger
  - disk: make addPartitionsForBootMode() arch specific (osbuild/image-builder#1928)
    - Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger
  - distro: add ova image type for bootc [HMS-9503] (osbuild/image-builder#1938)
    - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - fedora/minimal: drop uuids in partition tables (osbuild/image-builder#1932)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt

Changes with 0.206.0
----------------
  - Update osbuild dependency commit ID to latest (osbuild/image-builder#1945)
    - Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - deps: bump blueprint to 1.16.0 (osbuild/image-builder#1952)
    - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Sanne Raymaekers
  - fedora: Drop tigervnc on F42 and later (osbuild/image-builder#1942)
    - Author: Brian C. Lane, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: document root kickstart (osbuild/image-builder#1936)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt
  - fedora: rawhide is 44 (osbuild/image-builder#1943)
    - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Tomáš Hozza
  - many: lorax template split (HMS-9524) (osbuild/image-builder#1949)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Tomáš Hozza

Changes with 0.207.0
----------------
  - Enable fedora 43 unit testing (osbuild/image-builder#1954)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: update cloud_kernel_options (osbuild/image-builder#1953)
    - Author: Sanne Raymaekers, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - test/data/repos/rhel-10.2: fix copy & paste error (osbuild/image-builder#1956)
    - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger

Changes with 0.208.0
----------------
  - Schutzfile: switch CI runner to Fedora 42 (osbuild/image-builder#1955)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - Support uploading to IBM Cloud (osbuild/image-builder#1924)
    - Author: Jakub Kadlčík, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - pkg/osbuild: generate osbuild result from status scanner entries (osbuild/image-builder#1941)
    - Author: Sanne Raymaekers, Reviewers: Nobody
croissanne added a commit to croissanne/osbuild-composer that referenced this pull request Oct 21, 2025
Changes with 0.205.0
----------------
  - Convert the test config map to a config list (osbuild/image-builder#1900)
    - Author: Achilleas Koutsou, Reviewers: Sanne Raymaekers, Simon de Vlieger
  - Repos: Add definitions for AlmaLinux 9.7, 9.8, 10.1 and 10.2 (osbuild/image-builder#1926)
    - Author: Eduard Abdullin, Reviewers: Achilleas Koutsou, Brian C. Lane, Simon de Vlieger
  - Support uploading to OpenStack (osbuild/image-builder#1921)
    - Author: Jakub Kadlčík, Reviewers: Michael Vogt, Simon de Vlieger
  - disk: make addPartitionsForBootMode() arch specific (osbuild/image-builder#1928)
    - Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger
  - distro: add ova image type for bootc [HMS-9503] (osbuild/image-builder#1938)
    - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - fedora/minimal: drop uuids in partition tables (osbuild/image-builder#1932)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt

Changes with 0.206.0
----------------
  - Update osbuild dependency commit ID to latest (osbuild/image-builder#1945)
    - Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - deps: bump blueprint to 1.16.0 (osbuild/image-builder#1952)
    - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Sanne Raymaekers
  - fedora: Drop tigervnc on F42 and later (osbuild/image-builder#1942)
    - Author: Brian C. Lane, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: document root kickstart (osbuild/image-builder#1936)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt
  - fedora: rawhide is 44 (osbuild/image-builder#1943)
    - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Tomáš Hozza
  - many: lorax template split (HMS-9524) (osbuild/image-builder#1949)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Tomáš Hozza

Changes with 0.207.0
----------------
  - Enable fedora 43 unit testing (osbuild/image-builder#1954)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: update cloud_kernel_options (osbuild/image-builder#1953)
    - Author: Sanne Raymaekers, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - test/data/repos/rhel-10.2: fix copy & paste error (osbuild/image-builder#1956)
    - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger

Changes with 0.208.0
----------------
  - Schutzfile: switch CI runner to Fedora 42 (osbuild/image-builder#1955)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - Support uploading to IBM Cloud (osbuild/image-builder#1924)
    - Author: Jakub Kadlčík, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - pkg/osbuild: generate osbuild result from status scanner entries (osbuild/image-builder#1941)
    - Author: Sanne Raymaekers, Reviewers: Nobody
ondrejbudai pushed a commit to osbuild/osbuild-composer that referenced this pull request Oct 22, 2025
Changes with 0.205.0
----------------
  - Convert the test config map to a config list (osbuild/image-builder#1900)
    - Author: Achilleas Koutsou, Reviewers: Sanne Raymaekers, Simon de Vlieger
  - Repos: Add definitions for AlmaLinux 9.7, 9.8, 10.1 and 10.2 (osbuild/image-builder#1926)
    - Author: Eduard Abdullin, Reviewers: Achilleas Koutsou, Brian C. Lane, Simon de Vlieger
  - Support uploading to OpenStack (osbuild/image-builder#1921)
    - Author: Jakub Kadlčík, Reviewers: Michael Vogt, Simon de Vlieger
  - disk: make addPartitionsForBootMode() arch specific (osbuild/image-builder#1928)
    - Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger
  - distro: add ova image type for bootc [HMS-9503] (osbuild/image-builder#1938)
    - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - fedora/minimal: drop uuids in partition tables (osbuild/image-builder#1932)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt

Changes with 0.206.0
----------------
  - Update osbuild dependency commit ID to latest (osbuild/image-builder#1945)
    - Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - deps: bump blueprint to 1.16.0 (osbuild/image-builder#1952)
    - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Sanne Raymaekers
  - fedora: Drop tigervnc on F42 and later (osbuild/image-builder#1942)
    - Author: Brian C. Lane, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: document root kickstart (osbuild/image-builder#1936)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt
  - fedora: rawhide is 44 (osbuild/image-builder#1943)
    - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Tomáš Hozza
  - many: lorax template split (HMS-9524) (osbuild/image-builder#1949)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Tomáš Hozza

Changes with 0.207.0
----------------
  - Enable fedora 43 unit testing (osbuild/image-builder#1954)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: update cloud_kernel_options (osbuild/image-builder#1953)
    - Author: Sanne Raymaekers, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - test/data/repos/rhel-10.2: fix copy & paste error (osbuild/image-builder#1956)
    - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger

Changes with 0.208.0
----------------
  - Schutzfile: switch CI runner to Fedora 42 (osbuild/image-builder#1955)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - Support uploading to IBM Cloud (osbuild/image-builder#1924)
    - Author: Jakub Kadlčík, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - pkg/osbuild: generate osbuild result from status scanner entries (osbuild/image-builder#1941)
    - Author: Sanne Raymaekers, Reviewers: Nobody
croissanne added a commit to croissanne/image-builder-cli that referenced this pull request Oct 22, 2025
Changes with 0.207.0
----------------
  - Enable fedora 43 unit testing (osbuild/image-builder#1954)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: update cloud_kernel_options (osbuild/image-builder#1953)
    - Author: Sanne Raymaekers, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - test/data/repos/rhel-10.2: fix copy & paste error (osbuild/image-builder#1956)
    - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger

Changes with 0.208.0
----------------
  - Schutzfile: switch CI runner to Fedora 42 (osbuild/image-builder#1955)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - Support uploading to IBM Cloud (osbuild/image-builder#1924)
    - Author: Jakub Kadlčík, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - pkg/osbuild: generate osbuild result from status scanner entries (osbuild/image-builder#1941)
    - Author: Sanne Raymaekers, Reviewers: Nobody

Changes with 0.209.0
----------------
  - gitlab: run ostree manifest generation and builds only when needed (osbuild/image-builder#1961)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - osbuild/osbuild-exec: extract building the osbuild cmd to helper (osbuild/image-builder#1963)
    - Author: Sanne Raymaekers, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - rhel10: add ism secret & top secret oscap profiles (HMS-9507) (osbuild/image-builder#1962)
    - Author: Gianluca Zuccarelli, Reviewers: Lukáš Zapletal, Sanne Raymaekers
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants