fix(import): validate ARN resource type for online-eval import

import online-eval used a naive regex to extract the config ID from the
ARN, skipping resource type, region, and account validation. Now uses
parseAndValidateArn like all other import commands. Added an ARN resource
type mapping to handle the online-eval vs online-evaluation-config
mismatch between ImportableResourceType and the ARN format.

Author: jesseturner21

src/cli/commands/import/import-online-eval.ts

@@ -6,7 +6,7 @@ import {
   listAllOnlineEvaluationConfigs,
 } from '../../aws/agentcore-control';
 import { ANSI } from './constants';
-import { failResult, findResourceInDeployedState } from './import-utils';
+import { failResult, findResourceInDeployedState, parseAndValidateArn } from './import-utils';
 import { executeResourceImport } from './resource-import';
 import type { ImportResourceOptions, ImportResourceResult, ResourceImportDescriptor } from './types';
 import type { Command } from '@commander-js/extra-typings';
@@ -69,13 +69,7 @@ function createOnlineEvalDescriptor(): ResourceImportDescriptor<GetOnlineEvalCon
 
     listResources: region => listAllOnlineEvaluationConfigs({ region }),
     getDetail: (region, id) => getOnlineEvaluationConfig({ region, configId: id }),
-    parseResourceId: arn => {
-      const match = /\/([^/]+)$/.exec(arn);
-      if (!match) {
-        throw new Error(`Could not parse config ID from ARN: ${arn}`);
-      }
-      return match[1]!;
-    },
+    parseResourceId: (arn, target) => parseAndValidateArn(arn, 'online-eval', target).resourceId,
 
     extractSummaryId: s => s.onlineEvaluationConfigId,
     formatListItem: (s, i) =>

src/cli/commands/import/import-utils.ts

@@ -212,6 +212,14 @@ export interface ParsedArn {
 const ARN_PATTERN =
   /^arn:aws:bedrock-agentcore:([^:]+):([^:]+):(runtime|memory|evaluator|online-evaluation-config)\/(.+)$/;
 
+/** Map from ImportableResourceType to the resource type string used in ARNs. */
+const ARN_RESOURCE_TYPE_MAP: Record<ImportableResourceType, string> = {
+  runtime: 'runtime',
+  memory: 'memory',
+  evaluator: 'evaluator',
+  'online-eval': 'online-evaluation-config',
+};
+
 /**
  * Parse and validate a BedrockAgentCore ARN.
  * Validates format, region, and account against the deployment target.
@@ -222,16 +230,17 @@ export function parseAndValidateArn(
   target: { region: string; account: string }
 ): ParsedArn {
   const match = ARN_PATTERN.exec(arn);
+  const expectedArnType = ARN_RESOURCE_TYPE_MAP[expectedResourceType];
   if (!match) {
     throw new Error(
-      `Invalid ARN format: "${arn}". Expected format: arn:aws:bedrock-agentcore:<region>:<account>:${expectedResourceType}/<id>`
+      `Invalid ARN format: "${arn}". Expected format: arn:aws:bedrock-agentcore:<region>:<account>:${expectedArnType}/<id>`
     );
   }
 
   const [, region, account, resourceType, resourceId] = match;
 
-  if (resourceType !== expectedResourceType) {
-    throw new Error(`ARN resource type "${resourceType}" does not match expected type "${expectedResourceType}".`);
+  if (resourceType !== expectedArnType) {
+    throw new Error(`ARN resource type "${resourceType}" does not match expected type "${expectedArnType}".`);
   }
 
   if (region !== target.region) {