Revert "feat: add VPC CLI flags to create and add commands [2/3] (#425)"

This reverts commit c75f4cd.

Author: tejaskash

src/cli/commands/add/__tests__/validate.test.ts

@@ -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', () => {

src/cli/commands/add/actions.ts

@@ -7,7 +7,6 @@ import type {
   GatewayAuthorizerType,
   MemoryStrategyType,
   ModelProvider,
-  NetworkMode,
   SDKFramework,
   TargetLanguage,
 } from '../../../schema';
@@ -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';
@@ -45,9 +43,6 @@ export interface ValidatedAddAgentOptions {
   modelProvider: ModelProvider;
   apiKey?: string;
   memory?: MemoryOption;
-  networkMode?: NetworkMode;
-  subnets?: string;
-  securityGroups?: string;
   codeLocation?: string;
   entrypoint?: string;
 }
@@ -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);
@@ -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);

src/cli/commands/add/command.tsx

@@ -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,
   });
@@ -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]')

src/cli/commands/add/types.ts

@@ -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
@@ -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;

src/cli/commands/add/validate.ts

@@ -7,7 +7,6 @@ import {
   TargetLanguageSchema,
   getSupportedModelProviders,
 } from '../../../schema';
-import { validateVpcOptions } from '../shared/vpc-utils';
 import type {
   AddAgentOptions,
   AddGatewayOptions,
@@ -103,9 +102,6 @@ export function validateAddAgentOptions(options: AddAgentOptions): ValidationRes
     }
   }
 
-  const vpcResult = validateVpcOptions(options);
-  if (!vpcResult.valid) return vpcResult;
-
   return { valid: true };
 }
 

src/cli/commands/create/__tests__/validate.test.ts

@@ -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(

src/cli/commands/create/action.ts

@@ -4,7 +4,6 @@ import type {
   BuildType,
   DeployedState,
   ModelProvider,
-  NetworkMode,
   SDKFramework,
   TargetLanguage,
 } from '../../../schema';
@@ -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;
@@ -139,9 +135,6 @@ export async function createProjectWithAgent(options: CreateWithAgentOptions): P
     modelProvider,
     apiKey,
     memory,
-    networkMode,
-    subnets,
-    securityGroups,
     skipGit,
     skipPythonSetup,
     onProgress,
@@ -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)

src/cli/commands/create/command.tsx

@@ -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';
@@ -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,
@@ -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]')
@@ -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 ??

src/cli/commands/create/types.ts

@@ -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;

src/cli/commands/create/validate.ts

@@ -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';
@@ -122,8 +121,5 @@ export function validateCreateOptions(options: CreateOptions, cwd?: string): Val
     }
   }
 
-  const vpcResult = validateVpcOptions(options);
-  if (!vpcResult.valid) return vpcResult;
-
   return { valid: true };
 }