From dbedce861d102ed19b27e020399679dea5fb91ac Mon Sep 17 00:00:00 2001 From: Marcus Lachmanez Date: Fri, 18 Jun 2021 12:21:20 +0200 Subject: [PATCH 01/10] Set version to 0.3.6 This update is necessary for PR https://github.com/Azure/azure-cli-extensions/pull/3153 --- src/vm-repair/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vm-repair/setup.py b/src/vm-repair/setup.py index 933f1adba42..190bb779102 100644 --- a/src/vm-repair/setup.py +++ b/src/vm-repair/setup.py @@ -8,7 +8,7 @@ from codecs import open from setuptools import setup, find_packages -VERSION = "0.3.5" +VERSION = "0.3.6" CLASSIFIERS = [ 'Development Status :: 4 - Beta', From 2561a0ec127a80096f7845d634f1bdf8ae13416e Mon Sep 17 00:00:00 2001 From: Marcus Lachmanez Date: Tue, 22 Jun 2021 11:59:51 +0200 Subject: [PATCH 02/10] Added az-vm-repair to the file to trigger the CI job. --- src/service_name.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/service_name.json b/src/service_name.json index 5573f534bef..a7c19777409 100644 --- a/src/service_name.json +++ b/src/service_name.json @@ -428,5 +428,10 @@ "Command": "az dataprotection", "AzureServiceName": "Azure Data Protection", "URL": "" + }, + { + "Command": "az vm repair", + "AzureServiceName": "Azure CLI VM Repair Extension", + "URL": "" } ] From 5a87fe1eb9e63cdc08beab83c303bdedcff78bd1 Mon Sep 17 00:00:00 2001 From: malachma Date: Mon, 26 Jul 2021 11:28:07 +0200 Subject: [PATCH 03/10] changed "vm repair" to "vm-repair" --- src/service_name.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service_name.json b/src/service_name.json index a7c19777409..58e2ca86d80 100644 --- a/src/service_name.json +++ b/src/service_name.json @@ -430,7 +430,7 @@ "URL": "" }, { - "Command": "az vm repair", + "Command": "az vm-repair", "AzureServiceName": "Azure CLI VM Repair Extension", "URL": "" } From 16a8e8eec2f7ecdf610968488a285e9b08865db7 Mon Sep 17 00:00:00 2001 From: malachma Date: Mon, 26 Jul 2021 15:02:02 +0200 Subject: [PATCH 04/10] Added HISTORY.rst --- src/vm-repair/HISTORY.rst | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/vm-repair/HISTORY.rst diff --git a/src/vm-repair/HISTORY.rst b/src/vm-repair/HISTORY.rst new file mode 100644 index 00000000000..15e2be7692b --- /dev/null +++ b/src/vm-repair/HISTORY.rst @@ -0,0 +1,13 @@ + +Release History +=============== + +0.3.6 +++++++ +Add support for ALAR2 which requires cloud-init script to prepare the recovery VM with a +build environment for Rust. + +0.3.5 +++++++ + +Add support for nested VMs \ No newline at end of file From 98383d5bcca767f3f89319f012a05de39edaa53b Mon Sep 17 00:00:00 2001 From: malachma Date: Mon, 26 Jul 2021 15:03:22 +0200 Subject: [PATCH 05/10] Added missing command "vm-repair" and updated its URL --- src/service_name.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service_name.json b/src/service_name.json index 58e2ca86d80..26627eb37a2 100644 --- a/src/service_name.json +++ b/src/service_name.json @@ -432,6 +432,6 @@ { "Command": "az vm-repair", "AzureServiceName": "Azure CLI VM Repair Extension", - "URL": "" + "URL": "https://docs.microsoft.com/en-us/cli/azure/vm/repair?view=azure-cli-latest" } ] From c97887fa9c46754cecded4b27816b82cef0d11de Mon Sep 17 00:00:00 2001 From: malachma Date: Mon, 26 Jul 2021 15:08:54 +0200 Subject: [PATCH 06/10] HISTORY.rst is used by setup.py now. Added package-data "linux-build_setup-cloud-init.txt" --- src/vm-repair/setup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/vm-repair/setup.py b/src/vm-repair/setup.py index 190bb779102..7c6ab3ef63c 100644 --- a/src/vm-repair/setup.py +++ b/src/vm-repair/setup.py @@ -26,11 +26,14 @@ DEPENDENCIES = [] +with open('HISTORY.rst', 'r', encoding='utf-8') as f: + HISTORY = f.read() + setup( name='vm-repair', version=VERSION, description='Auto repair commands to fix VMs.', - long_description='VM repair command will enable Azure users to self-repair non-bootable VMs by copying the source VM\'s OS disk and attaching it to a newly created repair VM.', + long_description='VM repair command will enable Azure users to self-repair non-bootable VMs by copying the source VM\'s OS disk and attaching it to a newly created repair VM.'+ '\n\n' + HISTORY, license='MIT', author='Microsoft Corporation', author_email='caiddev@microsoft.com', @@ -44,6 +47,7 @@ 'scripts/enable-nestedhyperv.ps1', 'scripts/linux-mount-encrypted-disk.sh', 'scripts/win-mount-encrypted-disk.ps1', + 'linux-build_setup-cloud-init.txt', 'azext_metadata.json' ] }, From 1f2bc700baadbd38f1184d530c875721a28e39e2 Mon Sep 17 00:00:00 2001 From: malachma Date: Mon, 26 Jul 2021 15:14:51 +0200 Subject: [PATCH 07/10] merged manually missing object for arcdata --- src/service_name.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/service_name.json b/src/service_name.json index 26627eb37a2..900050d9b34 100644 --- a/src/service_name.json +++ b/src/service_name.json @@ -429,8 +429,13 @@ "AzureServiceName": "Azure Data Protection", "URL": "" }, - { - "Command": "az vm-repair", + { + "Command": "az arcdata", + "AzureServiceName": "Azure Data Services", + "URL": "https://docs.microsoft.com/en-us/sql/sql-server/azure-arc/overview?view=sql-server-ver15" + }, + { + Command": "az vm-repair", "AzureServiceName": "Azure CLI VM Repair Extension", "URL": "https://docs.microsoft.com/en-us/cli/azure/vm/repair?view=azure-cli-latest" } From dc69cce100f3d446fd0dd2ab022b9189d398025f Mon Sep 17 00:00:00 2001 From: Marcus Lachmanez Date: Mon, 26 Jul 2021 15:28:46 +0200 Subject: [PATCH 08/10] Update service_name.json fixed the linter complain about a missing newline --- src/service_name.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service_name.json b/src/service_name.json index df592cf479a..4bd6a7c4cf7 100644 --- a/src/service_name.json +++ b/src/service_name.json @@ -439,4 +439,4 @@ "AzureServiceName": "Azure CLI VM Repair Extension", "URL": "https://docs.microsoft.com/en-us/cli/azure/vm/repair?view=azure-cli-latest" } -] \ No newline at end of file +] From 8309ca33127c04c22f77a2870877fa0a002e50db Mon Sep 17 00:00:00 2001 From: malachma Date: Mon, 26 Jul 2021 15:49:29 +0200 Subject: [PATCH 09/10] Add missing newline at end of file. Complained by linter --- src/service_name.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/service_name.json b/src/service_name.json index 4bd6a7c4cf7..24585043263 100644 --- a/src/service_name.json +++ b/src/service_name.json @@ -440,3 +440,4 @@ "URL": "https://docs.microsoft.com/en-us/cli/azure/vm/repair?view=azure-cli-latest" } ] + From fb2e007d76048abfe4b488281f2fa4aad9852400 Mon Sep 17 00:00:00 2001 From: malachma Date: Mon, 26 Jul 2021 16:13:55 +0200 Subject: [PATCH 10/10] Add missing Command "vm" --- src/service_name.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/service_name.json b/src/service_name.json index 24585043263..eafb7eb03b6 100644 --- a/src/service_name.json +++ b/src/service_name.json @@ -438,6 +438,11 @@ "Command": "az vm-repair", "AzureServiceName": "Azure CLI VM Repair Extension", "URL": "https://docs.microsoft.com/en-us/cli/azure/vm/repair?view=azure-cli-latest" + }, + { + "Command": "az vm", + "AzureServiceName": "Azure Virtual Machines", + "URL": "https://docs.microsoft.com/en-us/azure/virtual-machines/" } ]