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
46 changes: 0 additions & 46 deletions src/cli/commands/add/__tests__/validate.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,52 +162,6 @@ describe('validate', () => {
expect(validateAddAgentOptions(validAgentOptionsByo)).toEqual({ valid: true });
expect(validateAddAgentOptions(validAgentOptionsCreate)).toEqual({ valid: true });
});

// VPC validation tests
it('rejects invalid network mode', () => {
const result = validateAddAgentOptions({ ...validAgentOptionsCreate, networkMode: 'INVALID' as any });
expect(result.valid).toBe(false);
expect(result.error).toContain('Invalid network mode');
});

it('rejects VPC mode without subnets', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
securityGroups: 'sg-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('--subnets is required');
});

it('rejects VPC mode without security groups', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
subnets: 'subnet-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('--security-groups is required');
});

it('rejects subnets without VPC mode', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
subnets: 'subnet-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('require --network-mode VPC');
});

it('passes for valid VPC options', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
subnets: 'subnet-12345678',
securityGroups: 'sg-12345678',
});
expect(result.valid).toBe(true);
});
});

describe('validateAddGatewayOptions', () => {
Expand Down
19 changes: 1 addition & 18 deletions src/cli/commands/add/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import type {
GatewayAuthorizerType,
MemoryStrategyType,
ModelProvider,
NetworkMode,
SDKFramework,
TargetLanguage,
} from '../../../schema';
Expand All@@ -30,7 +29,6 @@ import { createRenderer } from '../../templates';
import type { MemoryOption } from '../../tui/screens/generate/types';
import type { AddGatewayConfig, AddMcpToolConfig } from '../../tui/screens/mcp/types';
import { DEFAULT_EVENT_EXPIRY } from '../../tui/screens/memory/types';
import { parseCommaSeparatedList } from '../shared/vpc-utils';
import type { AddAgentResult, AddGatewayResult, AddIdentityResult, AddMcpToolResult, AddMemoryResult } from './types';
import { mkdirSync } from 'fs';
import { dirname, join } from 'path';
Expand All@@ -45,9 +43,6 @@ export interface ValidatedAddAgentOptions {
modelProvider: ModelProvider;
apiKey?: string;
memory?: MemoryOption;
networkMode?: NetworkMode;
subnets?: string;
securityGroups?: string;
codeLocation?: string;
entrypoint?: string;
}
Expand DownExpand Up@@ -125,9 +120,6 @@ async function handleCreatePath(options: ValidatedAddAgentOptions, configBaseDir
modelProvider: options.modelProvider,
memory: options.memory!,
language: options.language,
networkMode: options.networkMode,
subnets: parseCommaSeparatedList(options.subnets),
securityGroups: parseCommaSeparatedList(options.securityGroups),
};

const agentPath = join(projectRoot, APP_DIR, options.name);
Expand DownExpand Up@@ -194,23 +186,14 @@ async function handleByoPath(

const project = await configIO.readProjectSpec();

const networkMode = options.networkMode ?? 'PUBLIC';
const agent: AgentEnvSpec = {
type: 'AgentCoreRuntime',
name: options.name,
build: options.buildType,
entrypoint: (options.entrypoint ?? 'main.py') as FilePath,
codeLocation: codeLocation as DirectoryPath,
runtimeVersion: 'PYTHON_3_12',
networkMode,
...(networkMode === 'VPC' && options.subnets && options.securityGroups
? {
networkConfig: {
subnets: parseCommaSeparatedList(options.subnets)!,
securityGroups: parseCommaSeparatedList(options.securityGroups)!,
},
}
: {}),
networkMode: 'PUBLIC',
};

project.agents.push(agent);
Expand Down
6 changes: 0 additions & 6 deletions src/cli/commands/add/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,9 +40,6 @@ async function handleAddAgentCLI(options: AddAgentOptions): Promise<void> {
modelProvider: options.modelProvider!,
apiKey: options.apiKey,
memory: options.memory,
networkMode: options.networkMode,
subnets: options.subnets,
securityGroups: options.securityGroups,
codeLocation: options.codeLocation,
entrypoint: options.entrypoint,
});
Expand DownExpand Up@@ -230,9 +227,6 @@ export function registerAdd(program: Command) {
.option('--model-provider <provider>', 'Model provider: Bedrock, Anthropic, OpenAI, Gemini [non-interactive]')
.option('--api-key <key>', 'API key for non-Bedrock providers [non-interactive]')
.option('--memory <mem>', 'Memory: none, shortTerm, longAndShortTerm (create path only) [non-interactive]')
.option('--network-mode <mode>', 'Network mode: PUBLIC or VPC (default: PUBLIC) [non-interactive]')
.option('--subnets <ids>', 'Comma-separated subnet IDs (required for VPC mode) [non-interactive]')
.option('--security-groups <ids>', 'Comma-separated security group IDs (required for VPC mode) [non-interactive]')
.option('--code-location <path>', 'Path to existing code (BYO path only) [non-interactive]')
.option('--entrypoint <file>', 'Entry file relative to code-location (BYO, default: main.py) [non-interactive]')
.option('--json', 'Output as JSON [non-interactive]')
Expand Down
5 changes: 1 addition & 4 deletions src/cli/commands/add/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { GatewayAuthorizerType, ModelProvider, NetworkMode, SDKFramework, TargetLanguage } from '../../../schema';
import type { GatewayAuthorizerType, ModelProvider, SDKFramework, TargetLanguage } from '../../../schema';
import type { MemoryOption } from '../../tui/screens/generate/types';

// Agent types
Expand All@@ -11,9 +11,6 @@ export interface AddAgentOptions {
modelProvider?: ModelProvider;
apiKey?: string;
memory?: MemoryOption;
networkMode?: NetworkMode;
subnets?: string;
securityGroups?: string;
codeLocation?: string;
entrypoint?: string;
json?: boolean;
Expand Down
4 changes: 0 additions & 4 deletions src/cli/commands/add/validate.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import {
TargetLanguageSchema,
getSupportedModelProviders,
} from '../../../schema';
import { validateVpcOptions } from '../shared/vpc-utils';
import type {
AddAgentOptions,
AddGatewayOptions,
Expand DownExpand Up@@ -103,9 +102,6 @@ export function validateAddAgentOptions(options: AddAgentOptions): ValidationRes
}
}

const vpcResult = validateVpcOptions(options);
if (!vpcResult.valid) return vpcResult;

return { valid: true };
}

Expand Down
84 changes: 0 additions & 84 deletions src/cli/commands/create/__tests__/validate.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,90 +132,6 @@ describe('validateCreateOptions', () => {
expect(result.valid).toBe(true);
});

// VPC validation tests
it('rejects invalid network mode', () => {
const result = validateCreateOptions(
{
name: 'VpcTest1',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'INVALID',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('Invalid network mode');
});

it('rejects VPC mode without subnets', () => {
const result = validateCreateOptions(
{
name: 'VpcTest2',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
securityGroups: 'sg-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('--subnets is required');
});

it('rejects VPC mode without security groups', () => {
const result = validateCreateOptions(
{
name: 'VpcTest3',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
subnets: 'subnet-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('--security-groups is required');
});

it('rejects subnets without VPC mode', () => {
const result = validateCreateOptions(
{
name: 'VpcTest4',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
subnets: 'subnet-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('require --network-mode VPC');
});

it('returns valid with VPC mode and required options', () => {
const result = validateCreateOptions(
{
name: 'VpcTest5',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
subnets: 'subnet-12345678',
securityGroups: 'sg-12345678',
},
testDir
);
expect(result.valid).toBe(true);
});

it('returns invalid for unsupported framework/model combination', () => {
// GoogleADK only supports certain providers, not all
const result = validateCreateOptions(
Expand Down
10 changes: 0 additions & 10 deletions src/cli/commands/create/action.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import type {
BuildType,
DeployedState,
ModelProvider,
NetworkMode,
SDKFramework,
TargetLanguage,
} from '../../../schema';
Expand DownExpand Up@@ -121,9 +120,6 @@ export interface CreateWithAgentOptions {
modelProvider: ModelProvider;
apiKey?: string;
memory: MemoryOption;
networkMode?: NetworkMode;
subnets?: string[];
securityGroups?: string[];
skipGit?: boolean;
skipPythonSetup?: boolean;
onProgress?: ProgressCallback;
Expand All@@ -139,9 +135,6 @@ export async function createProjectWithAgent(options: CreateWithAgentOptions): P
modelProvider,
apiKey,
memory,
networkMode,
subnets,
securityGroups,
skipGit,
skipPythonSetup,
onProgress,
Expand DownExpand Up@@ -179,9 +172,6 @@ export async function createProjectWithAgent(options: CreateWithAgentOptions): P
apiKey,
memory,
language,
networkMode,
subnets,
securityGroups,
};

// Resolve credential strategy FIRST (new project has no existing credentials)
Expand Down
12 changes: 1 addition & 11 deletions src/cli/commands/create/command.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
import { getWorkingDirectory } from '../../../lib';
import type { BuildType, ModelProvider, NetworkMode, SDKFramework, TargetLanguage } from '../../../schema';
import type { BuildType, ModelProvider, SDKFramework, TargetLanguage } from '../../../schema';
import { getErrorMessage } from '../../errors';
import { COMMAND_DESCRIPTIONS } from '../../tui/copy';
import { CreateScreen } from '../../tui/screens/create';
import { parseCommaSeparatedList } from '../shared/vpc-utils';
import { type ProgressCallback, createProject, createProjectWithAgent, getDryRunInfo } from './action';
import type { CreateOptions } from './types';
import { validateCreateOptions } from './validate';
Expand DownExpand Up@@ -121,9 +120,6 @@ async function handleCreateCLI(options: CreateOptions): Promise<void> {
modelProvider: options.modelProvider as ModelProvider,
apiKey: options.apiKey,
memory: options.memory as 'none' | 'shortTerm' | 'longAndShortTerm',
networkMode: options.networkMode as NetworkMode | undefined,
subnets: parseCommaSeparatedList(options.subnets),
securityGroups: parseCommaSeparatedList(options.securityGroups),
skipGit: options.skipGit,
skipPythonSetup: options.skipPythonSetup,
onProgress,
Expand DownExpand Up@@ -156,9 +152,6 @@ export const registerCreate = (program: Command) => {
.option('--model-provider <provider>', 'Model provider (Bedrock, Anthropic, OpenAI, Gemini) [non-interactive]')
.option('--api-key <key>', 'API key for non-Bedrock providers [non-interactive]')
.option('--memory <option>', 'Memory option (none, shortTerm, longAndShortTerm) [non-interactive]')
.option('--network-mode <mode>', 'Network mode: PUBLIC or VPC (default: PUBLIC) [non-interactive]')
.option('--subnets <ids>', 'Comma-separated subnet IDs (required for VPC mode) [non-interactive]')
.option('--security-groups <ids>', 'Comma-separated security group IDs (required for VPC mode) [non-interactive]')
.option('--output-dir <dir>', 'Output directory (default: current directory) [non-interactive]')
.option('--skip-git', 'Skip git repository initialization [non-interactive]')
.option('--skip-python-setup', 'Skip Python virtual environment setup [non-interactive]')
Expand DownExpand Up@@ -186,9 +179,6 @@ export const registerCreate = (program: Command) => {
options.modelProvider ??
options.apiKey ??
options.memory ??
options.networkMode ??
options.subnets ??
options.securityGroups ??
options.outputDir ??
options.skipGit ??
options.skipPythonSetup ??
Expand Down
3 changes: 0 additions & 3 deletions src/cli/commands/create/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,6 @@ export interface CreateOptions {
modelProvider?: string;
apiKey?: string;
memory?: string;
networkMode?: string;
subnets?: string;
securityGroups?: string;
outputDir?: string;
skipGit?: boolean;
skipPythonSetup?: boolean;
Expand Down
4 changes: 0 additions & 4 deletions src/cli/commands/create/validate.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import {
TargetLanguageSchema,
getSupportedModelProviders,
} from '../../../schema';
import { validateVpcOptions } from '../shared/vpc-utils';
import type { CreateOptions } from './types';
import { existsSync } from 'fs';
import { join } from 'path';
Expand DownExpand Up@@ -122,8 +121,5 @@ export function validateCreateOptions(options: CreateOptions, cwd?: string): Val
}
}

const vpcResult = validateVpcOptions(options);
if (!vpcResult.valid) return vpcResult;

return { valid: true };
}
20 changes: 0 additions & 20 deletions src/cli/commands/dev/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,12 +144,6 @@ export const registerDev = (program: Command) => {
const targetAgent = project.agents.find(a => a.name === config.agentName);
const providerInfo = targetAgent?.modelProvider ?? '(see agent code)';

if (targetAgent?.networkMode === 'VPC') {
console.warn(
'Warning: This agent uses VPC network mode. Local dev server runs outside your VPC. Network behavior may differ from deployed environment.'
);
}

console.log(`Starting dev server...`);
console.log(`Agent: ${config.agentName}`);
console.log(`Provider: ${providerInfo}`);
Expand DownExpand Up@@ -184,20 +178,6 @@ export const registerDev = (program: Command) => {
await new Promise(() => {});
}

// Warn if the target agent uses VPC mode
{
const vpcAgent = opts.agent
? project.agents.find(a => a.name === opts.agent)
: project.agents.length === 1
? project.agents[0]
: undefined;
if (vpcAgent?.networkMode === 'VPC') {
console.warn(
'Warning: This agent uses VPC network mode. Local dev server runs outside your VPC. Network behavior may differ from deployed environment.'
);
}
}

// Enter alternate screen buffer for fullscreen mode
process.stdout.write(ENTER_ALT_SCREEN);

Expand Down
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: remove VPC feature from CLI by tejaskash · Pull Request #466 · 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
46 changes: 0 additions & 46 deletions src/cli/commands/add/__tests__/validate.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,52 +162,6 @@ describe('validate', () => {
expect(validateAddAgentOptions(validAgentOptionsByo)).toEqual({ valid: true });
expect(validateAddAgentOptions(validAgentOptionsCreate)).toEqual({ valid: true });
});

// VPC validation tests
it('rejects invalid network mode', () => {
const result = validateAddAgentOptions({ ...validAgentOptionsCreate, networkMode: 'INVALID' as any });
expect(result.valid).toBe(false);
expect(result.error).toContain('Invalid network mode');
});

it('rejects VPC mode without subnets', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
securityGroups: 'sg-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('--subnets is required');
});

it('rejects VPC mode without security groups', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
subnets: 'subnet-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('--security-groups is required');
});

it('rejects subnets without VPC mode', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
subnets: 'subnet-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('require --network-mode VPC');
});

it('passes for valid VPC options', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
subnets: 'subnet-12345678',
securityGroups: 'sg-12345678',
});
expect(result.valid).toBe(true);
});
});

describe('validateAddGatewayOptions', () => {
Expand Down
19 changes: 1 addition & 18 deletions src/cli/commands/add/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import type {
GatewayAuthorizerType,
MemoryStrategyType,
ModelProvider,
NetworkMode,
SDKFramework,
TargetLanguage,
} from '../../../schema';
Expand All@@ -30,7 +29,6 @@ import { createRenderer } from '../../templates';
import type { MemoryOption } from '../../tui/screens/generate/types';
import type { AddGatewayConfig, AddMcpToolConfig } from '../../tui/screens/mcp/types';
import { DEFAULT_EVENT_EXPIRY } from '../../tui/screens/memory/types';
import { parseCommaSeparatedList } from '../shared/vpc-utils';
import type { AddAgentResult, AddGatewayResult, AddIdentityResult, AddMcpToolResult, AddMemoryResult } from './types';
import { mkdirSync } from 'fs';
import { dirname, join } from 'path';
Expand All@@ -45,9 +43,6 @@ export interface ValidatedAddAgentOptions {
modelProvider: ModelProvider;
apiKey?: string;
memory?: MemoryOption;
networkMode?: NetworkMode;
subnets?: string;
securityGroups?: string;
codeLocation?: string;
entrypoint?: string;
}
Expand DownExpand Up@@ -125,9 +120,6 @@ async function handleCreatePath(options: ValidatedAddAgentOptions, configBaseDir
modelProvider: options.modelProvider,
memory: options.memory!,
language: options.language,
networkMode: options.networkMode,
subnets: parseCommaSeparatedList(options.subnets),
securityGroups: parseCommaSeparatedList(options.securityGroups),
};

const agentPath = join(projectRoot, APP_DIR, options.name);
Expand DownExpand Up@@ -194,23 +186,14 @@ async function handleByoPath(

const project = await configIO.readProjectSpec();

const networkMode = options.networkMode ?? 'PUBLIC';
const agent: AgentEnvSpec = {
type: 'AgentCoreRuntime',
name: options.name,
build: options.buildType,
entrypoint: (options.entrypoint ?? 'main.py') as FilePath,
codeLocation: codeLocation as DirectoryPath,
runtimeVersion: 'PYTHON_3_12',
networkMode,
...(networkMode === 'VPC' && options.subnets && options.securityGroups
? {
networkConfig: {
subnets: parseCommaSeparatedList(options.subnets)!,
securityGroups: parseCommaSeparatedList(options.securityGroups)!,
},
}
: {}),
networkMode: 'PUBLIC',
};

project.agents.push(agent);
Expand Down
6 changes: 0 additions & 6 deletions src/cli/commands/add/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,9 +40,6 @@ async function handleAddAgentCLI(options: AddAgentOptions): Promise<void> {
modelProvider: options.modelProvider!,
apiKey: options.apiKey,
memory: options.memory,
networkMode: options.networkMode,
subnets: options.subnets,
securityGroups: options.securityGroups,
codeLocation: options.codeLocation,
entrypoint: options.entrypoint,
});
Expand DownExpand Up@@ -230,9 +227,6 @@ export function registerAdd(program: Command) {
.option('--model-provider <provider>', 'Model provider: Bedrock, Anthropic, OpenAI, Gemini [non-interactive]')
.option('--api-key <key>', 'API key for non-Bedrock providers [non-interactive]')
.option('--memory <mem>', 'Memory: none, shortTerm, longAndShortTerm (create path only) [non-interactive]')
.option('--network-mode <mode>', 'Network mode: PUBLIC or VPC (default: PUBLIC) [non-interactive]')
.option('--subnets <ids>', 'Comma-separated subnet IDs (required for VPC mode) [non-interactive]')
.option('--security-groups <ids>', 'Comma-separated security group IDs (required for VPC mode) [non-interactive]')
.option('--code-location <path>', 'Path to existing code (BYO path only) [non-interactive]')
.option('--entrypoint <file>', 'Entry file relative to code-location (BYO, default: main.py) [non-interactive]')
.option('--json', 'Output as JSON [non-interactive]')
Expand Down
5 changes: 1 addition & 4 deletions src/cli/commands/add/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { GatewayAuthorizerType, ModelProvider, NetworkMode, SDKFramework, TargetLanguage } from '../../../schema';
import type { GatewayAuthorizerType, ModelProvider, SDKFramework, TargetLanguage } from '../../../schema';
import type { MemoryOption } from '../../tui/screens/generate/types';

// Agent types
Expand All@@ -11,9 +11,6 @@ export interface AddAgentOptions {
modelProvider?: ModelProvider;
apiKey?: string;
memory?: MemoryOption;
networkMode?: NetworkMode;
subnets?: string;
securityGroups?: string;
codeLocation?: string;
entrypoint?: string;
json?: boolean;
Expand Down
4 changes: 0 additions & 4 deletions src/cli/commands/add/validate.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import {
TargetLanguageSchema,
getSupportedModelProviders,
} from '../../../schema';
import { validateVpcOptions } from '../shared/vpc-utils';
import type {
AddAgentOptions,
AddGatewayOptions,
Expand DownExpand Up@@ -103,9 +102,6 @@ export function validateAddAgentOptions(options: AddAgentOptions): ValidationRes
}
}

const vpcResult = validateVpcOptions(options);
if (!vpcResult.valid) return vpcResult;

return { valid: true };
}

Expand Down
84 changes: 0 additions & 84 deletions src/cli/commands/create/__tests__/validate.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,90 +132,6 @@ describe('validateCreateOptions', () => {
expect(result.valid).toBe(true);
});

// VPC validation tests
it('rejects invalid network mode', () => {
const result = validateCreateOptions(
{
name: 'VpcTest1',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'INVALID',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('Invalid network mode');
});

it('rejects VPC mode without subnets', () => {
const result = validateCreateOptions(
{
name: 'VpcTest2',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
securityGroups: 'sg-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('--subnets is required');
});

it('rejects VPC mode without security groups', () => {
const result = validateCreateOptions(
{
name: 'VpcTest3',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
subnets: 'subnet-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('--security-groups is required');
});

it('rejects subnets without VPC mode', () => {
const result = validateCreateOptions(
{
name: 'VpcTest4',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
subnets: 'subnet-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('require --network-mode VPC');
});

it('returns valid with VPC mode and required options', () => {
const result = validateCreateOptions(
{
name: 'VpcTest5',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
subnets: 'subnet-12345678',
securityGroups: 'sg-12345678',
},
testDir
);
expect(result.valid).toBe(true);
});

it('returns invalid for unsupported framework/model combination', () => {
// GoogleADK only supports certain providers, not all
const result = validateCreateOptions(
Expand Down
10 changes: 0 additions & 10 deletions src/cli/commands/create/action.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import type {
BuildType,
DeployedState,
ModelProvider,
NetworkMode,
SDKFramework,
TargetLanguage,
} from '../../../schema';
Expand DownExpand Up@@ -121,9 +120,6 @@ export interface CreateWithAgentOptions {
modelProvider: ModelProvider;
apiKey?: string;
memory: MemoryOption;
networkMode?: NetworkMode;
subnets?: string[];
securityGroups?: string[];
skipGit?: boolean;
skipPythonSetup?: boolean;
onProgress?: ProgressCallback;
Expand All@@ -139,9 +135,6 @@ export async function createProjectWithAgent(options: CreateWithAgentOptions): P
modelProvider,
apiKey,
memory,
networkMode,
subnets,
securityGroups,
skipGit,
skipPythonSetup,
onProgress,
Expand DownExpand Up@@ -179,9 +172,6 @@ export async function createProjectWithAgent(options: CreateWithAgentOptions): P
apiKey,
memory,
language,
networkMode,
subnets,
securityGroups,
};

// Resolve credential strategy FIRST (new project has no existing credentials)
Expand Down
12 changes: 1 addition & 11 deletions src/cli/commands/create/command.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
import { getWorkingDirectory } from '../../../lib';
import type { BuildType, ModelProvider, NetworkMode, SDKFramework, TargetLanguage } from '../../../schema';
import type { BuildType, ModelProvider, SDKFramework, TargetLanguage } from '../../../schema';
import { getErrorMessage } from '../../errors';
import { COMMAND_DESCRIPTIONS } from '../../tui/copy';
import { CreateScreen } from '../../tui/screens/create';
import { parseCommaSeparatedList } from '../shared/vpc-utils';
import { type ProgressCallback, createProject, createProjectWithAgent, getDryRunInfo } from './action';
import type { CreateOptions } from './types';
import { validateCreateOptions } from './validate';
Expand DownExpand Up@@ -121,9 +120,6 @@ async function handleCreateCLI(options: CreateOptions): Promise<void> {
modelProvider: options.modelProvider as ModelProvider,
apiKey: options.apiKey,
memory: options.memory as 'none' | 'shortTerm' | 'longAndShortTerm',
networkMode: options.networkMode as NetworkMode | undefined,
subnets: parseCommaSeparatedList(options.subnets),
securityGroups: parseCommaSeparatedList(options.securityGroups),
skipGit: options.skipGit,
skipPythonSetup: options.skipPythonSetup,
onProgress,
Expand DownExpand Up@@ -156,9 +152,6 @@ export const registerCreate = (program: Command) => {
.option('--model-provider <provider>', 'Model provider (Bedrock, Anthropic, OpenAI, Gemini) [non-interactive]')
.option('--api-key <key>', 'API key for non-Bedrock providers [non-interactive]')
.option('--memory <option>', 'Memory option (none, shortTerm, longAndShortTerm) [non-interactive]')
.option('--network-mode <mode>', 'Network mode: PUBLIC or VPC (default: PUBLIC) [non-interactive]')
.option('--subnets <ids>', 'Comma-separated subnet IDs (required for VPC mode) [non-interactive]')
.option('--security-groups <ids>', 'Comma-separated security group IDs (required for VPC mode) [non-interactive]')
.option('--output-dir <dir>', 'Output directory (default: current directory) [non-interactive]')
.option('--skip-git', 'Skip git repository initialization [non-interactive]')
.option('--skip-python-setup', 'Skip Python virtual environment setup [non-interactive]')
Expand DownExpand Up@@ -186,9 +179,6 @@ export const registerCreate = (program: Command) => {
options.modelProvider ??
options.apiKey ??
options.memory ??
options.networkMode ??
options.subnets ??
options.securityGroups ??
options.outputDir ??
options.skipGit ??
options.skipPythonSetup ??
Expand Down
3 changes: 0 additions & 3 deletions src/cli/commands/create/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,6 @@ export interface CreateOptions {
modelProvider?: string;
apiKey?: string;
memory?: string;
networkMode?: string;
subnets?: string;
securityGroups?: string;
outputDir?: string;
skipGit?: boolean;
skipPythonSetup?: boolean;
Expand Down
4 changes: 0 additions & 4 deletions src/cli/commands/create/validate.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import {
TargetLanguageSchema,
getSupportedModelProviders,
} from '../../../schema';
import { validateVpcOptions } from '../shared/vpc-utils';
import type { CreateOptions } from './types';
import { existsSync } from 'fs';
import { join } from 'path';
Expand DownExpand Up@@ -122,8 +121,5 @@ export function validateCreateOptions(options: CreateOptions, cwd?: string): Val
}
}

const vpcResult = validateVpcOptions(options);
if (!vpcResult.valid) return vpcResult;

return { valid: true };
}
20 changes: 0 additions & 20 deletions src/cli/commands/dev/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,12 +144,6 @@ export const registerDev = (program: Command) => {
const targetAgent = project.agents.find(a => a.name === config.agentName);
const providerInfo = targetAgent?.modelProvider ?? '(see agent code)';

if (targetAgent?.networkMode === 'VPC') {
console.warn(
'Warning: This agent uses VPC network mode. Local dev server runs outside your VPC. Network behavior may differ from deployed environment.'
);
}

console.log(`Starting dev server...`);
console.log(`Agent: ${config.agentName}`);
console.log(`Provider: ${providerInfo}`);
Expand DownExpand Up@@ -184,20 +178,6 @@ export const registerDev = (program: Command) => {
await new Promise(() => {});
}

// Warn if the target agent uses VPC mode
{
const vpcAgent = opts.agent
? project.agents.find(a => a.name === opts.agent)
: project.agents.length === 1
? project.agents[0]
: undefined;
if (vpcAgent?.networkMode === 'VPC') {
console.warn(
'Warning: This agent uses VPC network mode. Local dev server runs outside your VPC. Network behavior may differ from deployed environment.'
);
}
}

// Enter alternate screen buffer for fullscreen mode
process.stdout.write(ENTER_ALT_SCREEN);

Expand Down
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: remove VPC feature from CLI by tejaskash · Pull Request #466 · 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
46 changes: 0 additions & 46 deletions src/cli/commands/add/__tests__/validate.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,52 +162,6 @@ describe('validate', () => {
expect(validateAddAgentOptions(validAgentOptionsByo)).toEqual({ valid: true });
expect(validateAddAgentOptions(validAgentOptionsCreate)).toEqual({ valid: true });
});

// VPC validation tests
it('rejects invalid network mode', () => {
const result = validateAddAgentOptions({ ...validAgentOptionsCreate, networkMode: 'INVALID' as any });
expect(result.valid).toBe(false);
expect(result.error).toContain('Invalid network mode');
});

it('rejects VPC mode without subnets', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
securityGroups: 'sg-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('--subnets is required');
});

it('rejects VPC mode without security groups', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
subnets: 'subnet-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('--security-groups is required');
});

it('rejects subnets without VPC mode', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
subnets: 'subnet-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('require --network-mode VPC');
});

it('passes for valid VPC options', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
subnets: 'subnet-12345678',
securityGroups: 'sg-12345678',
});
expect(result.valid).toBe(true);
});
});

describe('validateAddGatewayOptions', () => {
Expand Down
19 changes: 1 addition & 18 deletions src/cli/commands/add/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import type {
GatewayAuthorizerType,
MemoryStrategyType,
ModelProvider,
NetworkMode,
SDKFramework,
TargetLanguage,
} from '../../../schema';
Expand All@@ -30,7 +29,6 @@ import { createRenderer } from '../../templates';
import type { MemoryOption } from '../../tui/screens/generate/types';
import type { AddGatewayConfig, AddMcpToolConfig } from '../../tui/screens/mcp/types';
import { DEFAULT_EVENT_EXPIRY } from '../../tui/screens/memory/types';
import { parseCommaSeparatedList } from '../shared/vpc-utils';
import type { AddAgentResult, AddGatewayResult, AddIdentityResult, AddMcpToolResult, AddMemoryResult } from './types';
import { mkdirSync } from 'fs';
import { dirname, join } from 'path';
Expand All@@ -45,9 +43,6 @@ export interface ValidatedAddAgentOptions {
modelProvider: ModelProvider;
apiKey?: string;
memory?: MemoryOption;
networkMode?: NetworkMode;
subnets?: string;
securityGroups?: string;
codeLocation?: string;
entrypoint?: string;
}
Expand DownExpand Up@@ -125,9 +120,6 @@ async function handleCreatePath(options: ValidatedAddAgentOptions, configBaseDir
modelProvider: options.modelProvider,
memory: options.memory!,
language: options.language,
networkMode: options.networkMode,
subnets: parseCommaSeparatedList(options.subnets),
securityGroups: parseCommaSeparatedList(options.securityGroups),
};

const agentPath = join(projectRoot, APP_DIR, options.name);
Expand DownExpand Up@@ -194,23 +186,14 @@ async function handleByoPath(

const project = await configIO.readProjectSpec();

const networkMode = options.networkMode ?? 'PUBLIC';
const agent: AgentEnvSpec = {
type: 'AgentCoreRuntime',
name: options.name,
build: options.buildType,
entrypoint: (options.entrypoint ?? 'main.py') as FilePath,
codeLocation: codeLocation as DirectoryPath,
runtimeVersion: 'PYTHON_3_12',
networkMode,
...(networkMode === 'VPC' && options.subnets && options.securityGroups
? {
networkConfig: {
subnets: parseCommaSeparatedList(options.subnets)!,
securityGroups: parseCommaSeparatedList(options.securityGroups)!,
},
}
: {}),
networkMode: 'PUBLIC',
};

project.agents.push(agent);
Expand Down
6 changes: 0 additions & 6 deletions src/cli/commands/add/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,9 +40,6 @@ async function handleAddAgentCLI(options: AddAgentOptions): Promise<void> {
modelProvider: options.modelProvider!,
apiKey: options.apiKey,
memory: options.memory,
networkMode: options.networkMode,
subnets: options.subnets,
securityGroups: options.securityGroups,
codeLocation: options.codeLocation,
entrypoint: options.entrypoint,
});
Expand DownExpand Up@@ -230,9 +227,6 @@ export function registerAdd(program: Command) {
.option('--model-provider <provider>', 'Model provider: Bedrock, Anthropic, OpenAI, Gemini [non-interactive]')
.option('--api-key <key>', 'API key for non-Bedrock providers [non-interactive]')
.option('--memory <mem>', 'Memory: none, shortTerm, longAndShortTerm (create path only) [non-interactive]')
.option('--network-mode <mode>', 'Network mode: PUBLIC or VPC (default: PUBLIC) [non-interactive]')
.option('--subnets <ids>', 'Comma-separated subnet IDs (required for VPC mode) [non-interactive]')
.option('--security-groups <ids>', 'Comma-separated security group IDs (required for VPC mode) [non-interactive]')
.option('--code-location <path>', 'Path to existing code (BYO path only) [non-interactive]')
.option('--entrypoint <file>', 'Entry file relative to code-location (BYO, default: main.py) [non-interactive]')
.option('--json', 'Output as JSON [non-interactive]')
Expand Down
5 changes: 1 addition & 4 deletions src/cli/commands/add/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { GatewayAuthorizerType, ModelProvider, NetworkMode, SDKFramework, TargetLanguage } from '../../../schema';
import type { GatewayAuthorizerType, ModelProvider, SDKFramework, TargetLanguage } from '../../../schema';
import type { MemoryOption } from '../../tui/screens/generate/types';

// Agent types
Expand All@@ -11,9 +11,6 @@ export interface AddAgentOptions {
modelProvider?: ModelProvider;
apiKey?: string;
memory?: MemoryOption;
networkMode?: NetworkMode;
subnets?: string;
securityGroups?: string;
codeLocation?: string;
entrypoint?: string;
json?: boolean;
Expand Down
4 changes: 0 additions & 4 deletions src/cli/commands/add/validate.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import {
TargetLanguageSchema,
getSupportedModelProviders,
} from '../../../schema';
import { validateVpcOptions } from '../shared/vpc-utils';
import type {
AddAgentOptions,
AddGatewayOptions,
Expand DownExpand Up@@ -103,9 +102,6 @@ export function validateAddAgentOptions(options: AddAgentOptions): ValidationRes
}
}

const vpcResult = validateVpcOptions(options);
if (!vpcResult.valid) return vpcResult;

return { valid: true };
}

Expand Down
84 changes: 0 additions & 84 deletions src/cli/commands/create/__tests__/validate.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,90 +132,6 @@ describe('validateCreateOptions', () => {
expect(result.valid).toBe(true);
});

// VPC validation tests
it('rejects invalid network mode', () => {
const result = validateCreateOptions(
{
name: 'VpcTest1',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'INVALID',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('Invalid network mode');
});

it('rejects VPC mode without subnets', () => {
const result = validateCreateOptions(
{
name: 'VpcTest2',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
securityGroups: 'sg-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('--subnets is required');
});

it('rejects VPC mode without security groups', () => {
const result = validateCreateOptions(
{
name: 'VpcTest3',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
subnets: 'subnet-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('--security-groups is required');
});

it('rejects subnets without VPC mode', () => {
const result = validateCreateOptions(
{
name: 'VpcTest4',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
subnets: 'subnet-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('require --network-mode VPC');
});

it('returns valid with VPC mode and required options', () => {
const result = validateCreateOptions(
{
name: 'VpcTest5',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
subnets: 'subnet-12345678',
securityGroups: 'sg-12345678',
},
testDir
);
expect(result.valid).toBe(true);
});

it('returns invalid for unsupported framework/model combination', () => {
// GoogleADK only supports certain providers, not all
const result = validateCreateOptions(
Expand Down
10 changes: 0 additions & 10 deletions src/cli/commands/create/action.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import type {
BuildType,
DeployedState,
ModelProvider,
NetworkMode,
SDKFramework,
TargetLanguage,
} from '../../../schema';
Expand DownExpand Up@@ -121,9 +120,6 @@ export interface CreateWithAgentOptions {
modelProvider: ModelProvider;
apiKey?: string;
memory: MemoryOption;
networkMode?: NetworkMode;
subnets?: string[];
securityGroups?: string[];
skipGit?: boolean;
skipPythonSetup?: boolean;
onProgress?: ProgressCallback;
Expand All@@ -139,9 +135,6 @@ export async function createProjectWithAgent(options: CreateWithAgentOptions): P
modelProvider,
apiKey,
memory,
networkMode,
subnets,
securityGroups,
skipGit,
skipPythonSetup,
onProgress,
Expand DownExpand Up@@ -179,9 +172,6 @@ export async function createProjectWithAgent(options: CreateWithAgentOptions): P
apiKey,
memory,
language,
networkMode,
subnets,
securityGroups,
};

// Resolve credential strategy FIRST (new project has no existing credentials)
Expand Down
12 changes: 1 addition & 11 deletions src/cli/commands/create/command.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
import { getWorkingDirectory } from '../../../lib';
import type { BuildType, ModelProvider, NetworkMode, SDKFramework, TargetLanguage } from '../../../schema';
import type { BuildType, ModelProvider, SDKFramework, TargetLanguage } from '../../../schema';
import { getErrorMessage } from '../../errors';
import { COMMAND_DESCRIPTIONS } from '../../tui/copy';
import { CreateScreen } from '../../tui/screens/create';
import { parseCommaSeparatedList } from '../shared/vpc-utils';
import { type ProgressCallback, createProject, createProjectWithAgent, getDryRunInfo } from './action';
import type { CreateOptions } from './types';
import { validateCreateOptions } from './validate';
Expand DownExpand Up@@ -121,9 +120,6 @@ async function handleCreateCLI(options: CreateOptions): Promise<void> {
modelProvider: options.modelProvider as ModelProvider,
apiKey: options.apiKey,
memory: options.memory as 'none' | 'shortTerm' | 'longAndShortTerm',
networkMode: options.networkMode as NetworkMode | undefined,
subnets: parseCommaSeparatedList(options.subnets),
securityGroups: parseCommaSeparatedList(options.securityGroups),
skipGit: options.skipGit,
skipPythonSetup: options.skipPythonSetup,
onProgress,
Expand DownExpand Up@@ -156,9 +152,6 @@ export const registerCreate = (program: Command) => {
.option('--model-provider <provider>', 'Model provider (Bedrock, Anthropic, OpenAI, Gemini) [non-interactive]')
.option('--api-key <key>', 'API key for non-Bedrock providers [non-interactive]')
.option('--memory <option>', 'Memory option (none, shortTerm, longAndShortTerm) [non-interactive]')
.option('--network-mode <mode>', 'Network mode: PUBLIC or VPC (default: PUBLIC) [non-interactive]')
.option('--subnets <ids>', 'Comma-separated subnet IDs (required for VPC mode) [non-interactive]')
.option('--security-groups <ids>', 'Comma-separated security group IDs (required for VPC mode) [non-interactive]')
.option('--output-dir <dir>', 'Output directory (default: current directory) [non-interactive]')
.option('--skip-git', 'Skip git repository initialization [non-interactive]')
.option('--skip-python-setup', 'Skip Python virtual environment setup [non-interactive]')
Expand DownExpand Up@@ -186,9 +179,6 @@ export const registerCreate = (program: Command) => {
options.modelProvider ??
options.apiKey ??
options.memory ??
options.networkMode ??
options.subnets ??
options.securityGroups ??
options.outputDir ??
options.skipGit ??
options.skipPythonSetup ??
Expand Down
3 changes: 0 additions & 3 deletions src/cli/commands/create/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,6 @@ export interface CreateOptions {
modelProvider?: string;
apiKey?: string;
memory?: string;
networkMode?: string;
subnets?: string;
securityGroups?: string;
outputDir?: string;
skipGit?: boolean;
skipPythonSetup?: boolean;
Expand Down
4 changes: 0 additions & 4 deletions src/cli/commands/create/validate.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import {
TargetLanguageSchema,
getSupportedModelProviders,
} from '../../../schema';
import { validateVpcOptions } from '../shared/vpc-utils';
import type { CreateOptions } from './types';
import { existsSync } from 'fs';
import { join } from 'path';
Expand DownExpand Up@@ -122,8 +121,5 @@ export function validateCreateOptions(options: CreateOptions, cwd?: string): Val
}
}

const vpcResult = validateVpcOptions(options);
if (!vpcResult.valid) return vpcResult;

return { valid: true };
}
20 changes: 0 additions & 20 deletions src/cli/commands/dev/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,12 +144,6 @@ export const registerDev = (program: Command) => {
const targetAgent = project.agents.find(a => a.name === config.agentName);
const providerInfo = targetAgent?.modelProvider ?? '(see agent code)';

if (targetAgent?.networkMode === 'VPC') {
console.warn(
'Warning: This agent uses VPC network mode. Local dev server runs outside your VPC. Network behavior may differ from deployed environment.'
);
}

console.log(`Starting dev server...`);
console.log(`Agent: ${config.agentName}`);
console.log(`Provider: ${providerInfo}`);
Expand DownExpand Up@@ -184,20 +178,6 @@ export const registerDev = (program: Command) => {
await new Promise(() => {});
}

// Warn if the target agent uses VPC mode
{
const vpcAgent = opts.agent
? project.agents.find(a => a.name === opts.agent)
: project.agents.length === 1
? project.agents[0]
: undefined;
if (vpcAgent?.networkMode === 'VPC') {
console.warn(
'Warning: This agent uses VPC network mode. Local dev server runs outside your VPC. Network behavior may differ from deployed environment.'
);
}
}

// Enter alternate screen buffer for fullscreen mode
process.stdout.write(ENTER_ALT_SCREEN);

Expand Down
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: remove VPC feature from CLI by tejaskash · Pull Request #466 · 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
46 changes: 0 additions & 46 deletions src/cli/commands/add/__tests__/validate.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,52 +162,6 @@ describe('validate', () => {
expect(validateAddAgentOptions(validAgentOptionsByo)).toEqual({ valid: true });
expect(validateAddAgentOptions(validAgentOptionsCreate)).toEqual({ valid: true });
});

// VPC validation tests
it('rejects invalid network mode', () => {
const result = validateAddAgentOptions({ ...validAgentOptionsCreate, networkMode: 'INVALID' as any });
expect(result.valid).toBe(false);
expect(result.error).toContain('Invalid network mode');
});

it('rejects VPC mode without subnets', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
securityGroups: 'sg-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('--subnets is required');
});

it('rejects VPC mode without security groups', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
subnets: 'subnet-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('--security-groups is required');
});

it('rejects subnets without VPC mode', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
subnets: 'subnet-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('require --network-mode VPC');
});

it('passes for valid VPC options', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
subnets: 'subnet-12345678',
securityGroups: 'sg-12345678',
});
expect(result.valid).toBe(true);
});
});

describe('validateAddGatewayOptions', () => {
Expand Down
19 changes: 1 addition & 18 deletions src/cli/commands/add/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import type {
GatewayAuthorizerType,
MemoryStrategyType,
ModelProvider,
NetworkMode,
SDKFramework,
TargetLanguage,
} from '../../../schema';
Expand All@@ -30,7 +29,6 @@ import { createRenderer } from '../../templates';
import type { MemoryOption } from '../../tui/screens/generate/types';
import type { AddGatewayConfig, AddMcpToolConfig } from '../../tui/screens/mcp/types';
import { DEFAULT_EVENT_EXPIRY } from '../../tui/screens/memory/types';
import { parseCommaSeparatedList } from '../shared/vpc-utils';
import type { AddAgentResult, AddGatewayResult, AddIdentityResult, AddMcpToolResult, AddMemoryResult } from './types';
import { mkdirSync } from 'fs';
import { dirname, join } from 'path';
Expand All@@ -45,9 +43,6 @@ export interface ValidatedAddAgentOptions {
modelProvider: ModelProvider;
apiKey?: string;
memory?: MemoryOption;
networkMode?: NetworkMode;
subnets?: string;
securityGroups?: string;
codeLocation?: string;
entrypoint?: string;
}
Expand DownExpand Up@@ -125,9 +120,6 @@ async function handleCreatePath(options: ValidatedAddAgentOptions, configBaseDir
modelProvider: options.modelProvider,
memory: options.memory!,
language: options.language,
networkMode: options.networkMode,
subnets: parseCommaSeparatedList(options.subnets),
securityGroups: parseCommaSeparatedList(options.securityGroups),
};

const agentPath = join(projectRoot, APP_DIR, options.name);
Expand DownExpand Up@@ -194,23 +186,14 @@ async function handleByoPath(

const project = await configIO.readProjectSpec();

const networkMode = options.networkMode ?? 'PUBLIC';
const agent: AgentEnvSpec = {
type: 'AgentCoreRuntime',
name: options.name,
build: options.buildType,
entrypoint: (options.entrypoint ?? 'main.py') as FilePath,
codeLocation: codeLocation as DirectoryPath,
runtimeVersion: 'PYTHON_3_12',
networkMode,
...(networkMode === 'VPC' && options.subnets && options.securityGroups
? {
networkConfig: {
subnets: parseCommaSeparatedList(options.subnets)!,
securityGroups: parseCommaSeparatedList(options.securityGroups)!,
},
}
: {}),
networkMode: 'PUBLIC',
};

project.agents.push(agent);
Expand Down
6 changes: 0 additions & 6 deletions src/cli/commands/add/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,9 +40,6 @@ async function handleAddAgentCLI(options: AddAgentOptions): Promise<void> {
modelProvider: options.modelProvider!,
apiKey: options.apiKey,
memory: options.memory,
networkMode: options.networkMode,
subnets: options.subnets,
securityGroups: options.securityGroups,
codeLocation: options.codeLocation,
entrypoint: options.entrypoint,
});
Expand DownExpand Up@@ -230,9 +227,6 @@ export function registerAdd(program: Command) {
.option('--model-provider <provider>', 'Model provider: Bedrock, Anthropic, OpenAI, Gemini [non-interactive]')
.option('--api-key <key>', 'API key for non-Bedrock providers [non-interactive]')
.option('--memory <mem>', 'Memory: none, shortTerm, longAndShortTerm (create path only) [non-interactive]')
.option('--network-mode <mode>', 'Network mode: PUBLIC or VPC (default: PUBLIC) [non-interactive]')
.option('--subnets <ids>', 'Comma-separated subnet IDs (required for VPC mode) [non-interactive]')
.option('--security-groups <ids>', 'Comma-separated security group IDs (required for VPC mode) [non-interactive]')
.option('--code-location <path>', 'Path to existing code (BYO path only) [non-interactive]')
.option('--entrypoint <file>', 'Entry file relative to code-location (BYO, default: main.py) [non-interactive]')
.option('--json', 'Output as JSON [non-interactive]')
Expand Down
5 changes: 1 addition & 4 deletions src/cli/commands/add/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { GatewayAuthorizerType, ModelProvider, NetworkMode, SDKFramework, TargetLanguage } from '../../../schema';
import type { GatewayAuthorizerType, ModelProvider, SDKFramework, TargetLanguage } from '../../../schema';
import type { MemoryOption } from '../../tui/screens/generate/types';

// Agent types
Expand All@@ -11,9 +11,6 @@ export interface AddAgentOptions {
modelProvider?: ModelProvider;
apiKey?: string;
memory?: MemoryOption;
networkMode?: NetworkMode;
subnets?: string;
securityGroups?: string;
codeLocation?: string;
entrypoint?: string;
json?: boolean;
Expand Down
4 changes: 0 additions & 4 deletions src/cli/commands/add/validate.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import {
TargetLanguageSchema,
getSupportedModelProviders,
} from '../../../schema';
import { validateVpcOptions } from '../shared/vpc-utils';
import type {
AddAgentOptions,
AddGatewayOptions,
Expand DownExpand Up@@ -103,9 +102,6 @@ export function validateAddAgentOptions(options: AddAgentOptions): ValidationRes
}
}

const vpcResult = validateVpcOptions(options);
if (!vpcResult.valid) return vpcResult;

return { valid: true };
}

Expand Down
84 changes: 0 additions & 84 deletions src/cli/commands/create/__tests__/validate.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,90 +132,6 @@ describe('validateCreateOptions', () => {
expect(result.valid).toBe(true);
});

// VPC validation tests
it('rejects invalid network mode', () => {
const result = validateCreateOptions(
{
name: 'VpcTest1',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'INVALID',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('Invalid network mode');
});

it('rejects VPC mode without subnets', () => {
const result = validateCreateOptions(
{
name: 'VpcTest2',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
securityGroups: 'sg-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('--subnets is required');
});

it('rejects VPC mode without security groups', () => {
const result = validateCreateOptions(
{
name: 'VpcTest3',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
subnets: 'subnet-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('--security-groups is required');
});

it('rejects subnets without VPC mode', () => {
const result = validateCreateOptions(
{
name: 'VpcTest4',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
subnets: 'subnet-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('require --network-mode VPC');
});

it('returns valid with VPC mode and required options', () => {
const result = validateCreateOptions(
{
name: 'VpcTest5',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
subnets: 'subnet-12345678',
securityGroups: 'sg-12345678',
},
testDir
);
expect(result.valid).toBe(true);
});

it('returns invalid for unsupported framework/model combination', () => {
// GoogleADK only supports certain providers, not all
const result = validateCreateOptions(
Expand Down
10 changes: 0 additions & 10 deletions src/cli/commands/create/action.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import type {
BuildType,
DeployedState,
ModelProvider,
NetworkMode,
SDKFramework,
TargetLanguage,
} from '../../../schema';
Expand DownExpand Up@@ -121,9 +120,6 @@ export interface CreateWithAgentOptions {
modelProvider: ModelProvider;
apiKey?: string;
memory: MemoryOption;
networkMode?: NetworkMode;
subnets?: string[];
securityGroups?: string[];
skipGit?: boolean;
skipPythonSetup?: boolean;
onProgress?: ProgressCallback;
Expand All@@ -139,9 +135,6 @@ export async function createProjectWithAgent(options: CreateWithAgentOptions): P
modelProvider,
apiKey,
memory,
networkMode,
subnets,
securityGroups,
skipGit,
skipPythonSetup,
onProgress,
Expand DownExpand Up@@ -179,9 +172,6 @@ export async function createProjectWithAgent(options: CreateWithAgentOptions): P
apiKey,
memory,
language,
networkMode,
subnets,
securityGroups,
};

// Resolve credential strategy FIRST (new project has no existing credentials)
Expand Down
12 changes: 1 addition & 11 deletions src/cli/commands/create/command.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
import { getWorkingDirectory } from '../../../lib';
import type { BuildType, ModelProvider, NetworkMode, SDKFramework, TargetLanguage } from '../../../schema';
import type { BuildType, ModelProvider, SDKFramework, TargetLanguage } from '../../../schema';
import { getErrorMessage } from '../../errors';
import { COMMAND_DESCRIPTIONS } from '../../tui/copy';
import { CreateScreen } from '../../tui/screens/create';
import { parseCommaSeparatedList } from '../shared/vpc-utils';
import { type ProgressCallback, createProject, createProjectWithAgent, getDryRunInfo } from './action';
import type { CreateOptions } from './types';
import { validateCreateOptions } from './validate';
Expand DownExpand Up@@ -121,9 +120,6 @@ async function handleCreateCLI(options: CreateOptions): Promise<void> {
modelProvider: options.modelProvider as ModelProvider,
apiKey: options.apiKey,
memory: options.memory as 'none' | 'shortTerm' | 'longAndShortTerm',
networkMode: options.networkMode as NetworkMode | undefined,
subnets: parseCommaSeparatedList(options.subnets),
securityGroups: parseCommaSeparatedList(options.securityGroups),
skipGit: options.skipGit,
skipPythonSetup: options.skipPythonSetup,
onProgress,
Expand DownExpand Up@@ -156,9 +152,6 @@ export const registerCreate = (program: Command) => {
.option('--model-provider <provider>', 'Model provider (Bedrock, Anthropic, OpenAI, Gemini) [non-interactive]')
.option('--api-key <key>', 'API key for non-Bedrock providers [non-interactive]')
.option('--memory <option>', 'Memory option (none, shortTerm, longAndShortTerm) [non-interactive]')
.option('--network-mode <mode>', 'Network mode: PUBLIC or VPC (default: PUBLIC) [non-interactive]')
.option('--subnets <ids>', 'Comma-separated subnet IDs (required for VPC mode) [non-interactive]')
.option('--security-groups <ids>', 'Comma-separated security group IDs (required for VPC mode) [non-interactive]')
.option('--output-dir <dir>', 'Output directory (default: current directory) [non-interactive]')
.option('--skip-git', 'Skip git repository initialization [non-interactive]')
.option('--skip-python-setup', 'Skip Python virtual environment setup [non-interactive]')
Expand DownExpand Up@@ -186,9 +179,6 @@ export const registerCreate = (program: Command) => {
options.modelProvider ??
options.apiKey ??
options.memory ??
options.networkMode ??
options.subnets ??
options.securityGroups ??
options.outputDir ??
options.skipGit ??
options.skipPythonSetup ??
Expand Down
3 changes: 0 additions & 3 deletions src/cli/commands/create/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,6 @@ export interface CreateOptions {
modelProvider?: string;
apiKey?: string;
memory?: string;
networkMode?: string;
subnets?: string;
securityGroups?: string;
outputDir?: string;
skipGit?: boolean;
skipPythonSetup?: boolean;
Expand Down
4 changes: 0 additions & 4 deletions src/cli/commands/create/validate.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import {
TargetLanguageSchema,
getSupportedModelProviders,
} from '../../../schema';
import { validateVpcOptions } from '../shared/vpc-utils';
import type { CreateOptions } from './types';
import { existsSync } from 'fs';
import { join } from 'path';
Expand DownExpand Up@@ -122,8 +121,5 @@ export function validateCreateOptions(options: CreateOptions, cwd?: string): Val
}
}

const vpcResult = validateVpcOptions(options);
if (!vpcResult.valid) return vpcResult;

return { valid: true };
}
20 changes: 0 additions & 20 deletions src/cli/commands/dev/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,12 +144,6 @@ export const registerDev = (program: Command) => {
const targetAgent = project.agents.find(a => a.name === config.agentName);
const providerInfo = targetAgent?.modelProvider ?? '(see agent code)';

if (targetAgent?.networkMode === 'VPC') {
console.warn(
'Warning: This agent uses VPC network mode. Local dev server runs outside your VPC. Network behavior may differ from deployed environment.'
);
}

console.log(`Starting dev server...`);
console.log(`Agent: ${config.agentName}`);
console.log(`Provider: ${providerInfo}`);
Expand DownExpand Up@@ -184,20 +178,6 @@ export const registerDev = (program: Command) => {
await new Promise(() => {});
}

// Warn if the target agent uses VPC mode
{
const vpcAgent = opts.agent
? project.agents.find(a => a.name === opts.agent)
: project.agents.length === 1
? project.agents[0]
: undefined;
if (vpcAgent?.networkMode === 'VPC') {
console.warn(
'Warning: This agent uses VPC network mode. Local dev server runs outside your VPC. Network behavior may differ from deployed environment.'
);
}
}

// Enter alternate screen buffer for fullscreen mode
process.stdout.write(ENTER_ALT_SCREEN);

Expand Down
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: remove VPC feature from CLI by tejaskash · Pull Request #466 · 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
46 changes: 0 additions & 46 deletions src/cli/commands/add/__tests__/validate.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,52 +162,6 @@ describe('validate', () => {
expect(validateAddAgentOptions(validAgentOptionsByo)).toEqual({ valid: true });
expect(validateAddAgentOptions(validAgentOptionsCreate)).toEqual({ valid: true });
});

// VPC validation tests
it('rejects invalid network mode', () => {
const result = validateAddAgentOptions({ ...validAgentOptionsCreate, networkMode: 'INVALID' as any });
expect(result.valid).toBe(false);
expect(result.error).toContain('Invalid network mode');
});

it('rejects VPC mode without subnets', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
securityGroups: 'sg-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('--subnets is required');
});

it('rejects VPC mode without security groups', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
subnets: 'subnet-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('--security-groups is required');
});

it('rejects subnets without VPC mode', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
subnets: 'subnet-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('require --network-mode VPC');
});

it('passes for valid VPC options', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
subnets: 'subnet-12345678',
securityGroups: 'sg-12345678',
});
expect(result.valid).toBe(true);
});
});

describe('validateAddGatewayOptions', () => {
Expand Down
19 changes: 1 addition & 18 deletions src/cli/commands/add/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import type {
GatewayAuthorizerType,
MemoryStrategyType,
ModelProvider,
NetworkMode,
SDKFramework,
TargetLanguage,
} from '../../../schema';
Expand All@@ -30,7 +29,6 @@ import { createRenderer } from '../../templates';
import type { MemoryOption } from '../../tui/screens/generate/types';
import type { AddGatewayConfig, AddMcpToolConfig } from '../../tui/screens/mcp/types';
import { DEFAULT_EVENT_EXPIRY } from '../../tui/screens/memory/types';
import { parseCommaSeparatedList } from '../shared/vpc-utils';
import type { AddAgentResult, AddGatewayResult, AddIdentityResult, AddMcpToolResult, AddMemoryResult } from './types';
import { mkdirSync } from 'fs';
import { dirname, join } from 'path';
Expand All@@ -45,9 +43,6 @@ export interface ValidatedAddAgentOptions {
modelProvider: ModelProvider;
apiKey?: string;
memory?: MemoryOption;
networkMode?: NetworkMode;
subnets?: string;
securityGroups?: string;
codeLocation?: string;
entrypoint?: string;
}
Expand DownExpand Up@@ -125,9 +120,6 @@ async function handleCreatePath(options: ValidatedAddAgentOptions, configBaseDir
modelProvider: options.modelProvider,
memory: options.memory!,
language: options.language,
networkMode: options.networkMode,
subnets: parseCommaSeparatedList(options.subnets),
securityGroups: parseCommaSeparatedList(options.securityGroups),
};

const agentPath = join(projectRoot, APP_DIR, options.name);
Expand DownExpand Up@@ -194,23 +186,14 @@ async function handleByoPath(

const project = await configIO.readProjectSpec();

const networkMode = options.networkMode ?? 'PUBLIC';
const agent: AgentEnvSpec = {
type: 'AgentCoreRuntime',
name: options.name,
build: options.buildType,
entrypoint: (options.entrypoint ?? 'main.py') as FilePath,
codeLocation: codeLocation as DirectoryPath,
runtimeVersion: 'PYTHON_3_12',
networkMode,
...(networkMode === 'VPC' && options.subnets && options.securityGroups
? {
networkConfig: {
subnets: parseCommaSeparatedList(options.subnets)!,
securityGroups: parseCommaSeparatedList(options.securityGroups)!,
},
}
: {}),
networkMode: 'PUBLIC',
};

project.agents.push(agent);
Expand Down
6 changes: 0 additions & 6 deletions src/cli/commands/add/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,9 +40,6 @@ async function handleAddAgentCLI(options: AddAgentOptions): Promise<void> {
modelProvider: options.modelProvider!,
apiKey: options.apiKey,
memory: options.memory,
networkMode: options.networkMode,
subnets: options.subnets,
securityGroups: options.securityGroups,
codeLocation: options.codeLocation,
entrypoint: options.entrypoint,
});
Expand DownExpand Up@@ -230,9 +227,6 @@ export function registerAdd(program: Command) {
.option('--model-provider <provider>', 'Model provider: Bedrock, Anthropic, OpenAI, Gemini [non-interactive]')
.option('--api-key <key>', 'API key for non-Bedrock providers [non-interactive]')
.option('--memory <mem>', 'Memory: none, shortTerm, longAndShortTerm (create path only) [non-interactive]')
.option('--network-mode <mode>', 'Network mode: PUBLIC or VPC (default: PUBLIC) [non-interactive]')
.option('--subnets <ids>', 'Comma-separated subnet IDs (required for VPC mode) [non-interactive]')
.option('--security-groups <ids>', 'Comma-separated security group IDs (required for VPC mode) [non-interactive]')
.option('--code-location <path>', 'Path to existing code (BYO path only) [non-interactive]')
.option('--entrypoint <file>', 'Entry file relative to code-location (BYO, default: main.py) [non-interactive]')
.option('--json', 'Output as JSON [non-interactive]')
Expand Down
5 changes: 1 addition & 4 deletions src/cli/commands/add/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { GatewayAuthorizerType, ModelProvider, NetworkMode, SDKFramework, TargetLanguage } from '../../../schema';
import type { GatewayAuthorizerType, ModelProvider, SDKFramework, TargetLanguage } from '../../../schema';
import type { MemoryOption } from '../../tui/screens/generate/types';

// Agent types
Expand All@@ -11,9 +11,6 @@ export interface AddAgentOptions {
modelProvider?: ModelProvider;
apiKey?: string;
memory?: MemoryOption;
networkMode?: NetworkMode;
subnets?: string;
securityGroups?: string;
codeLocation?: string;
entrypoint?: string;
json?: boolean;
Expand Down
4 changes: 0 additions & 4 deletions src/cli/commands/add/validate.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import {
TargetLanguageSchema,
getSupportedModelProviders,
} from '../../../schema';
import { validateVpcOptions } from '../shared/vpc-utils';
import type {
AddAgentOptions,
AddGatewayOptions,
Expand DownExpand Up@@ -103,9 +102,6 @@ export function validateAddAgentOptions(options: AddAgentOptions): ValidationRes
}
}

const vpcResult = validateVpcOptions(options);
if (!vpcResult.valid) return vpcResult;

return { valid: true };
}

Expand Down
84 changes: 0 additions & 84 deletions src/cli/commands/create/__tests__/validate.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,90 +132,6 @@ describe('validateCreateOptions', () => {
expect(result.valid).toBe(true);
});

// VPC validation tests
it('rejects invalid network mode', () => {
const result = validateCreateOptions(
{
name: 'VpcTest1',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'INVALID',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('Invalid network mode');
});

it('rejects VPC mode without subnets', () => {
const result = validateCreateOptions(
{
name: 'VpcTest2',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
securityGroups: 'sg-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('--subnets is required');
});

it('rejects VPC mode without security groups', () => {
const result = validateCreateOptions(
{
name: 'VpcTest3',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
subnets: 'subnet-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('--security-groups is required');
});

it('rejects subnets without VPC mode', () => {
const result = validateCreateOptions(
{
name: 'VpcTest4',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
subnets: 'subnet-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('require --network-mode VPC');
});

it('returns valid with VPC mode and required options', () => {
const result = validateCreateOptions(
{
name: 'VpcTest5',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
subnets: 'subnet-12345678',
securityGroups: 'sg-12345678',
},
testDir
);
expect(result.valid).toBe(true);
});

it('returns invalid for unsupported framework/model combination', () => {
// GoogleADK only supports certain providers, not all
const result = validateCreateOptions(
Expand Down
10 changes: 0 additions & 10 deletions src/cli/commands/create/action.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import type {
BuildType,
DeployedState,
ModelProvider,
NetworkMode,
SDKFramework,
TargetLanguage,
} from '../../../schema';
Expand DownExpand Up@@ -121,9 +120,6 @@ export interface CreateWithAgentOptions {
modelProvider: ModelProvider;
apiKey?: string;
memory: MemoryOption;
networkMode?: NetworkMode;
subnets?: string[];
securityGroups?: string[];
skipGit?: boolean;
skipPythonSetup?: boolean;
onProgress?: ProgressCallback;
Expand All@@ -139,9 +135,6 @@ export async function createProjectWithAgent(options: CreateWithAgentOptions): P
modelProvider,
apiKey,
memory,
networkMode,
subnets,
securityGroups,
skipGit,
skipPythonSetup,
onProgress,
Expand DownExpand Up@@ -179,9 +172,6 @@ export async function createProjectWithAgent(options: CreateWithAgentOptions): P
apiKey,
memory,
language,
networkMode,
subnets,
securityGroups,
};

// Resolve credential strategy FIRST (new project has no existing credentials)
Expand Down
12 changes: 1 addition & 11 deletions src/cli/commands/create/command.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
import { getWorkingDirectory } from '../../../lib';
import type { BuildType, ModelProvider, NetworkMode, SDKFramework, TargetLanguage } from '../../../schema';
import type { BuildType, ModelProvider, SDKFramework, TargetLanguage } from '../../../schema';
import { getErrorMessage } from '../../errors';
import { COMMAND_DESCRIPTIONS } from '../../tui/copy';
import { CreateScreen } from '../../tui/screens/create';
import { parseCommaSeparatedList } from '../shared/vpc-utils';
import { type ProgressCallback, createProject, createProjectWithAgent, getDryRunInfo } from './action';
import type { CreateOptions } from './types';
import { validateCreateOptions } from './validate';
Expand DownExpand Up@@ -121,9 +120,6 @@ async function handleCreateCLI(options: CreateOptions): Promise<void> {
modelProvider: options.modelProvider as ModelProvider,
apiKey: options.apiKey,
memory: options.memory as 'none' | 'shortTerm' | 'longAndShortTerm',
networkMode: options.networkMode as NetworkMode | undefined,
subnets: parseCommaSeparatedList(options.subnets),
securityGroups: parseCommaSeparatedList(options.securityGroups),
skipGit: options.skipGit,
skipPythonSetup: options.skipPythonSetup,
onProgress,
Expand DownExpand Up@@ -156,9 +152,6 @@ export const registerCreate = (program: Command) => {
.option('--model-provider <provider>', 'Model provider (Bedrock, Anthropic, OpenAI, Gemini) [non-interactive]')
.option('--api-key <key>', 'API key for non-Bedrock providers [non-interactive]')
.option('--memory <option>', 'Memory option (none, shortTerm, longAndShortTerm) [non-interactive]')
.option('--network-mode <mode>', 'Network mode: PUBLIC or VPC (default: PUBLIC) [non-interactive]')
.option('--subnets <ids>', 'Comma-separated subnet IDs (required for VPC mode) [non-interactive]')
.option('--security-groups <ids>', 'Comma-separated security group IDs (required for VPC mode) [non-interactive]')
.option('--output-dir <dir>', 'Output directory (default: current directory) [non-interactive]')
.option('--skip-git', 'Skip git repository initialization [non-interactive]')
.option('--skip-python-setup', 'Skip Python virtual environment setup [non-interactive]')
Expand DownExpand Up@@ -186,9 +179,6 @@ export const registerCreate = (program: Command) => {
options.modelProvider ??
options.apiKey ??
options.memory ??
options.networkMode ??
options.subnets ??
options.securityGroups ??
options.outputDir ??
options.skipGit ??
options.skipPythonSetup ??
Expand Down
3 changes: 0 additions & 3 deletions src/cli/commands/create/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,6 @@ export interface CreateOptions {
modelProvider?: string;
apiKey?: string;
memory?: string;
networkMode?: string;
subnets?: string;
securityGroups?: string;
outputDir?: string;
skipGit?: boolean;
skipPythonSetup?: boolean;
Expand Down
4 changes: 0 additions & 4 deletions src/cli/commands/create/validate.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import {
TargetLanguageSchema,
getSupportedModelProviders,
} from '../../../schema';
import { validateVpcOptions } from '../shared/vpc-utils';
import type { CreateOptions } from './types';
import { existsSync } from 'fs';
import { join } from 'path';
Expand DownExpand Up@@ -122,8 +121,5 @@ export function validateCreateOptions(options: CreateOptions, cwd?: string): Val
}
}

const vpcResult = validateVpcOptions(options);
if (!vpcResult.valid) return vpcResult;

return { valid: true };
}
20 changes: 0 additions & 20 deletions src/cli/commands/dev/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,12 +144,6 @@ export const registerDev = (program: Command) => {
const targetAgent = project.agents.find(a => a.name === config.agentName);
const providerInfo = targetAgent?.modelProvider ?? '(see agent code)';

if (targetAgent?.networkMode === 'VPC') {
console.warn(
'Warning: This agent uses VPC network mode. Local dev server runs outside your VPC. Network behavior may differ from deployed environment.'
);
}

console.log(`Starting dev server...`);
console.log(`Agent: ${config.agentName}`);
console.log(`Provider: ${providerInfo}`);
Expand DownExpand Up@@ -184,20 +178,6 @@ export const registerDev = (program: Command) => {
await new Promise(() => {});
}

// Warn if the target agent uses VPC mode
{
const vpcAgent = opts.agent
? project.agents.find(a => a.name === opts.agent)
: project.agents.length === 1
? project.agents[0]
: undefined;
if (vpcAgent?.networkMode === 'VPC') {
console.warn(
'Warning: This agent uses VPC network mode. Local dev server runs outside your VPC. Network behavior may differ from deployed environment.'
);
}
}

// Enter alternate screen buffer for fullscreen mode
process.stdout.write(ENTER_ALT_SCREEN);

Expand Down
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: remove VPC feature from CLI by tejaskash · Pull Request #466 · 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
46 changes: 0 additions & 46 deletions src/cli/commands/add/__tests__/validate.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,52 +162,6 @@ describe('validate', () => {
expect(validateAddAgentOptions(validAgentOptionsByo)).toEqual({ valid: true });
expect(validateAddAgentOptions(validAgentOptionsCreate)).toEqual({ valid: true });
});

// VPC validation tests
it('rejects invalid network mode', () => {
const result = validateAddAgentOptions({ ...validAgentOptionsCreate, networkMode: 'INVALID' as any });
expect(result.valid).toBe(false);
expect(result.error).toContain('Invalid network mode');
});

it('rejects VPC mode without subnets', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
securityGroups: 'sg-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('--subnets is required');
});

it('rejects VPC mode without security groups', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
subnets: 'subnet-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('--security-groups is required');
});

it('rejects subnets without VPC mode', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
subnets: 'subnet-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('require --network-mode VPC');
});

it('passes for valid VPC options', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
subnets: 'subnet-12345678',
securityGroups: 'sg-12345678',
});
expect(result.valid).toBe(true);
});
});

describe('validateAddGatewayOptions', () => {
Expand Down
19 changes: 1 addition & 18 deletions src/cli/commands/add/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import type {
GatewayAuthorizerType,
MemoryStrategyType,
ModelProvider,
NetworkMode,
SDKFramework,
TargetLanguage,
} from '../../../schema';
Expand All@@ -30,7 +29,6 @@ import { createRenderer } from '../../templates';
import type { MemoryOption } from '../../tui/screens/generate/types';
import type { AddGatewayConfig, AddMcpToolConfig } from '../../tui/screens/mcp/types';
import { DEFAULT_EVENT_EXPIRY } from '../../tui/screens/memory/types';
import { parseCommaSeparatedList } from '../shared/vpc-utils';
import type { AddAgentResult, AddGatewayResult, AddIdentityResult, AddMcpToolResult, AddMemoryResult } from './types';
import { mkdirSync } from 'fs';
import { dirname, join } from 'path';
Expand All@@ -45,9 +43,6 @@ export interface ValidatedAddAgentOptions {
modelProvider: ModelProvider;
apiKey?: string;
memory?: MemoryOption;
networkMode?: NetworkMode;
subnets?: string;
securityGroups?: string;
codeLocation?: string;
entrypoint?: string;
}
Expand DownExpand Up@@ -125,9 +120,6 @@ async function handleCreatePath(options: ValidatedAddAgentOptions, configBaseDir
modelProvider: options.modelProvider,
memory: options.memory!,
language: options.language,
networkMode: options.networkMode,
subnets: parseCommaSeparatedList(options.subnets),
securityGroups: parseCommaSeparatedList(options.securityGroups),
};

const agentPath = join(projectRoot, APP_DIR, options.name);
Expand DownExpand Up@@ -194,23 +186,14 @@ async function handleByoPath(

const project = await configIO.readProjectSpec();

const networkMode = options.networkMode ?? 'PUBLIC';
const agent: AgentEnvSpec = {
type: 'AgentCoreRuntime',
name: options.name,
build: options.buildType,
entrypoint: (options.entrypoint ?? 'main.py') as FilePath,
codeLocation: codeLocation as DirectoryPath,
runtimeVersion: 'PYTHON_3_12',
networkMode,
...(networkMode === 'VPC' && options.subnets && options.securityGroups
? {
networkConfig: {
subnets: parseCommaSeparatedList(options.subnets)!,
securityGroups: parseCommaSeparatedList(options.securityGroups)!,
},
}
: {}),
networkMode: 'PUBLIC',
};

project.agents.push(agent);
Expand Down
6 changes: 0 additions & 6 deletions src/cli/commands/add/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,9 +40,6 @@ async function handleAddAgentCLI(options: AddAgentOptions): Promise<void> {
modelProvider: options.modelProvider!,
apiKey: options.apiKey,
memory: options.memory,
networkMode: options.networkMode,
subnets: options.subnets,
securityGroups: options.securityGroups,
codeLocation: options.codeLocation,
entrypoint: options.entrypoint,
});
Expand DownExpand Up@@ -230,9 +227,6 @@ export function registerAdd(program: Command) {
.option('--model-provider <provider>', 'Model provider: Bedrock, Anthropic, OpenAI, Gemini [non-interactive]')
.option('--api-key <key>', 'API key for non-Bedrock providers [non-interactive]')
.option('--memory <mem>', 'Memory: none, shortTerm, longAndShortTerm (create path only) [non-interactive]')
.option('--network-mode <mode>', 'Network mode: PUBLIC or VPC (default: PUBLIC) [non-interactive]')
.option('--subnets <ids>', 'Comma-separated subnet IDs (required for VPC mode) [non-interactive]')
.option('--security-groups <ids>', 'Comma-separated security group IDs (required for VPC mode) [non-interactive]')
.option('--code-location <path>', 'Path to existing code (BYO path only) [non-interactive]')
.option('--entrypoint <file>', 'Entry file relative to code-location (BYO, default: main.py) [non-interactive]')
.option('--json', 'Output as JSON [non-interactive]')
Expand Down
5 changes: 1 addition & 4 deletions src/cli/commands/add/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { GatewayAuthorizerType, ModelProvider, NetworkMode, SDKFramework, TargetLanguage } from '../../../schema';
import type { GatewayAuthorizerType, ModelProvider, SDKFramework, TargetLanguage } from '../../../schema';
import type { MemoryOption } from '../../tui/screens/generate/types';

// Agent types
Expand All@@ -11,9 +11,6 @@ export interface AddAgentOptions {
modelProvider?: ModelProvider;
apiKey?: string;
memory?: MemoryOption;
networkMode?: NetworkMode;
subnets?: string;
securityGroups?: string;
codeLocation?: string;
entrypoint?: string;
json?: boolean;
Expand Down
4 changes: 0 additions & 4 deletions src/cli/commands/add/validate.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import {
TargetLanguageSchema,
getSupportedModelProviders,
} from '../../../schema';
import { validateVpcOptions } from '../shared/vpc-utils';
import type {
AddAgentOptions,
AddGatewayOptions,
Expand DownExpand Up@@ -103,9 +102,6 @@ export function validateAddAgentOptions(options: AddAgentOptions): ValidationRes
}
}

const vpcResult = validateVpcOptions(options);
if (!vpcResult.valid) return vpcResult;

return { valid: true };
}

Expand Down
84 changes: 0 additions & 84 deletions src/cli/commands/create/__tests__/validate.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,90 +132,6 @@ describe('validateCreateOptions', () => {
expect(result.valid).toBe(true);
});

// VPC validation tests
it('rejects invalid network mode', () => {
const result = validateCreateOptions(
{
name: 'VpcTest1',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'INVALID',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('Invalid network mode');
});

it('rejects VPC mode without subnets', () => {
const result = validateCreateOptions(
{
name: 'VpcTest2',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
securityGroups: 'sg-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('--subnets is required');
});

it('rejects VPC mode without security groups', () => {
const result = validateCreateOptions(
{
name: 'VpcTest3',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
subnets: 'subnet-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('--security-groups is required');
});

it('rejects subnets without VPC mode', () => {
const result = validateCreateOptions(
{
name: 'VpcTest4',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
subnets: 'subnet-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('require --network-mode VPC');
});

it('returns valid with VPC mode and required options', () => {
const result = validateCreateOptions(
{
name: 'VpcTest5',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
subnets: 'subnet-12345678',
securityGroups: 'sg-12345678',
},
testDir
);
expect(result.valid).toBe(true);
});

it('returns invalid for unsupported framework/model combination', () => {
// GoogleADK only supports certain providers, not all
const result = validateCreateOptions(
Expand Down
10 changes: 0 additions & 10 deletions src/cli/commands/create/action.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import type {
BuildType,
DeployedState,
ModelProvider,
NetworkMode,
SDKFramework,
TargetLanguage,
} from '../../../schema';
Expand DownExpand Up@@ -121,9 +120,6 @@ export interface CreateWithAgentOptions {
modelProvider: ModelProvider;
apiKey?: string;
memory: MemoryOption;
networkMode?: NetworkMode;
subnets?: string[];
securityGroups?: string[];
skipGit?: boolean;
skipPythonSetup?: boolean;
onProgress?: ProgressCallback;
Expand All@@ -139,9 +135,6 @@ export async function createProjectWithAgent(options: CreateWithAgentOptions): P
modelProvider,
apiKey,
memory,
networkMode,
subnets,
securityGroups,
skipGit,
skipPythonSetup,
onProgress,
Expand DownExpand Up@@ -179,9 +172,6 @@ export async function createProjectWithAgent(options: CreateWithAgentOptions): P
apiKey,
memory,
language,
networkMode,
subnets,
securityGroups,
};

// Resolve credential strategy FIRST (new project has no existing credentials)
Expand Down
12 changes: 1 addition & 11 deletions src/cli/commands/create/command.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
import { getWorkingDirectory } from '../../../lib';
import type { BuildType, ModelProvider, NetworkMode, SDKFramework, TargetLanguage } from '../../../schema';
import type { BuildType, ModelProvider, SDKFramework, TargetLanguage } from '../../../schema';
import { getErrorMessage } from '../../errors';
import { COMMAND_DESCRIPTIONS } from '../../tui/copy';
import { CreateScreen } from '../../tui/screens/create';
import { parseCommaSeparatedList } from '../shared/vpc-utils';
import { type ProgressCallback, createProject, createProjectWithAgent, getDryRunInfo } from './action';
import type { CreateOptions } from './types';
import { validateCreateOptions } from './validate';
Expand DownExpand Up@@ -121,9 +120,6 @@ async function handleCreateCLI(options: CreateOptions): Promise<void> {
modelProvider: options.modelProvider as ModelProvider,
apiKey: options.apiKey,
memory: options.memory as 'none' | 'shortTerm' | 'longAndShortTerm',
networkMode: options.networkMode as NetworkMode | undefined,
subnets: parseCommaSeparatedList(options.subnets),
securityGroups: parseCommaSeparatedList(options.securityGroups),
skipGit: options.skipGit,
skipPythonSetup: options.skipPythonSetup,
onProgress,
Expand DownExpand Up@@ -156,9 +152,6 @@ export const registerCreate = (program: Command) => {
.option('--model-provider <provider>', 'Model provider (Bedrock, Anthropic, OpenAI, Gemini) [non-interactive]')
.option('--api-key <key>', 'API key for non-Bedrock providers [non-interactive]')
.option('--memory <option>', 'Memory option (none, shortTerm, longAndShortTerm) [non-interactive]')
.option('--network-mode <mode>', 'Network mode: PUBLIC or VPC (default: PUBLIC) [non-interactive]')
.option('--subnets <ids>', 'Comma-separated subnet IDs (required for VPC mode) [non-interactive]')
.option('--security-groups <ids>', 'Comma-separated security group IDs (required for VPC mode) [non-interactive]')
.option('--output-dir <dir>', 'Output directory (default: current directory) [non-interactive]')
.option('--skip-git', 'Skip git repository initialization [non-interactive]')
.option('--skip-python-setup', 'Skip Python virtual environment setup [non-interactive]')
Expand DownExpand Up@@ -186,9 +179,6 @@ export const registerCreate = (program: Command) => {
options.modelProvider ??
options.apiKey ??
options.memory ??
options.networkMode ??
options.subnets ??
options.securityGroups ??
options.outputDir ??
options.skipGit ??
options.skipPythonSetup ??
Expand Down
3 changes: 0 additions & 3 deletions src/cli/commands/create/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,6 @@ export interface CreateOptions {
modelProvider?: string;
apiKey?: string;
memory?: string;
networkMode?: string;
subnets?: string;
securityGroups?: string;
outputDir?: string;
skipGit?: boolean;
skipPythonSetup?: boolean;
Expand Down
4 changes: 0 additions & 4 deletions src/cli/commands/create/validate.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import {
TargetLanguageSchema,
getSupportedModelProviders,
} from '../../../schema';
import { validateVpcOptions } from '../shared/vpc-utils';
import type { CreateOptions } from './types';
import { existsSync } from 'fs';
import { join } from 'path';
Expand DownExpand Up@@ -122,8 +121,5 @@ export function validateCreateOptions(options: CreateOptions, cwd?: string): Val
}
}

const vpcResult = validateVpcOptions(options);
if (!vpcResult.valid) return vpcResult;

return { valid: true };
}
20 changes: 0 additions & 20 deletions src/cli/commands/dev/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,12 +144,6 @@ export const registerDev = (program: Command) => {
const targetAgent = project.agents.find(a => a.name === config.agentName);
const providerInfo = targetAgent?.modelProvider ?? '(see agent code)';

if (targetAgent?.networkMode === 'VPC') {
console.warn(
'Warning: This agent uses VPC network mode. Local dev server runs outside your VPC. Network behavior may differ from deployed environment.'
);
}

console.log(`Starting dev server...`);
console.log(`Agent: ${config.agentName}`);
console.log(`Provider: ${providerInfo}`);
Expand DownExpand Up@@ -184,20 +178,6 @@ export const registerDev = (program: Command) => {
await new Promise(() => {});
}

// Warn if the target agent uses VPC mode
{
const vpcAgent = opts.agent
? project.agents.find(a => a.name === opts.agent)
: project.agents.length === 1
? project.agents[0]
: undefined;
if (vpcAgent?.networkMode === 'VPC') {
console.warn(
'Warning: This agent uses VPC network mode. Local dev server runs outside your VPC. Network behavior may differ from deployed environment.'
);
}
}

// Enter alternate screen buffer for fullscreen mode
process.stdout.write(ENTER_ALT_SCREEN);

Expand Down
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: remove VPC feature from CLI by tejaskash · Pull Request #466 · 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
46 changes: 0 additions & 46 deletions src/cli/commands/add/__tests__/validate.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,52 +162,6 @@ describe('validate', () => {
expect(validateAddAgentOptions(validAgentOptionsByo)).toEqual({ valid: true });
expect(validateAddAgentOptions(validAgentOptionsCreate)).toEqual({ valid: true });
});

// VPC validation tests
it('rejects invalid network mode', () => {
const result = validateAddAgentOptions({ ...validAgentOptionsCreate, networkMode: 'INVALID' as any });
expect(result.valid).toBe(false);
expect(result.error).toContain('Invalid network mode');
});

it('rejects VPC mode without subnets', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
securityGroups: 'sg-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('--subnets is required');
});

it('rejects VPC mode without security groups', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
subnets: 'subnet-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('--security-groups is required');
});

it('rejects subnets without VPC mode', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
subnets: 'subnet-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('require --network-mode VPC');
});

it('passes for valid VPC options', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
subnets: 'subnet-12345678',
securityGroups: 'sg-12345678',
});
expect(result.valid).toBe(true);
});
});

describe('validateAddGatewayOptions', () => {
Expand Down
19 changes: 1 addition & 18 deletions src/cli/commands/add/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import type {
GatewayAuthorizerType,
MemoryStrategyType,
ModelProvider,
NetworkMode,
SDKFramework,
TargetLanguage,
} from '../../../schema';
Expand All@@ -30,7 +29,6 @@ import { createRenderer } from '../../templates';
import type { MemoryOption } from '../../tui/screens/generate/types';
import type { AddGatewayConfig, AddMcpToolConfig } from '../../tui/screens/mcp/types';
import { DEFAULT_EVENT_EXPIRY } from '../../tui/screens/memory/types';
import { parseCommaSeparatedList } from '../shared/vpc-utils';
import type { AddAgentResult, AddGatewayResult, AddIdentityResult, AddMcpToolResult, AddMemoryResult } from './types';
import { mkdirSync } from 'fs';
import { dirname, join } from 'path';
Expand All@@ -45,9 +43,6 @@ export interface ValidatedAddAgentOptions {
modelProvider: ModelProvider;
apiKey?: string;
memory?: MemoryOption;
networkMode?: NetworkMode;
subnets?: string;
securityGroups?: string;
codeLocation?: string;
entrypoint?: string;
}
Expand DownExpand Up@@ -125,9 +120,6 @@ async function handleCreatePath(options: ValidatedAddAgentOptions, configBaseDir
modelProvider: options.modelProvider,
memory: options.memory!,
language: options.language,
networkMode: options.networkMode,
subnets: parseCommaSeparatedList(options.subnets),
securityGroups: parseCommaSeparatedList(options.securityGroups),
};

const agentPath = join(projectRoot, APP_DIR, options.name);
Expand DownExpand Up@@ -194,23 +186,14 @@ async function handleByoPath(

const project = await configIO.readProjectSpec();

const networkMode = options.networkMode ?? 'PUBLIC';
const agent: AgentEnvSpec = {
type: 'AgentCoreRuntime',
name: options.name,
build: options.buildType,
entrypoint: (options.entrypoint ?? 'main.py') as FilePath,
codeLocation: codeLocation as DirectoryPath,
runtimeVersion: 'PYTHON_3_12',
networkMode,
...(networkMode === 'VPC' && options.subnets && options.securityGroups
? {
networkConfig: {
subnets: parseCommaSeparatedList(options.subnets)!,
securityGroups: parseCommaSeparatedList(options.securityGroups)!,
},
}
: {}),
networkMode: 'PUBLIC',
};

project.agents.push(agent);
Expand Down
6 changes: 0 additions & 6 deletions src/cli/commands/add/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,9 +40,6 @@ async function handleAddAgentCLI(options: AddAgentOptions): Promise<void> {
modelProvider: options.modelProvider!,
apiKey: options.apiKey,
memory: options.memory,
networkMode: options.networkMode,
subnets: options.subnets,
securityGroups: options.securityGroups,
codeLocation: options.codeLocation,
entrypoint: options.entrypoint,
});
Expand DownExpand Up@@ -230,9 +227,6 @@ export function registerAdd(program: Command) {
.option('--model-provider <provider>', 'Model provider: Bedrock, Anthropic, OpenAI, Gemini [non-interactive]')
.option('--api-key <key>', 'API key for non-Bedrock providers [non-interactive]')
.option('--memory <mem>', 'Memory: none, shortTerm, longAndShortTerm (create path only) [non-interactive]')
.option('--network-mode <mode>', 'Network mode: PUBLIC or VPC (default: PUBLIC) [non-interactive]')
.option('--subnets <ids>', 'Comma-separated subnet IDs (required for VPC mode) [non-interactive]')
.option('--security-groups <ids>', 'Comma-separated security group IDs (required for VPC mode) [non-interactive]')
.option('--code-location <path>', 'Path to existing code (BYO path only) [non-interactive]')
.option('--entrypoint <file>', 'Entry file relative to code-location (BYO, default: main.py) [non-interactive]')
.option('--json', 'Output as JSON [non-interactive]')
Expand Down
5 changes: 1 addition & 4 deletions src/cli/commands/add/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { GatewayAuthorizerType, ModelProvider, NetworkMode, SDKFramework, TargetLanguage } from '../../../schema';
import type { GatewayAuthorizerType, ModelProvider, SDKFramework, TargetLanguage } from '../../../schema';
import type { MemoryOption } from '../../tui/screens/generate/types';

// Agent types
Expand All@@ -11,9 +11,6 @@ export interface AddAgentOptions {
modelProvider?: ModelProvider;
apiKey?: string;
memory?: MemoryOption;
networkMode?: NetworkMode;
subnets?: string;
securityGroups?: string;
codeLocation?: string;
entrypoint?: string;
json?: boolean;
Expand Down
4 changes: 0 additions & 4 deletions src/cli/commands/add/validate.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import {
TargetLanguageSchema,
getSupportedModelProviders,
} from '../../../schema';
import { validateVpcOptions } from '../shared/vpc-utils';
import type {
AddAgentOptions,
AddGatewayOptions,
Expand DownExpand Up@@ -103,9 +102,6 @@ export function validateAddAgentOptions(options: AddAgentOptions): ValidationRes
}
}

const vpcResult = validateVpcOptions(options);
if (!vpcResult.valid) return vpcResult;

return { valid: true };
}

Expand Down
84 changes: 0 additions & 84 deletions src/cli/commands/create/__tests__/validate.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,90 +132,6 @@ describe('validateCreateOptions', () => {
expect(result.valid).toBe(true);
});

// VPC validation tests
it('rejects invalid network mode', () => {
const result = validateCreateOptions(
{
name: 'VpcTest1',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'INVALID',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('Invalid network mode');
});

it('rejects VPC mode without subnets', () => {
const result = validateCreateOptions(
{
name: 'VpcTest2',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
securityGroups: 'sg-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('--subnets is required');
});

it('rejects VPC mode without security groups', () => {
const result = validateCreateOptions(
{
name: 'VpcTest3',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
subnets: 'subnet-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('--security-groups is required');
});

it('rejects subnets without VPC mode', () => {
const result = validateCreateOptions(
{
name: 'VpcTest4',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
subnets: 'subnet-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('require --network-mode VPC');
});

it('returns valid with VPC mode and required options', () => {
const result = validateCreateOptions(
{
name: 'VpcTest5',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
subnets: 'subnet-12345678',
securityGroups: 'sg-12345678',
},
testDir
);
expect(result.valid).toBe(true);
});

it('returns invalid for unsupported framework/model combination', () => {
// GoogleADK only supports certain providers, not all
const result = validateCreateOptions(
Expand Down
10 changes: 0 additions & 10 deletions src/cli/commands/create/action.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import type {
BuildType,
DeployedState,
ModelProvider,
NetworkMode,
SDKFramework,
TargetLanguage,
} from '../../../schema';
Expand DownExpand Up@@ -121,9 +120,6 @@ export interface CreateWithAgentOptions {
modelProvider: ModelProvider;
apiKey?: string;
memory: MemoryOption;
networkMode?: NetworkMode;
subnets?: string[];
securityGroups?: string[];
skipGit?: boolean;
skipPythonSetup?: boolean;
onProgress?: ProgressCallback;
Expand All@@ -139,9 +135,6 @@ export async function createProjectWithAgent(options: CreateWithAgentOptions): P
modelProvider,
apiKey,
memory,
networkMode,
subnets,
securityGroups,
skipGit,
skipPythonSetup,
onProgress,
Expand DownExpand Up@@ -179,9 +172,6 @@ export async function createProjectWithAgent(options: CreateWithAgentOptions): P
apiKey,
memory,
language,
networkMode,
subnets,
securityGroups,
};

// Resolve credential strategy FIRST (new project has no existing credentials)
Expand Down
12 changes: 1 addition & 11 deletions src/cli/commands/create/command.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
import { getWorkingDirectory } from '../../../lib';
import type { BuildType, ModelProvider, NetworkMode, SDKFramework, TargetLanguage } from '../../../schema';
import type { BuildType, ModelProvider, SDKFramework, TargetLanguage } from '../../../schema';
import { getErrorMessage } from '../../errors';
import { COMMAND_DESCRIPTIONS } from '../../tui/copy';
import { CreateScreen } from '../../tui/screens/create';
import { parseCommaSeparatedList } from '../shared/vpc-utils';
import { type ProgressCallback, createProject, createProjectWithAgent, getDryRunInfo } from './action';
import type { CreateOptions } from './types';
import { validateCreateOptions } from './validate';
Expand DownExpand Up@@ -121,9 +120,6 @@ async function handleCreateCLI(options: CreateOptions): Promise<void> {
modelProvider: options.modelProvider as ModelProvider,
apiKey: options.apiKey,
memory: options.memory as 'none' | 'shortTerm' | 'longAndShortTerm',
networkMode: options.networkMode as NetworkMode | undefined,
subnets: parseCommaSeparatedList(options.subnets),
securityGroups: parseCommaSeparatedList(options.securityGroups),
skipGit: options.skipGit,
skipPythonSetup: options.skipPythonSetup,
onProgress,
Expand DownExpand Up@@ -156,9 +152,6 @@ export const registerCreate = (program: Command) => {
.option('--model-provider <provider>', 'Model provider (Bedrock, Anthropic, OpenAI, Gemini) [non-interactive]')
.option('--api-key <key>', 'API key for non-Bedrock providers [non-interactive]')
.option('--memory <option>', 'Memory option (none, shortTerm, longAndShortTerm) [non-interactive]')
.option('--network-mode <mode>', 'Network mode: PUBLIC or VPC (default: PUBLIC) [non-interactive]')
.option('--subnets <ids>', 'Comma-separated subnet IDs (required for VPC mode) [non-interactive]')
.option('--security-groups <ids>', 'Comma-separated security group IDs (required for VPC mode) [non-interactive]')
.option('--output-dir <dir>', 'Output directory (default: current directory) [non-interactive]')
.option('--skip-git', 'Skip git repository initialization [non-interactive]')
.option('--skip-python-setup', 'Skip Python virtual environment setup [non-interactive]')
Expand DownExpand Up@@ -186,9 +179,6 @@ export const registerCreate = (program: Command) => {
options.modelProvider ??
options.apiKey ??
options.memory ??
options.networkMode ??
options.subnets ??
options.securityGroups ??
options.outputDir ??
options.skipGit ??
options.skipPythonSetup ??
Expand Down
3 changes: 0 additions & 3 deletions src/cli/commands/create/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,6 @@ export interface CreateOptions {
modelProvider?: string;
apiKey?: string;
memory?: string;
networkMode?: string;
subnets?: string;
securityGroups?: string;
outputDir?: string;
skipGit?: boolean;
skipPythonSetup?: boolean;
Expand Down
4 changes: 0 additions & 4 deletions src/cli/commands/create/validate.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import {
TargetLanguageSchema,
getSupportedModelProviders,
} from '../../../schema';
import { validateVpcOptions } from '../shared/vpc-utils';
import type { CreateOptions } from './types';
import { existsSync } from 'fs';
import { join } from 'path';
Expand DownExpand Up@@ -122,8 +121,5 @@ export function validateCreateOptions(options: CreateOptions, cwd?: string): Val
}
}

const vpcResult = validateVpcOptions(options);
if (!vpcResult.valid) return vpcResult;

return { valid: true };
}
20 changes: 0 additions & 20 deletions src/cli/commands/dev/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,12 +144,6 @@ export const registerDev = (program: Command) => {
const targetAgent = project.agents.find(a => a.name === config.agentName);
const providerInfo = targetAgent?.modelProvider ?? '(see agent code)';

if (targetAgent?.networkMode === 'VPC') {
console.warn(
'Warning: This agent uses VPC network mode. Local dev server runs outside your VPC. Network behavior may differ from deployed environment.'
);
}

console.log(`Starting dev server...`);
console.log(`Agent: ${config.agentName}`);
console.log(`Provider: ${providerInfo}`);
Expand DownExpand Up@@ -184,20 +178,6 @@ export const registerDev = (program: Command) => {
await new Promise(() => {});
}

// Warn if the target agent uses VPC mode
{
const vpcAgent = opts.agent
? project.agents.find(a => a.name === opts.agent)
: project.agents.length === 1
? project.agents[0]
: undefined;
if (vpcAgent?.networkMode === 'VPC') {
console.warn(
'Warning: This agent uses VPC network mode. Local dev server runs outside your VPC. Network behavior may differ from deployed environment.'
);
}
}

// Enter alternate screen buffer for fullscreen mode
process.stdout.write(ENTER_ALT_SCREEN);

Expand Down
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: remove VPC feature from CLI by tejaskash · Pull Request #466 · 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
46 changes: 0 additions & 46 deletions src/cli/commands/add/__tests__/validate.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,52 +162,6 @@ describe('validate', () => {
expect(validateAddAgentOptions(validAgentOptionsByo)).toEqual({ valid: true });
expect(validateAddAgentOptions(validAgentOptionsCreate)).toEqual({ valid: true });
});

// VPC validation tests
it('rejects invalid network mode', () => {
const result = validateAddAgentOptions({ ...validAgentOptionsCreate, networkMode: 'INVALID' as any });
expect(result.valid).toBe(false);
expect(result.error).toContain('Invalid network mode');
});

it('rejects VPC mode without subnets', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
securityGroups: 'sg-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('--subnets is required');
});

it('rejects VPC mode without security groups', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
subnets: 'subnet-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('--security-groups is required');
});

it('rejects subnets without VPC mode', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
subnets: 'subnet-12345678',
});
expect(result.valid).toBe(false);
expect(result.error).toContain('require --network-mode VPC');
});

it('passes for valid VPC options', () => {
const result = validateAddAgentOptions({
...validAgentOptionsCreate,
networkMode: 'VPC',
subnets: 'subnet-12345678',
securityGroups: 'sg-12345678',
});
expect(result.valid).toBe(true);
});
});

describe('validateAddGatewayOptions', () => {
Expand Down
19 changes: 1 addition & 18 deletions src/cli/commands/add/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import type {
GatewayAuthorizerType,
MemoryStrategyType,
ModelProvider,
NetworkMode,
SDKFramework,
TargetLanguage,
} from '../../../schema';
Expand All@@ -30,7 +29,6 @@ import { createRenderer } from '../../templates';
import type { MemoryOption } from '../../tui/screens/generate/types';
import type { AddGatewayConfig, AddMcpToolConfig } from '../../tui/screens/mcp/types';
import { DEFAULT_EVENT_EXPIRY } from '../../tui/screens/memory/types';
import { parseCommaSeparatedList } from '../shared/vpc-utils';
import type { AddAgentResult, AddGatewayResult, AddIdentityResult, AddMcpToolResult, AddMemoryResult } from './types';
import { mkdirSync } from 'fs';
import { dirname, join } from 'path';
Expand All@@ -45,9 +43,6 @@ export interface ValidatedAddAgentOptions {
modelProvider: ModelProvider;
apiKey?: string;
memory?: MemoryOption;
networkMode?: NetworkMode;
subnets?: string;
securityGroups?: string;
codeLocation?: string;
entrypoint?: string;
}
Expand DownExpand Up@@ -125,9 +120,6 @@ async function handleCreatePath(options: ValidatedAddAgentOptions, configBaseDir
modelProvider: options.modelProvider,
memory: options.memory!,
language: options.language,
networkMode: options.networkMode,
subnets: parseCommaSeparatedList(options.subnets),
securityGroups: parseCommaSeparatedList(options.securityGroups),
};

const agentPath = join(projectRoot, APP_DIR, options.name);
Expand DownExpand Up@@ -194,23 +186,14 @@ async function handleByoPath(

const project = await configIO.readProjectSpec();

const networkMode = options.networkMode ?? 'PUBLIC';
const agent: AgentEnvSpec = {
type: 'AgentCoreRuntime',
name: options.name,
build: options.buildType,
entrypoint: (options.entrypoint ?? 'main.py') as FilePath,
codeLocation: codeLocation as DirectoryPath,
runtimeVersion: 'PYTHON_3_12',
networkMode,
...(networkMode === 'VPC' && options.subnets && options.securityGroups
? {
networkConfig: {
subnets: parseCommaSeparatedList(options.subnets)!,
securityGroups: parseCommaSeparatedList(options.securityGroups)!,
},
}
: {}),
networkMode: 'PUBLIC',
};

project.agents.push(agent);
Expand Down
6 changes: 0 additions & 6 deletions src/cli/commands/add/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,9 +40,6 @@ async function handleAddAgentCLI(options: AddAgentOptions): Promise<void> {
modelProvider: options.modelProvider!,
apiKey: options.apiKey,
memory: options.memory,
networkMode: options.networkMode,
subnets: options.subnets,
securityGroups: options.securityGroups,
codeLocation: options.codeLocation,
entrypoint: options.entrypoint,
});
Expand DownExpand Up@@ -230,9 +227,6 @@ export function registerAdd(program: Command) {
.option('--model-provider <provider>', 'Model provider: Bedrock, Anthropic, OpenAI, Gemini [non-interactive]')
.option('--api-key <key>', 'API key for non-Bedrock providers [non-interactive]')
.option('--memory <mem>', 'Memory: none, shortTerm, longAndShortTerm (create path only) [non-interactive]')
.option('--network-mode <mode>', 'Network mode: PUBLIC or VPC (default: PUBLIC) [non-interactive]')
.option('--subnets <ids>', 'Comma-separated subnet IDs (required for VPC mode) [non-interactive]')
.option('--security-groups <ids>', 'Comma-separated security group IDs (required for VPC mode) [non-interactive]')
.option('--code-location <path>', 'Path to existing code (BYO path only) [non-interactive]')
.option('--entrypoint <file>', 'Entry file relative to code-location (BYO, default: main.py) [non-interactive]')
.option('--json', 'Output as JSON [non-interactive]')
Expand Down
5 changes: 1 addition & 4 deletions src/cli/commands/add/types.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { GatewayAuthorizerType, ModelProvider, NetworkMode, SDKFramework, TargetLanguage } from '../../../schema';
import type { GatewayAuthorizerType, ModelProvider, SDKFramework, TargetLanguage } from '../../../schema';
import type { MemoryOption } from '../../tui/screens/generate/types';

// Agent types
Expand All@@ -11,9 +11,6 @@ export interface AddAgentOptions {
modelProvider?: ModelProvider;
apiKey?: string;
memory?: MemoryOption;
networkMode?: NetworkMode;
subnets?: string;
securityGroups?: string;
codeLocation?: string;
entrypoint?: string;
json?: boolean;
Expand Down
4 changes: 0 additions & 4 deletions src/cli/commands/add/validate.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import {
TargetLanguageSchema,
getSupportedModelProviders,
} from '../../../schema';
import { validateVpcOptions } from '../shared/vpc-utils';
import type {
AddAgentOptions,
AddGatewayOptions,
Expand DownExpand Up@@ -103,9 +102,6 @@ export function validateAddAgentOptions(options: AddAgentOptions): ValidationRes
}
}

const vpcResult = validateVpcOptions(options);
if (!vpcResult.valid) return vpcResult;

return { valid: true };
}

Expand Down
84 changes: 0 additions & 84 deletions src/cli/commands/create/__tests__/validate.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,90 +132,6 @@ describe('validateCreateOptions', () => {
expect(result.valid).toBe(true);
});

// VPC validation tests
it('rejects invalid network mode', () => {
const result = validateCreateOptions(
{
name: 'VpcTest1',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'INVALID',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('Invalid network mode');
});

it('rejects VPC mode without subnets', () => {
const result = validateCreateOptions(
{
name: 'VpcTest2',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
securityGroups: 'sg-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('--subnets is required');
});

it('rejects VPC mode without security groups', () => {
const result = validateCreateOptions(
{
name: 'VpcTest3',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
subnets: 'subnet-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('--security-groups is required');
});

it('rejects subnets without VPC mode', () => {
const result = validateCreateOptions(
{
name: 'VpcTest4',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
subnets: 'subnet-12345678',
},
testDir
);
expect(result.valid).toBe(false);
expect(result.error).toContain('require --network-mode VPC');
});

it('returns valid with VPC mode and required options', () => {
const result = validateCreateOptions(
{
name: 'VpcTest5',
language: 'Python',
framework: 'Strands',
modelProvider: 'Bedrock',
memory: 'none',
networkMode: 'VPC',
subnets: 'subnet-12345678',
securityGroups: 'sg-12345678',
},
testDir
);
expect(result.valid).toBe(true);
});

it('returns invalid for unsupported framework/model combination', () => {
// GoogleADK only supports certain providers, not all
const result = validateCreateOptions(
Expand Down
10 changes: 0 additions & 10 deletions src/cli/commands/create/action.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@ import type {
BuildType,
DeployedState,
ModelProvider,
NetworkMode,
SDKFramework,
TargetLanguage,
} from '../../../schema';
Expand DownExpand Up@@ -121,9 +120,6 @@ export interface CreateWithAgentOptions {
modelProvider: ModelProvider;
apiKey?: string;
memory: MemoryOption;
networkMode?: NetworkMode;
subnets?: string[];
securityGroups?: string[];
skipGit?: boolean;
skipPythonSetup?: boolean;
onProgress?: ProgressCallback;
Expand All@@ -139,9 +135,6 @@ export async function createProjectWithAgent(options: CreateWithAgentOptions): P
modelProvider,
apiKey,
memory,
networkMode,
subnets,
securityGroups,
skipGit,
skipPythonSetup,
onProgress,
Expand DownExpand Up@@ -179,9 +172,6 @@ export async function createProjectWithAgent(options: CreateWithAgentOptions): P
apiKey,
memory,
language,
networkMode,
subnets,
securityGroups,
};

// Resolve credential strategy FIRST (new project has no existing credentials)
Expand Down
12 changes: 1 addition & 11 deletions src/cli/commands/create/command.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
import { getWorkingDirectory } from '../../../lib';
import type { BuildType, ModelProvider, NetworkMode, SDKFramework, TargetLanguage } from '../../../schema';
import type { BuildType, ModelProvider, SDKFramework, TargetLanguage } from '../../../schema';
import { getErrorMessage } from '../../errors';
import { COMMAND_DESCRIPTIONS } from '../../tui/copy';
import { CreateScreen } from '../../tui/screens/create';
import { parseCommaSeparatedList } from '../shared/vpc-utils';
import { type ProgressCallback, createProject, createProjectWithAgent, getDryRunInfo } from './action';
import type { CreateOptions } from './types';
import { validateCreateOptions } from './validate';
Expand DownExpand Up@@ -121,9 +120,6 @@ async function handleCreateCLI(options: CreateOptions): Promise<void> {
modelProvider: options.modelProvider as ModelProvider,
apiKey: options.apiKey,
memory: options.memory as 'none' | 'shortTerm' | 'longAndShortTerm',
networkMode: options.networkMode as NetworkMode | undefined,
subnets: parseCommaSeparatedList(options.subnets),
securityGroups: parseCommaSeparatedList(options.securityGroups),
skipGit: options.skipGit,
skipPythonSetup: options.skipPythonSetup,
onProgress,
Expand DownExpand Up@@ -156,9 +152,6 @@ export const registerCreate = (program: Command) => {
.option('--model-provider <provider>', 'Model provider (Bedrock, Anthropic, OpenAI, Gemini) [non-interactive]')
.option('--api-key <key>', 'API key for non-Bedrock providers [non-interactive]')
.option('--memory <option>', 'Memory option (none, shortTerm, longAndShortTerm) [non-interactive]')
.option('--network-mode <mode>', 'Network mode: PUBLIC or VPC (default: PUBLIC) [non-interactive]')
.option('--subnets <ids>', 'Comma-separated subnet IDs (required for VPC mode) [non-interactive]')
.option('--security-groups <ids>', 'Comma-separated security group IDs (required for VPC mode) [non-interactive]')
.option('--output-dir <dir>', 'Output directory (default: current directory) [non-interactive]')
.option('--skip-git', 'Skip git repository initialization [non-interactive]')
.option('--skip-python-setup', 'Skip Python virtual environment setup [non-interactive]')
Expand DownExpand Up@@ -186,9 +179,6 @@ export const registerCreate = (program: Command) => {
options.modelProvider ??
options.apiKey ??
options.memory ??
options.networkMode ??
options.subnets ??
options.securityGroups ??
options.outputDir ??
options.skipGit ??
options.skipPythonSetup ??
Expand Down
3 changes: 0 additions & 3 deletions src/cli/commands/create/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,6 @@ export interface CreateOptions {
modelProvider?: string;
apiKey?: string;
memory?: string;
networkMode?: string;
subnets?: string;
securityGroups?: string;
outputDir?: string;
skipGit?: boolean;
skipPythonSetup?: boolean;
Expand Down
4 changes: 0 additions & 4 deletions src/cli/commands/create/validate.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import {
TargetLanguageSchema,
getSupportedModelProviders,
} from '../../../schema';
import { validateVpcOptions } from '../shared/vpc-utils';
import type { CreateOptions } from './types';
import { existsSync } from 'fs';
import { join } from 'path';
Expand DownExpand Up@@ -122,8 +121,5 @@ export function validateCreateOptions(options: CreateOptions, cwd?: string): Val
}
}

const vpcResult = validateVpcOptions(options);
if (!vpcResult.valid) return vpcResult;

return { valid: true };
}
20 changes: 0 additions & 20 deletions src/cli/commands/dev/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,12 +144,6 @@ export const registerDev = (program: Command) => {
const targetAgent = project.agents.find(a => a.name === config.agentName);
const providerInfo = targetAgent?.modelProvider ?? '(see agent code)';

if (targetAgent?.networkMode === 'VPC') {
console.warn(
'Warning: This agent uses VPC network mode. Local dev server runs outside your VPC. Network behavior may differ from deployed environment.'
);
}

console.log(`Starting dev server...`);
console.log(`Agent: ${config.agentName}`);
console.log(`Provider: ${providerInfo}`);
Expand DownExpand Up@@ -184,20 +178,6 @@ export const registerDev = (program: Command) => {
await new Promise(() => {});
}

// Warn if the target agent uses VPC mode
{
const vpcAgent = opts.agent
? project.agents.find(a => a.name === opts.agent)
: project.agents.length === 1
? project.agents[0]
: undefined;
if (vpcAgent?.networkMode === 'VPC') {
console.warn(
'Warning: This agent uses VPC network mode. Local dev server runs outside your VPC. Network behavior may differ from deployed environment.'
);
}
}

// Enter alternate screen buffer for fullscreen mode
process.stdout.write(ENTER_ALT_SCREEN);

Expand Down
Loading
Loading