Skip to content

Commit

Permalink
chore: Move print_bindle_deprecation into prepare_app_from_bindle
Browse files Browse the repository at this point in the history
Signed-off-by: Lann Martin <[email protected]>
  • Loading branch information
lann committed Mar 7, 2023
1 parent 50eb9b9 commit 276e570
Showing 1 changed file with 13 additions and 12 deletions.
25 changes: 13 additions & 12 deletions src/commands/up.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,29 +164,29 @@ impl UpCommand {
.await;
}

if matches!(app_source, AppSource::Bindle(_)) {
print_bindle_deprecation();
}

let working_dir_holder = match &self.tmp {
None => WorkingDirectory::Temporary(tempfile::tempdir()?),
Some(d) => WorkingDirectory::Given(d.to_owned()),
};
let working_dir = working_dir_holder.path().canonicalize()?;

let state_dir = self.prepare_state_dir(&app_source);

let mut locked_app = match app_source {
let mut locked_app = match &app_source {
AppSource::None => bail!("Internal error - should have shown help"),
AppSource::File(path) => self.prepare_app_from_file(&path, &working_dir).await?,
AppSource::Bindle(id) => self.prepare_app_from_bindle(&id, &working_dir).await?,
AppSource::OciRegistry(oci) => self.prepare_app_from_oci(&oci, &working_dir).await?,
AppSource::Unresolvable(err) => bail!(err),
AppSource::File(path) => self.prepare_app_from_file(path, &working_dir).await?,
AppSource::Bindle(id) => self.prepare_app_from_bindle(id, &working_dir).await?,
AppSource::OciRegistry(oci) => self.prepare_app_from_oci(oci, &working_dir).await?,
AppSource::Unresolvable(err) => bail!("{err}"),
};

let trigger_cmd = trigger_command_from_locked_app(&locked_app)?;

if self.help {
return self.run_trigger(trigger_cmd, None).await;
}

self.update_locked_app(&mut locked_app);

let trigger_cmd = trigger_command_from_locked_app(&locked_app)?;
let state_dir = self.prepare_state_dir(&app_source);

let run_opts = RunTriggerOpts {
locked_app,
Expand Down Expand Up @@ -383,6 +383,7 @@ impl UpCommand {
bindle_id: &str,
working_dir: &Path,
) -> Result<LockedApp> {
print_bindle_deprecation();
assert!(!self.direct_mounts);

let Some(server) = &self.server else {
Expand Down

0 comments on commit 276e570

Please sign in to comment.