Skip to content

Commit ecede94

Browse files
committed
Fix fmt
1 parent ef3485c commit ecede94

File tree

4 files changed

+29
-9
lines changed

4 files changed

+29
-9
lines changed

src/databricks/labs/ucx/assessment/workflows.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import logging
2-
from functools import cached_property
32

43
from databricks.sdk.service.jobs import JobParameterDefinition
54

@@ -19,12 +18,14 @@ def _get_force_refresh(ctx: RuntimeContext) -> bool:
1918
"""Extracts the force_refresh parameter from the job run parameters."""
2019
force_refresh = False
2120
job_id = ctx.install_state.jobs["assessment"]
22-
job_runs = [job_run for job_run in ctx.workspace_client.jobs.list_runs(active_only=True, job_id=job_id)]
21+
job_runs = list(ctx.workspace_client.jobs.list_runs(active_only=True, job_id=job_id))
2322
job_parameters = job_runs[0].job_parameters if job_runs else []
23+
if not job_parameters:
24+
return False
2425
for job_parameter in job_parameters:
2526
if job_parameter.name == "force_refresh" and job_parameter.value is not None:
2627
force_refresh = job_parameter.value.lower() in {"true", "1"}
27-
logger.info("Found force_refresh parameter in job run: %s", force_refresh)
28+
logger.info(f"Found force_refresh parameter in job run: {force_refresh}")
2829
break
2930
return force_refresh
3031

src/databricks/labs/ucx/cli.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,9 @@ def validate_external_locations(
219219

220220

221221
@ucx.command
222-
def ensure_assessment_run(w: WorkspaceClient, run_as_collection: bool = False, a: AccountClient | None = None, **named_parameters):
222+
def ensure_assessment_run(
223+
w: WorkspaceClient, run_as_collection: bool = False, a: AccountClient | None = None, **named_parameters
224+
):
223225
"""ensure the assessment job was run on a workspace"""
224226
workspace_contexts = _get_workspace_contexts(w, a, run_as_collection)
225227
force_refresh = named_parameters.get("force_refresh", "false").lower() == "true"
@@ -232,11 +234,14 @@ def ensure_assessment_run(w: WorkspaceClient, run_as_collection: bool = False, a
232234
logger.info(f"The assessment workflow has successfully completed in workspace: {workspace_id}")
233235
elif force_refresh:
234236
logger.info(f"Re-running assessment workflow in workspace: {workspace_id}")
235-
deployed_workflows.run_workflow("assessment", skip_job_wait=run_as_collection, named_parameters={"force_refresh": "true"})
237+
deployed_workflows.run_workflow(
238+
"assessment", skip_job_wait=run_as_collection, named_parameters={"force_refresh": "true"}
239+
)
236240
else:
237241
logger.info(f"Starting assessment workflow in workspace: {workspace_id}")
238242
# If running for a collection, don't wait for each assessment job to finish as that will take a long time.
239243

244+
240245
@ucx.command
241246
def update_migration_progress(
242247
w: WorkspaceClient,

src/databricks/labs/ucx/installer/workflows.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,13 @@ def __init__(self, ws: WorkspaceClient, install_state: InstallState):
249249
self._ws = ws
250250
self._install_state = install_state
251251

252-
def run_workflow(self, step: str, skip_job_wait: bool = False, max_wait: timedelta = timedelta(minutes=20),
253-
named_parameters: dict[str, str] | None = None ) -> int:
252+
def run_workflow(
253+
self,
254+
step: str,
255+
skip_job_wait: bool = False,
256+
max_wait: timedelta = timedelta(minutes=20),
257+
named_parameters: dict[str, str] | None = None,
258+
) -> int:
254259
# this dunder variable is hiding this method from tracebacks, making it cleaner
255260
# for the user to see the actual error without too much noise.
256261
__tracebackhide__ = True # pylint: disable=unused-variable

tests/integration/assessment/test_workflows.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,18 @@ def test_running_real_assessment_job(
5151
assert not workflow_problems_without_path
5252

5353
post_assessment_table = installation_ctx.make_table(schema_name=source_schema.name, ctas="SELECT 1 AS one")
54-
installation_ctx.deployed_workflows.run_workflow(workflow, skip_job_wait=False, named_parameters={"force_refresh": "true"})
54+
installation_ctx.deployed_workflows.run_workflow(
55+
workflow, skip_job_wait=False, named_parameters={"force_refresh": "true"}
56+
)
5557
assert installation_ctx.deployed_workflows.validate_step(workflow), f"Workflow failed: {workflow}"
56-
expected_tables = {managed_table.name, external_table.name, tmp_table.name, view.name, non_delta.name, post_assessment_table.name}
58+
expected_tables = {
59+
managed_table.name,
60+
external_table.name,
61+
tmp_table.name,
62+
view.name,
63+
non_delta.name,
64+
post_assessment_table.name,
65+
}
5766

5867
query = f"SELECT * FROM {installation_ctx.inventory_database}.tables"
5968
tables_after_assessment_rerun = [table.name for table in sql_backend.fetch(query)]

0 commit comments

Comments
 (0)