feat(config): switch to oci_spec's arch and os implementation

Author: toksdotdev

src/client.rs

@@ -10,6 +10,7 @@ use futures_util::{future, Stream};
 use http::header::RANGE;
 use http::{HeaderValue, StatusCode};
 use http_auth::{parser::ChallengeParser, ChallengeRef};
+use oci_spec::image::{Arch, Os};
 use olpc_cjson::CanonicalFormatter;
 use reqwest::header::HeaderMap;
 use reqwest::{NoProxy, Proxy, RequestBuilder, Response, Url};
@@ -2047,10 +2048,9 @@ pub fn linux_amd64_resolver(manifests: &[ImageIndexEntry]) -> Option<String> {
     manifests
         .iter()
         .find(|entry| {
-            entry
-                .platform
-                .as_ref()
-                .is_some_and(|platform| platform.os == "linux" && platform.architecture == "amd64")
+            entry.platform.as_ref().is_some_and(|platform| {
+                platform.os == Os::Linux && platform.architecture == Arch::Amd64
+            })
         })
         .map(|entry| entry.digest.clone())
 }
@@ -2061,55 +2061,20 @@ pub fn windows_amd64_resolver(manifests: &[ImageIndexEntry]) -> Option<String> {
         .iter()
         .find(|entry| {
             entry.platform.as_ref().is_some_and(|platform| {
-                platform.os == "windows" && platform.architecture == "amd64"
+                platform.os == Os::Windows && platform.architecture == Arch::Amd64
             })
         })
         .map(|entry| entry.digest.clone())
 }
 
-const MACOS: &str = "macos";
-const DARWIN: &str = "darwin";
-
-fn go_os() -> &'static str {
-    // Massage Rust OS var to GO OS:
-    // - Rust: https://doc.rust-lang.org/std/env/consts/constant.OS.html
-    // - Go: https://golang.org/doc/install/source#environment
-    match std::env::consts::OS {
-        MACOS => DARWIN,
-        other => other,
-    }
-}
-
-const X86_64: &str = "x86_64";
-const AMD64: &str = "amd64";
-const X86: &str = "x86";
-const AMD: &str = "amd";
-const ARM64: &str = "arm64";
-const AARCH64: &str = "aarch64";
-const POWERPC64: &str = "powerpc64";
-const PPC64LE: &str = "ppc64le";
-
-fn go_arch() -> &'static str {
-    // Massage Rust Architecture vars to GO equivalent:
-    // - Rust: https://doc.rust-lang.org/std/env/consts/constant.ARCH.html
-    // - Go: https://golang.org/doc/install/source#environment
-    match std::env::consts::ARCH {
-        X86_64 => AMD64,
-        X86 => AMD,
-        AARCH64 => ARM64,
-        POWERPC64 => PPC64LE,
-        other => other,
-    }
-}
-
 /// A platform resolver that chooses the first variant matching the running OS/Arch, if present.
 /// Doesn't currently handle platform.variants.
 pub fn current_platform_resolver(manifests: &[ImageIndexEntry]) -> Option<String> {
     manifests
         .iter()
         .find(|entry| {
             entry.platform.as_ref().is_some_and(|platform| {
-                platform.os == go_os() && platform.architecture == go_arch()
+                platform.os == Os::default() && platform.architecture == Arch::default()
             })
         })
         .map(|entry| entry.digest.clone())

src/config.rs

@@ -10,85 +10,12 @@ use serde::{ser::SerializeMap, Deserialize, Deserializer, Serialize, Serializer}
 /// The CPU architecture which the binaries in this image are
 /// built to run on.
 /// Validated values are listed in [Go Language document for GOARCH](https://golang.org/doc/install/source#environment)
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Default)]
-#[serde(rename_all = "lowercase")]
-pub enum Architecture {
-    /// Arm
-    Arm,
-    /// Arm 64bit
-    Arm64,
-    /// Amd64/x86-64
-    #[default]
-    Amd64,
-    /// Intel i386
-    #[serde(rename = "386")]
-    I386,
-    /// Wasm
-    Wasm,
-    /// Loong64
-    Loong64,
-    /// MIPS
-    Mips,
-    /// MIPSle
-    Mipsle,
-    /// MIPS64
-    Mips64,
-    /// MIPS64le
-    Mips64le,
-    /// Power PC64
-    PPC64,
-    /// Power PC64le
-    PPC64le,
-    /// RiscV 64
-    Riscv64,
-    /// IBM s390x
-    S390x,
-    /// With this field empty
-    #[serde(rename = "")]
-    None,
-}
+pub type Architecture = oci_spec::image::Arch;
 
 /// The name of the operating system which the image is
 /// built to run on.
 /// Validated values are listed in [Go Language document for GOARCH](https://golang.org/doc/install/source#environment)
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Default)]
-#[serde(rename_all = "lowercase")]
-pub enum Os {
-    /// IBM AIX
-    Aix,
-    /// Android
-    Android,
-    /// Apple Darwin
-    Darwin,
-    /// FreeBSD Dragonfly
-    Dragonfly,
-    /// FreeBSD
-    Freebsd,
-    /// Illumos
-    Illumos,
-    /// iOS
-    Ios,
-    /// Js
-    Js,
-    /// Linux
-    #[default]
-    Linux,
-    /// NetBSD
-    Netbsd,
-    /// OpenBSD
-    Openbsd,
-    /// Plan9 from Bell Labs
-    Plan9,
-    /// Solaris
-    Solaris,
-    /// WASI Preview 1
-    Wasip1,
-    /// Microsoft Windows
-    Windows,
-    /// With this field empty
-    #[serde(rename = "")]
-    None,
-}
+pub type Os = oci_spec::image::Os;
 
 /// An OCI Image is an ordered collection of root filesystem changes
 /// and the corresponding execution parameters for use within a
@@ -310,11 +237,12 @@ pub struct History {
 mod tests {
     use assert_json_diff::assert_json_eq;
     use chrono::DateTime;
+    use oci_spec::image::Arch;
     use rstest::*;
     use serde_json::Value;
     use std::collections::{HashMap, HashSet};
 
-    use super::{Architecture, Config, ConfigFile, History, Os, Rootfs};
+    use super::{Config, ConfigFile, History, Os, Rootfs};
 
     const EXAMPLE_CONFIG: &str = r#"
     {
@@ -431,7 +359,7 @@ mod tests {
                     .into(),
             ),
             author: Some("Alyssa P. Hacker <[email protected]>".into()),
-            architecture: Architecture::Amd64,
+            architecture: Arch::Amd64,
             os: Os::Linux,
             config: Some(config),
             rootfs,
@@ -462,7 +390,7 @@ mod tests {
         };
 
         ConfigFile {
-            architecture: Architecture::Amd64,
+            architecture: Arch::Amd64,
             os: Os::Linux,
             config: None,
             rootfs,
@@ -522,7 +450,7 @@ mod tests {
         };
 
         ConfigFile {
-            architecture: Architecture::Arm64,
+            architecture: Arch::ARM64,
             os: Os::Linux,
             config,
             rootfs,

src/manifest.rs

@@ -1,6 +1,8 @@
 //! OCI Manifest
 use std::collections::BTreeMap;
 
+use oci_spec::image::{Arch, Os};
+
 use crate::{
     client::{Config, ImageLayer},
     sha256_digest,
@@ -420,11 +422,11 @@ pub struct Platform {
     /// This REQUIRED property specifies the CPU architecture.
     /// Image indexes SHOULD use, and implementations SHOULD understand, values
     /// listed in the Go Language document for [`GOARCH`](https://golang.org/doc/install/source#environment).
-    pub architecture: String,
+    pub architecture: Arch,
     /// This REQUIRED property specifies the operating system.
     /// Image indexes SHOULD use, and implementations SHOULD understand, values
     /// listed in the Go Language document for [`GOOS`](https://golang.org/doc/install/source#environment).
-    pub os: String,
+    pub os: Os,
     /// This OPTIONAL property specifies the version of the operating system
     /// targeted by the referenced blob.
     /// Implementations MAY refuse to use manifests where `os.version` is not known