[Identity] Merge from release by jiasli · Pull Request #13566 · Azure/azure-cli

jiasli · 2020-05-19T09:03:41Z

Description
Sync changes from release to identity.

There are several conflicts from src/azure-cli-core/azure/cli/core/_profile.py introduced by @arrownj in #12999.

⚠ DO NOT SQUASH MERGE

…esource storage vm (#12499)

There is no need to sleep before parsing the response from the SCM server. Unless the status needs to continue to loop, this should return instantly.

…der (#13118) * finish * fix style * add extension

…ating or updating (#12074)

…le (#13062) * Adding private DNS zone import export feature * adding live tests * Incorporating review comments * style issue * Fixing local test * Encorporating review comment and adding test

…2018-03-01-hybrid (#13172)

* test LA cluster * Support LA cluster CMK feature * fix test * recording test for cluster CRUD * fix erros in other command modules due to version upgrade for log analytics * fix tests in other command modules due to version upgrade for log analytics * fix tests in other command modules due to version upgrade for log analytics from CI full test * fix test

…h feature (#12999) * {Core} support get msal accesstoken with adal refresh token for vm ssh feature * add License header for _msal.py * use hashlib instead of build-in hash function * refactor get_msal_token function * delete unused code * add query parameter * add test for get_msal_token

* [Compute] az vm availability-set list: Support showing VM list * test * test, 2019-03-01

…eview API version (#12240) * Upgrade openshift models to 2019-10-27-preview API version * Fix private-cluster parameter * Fix management_subnet_cidr property * Fix refresh cluster handling * fix lint * remove manually written history * remove short summary from _help.py as per code review suggestion * Update OSA API version Co-authored-by: Olga Mirensky <olga.mirensky@redhat.com> Co-authored-by: Feng Zhou <55177366+fengzhou-msft@users.noreply.github.com>

* [Compute] az vm list-skus: Fix display problem of table format * test

… BYOS features (#13187) * finish code recording finish tests * address comments and rerun tests * refine logic * address comments * fix style

…t-If for ARM template deployment (#12942) * Create formatters for What-If operation result. * Add change type legend formatter. * Implement deployment what-if cmdlets. * Add senarios tests for deployment what-if cmdlets. * Add What-If confirmation switches. * Write help for what-if commands. * Fix an error due to rebasing. * Cleanup code. * Handle no_color mode. * Enable VT mode before rendering What-If results. * Add license headers. * Fix linter errors. * Fix help docs. * Add no_prompt paramter to what-if commands. * Try to fix pylint error in CI pipeline. * Fix pylint error round 2. * Fix the pylint error caused by the first fixing pylint error attempt... * Create an alias -r for --what-if-result-format. * Fix help doc. * Use plural verbs in help messages. * Create an alias -c for --confirm-with-what-if. * Remove aux_subscriptions from RG-level what-if command. * Restore handle_extended_json_format. * Add min_api constraints for What-If commands. * Also catch exception for vt mode enabling. * Fix a regression. * Refactor What-If argument types. * Use get_models to import models. * Fix a test failure for old API versions. * Using get_models in formatter tests. * Add tests for prompt with confirm_with_what_if. * Fix a test name. * Fix a linter error.

…ackage (#12782)

) * change title to alert how to pass array parameters * add a dedicated section * fix bug * Update doc/use_cli_effectively.md Co-authored-by: Jiashuo Li <jiasli@microsoft.com> * Update doc/use_cli_effectively.md Co-authored-by: Jiashuo Li <jiasli@microsoft.com> * add JSON example * add them in resource/_help.py * typo Co-authored-by: Jiashuo Li <jiasli@microsoft.com>

* update azure-cli version to 2.6.0 * Apply suggestions from code review Co-authored-by: Yunge Zhu <yungez@microsoft.com> Co-authored-by: Feng Zhou <55177366+fengzhou-msft@users.noreply.github.com> Co-authored-by: Xiaojian Xu <arrownj@126.com> Co-authored-by: Bin Ma <bim@microsoft.com> Co-authored-by: Yunge Zhu <yungez@microsoft.com> Co-authored-by: Feng Zhou <55177366+fengzhou-msft@users.noreply.github.com> Co-authored-by: Xiaojian Xu <arrownj@126.com>

jiasli · 2020-05-19T09:06:25Z

src/azure-cli-core/azure/cli/core/_profile.py

+    def retrieve_msal_token(self, tenant, scopes, data, refresh_token):
+        """
+        This is added only for vmssh feature.
+        It is a temporary solution and will deprecate after MSAL adopted completely.
+        """
+        from azure.cli.core._msal import AdalRefreshTokenBasedClientApplication
+        tenant = tenant or 'organizations'
+        authority = self._ctx.cloud.endpoints.active_directory + '/' + tenant
+        app = AdalRefreshTokenBasedClientApplication(_CLIENT_ID, authority=authority)
+        result = app.acquire_token_silent(scopes, None, data=data, refresh_token=refresh_token)
+
+        return result["access_token"]


Identity needs to support this method as CredsCache is removed.

jiasli · 2020-05-19T09:07:25Z

src/azure-cli-core/azure/cli/core/_profile.py

+    def get_msal_token(self, scopes, data):
+        """
+        This is added only for vmssh feature.
+        It is a temporary solution and will deprecate after MSAL adopted completely.
+        """
+        account = self.get_subscription()
+        username = account[_USER_ENTITY][_USER_NAME]
+        tenant = account[_TENANT_ID] or 'common'
+        _, refresh_token, _, _ = self.get_refresh_token()
+        certificate = self._creds_cache.retrieve_msal_token(tenant, scopes, data, refresh_token)
+        return username, certificate


get_msal_token should use Identity instead of CredsCache.

jiasli · 2020-05-20T10:43:31Z

src/azure-cli-core/azure/cli/core/_profile.py

+        except UnicodeDecodeError:
+            logger.warning("Please make sure there is no international (Unicode) character in the computer name "
+                           r"or C:\Windows\System32\drivers\etc\hosts file's 127.0.0.1 entries. "
+                           "For more details, please see https://github.com/Azure/azure-cli/issues/12957")
+            break


This should be caught in Identity.

yonzhan · 2020-05-20T13:02:06Z

Identity

Jianhui Harold and others added 30 commits April 20, 2020 12:40

{ARO} add __init__.py for ARO tests and update recording (#13089)

fd6af49

{Profile} az login: Polish UnicodeDecodeError (#12972)

ad2a70f

{Aladdin} add usage examples for module: monitor network privatedns r…

8937383

…esource storage vm (#12499)

[Compute] az vmss disk detach: fix data disk NoneType issue (#13069)

66fe624

[ARO] Fixed az aro table output bug (#13066)

2989946

fix CI (#13114)

758f7e9

[Core] fix logging file fd leaking (#13102)

9abb510

[AppService] remove sleep after request.get() (#12609)

0ae790c

There is no need to sleep before parsing the response from the SCM server. Unless the status needs to continue to loop, this should return instantly.

[Network] az network security-partner: support security partner provi…

2862ce5

…der (#13118) * finish * fix style * add extension

[KeyVault] Add new parameter --enable-rbac-authorization during cre…

89cf88c

…ating or updating (#12074)

[AKS] az aks create: Add support for Windows (#13084)

21172d9

fix ci (#13132)

facd2bd

{ACR} Fix small typos (#13142)

b3d6fb7

{Compute} Delete stale test of image builder (#13134)

fdc155c

rename (#13147)

12367f8

[Core] fix core tests failed under certain profiles (#13136)

4a58bcb

[Privatedns] Add feature in private DNS zone to import export zone fi…

b93fab1

…le (#13062) * Adding private DNS zone import export feature * adding live tests * Incorporating review comments * style issue * Fixing local test * Encorporating review comment and adding test

{Resource} Remove resource test test_resource_policyset from profile …

d10679e

…2018-03-01-hybrid (#13172)

{REST} az rest: Refine help (#13067)

4e1ed61

{Compute} Update doc of image-version (#13112)

dada5c0

[Compute] az vm availability-set list: Support showing VM list (#13090)

5fff003

* [Compute] az vm availability-set list: Support showing VM list * test * test, 2019-03-01

[Compute] az vm list-skus: Fix display problem of table format (#13184)

984817c

* [Compute] az vm list-skus: Fix display problem of table format * test

[Monitor] az monitor log-analytics workspace linked-storage: supports…

79964fb

… BYOS features (#13187) * finish code recording finish tests * address comments and rerun tests * refine logic * address comments * fix style

[CI] Onboard pytest and deprecate nose for Automation Test (#13153)

d261ede

[Core] Unpin wheel version via pkginfo to query metadata for Python P…

44c3b4a

…ackage (#12782)

revert wheel to 0.30.0 (#13198)

06cce5b

Jianhui Harold and others added 3 commits May 16, 2020 15:47

fix (#13511)

530cd07

jiasli requested review from Juliehzl, arrownj, bgklein, bim-msft, fengzhou-msft, haroldrandom, jaredmoo, mmyyrroonn, qianwens, qwordy, samkreter, zhoxing-ms and zikalino as code owners May 19, 2020 09:03

jiasli commented May 19, 2020

View reviewed changes

qianwens approved these changes May 19, 2020

View reviewed changes

jiasli assigned arrownj and qianwens May 20, 2020

jiasli commented May 20, 2020

View reviewed changes

yonzhan added this to the S170 milestone May 20, 2020

bim-msft approved these changes May 21, 2020

View reviewed changes

jiasli force-pushed the release branch from 92fd6f1 to 029e73b Compare May 21, 2020 07:24

arrownj merged commit 935583f into identity May 21, 2020

jiasli added the Azure Identity Adoption label Jul 28, 2020

jiasli added MSAL and removed azure-identity / msal labels Oct 12, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Identity] Merge from release#13566

[Identity] Merge from release#13566
arrownj merged 130 commits intoidentityfrom
release

jiasli commented May 19, 2020

Uh oh!

jiasli May 19, 2020

Uh oh!

jiasli May 19, 2020

Uh oh!

jiasli May 20, 2020

Uh oh!

yonzhan commented May 20, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Conversation

jiasli commented May 19, 2020

Uh oh!

jiasli May 19, 2020

Choose a reason for hiding this comment

Uh oh!

jiasli May 19, 2020

Choose a reason for hiding this comment

Uh oh!

jiasli May 20, 2020

Choose a reason for hiding this comment

Uh oh!

yonzhan commented May 20, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants