[AKS] GA Kubernetes version alias (#22456)

Author: zjpjack

src/azure-cli/azure/cli/command_modules/acs/_format.py

@@ -67,6 +67,7 @@ def _aks_table_format(result):
         location: location,
         resourceGroup: resourceGroup,
         kubernetesVersion: kubernetesVersion,
+        currentKubernetesVersion: currentKubernetesVersion,
         provisioningState: provisioningState,
         fqdn: fqdn || privateFqdn
     }""")

src/azure-cli/azure/cli/command_modules/acs/_validators.py

@@ -96,13 +96,13 @@ def validate_k8s_version(namespace):
     """Validates a string as a possible Kubernetes version. An empty string is also valid, which tells the server
     to use its default version."""
     if namespace.kubernetes_version:
-        k8s_release_regex = re.compile(r'^[v|V]?(\d+\.\d+\.\d+.*)$')
+        k8s_release_regex = re.compile(r'^[v|V]?(\d+\.\d+(?:\.\d+)?)$')
         found = k8s_release_regex.findall(namespace.kubernetes_version)
         if found:
             namespace.kubernetes_version = found[0]
         else:
-            raise CLIError('--kubernetes-version should be the full version number, '
-                           'such as "1.11.8" or "1.12.6"')
+            raise CLIError('--kubernetes-version should be the full version number or major.minor version number, '
+                           'such as "1.7.12" or "1.7"')
 
 
 def validate_nodepool_name(namespace):

src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_validators.py

@@ -95,9 +95,10 @@ def test_IPv6(self):
 
 
 class Namespace:
-    def __init__(self, api_server_authorized_ip_ranges=None, cluster_autoscaler_profile=None):
+    def __init__(self, api_server_authorized_ip_ranges=None, cluster_autoscaler_profile=None, kubernetes_version=None):
         self.api_server_authorized_ip_ranges = api_server_authorized_ip_ranges
         self.cluster_autoscaler_profile = cluster_autoscaler_profile
+        self.kubernetes_version = kubernetes_version
 
 
 class TestVNetSubnetId(unittest.TestCase):
@@ -419,6 +420,45 @@ def test_valid_format(self):
 
         validators.validate_credential_format(namespace)
 
+class TestValidateKubernetesVersion(unittest.TestCase):
+
+     def test_valid_full_kubernetes_version(self):
+         kubernetes_version = "1.11.8"
+         namespace = Namespace(kubernetes_version=kubernetes_version)
+
+         validators.validate_k8s_version(namespace)
+
+     def test_valid_alias_minor_version(self):
+         kubernetes_version = "1.11"
+         namespace = Namespace(kubernetes_version=kubernetes_version)
+
+         validators.validate_k8s_version(namespace)
+
+     def test_valid_empty_kubernetes_version(self):
+         kubernetes_version = ""
+         namespace = Namespace(kubernetes_version=kubernetes_version)
+
+         validators.validate_k8s_version(namespace)
+
+     def test_invalid_kubernetes_version(self):
+         kubernetes_version = "1.2.3.4"
+
+         namespace = Namespace(kubernetes_version=kubernetes_version)
+         err = ("--kubernetes-version should be the full version number or major.minor version number, "
+                "such as \"1.7.12\" or \"1.7\"")
+
+         with self.assertRaises(CLIError) as cm:
+             validators.validate_k8s_version(namespace)
+         self.assertEqual(str(cm.exception), err)
+
+         kubernetes_version = "1."
+
+         namespace = Namespace(kubernetes_version=kubernetes_version)
+
+         with self.assertRaises(CLIError) as cm:
+             validators.validate_k8s_version(namespace)
+         self.assertEqual(str(cm.exception), err)
+
 
 if __name__ == "__main__":
     unittest.main()