[DevSpaces] Adding endpoint type option to the extension (#1241)

Azure · Feb 23, 2020 · 21f17ae · 21f17ae
1 parent f380e3c
commit 21f17ae
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 4 deletions.
diff --git a/src/dev-spaces/azext_dev_spaces/__init__.py b/src/dev-spaces/azext_dev_spaces/__init__.py
@@ -5,6 +5,7 @@
 
 from azure.cli.core import AzCommandsLoader
 from azure.cli.core.commands import CliCommandType
+from azure.cli.core.commands.parameters import (get_enum_type)
 import azext_dev_spaces._help  # pylint: disable=unused-import
 import azext_dev_spaces.custom  # pylint: disable=unused-import
 
@@ -31,6 +32,8 @@ def load_arguments(self, _):
             c.argument('cluster_name', options_list=['--name', '-n'])
             c.argument('update', options_list=['--update'], action='store_true')
             c.argument('space_name', options_list=['--space', '-s'])
+            c.argument('endpoint_type', get_enum_type(['Public', 'Private', 'None'], default='Public'),
+                       options_list=['--endpoint', '-e'])
             c.argument('do_not_prompt', options_list=['--yes', '-y'],
                        action='store_true', help='Do not prompt for confirmation. Requires --space.')
 

diff --git a/src/dev-spaces/azext_dev_spaces/azext_metadata.json b/src/dev-spaces/azext_dev_spaces/azext_metadata.json
@@ -1,3 +1,3 @@
 {
-    "azext.minCliCoreVersion": "2.0.63"
+    "azext.minCliCoreVersion": "2.1.0"
 }
diff --git a/src/dev-spaces/azext_dev_spaces/custom.py b/src/dev-spaces/azext_dev_spaces/custom.py
@@ -18,7 +18,8 @@
 # pylint:disable=no-member,too-many-lines,too-many-locals,too-many-statements
 
 
-def ads_use_dev_spaces(cluster_name, resource_group_name, update=False, space_name=None, do_not_prompt=False):
+def ads_use_dev_spaces(cluster_name, resource_group_name, update=False, space_name=None,
+                       endpoint_type='Public', do_not_prompt=False):
     """
     Use Azure Dev Spaces with a managed Kubernetes cluster.
 
@@ -31,14 +32,17 @@ def ads_use_dev_spaces(cluster_name, resource_group_name, update=False, space_na
     :type update: bool
     :param space_name: Name of the new or existing dev space to select. Defaults to an interactive selection experience.
     :type space_name: String
+    :param endpoint_type: The endpoint type to be used for a Azure Dev Spaces controller. \
+    See https://aka.ms/azds-networking for more information.
+    :type endpoint_type: String
     :param do_not_prompt: Do not prompt for confirmation. Requires --space.
     :type do_not_prompt: bool
     """
 
     azds_cli = _install_dev_spaces_cli(update, do_not_prompt)
 
     use_command_arguments = [azds_cli, 'use', '--name', cluster_name,
-                             '--resource-group', resource_group_name]
+                             '--resource-group', resource_group_name, '--endpoint', endpoint_type]
 
     if space_name is not None:
         use_command_arguments.append('--space')

diff --git a/src/dev-spaces/setup.py b/src/dev-spaces/setup.py
@@ -7,7 +7,7 @@
 
 from setuptools import setup, find_packages
 
-VERSION = "1.0.4"
+VERSION = "1.0.5"
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',

diff --git a/src/index.json b/src/index.json
@@ -1109,6 +1109,50 @@
             }
         ],
         "dev-spaces": [
+            {
+                "downloadUrl": "https://azuredevspacestools.blob.core.windows.net/azdssetup/LKS/dev_spaces-1.0.5-py2.py3-none-any.whl",
+                "filename": "dev_spaces-1.0.5-py2.py3-none-any.whl",
+                "metadata": {
+                    "azext.minCliCoreVersion": "2.1.0",
+                    "classifiers": [
+                        "Development Status :: 4 - Beta",
+                        "Intended Audience :: Developers",
+                        "Intended Audience :: System Administrators",
+                        "Programming Language :: Python",
+                        "Programming Language :: Python :: 2",
+                        "Programming Language :: Python :: 2.7",
+                        "Programming Language :: Python :: 3",
+                        "Programming Language :: Python :: 3.4",
+                        "Programming Language :: Python :: 3.5",
+                        "Programming Language :: Python :: 3.6",
+                        "License :: OSI Approved :: MIT License"
+                    ],
+                    "extensions": {
+                        "python.details": {
+                            "contacts": [
+                                {
+                                    "email": "azds-azcli@microsoft.com",
+                                    "name": "Microsoft Corporation",
+                                    "role": "author"
+                                }
+                            ],
+                            "document_names": {
+                                "description": "DESCRIPTION.rst"
+                            },
+                            "project_urls": {
+                                "Home": "https://github.com/Azure/azure-cli-extensions"
+                            }
+                        }
+                    },
+                    "generator": "bdist_wheel (0.30.0)",
+                    "license": "MIT",
+                    "metadata_version": "2.0",
+                    "name": "dev-spaces",
+                    "summary": "Dev Spaces provides a rapid, iterative Kubernetes development experience for teams.",
+                    "version": "1.0.5"
+                },
+                "sha256Digest": "6d481b89be4fe8835143433bb0b7c5ba2aba230433bc9ba483c0d26c5ef682a0"
+            },
             {
                 "downloadUrl": "https://azuredevspacestools.blob.core.windows.net/azdssetup/LKS/dev_spaces-1.0.4-py2.py3-none-any.whl",
                 "filename": "dev_spaces-1.0.4-py2.py3-none-any.whl",