lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lang: gapi: Remap the module path correctly

Browse Source 
If we've set the --module-path arg, then we expect to rebase that path
out of the deploy, and instead it should show up as /modules/ which is
the standard. Handle this scenario.
This commit is contained in:
James Shubin
2024-11-28 16:29:33 -05:00
parent c2f75d64a6
commit 517fc1e05b
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lang/gapi/gapi.go
View File

@@ -424,6 +424,16 @@ func (obj *GAPI) Cli(info *gapi.Info) (*gapi.Deploy, error) {
logf("base:\n%s", m) logf("base:\n%s", m)
return nil, errwrap.Wrapf(err, "malformed source module path: `%s`", src) return nil, errwrap.Wrapf(err, "malformed source module path: `%s`", src)
} }
} else if modules != "" && strings.HasPrefix(src, modules) {
// Here we've succeeded in the above rebase, but before
// we accept it completely, let's first check if it's
// actually a MODULE_PATH situation. If so, let's rebase
// it only the `/modules/` directory which is used in
// the deploy.
dst, err = util.Rebase(src, modules, "/"+interfaces.ModuleDirectory)
if err != nil {
return nil, errwrap.Wrapf(err, "malformed src path: `%s`", src)
}
} }
if strings.HasSuffix(src, "/") { // it's a dir if strings.HasSuffix(src, "/") { // it's a dir