On Wed, Jul 09, 2025 at 02:34:20PM +0200, Filip Schauer wrote:
> Signed-off-by: Filip Schauer <f.scha...@proxmox.com>
> ---
> This patch depends on the proxmox-oci crate added in patch 02/13.
>
> Changed since v2:
> * rebase onto newest master (6132d4d36cbd)
> * forward all errors to Perl
> * remove oci-spec dependency
>
> Changed since v1:
> * rebase on latest master (3d9806cb3c7f)
> * add new dependencies to debian/control
>
> pve-rs/Cargo.toml | 1 +
> pve-rs/Makefile | 1 +
> pve-rs/debian/control | 1 +
> pve-rs/src/bindings/mod.rs | 3 +++
> pve-rs/src/bindings/oci.rs | 21 +++++++++++++++++++++
> 5 files changed, 27 insertions(+)
> create mode 100644 pve-rs/src/bindings/oci.rs
>
> diff --git a/pve-rs/Cargo.toml b/pve-rs/Cargo.toml
> index c7f11a3..4d38a5c 100644
> --- a/pve-rs/Cargo.toml
> +++ b/pve-rs/Cargo.toml
> @@ -37,6 +37,7 @@ proxmox-http = { version = "1", features = ["client-sync",
> "client-trait"] }
> proxmox-http-error = "1"
> proxmox-log = "1"
> proxmox-notify = { version = "1", features = ["pve-context"] }
> +proxmox-oci = "0.1.0"
> proxmox-openid = "1"
> proxmox-resource-scheduling = "1"
> proxmox-shared-cache = "1"
> diff --git a/pve-rs/Makefile b/pve-rs/Makefile
> index 773156a..d813766 100644
> --- a/pve-rs/Makefile
> +++ b/pve-rs/Makefile
> @@ -27,6 +27,7 @@ PERLMOD_GENPACKAGE := /usr/lib/perlmod/genpackage.pl \
>
> PERLMOD_PACKAGES := \
> PVE::RS::Firewall::SDN \
> + PVE::RS::OCI \
> PVE::RS::OpenId \
> PVE::RS::ResourceScheduling::Static \
> PVE::RS::TFA
> diff --git a/pve-rs/debian/control b/pve-rs/debian/control
> index 9e424ec..869ca50 100644
> --- a/pve-rs/debian/control
> +++ b/pve-rs/debian/control
> @@ -24,6 +24,7 @@ Build-Depends: cargo:native <!nocheck>,
> librust-proxmox-log-1+default-dev,
> librust-proxmox-notify-1+default-dev (>= 0.5.4),
> librust-proxmox-notify-1+pve-context-dev,
> + librust-proxmox-oci-0.1+default-dev,
> librust-proxmox-openid-1+default-dev (>= 0.10.4-~~),
> librust-proxmox-resource-scheduling-1+default-dev,
> librust-proxmox-shared-cache-1+default-dev,
> diff --git a/pve-rs/src/bindings/mod.rs b/pve-rs/src/bindings/mod.rs
> index e4fb4db..17247f6 100644
> --- a/pve-rs/src/bindings/mod.rs
> +++ b/pve-rs/src/bindings/mod.rs
> @@ -1,5 +1,8 @@
> //! This contains all the perl bindings.
>
> +mod oci;
> +pub use oci::pve_rs_oci;
> +
> mod resource_scheduling_static;
> pub use resource_scheduling_static::pve_rs_resource_scheduling_static;
>
> diff --git a/pve-rs/src/bindings/oci.rs b/pve-rs/src/bindings/oci.rs
> new file mode 100644
> index 0000000..f7cfe41
> --- /dev/null
> +++ b/pve-rs/src/bindings/oci.rs
> @@ -0,0 +1,21 @@
> +#[perlmod::package(name = "PVE::RS::OCI")]
> +pub mod pve_rs_oci {
> + //! The `PVE::RS::OCI` package.
> + //!
> + //! Provides bindings for the proxmox-oci crate.
[`proxmox-oci`]
> +
> + use anyhow::Error;
> + use proxmox_oci::Config;
> +
> + /// Method: Extract the rootfs of an OCI image tar and return the image
> config.
Not a method - just a regular function. (iow. called via
`PVE::RS::OCI::parse_and_extract_image`.
Methods would be `$an_instance->parse_and_extract_image(…)` and `Class
methods` would be `PVE::RS::OCI->parse_and_extract_image(…)`.
> + #[export]
> + pub fn parse_and_extract_image(
> + oci_tar_path: &str,
> + rootfs_path: &str,
> + ) -> Result<Option<Config>, Error> {
We don't seem to have a case where we return `Ok(None)` now?
> + match proxmox_oci::parse_and_extract_image(oci_tar_path,
> rootfs_path) {
> + Ok(config) => Ok(Some(config.unwrap_or_default())),
> + Err(err) => Err(err.into()),
> + }
> + }
> +}
> --
> 2.47.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
