[RSDK-9498] Search for meta.json File in Top Level of Module #4675
Conversation
viambot
added
safe to test
viambot
added
safe to test
|
Right now, the meta.json file is being found, but the path to the set up script it provides is being used relative to the execution directory - as opposed to the top level directory - when testing :/ |
viambot
added
safe to test
config/module.go
Outdated
| @@ -282,7 +282,13 @@ func (m *Module) FirstRun( | |||
| logger.Debug("no first run script specified, skipping first run") | |||
| return nil | |||
| } | |||
| relFirstRunPath, err := utils.SafeJoinDir(unpackedModDir, meta.FirstRun) | |||
| var firstRunTopLevelDir string | |||
There was a problem hiding this comment.
Before, meta.FirstRun was used relative to the directory specified by unpackedModDir. In the case that the module has a type of registry, this would just be the parent directory of the module's entry point executable - not necessarily the top level of its directory. Here, I've changed it so that if moduleWorkingDirectory is not the empty string (which is equivalent to saying that the module's type is registry and the VIAM_ROOT_MODULE environment variable has been set), then the module's top level directory is used to find and execute the specified "first run" script.
config/module.go
Outdated
| // note: we don't look at internal meta.json in local non-tarball case because user has explicitly requested a binary. | ||
| localNonTarball := m.Type == ModuleTypeLocal && !m.NeedsSyntheticPackage() | ||
| if !localNonTarball { | ||
| // this is case 1, meta.json in exe folder. | ||
| metaPath, err := utils.SafeJoinDir(unpackedModDir, "meta.json") |
There was a problem hiding this comment.
Here to line 400 is just a refactor - no functional change besides the additional string return value.
config/module.go
Outdated
| return meta, "", err | ||
| } | ||
|
|
||
| if m.Type == ModuleTypeRegistry { |
There was a problem hiding this comment.
Before, this function would automatically return an error and no meta information when m.Type == ModuleTypeRegistry
viambot
added
safe to test
viambot
added
safe to test
viambot
added
safe to test
|
Closed in favor of #4689 |
WIP: I accidentally force pushed from the wrong branch here. I have what this PR should actually contain on my computer at home, so I'll push that code up soon..
Search for a registry module's meta.json file in the top level of the module and in the parent directory of its executable entry point.
Testing
Running the robot linked in the Jira ticket no longer outputs the WARN log listed.
first_run.shis successfully sourced and executed, and adist.first_run_succeededfile is created.Note: This has only been tested with a registry module, not a local module.