-
Multi-Cloud Cost Management Made Simple
-
Securely visualize and analyze costs across AWS, Alibaba Cloud, and more. All data stays on your machine with encryption.
-
-
-
🪟 Windows
-
🍎 macOS
+
+
+
+
+
+
Multi-Cloud Cost Management Made Simple
+
Securely visualize and analyze costs across AWS, Alibaba Cloud, and DeepSeek. All data stays on your machine, encrypted.
+
+
+ 🪟 Windows
+ 🍎 macOS (Intel & Apple Silicon)
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-
-
-
🌐
-
Multi-Cloud Support
-
Full support for AWS and Alibaba Cloud. Azure and GCP coming soon. Manage all your cloud costs in one place.
-
-
-
📊
-
Cost Visualization
-
Beautiful charts and graphs show monthly overviews, per-service breakdowns, and 30-day cost trends at a glance.
-
-
-
🔒
-
Security First
-
AES-256-GCM encryption for all credentials. Your data never leaves your machine. No cloud sync, no telemetry.
-
-
-
⚡
-
Smart Caching
-
Intelligent 6-hour cache minimizes API calls and costs. Auto-refresh when stale, manual refresh when needed.
-
-
-
🎨
-
Modern UI
-
Built with GPUI, Zed's GPU-accelerated framework. Native performance with a sleek dark theme interface.
-
-
-
💰
-
Cost Analytics
-
Track daily statistics including total, average, max, and min costs. Month-over-month comparisons built in.
+
+
-
+
-
-
-
-
-
-
-
1
-
Download & Install
-
Download CloudBridge for your platform. No installation required - just run the executable.
-
-
-
2
-
Add Cloud Accounts
-
Enter your cloud provider credentials. They're encrypted with AES-256-GCM and stored locally on your machine.
+
+
+
+
-
-
3
-
Visualize Costs
-
View your cost data with beautiful charts. Data is cached intelligently to minimize API costs.
+
+
+
🌐
+
Multi-Cloud Support
+
Full support for AWS, Alibaba Cloud, and DeepSeek balance tracking. Azure and GCP coming soon. Manage all your cloud costs in one place.
+
+
+
📊
+
Cost Visualization
+
Beautiful charts and graphs show monthly overviews, per-service breakdowns, and 30-day cost trends at a glance.
+
+
+
🔒
+
Security First
+
AES-256-GCM encryption for all credentials. Your data never leaves your machine. No cloud sync, no telemetry.
+
+
+
⚡
+
Smart Caching
+
Intelligent 6-hour cache minimizes API calls and costs. Auto-refresh when stale, manual refresh when needed.
+
+
+
🎨
+
Modern UI
+
Built with GPUI, Zed's GPU-accelerated framework. Native performance with a sleek dark theme interface.
+
+
+
💰
+
Cost Analytics
+
Track daily statistics including total, average, max, and min costs. Month-over-month comparisons built in.
+
-
-
-
-
-
-
Ready to Get Started?
-
Download CloudBridge for your platform and start managing your cloud costs today.
-
-
Or view all releases on GitHub
-
+
-
-
-
-
-
-
-
Is CloudBridge free to use?
-
Yes! CloudBridge is completely free and open source under the MIT license. You only pay for your cloud provider's API costs (AWS Cost Explorer charges $0.01 per request, Alibaba Cloud billing API is free).
+
+
+
+
-
-
How is my data secured?
-
All credentials are encrypted using AES-256-GCM before being stored locally. The encryption key is generated on your machine and stored in your local config file. Your data never leaves your computer except for direct API calls to your cloud providers.
+
+
+
1
+
Download & Install
+
Download CloudBridge for your platform. No installation required - just run the executable.
+
+
+
2
+
Add Cloud Accounts
+
Enter your cloud provider credentials. They're encrypted with AES-256-GCM and stored locally on your machine.
+
+
+
3
+
Visualize Costs
+
View your cost data with beautiful charts. Data is cached intelligently to minimize API costs.
+
-
-
Which cloud providers are supported?
-
Currently, AWS and Alibaba Cloud are fully supported. Azure and Google Cloud Platform support is planned for future releases. Check our roadmap on GitHub for the latest updates.
+
+
+
+
+
+
+
Ready to Get Started?
+
Download CloudBridge for your platform and start managing your cloud costs today.
+
-
-
Does CloudBridge work on Linux?
-
Native Linux builds are planned for future releases. Currently, CloudBridge supports Windows and macOS (Apple Silicon only).
+
+
Windows: SmartScreen may warn about unsigned executables. Click "More info" → "Run anyway" to proceed.
+
macOS: Unzip first, then run chmod +x cloudbridge-macos-* and launch from Terminal. If Gatekeeper blocks it, run xattr -cr cloudbridge-macos-* to remove quarantine flags.
+
Or browse all releases on GitHub.
-
-
How often is cost data refreshed?
-
CloudBridge uses intelligent caching with a 6-hour default refresh interval to minimize API costs. You can manually refresh data anytime by clicking the Refresh button.
+
+
+
+
+
+
+
-
-
Can I export my cost data?
-
Export functionality (CSV, PDF) is planned for version 0.3.0. For now, all cost data is stored in a local DuckDB database that you can query directly if needed.
+
+
+ Is CloudBridge free to use?
+ Yes! CloudBridge is completely free and open source under the MIT license. You only pay for your cloud provider's API costs (AWS Cost Explorer charges $0.01 per request; Alibaba Cloud and DeepSeek APIs are free).
+
+
+ How is my data secured?
+ All credentials are encrypted using AES-256-GCM before being stored locally. The encryption key is generated on your machine and stored in your local config file. Your data never leaves your computer except for direct API calls to your cloud providers.
+
+
+ Which cloud providers are supported?
+ AWS, Alibaba Cloud, and DeepSeek (balance tracking) are fully supported today. Azure and Google Cloud Platform support is planned for future releases. Check our roadmap on GitHub for the latest updates.
+
+
+ What IAM permissions does CloudBridge need?
+ CloudBridge only needs read-only billing access. For AWS, attach a policy with the four Cost Explorer read actions; for Alibaba Cloud, attach the built-in
AliyunBSSReadOnlyAccess policy. Ready-to-use templates and step-by-step instructions are in
docs/policies.md.
+
+ Does CloudBridge work on Linux?
+ Native Linux builds are planned for future releases. Currently, CloudBridge supports Windows (x64) and macOS (Intel and Apple Silicon).
+
+
+ How often is cost data refreshed?
+ CloudBridge uses intelligent caching with a 6-hour default refresh interval to minimize API costs. You can manually refresh data anytime by clicking the Refresh button.
+
+
+ Can I export my cost data?
+ Export functionality (CSV, PDF) is planned for version 0.3.0. For now, all cost data is stored in a local DuckDB database that you can query directly if needed.
+
-
+
+
diff --git a/src/cloud/aliyun.rs b/src/cloud/aliyun.rs
index 49ade06..3897c54 100644
--- a/src/cloud/aliyun.rs
+++ b/src/cloud/aliyun.rs
@@ -7,7 +7,7 @@ use serde::Deserialize;
use sha1::Sha1;
use std::collections::BTreeMap;
-use super::{CloudProvider, CloudService, CostData, CostSummary, ServiceCost};
+use super::{CloudService, CostData, CostSummary, ServiceCost, SourceId};
type HmacSha1 = Hmac
;
@@ -287,7 +287,7 @@ impl CloudService for AliyunCloudService {
Ok(CostSummary {
account_id: self.account_id.clone(),
account_name: self.account_name.clone(),
- provider: CloudProvider::Aliyun,
+ source_id: SourceId::from("Aliyun"),
current_month_cost,
last_month_cost,
currency: "CNY".to_string(),
diff --git a/src/cloud/aws.rs b/src/cloud/aws.rs
index 16e311f..59cff4f 100644
--- a/src/cloud/aws.rs
+++ b/src/cloud/aws.rs
@@ -6,7 +6,7 @@ use hmac::{Hmac, Mac};
use serde::Deserialize;
use sha2::{Digest, Sha256};
-use super::{CloudProvider, CloudService, CostData, CostSummary};
+use super::{CloudService, CostData, CostSummary, SourceId};
type HmacSha256 = Hmac;
@@ -664,7 +664,7 @@ impl CloudService for AwsCloudService {
Ok(CostSummary {
account_id: self.account_id.clone(),
account_name: self.account_name.clone(),
- provider: CloudProvider::AWS,
+ source_id: SourceId::from("AWS"),
current_month_cost,
last_month_cost,
currency,
diff --git a/src/cloud/deepseek.rs b/src/cloud/deepseek.rs
index ef1858d..ce1965e 100644
--- a/src/cloud/deepseek.rs
+++ b/src/cloud/deepseek.rs
@@ -3,7 +3,7 @@
use anyhow::{anyhow, Result};
use serde::Deserialize;
-use super::{CloudProvider, CloudService, CostData, CostSummary, CostTrend, ServiceCost};
+use super::{CloudService, CostData, CostSummary, CostTrend, ServiceCost, SourceId};
/// DeepSeek balance info
#[derive(Debug, Deserialize)]
@@ -125,7 +125,7 @@ impl CloudService for DeepSeekService {
Ok(CostSummary {
account_id: self.account_id.clone(),
account_name: self.account_name.clone(),
- provider: CloudProvider::DeepSeek,
+ source_id: SourceId::from("DeepSeek"),
current_month_cost: total,
last_month_cost: 0.0,
currency: balance_info.currency.clone(),
diff --git a/src/cloud/mod.rs b/src/cloud/mod.rs
index 64fe9d4..a31fa38 100644
--- a/src/cloud/mod.rs
+++ b/src/cloud/mod.rs
@@ -1,48 +1,30 @@
-//! Cloud provider module
+//! Billing sources: accounts, the data they report, and the client trait.
pub mod aliyun;
pub mod aws;
pub mod deepseek;
+pub mod registry;
use anyhow::Result;
use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize};
-/// Cloud provider type
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Default)]
-#[allow(clippy::upper_case_acronyms)]
-pub enum CloudProvider {
- #[default]
- AWS,
- Aliyun,
- Azure,
- GCP,
- DeepSeek,
-}
+pub use registry::{SourceDescriptor, SourceId};
-impl CloudProvider {
- /// Get full name of cloud provider
- #[allow(dead_code)]
- pub fn display_name(&self) -> &'static str {
- match self {
- CloudProvider::AWS => "Amazon Web Services",
- CloudProvider::Aliyun => "Alibaba Cloud",
- CloudProvider::Azure => "Microsoft Azure",
- CloudProvider::GCP => "Google Cloud Platform",
- CloudProvider::DeepSeek => "DeepSeek",
- }
- }
+/// Shown in place of a source's name when its id is not in the registry.
+/// Accounts like that are filtered out on load, so this is a backstop.
+const UNKNOWN_SOURCE: &str = "Unknown";
- /// Get short name of cloud provider
- pub fn short_name(&self) -> &'static str {
- match self {
- CloudProvider::AWS => "AWS",
- CloudProvider::Aliyun => "Aliyun",
- CloudProvider::Azure => "Azure",
- CloudProvider::GCP => "GCP",
- CloudProvider::DeepSeek => "DeepSeek",
- }
- }
+/// The credentials and identity a [`CloudService`] is built from.
+///
+/// Bundled into one struct so [`SourceDescriptor::build`] can be a plain
+/// function pointer.
+pub struct SourceContext {
+ pub account_id: String,
+ pub account_name: String,
+ pub access_key_id: String,
+ pub secret_access_key: String,
+ pub region: Option,
}
/// Cloud account information
@@ -52,8 +34,8 @@ pub struct CloudAccount {
pub id: String,
/// Account name (user-defined)
pub name: String,
- /// Cloud provider
- pub provider: CloudProvider,
+ /// Billing source this account belongs to; see [`registry`].
+ pub source_id: SourceId,
/// Access Key ID (encrypted storage)
pub access_key_id: String,
/// Secret Access Key (encrypted storage)
@@ -68,6 +50,31 @@ pub struct CloudAccount {
pub enabled: bool,
}
+impl CloudAccount {
+ /// The descriptor for this account's source, or `None` if the stored id
+ /// is not registered in this build.
+ pub fn descriptor(&self) -> Option<&'static SourceDescriptor> {
+ self.source_id.descriptor()
+ }
+
+ /// Short label for the source, for badges and log lines.
+ pub fn short_name(&self) -> &'static str {
+ self.descriptor().map_or(UNKNOWN_SOURCE, |s| s.short_name)
+ }
+
+ /// Credentials in the shape [`SourceDescriptor::build`] expects, with the
+ /// source's default region filled in when the account stored none.
+ pub fn context(&self, descriptor: &SourceDescriptor) -> SourceContext {
+ SourceContext {
+ account_id: self.id.clone(),
+ account_name: self.name.clone(),
+ access_key_id: self.access_key_id.clone(),
+ secret_access_key: self.secret_access_key.clone(),
+ region: descriptor.region_or_default(self.region.clone()),
+ }
+ }
+}
+
/// Cost data
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct CostData {
@@ -90,8 +97,8 @@ pub struct CostSummary {
pub account_id: String,
/// Account name
pub account_name: String,
- /// Cloud provider
- pub provider: CloudProvider,
+ /// Billing source this summary came from
+ pub source_id: SourceId,
/// Current month cost
pub current_month_cost: f64,
/// Last month cost
@@ -106,6 +113,24 @@ pub struct CostSummary {
pub last_month_details: Vec,
}
+impl CostSummary {
+ fn descriptor(&self) -> Option<&'static SourceDescriptor> {
+ self.source_id.descriptor()
+ }
+
+ /// Short label for the source, for badges.
+ pub fn short_name(&self) -> &'static str {
+ self.descriptor().map_or(UNKNOWN_SOURCE, |s| s.short_name)
+ }
+
+ /// Whether this is a point-in-time balance rather than a period cost.
+ /// The dashboard lists the two kinds in separate sections and labels
+ /// their amounts differently.
+ pub fn is_snapshot(&self) -> bool {
+ self.descriptor().is_some_and(SourceDescriptor::is_snapshot)
+ }
+}
+
/// Service cost detail
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct ServiceCost {
diff --git a/src/cloud/registry.rs b/src/cloud/registry.rs
new file mode 100644
index 0000000..e6c7449
--- /dev/null
+++ b/src/cloud/registry.rs
@@ -0,0 +1,250 @@
+//! Billing source registry.
+//!
+//! A source is a row in [`SOURCES`], not an enum variant. Adding one means
+//! adding a [`SourceDescriptor`] and a parser — nothing else in the codebase
+//! learns its name. That matters because the roadmap adds model-provider
+//! APIs, token plans and local agent usage on top of the public clouds, and
+//! the previous `CloudProvider` enum had to be matched in 48 places.
+//!
+//! Callers ask the descriptor what a source can do rather than who it is:
+//! DeepSeek renders as a balance because its [`Reporting`] is
+//! [`Reporting::Snapshot`], not because it is called DeepSeek.
+
+use serde::{Deserialize, Serialize};
+
+use super::{aliyun::AliyunCloudService, aws::AwsCloudService, deepseek::DeepSeekService};
+use super::{CloudService, SourceContext};
+
+/// What a source reports, and therefore how it can be displayed.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Reporting {
+ /// Cost accrued over a period. `trend_window_days` is how far back a
+ /// daily trend is worth requesting — Alibaba Cloud needs one API call
+ /// per day, so it gets a shorter window than AWS.
+ Periodic { trend_window_days: i64 },
+ /// A point-in-time balance. There is no period cost and no history to
+ /// chart.
+ Snapshot,
+}
+
+/// Identifier of a billing source.
+///
+/// Persisted verbatim in the `cloud_accounts` table, so these strings are
+/// part of the on-disk format and must not be renamed without a migration.
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(transparent)]
+pub struct SourceId(String);
+
+impl SourceId {
+ pub fn as_str(&self) -> &str {
+ &self.0
+ }
+
+ /// The descriptor for this id, or `None` if no source is registered
+ /// under it — an account written by a newer build, or by a build that
+ /// still had the Azure and GCP enum variants.
+ pub fn descriptor(&self) -> Option<&'static SourceDescriptor> {
+ get(&self.0)
+ }
+}
+
+impl From<&str> for SourceId {
+ fn from(id: &str) -> Self {
+ Self(id.to_string())
+ }
+}
+
+impl From for SourceId {
+ fn from(id: String) -> Self {
+ Self(id)
+ }
+}
+
+/// Everything the application needs to know about a billing source.
+pub struct SourceDescriptor {
+ /// Stable identifier; see [`SourceId`].
+ pub id: &'static str,
+ pub display_name: &'static str,
+ pub short_name: &'static str,
+ /// Label for the public half of the credential.
+ pub access_key_label: &'static str,
+ /// Label for the secret half, or `None` when the source authenticates
+ /// with a single key.
+ pub secret_key_label: Option<&'static str>,
+ /// Region applied when the user leaves the field blank, or `None` when
+ /// the source has no notion of a region.
+ pub default_region: Option<&'static str>,
+ pub reporting: Reporting,
+ /// Builds the client. A function pointer keeps construction in this
+ /// table instead of a `match` in every caller.
+ pub build: fn(SourceContext) -> Box,
+}
+
+impl SourceDescriptor {
+ pub fn source_id(&self) -> SourceId {
+ SourceId::from(self.id)
+ }
+
+ /// Whether the credential form should require a secret key.
+ pub fn needs_secret_key(&self) -> bool {
+ self.secret_key_label.is_some()
+ }
+
+ pub fn secret_key_placeholder(&self) -> &'static str {
+ self.secret_key_label
+ .unwrap_or("(Not required, leave empty)")
+ }
+
+ pub fn region_placeholder(&self) -> String {
+ match self.default_region {
+ Some(region) => format!("Region (optional, default {})", region),
+ None => "(Not required)".to_string(),
+ }
+ }
+
+ /// Region to use for an account that stored none.
+ pub fn region_or_default(&self, region: Option) -> Option {
+ region.or_else(|| self.default_region.map(str::to_string))
+ }
+
+ /// Days of daily trend worth requesting, or `None` for a source that has
+ /// no history to chart.
+ pub fn trend_window_days(&self) -> Option {
+ match self.reporting {
+ Reporting::Periodic { trend_window_days } => Some(trend_window_days),
+ Reporting::Snapshot => None,
+ }
+ }
+
+ /// Whether this source reports a balance rather than a period cost.
+ pub fn is_snapshot(&self) -> bool {
+ matches!(self.reporting, Reporting::Snapshot)
+ }
+}
+
+static SOURCES: &[SourceDescriptor] = &[
+ SourceDescriptor {
+ id: "AWS",
+ display_name: "Amazon Web Services",
+ short_name: "AWS",
+ access_key_label: "Access Key ID",
+ secret_key_label: Some("Secret Access Key"),
+ default_region: Some("us-east-1"),
+ reporting: Reporting::Periodic {
+ trend_window_days: 30,
+ },
+ build: |ctx| {
+ Box::new(AwsCloudService::new(
+ ctx.account_id,
+ ctx.account_name,
+ ctx.access_key_id,
+ ctx.secret_access_key,
+ ctx.region,
+ ))
+ },
+ },
+ SourceDescriptor {
+ id: "Aliyun",
+ display_name: "Alibaba Cloud",
+ short_name: "Aliyun",
+ access_key_label: "AccessKey ID",
+ secret_key_label: Some("AccessKey Secret"),
+ default_region: Some("cn-hangzhou"),
+ // One API call per day, so a shorter window than AWS.
+ reporting: Reporting::Periodic {
+ trend_window_days: 7,
+ },
+ build: |ctx| {
+ Box::new(AliyunCloudService::new(
+ ctx.account_id,
+ ctx.account_name,
+ ctx.access_key_id,
+ ctx.secret_access_key,
+ ctx.region,
+ ))
+ },
+ },
+ SourceDescriptor {
+ id: "DeepSeek",
+ display_name: "DeepSeek",
+ short_name: "DeepSeek",
+ access_key_label: "API Key",
+ secret_key_label: None,
+ default_region: None,
+ reporting: Reporting::Snapshot,
+ build: |ctx| {
+ Box::new(DeepSeekService::new(
+ ctx.account_id,
+ ctx.account_name,
+ ctx.access_key_id,
+ ctx.secret_access_key,
+ ctx.region,
+ ))
+ },
+ },
+];
+
+/// Every registered source, in the order they are offered in the UI.
+pub fn all() -> &'static [SourceDescriptor] {
+ SOURCES
+}
+
+/// The descriptor registered under `id`, if any.
+pub fn get(id: &str) -> Option<&'static SourceDescriptor> {
+ SOURCES.iter().find(|source| source.id == id)
+}
+
+/// The source offered first when adding an account.
+pub fn default_source() -> &'static SourceDescriptor {
+ &SOURCES[0]
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ /// Ids are persisted in `cloud_accounts`, so a duplicate would make one of
+ /// the two sources unreachable and silently reroute existing accounts.
+ #[test]
+ fn ids_are_unique() {
+ let mut seen = Vec::new();
+ for source in all() {
+ assert!(
+ !seen.contains(&source.id),
+ "duplicate source id {}",
+ source.id
+ );
+ seen.push(source.id);
+ }
+ }
+
+ /// The round trip an account takes: descriptor -> stored id -> descriptor.
+ #[test]
+ fn every_descriptor_resolves_from_its_own_id() {
+ for source in all() {
+ let resolved = source
+ .source_id()
+ .descriptor()
+ .unwrap_or_else(|| panic!("{} does not resolve", source.id));
+ assert_eq!(resolved.id, source.id);
+ }
+ }
+
+ /// A source with no region must not offer one, or the credential form
+ /// would ask for a value that is silently discarded.
+ #[test]
+ fn region_placeholder_matches_default_region() {
+ for source in all() {
+ match source.default_region {
+ Some(region) => {
+ assert!(
+ source.region_placeholder().contains(region),
+ "{}",
+ source.id
+ )
+ }
+ None => assert_eq!(source.region_placeholder(), "(Not required)"),
+ }
+ }
+ }
+}
diff --git a/src/db.rs b/src/db.rs
index 8a351b0..c84ba14 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -6,8 +6,8 @@ use duckdb::{params, Connection};
use std::sync::{Arc, Mutex};
use crate::cloud::{
- BudgetInfo, BudgetStatus, CloudAccount, CloudProvider, CostData, CostSummary, CostTrend,
- DailyCost, ServiceCost,
+ BudgetInfo, BudgetStatus, CloudAccount, CostData, CostSummary, CostTrend, DailyCost,
+ ServiceCost, SourceId,
};
use crate::config::get_database_path;
use crate::crypto::get_crypto_manager;
@@ -31,6 +31,8 @@ pub fn init_database() -> Result<()> {
CREATE TABLE IF NOT EXISTS cloud_accounts (
id VARCHAR PRIMARY KEY,
name VARCHAR NOT NULL,
+ -- Holds a registry SourceId. Column name predates the registry;
+ -- PR2 rebuilds this schema, so it is not worth a migration now.
provider VARCHAR NOT NULL,
access_key_id VARCHAR NOT NULL,
secret_access_key VARCHAR NOT NULL,
@@ -155,7 +157,7 @@ pub fn save_account(account: &CloudAccount) -> Result<()> {
params![
account.id,
account.name,
- format!("{:?}", account.provider),
+ account.source_id.as_str(),
"",
"",
account.region,
@@ -180,15 +182,7 @@ pub fn get_all_accounts() -> Result> {
let accounts = stmt
.query_map([], |row| {
- let provider_str: String = row.get(2)?;
- let provider = match provider_str.as_str() {
- "AWS" => CloudProvider::AWS,
- "Aliyun" => CloudProvider::Aliyun,
- "Azure" => CloudProvider::Azure,
- "GCP" => CloudProvider::GCP,
- "DeepSeek" => CloudProvider::DeepSeek,
- _ => CloudProvider::AWS,
- };
+ let source_id = SourceId::from(row.get::<_, String>(2)?);
let encrypted_ak: String = row.get(3)?;
let encrypted_sk: String = row.get(4)?;
@@ -199,7 +193,7 @@ pub fn get_all_accounts() -> Result> {
Ok((
row.get::<_, String>(0)?,
row.get::<_, String>(1)?,
- provider,
+ source_id,
encrypted_ak,
encrypted_sk,
row.get::<_, Option>(5)?,
@@ -214,7 +208,7 @@ pub fn get_all_accounts() -> Result> {
for (
id,
name,
- provider,
+ source_id,
encrypted_ak,
encrypted_sk,
region,
@@ -223,6 +217,20 @@ pub fn get_all_accounts() -> Result> {
enabled,
) in accounts
{
+ // An id with no descriptor comes from a build that knew a source this
+ // one does not. Skip the row rather than guessing: silently reading it
+ // as some other provider would sign requests with the wrong scheme and
+ // file the resulting costs under the wrong source.
+ if source_id.descriptor().is_none() {
+ tracing::warn!(
+ "Skipping account {} ({}): no billing source registered under '{}'",
+ name,
+ id,
+ source_id.as_str()
+ );
+ continue;
+ }
+
// Try to load secrets from OS keyring first (migration path). If not present, fall back to
// decrypting existing values from DB and migrate them into keyring.
let (access_key_id, secret_access_key) = match secret_store::get_account_secrets(&id)? {
@@ -257,7 +265,7 @@ pub fn get_all_accounts() -> Result> {
result.push(CloudAccount {
id,
name,
- provider,
+ source_id,
access_key_id,
secret_access_key,
region,
@@ -359,7 +367,7 @@ pub fn get_all_cost_summaries() -> Result> {
summaries.push(CostSummary {
account_id: account.id,
account_name: account.name,
- provider: account.provider,
+ source_id: account.source_id,
current_month_cost: 0.0,
last_month_cost: 0.0,
currency: "USD".to_string(),
@@ -375,11 +383,11 @@ pub fn get_all_cost_summaries() -> Result> {
// ==================== Cache Functions ====================
/// Check if cost summary cache is valid
-/// account_name and provider are passed by the caller to avoid deadlock when acquiring lock while holding database lock
+/// account_name and source_id are passed by the caller to avoid deadlock when acquiring lock while holding database lock
pub fn get_cached_cost_summary_with_account(
account_id: &str,
account_name: &str,
- provider: &CloudProvider,
+ source_id: &SourceId,
) -> Result> {
let db = get_connection()?;
let conn = db.as_ref().unwrap();
@@ -444,7 +452,7 @@ pub fn get_cached_cost_summary_with_account(
Ok(Some(CostSummary {
account_id: account_id.to_string(),
account_name: account_name.to_string(),
- provider: *provider,
+ source_id: source_id.clone(),
current_month_cost: current,
last_month_cost: last,
currency,
@@ -759,7 +767,7 @@ pub fn get_budget_status(account_id: &str) -> Result> {
// Get cached cost summary
let cost_summary =
- get_cached_cost_summary_with_account(account_id, &account.name, &account.provider)?;
+ get_cached_cost_summary_with_account(account_id, &account.name, &account.source_id)?;
let current_cost = cost_summary.map(|cs| cs.current_month_cost).unwrap_or(0.0);
diff --git a/src/ui/accounts.rs b/src/ui/accounts.rs
index 4c04a79..c29bc46 100644
--- a/src/ui/accounts.rs
+++ b/src/ui/accounts.rs
@@ -10,7 +10,8 @@ use gpui_component::{
};
use uuid::Uuid;
-use crate::cloud::{CloudAccount, CloudProvider};
+use crate::cloud::registry::{self, SourceDescriptor};
+use crate::cloud::CloudAccount;
use crate::db;
/// Account Management View
@@ -19,8 +20,6 @@ pub struct AccountsView {
accounts: Vec,
/// Whether to show add dialog
show_add_dialog: bool,
- /// New account form
- new_account_form: NewAccountForm,
/// Error message
error: Option,
/// Success message
@@ -30,19 +29,8 @@ pub struct AccountsView {
ak_input: Entity,
sk_input: Entity,
region_input: Entity,
- /// Currently selected cloud provider
- selected_provider: CloudProvider,
-}
-
-/// New account form data (internal use)
-#[derive(Default, Clone)]
-#[allow(dead_code)]
-struct NewAccountForm {
- name: String,
- provider: CloudProvider,
- access_key_id: String,
- secret_access_key: String,
- region: String,
+ /// Billing source selected in the add dialog
+ selected_source: &'static SourceDescriptor,
}
impl AccountsView {
@@ -59,14 +47,13 @@ impl AccountsView {
let mut view = Self {
accounts: Vec::new(),
show_add_dialog: false,
- new_account_form: NewAccountForm::default(),
error: None,
success: None,
name_input,
ak_input,
sk_input,
region_input,
- selected_provider: CloudProvider::AWS,
+ selected_source: registry::default_source(),
};
view.load_accounts();
@@ -87,60 +74,33 @@ impl AccountsView {
fn show_add_dialog(&mut self, cx: &mut Context) {
self.show_add_dialog = true;
- self.new_account_form = NewAccountForm::default();
- self.selected_provider = CloudProvider::AWS;
+ self.selected_source = registry::default_source();
self.error = None;
self.success = None;
cx.notify();
}
- fn set_provider(
+ fn set_source(
&mut self,
- provider: CloudProvider,
+ source: &'static SourceDescriptor,
window: &mut Window,
cx: &mut Context,
) {
- self.selected_provider = provider;
- // Update input placeholders based on cloud provider
- match provider {
- CloudProvider::AWS => {
- self.ak_input.update(cx, |state, cx| {
- state.set_placeholder("Access Key ID", window, cx);
- });
- self.sk_input.update(cx, |state, cx| {
- state.set_placeholder("Secret Access Key", window, cx);
- });
- self.region_input.update(cx, |state, cx| {
- state.set_placeholder("Region (optional, default us-east-1)", window, cx);
- state.set_value("us-east-1", window, cx);
- });
- }
- CloudProvider::Aliyun => {
- self.ak_input.update(cx, |state, cx| {
- state.set_placeholder("AccessKey ID", window, cx);
- });
- self.sk_input.update(cx, |state, cx| {
- state.set_placeholder("AccessKey Secret", window, cx);
- });
- self.region_input.update(cx, |state, cx| {
- state.set_placeholder("Region (optional, default cn-hangzhou)", window, cx);
- state.set_value("cn-hangzhou", window, cx);
- });
- }
- CloudProvider::DeepSeek => {
- self.ak_input.update(cx, |state, cx| {
- state.set_placeholder("API Key", window, cx);
- });
- self.sk_input.update(cx, |state, cx| {
- state.set_placeholder("(Not required, leave empty)", window, cx);
- });
- self.region_input.update(cx, |state, cx| {
- state.set_placeholder("(Not required)", window, cx);
- });
- }
+ self.selected_source = source;
+
+ // Every label comes from the descriptor, so a new source needs no
+ // change here.
+ self.ak_input.update(cx, |state, cx| {
+ state.set_placeholder(source.access_key_label, window, cx);
+ });
+ self.sk_input.update(cx, |state, cx| {
+ state.set_placeholder(source.secret_key_placeholder(), window, cx);
+ });
+ self.region_input.update(cx, |state, cx| {
+ state.set_placeholder(source.region_placeholder(), window, cx);
+ state.set_value(source.default_region.unwrap_or_default(), window, cx);
+ });
- _ => {}
- }
cx.notify();
}
@@ -167,8 +127,7 @@ impl AccountsView {
cx.notify();
return;
}
- // DeepSeek doesn't require secret key
- if sk.is_empty() && !matches!(self.selected_provider, CloudProvider::DeepSeek) {
+ if sk.is_empty() && self.selected_source.needs_secret_key() {
self.error = Some("Please enter Secret Access Key".to_string());
cx.notify();
return;
@@ -177,7 +136,7 @@ impl AccountsView {
let account = CloudAccount {
id: Uuid::new_v4().to_string(),
name,
- provider: self.selected_provider,
+ source_id: self.selected_source.source_id(),
access_key_id: ak,
secret_access_key: sk,
region: if region.is_empty() {
@@ -218,77 +177,31 @@ impl AccountsView {
}
fn validate_account(&mut self, account: &CloudAccount, cx: &mut Context) {
+ let Some(descriptor) = account.descriptor() else {
+ self.error = Some(format!(
+ "Account {} uses an unknown billing source",
+ account.name
+ ));
+ self.success = None;
+ cx.notify();
+ return;
+ };
+
let account_name = account.name.clone();
- let access_key_id = account.access_key_id.clone();
- let secret_access_key = account.secret_access_key.clone();
- let account_id = account.id.clone();
- let provider = account.provider;
-
- // Set default region based on cloud provider
- let region = account.region.clone().unwrap_or_else(|| match provider {
- CloudProvider::AWS => "us-east-1".to_string(),
- CloudProvider::Aliyun => "cn-hangzhou".to_string(),
- CloudProvider::DeepSeek => String::new(),
- _ => "us-east-1".to_string(),
- });
+ let context = account.context(descriptor);
// Show validating status
self.success = Some(format!("Validating account {}...", account_name));
self.error = None;
cx.notify();
- let account_name_clone = account_name.clone();
-
// Use standard thread to handle sync HTTP requests
let (tx, rx) = std::sync::mpsc::channel::>();
std::thread::spawn(move || {
- use crate::cloud::CloudService;
-
- let result: Result = match provider {
- CloudProvider::AWS => {
- let service = crate::cloud::aws::AwsCloudService::new(
- account_id,
- account_name,
- access_key_id,
- secret_access_key,
- Some(region),
- );
- match service.validate_credentials() {
- Ok(valid) => Ok(valid),
- Err(e) => Err(e.to_string()),
- }
- }
- CloudProvider::Aliyun => {
- let service = crate::cloud::aliyun::AliyunCloudService::new(
- account_id,
- account_name,
- access_key_id,
- secret_access_key,
- Some(region),
- );
- match service.validate_credentials() {
- Ok(valid) => Ok(valid),
- Err(e) => Err(e.to_string()),
- }
- }
- CloudProvider::DeepSeek => {
- let service = crate::cloud::deepseek::DeepSeekService::new(
- account_id,
- account_name,
- access_key_id,
- secret_access_key,
- Some(region),
- );
- match service.validate_credentials() {
- Ok(valid) => Ok(valid),
- Err(e) => Err(e.to_string()),
- }
- }
-
- _ => Err("Unsupported cloud provider".to_string()),
- };
-
+ let result = (descriptor.build)(context)
+ .validate_credentials()
+ .map_err(|e| e.to_string());
let _ = tx.send(result);
});
@@ -305,17 +218,13 @@ impl AccountsView {
this.update(cx, |this, cx| {
match validation_result {
Ok(true) => {
- this.success = Some(format!(
- "Account {} validated successfully!",
- account_name_clone
- ));
+ this.success =
+ Some(format!("Account {} validated successfully!", account_name));
this.error = None;
}
Ok(false) => {
- this.error = Some(format!(
- "Account {} credentials invalid",
- account_name_clone
- ));
+ this.error =
+ Some(format!("Account {} credentials invalid", account_name));
this.success = None;
}
Err(e) => {
@@ -332,80 +241,35 @@ impl AccountsView {
.detach();
}
- fn render_provider_selector(&self, cx: &Context) -> impl IntoElement {
- let is_aws_selected = matches!(self.selected_provider, CloudProvider::AWS);
- let is_aliyun_selected = matches!(self.selected_provider, CloudProvider::Aliyun);
- let is_deepseek_selected = matches!(self.selected_provider, CloudProvider::DeepSeek);
-
+ fn render_source_selector(&self, cx: &Context) -> impl IntoElement {
div()
.h_flex()
.gap_2()
- .child(
- div()
- .px_4()
- .py_2()
- .rounded_md()
- .cursor_pointer()
- .when(is_aws_selected, |el| {
- el.bg(cx.theme().accent)
- .text_color(cx.theme().accent_foreground)
- })
- .when(!is_aws_selected, |el| {
- el.bg(cx.theme().muted)
- .text_color(cx.theme().muted_foreground)
- })
- .on_mouse_down(
- MouseButton::Left,
- cx.listener(|this, _, window, cx| {
- this.set_provider(CloudProvider::AWS, window, cx);
- }),
- )
- .child("AWS"),
- )
- .child(
- div()
- .px_4()
- .py_2()
- .rounded_md()
- .cursor_pointer()
- .when(is_aliyun_selected, |el| {
- el.bg(cx.theme().accent)
- .text_color(cx.theme().accent_foreground)
- })
- .when(!is_aliyun_selected, |el| {
- el.bg(cx.theme().muted)
- .text_color(cx.theme().muted_foreground)
- })
- .on_mouse_down(
- MouseButton::Left,
- cx.listener(|this, _, window, cx| {
- this.set_provider(CloudProvider::Aliyun, window, cx);
- }),
- )
- .child("Aliyun"),
- )
- .child(
+ .children(registry::all().iter().map(|source| {
+ let is_selected = source.id == self.selected_source.id;
+
div()
+ .id(SharedString::from(source.id))
.px_4()
.py_2()
.rounded_md()
.cursor_pointer()
- .when(is_deepseek_selected, |el| {
+ .when(is_selected, |el| {
el.bg(cx.theme().accent)
.text_color(cx.theme().accent_foreground)
})
- .when(!is_deepseek_selected, |el| {
+ .when(!is_selected, |el| {
el.bg(cx.theme().muted)
.text_color(cx.theme().muted_foreground)
})
.on_mouse_down(
MouseButton::Left,
- cx.listener(|this, _, window, cx| {
- this.set_provider(CloudProvider::DeepSeek, window, cx);
+ cx.listener(move |this, _, window, cx| {
+ this.set_source(source, window, cx);
}),
)
- .child("DeepSeek"),
- )
+ .child(source.short_name)
+ }))
}
fn render_header(&self, cx: &Context) -> impl IntoElement {
@@ -450,6 +314,7 @@ impl AccountsView {
fn render_account_row(&self, account: &CloudAccount, cx: &Context) -> impl IntoElement {
let account_id = account.id.clone();
let account_for_validate = account.clone();
+ let short_name = account.short_name();
div()
.w_full()
@@ -476,7 +341,7 @@ impl AccountsView {
.bg(cx.theme().accent.opacity(0.1))
.text_color(cx.theme().accent)
.text_center()
- .child(account.provider.short_name()),
+ .child(short_name),
)
.child(
div()
@@ -585,7 +450,7 @@ impl AccountsView {
.v_flex()
.gap_1()
.child(div().text_sm().child("Cloud Provider"))
- .child(self.render_provider_selector(cx)),
+ .child(self.render_source_selector(cx)),
)
.child(
div()
diff --git a/src/ui/dashboard.rs b/src/ui/dashboard.rs
index f74e709..031e156 100644
--- a/src/ui/dashboard.rs
+++ b/src/ui/dashboard.rs
@@ -73,7 +73,7 @@ impl DashboardView {
match crate::db::get_cached_cost_summary_with_account(
&account.id,
&account.name,
- &account.provider,
+ &account.source_id,
) {
Ok(Some(cached)) => {
summaries.push(cached);
@@ -83,93 +83,27 @@ impl DashboardView {
Err(_) => {}
}
- match account.provider {
- crate::cloud::CloudProvider::AWS => {
- let service = crate::cloud::aws::AwsCloudService::new(
- account.id.clone(),
- account.name.clone(),
- account.access_key_id.clone(),
- account.secret_access_key.clone(),
- account.region.clone(),
- );
-
- use crate::cloud::CloudService;
- match service.get_cost_summary() {
- Ok(summary) => {
- // Save to cache
- if let Err(e) = crate::db::save_cost_summary_cache(&summary)
- {
- tracing::warn!("Failed to save cost cache: {}", e);
- }
- summaries.push(summary);
- }
- Err(e) => {
- tracing::error!(
- "Failed to get cost for {}: {}",
- account.name,
- e
- );
- }
- }
- }
- crate::cloud::CloudProvider::Aliyun => {
- let service = crate::cloud::aliyun::AliyunCloudService::new(
- account.id.clone(),
- account.name.clone(),
- account.access_key_id.clone(),
- account.secret_access_key.clone(),
- account.region.clone(),
- );
+ let Some(descriptor) = account.descriptor() else {
+ continue;
+ };
+ let service = (descriptor.build)(account.context(descriptor));
- use crate::cloud::CloudService;
- match service.get_cost_summary() {
- Ok(summary) => {
- // Save to cache
- if let Err(e) = crate::db::save_cost_summary_cache(&summary)
- {
- tracing::warn!("Failed to save cost cache: {}", e);
- }
- summaries.push(summary);
- }
- Err(e) => {
- tracing::error!(
- "Failed to get Aliyun {} cost: {}",
- account.name,
- e
- );
- }
+ match service.get_cost_summary() {
+ Ok(summary) => {
+ // Save to cache
+ if let Err(e) = crate::db::save_cost_summary_cache(&summary) {
+ tracing::warn!("Failed to save cost cache: {}", e);
}
+ summaries.push(summary);
}
- crate::cloud::CloudProvider::DeepSeek => {
- let service = crate::cloud::deepseek::DeepSeekService::new(
- account.id.clone(),
- account.name.clone(),
- account.access_key_id.clone(),
- account.secret_access_key.clone(),
- account.region.clone(),
+ Err(e) => {
+ tracing::error!(
+ "Failed to get {} cost for {}: {}",
+ descriptor.short_name,
+ account.name,
+ e
);
-
- use crate::cloud::CloudService;
- match service.get_cost_summary() {
- Ok(summary) => {
- // Save to cache
- if let Err(e) = crate::db::save_cost_summary_cache(&summary)
- {
- tracing::warn!("Failed to save cost cache: {}", e);
- }
- summaries.push(summary);
- }
- Err(e) => {
- tracing::error!(
- "Failed to get DeepSeek {} balance: {}",
- account.name,
- e
- );
- }
- }
}
-
- _ => {}
}
}
let _ = tx.send(Ok(summaries));
@@ -319,13 +253,10 @@ impl DashboardView {
.mt_4()
.child("Cost Details by Account"),
)
- // Account cards for cost-type providers
+ // Sources that report a period cost
.child({
- let cost_summaries: Vec<&CostSummary> = self
- .summaries
- .iter()
- .filter(|s| !matches!(s.provider, crate::cloud::CloudProvider::DeepSeek))
- .collect();
+ let cost_summaries: Vec<&CostSummary> =
+ self.summaries.iter().filter(|s| !s.is_snapshot()).collect();
div().w_full().v_flex().gap_4().children(
cost_summaries
@@ -338,13 +269,10 @@ impl DashboardView {
}),
)
})
- // Balance section for providers that report balances (DeepSeek)
+ // Sources that report a point-in-time balance instead
.child({
- let balance_summaries: Vec<&CostSummary> = self
- .summaries
- .iter()
- .filter(|s| matches!(s.provider, crate::cloud::CloudProvider::DeepSeek))
- .collect();
+ let balance_summaries: Vec<&CostSummary> =
+ self.summaries.iter().filter(|s| s.is_snapshot()).collect();
if balance_summaries.is_empty() {
div()
@@ -483,7 +411,7 @@ impl DashboardView {
.rounded_md()
.bg(cx.theme().accent.opacity(0.1))
.text_color(cx.theme().accent)
- .child(summary.provider.short_name()),
+ .child(summary.short_name()),
),
)
// Cost overview
@@ -493,12 +421,11 @@ impl DashboardView {
.justify_between()
.child({
// Format per-account amount using account currency.
- let label =
- if matches!(summary.provider, crate::cloud::CloudProvider::DeepSeek) {
- "Balance"
- } else {
- "This Month"
- };
+ let label = if summary.is_snapshot() {
+ "Balance"
+ } else {
+ "This Month"
+ };
let symbol = match summary.currency.as_str() {
"CNY" => "¥",
@@ -681,21 +608,20 @@ impl DashboardView {
std::thread::spawn(move || {
use chrono::{Datelike, Duration, Utc};
- let now = Utc::now();
- // AWS: 30 days, Aliyun: 7 days (Aliyun requires per-day API calls which is slower)
- // DeepSeek: no trend data available
- let days = match account.provider {
- crate::cloud::CloudProvider::Aliyun => 7,
- crate::cloud::CloudProvider::DeepSeek => 0, // No trend data
- _ => 30,
+ let Some(descriptor) = account.descriptor() else {
+ let _ = tx.send(Err("Unknown billing source".to_string()));
+ return;
};
- // DeepSeek doesn't support trend data
- if matches!(account.provider, crate::cloud::CloudProvider::DeepSeek) {
- let _ = tx.send(Err("DeepSeek does not provide usage history".to_string()));
+ let Some(days) = descriptor.trend_window_days() else {
+ let _ = tx.send(Err(format!(
+ "{} does not provide usage history",
+ descriptor.display_name
+ )));
return;
- }
+ };
+ let now = Utc::now();
let start = now - Duration::days(days);
let start_date = format!("{}-{:02}-{:02}", start.year(), start.month(), start.day());
let end_date = format!("{}-{:02}-{:02}", now.year(), now.month(), now.day());
@@ -708,55 +634,20 @@ impl DashboardView {
return;
}
- match account.provider {
- crate::cloud::CloudProvider::AWS => {
- let service = crate::cloud::aws::AwsCloudService::new(
- account.id.clone(),
- account.name.clone(),
- account.access_key_id.clone(),
- account.secret_access_key.clone(),
- account.region.clone(),
- );
-
- use crate::cloud::CloudService;
- match service.get_cost_trend(&start_date, &end_date) {
- Ok(trend) => {
- // Save to cache
- if let Err(e) = crate::db::save_cost_trend_cache(&trend) {
- tracing::warn!("Failed to save trend cache: {}", e);
- }
- let _ = tx.send(Ok(trend));
- }
- Err(e) => {
- let _ = tx.send(Err(format!("Failed to get trend data: {}", e)));
- }
+ let service = (descriptor.build)(account.context(descriptor));
+ match service.get_cost_trend(&start_date, &end_date) {
+ Ok(trend) => {
+ // Save to cache
+ if let Err(e) = crate::db::save_cost_trend_cache(&trend) {
+ tracing::warn!("Failed to save trend cache: {}", e);
}
+ let _ = tx.send(Ok(trend));
}
- crate::cloud::CloudProvider::Aliyun => {
- let service = crate::cloud::aliyun::AliyunCloudService::new(
- account.id.clone(),
- account.name.clone(),
- account.access_key_id.clone(),
- account.secret_access_key.clone(),
- account.region.clone(),
- );
-
- use crate::cloud::CloudService;
- match service.get_cost_trend(&start_date, &end_date) {
- Ok(trend) => {
- // Save to cache
- if let Err(e) = crate::db::save_cost_trend_cache(&trend) {
- tracing::warn!("Failed to save trend cache: {}", e);
- }
- let _ = tx.send(Ok(trend));
- }
- Err(e) => {
- let _ = tx.send(Err(format!("Failed to get Aliyun trend data: {}", e)));
- }
- }
- }
- _ => {
- let _ = tx.send(Err("This cloud provider is not supported".to_string()));
+ Err(e) => {
+ let _ = tx.send(Err(format!(
+ "Failed to get {} trend data: {}",
+ descriptor.short_name, e
+ )));
}
}
});