Merge pull request #121 from modrinth/fix-description-cache

Fix description cache
This commit is contained in:
Geometrically
2020-12-31 10:58:40 -07:00
committed by GitHub
4 changed files with 31 additions and 2 deletions

1
.env
View File

@@ -23,6 +23,7 @@ S3_SECRET=none
S3_URL=none
S3_REGION=none
S3_BUCKET_NAME=none
S3_PROVIDER=none
# 1 hour
LOCAL_INDEX_INTERVAL=3600

View File

@@ -76,7 +76,7 @@ impl FileHost for BackblazeHost {
}
}
#[cfg(test)]
/*#[cfg(test)]
mod tests {
use super::*;
use authorization::*;
@@ -132,4 +132,4 @@ mod tests {
.await
.unwrap();
}
}
}*/

View File

@@ -49,6 +49,33 @@ impl FileHost for S3Host {
)
.await?;
let provider = &*dotenv::var("S3_PROVIDER").unwrap();
if provider == "do" {
reqwest::Client::new()
.delete(&*format!(
"https://api.digitalocean.com/v2/cdn/endpoints/{}/cache",
self.bucket.name
))
.header(reqwest::header::CONTENT_TYPE, "application/json")
.header(
reqwest::header::AUTHORIZATION,
self.bucket
.credentials
.secret_key
.clone()
.unwrap_or_else(|| "".to_string()),
)
.body(
serde_json::json!({
"files": vec![file_name],
})
.to_string(),
)
.send()
.await?;
}
Ok(UploadFileData {
file_id: file_name.to_string(),
file_name: file_name.to_string(),

View File

@@ -334,6 +334,7 @@ fn check_env_vars() -> bool {
failed |= check_var::<String>("S3_URL");
failed |= check_var::<String>("S3_REGION");
failed |= check_var::<String>("S3_BUCKET_NAME");
failed |= check_var::<String>("S3_PROVIDER");
} else if storage_backend.as_deref() == Some("local") {
failed |= check_var::<String>("MOCK_FILE_PATH");
} else if let Some(backend) = storage_backend {