Add the notifier module to all submodules that are instrumented #30
Conversation
| relFolders := []string{notifierRelPath} | ||
| someOffset = common.PathFromBaseDirectory(cfx.inputDirectory, modFolder) | ||
| if someOffset != "" { | ||
| num_parents := len(strings.Split(someOffset, pathSep)) |
There was a problem hiding this comment.
should probably use https://pkg.go.dev/path#Split instead of strings. Just incase there is an escaped path seperator in a file/directory name.
There was a problem hiding this comment.
We need to know the number of directory levels to navigate to from modFolder, back to the antithesis module that will be required.
Example:
../../../../../notifier evaluated from /work/customer/aa/bb/cc/dd should resolve to /work/notifier
In this case, we need to know how many relative levels to 'go up', from the dd directory, to refer to the notifier module.
By using strings.Split (respecting the platform specific PathSeparator) we can readily get the number of levels needed.
Using path.Split() or filepath.Split() only parses the basename and the directory. We would have to repeatedly parse the directory to see how many levels there are. The hope is that filepath.Split() will properly handle filenames that contain PathSeparator characters. Is it worth it?
There was a problem hiding this comment.
f, _ := filepath.Rel("/test/t/x/y", "/fd")
fmt.Println(f)There was a problem hiding this comment.
Done: "tastes great, less filling"
someOffset = common.PathFromBaseDirectory(cfx.inputDirectory, modFolder)
if someOffset != "" {
destModuleFolder := filepath.Join(cfx.customerDirectory, someOffset)
os.MkdirAll(destModuleFolder, 0777)
basePath := filepath.Join(cfx.customerDirectory, someOffset)
targPath := cfx.notifierDirectory
if altDestModuleFolder, erx := filepath.Rel(basePath, targPath); erx == nil {
common.AddDependencies(modFolder, destModuleFolder, cfx.instrumentorVersion, notifierModule, altDestModuleFolder)
}
}
| for i := 0; i < num_parents; i++ { | ||
| relFolders = append(relFolders, notifierRelPath) | ||
| } | ||
| subRelPath := strings.Join(relFolders, pathSep) |
There was a problem hiding this comment.
| @@ -258,6 +286,10 @@ func (cfx *CommandFiles) FindSourceCode() (paths []string, numSkipped int, err e | |||
| return nil | |||
| } | |||
| if !strings.HasSuffix(path, ".go") { | |||
| if strings.HasSuffix(path, "go.mod") { | |||
There was a problem hiding this comment.
should probably be filepath.Base(path)=="go.mod"
There was a problem hiding this comment.
Done - uses filepath.Split() to get both dir and baseFile, then compares baseFile to "go.mod" and if they are equivalent, will consider dir as containing a submodule.
| @@ -258,6 +286,10 @@ func (cfx *CommandFiles) FindSourceCode() (paths []string, numSkipped int, err e | |||
| return nil | |||
| } | |||
| if !strings.HasSuffix(path, ".go") { | |||
There was a problem hiding this comment.
| @@ -312,3 +345,37 @@ func (cfx *CommandFiles) CreateSymbolTableWriter(filesHash string) (symWriter *i | |||
| func (cfx *CommandFiles) GetNotifierDirectory() string { | |||
| return cfx.notifierDirectory | |||
| } | |||
|
|
|||
| func (cfx *CommandFiles) ShowDependentModules() { | |||
There was a problem hiding this comment.
these functions are not recursive. Can dependent modules have recursive dependencies?
There was a problem hiding this comment.
dependent modules can not have recursive dependencies
| destGoModFile := fmt.Sprintf("%s/go.mod", customerOutputDirectory) | ||
| localNotifier := fmt.Sprintf("../%s", NOTIFIER_FOLDER) | ||
| localNotifier := filepath.Join(notifierRelPath, NOTIFIER_FOLDER) |
| return "" | ||
| } | ||
| someOffset := someNorm | ||
| if strings.HasPrefix(someNorm, baseNorm) { |
There was a problem hiding this comment.
this can be a can of worms. imagine the following scenario:
/path/to/dir
/path/to/dir_xyz
the second one will look like the prefix of the first one even though it is not a subdirectory. This is a non-trivial thing to test for (see golang/go#18358). Probably the simplest way that works 99% of the time is:
filepath.match(filepath.join(baseNorm,"*"), someNorm)
No description provided.