jprdonnelly/opentf
1
0
Fork 0
mirror of https://github.com/opentffoundation/opentf.git synced 2025-12-25 01:00:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

addrs: ModuleSourceRemote.String correctly handles query string in URL

Browse Source 
Previously it would append the "subdir" portion onto the query string, producing an invalid result.
This commit is contained in:
fatahfattah
2022-08-31 18:13:24 +02:00
committed by GitHub
parent ba113ff2cd
commit 8a31f0a6c8
2 changed files with 66 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/addrs/module_source.go
View File

@@ -316,10 +316,17 @@ func parseModuleSourceRemote(raw string) (ModuleSourceRemote, error) {
func (s ModuleSourceRemote) moduleSource() {}
func (s ModuleSourceRemote) String() string {
base := s.Package.String()
if s.Subdir != "" {
return s.Package.String() + "//" + s.Subdir
// Address contains query string
if strings.Contains(base, "?") {
parts := strings.SplitN(base, "?", 2)
return parts[0] + "//" + s.Subdir + "?" + parts[1]
}
return base + "//" + s.Subdir
}
return s.Package.String()
return base
}
func (s ModuleSourceRemote) ForDisplay() string {