validate account id existence

cloudflare · Jun 26, 2020 · 9360438 · 9360438
1 parent 08c4944
commit 9360438
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 48 deletions.
diff --git a/src/settings/toml/manifest.rs b/src/settings/toml/manifest.rs
@@ -179,12 +179,21 @@ impl Manifest {
 
     pub fn get_account_id(&self, environment_name: Option<&str>) -> Result<String, failure::Error> {
         let environment = self.get_environment(environment_name)?;
+        let mut result = self.account_id.to_string();
         if let Some(environment) = environment {
             if let Some(account_id) = &environment.account_id {
-                return Ok(account_id.to_string());
+                result = account_id.to_string();
             }
         }
-        Ok(self.account_id.to_string())
+        if result.is_empty() {
+            let mut msg = "Your wrangler.toml is missing an account_id field".to_string();
+            if let Some(environment_name) = environment_name {
+                msg.push_str(&format!("in [env.{}]", environment_name));
+            }
+            failure::bail!("{}", &msg)
+        } else {
+            Ok(result)
+        }
     }
 
     pub fn get_target(

diff --git a/tests/namespace.rs b/tests/namespace.rs