Fix spin up --help for unbuilt apps
#1980
Conversation
Signed-off-by: Lann Martin <lann.martin@fermyon.com>
First we "resolve" the AppSource into a ResolvedAppSource. This step isn't expected to "load" an app fully, e.g. copying static assets. At this stage we have enough information to determine the trigger executor, which lets us serve `--help`. Then we "load" the ResolvedAppSource into a LockedApp as before. Note that this change is basically a no-op for OCI apps as the changes to split these stages are incompatible with the rest of the OCI code today. Signed-off-by: Lann Martin <lann.martin@fermyon.com>
| }, | ||
| } | ||
|
|
||
| impl ResolvedAppSource { |
There was a problem hiding this comment.
I'm tripping over the name here - too many app sources I fear, and this is a different sense of "source" from the one a few lines above. The use case for this is more "application manifest" - I realise the water is muddied by it fully materialising the OCI case, but given your TODO of only loading the lockfile, maybe we should consider a manifesty name, with the fully resolved OCI case being an implementation detail?
(For me this is probably exacerbated by the "resolved" because of knowing the old name for the "figure out the source from the command" function!)
There was a problem hiding this comment.
This is the 3rd unsatisfactory name I came up with.
| async fn prepare_app_from_file( | ||
| // Take the AppSource and do the minimum amount of work necessary to | ||
| // be able to resolve the trigger executor. | ||
| async fn resolve_app_source( |
There was a problem hiding this comment.
(a note for the future, not for now) This function and load_resolved_app_source now have almost nothing to do with self - it might be interesting to explore making AppSource and ResolvedAppSource more self-contained at some future point. Not a consideration for now though
There was a problem hiding this comment.
Indeed up.rs seems ripe for major refactoring "pretty soon".
This shuffles the
spin uplogic around a bit to allow--helpcalls to execute before fully loading local apps. A nice side benefit is that--helpshould be a bit faster, especially for apps with lots offiles. Note thatOCIbehavior is (should be) unchanged as the current OCI codebase doesn't really allow for splitting up "get the manfiest" and "load everything".Fixes #1957