Provide helpful error when user accidentally puts kv-namespace inform…

…ation under [site] (#937)

* Provide helpful error when user accidentally puts kv-namespace information under [site]

* improve error messaging

Cargo.toml

@@ -25,7 +25,7 @@ openssl = { version = '0.10.11', optional = true }
 reqwest = "0.9.18"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.39"
-toml = "0.5.0"
+toml = "0.5.5"
 uuid = "0.7"
 which = "2.0.1"
 rand = "0.6.5"

src/settings/toml/manifest.rs

@@ -36,6 +36,8 @@ pub struct Manifest {
     pub zone_id: Option<String>,
     pub webpack_config: Option<String>,
     pub private: Option<bool>,
+    // TODO: maybe one day, serde toml support will allow us to serialize sites
+    // as a TOML inline table (this would prevent confusion with environments too!)
     pub site: Option<Site>,
     #[serde(rename = "kv-namespaces")]
     pub kv_namespaces: Option<Vec<KvNamespace>>,
@@ -46,7 +48,16 @@ impl Manifest {
     pub fn new(config_path: &Path) -> Result<Self, failure::Error> {
         let config = read_config(config_path)?;
 
-        let manifest: Manifest = config.try_into()?;
+        let manifest: Manifest = match config.try_into() {
+            Ok(m) => m,
+            Err(e) => {
+                if e.to_string().contains("unknown field `kv-namespaces`") {
+                    failure::bail!("kv-namespaces should not live under the [site] table in wrangler.toml; please move it above [site].")
+                } else {
+                    failure::bail!(e)
+                }
+            }
+        };
 
         check_for_duplicate_names(&manifest)?;
 

src/settings/toml/site.rs

@@ -9,6 +9,7 @@ use crate::commands::generate::run_generate;
 const SITE_ENTRY_POINT: &str = "workers-site";
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(deny_unknown_fields)]
 pub struct Site {
     pub bucket: PathBuf,
     #[serde(rename = "entry-point")]