Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions coriolis/api/v1/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ def _process_user_scripts(
payload = user_scripts
if sanitize_newlines:
payload = _sanitize_newlines(payload)
if not payload.strip("\r\n "):
raise exception.InvalidInput(
"Empty script received. "
"Use 'None' if the script should be removed.")
return [
{
"phase": constants.PHASE_OSMORPHING_POST_OS_MOUNT,
Expand Down Expand Up @@ -141,6 +145,10 @@ def _process_user_scripts(
if sanitize_newlines:
script_item["payload"] = _sanitize_newlines(
script_item["payload"])
if not script_item["payload"].strip("\r\n "):
raise exception.InvalidInput(
"Empty script received. "
"Use 'None' if the script should be removed.")

return user_scripts
else:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,31 @@
global:
linux: 'mock_scripts_linux'
windows: 'mock_scripts_windows'
instances: "invalid"
instances: "invalid"

- user_scripts:
global:
linux: ''

- user_scripts:
global:
instances:
some_instance: ''

- user_scripts:
global:
linux:
- phase: osmorphing_post_os_mount
payload: ''

- user_scripts:
global:
instances:
some_instance: ''

- user_scripts:
global:
instances:
some_instance:
- phase: osmorphing_post_os_mount
payload: ''
Loading