Skip to content

fix(vm): fall back on invalid image alias doc #33429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rohan-patnaik wants to merge 1 commit into
base: dev
Choose a base branch
from
+18 −1
Open

fix(vm): fall back on invalid image alias doc #33429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/azure-cli/azure/cli/command_modules/vm/_actions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,12 @@ def load_images_from_aliases_doc(cli_ctx, publisher=None, offer=None, sku=None,
try:
response = requests.get(target_url, verify=not should_disable_connection_verify())
if response.status_code == 200:
dic = json.loads(response.content.decode())
try:
dic = json.loads(response.content.decode())
except json.JSONDecodeError as ex:
logger.warning("Failed to parse image alias doc '%s'. Error: '%s'. Use local copy instead.",
target_url, ex)
dic = json.loads(alias_json)
else:
logger.warning("Failed to retrieve image alias doc '%s'. Error: '%s'. Use local copy instead.",
target_url, response)
Expand Down
12 changes: 12 additions & 0 deletions src/azure-cli/azure/cli/command_modules/vm/tests/latest/test_vm_image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,18 @@ def test_when_alias_doc_is_missing(self, mock_get_active_cloud):
'offer': 'CentOS', 'sku': '8_5-gen2', 'version': 'latest',
'architecture': 'x64'})

@mock.patch('requests.get', autospec=True)
def test_when_alias_doc_is_invalid_json(self, mock_get):
from azure.cli.command_modules.vm._actions import load_images_from_aliases_doc
cli_ctx = DummyCli()
cli_ctx.cloud.endpoints.vm_image_alias_doc = 'https://example.invalid/aliases.json'
mock_get.return_value.status_code = 200
mock_get.return_value.content = b'404: Not Found'

images = load_images_from_aliases_doc(cli_ctx)

self.assertEqual(images[0]['urnAlias'], 'AzureLinux4')


if __name__ == '__main__':
unittest.main()
Loading