tokens: correctly handle S3 tokens

Author: pietroalbini

src/errors.rs

@@ -16,6 +16,7 @@ error_chain! {
         ParseInt(::std::num::ParseIntError);
         Parse(::std::string::ParseError);
         RusotoTls(::rusoto_core::TlsError);
+        RusotoParseRegion(::rusoto_core::ParseRegionError);
         Rusqlite(::rusqlite::Error);
         R2D2(::r2d2::Error);
         Base64Decode(::base64::DecodeError);

src/server/reports.rs

@@ -18,7 +18,7 @@ fn generate_report(data: &Data, ex: &ExperimentData, results: &ResultsDB) -> Res
     let client = S3Client::new(
         default_tls_client()?,
         data.tokens.reports_bucket.clone(),
-        data.tokens.reports_bucket.region.clone(),
+        data.tokens.reports_bucket.region.to_region()?,
     );
     let dest = format!(
         "s3://{}/{}",
@@ -77,10 +77,11 @@ fn reports_thread(data: &Data, wakes: &mpsc::Receiver<()>) -> Result<()> {
             continue;
         }
 
-        let report_url = format!(
-            "{}/{}/{}/index.html",
-            data.tokens.reports_bucket.public_url, data.tokens.reports_bucket.bucket, name
-        );
+        let base_url = data.tokens
+            .reports_bucket
+            .public_url
+            .replace("{bucket}", &data.tokens.reports_bucket.bucket);
+        let report_url = format!("{}/{}/index.html", base_url, name);
 
         ex.set_status(&data.db, Status::Completed)?;
         info!("report for the experiment {} generated successfully!", name);

src/server/tokens.rs

@@ -8,6 +8,25 @@ use std::path::Path;
 
 static TOKENS_PATH: &'static str = "tokens.toml";
 
+#[derive(Debug, Clone, Deserialize)]
+#[serde(tag = "type", rename_all = "kebab-case")]
+pub enum BucketRegion {
+    S3 { region: String },
+    Custom { url: String },
+}
+
+impl BucketRegion {
+    pub fn to_region(&self) -> Result<Region> {
+        match *self {
+            BucketRegion::S3 { ref region } => Ok(region.parse()?),
+            BucketRegion::Custom { ref url } => Ok(Region::Custom {
+                name: "custom".to_string(),
+                endpoint: url.clone(),
+            }),
+        }
+    }
+}
+
 #[derive(Debug, Clone, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct BotTokens {
@@ -18,7 +37,7 @@ pub struct BotTokens {
 #[derive(Debug, Clone, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct ReportsBucket {
-    pub region: Region,
+    pub region: BucketRegion,
     pub bucket: String,
     pub public_url: String,
     pub access_key: String,
@@ -57,7 +76,9 @@ impl Default for Tokens {
                 api_token: String::new(),
             },
             reports_bucket: ReportsBucket {
-                region: "us-east-1".parse().unwrap(),
+                region: BucketRegion::S3 {
+                    region: "us-west-1".to_string(),
+                },
                 bucket: "crater-reports".into(),
                 public_url: String::new(),
                 access_key: String::new(),

tokens.example.toml

@@ -3,13 +3,22 @@ webhooks-secret = ""
 api-token = ""
 
 [reports-bucket]
-# This is configured by default to use the public minio playground
-# S3 can be changed by setting the region name (for example "us-east-1")
-region = ["custom", "https://play.minio.io:9000"]
 bucket = "crater-reports"
-public-url = "https://play.minio.io:9000"
+
+# Configuration for the minio playground
+# This requires no authentication (credentials are public) and it's great for
+# local testing, but it's purged every few days. You might have to recreate the
+# bucket manually if it was deleted.
+region = { type = "custom", url = "https://play.minio.io:9000" }
+public-url = "https://play.minio.io:9000/{bucket}"
 access-key = "Q3AM3UQ867SPQQA43P2F"
 secret-key = "zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG"
 
+# Configuration for production S3
+#region = { type = "s3", region = "us-west-1" }
+#public-url = "https://{bucket}.s3.amazonaws.com"
+#access-key = ""
+#secret-key = ""
+
 [agents]
 # "TOKEN" = "agent-name"