refactor: Support deno serve TLS with new CLI parser

Updates PR for changes introduced in #35343

Author: adamgreg

libs/cli_parser/src/convert.rs

@@ -123,7 +123,7 @@ pub fn convert(result: ParseResult) -> Result<Flags, CliError> {
   match result.subcommand.as_deref() {
     Some("run") => run_parse(&result, &mut flags, false)?,
     Some("watch") => run_parse(&result, &mut flags, true)?,
-    Some("serve") => serve_parse(&result, &mut flags),
+    Some("serve") => serve_parse(&result, &mut flags)?,
     Some("eval") => eval_parse(&result, &mut flags),
     Some("fmt") => fmt_parse(&result, &mut flags),
     Some("lint") => lint_parse(&result, &mut flags),
@@ -1379,7 +1379,10 @@ fn run_parse(
   Ok(())
 }
 
-fn serve_parse(result: &ParseResult, flags: &mut Flags) {
+fn serve_parse(
+  result: &ParseResult,
+  flags: &mut Flags,
+) -> Result<(), CliError> {
   let port = result
     .get_one("port")
     .and_then(|s| s.parse::<u16>().ok())
@@ -1393,6 +1396,14 @@ fn serve_parse(result: &ParseResult, flags: &mut Flags) {
   flags.code_cache_enabled = !result.get_bool("no-code-cache");
   flags.tunnel = result.get_bool("tunnel");
 
+  let tls_cert = result.get_one("tls-cert");
+  let tls_key = result.get_one("tls-key");
+
+  let tls_cert_and_key = match (tls_cert, tls_key) {
+    (Some(cert), Some(key)) => Some((cert.to_owned(), key.to_owned())),
+    _ => None,
+  };
+
   let script = result
     .get_one("script_arg")
     .map(|s| s.to_string())
@@ -1408,10 +1419,11 @@ fn serve_parse(result: &ParseResult, flags: &mut Flags) {
     script,
     port,
     host,
-    tls_cert_and_key: None,
+    tls_cert_and_key,
     parallel,
     open_site: result.get_bool("open"),
   });
+  Ok(())
 }
 
 fn eval_parse(result: &ParseResult, flags: &mut Flags) {

libs/cli_parser/src/defs.rs

@@ -589,6 +589,18 @@ pub static SERVE_SUBCOMMAND: CommandDef = CommandDef {
       .long("host")
       .action(ArgAction::Set)
       .num_args(NumArgs::Exact(1)),
+    ArgDef::new("tls-cert")
+      .long("tls-cert")
+      .action(ArgAction::Set)
+      .num_args(NumArgs::Exact(1))
+      .requires(&["tls-key"])
+      .help("Load TLS certificate from PEM encoded file"),
+    ArgDef::new("tls-key")
+      .long("tls-key")
+      .action(ArgAction::Set)
+      .num_args(NumArgs::Exact(1))
+      .requires(&["tls-cert"])
+      .help("Load TLS private key from PEM encoded file"),
     ArgDef::new("open").long("open").set_true(),
     ArgDef::new("tunnel")
       .short('t')

libs/cli_parser/src/tests.rs

@@ -593,6 +593,16 @@ const SERVE_ARGS: &[ArgDef] = &[
     .action(ArgAction::Set)
     .num_args(NumArgs::Exact(1))
     .default_value("0.0.0.0"),
+  ArgDef::new("tls-cert")
+    .long("tls-cert")
+    .action(ArgAction::Set)
+    .num_args(NumArgs::Exact(1))
+    .requires(&["tls-key"]),
+  ArgDef::new("tls-key")
+    .long("tls-key")
+    .action(ArgAction::Set)
+    .num_args(NumArgs::Exact(1))
+    .requires(&["tls-cert"]),
   ArgDef::new("parallel").long("parallel").set_true(),
   ArgDef::new("watch")
     .long("watch")
@@ -1293,6 +1303,41 @@ fn serve_with_permissions() {
   assert_eq!(r.get_one("port"), Some("8080"));
 }
 
+#[test]
+fn serve_with_tls() {
+  let r = parse(
+    &TEST_ROOT,
+    &svec![
+      "deno",
+      "serve",
+      "--tls-cert",
+      "cert.pem",
+      "--tls-key",
+      "cert.key",
+      "server.ts"
+    ],
+  )
+  .unwrap();
+  assert_eq!(r.get_one("tls-cert"), Some("cert.pem"));
+  assert_eq!(r.get_one("tls-key"), Some("cert.key"));
+
+  let err = parse(
+    &TEST_ROOT,
+    &svec!["deno", "serve", "--tls-cert", "cert.pem", "server.ts"],
+  )
+  .unwrap_err();
+  assert_eq!(err.kind, CliErrorKind::MissingRequired);
+  assert!(err.message.contains("--tls-key"));
+
+  let err = parse(
+    &TEST_ROOT,
+    &svec!["deno", "serve", "--tls-key", "cert.key", "server.ts"],
+  )
+  .unwrap_err();
+  assert_eq!(err.kind, CliErrorKind::MissingRequired);
+  assert!(err.message.contains("--tls-cert"));
+}
+
 #[test]
 fn run_inspect() {
   let r =

libs/cli_parser/src/tests_full.rs

@@ -717,6 +717,39 @@ fn serve_flags() {
       ..Flags::default()
     }
   );
+  let r = flags_from_vec(svec![
+    "deno",
+    "serve",
+    "--tls-cert",
+    "cert.pem",
+    "--tls-key",
+    "cert.key",
+    "main.ts"
+  ]);
+  assert_eq!(
+    r.unwrap(),
+    Flags {
+      subcommand: DenoSubcommand::Serve(ServeFlags {
+        tls_cert_and_key: Some((
+          "cert.pem".to_string(),
+          "cert.key".to_string()
+        )),
+        ..ServeFlags::new_default("main.ts".to_string(), 8000, "0.0.0.0")
+      }),
+      permissions: PermissionFlags {
+        allow_net: None,
+        ..Default::default()
+      },
+      code_cache_enabled: true,
+      ..Flags::default()
+    }
+  );
+  let r =
+    flags_from_vec(svec!["deno", "serve", "--tls-cert", "cert.pem", "main.ts"]);
+  assert!(r.is_err());
+  let r =
+    flags_from_vec(svec!["deno", "serve", "--tls-key", "cert.key", "main.ts"]);
+  assert!(r.is_err());
 }
 
 #[test]