enable virtual host style for s3 backend via environment variable

mozilla · Oct 20, 2024 · 8211e63 · 8211e63
1 parent 2932b22
commit 8211e63
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/cache/cache.rs b/src/cache/cache.rs
@@ -685,6 +685,7 @@ pub fn storage_from_config(
                     c.endpoint.as_deref(),
                     c.use_ssl,
                     c.server_side_encryption,
+                    c.use_virtual_host_style
                 )
                 .map_err(|err| anyhow!("create s3 cache failed: {err:?}"))?;
 

diff --git a/src/cache/s3.rs b/src/cache/s3.rs
@@ -29,12 +29,17 @@ impl S3Cache {
         endpoint: Option<&str>,
         use_ssl: Option<bool>,
         server_side_encryption: Option<bool>,
+        use_virtual_host_style: Option<bool>,
     ) -> Result<Operator> {
         let mut builder = S3::default()
             .http_client(set_user_agent())
             .bucket(bucket)
             .root(key_prefix);
 
+        if use_virtual_host_style.unwrap_or_default() {
+            builder = builder.enable_virtual_host_style();
+        }
+
         if let Some(region) = region {
             builder = builder.region(region);
         }

diff --git a/src/config.rs b/src/config.rs
@@ -315,6 +315,8 @@ pub struct S3CacheConfig {
     pub endpoint: Option<String>,
     pub use_ssl: Option<bool>,
     pub server_side_encryption: Option<bool>,
+    pub use_virtual_host_style: Option<bool>
+
 }
 
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
@@ -640,6 +642,7 @@ fn config_from_env() -> Result<EnvConfig> {
         let server_side_encryption = bool_from_env_var("SCCACHE_S3_SERVER_SIDE_ENCRYPTION")?;
         let endpoint = env::var("SCCACHE_ENDPOINT").ok();
         let key_prefix = key_prefix_from_env_var("SCCACHE_S3_KEY_PREFIX");
+        let use_virtual_host_style = bool_from_env_var("SCCACHE_S3_ENABLE_VIRTUAL_HOST_STYLE")?;
 
         Some(S3CacheConfig {
             bucket,
@@ -649,6 +652,7 @@ fn config_from_env() -> Result<EnvConfig> {
             endpoint,
             use_ssl,
             server_side_encryption,
+            use_virtual_host_style
         })
     } else {
         None
@@ -1544,7 +1548,8 @@ no_credentials = true
                     use_ssl: Some(true),
                     key_prefix: "s3prefix".into(),
                     no_credentials: true,
-                    server_side_encryption: Some(false)
+                    server_side_encryption: Some(false),
+                    use_virtual_host_style: Some(false)
                 }),
                 webdav: Some(WebdavCacheConfig {
                     endpoint: "http://127.0.0.1:8080".to_string(),