Skip to content

Conversation

@dongsupark
Copy link
Member

@dongsupark dongsupark commented Oct 13, 2025

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.

Maybe fixes #92.

Testing done

local test passed.
CI http://jenkins.infra.kinvolk.io:8080/job/container/job/packages_all_arches/6861/cldsv/ passed.

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 <[email protected]>
Since both `#[xml(child = "packages")]` and `#[xml(child = "actions"])` are not able
to handle correct hierarchies of manifest (as parent) and packages and
actions (as children), we need to define a separate structs for Packages
that includes `Vec<Package>`, as well as `Actions` that includes
`Vec<Action>`.

Signed-off-by: Dongsu Park <[email protected]>
dongsupark added a commit to flatcar/scripts that referenced this pull request Oct 24, 2025
@dongsupark dongsupark marked this pull request as ready for review October 24, 2025 09:59
@dongsupark dongsupark requested a review from a team as a code owner October 24, 2025 09:59
Copy link
Contributor

@james-parky james-parky left a comment

Choose a reason for hiding this comment

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

Some changes regarding module naming in omaha, otherwise ok.

@dongsupark dongsupark force-pushed the dongsu/fix-input-xml branch from cf70b08 to 2f9ccb2 Compare October 28, 2025 17:03
Since we need to support decoding of both hex and base64 formats, bring
back base64 decoding functionality.

Note, while hash_sha256 of Package has hex format, sha256 of Action has
base64 format. That is the reason why we need to keep both
mod sha256_from_hex_str and mod sha256_from_base64_str.

Signed-off-by: Dongsu Park <[email protected]>
@dongsupark dongsupark force-pushed the dongsu/fix-input-xml branch from 2f9ccb2 to 7b95cee Compare October 29, 2025 09:03
dongsupark added a commit to flatcar/scripts that referenced this pull request Oct 29, 2025
@dongsupark
Copy link
Member Author

Jenkins CI through flatcar/scripts#3425 passed.
@james-parky Do you want to have a look again and approve if it's ok?

Copy link
Contributor

@james-parky james-parky left a comment

Choose a reason for hiding this comment

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

lgtm

@dongsupark dongsupark merged commit 9d372a7 into main Oct 31, 2025
4 checks passed
@dongsupark dongsupark deleted the dongsu/fix-input-xml branch October 31, 2025 09:03
dongsupark added a commit to flatcar/scripts that referenced this pull request Oct 31, 2025
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.

Pulls in flatcar/ue-rs#93.

Signed-off-by: Dongsu Park <[email protected]>
dongsupark added a commit to flatcar/scripts that referenced this pull request Oct 31, 2025
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.

Pulls in flatcar/ue-rs#93.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Processing passed XML for payload download is broken

4 participants