Skip to content

Commit 91f96bf

Browse files
authored
fix: fix submodule detection (#44)
1 parent 742bd95 commit 91f96bf

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

converter.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ func (c *DefaultSourceConverter) ConvertToLocal(ctx context.Context, modulePath
3333
regexp.QuoteMeta(moduleInfo.Namespace), regexp.QuoteMeta(moduleInfo.Name), regexp.QuoteMeta(moduleInfo.Provider))
3434
re := regexp.MustCompile(modulePattern)
3535

36-
submodulePattern := fmt.Sprintf(`(?m)^(\s*module\s+"[^"]*"\s*\{[^}]*source\s*=\s*)"%s/%s/%s//modules/([^"]*)"([^}]*version\s*=\s*"[^"]*")?([^}]*\})`,
37-
regexp.QuoteMeta(moduleInfo.Namespace), regexp.QuoteMeta(moduleInfo.Name), regexp.QuoteMeta(moduleInfo.Provider))
36+
submodulePattern := fmt.Sprintf(`(?m)^(\s*module\s+"[^"]*"\s*\{[^}]*source\s*=\s*)"%s/([^/]+)/%s//modules/([^"]*)"([^}]*version\s*=\s*"[^"]*")?([^}]*\})`,
37+
regexp.QuoteMeta(moduleInfo.Namespace), regexp.QuoteMeta(moduleInfo.Provider))
3838
subRe := regexp.MustCompile(submodulePattern)
3939

4040
for _, file := range files {
@@ -99,8 +99,8 @@ func (c *DefaultSourceConverter) processSubmoduleContent(content string, re *reg
9999
}
100100

101101
moduleStart := parts[1]
102-
submoduleName := parts[4]
103-
moduleEnd := parts[6]
102+
submoduleName := parts[3]
103+
moduleEnd := parts[5]
104104

105105
// Remove version line if present
106106
versionRegex := regexp.MustCompile(`(?m)^\s*version\s*=\s*"[^"]*"\s*\n?`)

0 commit comments

Comments
 (0)