Split download verify parts of download_sysext into separate module by dongsupark · Pull Request #87 · flatcar/ue-rs

dongsupark · 2025-09-10T16:32:23Z

To be able to make package-related structs and enums public, Package and PackageStatus, create a new module download, move download.rs to download/mod.rs, create download/packge.rs that includes all package-related structs and enums.

To make download and verify functions of download_sysext usable by other modules, move most code parts into the new download module.

It is a preparation for the server-client architecture issue, #75 which I am working on.

dongsupark · 2025-09-11T14:00:26Z

A manual test passed. so no regression.

RUST_LOG=debug target/debug/download_sysext \
  -p ~/Dev/flatcar-scripts/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-au-key/files/official-v2.pub.pem \
  -m oem-azure.gz \
  -o /var/tmp/outdir/ \
  -u https://update.release.flatcar-linux.net/amd64-usr/4426.0.0/oem-azure.gz

src/download/mod.rs

james-parky

Seems sensible to extract to a new struct as method, with changes. However, there will be conflicts with my #88 if that is approved.

src/download/mod.rs

src/lib.rs

src/download/mod.rs

src/download/package.rs

src/download/mod.rs

james-parky · 2025-09-12T21:29:14Z

src/download/mod.rs

+    pub data: File,
+}
+
+pub fn hash_on_disk<T: omaha::HashAlgo>(path: &Path, maxlen: Option<usize>) -> Result<omaha::Hash<T>> {


Nice pattern to use a generic of <P: AsRef<Path>> when args are something that should be a path.

Sounds like a nice improvement, but that results in a huge change, so I would do in a separate PR.

Yes i would recommend it elsewhere in the codebase as well where appropriate so valid in separate pr

src/download/mod.rs

james-parky

Will have conflicts I imagine with #88. But I agree with the changes and don't mind which is merged first.

src/bin/download_sysext.rs

src/download/mod.rs

To be able to make package-related structs and enums public, Package and PackageStatus, create a new module download, move download.rs to download/mod.rs, create download/packge.rs that includes all package-related structs and enums. To make download and verify functions usable by other modules, move most code parts into the new download module. Signed-off-by: Dongsu Park <dongsu@dpark.io>

dongsupark · 2025-09-17T09:44:14Z

Squashed commits. Thanks!

PR flatcar#87 created the download crate which caused merge conflicts with flatcar#88.

PR flatcar#87 created the download crate which caused merge conflicts with flatcar#88. Signed-off-by: james-parky <72101291+james-parky@users.noreply.github.com>

Pulls in flatcar/ue-rs#72, flatcar/ue-rs#74, flatcar/ue-rs#84, flatcar/ue-rs#85, flatcar/ue-rs#87, flatcar/ue-rs#88. Signed-off-by: Dongsu Park <dongsu@dpark.io>

Pulls in flatcar/ue-rs#72, flatcar/ue-rs#84, flatcar/ue-rs#85, flatcar/ue-rs#87, flatcar/ue-rs#88. Signed-off-by: Dongsu Park <dongsu@dpark.io>

Before PR #87, target_filename was almost always `None`, which had covered an issue of setting pkg_verified. In case of target_filename being a valid String, for example "oem-azure.gz", pkg_verified ended up having an extension `.gz`, which is not expected. Now that the PR was merged, DownloadVerify module gets created with .target_filename(args.target_filename.unwrap_or(TARGET_FILENAME_DEFAULT.into())), where TARGET_FILENAME_DEFAULT is with ".gz" extension. That uncovered the hidden issue. Fix that with explicitly setting extension ".raw" for both a valid String and None for the input string. Signed-off-by: Dongsu Park <dongsu@dpark.io>

Pulls in flatcar/ue-rs#72, flatcar/ue-rs#84, flatcar/ue-rs#85, flatcar/ue-rs#87, flatcar/ue-rs#88, flatcar/ue-rs#90. Signed-off-by: Dongsu Park <dongsu@dpark.io>

When --input-xml is on and --payload-url is off to pass XML data offline, we need to set payload_url to None and continue running the DownloadVerify builder instead of returning there. It is necessary to fix regressions of #87. Signed-off-by: Dongsu Park <dongsu@dpark.io>

Before PR #87, target_filename was almost always `None`, which had covered an issue of setting pkg_verified. In case of target_filename being a valid String, for example "oem-azure.gz", pkg_verified ended up having an extension `.gz`, which is not expected. Now that the PR was merged, DownloadVerify module gets created with .target_filename(args.target_filename.unwrap_or(TARGET_FILENAME_DEFAULT.into())), where TARGET_FILENAME_DEFAULT is with ".gz" extension. That uncovered the hidden issue. Fix that with explicitly setting extension ".raw" for both a valid String and None for the input string. Signed-off-by: Dongsu Park <dongsu@dpark.io>

PR #87 created the download crate which caused merge conflicts with #88. Signed-off-by: james-parky <72101291+james-parky@users.noreply.github.com>

When --input-xml is on and --payload-url is off to pass XML data offline, we need to set payload_url to None and continue running the DownloadVerify builder instead of returning there. It is necessary to fix regressions of #87. Signed-off-by: Dongsu Park <dongsu@dpark.io>

dongsupark force-pushed the dongsu/split-download branch from 15d3757 to a356548 Compare September 11, 2025 13:25

dongsupark marked this pull request as ready for review September 11, 2025 14:00

dongsupark requested a review from a team as a code owner September 11, 2025 14:00

krnowak reviewed Sep 12, 2025

View reviewed changes

src/download/mod.rs Outdated Show resolved Hide resolved

src/download/mod.rs Outdated Show resolved Hide resolved

james-parky suggested changes Sep 12, 2025

View reviewed changes

src/download/mod.rs Outdated Show resolved Hide resolved

src/download/mod.rs Outdated Show resolved Hide resolved

src/download/mod.rs Outdated Show resolved Hide resolved

src/download/mod.rs Outdated Show resolved Hide resolved

src/lib.rs Outdated Show resolved Hide resolved

james-parky suggested changes Sep 12, 2025

View reviewed changes

src/download/mod.rs Outdated Show resolved Hide resolved

src/download/mod.rs Outdated Show resolved Hide resolved

src/download/mod.rs Outdated Show resolved Hide resolved

src/download/package.rs Outdated Show resolved Hide resolved

james-parky suggested changes Sep 12, 2025

View reviewed changes

james-parky approved these changes Sep 15, 2025

View reviewed changes

krnowak requested changes Sep 16, 2025

View reviewed changes

src/bin/download_sysext.rs Show resolved Hide resolved

src/download/mod.rs Show resolved Hide resolved

krnowak approved these changes Sep 16, 2025

View reviewed changes

dongsupark force-pushed the dongsu/split-download branch from aa2d002 to a5ae9b6 Compare September 17, 2025 09:42

dongsupark merged commit c6e869f into main Sep 17, 2025
4 checks passed

dongsupark deleted the dongsu/split-download branch September 17, 2025 09:44

james-parky added a commit to james-parky/ue-rs that referenced this pull request Sep 18, 2025

download: fix new download crate after rebasing this branch onto main

7d2e60e

PR flatcar#87 created the download crate which caused merge conflicts with flatcar#88.

james-parky mentioned this pull request Sep 18, 2025

Omaha crate improvements #88

Merged

github-actions bot mentioned this pull request Sep 26, 2025

Monthly contributions report 2025-08-22 - 2025-09-21 flatcar/Flatcar#1899

Closed

dongsupark added a commit to flatcar/scripts that referenced this pull request Sep 26, 2025

overlay ue-rs: update to 2025-09-26

a10111f

Pulls in flatcar/ue-rs#72, flatcar/ue-rs#84, flatcar/ue-rs#85, flatcar/ue-rs#87, flatcar/ue-rs#88. Signed-off-by: Dongsu Park <dongsu@dpark.io>

dongsupark mentioned this pull request Sep 26, 2025

overlay ue-rs: update to 2025-09-26 flatcar/scripts#3310

Merged

1 task

dongsupark mentioned this pull request Sep 26, 2025

download: Fix bug of pkg_verified path extension #90

Merged

This was referenced Oct 13, 2025

download_sysext: fix passing XML data with --input-xml #93

Merged

Processing passed XML for payload download is broken #92

Closed

Conversation

dongsupark commented Sep 10, 2025

Uh oh!

dongsupark commented Sep 11, 2025

Uh oh!

Uh oh!

Uh oh!

james-parky left a comment • 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!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

james-parky Sep 12, 2025

Choose a reason for hiding this comment

Uh oh!

dongsupark Sep 15, 2025

Choose a reason for hiding this comment

Uh oh!

james-parky Sep 15, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

james-parky left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

dongsupark commented Sep 17, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

james-parky left a comment •

edited

Loading