From 63bc06b05f76c8279458de94ac903d611ab4ca4b Mon Sep 17 00:00:00 2001 From: Marcus Robinson Date: Wed, 14 Jun 2023 16:51:07 +0100 Subject: [PATCH] Ensure parent resource is always added to resources_list (#3567) --- CHANGELOG.md | 4 +++- api_app/_version.py | 2 +- api_app/db/repositories/resources.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88b550156..8b34bcc44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,9 @@ BUG FIXES: * Azure ML connection URI is an object, not string ([#3486](https://github.com/microsoft/AzureTRE/issues/3486)) * Update key in Linux VM deploy script ([#3434](https://github.com/microsoft/AzureTRE/issues/3434)) * Add missing `azure_environment` porter parameters ([#3549](https://github.com/microsoft/AzureTRE/issues/3549)) -* Fix airlock_notifier not getting the right smtp password ([#3561](https://github.com/microsoft/AzureTRE/issues/3561), [#3571](https://github.com/microsoft/AzureTRE/issues/3571)) +* Fix airlock_notifier not getting the right smtp password ([#3561](https://github.com/microsoft/AzureTRE/issues/3561)) +* Fix issue when deleting failed resources gives no steps ([#3567](https://github.com/microsoft/AzureTRE/issues/3567)) +* Fix airlock_notifier not getting the right smtp password ([#3565](https://github.com/microsoft/AzureTRE/issues/3565)) COMPONENTS: diff --git a/api_app/_version.py b/api_app/_version.py index 8066fa278..32e2f393c 100644 --- a/api_app/_version.py +++ b/api_app/_version.py @@ -1 +1 @@ -__version__ = "0.15.3" +__version__ = "0.15.5" diff --git a/api_app/db/repositories/resources.py b/api_app/db/repositories/resources.py index 05cc98cf3..6cbc46408 100644 --- a/api_app/db/repositories/resources.py +++ b/api_app/db/repositories/resources.py @@ -130,7 +130,7 @@ class ResourceRepository(BaseRepository): dependent_resources_list = [] # Get all related resources - related_resources_query = f"SELECT * FROM c WHERE CONTAINS(c.resourcePath, '{parent_resource_path}') AND c.deploymentStatus != '{Status.Deleted}' and c.deploymentStatus != '{Status.DeploymentFailed}'" + related_resources_query = f"SELECT * FROM c WHERE CONTAINS(c.resourcePath, '{parent_resource_path}') AND c.deploymentStatus != '{Status.Deleted}'" related_resources = await self.query(query=related_resources_query) for resource in related_resources: resource_path = resource["resourcePath"]