Add config option to switch usage model to unbound

src/commands/kv/mod.rs

@@ -125,6 +125,7 @@ mod tests {
             site: None,
             vars: None,
             text_blobs: None,
+            usage_model: None,
         };
         assert!(kv::get_namespace_id(&target_with_dup_kv_bindings, "").is_err());
     }

src/settings/toml/manifest.rs

@@ -9,6 +9,7 @@ use config::{Config, File};
 use serde::{Deserialize, Serialize};
 use serde_with::rust::string_empty_as_none;
 
+use super::UsageModel;
 use crate::commands::{validate_worker_name, whoami, DEFAULT_CONFIG_PATH};
 use crate::deploy::{self, DeployTarget, DeploymentSet};
 use crate::settings::toml::dev::Dev;
@@ -51,6 +52,8 @@ pub struct Manifest {
     pub vars: Option<HashMap<String, String>>,
     pub text_blobs: Option<HashMap<String, PathBuf>>,
     pub triggers: Option<Triggers>,
+    #[serde(default, with = "string_empty_as_none")]
+    pub usage_model: Option<UsageModel>,
 }
 
 impl Manifest {
@@ -297,6 +300,7 @@ impl Manifest {
             site: self.site.clone(), // Inherited
             vars: self.vars.clone(), // Not inherited
             text_blobs: self.text_blobs.clone(), // Inherited
+            usage_model: self.usage_model, // Top level
         };
 
         let environment = self.get_environment(environment_name)?;

src/settings/toml/mod.rs

@@ -8,6 +8,9 @@ mod target;
 mod target_type;
 mod triggers;
 
+use serde::{Deserialize, Serialize};
+use std::str::FromStr;
+
 pub use environment::Environment;
 pub use kv_namespace::{ConfigKvNamespace, KvNamespace};
 pub use manifest::Manifest;
@@ -16,5 +19,33 @@ pub use site::Site;
 pub use target::Target;
 pub use target_type::TargetType;
 
+#[derive(Serialize, Deserialize, Clone, Copy, Debug, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum UsageModel {
+    Bundled,
+    Unbound,
+}
+
+impl FromStr for UsageModel {
+    type Err = failure::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "bundled" => Ok(UsageModel::Bundled),
+            "unbound" => Ok(UsageModel::Unbound),
+            _ => failure::bail!("Invalid usage model; must be either \"bundled\" or \"unbound\""),
+        }
+    }
+}
+
+impl AsRef<str> for UsageModel {
+    fn as_ref(&self) -> &str {
+        match self {
+            UsageModel::Bundled => "bundled",
+            UsageModel::Unbound => "unbound",
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests;

src/settings/toml/target.rs

@@ -1,6 +1,7 @@
 use super::kv_namespace::KvNamespace;
 use super::site::Site;
 use super::target_type::TargetType;
+use super::UsageModel;
 
 use std::collections::HashMap;
 use std::env;
@@ -17,6 +18,7 @@ pub struct Target {
     pub site: Option<Site>,
     pub vars: Option<HashMap<String, String>>,
     pub text_blobs: Option<HashMap<String, PathBuf>>,
+    pub usage_model: Option<UsageModel>,
 }
 
 impl Target {

src/sites/mod.rs

@@ -320,6 +320,7 @@ mod tests {
             site: Some(site),
             vars: None,
             text_blobs: None,
+            usage_model: None,
         }
     }
 

src/upload/mod.rs

@@ -33,6 +33,27 @@ pub fn script(
         failure::bail!(error_msg(res_status, res_text))
     }
 
+    if let Some(usage_model) = target.usage_model {
+        let addr = format!(
+            "https://api.cloudflare.com/client/v4/accounts/{}/workers/scripts/{}/usage-model",
+            target.account_id, target.name,
+        );
+
+        let res = client
+            .put(&addr)
+            .json(&serde_json::json!({
+                "usage_model": usage_model.as_ref()
+            }))
+            .send()?;
+
+        let res_status = res.status();
+
+        if !res_status.is_success() {
+            let res_text = res.text()?;
+            failure::bail!(error_msg(res_status, res_text))
+        }
+    }
+
     Ok(())
 }
 
@@ -41,6 +62,8 @@ fn error_msg(status: reqwest::StatusCode, text: String) -> String {
         "You need to verify your account's email address before you can publish. You can do this by checking your email or logging in to https://dash.cloudflare.com.".to_string()
     } else if text.contains("\"code\":10000,") {
         "Your user configuration is invalid, please run wrangler login or wrangler config and enter a new set of credentials.".to_string()
+    } else if text.contains("\"code\":10075,") {
+        "Setting a Usage Model requires a Paid plan with Unbound enabled. You can do this in the dash by logging in to https://dash.cloudflare.com/?account=workers/plans".to_string()
     } else {
         format!("Something went wrong! Status: {}, Details {}", status, text)
     }