Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 147 additions & 0 deletions e2e-tests/web-search-lifecycle.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
import { type RunResult, hasAwsCredentials, parseJsonOutput, prereqs } from '../src/test-utils/index.js';
import { installCdkTarball, runAgentCoreCLI, teardownE2EProject, writeAwsTargets } from './e2e-helper.js';
import { randomUUID } from 'node:crypto';
import { mkdir, rm } from 'node:fs/promises';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';

const hasAws = hasAwsCredentials();
const canRun = prereqs.npm && prereqs.git && prereqs.uv && hasAws;

describe.sequential('e2e: web-search gateway target lifecycle', () => {
const suffix = Date.now().toString().slice(-8);
const agentName = `E2eWs${suffix}`;
const gatewayName = 'WsGw';
const targetName = 'ws1';
const toolName = `${targetName}___WebSearch`;

let testDir: string;
let projectPath: string;
let originalRegion: string | undefined;
let lifecycleFailed = false;

beforeAll(async () => {
if (!canRun) return;

// Web search is only available in us-east-1. Pin the region
// so deploy doesn't target a region where the connector doesn't exist
originalRegion = process.env.AWS_REGION;
process.env.AWS_REGION = 'us-east-1';

testDir = join(tmpdir(), `agentcore-e2e-web-search-${randomUUID()}`);
await mkdir(testDir, { recursive: true });

const create = await runAgentCoreCLI(
['create', '--name', agentName, '--no-agent', '--defaults', '--skip-git', '--skip-python-setup', '--json'],
testDir
);
expect(create.exitCode, `Create failed: ${create.stderr}`).toBe(0);
projectPath = (parseJsonOutput(create.stdout) as { projectPath: string }).projectPath;

await writeAwsTargets(projectPath);
installCdkTarball(projectPath);
}, 600_000);

afterAll(async () => {
if (projectPath && hasAws) {
await teardownE2EProject(projectPath, agentName, 'Bedrock');
}
if (testDir) await rm(testDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 1000 });
if (originalRegion === undefined) delete process.env.AWS_REGION;
else process.env.AWS_REGION = originalRegion;
}, 600_000);

const run = (args: string[]): Promise<RunResult> => runAgentCoreCLI(args, projectPath);

// Each step short-circuits if a prior step in the lifecycle failed
const step = (label: string, fn: () => Promise<void>, timeout: number) =>
it.skipIf(!canRun)(
label,
async () => {
if (lifecycleFailed) {
throw new Error('Skipped: a prior step in the lifecycle failed.');
}
try {
await fn();
} catch (err) {
lifecycleFailed = true;
throw err;
}
},
timeout
);

step(
'adds a gateway and a web-search target',
async () => {
const gw = await run(['add', 'gateway', '--name', gatewayName, '--protocol-type', 'MCP', '--json']);
expect(gw.exitCode, `Add gateway failed: ${gw.stderr}`).toBe(0);

const target = await run(['add', 'web-search', '--gateway', gatewayName, '--name', targetName, '--json']);
expect(target.exitCode, `Add web-search failed: ${target.stdout}\n${target.stderr}`).toBe(0);
},
120_000
);

step(
'deploys the stack',
async () => {
const result = await run(['deploy', '--yes', '--json']);
expect(result.exitCode, `Deploy failed: ${result.stderr}`).toBe(0);
},
900_000
);

step(
'status shows the gateway as deployed',
async () => {
const result = await run(['status', '--json']);
expect(result.exitCode, `Status failed: ${result.stderr}`).toBe(0);

const json = parseJsonOutput(result.stdout) as {
success: boolean;
resources: { resourceType: string; name: string; deploymentState: string }[];
};
expect(json.success).toBe(true);

const gateway = json.resources.find(r => r.resourceType === 'gateway' && r.name === gatewayName);
expect(gateway, 'Gateway should appear in status').toBeDefined();
expect(gateway?.deploymentState).toBe('deployed');
},
120_000
);

step(
'call-tool returns search results',
async () => {
const result = await run([
'invoke',
'call-tool',
'--gateway',
gatewayName,
'--tool',
toolName,
'--input',
'{"query":"AWS Lambda pricing"}',
'--json',
]);
expect(result.exitCode, `call-tool failed:\nstdout: ${result.stdout}\nstderr: ${result.stderr}`).toBe(0);

const payload = parseJsonOutput(result.stdout) as { success: boolean; response?: string };
expect(payload.success, `call-tool result not successful. Raw stdout:\n${result.stdout}`).toBe(true);
expect(typeof payload.response, 'response should be a JSON envelope string').toBe('string');

const envelope = JSON.parse(payload.response!) as {
result?: { content?: { text?: string }[] };
};
const text = envelope.result?.content?.[0]?.text;
expect(text, `call-tool envelope missing result.content[0].text. Envelope:\n${payload.response}`).toBeTruthy();

const inner = JSON.parse(text!) as { results?: { url?: string }[] };
expect(Array.isArray(inner.results), 'Results array should be present').toBe(true);
expect(inner.results!.length, 'Results array should be non-empty').toBeGreaterThan(0);
},
180_000
);
});
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
chore: add e2e & integ tests for web-search by nborges-aws · Pull Request #1604 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 147 additions & 0 deletions e2e-tests/web-search-lifecycle.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
import { type RunResult, hasAwsCredentials, parseJsonOutput, prereqs } from '../src/test-utils/index.js';
import { installCdkTarball, runAgentCoreCLI, teardownE2EProject, writeAwsTargets } from './e2e-helper.js';
import { randomUUID } from 'node:crypto';
import { mkdir, rm } from 'node:fs/promises';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';

const hasAws = hasAwsCredentials();
const canRun = prereqs.npm && prereqs.git && prereqs.uv && hasAws;

describe.sequential('e2e: web-search gateway target lifecycle', () => {
const suffix = Date.now().toString().slice(-8);
const agentName = `E2eWs${suffix}`;
const gatewayName = 'WsGw';
const targetName = 'ws1';
const toolName = `${targetName}___WebSearch`;

let testDir: string;
let projectPath: string;
let originalRegion: string | undefined;
let lifecycleFailed = false;

beforeAll(async () => {
if (!canRun) return;

// Web search is only available in us-east-1. Pin the region
// so deploy doesn't target a region where the connector doesn't exist
originalRegion = process.env.AWS_REGION;
process.env.AWS_REGION = 'us-east-1';

testDir = join(tmpdir(), `agentcore-e2e-web-search-${randomUUID()}`);
await mkdir(testDir, { recursive: true });

const create = await runAgentCoreCLI(
['create', '--name', agentName, '--no-agent', '--defaults', '--skip-git', '--skip-python-setup', '--json'],
testDir
);
expect(create.exitCode, `Create failed: ${create.stderr}`).toBe(0);
projectPath = (parseJsonOutput(create.stdout) as { projectPath: string }).projectPath;

await writeAwsTargets(projectPath);
installCdkTarball(projectPath);
}, 600_000);

afterAll(async () => {
if (projectPath && hasAws) {
await teardownE2EProject(projectPath, agentName, 'Bedrock');
}
if (testDir) await rm(testDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 1000 });
if (originalRegion === undefined) delete process.env.AWS_REGION;
else process.env.AWS_REGION = originalRegion;
}, 600_000);

const run = (args: string[]): Promise<RunResult> => runAgentCoreCLI(args, projectPath);

// Each step short-circuits if a prior step in the lifecycle failed
const step = (label: string, fn: () => Promise<void>, timeout: number) =>
it.skipIf(!canRun)(
label,
async () => {
if (lifecycleFailed) {
throw new Error('Skipped: a prior step in the lifecycle failed.');
}
try {
await fn();
} catch (err) {
lifecycleFailed = true;
throw err;
}
},
timeout
);

step(
'adds a gateway and a web-search target',
async () => {
const gw = await run(['add', 'gateway', '--name', gatewayName, '--protocol-type', 'MCP', '--json']);
expect(gw.exitCode, `Add gateway failed: ${gw.stderr}`).toBe(0);

const target = await run(['add', 'web-search', '--gateway', gatewayName, '--name', targetName, '--json']);
expect(target.exitCode, `Add web-search failed: ${target.stdout}\n${target.stderr}`).toBe(0);
},
120_000
);

step(
'deploys the stack',
async () => {
const result = await run(['deploy', '--yes', '--json']);
expect(result.exitCode, `Deploy failed: ${result.stderr}`).toBe(0);
},
900_000
);

step(
'status shows the gateway as deployed',
async () => {
const result = await run(['status', '--json']);
expect(result.exitCode, `Status failed: ${result.stderr}`).toBe(0);

const json = parseJsonOutput(result.stdout) as {
success: boolean;
resources: { resourceType: string; name: string; deploymentState: string }[];
};
expect(json.success).toBe(true);

const gateway = json.resources.find(r => r.resourceType === 'gateway' && r.name === gatewayName);
expect(gateway, 'Gateway should appear in status').toBeDefined();
expect(gateway?.deploymentState).toBe('deployed');
},
120_000
);

step(
'call-tool returns search results',
async () => {
const result = await run([
'invoke',
'call-tool',
'--gateway',
gatewayName,
'--tool',
toolName,
'--input',
'{"query":"AWS Lambda pricing"}',
'--json',
]);
expect(result.exitCode, `call-tool failed:\nstdout: ${result.stdout}\nstderr: ${result.stderr}`).toBe(0);

const payload = parseJsonOutput(result.stdout) as { success: boolean; response?: string };
expect(payload.success, `call-tool result not successful. Raw stdout:\n${result.stdout}`).toBe(true);
expect(typeof payload.response, 'response should be a JSON envelope string').toBe('string');

const envelope = JSON.parse(payload.response!) as {
result?: { content?: { text?: string }[] };
};
const text = envelope.result?.content?.[0]?.text;
expect(text, `call-tool envelope missing result.content[0].text. Envelope:\n${payload.response}`).toBeTruthy();

const inner = JSON.parse(text!) as { results?: { url?: string }[] };
expect(Array.isArray(inner.results), 'Results array should be present').toBe(true);
expect(inner.results!.length, 'Results array should be non-empty').toBeGreaterThan(0);
},
180_000
);
});
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' chore: add e2e & integ tests for web-search by nborges-aws · Pull Request #1604 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 147 additions & 0 deletions e2e-tests/web-search-lifecycle.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
import { type RunResult, hasAwsCredentials, parseJsonOutput, prereqs } from '../src/test-utils/index.js';
import { installCdkTarball, runAgentCoreCLI, teardownE2EProject, writeAwsTargets } from './e2e-helper.js';
import { randomUUID } from 'node:crypto';
import { mkdir, rm } from 'node:fs/promises';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';

const hasAws = hasAwsCredentials();
const canRun = prereqs.npm && prereqs.git && prereqs.uv && hasAws;

describe.sequential('e2e: web-search gateway target lifecycle', () => {
const suffix = Date.now().toString().slice(-8);
const agentName = `E2eWs${suffix}`;
const gatewayName = 'WsGw';
const targetName = 'ws1';
const toolName = `${targetName}___WebSearch`;

let testDir: string;
let projectPath: string;
let originalRegion: string | undefined;
let lifecycleFailed = false;

beforeAll(async () => {
if (!canRun) return;

// Web search is only available in us-east-1. Pin the region
// so deploy doesn't target a region where the connector doesn't exist
originalRegion = process.env.AWS_REGION;
process.env.AWS_REGION = 'us-east-1';

testDir = join(tmpdir(), `agentcore-e2e-web-search-${randomUUID()}`);
await mkdir(testDir, { recursive: true });

const create = await runAgentCoreCLI(
['create', '--name', agentName, '--no-agent', '--defaults', '--skip-git', '--skip-python-setup', '--json'],
testDir
);
expect(create.exitCode, `Create failed: ${create.stderr}`).toBe(0);
projectPath = (parseJsonOutput(create.stdout) as { projectPath: string }).projectPath;

await writeAwsTargets(projectPath);
installCdkTarball(projectPath);
}, 600_000);

afterAll(async () => {
if (projectPath && hasAws) {
await teardownE2EProject(projectPath, agentName, 'Bedrock');
}
if (testDir) await rm(testDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 1000 });
if (originalRegion === undefined) delete process.env.AWS_REGION;
else process.env.AWS_REGION = originalRegion;
}, 600_000);

const run = (args: string[]): Promise<RunResult> => runAgentCoreCLI(args, projectPath);

// Each step short-circuits if a prior step in the lifecycle failed
const step = (label: string, fn: () => Promise<void>, timeout: number) =>
it.skipIf(!canRun)(
label,
async () => {
if (lifecycleFailed) {
throw new Error('Skipped: a prior step in the lifecycle failed.');
}
try {
await fn();
} catch (err) {
lifecycleFailed = true;
throw err;
}
},
timeout
);

step(
'adds a gateway and a web-search target',
async () => {
const gw = await run(['add', 'gateway', '--name', gatewayName, '--protocol-type', 'MCP', '--json']);
expect(gw.exitCode, `Add gateway failed: ${gw.stderr}`).toBe(0);

const target = await run(['add', 'web-search', '--gateway', gatewayName, '--name', targetName, '--json']);
expect(target.exitCode, `Add web-search failed: ${target.stdout}\n${target.stderr}`).toBe(0);
},
120_000
);

step(
'deploys the stack',
async () => {
const result = await run(['deploy', '--yes', '--json']);
expect(result.exitCode, `Deploy failed: ${result.stderr}`).toBe(0);
},
900_000
);

step(
'status shows the gateway as deployed',
async () => {
const result = await run(['status', '--json']);
expect(result.exitCode, `Status failed: ${result.stderr}`).toBe(0);

const json = parseJsonOutput(result.stdout) as {
success: boolean;
resources: { resourceType: string; name: string; deploymentState: string }[];
};
expect(json.success).toBe(true);

const gateway = json.resources.find(r => r.resourceType === 'gateway' && r.name === gatewayName);
expect(gateway, 'Gateway should appear in status').toBeDefined();
expect(gateway?.deploymentState).toBe('deployed');
},
120_000
);

step(
'call-tool returns search results',
async () => {
const result = await run([
'invoke',
'call-tool',
'--gateway',
gatewayName,
'--tool',
toolName,
'--input',
'{"query":"AWS Lambda pricing"}',
'--json',
]);
expect(result.exitCode, `call-tool failed:\nstdout: ${result.stdout}\nstderr: ${result.stderr}`).toBe(0);

const payload = parseJsonOutput(result.stdout) as { success: boolean; response?: string };
expect(payload.success, `call-tool result not successful. Raw stdout:\n${result.stdout}`).toBe(true);
expect(typeof payload.response, 'response should be a JSON envelope string').toBe('string');

const envelope = JSON.parse(payload.response!) as {
result?: { content?: { text?: string }[] };
};
const text = envelope.result?.content?.[0]?.text;
expect(text, `call-tool envelope missing result.content[0].text. Envelope:\n${payload.response}`).toBeTruthy();

const inner = JSON.parse(text!) as { results?: { url?: string }[] };
expect(Array.isArray(inner.results), 'Results array should be present').toBe(true);
expect(inner.results!.length, 'Results array should be non-empty').toBeGreaterThan(0);
},
180_000
);
});
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' chore: add e2e & integ tests for web-search by nborges-aws · Pull Request #1604 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 147 additions & 0 deletions e2e-tests/web-search-lifecycle.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
import { type RunResult, hasAwsCredentials, parseJsonOutput, prereqs } from '../src/test-utils/index.js';
import { installCdkTarball, runAgentCoreCLI, teardownE2EProject, writeAwsTargets } from './e2e-helper.js';
import { randomUUID } from 'node:crypto';
import { mkdir, rm } from 'node:fs/promises';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';

const hasAws = hasAwsCredentials();
const canRun = prereqs.npm && prereqs.git && prereqs.uv && hasAws;

describe.sequential('e2e: web-search gateway target lifecycle', () => {
const suffix = Date.now().toString().slice(-8);
const agentName = `E2eWs${suffix}`;
const gatewayName = 'WsGw';
const targetName = 'ws1';
const toolName = `${targetName}___WebSearch`;

let testDir: string;
let projectPath: string;
let originalRegion: string | undefined;
let lifecycleFailed = false;

beforeAll(async () => {
if (!canRun) return;

// Web search is only available in us-east-1. Pin the region
// so deploy doesn't target a region where the connector doesn't exist
originalRegion = process.env.AWS_REGION;
process.env.AWS_REGION = 'us-east-1';

testDir = join(tmpdir(), `agentcore-e2e-web-search-${randomUUID()}`);
await mkdir(testDir, { recursive: true });

const create = await runAgentCoreCLI(
['create', '--name', agentName, '--no-agent', '--defaults', '--skip-git', '--skip-python-setup', '--json'],
testDir
);
expect(create.exitCode, `Create failed: ${create.stderr}`).toBe(0);
projectPath = (parseJsonOutput(create.stdout) as { projectPath: string }).projectPath;

await writeAwsTargets(projectPath);
installCdkTarball(projectPath);
}, 600_000);

afterAll(async () => {
if (projectPath && hasAws) {
await teardownE2EProject(projectPath, agentName, 'Bedrock');
}
if (testDir) await rm(testDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 1000 });
if (originalRegion === undefined) delete process.env.AWS_REGION;
else process.env.AWS_REGION = originalRegion;
}, 600_000);

const run = (args: string[]): Promise<RunResult> => runAgentCoreCLI(args, projectPath);

// Each step short-circuits if a prior step in the lifecycle failed
const step = (label: string, fn: () => Promise<void>, timeout: number) =>
it.skipIf(!canRun)(
label,
async () => {
if (lifecycleFailed) {
throw new Error('Skipped: a prior step in the lifecycle failed.');
}
try {
await fn();
} catch (err) {
lifecycleFailed = true;
throw err;
}
},
timeout
);

step(
'adds a gateway and a web-search target',
async () => {
const gw = await run(['add', 'gateway', '--name', gatewayName, '--protocol-type', 'MCP', '--json']);
expect(gw.exitCode, `Add gateway failed: ${gw.stderr}`).toBe(0);

const target = await run(['add', 'web-search', '--gateway', gatewayName, '--name', targetName, '--json']);
expect(target.exitCode, `Add web-search failed: ${target.stdout}\n${target.stderr}`).toBe(0);
},
120_000
);

step(
'deploys the stack',
async () => {
const result = await run(['deploy', '--yes', '--json']);
expect(result.exitCode, `Deploy failed: ${result.stderr}`).toBe(0);
},
900_000
);

step(
'status shows the gateway as deployed',
async () => {
const result = await run(['status', '--json']);
expect(result.exitCode, `Status failed: ${result.stderr}`).toBe(0);

const json = parseJsonOutput(result.stdout) as {
success: boolean;
resources: { resourceType: string; name: string; deploymentState: string }[];
};
expect(json.success).toBe(true);

const gateway = json.resources.find(r => r.resourceType === 'gateway' && r.name === gatewayName);
expect(gateway, 'Gateway should appear in status').toBeDefined();
expect(gateway?.deploymentState).toBe('deployed');
},
120_000
);

step(
'call-tool returns search results',
async () => {
const result = await run([
'invoke',
'call-tool',
'--gateway',
gatewayName,
'--tool',
toolName,
'--input',
'{"query":"AWS Lambda pricing"}',
'--json',
]);
expect(result.exitCode, `call-tool failed:\nstdout: ${result.stdout}\nstderr: ${result.stderr}`).toBe(0);

const payload = parseJsonOutput(result.stdout) as { success: boolean; response?: string };
expect(payload.success, `call-tool result not successful. Raw stdout:\n${result.stdout}`).toBe(true);
expect(typeof payload.response, 'response should be a JSON envelope string').toBe('string');

const envelope = JSON.parse(payload.response!) as {
result?: { content?: { text?: string }[] };
};
const text = envelope.result?.content?.[0]?.text;
expect(text, `call-tool envelope missing result.content[0].text. Envelope:\n${payload.response}`).toBeTruthy();

const inner = JSON.parse(text!) as { results?: { url?: string }[] };
expect(Array.isArray(inner.results), 'Results array should be present').toBe(true);
expect(inner.results!.length, 'Results array should be non-empty').toBeGreaterThan(0);
},
180_000
);
});
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' chore: add e2e & integ tests for web-search by nborges-aws · Pull Request #1604 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 147 additions & 0 deletions e2e-tests/web-search-lifecycle.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
import { type RunResult, hasAwsCredentials, parseJsonOutput, prereqs } from '../src/test-utils/index.js';
import { installCdkTarball, runAgentCoreCLI, teardownE2EProject, writeAwsTargets } from './e2e-helper.js';
import { randomUUID } from 'node:crypto';
import { mkdir, rm } from 'node:fs/promises';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';

const hasAws = hasAwsCredentials();
const canRun = prereqs.npm && prereqs.git && prereqs.uv && hasAws;

describe.sequential('e2e: web-search gateway target lifecycle', () => {
const suffix = Date.now().toString().slice(-8);
const agentName = `E2eWs${suffix}`;
const gatewayName = 'WsGw';
const targetName = 'ws1';
const toolName = `${targetName}___WebSearch`;

let testDir: string;
let projectPath: string;
let originalRegion: string | undefined;
let lifecycleFailed = false;

beforeAll(async () => {
if (!canRun) return;

// Web search is only available in us-east-1. Pin the region
// so deploy doesn't target a region where the connector doesn't exist
originalRegion = process.env.AWS_REGION;
process.env.AWS_REGION = 'us-east-1';

testDir = join(tmpdir(), `agentcore-e2e-web-search-${randomUUID()}`);
await mkdir(testDir, { recursive: true });

const create = await runAgentCoreCLI(
['create', '--name', agentName, '--no-agent', '--defaults', '--skip-git', '--skip-python-setup', '--json'],
testDir
);
expect(create.exitCode, `Create failed: ${create.stderr}`).toBe(0);
projectPath = (parseJsonOutput(create.stdout) as { projectPath: string }).projectPath;

await writeAwsTargets(projectPath);
installCdkTarball(projectPath);
}, 600_000);

afterAll(async () => {
if (projectPath && hasAws) {
await teardownE2EProject(projectPath, agentName, 'Bedrock');
}
if (testDir) await rm(testDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 1000 });
if (originalRegion === undefined) delete process.env.AWS_REGION;
else process.env.AWS_REGION = originalRegion;
}, 600_000);

const run = (args: string[]): Promise<RunResult> => runAgentCoreCLI(args, projectPath);

// Each step short-circuits if a prior step in the lifecycle failed
const step = (label: string, fn: () => Promise<void>, timeout: number) =>
it.skipIf(!canRun)(
label,
async () => {
if (lifecycleFailed) {
throw new Error('Skipped: a prior step in the lifecycle failed.');
}
try {
await fn();
} catch (err) {
lifecycleFailed = true;
throw err;
}
},
timeout
);

step(
'adds a gateway and a web-search target',
async () => {
const gw = await run(['add', 'gateway', '--name', gatewayName, '--protocol-type', 'MCP', '--json']);
expect(gw.exitCode, `Add gateway failed: ${gw.stderr}`).toBe(0);

const target = await run(['add', 'web-search', '--gateway', gatewayName, '--name', targetName, '--json']);
expect(target.exitCode, `Add web-search failed: ${target.stdout}\n${target.stderr}`).toBe(0);
},
120_000
);

step(
'deploys the stack',
async () => {
const result = await run(['deploy', '--yes', '--json']);
expect(result.exitCode, `Deploy failed: ${result.stderr}`).toBe(0);
},
900_000
);

step(
'status shows the gateway as deployed',
async () => {
const result = await run(['status', '--json']);
expect(result.exitCode, `Status failed: ${result.stderr}`).toBe(0);

const json = parseJsonOutput(result.stdout) as {
success: boolean;
resources: { resourceType: string; name: string; deploymentState: string }[];
};
expect(json.success).toBe(true);

const gateway = json.resources.find(r => r.resourceType === 'gateway' && r.name === gatewayName);
expect(gateway, 'Gateway should appear in status').toBeDefined();
expect(gateway?.deploymentState).toBe('deployed');
},
120_000
);

step(
'call-tool returns search results',
async () => {
const result = await run([
'invoke',
'call-tool',
'--gateway',
gatewayName,
'--tool',
toolName,
'--input',
'{"query":"AWS Lambda pricing"}',
'--json',
]);
expect(result.exitCode, `call-tool failed:\nstdout: ${result.stdout}\nstderr: ${result.stderr}`).toBe(0);

const payload = parseJsonOutput(result.stdout) as { success: boolean; response?: string };
expect(payload.success, `call-tool result not successful. Raw stdout:\n${result.stdout}`).toBe(true);
expect(typeof payload.response, 'response should be a JSON envelope string').toBe('string');

const envelope = JSON.parse(payload.response!) as {
result?: { content?: { text?: string }[] };
};
const text = envelope.result?.content?.[0]?.text;
expect(text, `call-tool envelope missing result.content[0].text. Envelope:\n${payload.response}`).toBeTruthy();

const inner = JSON.parse(text!) as { results?: { url?: string }[] };
expect(Array.isArray(inner.results), 'Results array should be present').toBe(true);
expect(inner.results!.length, 'Results array should be non-empty').toBeGreaterThan(0);
},
180_000
);
});
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' chore: add e2e & integ tests for web-search by nborges-aws · Pull Request #1604 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 147 additions & 0 deletions e2e-tests/web-search-lifecycle.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
import { type RunResult, hasAwsCredentials, parseJsonOutput, prereqs } from '../src/test-utils/index.js';
import { installCdkTarball, runAgentCoreCLI, teardownE2EProject, writeAwsTargets } from './e2e-helper.js';
import { randomUUID } from 'node:crypto';
import { mkdir, rm } from 'node:fs/promises';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';

const hasAws = hasAwsCredentials();
const canRun = prereqs.npm && prereqs.git && prereqs.uv && hasAws;

describe.sequential('e2e: web-search gateway target lifecycle', () => {
const suffix = Date.now().toString().slice(-8);
const agentName = `E2eWs${suffix}`;
const gatewayName = 'WsGw';
const targetName = 'ws1';
const toolName = `${targetName}___WebSearch`;

let testDir: string;
let projectPath: string;
let originalRegion: string | undefined;
let lifecycleFailed = false;

beforeAll(async () => {
if (!canRun) return;

// Web search is only available in us-east-1. Pin the region
// so deploy doesn't target a region where the connector doesn't exist
originalRegion = process.env.AWS_REGION;
process.env.AWS_REGION = 'us-east-1';

testDir = join(tmpdir(), `agentcore-e2e-web-search-${randomUUID()}`);
await mkdir(testDir, { recursive: true });

const create = await runAgentCoreCLI(
['create', '--name', agentName, '--no-agent', '--defaults', '--skip-git', '--skip-python-setup', '--json'],
testDir
);
expect(create.exitCode, `Create failed: ${create.stderr}`).toBe(0);
projectPath = (parseJsonOutput(create.stdout) as { projectPath: string }).projectPath;

await writeAwsTargets(projectPath);
installCdkTarball(projectPath);
}, 600_000);

afterAll(async () => {
if (projectPath && hasAws) {
await teardownE2EProject(projectPath, agentName, 'Bedrock');
}
if (testDir) await rm(testDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 1000 });
if (originalRegion === undefined) delete process.env.AWS_REGION;
else process.env.AWS_REGION = originalRegion;
}, 600_000);

const run = (args: string[]): Promise<RunResult> => runAgentCoreCLI(args, projectPath);

// Each step short-circuits if a prior step in the lifecycle failed
const step = (label: string, fn: () => Promise<void>, timeout: number) =>
it.skipIf(!canRun)(
label,
async () => {
if (lifecycleFailed) {
throw new Error('Skipped: a prior step in the lifecycle failed.');
}
try {
await fn();
} catch (err) {
lifecycleFailed = true;
throw err;
}
},
timeout
);

step(
'adds a gateway and a web-search target',
async () => {
const gw = await run(['add', 'gateway', '--name', gatewayName, '--protocol-type', 'MCP', '--json']);
expect(gw.exitCode, `Add gateway failed: ${gw.stderr}`).toBe(0);

const target = await run(['add', 'web-search', '--gateway', gatewayName, '--name', targetName, '--json']);
expect(target.exitCode, `Add web-search failed: ${target.stdout}\n${target.stderr}`).toBe(0);
},
120_000
);

step(
'deploys the stack',
async () => {
const result = await run(['deploy', '--yes', '--json']);
expect(result.exitCode, `Deploy failed: ${result.stderr}`).toBe(0);
},
900_000
);

step(
'status shows the gateway as deployed',
async () => {
const result = await run(['status', '--json']);
expect(result.exitCode, `Status failed: ${result.stderr}`).toBe(0);

const json = parseJsonOutput(result.stdout) as {
success: boolean;
resources: { resourceType: string; name: string; deploymentState: string }[];
};
expect(json.success).toBe(true);

const gateway = json.resources.find(r => r.resourceType === 'gateway' && r.name === gatewayName);
expect(gateway, 'Gateway should appear in status').toBeDefined();
expect(gateway?.deploymentState).toBe('deployed');
},
120_000
);

step(
'call-tool returns search results',
async () => {
const result = await run([
'invoke',
'call-tool',
'--gateway',
gatewayName,
'--tool',
toolName,
'--input',
'{"query":"AWS Lambda pricing"}',
'--json',
]);
expect(result.exitCode, `call-tool failed:\nstdout: ${result.stdout}\nstderr: ${result.stderr}`).toBe(0);

const payload = parseJsonOutput(result.stdout) as { success: boolean; response?: string };
expect(payload.success, `call-tool result not successful. Raw stdout:\n${result.stdout}`).toBe(true);
expect(typeof payload.response, 'response should be a JSON envelope string').toBe('string');

const envelope = JSON.parse(payload.response!) as {
result?: { content?: { text?: string }[] };
};
const text = envelope.result?.content?.[0]?.text;
expect(text, `call-tool envelope missing result.content[0].text. Envelope:\n${payload.response}`).toBeTruthy();

const inner = JSON.parse(text!) as { results?: { url?: string }[] };
expect(Array.isArray(inner.results), 'Results array should be present').toBe(true);
expect(inner.results!.length, 'Results array should be non-empty').toBeGreaterThan(0);
},
180_000
);
});
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' chore: add e2e & integ tests for web-search by nborges-aws · Pull Request #1604 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 147 additions & 0 deletions e2e-tests/web-search-lifecycle.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
import { type RunResult, hasAwsCredentials, parseJsonOutput, prereqs } from '../src/test-utils/index.js';
import { installCdkTarball, runAgentCoreCLI, teardownE2EProject, writeAwsTargets } from './e2e-helper.js';
import { randomUUID } from 'node:crypto';
import { mkdir, rm } from 'node:fs/promises';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';

const hasAws = hasAwsCredentials();
const canRun = prereqs.npm && prereqs.git && prereqs.uv && hasAws;

describe.sequential('e2e: web-search gateway target lifecycle', () => {
const suffix = Date.now().toString().slice(-8);
const agentName = `E2eWs${suffix}`;
const gatewayName = 'WsGw';
const targetName = 'ws1';
const toolName = `${targetName}___WebSearch`;

let testDir: string;
let projectPath: string;
let originalRegion: string | undefined;
let lifecycleFailed = false;

beforeAll(async () => {
if (!canRun) return;

// Web search is only available in us-east-1. Pin the region
// so deploy doesn't target a region where the connector doesn't exist
originalRegion = process.env.AWS_REGION;
process.env.AWS_REGION = 'us-east-1';

testDir = join(tmpdir(), `agentcore-e2e-web-search-${randomUUID()}`);
await mkdir(testDir, { recursive: true });

const create = await runAgentCoreCLI(
['create', '--name', agentName, '--no-agent', '--defaults', '--skip-git', '--skip-python-setup', '--json'],
testDir
);
expect(create.exitCode, `Create failed: ${create.stderr}`).toBe(0);
projectPath = (parseJsonOutput(create.stdout) as { projectPath: string }).projectPath;

await writeAwsTargets(projectPath);
installCdkTarball(projectPath);
}, 600_000);

afterAll(async () => {
if (projectPath && hasAws) {
await teardownE2EProject(projectPath, agentName, 'Bedrock');
}
if (testDir) await rm(testDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 1000 });
if (originalRegion === undefined) delete process.env.AWS_REGION;
else process.env.AWS_REGION = originalRegion;
}, 600_000);

const run = (args: string[]): Promise<RunResult> => runAgentCoreCLI(args, projectPath);

// Each step short-circuits if a prior step in the lifecycle failed
const step = (label: string, fn: () => Promise<void>, timeout: number) =>
it.skipIf(!canRun)(
label,
async () => {
if (lifecycleFailed) {
throw new Error('Skipped: a prior step in the lifecycle failed.');
}
try {
await fn();
} catch (err) {
lifecycleFailed = true;
throw err;
}
},
timeout
);

step(
'adds a gateway and a web-search target',
async () => {
const gw = await run(['add', 'gateway', '--name', gatewayName, '--protocol-type', 'MCP', '--json']);
expect(gw.exitCode, `Add gateway failed: ${gw.stderr}`).toBe(0);

const target = await run(['add', 'web-search', '--gateway', gatewayName, '--name', targetName, '--json']);
expect(target.exitCode, `Add web-search failed: ${target.stdout}\n${target.stderr}`).toBe(0);
},
120_000
);

step(
'deploys the stack',
async () => {
const result = await run(['deploy', '--yes', '--json']);
expect(result.exitCode, `Deploy failed: ${result.stderr}`).toBe(0);
},
900_000
);

step(
'status shows the gateway as deployed',
async () => {
const result = await run(['status', '--json']);
expect(result.exitCode, `Status failed: ${result.stderr}`).toBe(0);

const json = parseJsonOutput(result.stdout) as {
success: boolean;
resources: { resourceType: string; name: string; deploymentState: string }[];
};
expect(json.success).toBe(true);

const gateway = json.resources.find(r => r.resourceType === 'gateway' && r.name === gatewayName);
expect(gateway, 'Gateway should appear in status').toBeDefined();
expect(gateway?.deploymentState).toBe('deployed');
},
120_000
);

step(
'call-tool returns search results',
async () => {
const result = await run([
'invoke',
'call-tool',
'--gateway',
gatewayName,
'--tool',
toolName,
'--input',
'{"query":"AWS Lambda pricing"}',
'--json',
]);
expect(result.exitCode, `call-tool failed:\nstdout: ${result.stdout}\nstderr: ${result.stderr}`).toBe(0);

const payload = parseJsonOutput(result.stdout) as { success: boolean; response?: string };
expect(payload.success, `call-tool result not successful. Raw stdout:\n${result.stdout}`).toBe(true);
expect(typeof payload.response, 'response should be a JSON envelope string').toBe('string');

const envelope = JSON.parse(payload.response!) as {
result?: { content?: { text?: string }[] };
};
const text = envelope.result?.content?.[0]?.text;
expect(text, `call-tool envelope missing result.content[0].text. Envelope:\n${payload.response}`).toBeTruthy();

const inner = JSON.parse(text!) as { results?: { url?: string }[] };
expect(Array.isArray(inner.results), 'Results array should be present').toBe(true);
expect(inner.results!.length, 'Results array should be non-empty').toBeGreaterThan(0);
},
180_000
);
});
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); chore: add e2e & integ tests for web-search by nborges-aws · Pull Request #1604 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 147 additions & 0 deletions e2e-tests/web-search-lifecycle.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
import { type RunResult, hasAwsCredentials, parseJsonOutput, prereqs } from '../src/test-utils/index.js';
import { installCdkTarball, runAgentCoreCLI, teardownE2EProject, writeAwsTargets } from './e2e-helper.js';
import { randomUUID } from 'node:crypto';
import { mkdir, rm } from 'node:fs/promises';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';

const hasAws = hasAwsCredentials();
const canRun = prereqs.npm && prereqs.git && prereqs.uv && hasAws;

describe.sequential('e2e: web-search gateway target lifecycle', () => {
const suffix = Date.now().toString().slice(-8);
const agentName = `E2eWs${suffix}`;
const gatewayName = 'WsGw';
const targetName = 'ws1';
const toolName = `${targetName}___WebSearch`;

let testDir: string;
let projectPath: string;
let originalRegion: string | undefined;
let lifecycleFailed = false;

beforeAll(async () => {
if (!canRun) return;

// Web search is only available in us-east-1. Pin the region
// so deploy doesn't target a region where the connector doesn't exist
originalRegion = process.env.AWS_REGION;
process.env.AWS_REGION = 'us-east-1';

testDir = join(tmpdir(), `agentcore-e2e-web-search-${randomUUID()}`);
await mkdir(testDir, { recursive: true });

const create = await runAgentCoreCLI(
['create', '--name', agentName, '--no-agent', '--defaults', '--skip-git', '--skip-python-setup', '--json'],
testDir
);
expect(create.exitCode, `Create failed: ${create.stderr}`).toBe(0);
projectPath = (parseJsonOutput(create.stdout) as { projectPath: string }).projectPath;

await writeAwsTargets(projectPath);
installCdkTarball(projectPath);
}, 600_000);

afterAll(async () => {
if (projectPath && hasAws) {
await teardownE2EProject(projectPath, agentName, 'Bedrock');
}
if (testDir) await rm(testDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 1000 });
if (originalRegion === undefined) delete process.env.AWS_REGION;
else process.env.AWS_REGION = originalRegion;
}, 600_000);

const run = (args: string[]): Promise<RunResult> => runAgentCoreCLI(args, projectPath);

// Each step short-circuits if a prior step in the lifecycle failed
const step = (label: string, fn: () => Promise<void>, timeout: number) =>
it.skipIf(!canRun)(
label,
async () => {
if (lifecycleFailed) {
throw new Error('Skipped: a prior step in the lifecycle failed.');
}
try {
await fn();
} catch (err) {
lifecycleFailed = true;
throw err;
}
},
timeout
);

step(
'adds a gateway and a web-search target',
async () => {
const gw = await run(['add', 'gateway', '--name', gatewayName, '--protocol-type', 'MCP', '--json']);
expect(gw.exitCode, `Add gateway failed: ${gw.stderr}`).toBe(0);

const target = await run(['add', 'web-search', '--gateway', gatewayName, '--name', targetName, '--json']);
expect(target.exitCode, `Add web-search failed: ${target.stdout}\n${target.stderr}`).toBe(0);
},
120_000
);

step(
'deploys the stack',
async () => {
const result = await run(['deploy', '--yes', '--json']);
expect(result.exitCode, `Deploy failed: ${result.stderr}`).toBe(0);
},
900_000
);

step(
'status shows the gateway as deployed',
async () => {
const result = await run(['status', '--json']);
expect(result.exitCode, `Status failed: ${result.stderr}`).toBe(0);

const json = parseJsonOutput(result.stdout) as {
success: boolean;
resources: { resourceType: string; name: string; deploymentState: string }[];
};
expect(json.success).toBe(true);

const gateway = json.resources.find(r => r.resourceType === 'gateway' && r.name === gatewayName);
expect(gateway, 'Gateway should appear in status').toBeDefined();
expect(gateway?.deploymentState).toBe('deployed');
},
120_000
);

step(
'call-tool returns search results',
async () => {
const result = await run([
'invoke',
'call-tool',
'--gateway',
gatewayName,
'--tool',
toolName,
'--input',
'{"query":"AWS Lambda pricing"}',
'--json',
]);
expect(result.exitCode, `call-tool failed:\nstdout: ${result.stdout}\nstderr: ${result.stderr}`).toBe(0);

const payload = parseJsonOutput(result.stdout) as { success: boolean; response?: string };
expect(payload.success, `call-tool result not successful. Raw stdout:\n${result.stdout}`).toBe(true);
expect(typeof payload.response, 'response should be a JSON envelope string').toBe('string');

const envelope = JSON.parse(payload.response!) as {
result?: { content?: { text?: string }[] };
};
const text = envelope.result?.content?.[0]?.text;
expect(text, `call-tool envelope missing result.content[0].text. Envelope:\n${payload.response}`).toBeTruthy();

const inner = JSON.parse(text!) as { results?: { url?: string }[] };
expect(Array.isArray(inner.results), 'Results array should be present').toBe(true);
expect(inner.results!.length, 'Results array should be non-empty').toBeGreaterThan(0);
},
180_000
);
});
Loading
Loading