Page MenuHomePhabricator

D13641.diff
No OneTemporary

D13641.diff

diff --git a/services/identity/src/config.rs b/services/identity/src/config.rs
--- a/services/identity/src/config.rs
+++ b/services/identity/src/config.rs
@@ -10,10 +10,11 @@
use crate::constants::{
cors::ALLOW_ORIGIN_LIST, cors::PROD_ORIGIN_HOST_STR, BACKUP_SERVICE_URL,
- DEFAULT_BACKUP_SERVICE_URL, DEFAULT_OPENSEARCH_ENDPOINT,
- DEFAULT_TUNNELBROKER_ENDPOINT, KEYSERVER_PUBLIC_KEY, LOCALSTACK_ENDPOINT,
- OPAQUE_SERVER_SETUP, OPENSEARCH_ENDPOINT, REDACT_SENSITIVE_DATA,
- SECRETS_DIRECTORY, SECRETS_SETUP_FILE, TUNNELBROKER_GRPC_ENDPOINT,
+ BLOB_SERVICE_URL, DEFAULT_BACKUP_SERVICE_URL, DEFAULT_BLOB_SERVICE_URL,
+ DEFAULT_OPENSEARCH_ENDPOINT, DEFAULT_TUNNELBROKER_ENDPOINT,
+ KEYSERVER_PUBLIC_KEY, LOCALSTACK_ENDPOINT, OPAQUE_SERVER_SETUP,
+ OPENSEARCH_ENDPOINT, REDACT_SENSITIVE_DATA, SECRETS_DIRECTORY,
+ SECRETS_SETUP_FILE, TUNNELBROKER_GRPC_ENDPOINT,
};
/// Raw CLI arguments, should be only used internally to create ServerConfig
@@ -70,6 +71,11 @@
#[arg(env = BACKUP_SERVICE_URL)]
#[arg(long, default_value = DEFAULT_BACKUP_SERVICE_URL)]
backup_service_url: reqwest::Url,
+
+ /// Blob service URL
+ #[arg(env = BLOB_SERVICE_URL)]
+ #[arg(long, default_value = DEFAULT_BLOB_SERVICE_URL)]
+ blob_service_url: reqwest::Url,
}
#[derive(Subcommand)]
@@ -94,6 +100,7 @@
pub keyserver_public_key: Option<String>,
pub tunnelbroker_endpoint: String,
pub backup_service_url: reqwest::Url,
+ pub blob_service_url: reqwest::Url,
pub opensearch_endpoint: String,
pub allow_origin: Option<AllowOrigin>,
pub redact_sensitive_data: bool,
@@ -128,6 +135,7 @@
localstack_endpoint: cli.localstack_endpoint.clone(),
tunnelbroker_endpoint: cli.tunnelbroker_endpoint.clone(),
backup_service_url: cli.backup_service_url.clone(),
+ blob_service_url: cli.blob_service_url.clone(),
opensearch_endpoint: cli.opensearch_endpoint.clone(),
server_setup,
keyserver_public_key,
diff --git a/services/identity/src/constants.rs b/services/identity/src/constants.rs
--- a/services/identity/src/constants.rs
+++ b/services/identity/src/constants.rs
@@ -285,6 +285,10 @@
pub const BACKUP_SERVICE_URL: &str = "BACKUP_SERVICE_URL";
pub const DEFAULT_BACKUP_SERVICE_URL: &str = "http://localhost:50052";
+// Blob
+pub const BLOB_SERVICE_URL: &str = "BLOB_SERVICE_URL";
+pub const DEFAULT_BLOB_SERVICE_URL: &str = "http://localhost:50053";
+
// X3DH key management
// Threshold for requesting more one_time keys

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 10, 3:08 AM (10 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2269797
Default Alt Text
D13641.diff (2 KB)

Event Timeline