revert(ec2): update PrefixList.fromLookup() to expect the result from CcApi context provider has exactly one resource (#34557)

Reverts #34199

Author: GavinZZ

packages/@aws-cdk/cx-api/package.json

@@ -82,12 +82,12 @@
     "semver": "^7.7.2"
   },
   "peerDependencies": {
-    "@aws-cdk/cloud-assembly-schema": ">=43.6.0"
+    "@aws-cdk/cloud-assembly-schema": ">=41.0.0"
   },
   "license": "Apache-2.0",
   "devDependencies": {
     "@aws-cdk/cdk-build-tools": "0.0.0",
-    "@aws-cdk/cloud-assembly-schema": "^43.6.0",
+    "@aws-cdk/cloud-assembly-schema": "^41.2.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^29.5.14",
     "@types/mock-fs": "^4.13.4",

packages/aws-cdk-lib/aws-ec2/lib/prefix-list.ts

@@ -148,14 +148,15 @@ export class PrefixList extends PrefixListBase {
           ...(options.addressFamily ? { AddressFamily: options.addressFamily } : undefined),
         },
         propertiesToReturn: ['PrefixListId'],
-        expectedMatchCount: 'exactly-one',
       } satisfies Omit<cxschema.CcApiContextQuery, 'account'|'region'>,
       dummyValue: [dummyResponse] satisfies PrefixListContextResponse[],
     }).value;
 
     // getValue returns a list of result objects. We are expecting 1 result or Error.
-    if (response.length !== 1) {
-      throw new ValidationError('Unexpected response received from the context provider. Please clear out the context key using `cdk context --remove` and try again.', scope);
+    if (response.length === 0) {
+      throw new ValidationError(`Could not find any managed prefix lists matching ${JSON.stringify(options)}`, scope);
+    } else if (response.length > 1) {
+      throw new ValidationError(`Found ${response.length} managed prefix lists matching ${JSON.stringify(options)}; please narrow the search criteria`, scope);
     }
 
     const prefixList = response[0];

packages/aws-cdk-lib/aws-ec2/test/prefix-list.test.ts

@@ -130,7 +130,6 @@ describe('prefix list', () => {
           PrefixListName: 'com.amazonaws.us-east-1.testprefixlist',
         },
         propertiesToReturn: ['PrefixListId'],
-        expectedMatchCount: 'exactly-one',
       },
       dummyValue: [
         { PrefixListId: 'pl-xxxxxxxx' },
@@ -165,7 +164,6 @@ describe('prefix list', () => {
           AddressFamily: 'IPv6',
         },
         propertiesToReturn: ['PrefixListId'],
-        expectedMatchCount: 'exactly-one',
       },
       dummyValue: [
         { PrefixListId: 'pl-xxxxxxxx' },
@@ -184,11 +182,9 @@ describe('prefix list', () => {
     }).toThrow('All arguments to look up a managed prefix list must be concrete (no Tokens)');
   });
 
-  test.each([
-    [[]],
-    [[{ PrefixListId: 'pl-xxxxxxxx' }, { PrefixListId: 'pl-yyyyyyyy' }]],
-  ])('fromLookup throws for unexpected result', (resultObjs) => {
+  test('fromLookup throws if not found', () => {
     // GIVEN
+    const resultObjs = [];
     jest.spyOn(ContextProvider, 'getValue').mockReturnValue({ value: resultObjs });
 
     // WHEN
@@ -199,6 +195,22 @@ describe('prefix list', () => {
       PrefixList.fromLookup(stack, 'PrefixList', {
         prefixListName: 'com.amazonaws.us-east-1.missingprefixlist',
       });
-    }).toThrow('Unexpected response received from the context provider.');
+    }).toThrow('Could not find any managed prefix lists matching');
+  });
+
+  test('fromLookup throws if multiple resources found', () => {
+    // GIVEN
+    const resultObjs = [{ PrefixListId: 'pl-xxxxxxxx' }, { PrefixListId: 'pl-yyyyyyyy' }];
+    jest.spyOn(ContextProvider, 'getValue').mockReturnValue({ value: resultObjs });
+
+    // WHEN
+    const stack = new Stack(undefined, undefined, { env: { region: 'us-east-1', account: '123456789012' } });
+
+    // THEN
+    expect(() => {
+      PrefixList.fromLookup(stack, 'PrefixList', {
+        prefixListName: 'com.amazonaws.us-east-1.missingprefixlist',
+      });
+    }).toThrow('Found 2 managed prefix lists matching');
   });
 });

packages/aws-cdk-lib/package.json

@@ -121,7 +121,7 @@
   "dependencies": {
     "@aws-cdk/asset-awscli-v1": "2.2.237",
     "@aws-cdk/asset-node-proxy-agent-v6": "^2.1.0",
-    "@aws-cdk/cloud-assembly-schema": "^43.6.0",
+    "@aws-cdk/cloud-assembly-schema": "^41.2.0",
     "@balena/dockerignore": "^1.0.2",
     "case": "1.6.3",
     "fs-extra": "^11.3.0",

yarn.lock

@@ -74,10 +74,10 @@
     "@aws-cdk/service-spec-types" "^0.0.141"
     "@cdklabs/tskb" "^0.0.3"
 
-"@aws-cdk/cloud-assembly-schema@^43.6.0":
-  version "43.9.0"
-  resolved "https://registry.npmjs.org/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-43.9.0.tgz#795c491f703c0faa71b4c97a888086a54614b2d4"
-  integrity sha512-S6fiiNGSRoTqCnpAH3mXV52Ssj6i+eUB6LSKYqGdKqzrgGkyvR/acurMGYtCJt5gsf3uZ+5J6utYs2X6dcg8Vw==
+"@aws-cdk/cloud-assembly-schema@^41.2.0":
+  version "41.2.0"
+  resolved "https://registry.npmjs.org/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-41.2.0.tgz#c1ef513e1cc0528dbc05948ae39d5631306af423"
+  integrity sha512-JaulVS6z9y5+u4jNmoWbHZRs9uGOnmn/ktXygNWKNu1k6lF3ad4so3s18eRu15XCbUIomxN9WPYT6Ehh7hzONw==
   dependencies:
     jsonschema "~1.4.1"
     semver "^7.7.1"