Upload all content to s3 as public and immutable

Author: jtescher

src/s3/lib.rs

@@ -45,6 +45,7 @@ impl Bucket {
         content: R,
         content_length: u64,
         content_type: &str,
+        cache_control: &str,
     ) -> reqwest::Result<reqwest::Response> {
         let path = if path.starts_with('/') {
             &path[1..]
@@ -59,6 +60,7 @@ impl Bucket {
             .put(&url)
             .header(header::AUTHORIZATION, auth)
             .header(header::CONTENT_TYPE, content_type)
+            .header(header::CACHE_CONTROL, cache_control)
             .header(header::DATE, date)
             .body(reqwest::Body::sized(content, content_length))
             .send()?

src/tests/record.rs

@@ -272,7 +272,7 @@ fn replay_http(
     mut exchange: Exchange,
     stdout: &mut dyn Write,
 ) -> Box<dyn Future<Item = hyper::Response<hyper::Body>, Error = hyper::Error> + Send> {
-    static IGNORED_HEADERS: &[&str] = &["authorization", "date", "user-agent"];
+    static IGNORED_HEADERS: &[&str] = &["authorization", "date", "user-agent", "cache-control"];
 
     assert_eq!(req.uri().to_string(), exchange.request.uri);
     assert_eq!(req.method().to_string(), exchange.request.method);

src/uploaders.rs

@@ -13,6 +13,8 @@ use std::sync::Arc;
 use crate::middleware::app::RequestApp;
 use crate::models::Crate;
 
+const CACHE_CONTROL_PUBLIC_IMMUTABLE: &str = "public,max-age=31536000,immutable";
+
 #[derive(Clone, Debug)]
 pub enum Uploader {
     /// For production usage, uploads and redirects to s3.
@@ -95,7 +97,14 @@ impl Uploader {
         match *self {
             Uploader::S3 { ref bucket, .. } => {
                 bucket
-                    .put(client, path, content, content_length, content_type)
+                    .put(
+                        client,
+                        path,
+                        content,
+                        content_length,
+                        content_type,
+                        CACHE_CONTROL_PUBLIC_IMMUTABLE,
+                    )
                     .map_err(|e| internal(&format_args!("failed to upload to S3: {}", e)))?;
                 Ok(Some(String::from(path)))
             }