-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(wkg)!: Adds support for pushing and pulling OCI wasm artifacts
This adds support for pushing and pulling compatible OCI wasm artifacts from the command line. As part of this refactor, it makes the original loading feature a separate command for use in debugging. Some of the features from the `load` subcommand should probably make their way into the push and pull command, but for now just keeping it simple Signed-off-by: Taylor Thomas <taylor@cosmonic.com>
- Loading branch information
1 parent
44126e4
commit 2a52302
Showing
8 changed files
with
240 additions
and
24 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains 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
This file contains 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
This file contains 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| use std::path::PathBuf; | ||
|
|
||
| use anyhow::Context; | ||
| use clap::{Args, Subcommand}; | ||
| use docker_credential::DockerCredential; | ||
| use oci_distribution::{ | ||
| client::{ClientConfig, ClientProtocol}, | ||
| secrets::RegistryAuth, | ||
| Reference, | ||
| }; | ||
| use oci_wasm::{WasmClient, WasmConfig}; | ||
|
|
||
| #[derive(Debug, Args)] | ||
| pub struct Auth { | ||
| /// The username to use for authentication. If no credentials are provided, wkg will load them | ||
| /// from a local docker config and credential store and default to anonymous if none are found. | ||
| #[clap( | ||
| id = "username", | ||
| short = 'u', | ||
| env = "WKG_OCI_USERNAME", | ||
| requires = "password" | ||
| )] | ||
| pub username: Option<String>, | ||
| /// The password to use for authentication. This is required if username is set | ||
| #[clap( | ||
| id = "password", | ||
| short = 'p', | ||
| env = "WKG_OCI_PASSWORD", | ||
| requires = "username" | ||
| )] | ||
| pub password: Option<String>, | ||
| } | ||
|
|
||
| impl Auth { | ||
| fn into_auth(self, reference: &Reference) -> anyhow::Result<RegistryAuth> { | ||
| match (self.username, self.password) { | ||
| (Some(username), Some(password)) => Ok(RegistryAuth::Basic(username, password)), | ||
| (None, None) => { | ||
| let server_url = format!("https://{}", reference.registry()); | ||
| match docker_credential::get_credential(&server_url) { | ||
| Ok(DockerCredential::UsernamePassword(username, password)) => { | ||
| return Ok(RegistryAuth::Basic(username, password)); | ||
| } | ||
| Ok(DockerCredential::IdentityToken(_)) => { | ||
| return Err(anyhow::anyhow!("identity tokens not supported")); | ||
| } | ||
| Err(err) => { | ||
| tracing::debug!("Failed to look up OCI credentials: {err}"); | ||
| } | ||
| } | ||
| Ok(RegistryAuth::Anonymous) | ||
| } | ||
| _ => Err(anyhow::anyhow!("Must provide both a username and password")), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Args)] | ||
| pub struct Common { | ||
| /// A comma delimited list of allowed registries to use for http instead of https | ||
| #[clap( | ||
| long = "insecure", | ||
| default_value = "", | ||
| env = "WKG_OCI_INSECURE", | ||
| value_delimiter = ',' | ||
| )] | ||
| pub insecure: Vec<String>, | ||
| } | ||
|
|
||
| /// Commands for interacting with OCI registries | ||
| #[derive(Debug, Subcommand)] | ||
| pub enum OciCommands { | ||
| /// Pull a component from an OCI registry and write it to a file. | ||
| Pull(PullArgs), | ||
| /// Push a component to an OCI registry. | ||
| Push(PushArgs), | ||
| } | ||
|
|
||
| impl OciCommands { | ||
| pub async fn run(self) -> anyhow::Result<()> { | ||
| match self { | ||
| OciCommands::Pull(args) => args.run().await, | ||
| OciCommands::Push(args) => args.run().await, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Args)] | ||
| pub struct PullArgs { | ||
| #[clap(flatten)] | ||
| pub auth: Auth, | ||
|
|
||
| #[clap(flatten)] | ||
| pub common: Common, | ||
|
|
||
| /// The OCI reference to pull | ||
| pub reference: Reference, | ||
|
|
||
| /// The output path to write the file to | ||
| #[clap(short = 'o', long = "output")] | ||
| pub output: Option<PathBuf>, | ||
| } | ||
|
|
||
| #[derive(Debug, Args)] | ||
| pub struct PushArgs { | ||
| #[clap(flatten)] | ||
| pub auth: Auth, | ||
|
|
||
| #[clap(flatten)] | ||
| pub common: Common, | ||
|
|
||
| /// An optional author to set for the pushed component | ||
| #[clap(short = 'a', long = "author")] | ||
| pub author: Option<String>, | ||
|
|
||
| // TODO(thomastaylor312): Add support for custom annotations | ||
| /// The OCI reference to push | ||
| pub reference: Reference, | ||
|
|
||
| /// The path to the file to push | ||
| pub file: PathBuf, | ||
| } | ||
|
|
||
| impl PushArgs { | ||
| pub async fn run(self) -> anyhow::Result<()> { | ||
| let client = get_client(self.common); | ||
| let (conf, layer) = WasmConfig::from_component(&self.file, self.author) | ||
| .await | ||
| .context("Unable to parse component")?; | ||
| let auth = self.auth.into_auth(&self.reference)?; | ||
| client | ||
| .push(&self.reference, &auth, layer, conf, None) | ||
| .await | ||
| .context("Unable to push image")?; | ||
| println!("Pushed {}", self.reference); | ||
| Ok(()) | ||
| } | ||
| } | ||
|
|
||
| impl PullArgs { | ||
| pub async fn run(self) -> anyhow::Result<()> { | ||
| let client = get_client(self.common); | ||
| let auth = self.auth.into_auth(&self.reference)?; | ||
| let data = client | ||
| .pull(&self.reference, &auth) | ||
| .await | ||
| .context("Unable to pull image")?; | ||
| let output_path = match self.output { | ||
| Some(output_file) => output_file, | ||
| None => PathBuf::from(format!( | ||
| "{}.wasm", | ||
| self.reference.repository().replace('/', "_") | ||
| )), | ||
| }; | ||
| tokio::fs::write( | ||
| &output_path, | ||
| data.layers | ||
| .into_iter() | ||
| .next() | ||
| .ok_or_else(|| anyhow::anyhow!("No layers found"))? | ||
| .data, | ||
| ) | ||
| .await | ||
| .context("Unable to write file")?; | ||
| println!( | ||
| "Successfully wrote {} to {}", | ||
| self.reference, | ||
| output_path.display() | ||
| ); | ||
| Ok(()) | ||
| } | ||
| } | ||
|
|
||
| fn get_client(common: Common) -> WasmClient { | ||
| let client = oci_distribution::Client::new(ClientConfig { | ||
| protocol: if common.insecure.is_empty() { | ||
| ClientProtocol::Https | ||
| } else { | ||
| ClientProtocol::HttpsExcept(common.insecure) | ||
| }, | ||
| ..Default::default() | ||
| }); | ||
|
|
||
| WasmClient::new(client) | ||
| } |