From 44bef5e44e8affb8f606822343669ff5ece5aae2 Mon Sep 17 00:00:00 2001 From: Aditya Samantaray Date: Fri, 14 Jul 2023 11:24:25 +0530 Subject: [PATCH 1/2] chore: modify validations forgeolocation to support state codes --- bin/helpers/capabilityHelper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/helpers/capabilityHelper.js b/bin/helpers/capabilityHelper.js index 06c9ebee..ea97d134 100644 --- a/bin/helpers/capabilityHelper.js +++ b/bin/helpers/capabilityHelper.js @@ -183,7 +183,7 @@ const validate = (bsConfig, args) => { if( Utils.searchForOption('--async') && ( !Utils.isUndefined(args.async) && bsConfig["connection_settings"]["local"])) reject(Constants.validationMessages.INVALID_LOCAL_ASYNC_ARGS); - if (bsConfig.run_settings.userProvidedGeolocation && !bsConfig.run_settings.geolocation.match(/^[A-Z]{2}$/g)) reject(Constants.validationMessages.INVALID_GEO_LOCATION); + if (bsConfig.run_settings.userProvidedGeolocation && !(bsConfig.run_settings.geolocation.match(/^[A-Z]{2}$/g) || bsConfig.run_settings.geolocation.match(/^[A-Z]{2}-[A-Z1-9]+$/g)) ) reject(Constants.validationMessages.INVALID_GEO_LOCATION); if (bsConfig["connection_settings"]["local"] && bsConfig.run_settings.userProvidedGeolocation) reject(Constants.validationMessages.NOT_ALLOWED_GEO_LOCATION_AND_LOCAL_MODE); From 4fa38848e7237f8886416453ce0e98cb46a5a860 Mon Sep 17 00:00:00 2001 From: Aditya Samantaray Date: Fri, 14 Jul 2023 11:36:24 +0530 Subject: [PATCH 2/2] chore: update validations forgeolocation to support state codes --- bin/helpers/capabilityHelper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/helpers/capabilityHelper.js b/bin/helpers/capabilityHelper.js index ea97d134..5d9adfe4 100644 --- a/bin/helpers/capabilityHelper.js +++ b/bin/helpers/capabilityHelper.js @@ -183,7 +183,7 @@ const validate = (bsConfig, args) => { if( Utils.searchForOption('--async') && ( !Utils.isUndefined(args.async) && bsConfig["connection_settings"]["local"])) reject(Constants.validationMessages.INVALID_LOCAL_ASYNC_ARGS); - if (bsConfig.run_settings.userProvidedGeolocation && !(bsConfig.run_settings.geolocation.match(/^[A-Z]{2}$/g) || bsConfig.run_settings.geolocation.match(/^[A-Z]{2}-[A-Z1-9]+$/g)) ) reject(Constants.validationMessages.INVALID_GEO_LOCATION); + if (bsConfig.run_settings.userProvidedGeolocation && !bsConfig.run_settings.geolocation.match(/^[A-Z]{2}(-[A-Z0-9]{2,3})?$/g)) reject(Constants.validationMessages.INVALID_GEO_LOCATION); if (bsConfig["connection_settings"]["local"] && bsConfig.run_settings.userProvidedGeolocation) reject(Constants.validationMessages.NOT_ALLOWED_GEO_LOCATION_AND_LOCAL_MODE);