From 1d3c75ed6281ec2e6dcfdc3544f37e83061dd9c7 Mon Sep 17 00:00:00 2001 From: Pallab Pain Date: Thu, 8 Feb 2024 17:46:06 +0530 Subject: [PATCH] fix: corrects regex for fetching resources The regex defined in commands for fetching resources in bulk to perform batch operations has a flaw where it did not match the given pattern at its boundaries. This can lead to unintended consequences while performing such batch operations. This commit fixes that. Wrike Ticket: https://www.wrike.com/open.htm?id=1299310557 --- riocli/deployment/util.py | 2 +- riocli/device/util.py | 2 +- riocli/package/util.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/riocli/deployment/util.py b/riocli/deployment/util.py index 607d2d3c..42784da1 100644 --- a/riocli/deployment/util.py +++ b/riocli/deployment/util.py @@ -174,7 +174,7 @@ def fetch_deployments( if (include_all or deployment_name_or_regex == deployment.name or deployment_name_or_regex == deployment.deploymentId or (deployment_name_or_regex not in deployment.name and - re.search(deployment_name_or_regex, deployment.name))): + re.search(r'^{}$'.format(deployment_name_or_regex), deployment.name))): result.append(deployment) return result diff --git a/riocli/device/util.py b/riocli/device/util.py index a66b9ef8..80df9132 100644 --- a/riocli/device/util.py +++ b/riocli/device/util.py @@ -115,7 +115,7 @@ def fetch_devices( if (include_all or device.name == device_name_or_regex or device_name_or_regex == device.uuid or (device_name_or_regex not in device.name and - re.search(device_name_or_regex, device.name))): + re.search(r'^{}$'.format(device_name_or_regex), device.name))): result.append(device) return result diff --git a/riocli/package/util.py b/riocli/package/util.py index 748d3f31..f218943a 100644 --- a/riocli/package/util.py +++ b/riocli/package/util.py @@ -94,7 +94,7 @@ def fetch_packages( if (include_all or package_name_or_regex == pkg.packageName or pkg.packageId == package_name_or_regex or (package_name_or_regex not in pkg.packageName and - re.search(package_name_or_regex, pkg.packageName))): + re.search(r'^{}$'.format(package_name_or_regex), pkg.packageName))): result.append(pkg) return result