Skip to content

Commit 5b30bae

Browse files
authored
Updating az use call to azds cli (#211)
* Updating az use call to azds cli - addressing azds updated cli * Fix indentation error * update * Update * CR: renaming the prompt variable
1 parent ef41893 commit 5b30bae

3 files changed

Lines changed: 27 additions & 40 deletions

File tree

src/dev-spaces-preview/azext_dev_spaces_preview/custom.py

Lines changed: 22 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# pylint:disable=no-member,too-many-lines,too-many-locals,too-many-statements
1919

2020

21-
def ads_use_dev_spaces(cluster_name, resource_group_name, update=False, space_name=None, prompt=False):
21+
def ads_use_dev_spaces(cluster_name, resource_group_name, update=False, space_name=None, do_not_prompt=False):
2222
"""
2323
Use Azure Dev Spaces with a managed Kubernetes cluster.
2424
@@ -31,39 +31,26 @@ def ads_use_dev_spaces(cluster_name, resource_group_name, update=False, space_na
3131
:type update: bool
3232
:param space_name: Name of the new or existing dev space to select. Defaults to an interactive selection experience.
3333
:type space_name: String
34-
:param prompt: Do not prompt for confirmation. Requires --space.
35-
:type prompt: bool
34+
:param do_not_prompt: Do not prompt for confirmation. Requires --space.
35+
:type do_not_prompt: bool
3636
"""
3737

3838
azds_cli = _install_dev_spaces_cli(update)
3939

40-
from subprocess import PIPE
41-
retCode = subprocess.call(
42-
[azds_cli, 'controller', 'select', '--name', cluster_name, '--resource-group', resource_group_name],
43-
stderr=PIPE)
44-
if retCode != 0:
45-
retCode = subprocess.call(
46-
[azds_cli, 'controller', 'create', '--target-name', cluster_name, '--target-resource-group',
47-
resource_group_name, '--name', cluster_name, '--resource-group', resource_group_name],
48-
universal_newlines=True)
49-
if retCode != 0:
50-
return
51-
52-
if space_name is None:
53-
space_name = 'default'
54-
55-
retCode = subprocess.call(
56-
[azds_cli, 'space', 'select', '--name', space_name], stderr=PIPE)
57-
if retCode == 0:
58-
return
59-
60-
create_space_arguments = [azds_cli, 'space', 'create', '--name', space_name]
61-
if prompt:
62-
pass
63-
subprocess.call(create_space_arguments, universal_newlines=True)
64-
65-
66-
def ads_remove_dev_spaces(cluster_name, resource_group_name, prompt=False):
40+
use_command_arguments = [azds_cli, 'use', '--name', cluster_name,
41+
'--resource-group', resource_group_name]
42+
43+
if space_name is not None:
44+
use_command_arguments.append('--space')
45+
use_command_arguments.append(space_name)
46+
47+
if do_not_prompt:
48+
use_command_arguments.append('-y')
49+
subprocess.call(
50+
use_command_arguments, universal_newlines=True)
51+
52+
53+
def ads_remove_dev_spaces(cluster_name, resource_group_name, do_not_prompt=False):
6754
"""
6855
Remove Azure Dev Spaces from a managed Kubernetes cluster.
6956
@@ -72,15 +59,15 @@ def ads_remove_dev_spaces(cluster_name, resource_group_name, prompt=False):
7259
:param resource_group_name: Name of resource group. You can configure the default group. \
7360
Using 'az configure --defaults group=<name>'.
7461
:type resource_group_name: String
75-
:param prompt: Do not prompt for confirmation.
76-
:type prompt: bool
62+
:param do_not_prompt: Do not prompt for confirmation.
63+
:type do_not_prompt: bool
7764
"""
7865

7966
azds_cli = _install_dev_spaces_cli(False)
8067

81-
remove_command_arguments = [azds_cli, 'controller', 'delete', '--name',
82-
cluster_name, '--resource-group', resource_group_name]
83-
if prompt:
68+
remove_command_arguments = [azds_cli, 'remove', '--name', cluster_name,
69+
'--resource-group', resource_group_name]
70+
if do_not_prompt:
8471
remove_command_arguments.append('-y')
8572
subprocess.call(
8673
remove_command_arguments, universal_newlines=True)

src/dev-spaces-preview/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from setuptools import setup, find_packages
99

10-
VERSION = "0.1.4"
10+
VERSION = "0.1.5"
1111

1212
CLASSIFIERS = [
1313
'Development Status :: 4 - Beta',

src/index.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,9 @@
370370
],
371371
"dev-spaces-preview": [
372372
{
373-
"filename": "dev_spaces_preview-0.1.4-py2.py3-none-any.whl",
374-
"sha256Digest": "cd2d50ea8a3a46a4b86d3a8810341b05205b91d87b8e9e5c26e7536714bad7ff",
375-
"downloadUrl": "https://azuredevspacestools.blob.core.windows.net/azdssetup/LKS/dev_spaces_preview-0.1.4-py2.py3-none-any.whl",
373+
"filename": "dev_spaces_preview-0.1.5-py2.py3-none-any.whl",
374+
"sha256Digest": "28077ae576f5a86dca30f7def0308d3a26d7464f91f82109c1dc8fc4b11c6a6f",
375+
"downloadUrl": "https://azuredevspacestools.blob.core.windows.net/azdssetup/LKS/dev_spaces_preview-0.1.5-py2.py3-none-any.whl",
376376
"metadata": {
377377
"azext.isPreview": true,
378378
"azext.minCliCoreVersion": "2.0.32",
@@ -411,7 +411,7 @@
411411
"metadata_version": "2.0",
412412
"name": "dev-spaces-preview",
413413
"summary": "Dev Spaces provides a rapid, iterative Kubernetes development experience for teams.",
414-
"version": "0.1.4"
414+
"version": "0.1.5"
415415
}
416416
}
417417
],

0 commit comments

Comments
 (0)