From 6e78a33b9f1ff72b64a3a586b99e03c3f84c7b0d Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Thu, 1 May 2025 22:05:01 -0700 Subject: [PATCH 1/2] fix bug --- .../azure/cli/command_modules/acs/addonconfiguration.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py b/src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py index 2114c1dcb25..46bd3ce6e18 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py +++ b/src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py @@ -770,8 +770,10 @@ def create_data_collection_endpoint(cmd, subscription, resource_group, region, e def validate_data_collection_settings(dataCollectionSettings): if 'interval' in dataCollectionSettings.keys(): intervalValue = dataCollectionSettings["interval"] - if (bool(re.match(r'^[0-9]+[m]$', intervalValue))) is False: # pylint: disable=used-before-assignment - raise InvalidArgumentValueError('interval format must be in m') + if (bool(re.match(r'^[0-9]+[m]$', intervalValue))) is False: # pylint: disable=used-before-assignment + raise InvalidArgumentValueError('interval format must be in m') + else: + raise InvalidArgumentValueError("'interval' key is missing in dataCollectionSettings") intervalValue = int(intervalValue.rstrip("m")) if intervalValue <= 0 or intervalValue > 30: raise InvalidArgumentValueError('interval value MUST be in the range from 1m to 30m') From db55c071303609a0a6b1ff722bd0ccdc09877862 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Thu, 1 May 2025 22:14:16 -0700 Subject: [PATCH 2/2] fix bug --- .../azure/cli/command_modules/acs/addonconfiguration.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py b/src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py index 46bd3ce6e18..4937b9369a2 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py +++ b/src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py @@ -772,11 +772,9 @@ def validate_data_collection_settings(dataCollectionSettings): intervalValue = dataCollectionSettings["interval"] if (bool(re.match(r'^[0-9]+[m]$', intervalValue))) is False: # pylint: disable=used-before-assignment raise InvalidArgumentValueError('interval format must be in m') - else: - raise InvalidArgumentValueError("'interval' key is missing in dataCollectionSettings") - intervalValue = int(intervalValue.rstrip("m")) - if intervalValue <= 0 or intervalValue > 30: - raise InvalidArgumentValueError('interval value MUST be in the range from 1m to 30m') + intervalValue = int(intervalValue.rstrip("m")) + if intervalValue <= 0 or intervalValue > 30: + raise InvalidArgumentValueError('interval value MUST be in the range from 1m to 30m') if 'namespaceFilteringMode' in dataCollectionSettings.keys(): namespaceFilteringModeValue = dataCollectionSettings["namespaceFilteringMode"].lower() if namespaceFilteringModeValue not in ["off", "exclude", "include"]: