Add compatible logic for the track 2 migration of resource #3355

zhoxing-ms · 2021-05-10T06:13:09Z

Because Python SDK used by resource module needs to be migrated to track 2 recently, there are a lot of breaking changes in track 2, while the Python SDK of azure-mgmt-resource used by azure-cli-extension is the same as azure-cli. Therefore, the modules that use Python SDK of azure-mgmt-resource in azure-cli-extension should be added with the compatible logic of track 2.

Please refer to the PR description Azure/azure-cli#17783 for specific compatibility logic to be added

This checklist is used to make sure that common guidelines for a pull request are followed.

General Guidelines

Have you run azdev style <YOUR_EXT> locally? (pip install azdev required)
Have you run python scripts/ci/test_index.py -q locally?

For new extensions:

My extension description/summary conforms to the Extension Summary Guidelines.

About Extension Publish

There is a pipeline to automatically build, upload and publish extension wheels.
Once your PR is merged into master branch, a new PR will be created to update src/index.json automatically.
The precondition is to put your code inside this repo and upgrade the version in the PR but do not modify src/index.json.

zhoxing-ms · 2021-05-10T09:04:16Z

Since part of the azure-cli-extension modules are not owned by CLI team, so I only added compatible code.
Please help review the new compatible code in your responsible modules and test the affected functions~

aks-preview @zqingqing1 @JunSun17
connectedk8s @akashkeshari @alphaWizard
k8s-extension @NarayanThiru @jonathan-innis
mesh @linggengmsft @vshan @jeffj6123

Juliehzl · 2021-05-12T02:37:15Z

src/service_name.json

@@ -368,5 +368,10 @@
    "Command": "az webpubsub",
    "AzureServiceName": "Azure Web PubSub",
    "URL": ""
+  },
+  {
+    "Command": "az sql",


follow alphabetical order

Good catch! OK

Juliehzl

It seems that there is no test run in live mode?

akashkeshari · 2021-05-12T07:23:59Z

src/connectedk8s/azext_connectedk8s/custom.py

        try:
-            resourceClient.resource_groups.create_or_update(resource_group_name, resource_group_params)
+            resourceClient.resource_groups.create_or_update(resource_group_name, parameters)


We are also using the resourceClient here:

azure-cli-extensions/src/connectedk8s/azext_connectedk8s/_utils.py

Line 56 in 1010d2a

providerDetails = resourceClient.providers.get('Microsoft.Kubernetes')

Thanks for your reminder~ In fact, I know it. However, there is no breaking change for this operation (code link), so no additional compatibility logic is required.

akashkeshari · 2021-05-12T07:37:00Z

src/connectedk8s/azext_connectedk8s/custom.py

@@ -201,9 +201,11 @@ def create_connectedk8s(cmd, client, resource_group_name, cluster_name, https_pr

    # Resource group Creation
    if resource_group_exists(cmd.cli_ctx, resource_group_name, subscription_id) is False:
-        resource_group_params = {'location': location}
+        from azure.cli.core.profiles import ResourceType
+        ResourceGroup = cmd.get_models('ResourceGroup', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES)


There is another place where we use ResourceType.MGMT_RESOURCE_RESOURCES.

azure-cli-extensions/src/connectedk8s/azext_connectedk8s/custom.py

Line 382 in 1010d2a

groups = cf_resource_groups(ctx, subscription_id=subscription_id)

imported from:

azure-cli-extensions/src/connectedk8s/azext_connectedk8s/_client_factory.py

Line 32 in 1010d2a

return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES,

Yes, I know it. However, there is no breaking change in this logic, so no additional compatibility logic is required.

For the breaking changes in the new azure-mgmt-resource SDK, please refer to the description of PR Azure/azure-cli#17783

zhoxing-ms · 2021-05-12T07:49:44Z

It seems that there is no test run in live mode?

Yes, because most of the modified modules are not owned by us. Some live tests will fail due to non resource SDK reasons (such as some fixed resources cannot be found or do not have resource permissions), and some of the cases are not covered.
Therefore, I think these tests should be run by the corresponding module owner.

jonathan-innis · 2021-05-13T22:27:37Z

src/k8s-extension/setup.py

@@ -32,7 +32,7 @@
 # TODO: Add any additional SDK dependencies here
 DEPENDENCIES = []

-VERSION = "0.3.1"
+VERSION = "0.3.2"


We have another version coming out 0.4.0 so depending on when this goes in, this version might need to be changed

OK, may I ask what is your expected version here?

This should now be 0.4.1

Yes, it has been updated

jonathan-innis

Small comment on versioning

JunSun17

For the aks -preview part, looks good to me.

jonathan-innis

Please hold this as a call is failing

jonathan-innis · 2021-05-14T16:41:11Z

src/k8s-extension/azext_k8s_extension/partner_extensions/ContainerInsights.py

-    if validate:
-        return smc.validate(resource_group_name, deployment_name, properties)
-    return sdk_no_wait(no_wait, smc.create_or_update, resource_group_name, deployment_name, properties)
+    return sdk_no_wait(no_wait, smc.begin_create_or_update, resource_group_name, deployment_name, deployment)


This call in begin_create_or_update is failing. It is coming with ERROR: 'DeploymentsOperations' object has no attribute 'begin_create_or_update'

As the upgrade of azure-mgmt-resource in CLI main repo has not been released, it can only be tested through the dev environment. So may I ask if you are using CLI in dev environment and pulled the latest code from remote dev branch?
The expected version of azure-mgmt-resource is 16.1.0, please execute pip list to confirm whether the version is correct~

@jonathan-innis May I ask can you pass the test now?

zhoxing-ms · 2021-05-19T09:52:57Z

As I have communicated with @jeffj6123, module mesh will be deleted, so this module also be passed

zhoxing-ms requested review from gtracer, Juliehzl and zqingqing1 as code owners May 10, 2021 06:13

zhoxing-ms requested a review from jsntcy May 10, 2021 06:34

zhoxing-ms mentioned this pull request May 10, 2021

[ARM] Migrate resource to track2 SDK Azure/azure-cli#17783

Merged

4 tasks

zhoxing-ms force-pushed the resource_track2 branch from a23819a to 3d4319c Compare May 10, 2021 06:53

yonzhan assigned zhoxing-ms May 10, 2021

yonzhan added this to the S187 milestone May 10, 2021

Juliehzl reviewed May 12, 2021

View reviewed changes

zhoxing-ms force-pushed the resource_track2 branch from 6adfea2 to 3ef11a4 Compare May 12, 2021 06:56

akashkeshari reviewed May 12, 2021

View reviewed changes

akashkeshari approved these changes May 13, 2021

View reviewed changes

zhoxing-ms force-pushed the resource_track2 branch from 3ef11a4 to 805f5c3 Compare May 13, 2021 08:02

jonathan-innis reviewed May 13, 2021

View reviewed changes

jonathan-innis approved these changes May 13, 2021

View reviewed changes

JunSun17 approved these changes May 14, 2021

View reviewed changes

jonathan-innis suggested changes May 14, 2021

View reviewed changes

zhoxing-ms force-pushed the resource_track2 branch from d90cf7e to 7e8783c Compare May 18, 2021 08:56

zhoxing-ms requested a review from andyliuliming as a code owner May 18, 2021 08:56

Add compatible logic for track 2 migration of resource module

26ed2d2

zhoxing-ms force-pushed the resource_track2 branch from 7e8783c to 26ed2d2 Compare May 18, 2021 08:58

Juliehzl approved these changes May 20, 2021

View reviewed changes

zhoxing-ms merged commit f19ddbe into Azure:master May 20, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add compatible logic for the track 2 migration of resource #3355

Add compatible logic for the track 2 migration of resource #3355

zhoxing-ms commented May 10, 2021 •

edited

Loading

zhoxing-ms commented May 10, 2021 •

edited

Loading

Juliehzl May 12, 2021

zhoxing-ms May 12, 2021

Juliehzl left a comment

akashkeshari May 12, 2021 •

edited

Loading

zhoxing-ms May 12, 2021

akashkeshari May 12, 2021

zhoxing-ms May 12, 2021

zhoxing-ms May 12, 2021

zhoxing-ms commented May 12, 2021 •

edited

Loading

jonathan-innis May 13, 2021

zhoxing-ms May 14, 2021 •

edited

Loading

jonathan-innis May 19, 2021

zhoxing-ms May 20, 2021

jonathan-innis left a comment

JunSun17 left a comment

jonathan-innis left a comment

jonathan-innis May 14, 2021

zhoxing-ms May 15, 2021

zhoxing-ms May 18, 2021

zhoxing-ms commented May 19, 2021

Add compatible logic for the track 2 migration of resource #3355

Add compatible logic for the track 2 migration of resource #3355

Conversation

zhoxing-ms commented May 10, 2021 • edited Loading

General Guidelines

About Extension Publish

zhoxing-ms commented May 10, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Juliehzl left a comment

Choose a reason for hiding this comment

akashkeshari May 12, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zhoxing-ms commented May 12, 2021 • edited Loading

Choose a reason for hiding this comment

zhoxing-ms May 14, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jonathan-innis left a comment

Choose a reason for hiding this comment

JunSun17 left a comment

Choose a reason for hiding this comment

jonathan-innis left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zhoxing-ms commented May 19, 2021

zhoxing-ms commented May 10, 2021 •

edited

Loading

zhoxing-ms commented May 10, 2021 •

edited

Loading

akashkeshari May 12, 2021 •

edited

Loading

zhoxing-ms commented May 12, 2021 •

edited

Loading

zhoxing-ms May 14, 2021 •

edited

Loading