actions: run: Check script exists during recipe verification #302
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
obbardc
force-pushed
the
wip/obbardc/fix-run-missing-mount
branch
from
a8a574e
to
f4d49c5
Compare
|
fwiw this would be a great change to start adding test for |
obbardc
changed the title
obbardc
force-pushed
the
wip/obbardc/fix-run-missing-mount
branch
2 times, most recently
from
27c3f44
to
fb2c1c0
Compare
obbardc
force-pushed
the
wip/obbardc/fix-run-missing-mount
branch
from
fb2c1c0
to
8fd0ace
Compare
obbardc
force-pushed
the
wip/obbardc/fix-run-missing-mount
branch
from
8fd0ace
to
8c6a800
Compare
Rework the logic to extract the script path and arguments into one place such that the code is more readable with less duplication. Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
The label for the run action currently contains all of the arguments of a script; change this to just show the base path of the script so we don't pollute the log. Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
If a script doesn't exist or the permissions are wrong, the recipe exits during the recipe execution. Let's do some early checks in the Verify stage to ensure the script exists on the host filesystem and a basic check that the file has executable permission bit set. This check also follows symlinks. Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
Signed-off-by: Christopher Obbard <chris.obbard@collabora.com>
obbardc
force-pushed
the
wip/obbardc/fix-run-missing-mount
branch
from
8c6a800
to
5fe7313
Compare
sjoerdsimons
requested changes
Jan 13, 2024
| @@ -120,7 +120,7 @@ func (run *RunAction) doRun(context debos.DebosContext) error { | |||
| } | |||
| cmdline = []string{run.scriptPath} | |||
| cmdline = append(cmdline, run.scriptArgs...) | |||
| label = path.Base(run.Script) | |||
| label = path.Base(run.scriptPath) | |||
There was a problem hiding this comment.
but then you don't see the arguments to the script anymore, which is a loss.. Probably this doesn't belong in this PR (it doesn't help with your stated target i think) but preventing "pollution" we could do either by:
- unify truncating the length like the Command handling does
- printing what gets run first and then either not or only providing a minimal label on each line after
| return err | ||
| } | ||
|
|
||
| if stat.IsDir() { |
There was a problem hiding this comment.
Rather then checking if it's a Dir this should proably check if it's a regular file
| } | ||
|
|
||
| /* Check the script is executable */ | ||
| if stat.Mode()&0111 == 0 { |
There was a problem hiding this comment.
executable and readable ideally; though i don't think golang gives you nice helpers for that unfortunately :/
| @@ -136,6 +136,8 @@ jobs: | |||
| test: { name: "arch", case: "arch" } | |||
| - backend: kvm | |||
| test: { name: "apertis", case: "apertis" } | |||
| - backend: kvm | |||
| test: { name: "run", case: "run" } | |||
There was a problem hiding this comment.
kvm actually has the highest latency atm because of the runner setup; and really this should probably run on all types.. That said could you merge it with an existing tests so we don't need a new CI job for it ?
e.g. maybe merge it with the recipes test and the overlay test :)
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.
If a script doesn't exist or the permissions are wrong, the
recipe exits during execution. Let's check early if the
script exists on the host filesystem and that the file has
executable permission bit set.
Signed-off-by: Christopher Obbard chris.obbard@collabora.com