Skip to content

Commit ad9d6ad

Browse files
authored
Merge pull request #1890 from vdice/chore/oci-pub-stuff
chore(oci): pub client and utils crates
2 parents e2c844a + 222a1b0 commit ad9d6ad

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

crates/oci/src/client.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//! Spin's client for distributing applications via OCI registries
2+
13
use std::path::{Path, PathBuf};
24

35
use anyhow::{bail, Context, Result};
@@ -24,10 +26,14 @@ use walkdir::WalkDir;
2426
use crate::auth::AuthConfig;
2527

2628
// TODO: the media types for application, wasm module, data and archive layer are not final.
27-
const SPIN_APPLICATION_MEDIA_TYPE: &str = "application/vnd.fermyon.spin.application.v1+config";
29+
/// Media type for a layer representing a locked Spin application configuration
30+
pub const SPIN_APPLICATION_MEDIA_TYPE: &str = "application/vnd.fermyon.spin.application.v1+config";
31+
// Note: we hope to use a canonical value defined upstream for this media type
2832
const WASM_LAYER_MEDIA_TYPE: &str = "application/vnd.wasm.content.layer.v1+wasm";
29-
const DATA_MEDIATYPE: &str = "application/vnd.wasm.content.layer.v1+data";
30-
const ARCHIVE_MEDIATYPE: &str = "application/vnd.wasm.content.bundle.v1.tar+gzip";
33+
/// Media type for a layer representing a generic data file used by a Spin application
34+
pub const DATA_MEDIATYPE: &str = "application/vnd.wasm.content.layer.v1+data";
35+
/// Media type for a layer representing a compressed archive of one or more files used by a Spin application
36+
pub const ARCHIVE_MEDIATYPE: &str = "application/vnd.wasm.content.bundle.v1.tar+gzip";
3137

3238
const CONFIG_FILE: &str = "config.json";
3339
const LATEST_TAG: &str = "latest";

crates/oci/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#![deny(missing_docs)]
33

44
mod auth;
5-
mod client;
5+
pub mod client;
66
mod loader;
7-
mod utils;
7+
pub mod utils;
88

99
pub use client::Client;
1010
pub use loader::OciLoader;

crates/oci/src/utils.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//! Utilities related to distributing Spin apps via OCI registries
2+
13
use anyhow::{Context, Result};
24
use async_compression::tokio::bufread::GzipDecoder;
35
use async_compression::tokio::write::GzipEncoder;

0 commit comments

Comments
 (0)