Compare commits

..

4 Commits

Author SHA1 Message Date
charlesgauthereau e62de95827 chore(release): 1.1.5 2026-02-19 21:15:55 +01:00
Charles GTE fc3612fa3f Merge pull request #14 from Portabase/dev
fix: s3 provider port config.
2026-02-19 21:15:19 +01:00
charlesgauthereau 18fe211ad1 fix: s3 provider port config. 2026-02-19 21:14:35 +01:00
charlesgauthereau 74ada01232 chore: Cargo.lock 2026-02-19 16:10:37 +01:00
6 changed files with 16 additions and 17 deletions
+1 -1
View File
@@ -22,5 +22,5 @@ keywords:
- self-hosted
- portabase
license: Apache-2.0
version: 1.1.4
version: 1.1.5
date-released: "2026-02-19"
Generated
+1 -1
View File
@@ -2851,7 +2851,7 @@ dependencies = [
[[package]]
name = "portabase-agent"
version = "1.1.4-rc.1"
version = "1.1.4"
dependencies = [
"aes",
"aes-gcm",
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "portabase-agent"
version = "1.1.4"
version = "1.1.5"
edition = "2024"
[dependencies]
+1 -1
View File
@@ -16,7 +16,7 @@ services:
APP_ENV: development
LOG: debug
TZ: "Europe/Paris"
EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiNTVkODRlYjctMmJjMC00YTYzLThhNmMtZDM0YTkzNWRiMWVkIiwibWFzdGVyS2V5QjY0IjoiQlhWM1hvbEM2NTZTVjdkTmdjV1BHUWxrKytycExJNmxHRGk3Q1BCNWllbz0ifQ=="
EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiZjg4Y2E0MDMtNDgwOS00NGM4LTlkZjItY2VkNWYwYzhkNTM2IiwibWFzdGVyS2V5QjY0IjoiQlhWM1hvbEM2NTZTVjdkTmdjV1BHUWxrKytycExJNmxHRGk3Q1BCNWllbz0ifQ=="
#POOLING: 1
#DATABASES_CONFIG_FILE: "config.toml"
extra_hosts:
+11 -13
View File
@@ -32,7 +32,6 @@ impl StorageProvider for S3Provider {
storage: &DatabaseStorage,
encrypt: Option<bool>,
) -> UploadResult {
let Some(file_path) = result.backup_file else {
return UploadResult {
storage_id: storage.id.clone(),
@@ -59,13 +58,7 @@ impl StorageProvider for S3Provider {
let encrypt = encrypt.unwrap_or(false);
let upload = match build_stream(
&file_path,
encrypt,
&ctx.edge_key.master_key_b64,
)
.await
{
let upload = match build_stream(&file_path, encrypt, &ctx.edge_key.master_key_b64).await {
Ok(u) => u,
Err(e) => {
error!("Stream build failed: {}", e);
@@ -102,15 +95,20 @@ impl StorageProvider for S3Provider {
let region = Region::new(config.region.clone().unwrap_or("us-east-1".to_string()));
let scheme = if config.ssl { "https" } else { "http" };
let endpoint = match config.port {
Some(port) => format!("{scheme}://{}:{port}", config.end_point_url),
None => format!("{scheme}://{}", config.end_point_url),
};
info!("S3 endpoint to {}", &endpoint);
let sdk_config = s3::config::Builder::new()
.credentials_provider(credentials)
.region(region)
.force_path_style(true)
.endpoint_url(format!(
"{}://{}",
if config.ssl { "https" } else { "http" },
config.end_point_url
))
.endpoint_url(endpoint)
.behavior_version(BehaviorVersion::latest())
.build();
@@ -8,4 +8,5 @@ pub struct S3ProviderConfig {
pub end_point_url: String,
pub ssl: bool,
pub region: Option<String>,
pub port: Option<String>,
}