Change version downloads archive location to static S3 bucket

src/bin/background-worker.rs

@@ -19,7 +19,6 @@ use crates_io::db::make_manager_config;
 use crates_io::fastly::Fastly;
 use crates_io::storage::Storage;
 use crates_io::team_repo::TeamRepoImpl;
-use crates_io::worker::jobs::ArchiveVersionDownloads;
 use crates_io::worker::{Environment, RunnerExt};
 use crates_io::{config, Emails};
 use crates_io::{db, ssh};
@@ -28,6 +27,8 @@ use crates_io_index::RepositoryConfig;
 use crates_io_worker::Runner;
 use diesel_async::pooled_connection::deadpool::Pool;
 use diesel_async::pooled_connection::AsyncDieselConnectionManager;
+use object_store::prefix::PrefixStore;
+use object_store::ObjectStore;
 use reqwest::Client;
 use secrecy::ExposeSecret;
 use std::sync::Arc;
@@ -71,7 +72,9 @@ fn main() -> anyhow::Result<()> {
 
     let cloudfront = CloudFront::from_environment();
     let storage = Arc::new(Storage::from_config(&config.storage));
-    let downloads_archive_store = ArchiveVersionDownloads::store_from_environment()?;
+
+    let downloads_archive_store = PrefixStore::new(storage.as_inner(), "archive/version-downloads");
+    let downloads_archive_store: Box<dyn ObjectStore> = Box::new(downloads_archive_store);
 
     let client = Client::builder()
         .timeout(Duration::from_secs(45))
@@ -92,7 +95,7 @@ fn main() -> anyhow::Result<()> {
         .cloudfront(cloudfront)
         .fastly(fastly)
         .storage(storage)
-        .downloads_archive_store(downloads_archive_store)
+        .downloads_archive_store(Some(downloads_archive_store))
         .deadpool(deadpool.clone())
         .emails(emails)
         .team_repo(Box::new(team_repo))

src/storage.rs

@@ -325,8 +325,8 @@ impl Storage {
     }
 
     /// This should only be used for assertions in the test suite!
-    pub fn as_inner(&self) -> &dyn ObjectStore {
-        &self.store
+    pub fn as_inner(&self) -> Arc<dyn ObjectStore> {
+        self.store.clone()
     }
 
     async fn delete_all_with_prefix(&self, prefix: &Path) -> Result<()> {

src/worker/jobs/archive_version_downloads.rs

@@ -4,15 +4,13 @@ use crate::util::diesel::Conn;
 use crate::worker::Environment;
 use anyhow::{anyhow, Context};
 use chrono::{NaiveDate, Utc};
-use crates_io_env_vars::var;
 use crates_io_worker::BackgroundJob;
 use diesel::prelude::*;
 use diesel::{ExpressionMethods, RunQueryDsl};
 use diesel_async::async_connection_wrapper::AsyncConnectionWrapper;
 use diesel_async::pooled_connection::deadpool::Pool;
 use diesel_async::AsyncPgConnection;
 use futures_util::StreamExt;
-use object_store::aws::AmazonS3Builder;
 use object_store::ObjectStore;
 use secrecy::{ExposeSecret, SecretString};
 use std::collections::btree_map::Entry;
@@ -40,31 +38,6 @@ impl ArchiveVersionDownloads {
     pub fn before(before: NaiveDate) -> Self {
         Self { before }
     }
-
-    pub fn store_from_environment() -> anyhow::Result<Option<Box<dyn ObjectStore>>> {
-        let Some(region) = var("DOWNLOADS_ARCHIVE_REGION")? else {
-            return Ok(None);
-        };
-        let Some(bucket) = var("DOWNLOADS_ARCHIVE_BUCKET")? else {
-            return Ok(None);
-        };
-        let Some(access_key) = var("DOWNLOADS_ARCHIVE_ACCESS_KEY")? else {
-            return Ok(None);
-        };
-        let Some(secret_key) = var("DOWNLOADS_ARCHIVE_SECRET_KEY")? else {
-            return Ok(None);
-        };
-
-        let store = AmazonS3Builder::new()
-            .with_region(region)
-            .with_bucket_name(bucket)
-            .with_access_key_id(access_key)
-            .with_secret_access_key(secret_key)
-            .build()
-            .context("Failed to initialize S3 code")?;
-
-        Ok(Some(Box::new(store)))
-    }
 }
 
 impl Default for ArchiveVersionDownloads {