diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f57d7be6191..fa63fbaf7a2 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -23,7 +23,7 @@ jobs:
- bash: |
echo "Check Title of Pull Request: #$(System.PullRequest.PullRequestNumber)"
title=$(curl https://api.github.com/repos/$(Build.Repository.Name)/pulls/$(System.PullRequest.PullRequestNumber) | jq -r '.title')
- if [ "$(System.PullRequest.TargetBranch)" != "release" ] && echo $title | grep -iqF hotfix; then
+ if [ "$(System.PullRequest.TargetBranch)" != "release" ] && echo $title | grep -iqF hotfix:; then
echo "Hotfix PR should target release branch."
exit 1
fi
@@ -122,7 +122,7 @@ jobs:
- task: UsePythonVersion@0
displayName: 'Use Python 3'
inputs:
- versionSpec: 3.x
+ versionSpec: 3.8
- task: BatchScript@1
inputs:
@@ -685,7 +685,7 @@ jobs:
distro: stretch
Buster:
deb_system: debian
- distro: buster
+ distro: buster
steps:
- task: DownloadPipelineArtifact@1
displayName: 'Download Build Artifacts'
@@ -739,7 +739,7 @@ jobs:
distro: stretch
Buster:
deb_system: debian
- distro: buster
+ distro: buster
pool:
vmImage: 'ubuntu-16.04'
steps:
diff --git a/doc/authoring_command_modules/README.md b/doc/authoring_command_modules/README.md
index 5c9c4f804f0..df328accf66 100644
--- a/doc/authoring_command_modules/README.md
+++ b/doc/authoring_command_modules/README.md
@@ -213,12 +213,12 @@ History notes are auto-generated based on PR titles and descriptions starting fr
Examples of customer-facing change PR title:
->[Storage] BREAKING CHANGE: az storage remove: Remove --auth-mode argument
->[ARM] Fix #10246: az resource tag crashes when the parameter --ids passed in is resource group ID
+> [Storage] BREAKING CHANGE: az storage remove: Remove --auth-mode argument
+> [ARM] Fix #10246: az resource tag crashes when the parameter --ids passed in is resource group ID
An example of non-customer-facing change PR title:
->{Aladdin} Add help example for dns
+> {Aladdin} Add help example for dns
### Format PR Description
@@ -227,11 +227,14 @@ Please follow the instruction in the PR template to provide a description of the
If you would like to write multiple history notes for one PR or overwrite the message in the PR title as a history note, please write the notes under `History Notes` section in the PR description, following the same format described above. The PR template already contains the history note template, just change it if needed. In this case, the PR title could be a summary of all the changes in this PR and will not be put into `HISTORY.rst` in our pipeline. The PR title still needs to start with `[Component Name]`. You can delete the `History Notes` section if not needed.
### Hotfix PR
-Step 1: Create a hotfix branch based on release branch, then submit a PR to merge hotfix into release.
-In this PR, the second part of the PR title should be `Hotfix`. If you have customer-facing changes, you need to manually modify `HISTORY.rst` to add history notes. The auto generated history notes for the next regular release will ignore the PR that contains `Hotfix`.
-Step 2: Submit a PR to merge the release branch back into dev branch after the hotfix release.
-Do **NOT** squash and merge this PR. After the PR gets approved by code owners, you should fast forward dev to release on your local machine and then push dev to upstream repository.
+Step 1: Create a hotfix branch based on `release` branch, then submit a PR to merge the hotfix branch into `release`.
+
+In this PR, the second part of the PR title should be `Hotfix`. If you have customer-facing changes, you need to manually modify `HISTORY.rst` to add history notes. The auto-generated history notes for the next regular release will ignore the PR that contains `Hotfix`.
An example title of hotfix change PR:
->{Packaging} Hotfix: Fix dependency error
+> {Packaging} Hotfix: Fix dependency error
+
+Step 2: After the hotfix version is released, submit a PR to merge `release` branch back to `dev` (e.g. [#15505](https://github.com/Azure/azure-cli/pull/15505)).
+
+⚠ Do **NOT** squash merge this PR. After the PR gets approved by code owners, merge `release` to `dev` by creating a **merge commit** on your local machine, then push `dev` to upstream repository. The PR will automatically be marked as **Merged**.
diff --git a/scripts/live_test/CLITest.yml b/scripts/live_test/CLITest.yml
index 936421dd4b2..d9e8dfde15f 100644
--- a/scripts/live_test/CLITest.yml
+++ b/scripts/live_test/CLITest.yml
@@ -24,7 +24,7 @@ jobs:
displayName: Live Test Python 3.8
timeoutInMinutes: 9999
strategy:
- maxParallel: 20
+ maxParallel: 5
matrix:
acr:
Target: acr
@@ -324,7 +324,7 @@ jobs:
echo "##vso[task.setvariable variable=Match]0"
fi
- task: UsePythonVersion@0
- condition: eq(variables.Match, '1')
+ condition: and(succeededOrFailed(), eq(variables.Match, '1'))
inputs:
versionSpec: '3.8'
addToPath: true
@@ -399,34 +399,34 @@ jobs:
git push origin $(USER_BRANCH)
fi
- condition: eq(variables.Match, '1')
+ condition: and(succeededOrFailed(), eq(variables.Match, '1'))
- task: PublishTestResults@2
- condition: eq(variables.Match, '1')
+ condition: and(succeededOrFailed(), eq(variables.Match, '1'))
inputs:
testResultsFiles: '/home/vsts/work/1/test_results.*.xml'
testRunTitle: 'Azure CLI live test results of $(Target)'
mergeTestResults: true
# testResultsFormat: 'JUnit'
- task: PublishBuildArtifacts@1
- condition: eq(variables.Match, '1')
+ condition: and(succeededOrFailed(), eq(variables.Match, '1'))
inputs:
PathtoPublish: '/home/vsts/work/1/$(Target).report.sequential.json'
ArtifactName: '$(Target).report.sequential.json'
publishLocation: 'Container'
- task: PublishBuildArtifacts@1
- condition: eq(variables.Match, '1')
+ condition: and(succeededOrFailed(), eq(variables.Match, '1'))
inputs:
PathtoPublish: '/home/vsts/work/1/$(Target).report.sequential.html'
ArtifactName: '$(Target).report.sequential.html'
publishLocation: 'Container'
- task: PublishBuildArtifacts@1
- condition: eq(variables.Match, '1')
+ condition: and(succeededOrFailed(), eq(variables.Match, '1'))
inputs:
PathtoPublish: '/home/vsts/work/1/$(Target).report.parallel.json'
ArtifactName: '$(Target).report.parallel.json'
publishLocation: 'Container'
- task: PublishBuildArtifacts@1
- condition: eq(variables.Match, '1')
+ condition: and(succeededOrFailed(), eq(variables.Match, '1'))
inputs:
PathtoPublish: '/home/vsts/work/1/$(Target).report.parallel.html'
ArtifactName: '$(Target).report.parallel.html'
diff --git a/scripts/live_test/HISTORY.rst b/scripts/live_test/HISTORY.rst
index f324e7edaf1..fa54a49740c 100644
--- a/scripts/live_test/HISTORY.rst
+++ b/scripts/live_test/HISTORY.rst
@@ -3,18 +3,26 @@
Release History
===============
-0.6.0
+0.7.0 (10/23/2020)
++++++
+
+* Improve index.html. Move report link inside table. Display number of tests in link name.
+* Fix a small problem of job condition.
+
+0.6.0 (10/19/2020)
+++++++
+
* Remove module iotcentral.
* Support testing Azure CLI extensions.
-0.5.0
+0.5.0 (10/10/2020)
++++++
+
* Update index.html design.
* Add module data table.
* Add retry for CLI commands.
-0.4.0
+0.4.0 (9/27/2020)
++++++
* Update pipeline run title.
@@ -22,14 +30,14 @@ Release History
* Design a unique representation of a pipeline run.
* Make storage account container public.
-0.3.0
+0.3.0 (9/14/2020)
++++++
* Support upgrading API version in pipeline.
* Fix a tiny DB bug.
* Fix pipe not close problem.
-0.2.0
+0.2.0 (9/4/2020)
++++++
* Fix a tiny bug of sequential run.
@@ -37,7 +45,7 @@ Release History
* Fix a bug of module name sorting.
* Update notification email format.
-0.1.0
+0.1.0 (8/24/2020)
++++++
* Remove schedule in debug mode.
diff --git a/scripts/live_test/generate_index.py b/scripts/live_test/generate_index.py
index 991b841e3ee..9654ea4cd86 100644
--- a/scripts/live_test/generate_index.py
+++ b/scripts/live_test/generate_index.py
@@ -8,6 +8,7 @@
"""
import traceback
import os
+import re
import requests
import xml.etree.ElementTree as ET
@@ -20,6 +21,7 @@ def generate(container, container_url, testdata, USER_REPO, USER_BRANCH, COMMIT_
:return:
"""
print('Enter generate()')
+ # [{'name': name, 'url': url}]
data = []
url = container_url + '?restype=container&comp=list'
content = requests.get(url).content
@@ -100,6 +102,7 @@ def render(data, container, container_url, testdata, USER_REPO, USER_BRANCH, COM
| Pass |
Fail |
Pass rate |
+ Reports |
"""
@@ -109,34 +112,56 @@ def render(data, container, container_url, testdata, USER_REPO, USER_BRANCH, COM
{} |
{} |
{} |
+ |
""".format(testdata.total[1], testdata.total[2], testdata.total[3])
for module, passed, failed, rate in testdata.modules:
+ reports = ''
+ for x in data:
+ name = x['name']
+ url = x['url']
+ if name.startswith(module + '.'):
+ display_name = 'report'
+ if 'parallel' in name:
+ display_name = 'parallel'
+ elif 'sequential' in name:
+ display_name = 'sequential'
+ try:
+ html = requests.get(url).content.__str__()
+ pattern = re.compile('\\d+ tests ran in')
+ match = pattern.search(html)
+ number = match.group().split()[0]
+ if number.isdigit():
+ display_name += '(' + number + ')'
+ except:
+ traceback.print_exc()
+ reports += '{} '.format(url, display_name)
table += """
| {} |
{} |
{} |
{} |
+ {} |
- """.format(module, passed, failed, rate)
+ """.format(module, passed, failed, rate, reports)
table += """
"""
content += table
- content += """
- Reports
- """
-
- for item in data:
- name = item['name']
- url = item['url']
- content += """
- {}
- """.format(url, name)
+ # content += """
+ # Reports
+ # """
+ #
+ # for item in data:
+ # name = item['name']
+ # url = item['url']
+ # content += """
+ # {}
+ # """.format(url, name)
content += """
diff --git a/src/azure-cli-core/azure/cli/core/_profile.py b/src/azure-cli-core/azure/cli/core/_profile.py
index 3dee2b62679..79e08e5c91b 100644
--- a/src/azure-cli-core/azure/cli/core/_profile.py
+++ b/src/azure-cli-core/azure/cli/core/_profile.py
@@ -559,26 +559,35 @@ def get_login_credentials(self, resource=None, subscription_id=None, aux_subscri
external_tenants_info.append(sub[_TENANT_ID])
if identity_type is None:
- def _retrieve_token():
+ def _retrieve_token(sdk_resource=None):
+ # When called by
+ # - Track 1 SDK, use `resource` specified by CLI
+ # - Track 2 SDK, use `sdk_resource` specified by SDK and ignore `resource` specified by CLI
+ token_resource = sdk_resource or resource
+ logger.debug("Retrieving token from ADAL for resource %r", token_resource)
+
if in_cloud_console() and account[_USER_ENTITY].get(_CLOUD_SHELL_ID):
- return self._get_token_from_cloud_shell(resource)
+ return self._get_token_from_cloud_shell(token_resource)
if user_type == _USER:
return self._creds_cache.retrieve_token_for_user(username_or_sp_id,
- account[_TENANT_ID], resource)
+ account[_TENANT_ID], token_resource)
use_cert_sn_issuer = account[_USER_ENTITY].get(_SERVICE_PRINCIPAL_CERT_SN_ISSUER_AUTH)
- return self._creds_cache.retrieve_token_for_service_principal(username_or_sp_id, resource,
+ return self._creds_cache.retrieve_token_for_service_principal(username_or_sp_id, token_resource,
account[_TENANT_ID],
use_cert_sn_issuer)
- def _retrieve_tokens_from_external_tenants():
+ def _retrieve_tokens_from_external_tenants(sdk_resource=None):
+ token_resource = sdk_resource or resource
+ logger.debug("Retrieving token from ADAL for external tenants and resource %r", token_resource)
+
external_tokens = []
for sub_tenant_id in external_tenants_info:
if user_type == _USER:
external_tokens.append(self._creds_cache.retrieve_token_for_user(
- username_or_sp_id, sub_tenant_id, resource))
+ username_or_sp_id, sub_tenant_id, token_resource))
else:
external_tokens.append(self._creds_cache.retrieve_token_for_service_principal(
- username_or_sp_id, resource, sub_tenant_id, resource))
+ username_or_sp_id, token_resource, sub_tenant_id, token_resource))
return external_tokens
from azure.cli.core.adal_authentication import AdalAuthentication
@@ -621,6 +630,8 @@ def get_refresh_token(self, resource=None,
return username_or_sp_id, sp_secret, None, str(account[_TENANT_ID])
def get_raw_token(self, resource=None, subscription=None, tenant=None):
+ logger.debug("Profile.get_raw_token invoked with resource=%r, subscription=%r, tenant=%r",
+ resource, subscription, tenant)
if subscription and tenant:
raise CLIError("Please specify only one of subscription and tenant, not both")
account = self.get_subscription(subscription)
diff --git a/src/azure-cli-core/azure/cli/core/adal_authentication.py b/src/azure-cli-core/azure/cli/core/adal_authentication.py
index 7ff90a1bd31..a4496b05d7a 100644
--- a/src/azure-cli-core/azure/cli/core/adal_authentication.py
+++ b/src/azure-cli-core/azure/cli/core/adal_authentication.py
@@ -10,9 +10,12 @@
from msrest.authentication import Authentication
from msrestazure.azure_active_directory import MSIAuthentication
from azure.core.credentials import AccessToken
-from azure.cli.core.util import in_cloud_console
+from azure.cli.core.util import in_cloud_console, scopes_to_resource
from knack.util import CLIError
+from knack.log import get_logger
+
+logger = get_logger(__name__)
class AdalAuthentication(Authentication): # pylint: disable=too-few-public-methods
@@ -21,12 +24,15 @@ def __init__(self, token_retriever, external_tenant_token_retriever=None):
self._token_retriever = token_retriever
self._external_tenant_token_retriever = external_tenant_token_retriever
- def _get_token(self):
+ def _get_token(self, sdk_resource=None):
+ """
+ :param sdk_resource: `resource` converted from Track 2 SDK's `scopes`
+ """
external_tenant_tokens = None
try:
- scheme, token, full_token = self._token_retriever()
+ scheme, token, full_token = self._token_retriever(sdk_resource)
if self._external_tenant_token_retriever:
- external_tenant_tokens = self._external_tenant_token_retriever()
+ external_tenant_tokens = self._external_tenant_token_retriever(sdk_resource)
except CLIError as err:
if in_cloud_console():
AdalAuthentication._log_hostname()
@@ -60,7 +66,16 @@ def _get_token(self):
# This method is exposed for Azure Core.
def get_token(self, *scopes, **kwargs): # pylint:disable=unused-argument
- _, token, full_token, _ = self._get_token()
+ logger.debug("AdalAuthentication.get_token invoked by Track 2 SDK with scopes=%s", scopes)
+
+ # Deal with an old Track 2 SDK issue where the default credential_scopes is extended with
+ # custom credential_scopes. Instead, credential_scopes should be replaced by custom credential_scopes.
+ # https://github.com/Azure/azure-sdk-for-python/issues/12947
+ # We simply remove the first one if there are multiple scopes provided.
+ if len(scopes) > 1:
+ scopes = scopes[1:]
+
+ _, token, full_token, _ = self._get_token(scopes_to_resource(scopes))
try:
return AccessToken(token, int(full_token['expiresIn'] + time.time()))
except KeyError: # needed to deal with differing unserialized MSI token payload
@@ -68,6 +83,7 @@ def get_token(self, *scopes, **kwargs): # pylint:disable=unused-argument
# This method is exposed for msrest.
def signed_session(self, session=None): # pylint: disable=arguments-differ
+ logger.debug("AdalAuthentication.signed_session invoked by Track 1 SDK")
session = session or super(AdalAuthentication, self).signed_session()
scheme, token, _, external_tenant_tokens = self._get_token()
@@ -82,8 +98,6 @@ def signed_session(self, session=None): # pylint: disable=arguments-differ
@staticmethod
def _log_hostname():
import socket
- from knack.log import get_logger
- logger = get_logger(__name__)
logger.warning("A Cloud Shell credential problem occurred. When you report the issue with the error "
"below, please mention the hostname '%s'", socket.gethostname())
@@ -91,13 +105,13 @@ def _log_hostname():
class MSIAuthenticationWrapper(MSIAuthentication):
# This method is exposed for Azure Core. Add *scopes, **kwargs to fit azure.core requirement
def get_token(self, *scopes, **kwargs): # pylint:disable=unused-argument
+ logger.debug("MSIAuthenticationWrapper.get_token invoked by Track 2 SDK with scopes=%s", scopes)
+ self.resource = scopes_to_resource(scopes)
self.set_token()
return AccessToken(self.token['access_token'], int(self.token['expires_on']))
def set_token(self):
import traceback
- from knack.log import get_logger
- logger = get_logger(__name__)
from azure.cli.core.azclierror import AzureConnectionError, AzureResponseError
try:
super(MSIAuthenticationWrapper, self).set_token()
@@ -117,3 +131,7 @@ def set_token(self):
traceback.format_exc())
raise AzureConnectionError('MSI endpoint is not responding. Please make sure MSI is configured correctly.\n'
'Error detail: {}'.format(str(err)))
+
+ def signed_session(self, session=None):
+ logger.debug("MSIAuthenticationWrapper.signed_session invoked by Track 1 SDK")
+ super().signed_session(session)
diff --git a/src/azure-cli-core/azure/cli/core/commands/client_factory.py b/src/azure-cli-core/azure/cli/core/commands/client_factory.py
index 8a9472469f8..c8c4b5aa1bd 100644
--- a/src/azure-cli-core/azure/cli/core/commands/client_factory.py
+++ b/src/azure-cli-core/azure/cli/core/commands/client_factory.py
@@ -150,6 +150,7 @@ def _get_mgmt_service_client(cli_ctx,
aux_tenants=None,
**kwargs):
from azure.cli.core._profile import Profile
+ from azure.cli.core.util import resource_to_scopes
logger.debug('Getting management service client client_type=%s', client_type.__name__)
resource = resource or cli_ctx.cloud.endpoints.active_directory_resource_id
profile = Profile(cli_ctx=cli_ctx)
@@ -169,6 +170,7 @@ def _get_mgmt_service_client(cli_ctx,
if is_track2(client_type):
client_kwargs.update(configure_common_settings_track2(cli_ctx))
+ client_kwargs['credential_scopes'] = resource_to_scopes(resource)
if subscription_bound:
client = client_type(cred, subscription_id, **client_kwargs)
diff --git a/src/azure-cli-core/azure/cli/core/tests/test_util.py b/src/azure-cli-core/azure/cli/core/tests/test_util.py
index 821a3537063..c2b5405fea2 100644
--- a/src/azure-cli-core/azure/cli/core/tests/test_util.py
+++ b/src/azure-cli-core/azure/cli/core/tests/test_util.py
@@ -377,6 +377,41 @@ def test_send_raw_requests(self, send_mock, get_raw_token_mock):
request = send_mock.call_args.args[1]
self.assertEqual(request.headers['User-Agent'], get_az_rest_user_agent() + ' env-ua ARG-UA')
+ def test_scopes_to_resource(self):
+ from azure.cli.core.util import scopes_to_resource
+ # scopes as a list
+ self.assertEqual(scopes_to_resource(['https://management.core.windows.net//.default']),
+ 'https://management.core.windows.net/')
+ # scopes as a tuple
+ self.assertEqual(scopes_to_resource(('https://storage.azure.com/.default',)),
+ 'https://storage.azure.com')
+
+ # resource with trailing slash
+ self.assertEqual(scopes_to_resource(('https://management.azure.com//.default',)),
+ 'https://management.azure.com/')
+ self.assertEqual(scopes_to_resource(['https://datalake.azure.net//.default']),
+ 'https://datalake.azure.net/')
+
+ # resource without trailing slash
+ self.assertEqual(scopes_to_resource(('https://managedhsm.azure.com/.default',)),
+ 'https://managedhsm.azure.com')
+
+ def test_resource_to_scopes(self):
+ from azure.cli.core.util import resource_to_scopes
+ # resource converted to a scopes list
+ self.assertEqual(resource_to_scopes('https://management.core.windows.net/'),
+ ['https://management.core.windows.net//.default'])
+
+ # resource with trailing slash
+ self.assertEqual(resource_to_scopes('https://management.azure.com/'),
+ ['https://management.azure.com//.default'])
+ self.assertEqual(resource_to_scopes('https://datalake.azure.net/'),
+ ['https://datalake.azure.net//.default'])
+
+ # resource without trailing slash
+ self.assertEqual(resource_to_scopes('https://managedhsm.azure.com'),
+ ['https://managedhsm.azure.com/.default'])
+
class TestBase64ToHex(unittest.TestCase):
diff --git a/src/azure-cli-core/azure/cli/core/util.py b/src/azure-cli-core/azure/cli/core/util.py
index 283f7e9bb7f..aa15a16d041 100644
--- a/src/azure-cli-core/azure/cli/core/util.py
+++ b/src/azure-cli-core/azure/cli/core/util.py
@@ -1165,3 +1165,36 @@ def handle_version_update():
refresh_known_clouds()
except Exception as ex: # pylint: disable=broad-except
logger.warning(ex)
+
+
+def resource_to_scopes(resource):
+ """Convert the ADAL resource ID to MSAL scopes by appending the /.default suffix and return a list.
+ For example:
+ 'https://management.core.windows.net/' -> ['https://management.core.windows.net//.default']
+ 'https://managedhsm.azure.com' -> ['https://managedhsm.azure.com/.default']
+
+ :param resource: The ADAL resource ID
+ :return: A list of scopes
+ """
+ # https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-permissions-and-consent#trailing-slash-and-default
+ # We should not trim the trailing slash, like in https://management.azure.com/
+ # In other word, the trailing slash should be preserved and scope should be https://management.azure.com//.default
+ scope = resource + '/.default'
+ return [scope]
+
+
+def scopes_to_resource(scopes):
+ """Convert MSAL scopes to ADAL resource by stripping the /.default suffix and return a str.
+ For example:
+ ['https://management.core.windows.net//.default'] -> 'https://management.core.windows.net/'
+ ['https://managedhsm.azure.com/.default'] -> 'https://managedhsm.azure.com'
+
+ :param scopes: The MSAL scopes. It can be a list or tuple of string
+ :return: The ADAL resource
+ :rtype: str
+ """
+ scope = scopes[0]
+ if scope.endswith("/.default"):
+ scope = scope[:-len("/.default")]
+
+ return scope
diff --git a/src/azure-cli/azure/cli/command_modules/acs/_consts.py b/src/azure-cli/azure/cli/command_modules/acs/_consts.py
index fcf74dceb68..e6a48da6414 100644
--- a/src/azure-cli/azure/cli/command_modules/acs/_consts.py
+++ b/src/azure-cli/azure/cli/command_modules/acs/_consts.py
@@ -11,3 +11,6 @@
CONST_SPOT_EVICTION_POLICY_DELETE = "Delete"
CONST_SPOT_EVICTION_POLICY_DEALLOCATE = "Deallocate"
+
+CONST_OS_DISK_TYPE_MANAGED = "Managed"
+CONST_OS_DISK_TYPE_EPHEMERAL = "Ephemeral"
diff --git a/src/azure-cli/azure/cli/command_modules/acs/_help.py b/src/azure-cli/azure/cli/command_modules/acs/_help.py
index cfa1fbad2ae..8c5c058573a 100644
--- a/src/azure-cli/azure/cli/command_modules/acs/_help.py
+++ b/src/azure-cli/azure/cli/command_modules/acs/_help.py
@@ -205,6 +205,9 @@
- name: --node-osdisk-size
type: int
short-summary: Size in GB of the OS disk for each node in the node pool. Minimum 30 GB.
+ - name: --node-osdisk-type
+ type: string
+ short-summary: OS disk type to be used for machines in a given agent pool. Defaults to 'Ephemeral' when possible in conjunction with VM size and OS disk size. May not be changed for this pool after creation.
- name: --kubernetes-version -k
type: string
short-summary: Version of Kubernetes to use for creating the cluster, such as "1.16.9".
@@ -407,6 +410,8 @@
text: az aks create -g MyResourceGroup -n MyManagedCluster --enable-aad --aad-admin-group-object-ids