Skip to content
New issue

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

#

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

Already on GitHub? # to your account

[Merged by Bors] - feat: deprecate fluvio install in place of fvm #3647

Closed
wants to merge 1 commit into from
Closed

[Merged by Bors] - feat: deprecate fluvio install in place of fvm #3647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions crates/fluvio-cli/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ pub enum CliError {

#[error("Invalid argument: {0}")]
InvalidArg(String),
#[error("Unknown error: {0}")]
Other(String),
#[error("{0}")]
CollectedError(String),
#[error("Unexpected Infallible error")]
Expand Down
1 change: 0 additions & 1 deletion crates/fluvio-cli/src/install/mod.rs
View file
Open in desktop

This file was deleted.

266 changes: 0 additions & 266 deletions crates/fluvio-cli/src/install/plugins.rs
View file
Open in desktop

This file was deleted.

36 changes: 9 additions & 27 deletions crates/fluvio-cli/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,20 @@
//! CLI configurations at the top of the tree

mod error;
pub mod client;
pub mod install;
mod profile;
mod version;
mod metadata;
mod profile;
mod render;
mod version;

pub mod client;

pub(crate) mod monitoring;

// Re-exported
pub(crate) use error::CliError;

use fluvio_extension_common as common;

pub(crate) const VERSION: &str = include_str!("../../../VERSION");

// list of public export
Expand Down Expand Up @@ -52,10 +56,9 @@ mod root {
#[cfg(feature = "k8s")]
use fluvio_cluster::cli::ClusterCmd;
use fluvio_cli_common::install::fluvio_extensions_dir;
use fluvio_channel::{FLUVIO_RELEASE_CHANNEL, LATEST_CHANNEL_NAME};
use fluvio_channel::FLUVIO_RELEASE_CHANNEL;

use crate::profile::ProfileOpt;
use crate::install::plugins::InstallOpt;
use crate::client::FluvioCmd;
use crate::metadata::{MetadataOpt, subcommand_metadata};
use crate::version::VersionOpt;
Expand Down Expand Up @@ -118,16 +121,6 @@ mod root {
#[command(subcommand, name = "cluster")]
Cluster(Box<ClusterCmd>),

/// Install Fluvio plugins
///
/// The Fluvio CLI considers any executable with the prefix `fluvio-` to be a
/// CLI plugin. For example, an executable named `fluvio-foo` in your PATH may
/// be invoked by running `fluvio foo`.
///
/// This command allows you to install plugins from Fluvio's package registry.
#[command(name = "install")]
Install(InstallOpt),

/// Print Fluvio version information
#[command(name = "version")]
Version(VersionOpt),
Expand Down Expand Up @@ -171,17 +164,6 @@ mod root {
let version = semver::Version::parse(crate::VERSION).unwrap();
cluster.process(out, version, root.target).await?;
}
Self::Install(mut install) => {
if let Ok(channel_name) = std::env::var(FLUVIO_RELEASE_CHANNEL) {
println!("Current channel: {}", &channel_name);

if channel_name == LATEST_CHANNEL_NAME {
install.develop = true;
}
};

install.process().await?;
}
Self::Version(version) => {
version.process(root.target).await?;
}
Expand Down