Print subdomain if name arg not provided to wrangler subdomain

src/commands/mod.rs

@@ -20,7 +20,8 @@ pub use publish::preview::preview;
 pub use publish::preview::HTTPMethod;
 pub use publish::publish;
 use regex::Regex;
-pub use subdomain::subdomain;
+pub use subdomain::get_subdomain;
+pub use subdomain::set_subdomain;
 pub use whoami::whoami;
 
 /// Run the given command and return its stdout.

src/commands/subdomain.rs

@@ -11,7 +11,7 @@ pub struct Subdomain {
 }
 
 impl Subdomain {
-    pub fn get(account_id: &str, user: &GlobalUser) -> Result<String, failure::Error> {
+    fn request(account_id: &str, user: &GlobalUser) -> Result<Response, failure::Error> {
         let addr = subdomain_addr(account_id);
 
         let client = http::auth_client(None, user);
@@ -27,12 +27,24 @@ impl Subdomain {
             )
         }
 
-        let res: Response = serde_json::from_str(&res.text()?)?;
+        Ok(serde_json::from_str(&res.text()?)?)
+    }
+
+    pub fn get(account_id: &str, user: &GlobalUser) -> Result<String, failure::Error> {
+        let res = Subdomain::request(account_id, user)?;
         Ok(res
             .result
             .expect("Oops! We expected a subdomain name, but found none.")
             .subdomain)
     }
+
+    pub fn get_as_option(
+        account_id: &str,
+        user: &GlobalUser,
+    ) -> Result<Option<String>, failure::Error> {
+        let res = Subdomain::request(account_id, user)?;
+        Ok(res.result.map(|r| r.subdomain))
+    }
 }
 
 #[derive(Deserialize)]
@@ -58,13 +70,11 @@ fn subdomain_addr(account_id: &str) -> String {
     )
 }
 
-pub fn subdomain(name: &str, user: &GlobalUser, target: &Target) -> Result<(), failure::Error> {
-    if target.account_id.is_empty() {
-        failure::bail!(format!(
-            "{} You must provide an account_id in your wrangler.toml before creating a subdomain!",
-            emoji::WARN
-        ))
-    }
+fn register_subdomain(
+    name: &str,
+    user: &GlobalUser,
+    target: &Target,
+) -> Result<(), failure::Error> {
     let msg = format!(
         "Registering your subdomain, {}.workers.dev, this could take up to a minute.",
         name
@@ -126,6 +136,37 @@ pub fn subdomain(name: &str, user: &GlobalUser, target: &Target) -> Result<(), f
     Ok(())
 }
 
+pub fn set_subdomain(name: &str, user: &GlobalUser, target: &Target) -> Result<(), failure::Error> {
+    if target.account_id.is_empty() {
+        failure::bail!(format!(
+            "{} You must provide an account_id in your wrangler.toml before creating a subdomain!",
+            emoji::WARN
+        ))
+    }
+    let subdomain = Subdomain::get_as_option(&target.account_id, user)?;
+    if let Some(subdomain) = subdomain {
+        let msg = format!("This account already has a registered subdomain. You can only register one subdomain per account. Your subdomain is {}.workers.dev", subdomain);
+        message::user_error(&msg);
+        Ok(())
+    } else {
+        register_subdomain(&name, &user, &target)
+    }
+}
+
+pub fn get_subdomain(user: &GlobalUser, target: &Target) -> Result<(), failure::Error> {
+    let subdomain = Subdomain::get_as_option(&target.account_id, user)?;
+    if let Some(subdomain) = subdomain {
+        let msg = format!("{}.workers.dev", subdomain);
+        message::info(&msg);
+        Ok(())
+    } else {
+        let msg =
+            format!("No subdomain registered. Use `wrangler subdomain <name>` to register one.");
+        message::user_error(&msg);
+        Ok(())
+    }
+}
+
 fn already_has_subdomain(errors: Vec<Error>) -> bool {
     for error in errors {
         if error.code == 10036 {

src/main.rs

@@ -373,8 +373,7 @@ fn run() -> Result<(), failure::Error> {
                 .arg(
                     Arg::with_name("name")
                         .help("the subdomain on workers.dev you'd like to reserve")
-                        .index(1)
-                        .required(true),
+                        .index(1),
                 ),
         )
         .subcommand(SubCommand::with_name("whoami").about(&*format!(
@@ -498,11 +497,13 @@ fn run() -> Result<(), failure::Error> {
         info!("Getting User settings");
         let user = settings::global_user::GlobalUser::new()?;
 
-        let name = matches
-            .value_of("name")
-            .expect("The subdomain name you are requesting must be provided.");
+        let name = matches.value_of("name");
 
-        commands::subdomain(name, &user, &target)?;
+        if let Some(name) = name {
+            commands::subdomain::set_subdomain(&name, &user, &target)?;
+        } else {
+            commands::subdomain::get_subdomain(&user, &target)?;
+        }
     } else if let Some(kv_matches) = matches.subcommand_matches("kv:namespace") {
         let manifest = settings::target::Manifest::new(config_path)?;
         let user = settings::global_user::GlobalUser::new()?;