From 7e6a25818666f28d8cfad4032a6a6fb799c5110a Mon Sep 17 00:00:00 2001
From: nate nowack <thrast36@gmail.com>
Date: Sat, 23 Mar 2024 15:54:34 -0500
Subject: [PATCH] handle new `typer.Option` behavior (#12398)

---
 src/prefect/cli/deploy.py     | 2 +-
 src/prefect/cli/deployment.py | 6 +++---
 tests/cli/test_agent.py       | 8 ++++----
 tests/cli/test_worker.py      | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/prefect/cli/deploy.py b/src/prefect/cli/deploy.py
index e63ae9d77104..2fd2d66fc29c 100644
--- a/src/prefect/cli/deploy.py
+++ b/src/prefect/cli/deploy.py
@@ -271,7 +271,7 @@ async def deploy(
             prefect_file=prefect_file, ci=ci
         )
         parsed_names = []
-        for name in names:
+        for name in names or []:
             if "*" in name:
                 parsed_names.extend(_parse_name_from_pattern(deploy_configs, name))
             else:
diff --git a/src/prefect/cli/deployment.py b/src/prefect/cli/deployment.py
index 1386c02c6c83..8713c8d1d111 100644
--- a/src/prefect/cli/deployment.py
+++ b/src/prefect/cli/deployment.py
@@ -884,7 +884,7 @@ async def run(
         ),
     ),
     tags: List[str] = typer.Option(
-        [],
+        None,
         "--tag",
         help=("Tag(s) to be applied to flow run."),
     ),
@@ -930,7 +930,7 @@ async def run(
             exit_with_error(
                 "`--watch-interval` can only be used with `--watch`.",
             )
-    cli_params = _load_json_key_values(params, "parameter")
+    cli_params = _load_json_key_values(params or [], "parameter")
     conflicting_keys = set(cli_params.keys()).intersection(multi_params.keys())
     if conflicting_keys:
         app.console.print(
@@ -939,7 +939,7 @@ async def run(
         )
     parameters = {**multi_params, **cli_params}
 
-    job_vars = _load_json_key_values(job_variables, "job variable")
+    job_vars = _load_json_key_values(job_variables or [], "job variable")
     if start_in and start_at:
         exit_with_error(
             "Only one of `--start-in` or `--start-at` can be set, not both."
diff --git a/tests/cli/test_agent.py b/tests/cli/test_agent.py
index c0dcabde47fd..fc9cb3c58ee3 100644
--- a/tests/cli/test_agent.py
+++ b/tests/cli/test_agent.py
@@ -139,7 +139,7 @@ def test_start_agent_respects_work_queue_names(monkeypatch):
     )
     mock_agent.assert_called_once_with(
         work_queues=["a", "b"],
-        work_queue_prefix=[],
+        work_queue_prefix=None,
         work_pool_name=None,
         prefetch_seconds=ANY,
         limit=None,
@@ -171,7 +171,7 @@ def test_start_agent_respects_limit(monkeypatch):
     )
     mock_agent.assert_called_once_with(
         work_queues=["test"],
-        work_queue_prefix=[],
+        work_queue_prefix=None,
         work_pool_name=None,
         prefetch_seconds=ANY,
         limit=10,
@@ -187,7 +187,7 @@ def test_start_agent_respects_work_pool_name(monkeypatch):
     )
     mock_agent.assert_called_once_with(
         work_queues=["test"],
-        work_queue_prefix=[],
+        work_queue_prefix=None,
         work_pool_name="test-pool",
         prefetch_seconds=ANY,
         limit=None,
@@ -221,7 +221,7 @@ def test_start_agent_with_just_work_pool(monkeypatch):
     )
     mock_agent.assert_called_once_with(
         work_queues=[],
-        work_queue_prefix=[],
+        work_queue_prefix=None,
         work_pool_name="test-pool",
         prefetch_seconds=ANY,
         limit=None,
diff --git a/tests/cli/test_worker.py b/tests/cli/test_worker.py
index da41f171b587..9824063f371b 100644
--- a/tests/cli/test_worker.py
+++ b/tests/cli/test_worker.py
@@ -233,7 +233,7 @@ def test_start_worker_with_prefetch_seconds(monkeypatch):
     mock_worker.assert_called_once_with(
         name=None,
         work_pool_name="test",
-        work_queues=[],
+        work_queues=None,
         prefetch_seconds=30,
         limit=None,
         heartbeat_interval_seconds=30,
@@ -261,7 +261,7 @@ def test_start_worker_with_prefetch_seconds_from_setting_by_default(monkeypatch)
     mock_worker.assert_called_once_with(
         name=None,
         work_pool_name="test",
-        work_queues=[],
+        work_queues=None,
         prefetch_seconds=100,
         limit=None,
         heartbeat_interval_seconds=30,
@@ -290,7 +290,7 @@ def test_start_worker_with_limit(monkeypatch):
     mock_worker.assert_called_once_with(
         name=None,
         work_pool_name="test",
-        work_queues=[],
+        work_queues=None,
         prefetch_seconds=10,
         limit=5,
         heartbeat_interval_seconds=30,