Fix main.go generation when executing on a windows machine

[jaysonsantos]

When normalizing the importPath it will try to write on main.go files with imports
like github.com/caddyserver/xcaddy/c:\xcaddy

The fix is basically changing from path.Join(currentModule, strings.TrimPrefix(cwd, filepath.ToSlash(moduleDir))) to path.Join(currentModule, filepath.ToSlash(strings.TrimPrefix(cwd, moduleDir)))

[jaysonsantos]

I just rebased it

[mholt]

Thanks for the fix! How does it handle the situation where you're in a subdir of a module, i.e. cwd = /xcaddy/subdir, and on Windows, i.e. c:\xcaddy\subdir?

[mholt]

Suggested change

	func Test_normalizeImportPath(t *testing.T) {
	func TestNormalizeImportPath(t *testing.T) {

[mholt]

Suggested change

	func normalizeImportPath(currentModule string, cwd string, moduleDir string) string {
	func normalizeImportPath(currentModule, cwd, moduleDir string) string {

[jaysonsantos]

Hey @mholt
Do you mean that this testcase:

args{
	currentModule: "github.com/caddyserver/xcaddy",
	cwd:           "c:\\xcaddy\\subdir",
	moduleDir:     "c:\\xcaddy\\subdir",
}

should be:
github.com/caddyserver/xcaddy/subdir
?

[mholt]

I mean we need to add at least 2 more test cases.

[jaysonsantos]

If I understood correctly, something like this?

diff --git a/cmd/xcaddy/main_test.go b/cmd/xcaddy/main_test.go
index af9f0de..23975c4 100644
--- a/cmd/xcaddy/main_test.go
+++ b/cmd/xcaddy/main_test.go
@@ -88,11 +88,21 @@ func TestNormalizeImportPath(t *testing.T) {
 			cwd:           "/xcaddy",
 			moduleDir:     "/xcaddy",
 		}, "github.com/caddyserver/xcaddy"},
+		{"linux-subpath", args{
+			currentModule: "github.com/caddyserver/xcaddy",
+			cwd:           "/xcaddy/subdir",
+			moduleDir:     "/xcaddy",
+		}, "github.com/caddyserver/xcaddy/subdir"},
 		{"windows-path", args{
 			currentModule: "github.com/caddyserver/xcaddy",
 			cwd:           "c:\\xcaddy",
 			moduleDir:     "c:\\xcaddy",
 		}, "github.com/caddyserver/xcaddy"},
+		{"windows-subpath", args{
+			currentModule: "github.com/caddyserver/xcaddy",
+			cwd:           "c:\\xcaddy\\subdir",
+			moduleDir:     "c:\\xcaddy",
+		}, "github.com/caddyserver/xcaddy/subdir"},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

[mholt]

Yes I think that's right! (My brain's all over the place today but see if that works)

[jaysonsantos]

Thank you!
Done

[jaysonsantos]

Hmm, and it fails on Linux for windows subpaths.
Should I split up the test for linux and windows and run windows' one only on it?

[mholt]

Well, Windows paths shouldn't come up on Unix at all, so running tests for Windows path on Unix does seem a bit unnecessary.

Or, maybe something like this?

	return path.Join(currentModule, filepath.ToSlash(strings.TrimPrefix(cwd, filepath.ToSlash(moduleDir))))

[jaysonsantos]

I guess for that to work I need to make the cwd slashed as well.
I will try in a few and commit if it works

[mholt]

I guess for that to work I need to make the cwd slashed as well.

Oh, yes, that's probably true!

[jaysonsantos]

Hey there ToSlash takes the separator from the OS so running it on windows paths won't work so I changed the tests to run the windows cases only only when GOOS matches

[mholt]

Cool, that works. Thanks so much for contributing this!