Skip to content

Commit 6084c87

Browse files
feat: avoid creation of nested datasets (#796)
* feat: avoid creation of nested datasets
1 parent d54e877 commit 6084c87

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

renku/core/management/datasets.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,12 @@ def with_dataset(self, name=None, identifier=None):
115115
clean_up_required = False
116116

117117
if dataset is None:
118+
# Avoid nested datasets: name mustn't have '/' in it
119+
if len(Path(name).parts) > 1:
120+
raise errors.ParameterError(
121+
'Dataset name {} is not valid.'.format(name)
122+
)
123+
118124
clean_up_required = True
119125
dataset_ref = None
120126
identifier = str(uuid.uuid4())

tests/cli/test_datasets.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,14 @@ def test_dataset_create_exception_refs(runner, project, client):
182182
assert 'a' in result.output
183183

184184

185+
@pytest.mark.parametrize('name', ['dataset/new', '/dataset', 'dataset/'])
186+
def test_dataset_name_is_valid(client, runner, project, name):
187+
"""Test dataset name has no '/' character to avoid nested datasets."""
188+
result = runner.invoke(cli, ['dataset', 'create', name])
189+
assert 2 == result.exit_code
190+
assert 'is not valid' in result.output
191+
192+
185193
@pytest.mark.parametrize('output_format', DATASETS_FORMATS.keys())
186194
def test_datasets_list_empty(output_format, runner, project):
187195
"""Test listing without datasets."""

0 commit comments

Comments
 (0)