Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added update command #960

Merged
merged 11 commits into from
Nov 15, 2024
4 changes: 4 additions & 0 deletions crates/meroctl/src/cli/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use crate::cli::context::get::GetCommand;
use crate::cli::context::invite::InviteCommand;
use crate::cli::context::join::JoinCommand;
use crate::cli::context::list::ListCommand;
use crate::cli::context::update::UpdateCommand;
use crate::cli::context::watch::WatchCommand;
use crate::cli::Environment;
use crate::output::Report;
Expand All @@ -19,6 +20,7 @@ mod get;
mod invite;
mod join;
mod list;
mod update;
mod watch;

pub const EXAMPLES: &str = r"
Expand Down Expand Up @@ -55,6 +57,7 @@ pub enum ContextSubCommands {
Delete(DeleteCommand),
#[command(alias = "ws")]
Watch(WatchCommand),
Update(UpdateCommand),
}

impl Report for Context {
Expand All @@ -75,6 +78,7 @@ impl ContextCommand {
ContextSubCommands::Join(join) => join.run(environment).await,
ContextSubCommands::List(list) => list.run(environment).await,
ContextSubCommands::Watch(watch) => watch.run(environment).await,
ContextSubCommands::Update(update) => update.run(environment).await,
}
}
}
256 changes: 256 additions & 0 deletions crates/meroctl/src/cli/context/update.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,256 @@
use calimero_primitives::application::ApplicationId;
use calimero_primitives::context::ContextId;
use calimero_primitives::identity::PublicKey;
use calimero_server_primitives::admin::{
InstallApplicationResponse, InstallDevApplicationRequest, UpdateContextApplicationRequest,
UpdateContextApplicationResponse,
};
use camino::Utf8PathBuf;
use clap::Parser;
use eyre::{bail, Result as EyreResult};
use libp2p::identity::Keypair;
use libp2p::Multiaddr;
use notify::event::ModifyKind;
use notify::{EventKind, RecursiveMode, Watcher};
use reqwest::Client;
use tokio::runtime::Handle;
use tokio::sync::mpsc;

use crate::cli::Environment;
use crate::common::{do_request, fetch_multiaddr, load_config, multiaddr_to_url, RequestType};
use crate::output::{ErrorLine, InfoLine};

#[derive(Debug, Parser)]
#[command(about = "Update app in context")]
pub struct UpdateCommand {
#[clap(long, short = 'c', help = "ContextId where to install the application")]
context_id: ContextId,

#[clap(
long,
short = 'a',
help = "The application ID to update in the context"
)]
application_id: Option<ApplicationId>,

#[clap(
long,
conflicts_with = "application_id",
help = "Path to the application file to watch and install locally"
)]
path: Option<Utf8PathBuf>,

#[clap(
long,
conflicts_with = "application_id",
help = "Metadata needed for the application installation"
)]
metadata: Option<String>,

#[clap(
long,
short = 'w',
conflicts_with = "application_id",
requires = "path"
)]
watch: bool,

#[arg(long = "as", help = "Public key of the executor")]
pub executor: PublicKey,
}

impl UpdateCommand {
pub async fn run(self, environment: &Environment) -> EyreResult<()> {
let config = load_config(&environment.args.home, &environment.args.node_name)?;
let multiaddr = fetch_multiaddr(&config)?;
let client = Client::new();

match self {
Self {
context_id,
application_id: Some(application_id),
path: None,
metadata: None,
watch: false,
executor: executor_public_key,
} => {
update_context_application(
environment,
&client,
multiaddr,
context_id,
application_id,
&config.identity,
executor_public_key,
)
.await?;
}
Self {
context_id,
application_id: None,
path: Some(path),
metadata,
executor: executor_public_key,
..
} => {
let metadata = metadata.map(String::into_bytes);

let application_id = install_app(
environment,
&client,
multiaddr,
path.clone(),
metadata.clone(),
&config.identity,
)
.await?;
if self.watch {
watch_app_and_update_context(
petarjuki7 marked this conversation as resolved.
Show resolved Hide resolved
environment,
&client,
multiaddr,
context_id,
path,
metadata,
&config.identity,
executor_public_key,
)
.await?;
} else {
update_context_application(
environment,
&client,
multiaddr,
context_id,
application_id,
&config.identity,
executor_public_key,
)
.await?;
}
}

_ => bail!("Invalid command configuration"),
}

Ok(())
}
}

async fn install_app(
environment: &Environment,
client: &Client,
base_multiaddr: &Multiaddr,
path: Utf8PathBuf,
metadata: Option<Vec<u8>>,
keypair: &Keypair,
) -> EyreResult<ApplicationId> {
let url = multiaddr_to_url(base_multiaddr, "admin-api/dev/install-dev-application")?;

let request = InstallDevApplicationRequest::new(path, metadata.unwrap_or_default());

let response: InstallApplicationResponse =
do_request(client, url, Some(request), keypair, RequestType::Post).await?;

environment.output.write(&response);

Ok(response.data.application_id)
}

async fn update_context_application(
environment: &Environment,
client: &Client,
base_multiaddr: &Multiaddr,
context_id: ContextId,
application_id: ApplicationId,
keypair: &Keypair,
member_public_key: PublicKey,
) -> EyreResult<()> {
let url = multiaddr_to_url(
base_multiaddr,
&format!("admin-api/dev/contexts/{context_id}/application"),
)?;

let request = UpdateContextApplicationRequest::new(application_id, member_public_key);

let response: UpdateContextApplicationResponse =
do_request(client, url, Some(request), keypair, RequestType::Post).await?;

environment.output.write(&response);

Ok(())
}

async fn watch_app_and_update_context(
environment: &Environment,
client: &Client,
base_multiaddr: &Multiaddr,
context_id: ContextId,
path: Utf8PathBuf,
metadata: Option<Vec<u8>>,
keypair: &Keypair,
member_public_key: PublicKey,
) -> EyreResult<()> {
let (tx, mut rx) = mpsc::channel(1);

let handle = Handle::current();
let mut watcher = notify::recommended_watcher(move |evt| {
handle.block_on(async {
drop(tx.send(evt).await);
});
})?;

watcher.watch(path.as_std_path(), RecursiveMode::NonRecursive)?;

environment
.output
.write(&InfoLine(&format!("Watching for changes to {path}")));

while let Some(event) = rx.recv().await {
let event = match event {
Ok(event) => event,
Err(err) => {
environment.output.write(&ErrorLine(&format!("{err:?}")));
continue;
}
};

match event.kind {
EventKind::Modify(ModifyKind::Data(_)) => {}
EventKind::Remove(_) => {
environment
.output
.write(&ErrorLine("File removed, ignoring.."));
continue;
}
EventKind::Any
| EventKind::Access(_)
| EventKind::Create(_)
| EventKind::Modify(_)
| EventKind::Other => continue,
}

let application_id = install_app(
environment,
client,
base_multiaddr,
path.clone(),
metadata.clone(),
keypair,
)
.await?;

update_context_application(
environment,
client,
base_multiaddr,
context_id,
application_id,
keypair,
member_public_key,
)
.await?;
}

Ok(())
}
Loading