ModuleSourceRemote String now considers presence of query string (#31250

)
hashicorp · Aug 12, 2022 · 5485b30 · 5485b30
1 parent 2aff678
commit 5485b30
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/internal/addrs/module_source.go b/internal/addrs/module_source.go
@@ -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 {