download: Fix bug of pkg_verified path extension #90
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 <[email protected]>
dongsupark
added a commit
to flatcar/scripts
that referenced
this pull request
Sep 26, 2025
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 <[email protected]>
1 task
dongsupark
added a commit
to flatcar/scripts
that referenced
this pull request
Sep 27, 2025
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 <[email protected]>
Since the target filename could vary for many update payload types and OEMs, it does not make sense to set a default filename to a specific target file name. Remove TARGET_FILENAME_DEFAULT and PAYLOAD_URL_DEFAULT. Let target_filename() & payload_url() take Option<String> parameter, to be able to pass either Some(String) or None, to fix a wrong target_filename issue. Signed-off-by: Dongsu Park <[email protected]>
dongsupark
force-pushed
the
dongsu/fix-pkg-verified-extension
branch
from
01c4c4b to
2ec9c23
Compare
dongsupark
added a commit
to flatcar/scripts
that referenced
this pull request
Sep 27, 2025
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 <[email protected]>
Member
Author
|
CI of flatcar/scripts#3310 passed, so this PR fixes the regression. |
krnowak
approved these changes
Sep 29, 2025
dongsupark
added a commit
to flatcar/scripts
that referenced
this pull request
Sep 30, 2025
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 <[email protected]>
sambonbonne
pushed a commit
to sambonbonne/flatcar-scripts
that referenced
this pull request
Oct 3, 2025
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 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before PR #87,
target_filenamewas almost alwaysNone, which had hidden an issue of settingpkg_verified. In case oftarget_filenamebeing a valid String, for exampleoem-azure.gz,pkg_verifiedended 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())), whereTARGET_FILENAME_DEFAULTis with.gzextension. That uncovered the hidden issue.Fix that with explicitly setting extension
.rawfor both a valid String and None for the input string.Since the target filename could vary for many update payload types and OEMs, it does not make sense to set a default filename to a specific target file name. Remove
TARGET_FILENAME_DEFAULTandPAYLOAD_URL_DEFAULT.Let
target_filename()&payload_url()takeOption<String>parameter, to be able to pass eitherSome(String)orNone, to fix a wrong target_filename issue.Testing done
Local test passed, Jenkins CI will run soon.