Merge #1152

1152: Add support for a CDN in front of crates/readmes r=carols10cents

This should hopefully allow us to configure a CDN on Heroku (namely CloudFront)
to distribute crates/readmes through.

Author: bors-voyager[bot]

src/config.rs

@@ -69,6 +69,7 @@ impl Default for Config {
                         env("S3_SECRET_KEY"),
                         &api_protocol,
                     ),
+                    cdn: env::var("S3_CDN").ok(),
                     proxy: None,
                 }
             }
@@ -89,6 +90,7 @@ impl Default for Config {
                         env::var("S3_SECRET_KEY").unwrap_or_default(),
                         &api_protocol,
                     ),
+                    cdn: env::var("S3_CDN").ok(),
                     proxy: None,
                 }
             }
@@ -108,6 +110,7 @@ impl Default for Config {
                             env::var("S3_SECRET_KEY").unwrap_or_default(),
                             &api_protocol,
                         ),
+                        cdn: env::var("S3_CDN").ok(),
                         proxy: None,
                     }
                 } else {

src/tests/all.rs

@@ -143,6 +143,7 @@ fn app() -> (
             &api_protocol,
         ),
         proxy: Some(proxy),
+        cdn: None,
     };
 
     let config = cargo_registry::Config {

src/uploaders.rs

@@ -20,6 +20,7 @@ pub enum Uploader {
     /// For test usage with a proxy.
     S3 {
         bucket: s3::Bucket,
+        cdn: Option<String>,
         proxy: Option<String>,
     },
 
@@ -45,11 +46,18 @@ impl Uploader {
     /// It returns `None` if the current `Uploader` is `NoOp`.
     pub fn crate_location(&self, crate_name: &str, version: &str) -> Option<String> {
         match *self {
-            Uploader::S3 { ref bucket, .. } => Some(format!(
-                "https://{}/{}",
-                bucket.host(),
-                Uploader::crate_path(crate_name, version)
-            )),
+            Uploader::S3 {
+                ref bucket,
+                ref cdn,
+                ..
+            } => {
+                let host = match *cdn {
+                    Some(ref s) => s.clone(),
+                    None => bucket.host(),
+                };
+                let path = Uploader::crate_path(crate_name, version);
+                Some(format!("https://{}/{}", host, path))
+            }
             Uploader::Local => Some(format!("/{}", Uploader::crate_path(crate_name, version))),
             Uploader::NoOp => None,
         }
@@ -61,11 +69,18 @@ impl Uploader {
     /// It returns `None` if the current `Uploader` is `NoOp`.
     pub fn readme_location(&self, crate_name: &str, version: &str) -> Option<String> {
         match *self {
-            Uploader::S3 { ref bucket, .. } => Some(format!(
-                "https://{}/{}",
-                bucket.host(),
-                Uploader::readme_path(crate_name, version)
-            )),
+            Uploader::S3 {
+                ref bucket,
+                ref cdn,
+                ..
+            } => {
+                let host = match *cdn {
+                    Some(ref s) => s.clone(),
+                    None => bucket.host(),
+                };
+                let path = Uploader::readme_path(crate_name, version);
+                Some(format!("https://{}/{}", host, path))
+            }
             Uploader::Local => Some(format!("/{}", Uploader::readme_path(crate_name, version))),
             Uploader::NoOp => None,
         }