Merge branch 'main' into blocking-pause-resume

PrefectHQ · Nov 28, 2022 · 4140077 · 4140077
2 parents 17eaf9d + a0253ce
commit 4140077
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 87 deletions.
diff --git a/docs/concepts/work-queues.md b/docs/concepts/work-queues.md
@@ -19,7 +19,7 @@ Work queues are automatically created whenever they are referenced by either a d
 
 To run orchestrated deployments, you must configure at least one agent (and its associated work queue):
 
-1. [Start an agent](#agent-configuration)
+1. [Start an agent](#starting-an-agent)
 2. [Configure a work queue](#work-queue-configuration) (optional)
 
 !!! tip "Agent role has changed from Prefect 1"

diff --git a/orion-ui/package-lock.json b/orion-ui/package-lock.json
diff --git a/orion-ui/package.json b/orion-ui/package.json
@@ -11,24 +11,24 @@
   },
   "dependencies": {
     "@prefecthq/orion-design": "1.1.15",
-    "@prefecthq/prefect-design": "1.1.29",
-    "@prefecthq/vue-compositions": "0.2.12",
+    "@prefecthq/prefect-design": "1.1.32",
+    "@prefecthq/vue-compositions": "1.0.0",
     "@types/lodash.debounce": "4.0.7",
     "axios": "0.27.2",
     "d3": "^7.6.1",
     "lodash.debounce": "4.0.8",
-    "tailwindcss": "3.2.2",
+    "tailwindcss": "3.2.4",
     "vue": "3.2.45",
     "vue-router": "4.1.6"
   },
   "devDependencies": {
-    "@playwright/test": "1.28.0",
+    "@playwright/test": "1.28.1",
     "@prefecthq/eslint-config": "1.0.17",
     "@types/d3": "^7.4.0",
     "@vitejs/plugin-vue": "^2.3.3",
     "autoprefixer": "10.4.13",
     "dotenv": "16.0.3",
-    "eslint": "^8.27.0",
+    "eslint": "^8.28.0",
     "ts-node": "10.9.1",
     "typescript": "^4.9.3",
     "vite": "^2.9.14"

diff --git a/src/prefect/cli/cloud.py b/src/prefect/cli/cloud.py
@@ -365,12 +365,12 @@ async def login(
             "How would you like to authenticate?",
             [
                 ("browser", "Log in with a web browser"),
-                ("key", "Paste an authentication key"),
+                ("key", "Paste an API key"),
             ],
         )
 
         if choice == "key":
-            key = typer.prompt("Paste your authentication key", hide_input=True)
+            key = typer.prompt("Paste your API key", hide_input=True)
         elif choice == "browser":
             key = await login_with_browser()
 

diff --git a/src/prefect/orion/services/flow_run_notifications.py b/src/prefect/orion/services/flow_run_notifications.py
@@ -27,8 +27,8 @@ class FlowRunNotifications(LoopService):
 
     @inject_db
     async def run_once(self, db: OrionDBInterface):
-        async with db.session_context(begin_transaction=True) as session:
-            while True:
+        while True:
+            async with db.session_context(begin_transaction=True) as session:
                 # Drain the queue one entry at a time, because if a transient
                 # database error happens while sending a notification, the whole
                 # transaction will be rolled back, which effectively re-queues any

diff --git a/tests/cli/test_cloud.py b/tests/cli/test_cloud.py
@@ -255,8 +255,8 @@ def test_login_with_interactive_key_single_workspace(respx_mock):
         expected_output_contains=[
             "? How would you like to authenticate? [Use arrows to move; enter to select]",
             "Log in with a web browser",
-            "Paste an authentication key",
-            "Paste your authentication key:",
+            "Paste an API key",
+            "Paste your API key:",
             "Authenticated with Prefect Cloud! Using workspace 'test/foo'.",
         ],
     )
@@ -298,8 +298,8 @@ def test_login_with_interactive_key_multiple_workspaces(respx_mock):
         expected_output_contains=[
             "? How would you like to authenticate? [Use arrows to move; enter to select]",
             "Log in with a web browser",
-            "Paste an authentication key",
-            "Paste your authentication key:",
+            "Paste an API key",
+            "Paste your API key:",
         ],
     )
 
@@ -340,7 +340,7 @@ def post_success(ui_url):
         expected_output_contains=[
             "? How would you like to authenticate? [Use arrows to move; enter to select]",
             "Log in with a web browser",
-            "Paste an authentication key",
+            "Paste an API key",
             "Authenticated with Prefect Cloud! Using workspace 'test/foo'.",
         ],
     )
@@ -382,7 +382,7 @@ def post_failure(ui_url):
         expected_output_contains=[
             "? How would you like to authenticate? [Use arrows to move; enter to select]",
             "Log in with a web browser",
-            "Paste an authentication key",
+            "Paste an API key",
             "Failed to log in. Oh no!",
         ],
     )
@@ -540,8 +540,8 @@ def test_login_already_logged_in_to_current_profile_yes_reauth(respx_mock):
                 "Would you like to reauthenticate? [y/N]",
                 "? How would you like to authenticate? [Use arrows to move; enter to select]",
                 "Log in with a web browser",
-                "Paste an authentication key",
-                "Paste your authentication key:",
+                "Paste an API key",
+                "Paste your API key:",
                 "Authenticated with Prefect Cloud! Using workspace 'test/foo'.",
             ],
         )