workflows: add validate function to workspace_root_path #397
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
audrium
reviewed
Sep 1, 2021
reana_server/rest/workspaces.py
Outdated
| type: object | ||
| properties: | ||
| workspaces_available: | ||
| type: list |
There was a problem hiding this comment.
There is a small mistake here, it should be array instead of list. You can update reana_server openapi docs and publish it to reana-commons by doing the following:
cd reana_server
FLASK_APP=reana_server/app.py python ./scripts/generate_openapi_spec.py --publish
diff -q -w temp_openapi.json docs/openapi.json
mv temp_openapi.json docs/openapi.json
reana-dev git-submodule --update
edit: it seems you also have to specify types of list items, something like this:
...
properties:
workspaces_available:
type: array
items:
type: string
...
marcdiazsan
force-pushed
the
workspace-validation
branch
from
fccae78 to
871aa43
Compare
audrium
reviewed
Sep 2, 2021
reana_server/rest/workflows.py
Outdated
| @@ -401,10 +402,15 @@ def create_workflow(user): # noqa | |||
| workflow_dict["operational_options"] = validate_operational_options( | |||
| workflow_engine, reana_spec_file.get("inputs", {}).get("options", {}) | |||
| ) | |||
| workspace_root_path = validate_workspace( | |||
| reana_spec_file.get("workspace", {}).get("root_path", None) | |||
There was a problem hiding this comment.
Minor: None is default option for .get(), no need to specify it
reana_server/rest/workspaces.py
Outdated
| Request failed. Internal controller error. | ||
| """ | ||
| try: | ||
| if ADMIN_ALLOWED_WORKSPACES: |
There was a problem hiding this comment.
Please see my comment, I think this part could be simplified if we would store the final list in reana-commons
marcdiazsan
force-pushed
the
workspace-validation
branch
from
871aa43 to
ee81a92
Compare
audrium
approved these changes
Sep 10, 2021
…point to list available workspaces Closes reanahub/reana-client#546
marcdiazsan
force-pushed
the
workspace-validation
branch
from
ee81a92 to
d019dac
Compare
Codecov Report
@@ Coverage Diff @@
## master #397 +/- ##
==========================================
+ Coverage 49.92% 50.05% +0.12%
==========================================
Files 22 23 +1
Lines 1957 1974 +17
==========================================
+ Hits 977 988 +11
- Misses 980 986 +6
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Goes on top of reanahub/reana-client#545 PR set, and reanahub/reana#532 PR set
Closes reanahub/reana-client#546