impl: add support for matching agent by name #146
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -258,26 +258,25 @@ open class CoderProtocolHandler( | |
| } | ||
|
|
||
| // If the agent is missing and the workspace has only one, use that. | ||
| val agent = if (!parameters.agentName().isNullOrBlank()) { | ||
| agents.firstOrNull { it.name == parameters.agentName() } | ||
| } else if (agents.size == 1) { | ||
| agents.first() | ||
| } else { | ||
| null | ||
| } | ||
|
|
||
| if (agent == null) { | ||
| if (!parameters.agentName().isNullOrBlank()) { | ||
| context.logAndShowError( | ||
| CAN_T_HANDLE_URI_TITLE, | ||
| "The workspace \"${workspace.name}\" does not have an agent with name \"${parameters.agentName()}\"" | ||
| ) | ||
| return null | ||
| } else { | ||
| context.logAndShowError( | ||
| CAN_T_HANDLE_URI_TITLE, | ||
| "Unable to determine which agent to connect to; \"$AGENT_NAME\" must be set because the workspace \"${workspace.name}\" has more than one agent" | ||
| ) | ||
| return null | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ package com.coder.toolbox.util | |
| const val URL = "url" | ||
| const val TOKEN = "token" | ||
| const val WORKSPACE = "workspace" | ||
| const val AGENT_NAME = "agent_name" | ||
| private const val IDE_PRODUCT_CODE = "ide_product_code" | ||
| private const val IDE_BUILD_NUMBER = "ide_build_number" | ||
| private const val FOLDER = "folder" | ||
|
|
@@ -14,7 +14,7 @@ fun Map<String, String>.token() = this[TOKEN] | |
|
|
||
| fun Map<String, String>.workspace() = this[WORKSPACE] | ||
|
|
||
| fun Map<String, String?>.agentName() = this[AGENT_NAME] | ||
|
|
||
| fun Map<String, String>.ideProductCode() = this[IDE_PRODUCT_CODE] | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,7 @@ import io.mockk.mockk | |
| import kotlinx.coroutines.CoroutineScope | ||
| import kotlinx.coroutines.flow.MutableStateFlow | ||
| import kotlinx.coroutines.runBlocking | ||
| import org.junit.jupiter.api.DisplayName | ||
| import java.util.UUID | ||
| import kotlin.test.Test | ||
| import kotlin.test.assertEquals | ||
|
|
@@ -47,40 +48,34 @@ internal class CoderProtocolHandlerTest { | |
|
|
||
| private val agents = | ||
| mapOf( | ||
| "agent_name_bob" to "b0e4c54d-9ba9-4413-8512-11ca1e826a24", | ||
| "agent_name_bill" to "fb3daea4-da6b-424d-84c7-36b90574cfef", | ||
| "agent_name_riker" to "9a920eee-47fb-4571-9501-e4b3120c12f2", | ||
| ) | ||
| private val agentBob = | ||
| mapOf( | ||
| "agent_name_bob" to "b0e4c54d-9ba9-4413-8512-11ca1e826a24", | ||
| ) | ||
|
|
||
| @Test | ||
| @DisplayName("given a ws with multiple agents, expect the correct agent to be resolved if it matches the agent_name query param") | ||
| fun getMatchingAgent() { | ||
| val ws = DataGen.workspace("ws", agents = agents) | ||
|
|
||
| val tests = | ||
| listOf( | ||
| Pair( | ||
| mapOf("agent_name" to "agent_name_riker"), | ||
| "9a920eee-47fb-4571-9501-e4b3120c12f2" | ||
| ), | ||
| Pair( | ||
| mapOf("agent_name" to "agent_name_bill"), | ||
| "fb3daea4-da6b-424d-84c7-36b90574cfef" | ||
| ), | ||
| Pair( | ||
| mapOf("agent_name" to "agent_name_bob"), | ||
| "b0e4c54d-9ba9-4413-8512-11ca1e826a24" | ||
| ) | ||
| ) | ||
| runBlocking { | ||
| tests.forEach { | ||
|
|
@@ -90,28 +85,20 @@ internal class CoderProtocolHandlerTest { | |
| } | ||
|
|
||
| @Test | ||
| @DisplayName("given a ws with only multiple agents expect the agent resolution to fail if none match the agent_name query param") | ||
| fun failsToGetMatchingAgent() { | ||
| val ws = DataGen.workspace("ws", agents = agents) | ||
| val tests = | ||
| listOf( | ||
| Triple(emptyMap(), MissingArgumentException::class, "Unable to determine"), | ||
| Triple(mapOf("agent_name" to ""), MissingArgumentException::class, "Unable to determine"), | ||
| Triple(mapOf("agent_name" to null), MissingArgumentException::class, "Unable to determine"), | ||
| Triple(mapOf("agent_name" to "not-an-agent-name"), IllegalArgumentException::class, "agent with ID"), | ||
| Triple( | ||
| mapOf("agent_name" to "agent_name_homer"), | ||
| IllegalArgumentException::class, | ||
| "agent with name" | ||
| ) | ||
| ) | ||
| runBlocking { | ||
| tests.forEach { | ||
|
|
@@ -121,15 +108,14 @@ internal class CoderProtocolHandlerTest { | |
| } | ||
|
|
||
| @Test | ||
| @DisplayName("given a ws with only one agent, the agent is selected even when agent_name query param was not provided") | ||
| fun getsFirstAgentWhenOnlyOne() { | ||
| val ws = DataGen.workspace("ws", agents = agentBob) | ||
| val tests = | ||
| listOf( | ||
| emptyMap(), | ||
| mapOf("agent_name" to ""), | ||
| mapOf("agent_name" to null) | ||
| ) | ||
| runBlocking { | ||
| tests.forEach { | ||
|
|
@@ -145,43 +131,42 @@ internal class CoderProtocolHandlerTest { | |
| } | ||
|
|
||
| @Test | ||
| @DisplayName("given a ws with only one agent, the agent is NOT selected when agent_name query param was provided but does not match") | ||
| fun failsToGetAgentWhenOnlyOne() { | ||
| val wsWithAgentBob = DataGen.workspace("ws", agents = agentBob) | ||
| val tests = | ||
| listOf( | ||
| Triple( | ||
| mapOf("agent_name" to "agent_name_garfield"), | ||
| IllegalArgumentException::class, | ||
| "agent with name" | ||
| ), | ||
| ) | ||
| runBlocking { | ||
| tests.forEach { | ||
| assertNull(protocolHandler.getMatchingAgent(it.first, wsWithAgentBob)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| @DisplayName("fails to resolve any agent when the workspace has no agents") | ||
| fun failsToGetAgentWhenWorkspaceHasNoAgents() { | ||
| val wsWithoutAgents = DataGen.workspace("ws") | ||
| val tests = | ||
| listOf( | ||
| Triple(emptyMap(), IllegalArgumentException::class, "has no agents"), | ||
| Triple(mapOf("agent_name" to ""), IllegalArgumentException::class, "has no agents"), | ||
| Triple(mapOf("agent_name" to null), IllegalArgumentException::class, "has no agents"), | ||
| Triple( | ||
| mapOf("agent_name" to "agent_name_riker"), | ||
| IllegalArgumentException::class, | ||
| "has no agents" | ||
| ), | ||
| ) | ||
| runBlocking { | ||
| tests.forEach { | ||
| assertNull(protocolHandler.getMatchingAgent(it.first, wsWithoutAgents)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.