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.

Sign up for GitHub

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

chore: fix ls-files and cli experience #2133

Merged
merged 6 commits into from
Oct 8, 2023
Merged

chore: fix ls-files and cli experience #2133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7bee0c6
chore: refactor lockfile path
v3g42 Oct 8, 2023
26967ad
chore: refactor cloud config
v3g42 Oct 8, 2023
2c1774c
chore: refactor config initiation
v3g42 Oct 8, 2023
8c12378
chore: store and clean up
v3g42 Oct 8, 2023
dd7db05
chore: include get_all_schemas
v3g42 Oct 8, 2023
9dd3b47
chore: add default
v3g42 Oct 8, 2023
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
11 changes: 7 additions & 4 deletions dozer-cli/src/cli/helper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,18 @@ pub async fn init_config(
Ok(config)
}

pub fn get_base_dir() -> Result<Utf8PathBuf, CliError> {
let base_directory = std::env::current_dir().map_err(CliError::Io)?;

Utf8PathBuf::try_from(base_directory).map_err(|e| CliError::Io(e.into_io_error()))
}

pub fn init_dozer(
runtime: Arc<Runtime>,
config: Config,
labels: LabelsAndProgress,
) -> Result<Dozer, CliError> {
let base_directory = std::env::current_dir().map_err(CliError::Io)?;
let base_directory =
Utf8PathBuf::try_from(base_directory).map_err(|e| CliError::Io(e.into_io_error()))?;

let base_directory = get_base_dir()?;
Ok(Dozer::new(base_directory, config, runtime, labels))
}

Expand Down
4 changes: 3 additions & 1 deletion dozer-cli/src/cli/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@ mod helper;
mod init;
pub mod types;

pub use helper::{init_config, init_dozer, list_sources, load_config_from_file, LOGO};
pub use helper::{
get_base_dir, init_config, init_dozer, list_sources, load_config_from_file, LOGO,
};
pub use init::{generate_config_repl, generate_connection};
192 changes: 98 additions & 94 deletions dozer-cli/src/cloud/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::cli::cloud::{
Cloud, DeployCommandArgs, ListCommandArgs, LogCommandArgs, SecretsCommand, VersionCommand,
};
use crate::cli::init_dozer;
use crate::cli::get_base_dir;
use crate::cloud::cloud_app_context::CloudAppContext;
use crate::cloud::cloud_helper::list_files;

Expand All @@ -13,8 +13,9 @@ use crate::cloud::DozerGrpcCloudClient;
use crate::console_helper::{get_colored_text, PURPLE};
use crate::errors::OrchestrationError::FailedToReadOrganisationName;
use crate::errors::{
map_tonic_error, CliError, CloudError, CloudLoginError, ConfigCombineError, OrchestrationError,
map_tonic_error, CliError, CloudContextError, CloudError, CloudLoginError, OrchestrationError,
};
use crate::simple::orchestrator::lockfile_path;
use dozer_types::constants::{DEFAULT_CLOUD_TARGET_URL, LOCK_FILE};
use dozer_types::grpc_types::api_explorer::api_explorer_service_client::ApiExplorerServiceClient;
use dozer_types::grpc_types::api_explorer::GetApiTokenRequest;
Expand All @@ -33,17 +34,16 @@ use dozer_types::prettytable::{row, table};
use futures::{select, FutureExt, StreamExt};
use std::io;
use std::sync::Arc;
use tokio::runtime::Runtime;
use tonic::transport::Endpoint;
use tower::ServiceBuilder;

use super::login::LoginSvc;
async fn establish_cloud_service_channel(
cloud: &Cloud,
cloud_config: &dozer_types::models::cloud::Cloud,
cloud_config: Option<dozer_types::models::cloud::Cloud>,
) -> Result<TokenLayer, CloudError> {
let profile_name = match &cloud.profile {
None => cloud_config.profile.clone(),
let profile_name = match cloud.profile.as_ref() {
None => cloud_config.as_ref().and_then(|f| f.profile.clone()),
Some(_) => cloud.profile.clone(),
};
let credential = CredentialInfo::load(profile_name)?;
Expand All @@ -63,30 +63,48 @@ async fn establish_cloud_service_channel(

pub async fn get_grpc_cloud_client(
cloud: &Cloud,
cloud_config: &dozer_types::models::cloud::Cloud,
cloud_config: Option<dozer_types::models::cloud::Cloud>,
) -> Result<DozerCloudClient<TokenLayer>, CloudError> {
let client = DozerCloudClient::new(establish_cloud_service_channel(cloud, cloud_config).await?);
Ok(client)
}

pub async fn get_explorer_client(
cloud: &Cloud,
cloud_config: &dozer_types::models::cloud::Cloud,
cloud_config: Option<dozer_types::models::cloud::Cloud>,
) -> Result<ApiExplorerServiceClient<TokenLayer>, CloudError> {
let client =
ApiExplorerServiceClient::new(establish_cloud_service_channel(cloud, cloud_config).await?);
Ok(client)
}

pub struct CloudClient {
config: Config,
config: Option<Config>,
runtime: Arc<tokio::runtime::Runtime>,
}

impl CloudClient {
pub fn new(config: Config, runtime: Arc<tokio::runtime::Runtime>) -> Self {
pub fn new(config: Option<Config>, runtime: Arc<tokio::runtime::Runtime>) -> Self {
Self { config, runtime }
}

pub fn get_app_id(&self) -> Option<(String, bool)> {
// Get app_id from command line argument if there, otherwise take it from the cloud config file
// if the app_id is from the cloud config file then set `from_cloud_file` to true and use it later
// to perform cleanup in case of delete and other operations

self.config.as_ref().and_then(|config| {
config.cloud.app_id.clone().map(|app_id| (app_id, true)).or(
CloudAppContext::get_app_id(&config.cloud)
.ok()
.map(|app_id| (app_id, false)),
)
})
}

fn get_cloud_config(&self) -> Option<dozer_types::models::cloud::Cloud> {
self.config.as_ref().map(|config| config.cloud.clone())
}
}

impl DozerGrpcCloudClient for CloudClient {
Expand All @@ -97,19 +115,12 @@ impl DozerGrpcCloudClient for CloudClient {
deploy: DeployCommandArgs,
config_paths: Vec<String>,
) -> Result<(), OrchestrationError> {
let app_id = cloud
.app_id
.clone()
.or(CloudAppContext::get_app_id(&self.config.cloud).ok());

let dozer = init_dozer(
self.runtime.clone(),
self.config.clone(),
Default::default(),
)?;
let lockfile_path = dozer.lockfile_path();
let app_id = self.get_app_id().map(|a| a.0);

let base_dir = get_base_dir()?;
let lockfile_path = lockfile_path(base_dir);
self.runtime.clone().block_on(async move {
let mut client = get_grpc_cloud_client(&cloud, &self.config.cloud).await?;
let mut client = get_grpc_cloud_client(&cloud, self.get_cloud_config()).await?;
let mut files = list_files(config_paths)?;
if deploy.locked {
let lockfile_contents = tokio::fs::read_to_string(lockfile_path)
Expand Down Expand Up @@ -143,23 +154,38 @@ impl DozerGrpcCloudClient for CloudClient {
})?;
Ok(())
}
fn create(
&mut self,
cloud: Cloud,
config_paths: Vec<String>,
) -> Result<(), OrchestrationError> {
let cloud_config = self.get_cloud_config();
let app_id = self.get_app_id().map(|a| a.0);

fn delete(&mut self, cloud: Cloud) -> Result<(), OrchestrationError> {
// Get app_id from command line argument if there, otherwise take it from the cloud config file
// if the app_id is from the cloud config file then set `delete_cloud_file` to true and use it later
// to delete the file after deleting the app

let (app_id, delete_cloud_file) = if let Some(app_id) = cloud.app_id.clone() {
// if the app_id on command line is equal to the one in the cloud config file then file can be deleted
if app_id == CloudAppContext::get_app_id(&self.config.cloud)? {
(app_id, true)
} else {
(app_id, false)
}
} else {
(CloudAppContext::get_app_id(&self.config.cloud)?, true)
if let Some(app_id) = app_id {
return Err(CloudContextError::AppIdAlreadyExists(app_id).into());
};

self.runtime.block_on(async move {
let mut client = get_grpc_cloud_client(&cloud, cloud_config).await?;
let files = list_files(config_paths)?;
let response = client
.create_application(CreateAppRequest { files })
.await
.map_err(map_tonic_error)?
.into_inner();

CloudAppContext::save_app_id(response.app_id.clone())?;
info!("Application created with id {}", response.app_id);
Ok::<(), OrchestrationError>(())
})
}

fn delete(&mut self, cloud: Cloud) -> Result<(), OrchestrationError> {
let (app_id, delete_cloud_file) = self
.get_app_id()
.ok_or_else(|| CloudContextError::AppIdNotFound)?;

let mut double_check = String::new();
println!("Are you sure to delete the application {}? (y/N)", app_id);
io::stdin()
Expand All @@ -174,7 +200,7 @@ impl DozerGrpcCloudClient for CloudClient {
return Ok(());
}

let cloud_config = &self.config.cloud;
let cloud_config = self.get_cloud_config();
self.runtime.block_on(async move {
let mut client = get_grpc_cloud_client(&cloud, cloud_config).await?;

Expand All @@ -201,7 +227,7 @@ impl DozerGrpcCloudClient for CloudClient {
}

fn list(&mut self, cloud: Cloud, list: ListCommandArgs) -> Result<(), OrchestrationError> {
let cloud_config = &self.config.cloud;
let cloud_config = self.get_cloud_config();
self.runtime.block_on(async move {
let mut client = get_grpc_cloud_client(&cloud, cloud_config).await?;
let response = client
Expand Down Expand Up @@ -239,11 +265,11 @@ impl DozerGrpcCloudClient for CloudClient {
}

fn status(&mut self, cloud: Cloud) -> Result<(), OrchestrationError> {
let app_id = cloud
.app_id
.clone()
.unwrap_or(CloudAppContext::get_app_id(&self.config.cloud)?);
let cloud_config = &self.config.cloud;
let app_id = self
.get_app_id()
.map(|a| a.0)
.ok_or_else(|| CloudContextError::AppIdNotFound)?;
let cloud_config = self.get_cloud_config();
self.runtime.block_on(async move {
let mut client = get_grpc_cloud_client(&cloud, cloud_config).await?;
let response = client
Expand Down Expand Up @@ -289,16 +315,21 @@ impl DozerGrpcCloudClient for CloudClient {
}

fn monitor(&mut self, cloud: Cloud) -> Result<(), OrchestrationError> {
monitor_app(&cloud, &self.config.cloud, self.runtime.clone())
let cloud_config = self.get_cloud_config();
let app_id = self
.get_app_id()
.map(|a| a.0)
.ok_or_else(|| CloudContextError::AppIdNotFound)?;
monitor_app(&cloud, app_id, cloud_config, self.runtime.clone())
.map_err(crate::errors::OrchestrationError::CloudError)
}

fn trace_logs(&mut self, cloud: Cloud, logs: LogCommandArgs) -> Result<(), OrchestrationError> {
let app_id = cloud
.app_id
.clone()
.unwrap_or(CloudAppContext::get_app_id(&self.config.cloud)?);
let cloud_config = &self.config.cloud;
let cloud_config = self.get_cloud_config();
let app_id = self
.get_app_id()
.map(|a| a.0)
.ok_or_else(|| CloudContextError::AppIdNotFound)?;
self.runtime.block_on(async move {
let mut client = get_grpc_cloud_client(&cloud, cloud_config).await?;

Expand Down Expand Up @@ -355,7 +386,7 @@ impl DozerGrpcCloudClient for CloudClient {
}

fn login(
runtime: Arc<Runtime>,
&self,
cloud: Cloud,
organisation_slug: Option<String>,
profile: Option<String>,
Expand All @@ -377,7 +408,7 @@ impl DozerGrpcCloudClient for CloudClient {
Some(name) => name,
};

runtime.block_on(async move {
self.runtime.block_on(async move {
let login_svc = LoginSvc::new(
organisation_slug,
cloud
Expand All @@ -396,42 +427,15 @@ impl DozerGrpcCloudClient for CloudClient {
cloud: Cloud,
command: SecretsCommand,
) -> Result<(), OrchestrationError> {
let app_id_result = cloud
.app_id
.clone()
.map_or(CloudAppContext::get_app_id(&self.config.cloud), Ok);

let config = self.config.clone();
let cloud_config = &self.config.cloud;
let cloud_config = self.get_cloud_config();
let app_id = self
.get_app_id()
.map(|a| a.0)
.ok_or_else(|| CloudContextError::AppIdNotFound)?;

self.runtime.block_on(async move {
let mut client = get_grpc_cloud_client(&cloud, cloud_config).await?;

let app_id = match app_id_result {
Ok(id) => Ok(id),
Err(_e) if matches!(command, SecretsCommand::Create { .. }) => {
let config_content =
dozer_types::serde_yaml::to_string(&config).map_err(|e| {
CloudError::ConfigCombineError(ConfigCombineError::ParseConfig(e))
})?;

let response = client
.create_application(CreateAppRequest {
files: vec![File {
name: "dozer.yaml".to_string(),
content: config_content,
}],
})
.await
.map_err(map_tonic_error)?
.into_inner();

CloudAppContext::save_app_id(response.app_id.clone())?;
Ok(response.app_id)
}
Err(e) => Err(e),
}?;

match command {
SecretsCommand::Create { name, value } => {
client
Expand Down Expand Up @@ -504,12 +508,12 @@ impl CloudClient {
cloud: Cloud,
version: VersionCommand,
) -> Result<(), OrchestrationError> {
let app_id = cloud
.app_id
.clone()
.unwrap_or(CloudAppContext::get_app_id(&self.config.cloud)?);
let cloud_config = self.get_cloud_config();
let app_id = self
.get_app_id()
.map(|a| a.0)
.ok_or_else(|| CloudContextError::AppIdNotFound)?;

let cloud_config = &self.config.cloud;
self.runtime.block_on(async move {
let mut client = get_grpc_cloud_client(&cloud, cloud_config).await?;

Expand Down Expand Up @@ -548,13 +552,13 @@ impl CloudClient {
cloud: Cloud,
endpoint: Option<String>,
) -> Result<(), OrchestrationError> {
let app_id = cloud
.app_id
.clone()
.unwrap_or(CloudAppContext::get_app_id(&self.config.cloud)?);
let cloud_config = &self.config.cloud;
let cloud_config = self.get_cloud_config();
let app_id = self
.get_app_id()
.map(|a| a.0)
.ok_or_else(|| CloudContextError::AppIdNotFound)?;
self.runtime.block_on(async move {
let mut client = get_grpc_cloud_client(&cloud, cloud_config).await?;
let mut client = get_grpc_cloud_client(&cloud, cloud_config.clone()).await?;
let mut explorer_client = get_explorer_client(&cloud, cloud_config).await?;

let response = client
Expand Down
10 changes: 5 additions & 5 deletions dozer-cli/src/cloud/deployer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ pub async fn deploy_app(
let deployment_id = response.deployment_id;
let url = response.deployment_url;
info!("Deploying new application with App Id: {app_id}, Deployment Id: {deployment_id}");
info!("Follow the deployment progress at {url}");

CloudAppContext::save_app_id(app_id.clone())?;
if follow {
print_progress(client, app_id, deployment_id).await?;
} else {
info!("Follow the deployment progress at {url}");
}

Ok::<(), CloudError>(())
Expand All @@ -63,12 +64,11 @@ async fn print_progress(
if response.status == DeploymentStatus::Success as i32 {
info!("Deployment completed successfully");
info!("You can get API requests samples with `dozer cloud api-request-samples`");

CloudAppContext::save_app_id(app_id)?;

break;
} else if response.status == DeploymentStatus::Failed as i32 {
warn!("Deployment failed!");
info!("Cleaning up...");
CloudAppContext::delete_config_file()?;
break;
} else {
let steps = response.steps.clone();
Expand Down
Loading
Loading