🔖 prepare 0.8.2 release (#545)

databrickslabs · Nov 2, 2022 · a9c93b5 · a9c93b5
1 parent 77cb903
commit a9c93b5
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,9 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [Please read through the Keep a Changelog (~5min)](https://keepachangelog.com/en/1.0.0/).
 
+## [0.8.2] - 2022-11-02
+
+## Fixed
+- 🩹 Deletion logic in the workflow eraser
+
+
 ## [0.8.1] - 2022-11-02
 
 ## Changed
+
 - 📖 Reference documentation for deployment file
 - ♻️ Add extensive caching for job listing
 

diff --git a/dbx/__init__.py b/dbx/__init__.py
@@ -1 +1 @@
-__version__ = "0.8.1"
+__version__ = "0.8.2"
diff --git a/dbx/api/destroyer.py b/dbx/api/destroyer.py
@@ -17,7 +17,7 @@
 from dbx.models.cli.destroyer import DestroyerConfig, DeletionMode
 from dbx.models.deployment import AnyWorkflow
 from dbx.models.files.project import EnvironmentInfo
-from dbx.models.workflow.common.pipeline import Pipeline
+from dbx.models.workflow.common.workflow_types import WorkflowType
 from dbx.utils import dbx_echo
 
 
@@ -32,11 +32,14 @@ def __init__(self, api_client: ApiClient, workflows: List[AnyWorkflow], dry_run:
         self._client = api_client
         self._workflows = workflows
         self._dry_run = dry_run
+        self._pipeline_service = NamedPipelinesService(self._client)
+        self._jobs_service = NamedJobsService(self._client)
 
     def _delete_workflow(self, workflow: AnyWorkflow):
         dbx_echo(f"Workflow {escape(workflow.name)} will be deleted")
-        operator_service = NamedPipelinesService if isinstance(workflow, Pipeline) else NamedJobsService
-        service_instance = operator_service(self._client)
+        service_instance = (
+            self._jobs_service if not workflow.workflow_type == WorkflowType.pipeline else self._pipeline_service
+        )
         obj_id = service_instance.find_by_name(workflow.name)
 
         if not obj_id:

diff --git a/dbx/api/services/jobs.py b/dbx/api/services/jobs.py
@@ -37,6 +37,7 @@ class NamedJobsService(WorkflowBaseService):
     def __init__(self, api_client: ApiClient):
         super().__init__(api_client)
         self._service = JobsService(api_client)
+        dbx_echo(f"Total jobs in the workspace: {len(self.all_jobs)}")
 
     @property
     @lru_cache(maxsize=2000)

diff --git a/dbx/commands/destroy.py b/dbx/commands/destroy.py
@@ -63,7 +63,7 @@ def destroy(
     relevant_workflows = env_config.payload.select_relevant_or_all_workflows(workflow_name, workflow_names)
 
     _d_config = DestroyerConfig(
-        workflow_names=relevant_workflows,
+        workflows=relevant_workflows,
         deletion_mode=deletion_mode,
         dracarys=dracarys,
         deployment=env_config,