Skip to content

Commit f3f95d6

Browse files
authored
Merge pull request docker#256 from mikesir87/swap-q-to-kiro
Remove Amazon Q support in favor of Kiro
2 parents f481080 + 0115129 commit f3f95d6

File tree

19 files changed

+64
-64
lines changed

19 files changed

+64
-64
lines changed

docs/generator/reference/docker_mcp_client_connect.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
command: docker mcp client connect
22
short: |
3-
Connect the Docker MCP Toolkit to a client. Supported clients: amazon-q claude-code claude-desktop codex continue cursor gemini goose gordon lmstudio opencode sema4 vscode zed
3+
Connect the Docker MCP Toolkit to a client. Supported clients: claude-code claude-desktop codex continue cursor gemini goose gordon kiro lmstudio opencode sema4 vscode zed
44
long: |
5-
Connect the Docker MCP Toolkit to a client. Supported clients: amazon-q claude-code claude-desktop codex continue cursor gemini goose gordon lmstudio opencode sema4 vscode zed
5+
Connect the Docker MCP Toolkit to a client. Supported clients: claude-code claude-desktop codex continue cursor gemini goose gordon kiro lmstudio opencode sema4 vscode zed
66
usage: |-
77
docker mcp client connect [OPTIONS] <mcp-client>
88
9-
Supported clients: amazon-q claude-code claude-desktop codex continue cursor gemini goose gordon lmstudio opencode sema4 vscode zed
9+
Supported clients: claude-code claude-desktop codex continue cursor gemini goose gordon kiro lmstudio opencode sema4 vscode zed
1010
pname: docker mcp client
1111
plink: docker_mcp_client.yaml
1212
options:

docs/generator/reference/docker_mcp_client_disconnect.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
command: docker mcp client disconnect
22
short: |
3-
Disconnect the Docker MCP Toolkit from a client. Supported clients: amazon-q claude-code claude-desktop codex continue cursor gemini goose gordon lmstudio opencode sema4 vscode zed
3+
Disconnect the Docker MCP Toolkit from a client. Supported clients: claude-code claude-desktop codex continue cursor gemini goose gordon kiro lmstudio opencode sema4 vscode zed
44
long: |
5-
Disconnect the Docker MCP Toolkit from a client. Supported clients: amazon-q claude-code claude-desktop codex continue cursor gemini goose gordon lmstudio opencode sema4 vscode zed
5+
Disconnect the Docker MCP Toolkit from a client. Supported clients: claude-code claude-desktop codex continue cursor gemini goose gordon kiro lmstudio opencode sema4 vscode zed
66
usage: |-
77
docker mcp client disconnect [OPTIONS] <mcp-client>
88
9-
Supported clients: amazon-q claude-code claude-desktop codex continue cursor gemini goose gordon lmstudio opencode sema4 vscode zed
9+
Supported clients: claude-code claude-desktop codex continue cursor gemini goose gordon kiro lmstudio opencode sema4 vscode zed
1010
pname: docker mcp client
1111
plink: docker_mcp_client.yaml
1212
options:

docs/generator/reference/mcp_client.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ Manage MCP clients
55

66
### Subcommands
77

8-
| Name | Description |
9-
|:-----------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
10-
| [`connect`](mcp_client_connect.md) | Connect the Docker MCP Toolkit to a client. Supported clients: amazon-q claude-code claude-desktop codex continue cursor gemini goose gordon lmstudio opencode sema4 vscode zed |
11-
| [`disconnect`](mcp_client_disconnect.md) | Disconnect the Docker MCP Toolkit from a client. Supported clients: amazon-q claude-code claude-desktop codex continue cursor gemini goose gordon lmstudio opencode sema4 vscode zed |
12-
| [`ls`](mcp_client_ls.md) | List client configurations |
8+
| Name | Description |
9+
|:-----------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
10+
| [`connect`](mcp_client_connect.md) | Connect the Docker MCP Toolkit to a client. Supported clients: claude-code claude-desktop codex continue cursor gemini goose gordon kiro lmstudio opencode sema4 vscode zed |
11+
| [`disconnect`](mcp_client_disconnect.md) | Disconnect the Docker MCP Toolkit from a client. Supported clients: claude-code claude-desktop codex continue cursor gemini goose gordon kiro lmstudio opencode sema4 vscode zed |
12+
| [`ls`](mcp_client_ls.md) | List client configurations |
1313

1414

1515

docs/generator/reference/mcp_client_connect.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# docker mcp client connect
22

33
<!---MARKER_GEN_START-->
4-
Connect the Docker MCP Toolkit to a client. Supported clients: amazon-q claude-code claude-desktop codex continue cursor gemini goose gordon lmstudio opencode sema4 vscode zed
4+
Connect the Docker MCP Toolkit to a client. Supported clients: claude-code claude-desktop codex continue cursor gemini goose gordon kiro lmstudio opencode sema4 vscode zed
55

66
### Options
77

docs/generator/reference/mcp_client_disconnect.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# docker mcp client disconnect
22

33
<!---MARKER_GEN_START-->
4-
Disconnect the Docker MCP Toolkit from a client. Supported clients: amazon-q claude-code claude-desktop codex continue cursor gemini goose gordon lmstudio opencode sema4 vscode zed
4+
Disconnect the Docker MCP Toolkit from a client. Supported clients: claude-code claude-desktop codex continue cursor gemini goose gordon kiro lmstudio opencode sema4 vscode zed
55

66
### Options
77

img/client/amazon-q.svg

Lines changed: 0 additions & 12 deletions
This file was deleted.

img/client/kiro.svg

Lines changed: 12 additions & 0 deletions
Loading

pkg/client/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const (
2424
VendorGordon = "gordon"
2525
vendorZed = "zed"
2626
VendorCodex = "codex"
27-
VendorAmazonQ = "amazon-q"
27+
vendorKiro = "kiro"
2828
)
2929

3030
var (

pkg/client/config.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -224,20 +224,20 @@ system:
224224
list: '.context_servers | to_entries | map(.value + {"name": .key})'
225225
set: .context_servers[$NAME] = {"source":"custom","enabled":true}+$JSON
226226
del: del(.context_servers[$NAME])
227-
amazon-q:
228-
displayName: Amazon Q Developer CLI
229-
source: https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/command-line-getting-started.html
230-
icon: https://raw.githubusercontent.com/docker/mcp-gateway/main/img/client/amazon-q.svg
227+
kiro:
228+
displayName: Kiro
229+
source: https://kiro.dev/
230+
icon: https://kiro.dev/icon.svg
231231
installCheckPaths:
232-
- $HOME/.aws/amazonq
233-
- $USERPROFILE\.aws\amazonq
232+
- $HOME/.kiro
233+
- $USERPROFILE\.kiro
234234
paths:
235235
linux:
236-
- $HOME/.aws/amazonq/mcp.json
236+
- $HOME/.kiro/settings/mcp.json
237237
darwin:
238-
- $HOME/.aws/amazonq/mcp.json
238+
- $HOME/.kiro/settings/mcp.json
239239
windows:
240-
- $USERPROFILE\.aws\amazonq\mcp.json
240+
- $USERPROFILE\.kiro\settings\mcp.json
241241
yq:
242242
list: '.mcpServers | to_entries | map(.value + {"name": .key})'
243243
set: .mcpServers[$NAME] = $JSON
@@ -267,11 +267,11 @@ project:
267267
list: '.mcpServers | to_entries | map(.value + {"name": .key})'
268268
set: .mcpServers[$NAME] = $JSON+{"type":"stdio"}
269269
del: del(.mcpServers[$NAME])
270-
amazon-q:
271-
displayName: Amazon Q Developer CLI
272-
source: https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/command-line-getting-started.html
273-
icon: https://raw.githubusercontent.com/docker/mcp-gateway/main/img/client/amazon-q.svg
274-
projectfile: .amazonhq/mcp.json
270+
kiro:
271+
displayName: Kiro
272+
source: https://kiro.dev/
273+
icon: https://kiro.dev/icon.svg
274+
projectfile: .kiro/settings/mcp.json
275275
yq:
276276
list: '.mcpServers | to_entries | map(.value + {"name": .key})'
277277
set: .mcpServers[$NAME] = $JSON

pkg/client/config_test.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ func Test_yq_list(t *testing.T) {
121121
},
122122
},
123123
{
124-
name: "Amazon Q",
125-
cfg: config.System[VendorAmazonQ],
126-
content: "list/amazon-q.json",
124+
name: "Kiro",
125+
cfg: config.System[vendorKiro],
126+
content: "list/kiro.json",
127127
result: &MCPJSONLists{
128128
STDIOServers: []MCPServerSTDIO{
129129
{
@@ -230,18 +230,18 @@ func Test_yq_add_del(t *testing.T) {
230230
afterDel: "zed-create/after-del.json",
231231
},
232232
{
233-
name: "Amazon Q - append",
234-
cfg: config.System[VendorAmazonQ],
235-
original: "amazon-q-append/original.json",
236-
afterAdd: "amazon-q-append/after-add.json",
237-
afterDel: "amazon-q-append/after-del.json",
233+
name: "Kiro - append",
234+
cfg: config.System[vendorKiro],
235+
original: "kiro-append/original.json",
236+
afterAdd: "kiro-append/after-add.json",
237+
afterDel: "kiro-append/after-del.json",
238238
},
239239
{
240-
name: "Amazon Q - create",
241-
cfg: config.System[VendorAmazonQ],
242-
original: "amazon-q-create/original.json",
243-
afterAdd: "amazon-q-create/after-add.json",
244-
afterDel: "amazon-q-create/after-del.json",
240+
name: "Kiro - create",
241+
cfg: config.System[vendorKiro],
242+
original: "kiro-create/original.json",
243+
afterAdd: "kiro-create/after-add.json",
244+
afterDel: "kiro-create/after-del.json",
245245
},
246246
}
247247
for _, tc := range tests {
@@ -301,10 +301,10 @@ func TestFindClientsByProfile(t *testing.T) {
301301
vendorCursor: readTestData(t, "find-profiles/cursor-with-profile.json"),
302302
vendorClaudeDesktop: readTestData(t, "find-profiles/claude-desktop-with-profile.json"),
303303
vendorZed: readTestData(t, "find-profiles/zed-with-profile.json"),
304-
VendorAmazonQ: readTestData(t, "find-profiles/amazon-q-with-profile.json"),
304+
vendorKiro: readTestData(t, "find-profiles/kiro-with-profile.json"),
305305
vendorContinueDev: readTestData(t, "find-profiles/continue-with-profile.yml"),
306306
},
307-
expectedVendors: []string{vendorCursor, vendorClaudeDesktop, vendorZed, VendorAmazonQ, vendorContinueDev},
307+
expectedVendors: []string{vendorCursor, vendorClaudeDesktop, vendorZed, vendorKiro, vendorContinueDev},
308308
},
309309
{
310310
name: "finds no clients when profile doesn't match",
@@ -313,7 +313,7 @@ func TestFindClientsByProfile(t *testing.T) {
313313
vendorCursor: readTestData(t, "find-profiles/cursor-with-profile.json"),
314314
vendorClaudeDesktop: readTestData(t, "find-profiles/claude-desktop-with-profile.json"),
315315
vendorZed: readTestData(t, "find-profiles/zed-without-profile.json"),
316-
VendorAmazonQ: readTestData(t, "find-profiles/amazon-q-without-profile.json"),
316+
vendorKiro: readTestData(t, "find-profiles/kiro-without-profile.json"),
317317
vendorContinueDev: readTestData(t, "find-profiles/continue-without-profile.yml"),
318318
},
319319
expectedVendors: []string{},
@@ -325,10 +325,10 @@ func TestFindClientsByProfile(t *testing.T) {
325325
vendorCursor: readTestData(t, "find-profiles/cursor-with-profile.json"),
326326
vendorClaudeDesktop: readTestData(t, "find-profiles/claude-desktop-without-profile.json"),
327327
vendorZed: readTestData(t, "find-profiles/zed-without-profile.json"),
328-
VendorAmazonQ: readTestData(t, "find-profiles/amazon-q-without-profile.json"),
328+
vendorKiro: readTestData(t, "find-profiles/kiro-without-profile.json"),
329329
vendorContinueDev: readTestData(t, "find-profiles/continue-without-profile.yml"),
330330
},
331-
expectedVendors: []string{vendorClaudeDesktop, vendorZed, VendorAmazonQ, vendorContinueDev},
331+
expectedVendors: []string{vendorClaudeDesktop, vendorZed, vendorKiro, vendorContinueDev},
332332
},
333333
{
334334
name: "finds mix of clients with and without matching profile",
@@ -337,7 +337,7 @@ func TestFindClientsByProfile(t *testing.T) {
337337
vendorCursor: readTestData(t, "find-profiles/cursor-with-profile.json"),
338338
vendorClaudeDesktop: readTestData(t, "find-profiles/claude-desktop-without-profile.json"),
339339
vendorZed: readTestData(t, "find-profiles/zed-with-profile.json"),
340-
VendorAmazonQ: readTestData(t, "find-profiles/amazon-q-without-profile.json"),
340+
vendorKiro: readTestData(t, "find-profiles/kiro-without-profile.json"),
341341
vendorContinueDev: readTestData(t, "find-profiles/continue-with-profile.yml"),
342342
},
343343
expectedVendors: []string{vendorCursor, vendorZed, vendorContinueDev},
@@ -441,8 +441,8 @@ func TestIsSupportedMCPClient(t *testing.T) {
441441
expected: true,
442442
},
443443
{
444-
name: "amazon-q is supported as global",
445-
vendor: VendorAmazonQ,
444+
name: "kiro is supported as global",
445+
vendor: vendorKiro,
446446
global: true,
447447
expected: true,
448448
},
@@ -472,10 +472,10 @@ func TestIsSupportedMCPClient(t *testing.T) {
472472
expected: true, // cursor is in both System and Project
473473
},
474474
{
475-
name: "amazon-q is supported as project",
476-
vendor: VendorAmazonQ,
475+
name: "kiro is supported as project",
476+
vendor: vendorKiro,
477477
global: false,
478-
expected: true, // amazon-q is in both System and Project
478+
expected: true, // kiro is in both System and Project
479479
},
480480
{
481481
name: "gordon is not supported as project",

0 commit comments

Comments
 (0)