fix(#29 review r1): stack-delete leak, rollback/retention/version tests, UX trap

F3: deleting a file-based stack now removes the stack ROOT (compose/{id}) via a new removeStackProjectDir helper, not stack.ProjectPath (which the PR repointed to compose/{id}/v{N}) — old version dirs + parent no longer leak. Git stacks unchanged. F1: tests for validateRollbackTarget (rejects 0/neg/>current/hole) and the rollback snapshot (client content ignored, target read from disk, monotonic new version, note). F2: tests for pruneStackFileVersionDirs (deletes given dirs, swallows errors) + the post-commit gate contract + a monotonic-version regression guard. F4: handler tests for ?version= (negative/out-of-range -> 400, valid version served, legacy fallback). F5: swagger @param version on GET file; @version 2.44.0 (handler.go) + package.json 2.44.0, matching APIVersion. F6: the version selector no longer sets rollbackTo for the current/top version and clears it on a manual buffer edit (so edits are honored, not silently discarded); returning to the current version restores the current content. Distinguishes real user edits from the programmatic version-load (CodeMirror ExternalChange). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-02 17:28:52 +03:00
parent d0d3c068ba
commit bb68acfbf6
8 changed files with 616 additions and 11 deletions
@@ -76,6 +76,130 @@ func TestStackFile_GitPendingRedeploy_Returns409(t *testing.T) {
 	require.Equal(t, http.StatusConflict, rr.Code)
 }

+// setupFileVersionStackTest wires a handler over a real datastore + filesystem and creates a
+// file-based (non-git) stack together with the given on-disk file versions. It returns the handler
+// and the created stack so version-selection cases can be exercised through the HTTP handler.
+func setupFileVersionStackTest(t *testing.T, stack *portainer.Stack, versionContent map[int]string) *Handler {
+	t.Helper()
+
+	_, store := datastore.MustNewTestStore(t, false, true)
+
+	_, err := mockCreateUser(store)
+	require.NoError(t, err)
+
+	endpoint, err := mockCreateEndpoint(store)
+	require.NoError(t, err)
+
+	fileService, err := filesystem.NewService(t.TempDir(), "")
+	require.NoError(t, err)
+
+	handler := NewHandler(testhelpers.NewTestRequestBouncer())
+	handler.FileService = fileService
+	handler.DataStore = store
+
+	stackFolder := strconv.Itoa(int(stack.ID))
+	for v, content := range versionContent {
+		_, err := fileService.StoreStackFileFromBytesByVersion(stackFolder, stack.EntryPoint, v, []byte(content))
+		require.NoError(t, err)
+	}
+
+	stack.EndpointID = endpoint.ID
+	require.NoError(t, store.Stack().Create(stack))
+
+	return handler
+}
+
+// requestStackFile performs a GET /stacks/{id}/file request (optionally with a raw query string).
+func requestStackFile(t *testing.T, handler *Handler, stackID portainer.StackID, rawQuery string) *httptest.ResponseRecorder {
+	t.Helper()
+
+	target := "/stacks/" + strconv.Itoa(int(stackID)) + "/file"
+	if rawQuery != "" {
+		target += "?" + rawQuery
+	}
+
+	req := mockCreateStackRequestWithSecurityContext(http.MethodGet, target, nil)
+	rr := httptest.NewRecorder()
+	handler.ServeHTTP(rr, req)
+
+	return rr
+}
+
+// TestStackFile_VersionParam exercises the ?version= selector on a file-based stack: rejects a
+// negative version, rejects an out-of-range version, and returns the selected version's content.
+func TestStackFile_VersionParam(t *testing.T) {
+	t.Parallel()
+
+	newHandlerAndStack := func(t *testing.T) (*Handler, portainer.StackID) {
+		stack := &portainer.Stack{
+			ID:               10,
+			Type:             portainer.DockerComposeStack,
+			EntryPoint:       "docker-compose.yml",
+			StackFileVersion: 3,
+			Versions: []portainer.StackFileVersionInfo{
+				{Version: 1}, {Version: 2}, {Version: 3},
+			},
+		}
+		handler := setupFileVersionStackTest(t, stack, map[int]string{
+			1: "V1-CONTENT", 2: "V2-CONTENT", 3: "V3-CONTENT",
+		})
+		// Point ProjectPath at the current version directory (as the versioning code does).
+		stack.ProjectPath = handler.FileService.GetStackProjectPathByVersion("10", 3, "")
+		require.NoError(t, handler.DataStore.Stack().Update(stack.ID, stack))
+
+		return handler, stack.ID
+	}
+
+	t.Run("negative version returns 400", func(t *testing.T) {
+		handler, id := newHandlerAndStack(t)
+		rr := requestStackFile(t, handler, id, "version=-1")
+		require.Equal(t, http.StatusBadRequest, rr.Code)
+	})
+
+	t.Run("out-of-range version returns 400", func(t *testing.T) {
+		handler, id := newHandlerAndStack(t)
+		rr := requestStackFile(t, handler, id, "version=99")
+		require.Equal(t, http.StatusBadRequest, rr.Code)
+	})
+
+	t.Run("valid version returns that version content", func(t *testing.T) {
+		handler, id := newHandlerAndStack(t)
+		rr := requestStackFile(t, handler, id, "version=2")
+		require.Equal(t, http.StatusOK, rr.Code)
+
+		var resp stackFileResponse
+		require.NoError(t, json.Unmarshal(rr.Body.Bytes(), &resp))
+		require.Equal(t, "V2-CONTENT", resp.StackFileContent)
+	})
+}
+
+// TestStackFile_VersionParam_LegacyFallback covers the fallback branch for stacks predating the
+// version history seed: when Versions[] is empty, an in-range version (1..StackFileVersion) is
+// accepted and served from its v{N} directory.
+func TestStackFile_VersionParam_LegacyFallback(t *testing.T) {
+	t.Parallel()
+
+	stack := &portainer.Stack{
+		ID:               11,
+		Type:             portainer.DockerComposeStack,
+		EntryPoint:       "docker-compose.yml",
+		StackFileVersion: 2,
+		// Versions intentionally empty: legacy stack without a recorded history.
+	}
+	handler := setupFileVersionStackTest(t, stack, map[int]string{
+		1: "LEGACY-V1", 2: "LEGACY-V2",
+	})
+	stack.ProjectPath = handler.FileService.GetStackProjectPathByVersion("11", 2, "")
+	require.NoError(t, handler.DataStore.Stack().Update(stack.ID, stack))
+
+	rr := requestStackFile(t, handler, stack.ID, "version=1")
+	require.Equal(t, http.StatusOK, rr.Code)
+
+	var resp stackFileResponse
+	require.NoError(t, json.Unmarshal(rr.Body.Bytes(), &resp))
+	require.Equal(t, "LEGACY-V1", resp.StackFileContent)
+}
+
 func TestStackFile_MatchingGitSettings_ReturnsFileContent(t *testing.T) {
 	t.Parallel()
 	_, store := datastore.MustNewTestStore(t, false, true)