From 3054217038dcf489d5ceaf8a3e15b92c43c6ca06 Mon Sep 17 00:00:00 2001 From: Virgil Date: Tue, 31 Mar 2026 06:10:46 +0000 Subject: [PATCH] refactor(ax): remove workspace message compatibility map Co-Authored-By: Virgil --- workspace/service.go | 22 +++------------------- workspace/service_test.go | 33 +-------------------------------- 2 files changed, 4 insertions(+), 51 deletions(-) diff --git a/workspace/service.go b/workspace/service.go index c3d705a..3a0babf 100644 --- a/workspace/service.go +++ b/workspace/service.go @@ -192,28 +192,12 @@ func (service *Service) HandleWorkspaceCommand(command WorkspaceCommand) core.Re } // Example: result := service.HandleWorkspaceMessage(core.New(), WorkspaceCommand{Action: WorkspaceSwitchAction, WorkspaceID: "f3f0d7"}) -// Example: legacy := service.HandleWorkspaceMessage(core.New(), map[string]any{"action": WorkspaceCreateAction, "identifier": "alice", "password": "pass123"}) func (service *Service) HandleWorkspaceMessage(_ *core.Core, message core.Message) core.Result { - command, ok := workspaceCommandFromMessage(message) - if !ok { - return core.Result{OK: true} - } - return service.HandleWorkspaceCommand(command) -} - -func workspaceCommandFromMessage(message core.Message) (WorkspaceCommand, bool) { - switch payload := message.(type) { + switch command := message.(type) { case WorkspaceCommand: - return payload, true - case map[string]any: - command := WorkspaceCommand{} - command.Action, _ = payload["action"].(string) - command.Identifier, _ = payload["identifier"].(string) - command.Password, _ = payload["password"].(string) - command.WorkspaceID, _ = payload["workspaceID"].(string) - return command, true + return service.HandleWorkspaceCommand(command) } - return WorkspaceCommand{}, false + return core.Result{OK: true} } func resolveWorkspaceHomeDirectory() string { diff --git a/workspace/service_test.go b/workspace/service_test.go index f7e88b2..aaf4caf 100644 --- a/workspace/service_test.go +++ b/workspace/service_test.go @@ -93,7 +93,7 @@ func TestService_WriteWorkspaceFile_TraversalBlocked_Bad(t *testing.T) { require.Error(t, err) } -func TestService_HandleWorkspaceMessage_Good(t *testing.T) { +func TestService_HandleWorkspaceMessage_Command_Good(t *testing.T) { service, _ := newTestService(t) create := service.HandleWorkspaceMessage(core.New(), WorkspaceCommand{ @@ -114,37 +114,6 @@ func TestService_HandleWorkspaceMessage_Good(t *testing.T) { assert.True(t, switchResult.OK) assert.Equal(t, workspaceID, service.activeWorkspaceID) - legacyCreate := service.HandleWorkspaceMessage(core.New(), map[string]any{ - "action": WorkspaceCreateAction, - "identifier": "legacy-user", - "password": "pass123", - }) - assert.True(t, legacyCreate.OK) - - legacyWorkspaceID, ok := legacyCreate.Value.(string) - require.True(t, ok) - require.NotEmpty(t, legacyWorkspaceID) - - legacySwitch := service.HandleWorkspaceMessage(core.New(), WorkspaceCommand{ - Action: WorkspaceSwitchAction, - WorkspaceID: legacyWorkspaceID, - }) - assert.True(t, legacySwitch.OK) - assert.Equal(t, legacyWorkspaceID, service.activeWorkspaceID) - - rejectedLegacySwitch := service.HandleWorkspaceMessage(core.New(), map[string]any{ - "action": WorkspaceSwitchAction, - "name": workspaceID, - }) - assert.False(t, rejectedLegacySwitch.OK) - assert.Equal(t, legacyWorkspaceID, service.activeWorkspaceID) - - failedSwitch := service.HandleWorkspaceMessage(core.New(), map[string]any{ - "action": WorkspaceSwitchAction, - "workspaceID": "missing", - }) - assert.False(t, failedSwitch.OK) - unknown := service.HandleWorkspaceMessage(core.New(), "noop") assert.True(t, unknown.OK) }