From ac5f380746084e0025b45f01296b6044b8da194b Mon Sep 17 00:00:00 2001 From: navba-MSFT <57353862+navba-MSFT@users.noreply.github.com> Date: Fri, 5 Aug 2022 15:58:07 +0530 Subject: [PATCH 1/8] {AzureBtach} fixes Azure/azure-cli#23445 fixes Azure/azure-cli#23445 Getting supported images list for an Azure Batch pool fails with nondescript error 'NoneType' object has no attribute 'startswith'. This PR fixes this error. --- src/azure-cli/azure/cli/command_modules/batch/_validators.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/batch/_validators.py b/src/azure-cli/azure/cli/command_modules/batch/_validators.py index c6a8661133f..503e933077c 100644 --- a/src/azure-cli/azure/cli/command_modules/batch/_validators.py +++ b/src/azure-cli/azure/cli/command_modules/batch/_validators.py @@ -304,10 +304,10 @@ def validate_client_parameters(cmd, namespace): namespace.account_endpoint = cmd.cli_ctx.config.get('batch', 'endpoint', None) # Simple validation for account_endpoint - if not (namespace.account_endpoint.startswith('https://') or + if namespace.account_endpoint and not (namespace.account_endpoint.startswith('https://') or namespace.account_endpoint.startswith('http://')): namespace.account_endpoint = 'https://' + namespace.account_endpoint - namespace.account_endpoint = namespace.account_endpoint.rstrip('/') + namespace.account_endpoint = namespace.account_endpoint.rstrip('/') # if account name is specified but no key, attempt to query if we use shared key auth if namespace.account_name and namespace.account_endpoint and not namespace.account_key: if cmd.cli_ctx.config.get('batch', 'auth_mode', 'shared_key') == 'shared_key': From 61a8768ab05d3c7d78add38262ebfcd29ae8cea6 Mon Sep 17 00:00:00 2001 From: navba-MSFT <57353862+navba-MSFT@users.noreply.github.com> Date: Mon, 8 Aug 2022 12:41:35 +0530 Subject: [PATCH 2/8] Update src/azure-cli/azure/cli/command_modules/batch/_validators.py corrected Co-authored-by: ZelinWang --- src/azure-cli/azure/cli/command_modules/batch/_validators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/batch/_validators.py b/src/azure-cli/azure/cli/command_modules/batch/_validators.py index 503e933077c..73c8ce5b517 100644 --- a/src/azure-cli/azure/cli/command_modules/batch/_validators.py +++ b/src/azure-cli/azure/cli/command_modules/batch/_validators.py @@ -305,7 +305,7 @@ def validate_client_parameters(cmd, namespace): # Simple validation for account_endpoint if namespace.account_endpoint and not (namespace.account_endpoint.startswith('https://') or - namespace.account_endpoint.startswith('http://')): + namespace.account_endpoint.startswith('http://')): namespace.account_endpoint = 'https://' + namespace.account_endpoint namespace.account_endpoint = namespace.account_endpoint.rstrip('/') # if account name is specified but no key, attempt to query if we use shared key auth From 95b7a1eec0b7734ab390ccda31d06b7d26c4c2ec Mon Sep 17 00:00:00 2001 From: navba-MSFT <57353862+navba-MSFT@users.noreply.github.com> Date: Mon, 8 Aug 2022 14:29:38 +0530 Subject: [PATCH 3/8] Update _validators.py --- src/azure-cli/azure/cli/command_modules/batch/_validators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/batch/_validators.py b/src/azure-cli/azure/cli/command_modules/batch/_validators.py index 73c8ce5b517..e28b7371306 100644 --- a/src/azure-cli/azure/cli/command_modules/batch/_validators.py +++ b/src/azure-cli/azure/cli/command_modules/batch/_validators.py @@ -305,7 +305,7 @@ def validate_client_parameters(cmd, namespace): # Simple validation for account_endpoint if namespace.account_endpoint and not (namespace.account_endpoint.startswith('https://') or - namespace.account_endpoint.startswith('http://')): + namespace.account_endpoint.startswith('http://')): namespace.account_endpoint = 'https://' + namespace.account_endpoint namespace.account_endpoint = namespace.account_endpoint.rstrip('/') # if account name is specified but no key, attempt to query if we use shared key auth From d224bad5b605901863999817a358305efe67cdb3 Mon Sep 17 00:00:00 2001 From: navba-MSFT <57353862+navba-MSFT@users.noreply.github.com> Date: Mon, 8 Aug 2022 15:03:13 +0530 Subject: [PATCH 4/8] Update _validators.py --- src/azure-cli/azure/cli/command_modules/batch/_validators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/batch/_validators.py b/src/azure-cli/azure/cli/command_modules/batch/_validators.py index e28b7371306..3c69bd2ed97 100644 --- a/src/azure-cli/azure/cli/command_modules/batch/_validators.py +++ b/src/azure-cli/azure/cli/command_modules/batch/_validators.py @@ -305,7 +305,7 @@ def validate_client_parameters(cmd, namespace): # Simple validation for account_endpoint if namespace.account_endpoint and not (namespace.account_endpoint.startswith('https://') or - namespace.account_endpoint.startswith('http://')): + namespace.account_endpoint.startswith('http://')): namespace.account_endpoint = 'https://' + namespace.account_endpoint namespace.account_endpoint = namespace.account_endpoint.rstrip('/') # if account name is specified but no key, attempt to query if we use shared key auth From cd1ca003dccf120f810a5aa5bb8c73d380251e4e Mon Sep 17 00:00:00 2001 From: ZelinWang Date: Mon, 8 Aug 2022 21:38:58 +0800 Subject: [PATCH 5/8] fix E128 --- src/azure-cli/azure/cli/command_modules/batch/_validators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/batch/_validators.py b/src/azure-cli/azure/cli/command_modules/batch/_validators.py index 3c69bd2ed97..73c8ce5b517 100644 --- a/src/azure-cli/azure/cli/command_modules/batch/_validators.py +++ b/src/azure-cli/azure/cli/command_modules/batch/_validators.py @@ -305,7 +305,7 @@ def validate_client_parameters(cmd, namespace): # Simple validation for account_endpoint if namespace.account_endpoint and not (namespace.account_endpoint.startswith('https://') or - namespace.account_endpoint.startswith('http://')): + namespace.account_endpoint.startswith('http://')): namespace.account_endpoint = 'https://' + namespace.account_endpoint namespace.account_endpoint = namespace.account_endpoint.rstrip('/') # if account name is specified but no key, attempt to query if we use shared key auth From 63b15c1461aa30cf5c50f2f05fea77243efe4fe8 Mon Sep 17 00:00:00 2001 From: ZelinWang Date: Mon, 8 Aug 2022 21:41:08 +0800 Subject: [PATCH 6/8] fix E128 --- src/azure-cli/azure/cli/command_modules/batch/_validators.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/batch/_validators.py b/src/azure-cli/azure/cli/command_modules/batch/_validators.py index 73c8ce5b517..1fe6ce04f2a 100644 --- a/src/azure-cli/azure/cli/command_modules/batch/_validators.py +++ b/src/azure-cli/azure/cli/command_modules/batch/_validators.py @@ -304,8 +304,8 @@ def validate_client_parameters(cmd, namespace): namespace.account_endpoint = cmd.cli_ctx.config.get('batch', 'endpoint', None) # Simple validation for account_endpoint - if namespace.account_endpoint and not (namespace.account_endpoint.startswith('https://') or - namespace.account_endpoint.startswith('http://')): + if namespace.account_endpoint and not (namespace.account_endpoint.startswith('https://') or + namespace.account_endpoint.startswith('http://')): namespace.account_endpoint = 'https://' + namespace.account_endpoint namespace.account_endpoint = namespace.account_endpoint.rstrip('/') # if account name is specified but no key, attempt to query if we use shared key auth From 12ecd508df800f732e8079652c7b216d41bb033c Mon Sep 17 00:00:00 2001 From: ZelinWang Date: Mon, 8 Aug 2022 21:42:15 +0800 Subject: [PATCH 7/8] fix E128 --- src/azure-cli/azure/cli/command_modules/batch/_validators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/batch/_validators.py b/src/azure-cli/azure/cli/command_modules/batch/_validators.py index 1fe6ce04f2a..180b21f5243 100644 --- a/src/azure-cli/azure/cli/command_modules/batch/_validators.py +++ b/src/azure-cli/azure/cli/command_modules/batch/_validators.py @@ -305,7 +305,7 @@ def validate_client_parameters(cmd, namespace): # Simple validation for account_endpoint if namespace.account_endpoint and not (namespace.account_endpoint.startswith('https://') or - namespace.account_endpoint.startswith('http://')): + namespace.account_endpoint.startswith('http://')): namespace.account_endpoint = 'https://' + namespace.account_endpoint namespace.account_endpoint = namespace.account_endpoint.rstrip('/') # if account name is specified but no key, attempt to query if we use shared key auth From b32734ba5963c6944a02a41dab8ccafa61e0d082 Mon Sep 17 00:00:00 2001 From: ZelinWang Date: Tue, 9 Aug 2022 15:01:00 +0800 Subject: [PATCH 8/8] Update _validators.py --- src/azure-cli/azure/cli/command_modules/batch/_validators.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/batch/_validators.py b/src/azure-cli/azure/cli/command_modules/batch/_validators.py index 180b21f5243..f9d2c35cfa8 100644 --- a/src/azure-cli/azure/cli/command_modules/batch/_validators.py +++ b/src/azure-cli/azure/cli/command_modules/batch/_validators.py @@ -304,8 +304,8 @@ def validate_client_parameters(cmd, namespace): namespace.account_endpoint = cmd.cli_ctx.config.get('batch', 'endpoint', None) # Simple validation for account_endpoint - if namespace.account_endpoint and not (namespace.account_endpoint.startswith('https://') or - namespace.account_endpoint.startswith('http://')): + if namespace.account_endpoint and not (namespace.account_endpoint.startswith('https://') or + namespace.account_endpoint.startswith('http://')): namespace.account_endpoint = 'https://' + namespace.account_endpoint namespace.account_endpoint = namespace.account_endpoint.rstrip('/') # if account name is specified but no key, attempt to query if we use shared key auth