fix(catalog): construct valid module source URLs for version-pinned modules #5173 (#5174)

* fix(5173): construct valid module source URLs

* add tests for TerraformSourcePath URL formatting

* use external test package pattern

* add test case for multiple query params

Author: rvelichkov

internal/services/catalog/module/module.go

@@ -95,8 +95,22 @@ func (module *Module) URL() string {
 	return module.url
 }
 
+// TerraformSourcePath returns the module source URL in the format expected by go-getter:
+// baseURL//moduleDir?query (e.g., git::https://github.com/org/repo.git//modules/foo?ref=v1.0.0)
 func (module *Module) TerraformSourcePath() string {
-	return module.cloneURL + "//" + module.moduleDir
+	if module.moduleDir == "" {
+		return module.cloneURL
+	}
+
+	// Split on ? to separate base URL from query string
+	base, query, _ := strings.Cut(module.cloneURL, "?")
+
+	result := base + "//" + module.moduleDir
+	if query != "" {
+		result += "?" + query
+	}
+
+	return result
 }
 
 func (module *Module) isValid() (bool, error) {
@@ -126,3 +140,11 @@ func (module *Module) isValid() (bool, error) {
 func (module *Module) ModuleDir() string {
 	return module.moduleDir
 }
+
+// NewModuleForTest creates a Module for testing purposes.
+func NewModuleForTest(cloneURL, moduleDir string) *Module {
+	return &Module{
+		cloneURL:  cloneURL,
+		moduleDir: moduleDir,
+	}
+}

internal/services/catalog/module/module_test.go

@@ -0,0 +1,65 @@
+package module_test
+
+import (
+	"testing"
+
+	"github.com/gruntwork-io/terragrunt/internal/services/catalog/module"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestTerraformSourcePath(t *testing.T) {
+	t.Parallel()
+
+	testCases := []struct {
+		name      string
+		cloneURL  string
+		moduleDir string
+		expected  string
+	}{
+		{
+			name:      "root module without ref",
+			cloneURL:  "git::https://github.com/org/repo.git",
+			moduleDir: "",
+			expected:  "git::https://github.com/org/repo.git",
+		},
+		{
+			name:      "root module with ref",
+			cloneURL:  "git::https://github.com/org/repo.git?ref=v1.0.0",
+			moduleDir: "",
+			expected:  "git::https://github.com/org/repo.git?ref=v1.0.0",
+		},
+		{
+			name:      "submodule without ref",
+			cloneURL:  "git::https://github.com/org/repo.git",
+			moduleDir: "modules/foo",
+			expected:  "git::https://github.com/org/repo.git//modules/foo",
+		},
+		{
+			name:      "submodule with ref",
+			cloneURL:  "git::https://github.com/org/repo.git?ref=v1.0.0",
+			moduleDir: "modules/foo",
+			expected:  "git::https://github.com/org/repo.git//modules/foo?ref=v1.0.0",
+		},
+		{
+			name:      "ssh url with ref",
+			cloneURL:  "git::ssh://git@github.com/org/repo.git?ref=v1.0.0",
+			moduleDir: "modules/bar",
+			expected:  "git::ssh://git@github.com/org/repo.git//modules/bar?ref=v1.0.0",
+		},
+		{
+			name:      "multiple query params",
+			cloneURL:  "git::https://github.com/org/repo.git?ref=v1.0.0&depth=1",
+			moduleDir: "modules/foo",
+			expected:  "git::https://github.com/org/repo.git//modules/foo?ref=v1.0.0&depth=1",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			m := module.NewModuleForTest(tc.cloneURL, tc.moduleDir)
+			assert.Equal(t, tc.expected, m.TerraformSourcePath())
+		})
+	}
+}