smbcloud-cli 0.4.11__tar.gz → 0.4.13__tar.gz

{smbcloud_cli-0.4.11 → smbcloud_cli-0.4.13}/Cargo.lock

@@ -2528,7 +2528,7 @@ checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
 
 [[package]]
 name = "smbcloud-auth"
-version = "0.4.11"
+version = "0.4.13"
 dependencies = [
  "log",
  "reqwest",
@@ -2543,7 +2543,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-auth-sdk"
-version = "0.4.11"
+version = "0.4.13"
 dependencies = [
  "base64",
  "reqwest",
@@ -2558,7 +2558,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-auth-sdk-py"
-version = "0.4.11"
+version = "0.4.13"
 dependencies = [
  "pyo3",
  "pythonize",
@@ -2572,7 +2572,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-auth-sdk-wasm"
-version = "0.4.11"
+version = "0.4.13"
 dependencies = [
  "serde-wasm-bindgen",
  "smbcloud-auth-sdk",
@@ -2585,7 +2585,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-cli"
-version = "0.4.11"
+version = "0.4.13"
 dependencies = [
  "anyhow",
  "chrono",
@@ -2631,7 +2631,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-deploy"
-version = "0.4.11"
+version = "0.4.13"
 dependencies = [
  "anyhow",
  "smbcloud-model",
@@ -2643,7 +2643,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-email-sdk"
-version = "0.4.11"
+version = "0.4.13"
 dependencies = [
  "anyhow",
  "log",
@@ -2658,7 +2658,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-gresiq"
-version = "0.4.11"
+version = "0.4.13"
 dependencies = [
  "native-tls",
  "postgres-native-tls",
@@ -2672,7 +2672,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-gresiq-sdk"
-version = "0.4.11"
+version = "0.4.13"
 dependencies = [
  "anyhow",
  "log",
@@ -2686,7 +2686,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-mail"
-version = "0.4.11"
+version = "0.4.13"
 dependencies = [
  "reqwest",
  "serde",
@@ -2698,7 +2698,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-model"
-version = "0.4.11"
+version = "0.4.13"
 dependencies = [
  "chrono",
  "log",
@@ -2714,7 +2714,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-network"
-version = "0.4.11"
+version = "0.4.13"
 dependencies = [
  "clap 4.6.2",
  "log",
@@ -2727,7 +2727,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-networking"
-version = "0.4.11"
+version = "0.4.13"
 dependencies = [
  "smbcloud-network",
  "url-builder",
@@ -2735,7 +2735,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-networking-project"
-version = "0.4.11"
+version = "0.4.13"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2753,11 +2753,11 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-s6n"
-version = "0.4.11"
+version = "0.4.13"
 
 [[package]]
 name = "smbcloud-utils"
-version = "0.4.11"
+version = "0.4.13"
 dependencies = [
  "anyhow",
  "dirs",

{smbcloud_cli-0.4.11 → smbcloud_cli-0.4.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smbcloud-cli
-Version: 0.4.11
+Version: 0.4.13
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers

{smbcloud_cli-0.4.11 → smbcloud_cli-0.4.13}/crates/cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "smbcloud-cli"
-version = "0.4.11"
+version = "0.4.13"
 edition = "2021"
 authors = ["Seto Elkahfi <seto@smbcloud.xyz>"]
 description = "smbCloud command line interface."

{smbcloud_cli-0.4.11 → smbcloud_cli-0.4.13}/crates/cli/src/cli/mod.rs

@@ -1,5 +1,5 @@
 use {
-    crate::{account, cloud_auth, mail, project},
+    crate::{account, cloud_auth, mail, project, tenant},
     clap::{Parser, Subcommand},
     smbcloud_network::environment::Environment,
     spinners::Spinner,
@@ -81,6 +81,11 @@ pub enum Commands {
         #[clap(subcommand)]
         command: project::cli::Commands,
     },
+    #[clap(about = "Manage your tenants.")]
+    Tenant {
+        #[clap(subcommand)]
+        command: tenant::cli::Commands,
+    },
     #[clap(about = "Manage smbCloud Mail.")]
     Mail {
         #[clap(subcommand)]

{smbcloud_cli-0.4.11 → smbcloud_cli-0.4.13}/crates/cli/src/cloud-deploy/process_migrate.rs

@@ -178,6 +178,7 @@ fn build_payload(
 fn strip_project(project: &Project) -> Project {
     Project {
         id: project.id,
+        tenant_id: project.tenant_id,
         name: project.name.clone(),
         runner: project.runner,
         deployment_method: DeploymentMethod::default(),

{smbcloud_cli-0.4.11 → smbcloud_cli-0.4.13}/crates/cli/src/cloud-deploy/setup_create_new_project.rs

@@ -111,11 +111,13 @@ pub(crate) async fn create_new_project(
         }
     };
 
+    let tenant_id = crate::session_config::current_tenant_id(env).unwrap_or(None);
     let project = create_project(
         env,
         client(),
         access_token.clone(),
         ProjectCreate { name, description },
+        tenant_id,
     )
     .await?;
 

smbcloud_cli-0.4.13/crates/cli/src/cloud-mail/current_project.rs

@@ -0,0 +1,24 @@
+use anyhow::{anyhow, Result};
+use smbcloud_network::environment::Environment;
+
+pub(crate) fn resolve_optional_project_id(
+    env: Environment,
+    project_id: Option<String>,
+) -> Result<Option<String>> {
+    match project_id {
+        Some(project_id) => Ok(Some(project_id)),
+        None => crate::session_config::current_project_id(env),
+    }
+}
+
+pub(crate) fn resolve_required_project_id(
+    env: Environment,
+    project_id: Option<String>,
+) -> Result<String> {
+    match resolve_optional_project_id(env, project_id)? {
+        Some(project_id) => Ok(project_id),
+        None => Err(anyhow!(
+            "No project selected. Pass `--project-id` or run `smb project use --id <project-id>`."
+        )),
+    }
+}

{smbcloud_cli-0.4.11 → smbcloud_cli-0.4.13}/crates/cli/src/lib.rs

@@ -12,6 +12,8 @@ pub mod interface;
 pub mod mail;
 pub mod mcp;
 pub mod project;
+mod session_config;
+pub mod tenant;
 mod token;
 pub mod ui;
 

{smbcloud_cli-0.4.11 → smbcloud_cli-0.4.13}/crates/cli/src/main.rs

@@ -10,6 +10,7 @@ use {
         deploy::{process_deploy::process_deploy, process_migrate::process_migrate},
         mail::process::process_mail,
         project::{crud_create::process_project_init, process::process_project},
+        tenant::process::process_tenant,
     },
     smbcloud_network::{environment::Environment, network::check_internet_connection},
     std::{
@@ -180,6 +181,7 @@ async fn run(cli: Cli) -> Result<CommandResult> {
         | Some(Commands::Mail { .. })
         | Some(Commands::Auth { .. })
         | Some(Commands::Project { .. })
+        | Some(Commands::Tenant { .. })
         | Some(Commands::Migrate {})
         | None => true,
         Some(Commands::Init {}) => true,
@@ -202,6 +204,7 @@ async fn run(cli: Cli) -> Result<CommandResult> {
         Some(Commands::Mail { command }) => process_mail(cli.environment, command).await,
         Some(Commands::Auth { command }) => process_cloud_auth(cli.environment, command).await,
         Some(Commands::Project { command }) => process_project(cli.environment, command).await,
+        Some(Commands::Tenant { command }) => process_tenant(cli.environment, command).await,
         Some(Commands::Migrate {}) => process_migrate(cli.environment).await,
         None => process_deploy(cli.environment, None).await,
     }