From 194801c439b16fcbd85019cbf7d9d3d60920305f Mon Sep 17 00:00:00 2001 From: Samuel K Date: Sun, 18 Oct 2026 12:21:15 -0600 Subject: [PATCH 1/3] test(ide): cover jetbrains generic download, extract, and install helpers --- pkg/ide/jetbrains/generic_test.go | 234 ++++++++++++++++++++++++++++++ 1 file changed, 234 insertions(+) create mode 100644 pkg/ide/jetbrains/generic_test.go diff --git a/pkg/ide/jetbrains/generic_test.go b/pkg/ide/jetbrains/generic_test.go new file mode 100644 index 0000000000..c8300afa01 --- /dev/null +++ b/pkg/ide/jetbrains/generic_test.go @@ -0,0 +1,234 @@ +package jetbrains + +import ( + "archive/tar" + "bytes" + "compress/gzip" + "net/http" + "net/http/httptest" + "os" + "path/filepath" + "runtime" + "testing" + + "github.com/devsy-org/devsy/pkg/config" + devconfig "github.com/devsy-org/devsy/pkg/devcontainer/config" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestGetDownloadURLs(t *testing.T) { + const ( + latestAmd64 = "https://download.jetbrains.com/product?code=GO&platform=linux" + latestArm64 = "https://download.jetbrains.com/product?code=GO&platform=linuxARM64" + pinnedAmd64 = "https://download.jetbrains.com/go/goland-2025.2.tar.gz" + pinnedArm64 = "https://download.jetbrains.com/go/goland-2025.2-aarch64.tar.gz" + overrideURL = "https://override.test/goland.tar.gz" + ) + + tests := []struct { + name string + values map[string]config.OptionValue + wantAmd64 string + wantArm64 string + }{ + { + name: "nil values select latest product URLs", + values: nil, + wantAmd64: latestAmd64, + wantArm64: latestArm64, + }, + { + name: "empty version value falls back to latest", + values: map[string]config.OptionValue{VersionOption: {Value: ""}}, + wantAmd64: latestAmd64, + wantArm64: latestArm64, + }, + { + name: "pinned version fills both architecture templates", + values: map[string]config.OptionValue{ + VersionOption: {Value: "2025.2"}, + }, + wantAmd64: pinnedAmd64, + wantArm64: pinnedArm64, + }, + { + name: "amd64 override replaces only the amd64 URL", + values: map[string]config.OptionValue{ + VersionOption: {Value: "2025.2"}, + DownloadAmd64Option: {Value: overrideURL}, + }, + wantAmd64: overrideURL, + wantArm64: pinnedArm64, + }, + { + name: "empty overrides fall back to pinned templates", + values: map[string]config.OptionValue{ + VersionOption: {Value: "2025.2"}, + DownloadAmd64Option: {Value: ""}, + DownloadArm64Option: {Value: ""}, + }, + wantAmd64: pinnedAmd64, + wantArm64: pinnedArm64, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + amd64, arm64 := getDownloadURLs( + GolandOptions, + tt.values, + GolandProductCode, + GolandDownloadAmd64Template, + GolandDownloadArm64Template, + ) + assert.Equal(t, tt.wantAmd64, amd64) + assert.Equal(t, tt.wantArm64, arm64) + }) + } +} + +func TestGetDirectoryUnderHome(t *testing.T) { + s := newGenericServer("alice", &GenericOptions{ID: "goland"}) + + assert.Equal( + t, + "/home/alice/.cache/JetBrains/RemoteDev/dist/goland", + s.getDirectory("/home/alice"), + ) +} + +type tarEntry struct { + name string + body string +} + +func buildTarGz(t *testing.T, entries ...tarEntry) []byte { + t.Helper() + var buf bytes.Buffer + gz := gzip.NewWriter(&buf) + tw := tar.NewWriter(gz) + for _, e := range entries { + require.NoError(t, tw.WriteHeader(&tar.Header{ + Name: e.name, + Mode: 0o644, + Size: int64(len(e.body)), + })) + _, err := tw.Write([]byte(e.body)) + require.NoError(t, err) + } + require.NoError(t, tw.Close()) + require.NoError(t, gz.Close()) + return buf.Bytes() +} + +func writeArchive(t *testing.T, data []byte) string { + t.Helper() + p := filepath.Join(t.TempDir(), "goland.tar.gz") + require.NoError(t, os.WriteFile(p, data, 0o600)) + return p +} + +func TestExtractArchiveStripsTopLevelDirectory(t *testing.T) { + archive := writeArchive(t, buildTarGz(t, + tarEntry{name: "goland-2025.2/bin/goland.sh", body: "#!/bin/sh\n"}, + tarEntry{name: "goland-2025.2/product-info.json", body: "{}"}, + )) + dest := t.TempDir() + s := newGenericServer("alice", &GenericOptions{ID: "goland"}) + + require.NoError(t, s.extractArchive(archive, dest)) + + got, err := os.ReadFile(filepath.Join(dest, "bin", "goland.sh")) + require.NoError(t, err) + assert.Equal(t, "#!/bin/sh\n", string(got)) + assert.FileExists(t, filepath.Join(dest, "product-info.json")) + assert.NoDirExists(t, filepath.Join(dest, "goland-2025.2")) +} + +func TestExtractArchiveErrors(t *testing.T) { + s := newGenericServer("alice", &GenericOptions{ID: "goland"}) + + t.Run("missing archive", func(t *testing.T) { + missing := filepath.Join(t.TempDir(), "absent.tar.gz") + err := s.extractArchive(missing, t.TempDir()) + assert.ErrorIs(t, err, os.ErrNotExist) + }) + + t.Run("not an archive", func(t *testing.T) { + archive := writeArchive(t, []byte("this is not a tarball")) + err := s.extractArchive(archive, t.TempDir()) + assert.Error(t, err) + }) + + t.Run("entry escaping destination after strip is rejected", func(t *testing.T) { + base := t.TempDir() + dest := filepath.Join(base, "install") + archive := writeArchive(t, buildTarGz(t, + tarEntry{name: "goland-2025.2/../../escape.sh", body: "owned"}, + )) + + err := s.extractArchive(archive, dest) + + assert.ErrorContains(t, err, "path traversal") + assert.NoFileExists(t, filepath.Join(base, "escape.sh")) + }) +} + +func TestDownloadSelectsArchitectureURL(t *testing.T) { + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + _, _ = w.Write([]byte("body:" + r.URL.Path)) + })) + defer srv.Close() + + s := newGenericServer("alice", &GenericOptions{ + ID: "goland", + DisplayName: "Goland", + DownloadAmd64: srv.URL + "/amd64.tar.gz", + DownloadArm64: srv.URL + "/arm64.tar.gz", + }) + targetFolder := filepath.Join(t.TempDir(), "nested", "downloads") + + got, err := s.download(targetFolder) + require.NoError(t, err) + + wantPath := "/amd64.tar.gz" + if runtime.GOARCH == "arm64" { + wantPath = "/arm64.tar.gz" + } + assert.Equal(t, filepath.Join(targetFolder, "goland.tar.gz"), filepath.Clean(got)) + body, err := os.ReadFile(got) + require.NoError(t, err) + assert.Equal(t, "body:"+wantPath, string(body)) +} + +func TestDownloadHTTPErrorLeavesNoArchive(t *testing.T) { + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + http.NotFound(w, r) + })) + defer srv.Close() + + targetFolder := t.TempDir() + s := newGenericServer("alice", &GenericOptions{ + ID: "goland", + DisplayName: "Goland", + DownloadAmd64: srv.URL + "/missing.tar.gz", + DownloadArm64: srv.URL + "/missing.tar.gz", + }) + + _, err := s.download(targetFolder) + + assert.ErrorContains(t, err, "404") + assert.NoFileExists(t, filepath.Join(targetFolder, "goland.tar.gz")) +} + +func TestInstallPluginsSkipsWhenNoneConfigured(t *testing.T) { + s := newGenericServer("alice", &GenericOptions{ID: "goland"}) + setupInfo := &devconfig.Result{MergedConfig: &devconfig.MergedDevContainerConfig{}} + + // The install directory has no bin/remote-dev-server.sh; any attempt to + // run the installer would fail, so nil proves it was never invoked. + err := s.installPlugins(setupInfo, filepath.Join(t.TempDir(), "missing"), t.TempDir()) + + assert.NoError(t, err) +} From 7ebcf1f93407ba7d38ec009b9b6b699ba8e02a75 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Sun, 18 Oct 2026 12:42:21 -0600 Subject: [PATCH 2/3] test(ide): fix lint findings --- pkg/ide/jetbrains/generic_test.go | 160 +++++++++++++++++------------- 1 file changed, 89 insertions(+), 71 deletions(-) diff --git a/pkg/ide/jetbrains/generic_test.go b/pkg/ide/jetbrains/generic_test.go index c8300afa01..316c0ad8bb 100644 --- a/pkg/ide/jetbrains/generic_test.go +++ b/pkg/ide/jetbrains/generic_test.go @@ -4,6 +4,7 @@ import ( "archive/tar" "bytes" "compress/gzip" + "io/fs" "net/http" "net/http/httptest" "os" @@ -17,63 +18,71 @@ import ( "github.com/stretchr/testify/require" ) -func TestGetDownloadURLs(t *testing.T) { - const ( - latestAmd64 = "https://download.jetbrains.com/product?code=GO&platform=linux" - latestArm64 = "https://download.jetbrains.com/product?code=GO&platform=linuxARM64" - pinnedAmd64 = "https://download.jetbrains.com/go/goland-2025.2.tar.gz" - pinnedArm64 = "https://download.jetbrains.com/go/goland-2025.2-aarch64.tar.gz" - overrideURL = "https://override.test/goland.tar.gz" - ) +const ( + testID = "goland" + testVersion = "2025.2" + latestAmd64URL = "https://download.jetbrains.com/product?code=GO&platform=linux" + latestArm64URL = "https://download.jetbrains.com/product?code=GO&platform=linuxARM64" + pinnedAmd64URL = "https://download.jetbrains.com/go/goland-2025.2.tar.gz" + pinnedArm64URL = "https://download.jetbrains.com/go/goland-2025.2-aarch64.tar.gz" + overrideAmd64 = "https://override.test/goland.tar.gz" + amd64Archive = "amd64-archive" + arm64Archive = "arm64-archive" + amd64ArchiveURL = "/amd64.tar.gz" + arm64ArchiveURL = "/arm64.tar.gz" +) - tests := []struct { - name string - values map[string]config.OptionValue - wantAmd64 string - wantArm64 string - }{ - { - name: "nil values select latest product URLs", - values: nil, - wantAmd64: latestAmd64, - wantArm64: latestArm64, - }, - { - name: "empty version value falls back to latest", - values: map[string]config.OptionValue{VersionOption: {Value: ""}}, - wantAmd64: latestAmd64, - wantArm64: latestArm64, - }, - { - name: "pinned version fills both architecture templates", - values: map[string]config.OptionValue{ - VersionOption: {Value: "2025.2"}, - }, - wantAmd64: pinnedAmd64, - wantArm64: pinnedArm64, +type downloadURLCase struct { + name string + values map[string]config.OptionValue + wantAmd64 string + wantArm64 string +} + +var downloadURLCases = []downloadURLCase{ + { + name: "nil values select latest product URLs", + values: nil, + wantAmd64: latestAmd64URL, + wantArm64: latestArm64URL, + }, + { + name: "empty version value falls back to latest", + values: map[string]config.OptionValue{VersionOption: {Value: ""}}, + wantAmd64: latestAmd64URL, + wantArm64: latestArm64URL, + }, + { + name: "pinned version fills both architecture templates", + values: map[string]config.OptionValue{ + VersionOption: {Value: testVersion}, }, - { - name: "amd64 override replaces only the amd64 URL", - values: map[string]config.OptionValue{ - VersionOption: {Value: "2025.2"}, - DownloadAmd64Option: {Value: overrideURL}, - }, - wantAmd64: overrideURL, - wantArm64: pinnedArm64, + wantAmd64: pinnedAmd64URL, + wantArm64: pinnedArm64URL, + }, + { + name: "amd64 override replaces only the amd64 URL", + values: map[string]config.OptionValue{ + VersionOption: {Value: testVersion}, + DownloadAmd64Option: {Value: overrideAmd64}, }, - { - name: "empty overrides fall back to pinned templates", - values: map[string]config.OptionValue{ - VersionOption: {Value: "2025.2"}, - DownloadAmd64Option: {Value: ""}, - DownloadArm64Option: {Value: ""}, - }, - wantAmd64: pinnedAmd64, - wantArm64: pinnedArm64, + wantAmd64: overrideAmd64, + wantArm64: pinnedArm64URL, + }, + { + name: "empty overrides fall back to pinned templates", + values: map[string]config.OptionValue{ + VersionOption: {Value: testVersion}, + DownloadAmd64Option: {Value: ""}, + DownloadArm64Option: {Value: ""}, }, - } + wantAmd64: pinnedAmd64URL, + wantArm64: pinnedArm64URL, + }, +} - for _, tt := range tests { +func TestGetDownloadURLs(t *testing.T) { + for _, tt := range downloadURLCases { t.Run(tt.name, func(t *testing.T) { amd64, arm64 := getDownloadURLs( GolandOptions, @@ -89,7 +98,7 @@ func TestGetDownloadURLs(t *testing.T) { } func TestGetDirectoryUnderHome(t *testing.T) { - s := newGenericServer("alice", &GenericOptions{ID: "goland"}) + s := newGenericServer("alice", &GenericOptions{ID: testID}) assert.Equal( t, @@ -129,25 +138,32 @@ func writeArchive(t *testing.T, data []byte) string { return p } +// readFileIn reads name relative to dir, so the path under test stays a +// fixed name inside a directory the test owns. +func readFileIn(t *testing.T, dir, name string) []byte { + t.Helper() + data, err := fs.ReadFile(os.DirFS(dir), name) + require.NoError(t, err) + return data +} + func TestExtractArchiveStripsTopLevelDirectory(t *testing.T) { archive := writeArchive(t, buildTarGz(t, tarEntry{name: "goland-2025.2/bin/goland.sh", body: "#!/bin/sh\n"}, tarEntry{name: "goland-2025.2/product-info.json", body: "{}"}, )) dest := t.TempDir() - s := newGenericServer("alice", &GenericOptions{ID: "goland"}) + s := newGenericServer("alice", &GenericOptions{ID: testID}) require.NoError(t, s.extractArchive(archive, dest)) - got, err := os.ReadFile(filepath.Join(dest, "bin", "goland.sh")) - require.NoError(t, err) - assert.Equal(t, "#!/bin/sh\n", string(got)) + assert.Equal(t, "#!/bin/sh\n", string(readFileIn(t, dest, "bin/goland.sh"))) assert.FileExists(t, filepath.Join(dest, "product-info.json")) assert.NoDirExists(t, filepath.Join(dest, "goland-2025.2")) } func TestExtractArchiveErrors(t *testing.T) { - s := newGenericServer("alice", &GenericOptions{ID: "goland"}) + s := newGenericServer("alice", &GenericOptions{ID: testID}) t.Run("missing archive", func(t *testing.T) { missing := filepath.Join(t.TempDir(), "absent.tar.gz") @@ -177,29 +193,31 @@ func TestExtractArchiveErrors(t *testing.T) { func TestDownloadSelectsArchitectureURL(t *testing.T) { srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - _, _ = w.Write([]byte("body:" + r.URL.Path)) + if r.URL.Path == arm64ArchiveURL { + _, _ = w.Write([]byte(arm64Archive)) + return + } + _, _ = w.Write([]byte(amd64Archive)) })) defer srv.Close() s := newGenericServer("alice", &GenericOptions{ - ID: "goland", + ID: testID, DisplayName: "Goland", - DownloadAmd64: srv.URL + "/amd64.tar.gz", - DownloadArm64: srv.URL + "/arm64.tar.gz", + DownloadAmd64: srv.URL + amd64ArchiveURL, + DownloadArm64: srv.URL + arm64ArchiveURL, }) targetFolder := filepath.Join(t.TempDir(), "nested", "downloads") got, err := s.download(targetFolder) require.NoError(t, err) - wantPath := "/amd64.tar.gz" + wantBody := amd64Archive if runtime.GOARCH == "arm64" { - wantPath = "/arm64.tar.gz" + wantBody = arm64Archive } - assert.Equal(t, filepath.Join(targetFolder, "goland.tar.gz"), filepath.Clean(got)) - body, err := os.ReadFile(got) - require.NoError(t, err) - assert.Equal(t, "body:"+wantPath, string(body)) + assert.Equal(t, filepath.Join(targetFolder, testID+".tar.gz"), filepath.Clean(got)) + assert.Equal(t, wantBody, string(readFileIn(t, filepath.Dir(got), filepath.Base(got)))) } func TestDownloadHTTPErrorLeavesNoArchive(t *testing.T) { @@ -210,7 +228,7 @@ func TestDownloadHTTPErrorLeavesNoArchive(t *testing.T) { targetFolder := t.TempDir() s := newGenericServer("alice", &GenericOptions{ - ID: "goland", + ID: testID, DisplayName: "Goland", DownloadAmd64: srv.URL + "/missing.tar.gz", DownloadArm64: srv.URL + "/missing.tar.gz", @@ -219,11 +237,11 @@ func TestDownloadHTTPErrorLeavesNoArchive(t *testing.T) { _, err := s.download(targetFolder) assert.ErrorContains(t, err, "404") - assert.NoFileExists(t, filepath.Join(targetFolder, "goland.tar.gz")) + assert.NoFileExists(t, filepath.Join(targetFolder, testID+".tar.gz")) } func TestInstallPluginsSkipsWhenNoneConfigured(t *testing.T) { - s := newGenericServer("alice", &GenericOptions{ID: "goland"}) + s := newGenericServer("alice", &GenericOptions{ID: testID}) setupInfo := &devconfig.Result{MergedConfig: &devconfig.MergedDevContainerConfig{}} // The install directory has no bin/remote-dev-server.sh; any attempt to From ab09b6d7c53d6f10e9db11bf9f31e244c690a56f Mon Sep 17 00:00:00 2001 From: Samuel K Date: Sun, 18 Oct 2026 18:21:50 -0600 Subject: [PATCH 3/3] test(ide): tighten jetbrains generic test assertions --- pkg/ide/jetbrains/generic_test.go | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkg/ide/jetbrains/generic_test.go b/pkg/ide/jetbrains/generic_test.go index 316c0ad8bb..0b3c6afb3b 100644 --- a/pkg/ide/jetbrains/generic_test.go +++ b/pkg/ide/jetbrains/generic_test.go @@ -26,6 +26,7 @@ const ( pinnedAmd64URL = "https://download.jetbrains.com/go/goland-2025.2.tar.gz" pinnedArm64URL = "https://download.jetbrains.com/go/goland-2025.2-aarch64.tar.gz" overrideAmd64 = "https://override.test/goland.tar.gz" + overrideArm64 = "https://override.test/goland-arm64.tar.gz" amd64Archive = "amd64-archive" arm64Archive = "arm64-archive" amd64ArchiveURL = "/amd64.tar.gz" @@ -79,6 +80,15 @@ var downloadURLCases = []downloadURLCase{ wantAmd64: pinnedAmd64URL, wantArm64: pinnedArm64URL, }, + { + name: "arm64 override replaces only the arm64 URL", + values: map[string]config.OptionValue{ + VersionOption: {Value: testVersion}, + DownloadArm64Option: {Value: overrideArm64}, + }, + wantAmd64: pinnedAmd64URL, + wantArm64: overrideArm64, + }, } func TestGetDownloadURLs(t *testing.T) { @@ -193,11 +203,14 @@ func TestExtractArchiveErrors(t *testing.T) { func TestDownloadSelectsArchitectureURL(t *testing.T) { srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if r.URL.Path == arm64ArchiveURL { + switch r.URL.Path { + case arm64ArchiveURL: _, _ = w.Write([]byte(arm64Archive)) - return + case amd64ArchiveURL: + _, _ = w.Write([]byte(amd64Archive)) + default: + http.NotFound(w, r) } - _, _ = w.Write([]byte(amd64Archive)) })) defer srv.Close()