From 3dd6d9114287bc2185226322bf2726da2109087b Mon Sep 17 00:00:00 2001 From: hongming-codex-laptop Date: Wed, 13 May 2026 06:20:38 -0700 Subject: [PATCH 1/2] fix(handlers): restore bundle import test build --- workspace-server/internal/handlers/bundle.go | 4 ++++ workspace-server/internal/handlers/bundle_test.go | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/workspace-server/internal/handlers/bundle.go b/workspace-server/internal/handlers/bundle.go index 0c080398..d69f9a20 100644 --- a/workspace-server/internal/handlers/bundle.go +++ b/workspace-server/internal/handlers/bundle.go @@ -49,6 +49,10 @@ func (h *BundleHandler) Import(c *gin.Context) { c.JSON(http.StatusBadRequest, gin.H{"error": "invalid bundle"}) return } + if b.Schema == "" || b.Name == "" { + c.JSON(http.StatusBadRequest, gin.H{"error": "invalid bundle"}) + return + } ctx := c.Request.Context() result := bundle.Import(ctx, &b, nil, h.broadcaster, h.provisioner, h.platformURL) diff --git a/workspace-server/internal/handlers/bundle_test.go b/workspace-server/internal/handlers/bundle_test.go index 0494e22e..3ca9fdd9 100644 --- a/workspace-server/internal/handlers/bundle_test.go +++ b/workspace-server/internal/handlers/bundle_test.go @@ -7,6 +7,7 @@ import ( "net/http/httptest" "testing" + "github.com/DATA-DOG/go-sqlmock" "github.com/gin-gonic/gin" ) @@ -52,6 +53,7 @@ func TestBundleImport_InvalidJSON(t *testing.T) { func TestBundleImport_ValidJSON(t *testing.T) { mock := setupTestDB(t) + _ = setupTestRedis(t) broadcaster := newTestBroadcaster() h := NewBundleHandler(broadcaster, nil, "http://localhost:8080", t.TempDir(), nil) @@ -59,12 +61,10 @@ func TestBundleImport_ValidJSON(t *testing.T) { // bundle.Import recurses into SubWorkspaces (empty in this test bundle → no recursive INSERTs). mock.ExpectExec("INSERT INTO workspaces"). WillReturnResult(sqlmock.NewResult(0, 1)) + mock.ExpectExec("INSERT INTO structure_events"). + WillReturnResult(sqlmock.NewResult(0, 1)) mock.ExpectExec("UPDATE workspaces SET runtime"). WillReturnResult(sqlmock.NewResult(0, 1)) - mock.ExpectExec("INSERT INTO workspace_schedules"). - WillReturnResult(sqlmock.NewResult(0, 1)) - mock.ExpectExec("INSERT INTO workspace_secrets"). - WillReturnResult(sqlmock.NewResult(0, 1)) body := `{"name": "test-workspace", "schema": "1.0", "tier": 3}` w := httptest.NewRecorder() -- 2.45.2 From a01ae27dadd18e3aae466e7f4fe63d86db7bb3c4 Mon Sep 17 00:00:00 2001 From: devops-engineer Date: Wed, 13 May 2026 17:45:12 +0000 Subject: [PATCH 2/2] ci: retrigger CI [empty] -- 2.45.2