Rip out non-AMI/SSM additionalCacheKey

Author: luxaritas

packages/aws-cdk-lib/aws-ec2/README.md

@@ -634,13 +634,6 @@ called `cdk.context.json`. You must commit this file to source control so
 that the lookup values are available in non-privileged environments such
 as CI build steps, and to ensure your template builds are repeatable.
 
-To customize the cache key, use the `additionalCacheKey` parameter.
-This allows you to have multiple lookups with the same parameters
-cache their values separately. This can be useful if you want to
-scope the context variable to a construct (ie, using `additionalCacheKey: this.node.path`),
-so that if the value in the cache needs to be updated, it does not need to be updated
-for all constructs at the same time.
-
 Here's how `Vpc.fromLookup()` can be used:
 
 [importing existing VPCs](test/integ.import-default-vpc.lit.ts)
@@ -894,13 +887,6 @@ written to a file called `cdk.context.json`.
 You must commit this file to source control so that the lookup values are available in non-privileged
 environments such as CI build steps, and to ensure your template builds are repeatable.
 
-To customize the cache key, use the `additionalCacheKey` property of the `options` parameter.
-This allows you to have multiple lookups with the same parameters
-cache their values separately. This can be useful if you want to
-scope the context variable to a construct (ie, using `additionalCacheKey: this.node.path`),
-so that if the value in the cache needs to be updated, it does not need to be updated
-for all constructs at the same time.
-
 ### Cross Stack Connections
 
 If you are attempting to add a connection from a peer in one stack to a peer in a different stack, sometimes it is necessary to ensure that you are making the connection in

packages/aws-cdk-lib/aws-ec2/lib/security-group.ts

@@ -376,22 +376,22 @@ export class SecurityGroup extends SecurityGroupBase {
    *
    * @deprecated Use `fromLookupById()` instead
    */
-  public static fromLookup(scope: Construct, id: string, securityGroupId: string, options?: BaseSecurityGroupLookupOptions) {
-    return this.fromLookupAttributes(scope, id, { securityGroupId, ...options });
+  public static fromLookup(scope: Construct, id: string, securityGroupId: string) {
+    return this.fromLookupAttributes(scope, id, { securityGroupId });
   }
 
   /**
    * Look up a security group by id.
    */
-  public static fromLookupById(scope: Construct, id: string, securityGroupId: string, options?: BaseSecurityGroupLookupOptions) {
-    return this.fromLookupAttributes(scope, id, { securityGroupId, ...options });
+  public static fromLookupById(scope: Construct, id: string, securityGroupId: string) {
+    return this.fromLookupAttributes(scope, id, { securityGroupId });
   }
 
   /**
    * Look up a security group by name.
    */
-  public static fromLookupByName(scope: Construct, id: string, securityGroupName: string, vpc: IVpc, options?: BaseSecurityGroupLookupOptions) {
-    return this.fromLookupAttributes(scope, id, { securityGroupName, vpc, ...options });
+  public static fromLookupByName(scope: Construct, id: string, securityGroupName: string, vpc: IVpc) {
+    return this.fromLookupAttributes(scope, id, { securityGroupName, vpc });
   }
 
   /**
@@ -456,7 +456,6 @@ export class SecurityGroup extends SecurityGroupBase {
         securityGroupId: 'sg-12345678',
         allowAllOutbound: true,
       } as cxapi.SecurityGroupContextResponse,
-      additionalCacheKey: options.additionalCacheKey,
     }).value;
 
     return SecurityGroup.fromSecurityGroupId(scope, id, attributes.securityGroupId, {
@@ -823,24 +822,12 @@ function isAllTrafficRule(rule: any) {
   return (rule.cidrIp === '0.0.0.0/0' || rule.cidrIpv6 === '::/0') && rule.ipProtocol === '-1';
 }
 
-/**
- * Base properties for looking up an existing SecurityGroup.
- */
-export interface BaseSecurityGroupLookupOptions {
-  /**
-   * Adds an additional discriminator to the `cdk.context.json` cache key.
-   *
-   * @default - no additional cache key
-   */
-  readonly additionalCacheKey?: string;
-}
-
 /**
  * Properties for looking up an existing SecurityGroup.
  *
  * Either `securityGroupName` or `securityGroupId` has to be specified.
  */
-interface SecurityGroupLookupOptions extends BaseSecurityGroupLookupOptions {
+interface SecurityGroupLookupOptions {
   /**
    * The name of the security group
    *
@@ -867,11 +854,4 @@ interface SecurityGroupLookupOptions extends BaseSecurityGroupLookupOptions {
    * @default Don't filter on VPC
    */
   readonly vpc?: IVpc;
-
-  /**
-   * Adds an additional discriminator to the `cdk.context.json` cache key.
-   *
-   * @default - no additional cache key
-   */
-  readonly additionalCacheKey?: string;
 }

packages/aws-cdk-lib/aws-ec2/lib/vpc-lookup.ts

@@ -75,11 +75,4 @@ export interface VpcLookupOptions {
    * @default the account id of the parent stack
    */
   readonly ownerAccountId?: string;
-
-  /**
-   * Adds an additional discriminator to the `cdk.context.json` cache key.
-   *
-   * @default - no additional cache key
-   */
-  readonly additionalCacheKey?: string;
 }

packages/aws-cdk-lib/aws-ec2/lib/vpc.ts

@@ -1366,7 +1366,6 @@ export class Vpc extends VpcBase {
         subnetGroupNameTag: options.subnetGroupNameTag,
       } as cxschema.VpcContextQuery,
       dummyValue: undefined,
-      additionalCacheKey: options.additionalCacheKey,
     }).value;
 
     return new LookedUpVpc(scope, id, attributes ?? DUMMY_VPC_PROPS, attributes === undefined);

packages/aws-cdk-lib/aws-elasticloadbalancingv2/README.md

@@ -953,18 +953,6 @@ following lookup methods:
 * `NetworkListener.fromLookup(options)` - Look up a network load balancer
   listener.
 
-The result of a `fromLookup()` operation will be written to a file
-called `cdk.context.json`. You must commit this file to source control so
-that the lookup values are available in non-privileged environments such
-as CI build steps, and to ensure your template builds are repeatable.
-
-To customize the cache key, use the `additionalCacheKey` parameter.
-This allows you to have multiple lookups with the same parameters
-cache their values separately. This can be useful if you want to
-scope the context variable to a construct (ie, using `additionalCacheKey: this.node.path`),
-so that if the value in the cache needs to be updated, it does not need to be updated
-for all constructs at the same time.
-
 ### Load Balancer lookup options
 
 You may look up a load balancer by ARN or by associated tags. When you look a
@@ -994,20 +982,7 @@ const loadBalancer = elbv2.ApplicationLoadBalancer.fromLookup(this, 'ALB', {
 });
 ```
 
-**Look up a Application Load Balancer by ARN, customizing the cache key**
-
-```ts
-const loadBalancer = elbv2.ApplicationLoadBalancer.fromLookup(this, 'ALB', {
-  loadBalancerArn: 'arn:aws:elasticloadbalancing:us-east-2:123456789012:loadbalancer/app/my-load-balancer/1234567890123456',
-  // creates a distinct context variable for this load balancer, instead of resolving to the same
-  // value anywhere this lookup is done in your app
-  additionalCacheKey: this.node.path,
-});
-```
-
-**
-
-### Load Balancer Listener lookup options
+## Load Balancer Listener lookup options
 
 You may look up a load balancer listener by the following criteria:
 
@@ -1055,19 +1030,6 @@ const listener = elbv2.NetworkListener.fromLookup(this, 'ALBListener', {
 });
 ```
 
-**Look up a Listener by associated Load Balancer, Port, and Protocol**
-
-```ts
-const listener = elbv2.ApplicationListener.fromLookup(this, 'ALBListener', {
-  loadBalancerArn: 'arn:aws:elasticloadbalancing:us-east-2:123456789012:loadbalancer/app/my-load-balancer/1234567890123456',
-  listenerProtocol: elbv2.ApplicationProtocol.HTTPS,
-  listenerPort: 443,
-  // creates a distinct context variable for this application listener, instead of resolving to the same
-  // value anywhere this lookup is done in your app
-  additionalCacheKey: this.node.path,
-});
-```
-
 ## Metrics
 
 You may create metrics for Load Balancers and Target Groups through the `metrics` attribute:

packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-listener.ts

@@ -211,11 +211,7 @@ export class ApplicationListener extends BaseListener implements IApplicationLis
   /**
    * Look up an ApplicationListener.
    */
-  public static fromLookup(
-    scope: Construct,
-    id: string,
-    options: ApplicationListenerLookupOptions,
-  ): IApplicationListener {
+  public static fromLookup(scope: Construct, id: string, options: ApplicationListenerLookupOptions): IApplicationListener {
     if (Token.isUnresolved(options.listenerArn)) {
       throw new ValidationError('All arguments to look up a load balancer listener must be concrete (no Tokens)', scope);
     }

packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/alb/application-load-balancer.ts

@@ -164,11 +164,7 @@ export class ApplicationLoadBalancer extends BaseLoadBalancer implements IApplic
   /**
    * Look up an application load balancer.
    */
-  public static fromLookup(
-    scope: Construct,
-    id: string,
-    options: ApplicationLoadBalancerLookupOptions,
-  ): IApplicationLoadBalancer {
+  public static fromLookup(scope: Construct, id: string, options: ApplicationLoadBalancerLookupOptions): IApplicationLoadBalancer {
     const props = BaseLoadBalancer._queryContextProvider(scope, {
       userOptions: options,
       loadBalancerType: cxschema.LoadBalancerType.APPLICATION,

packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/nlb/network-load-balancer.ts

@@ -217,11 +217,7 @@ export class NetworkLoadBalancer extends BaseLoadBalancer implements INetworkLoa
   /**
    * Looks up the network load balancer.
    */
-  public static fromLookup(
-    scope: Construct,
-    id: string,
-    options: NetworkLoadBalancerLookupOptions,
-  ): INetworkLoadBalancer {
+  public static fromLookup(scope: Construct, id: string, options: NetworkLoadBalancerLookupOptions): INetworkLoadBalancer {
     const props = BaseLoadBalancer._queryContextProvider(scope, {
       userOptions: options,
       loadBalancerType: cxschema.LoadBalancerType.NETWORK,

packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/base-listener.ts

@@ -28,13 +28,6 @@ export interface BaseListenerLookupOptions {
    * @default - does not filter by listener port
    */
   readonly listenerPort?: number;
-
-  /**
-   * Adds an additional discriminator to the `cdk.context.json` cache key.
-   *
-   * @default - no additional cache key
-   */
-  readonly additionalCacheKey?: string;
 }
 
 /**
@@ -112,7 +105,6 @@ export abstract class BaseListener extends Resource implements IListener {
         listenerPort: 80,
         securityGroupIds: ['sg-123456789012'],
       } as cxapi.LoadBalancerListenerContextResponse,
-      additionalCacheKey: options.userOptions.additionalCacheKey,
     }).value;
 
     return props;

packages/aws-cdk-lib/aws-elasticloadbalancingv2/lib/shared/base-load-balancer.ts

@@ -188,13 +188,6 @@ export interface BaseLoadBalancerLookupOptions {
    * @default - does not match load balancers by tags
    */
   readonly loadBalancerTags?: Record<string, string>;
-
-  /**
-   * Adds an additional discriminator to the `cdk.context.json` cache key.
-   *
-   * @default - no additional cache key
-   */
-  readonly additionalCacheKey?: string;
 }
 
 /**
@@ -221,10 +214,7 @@ export abstract class BaseLoadBalancer extends Resource {
    * Queries the load balancer context provider for load balancer info.
    * @internal
    */
-  protected static _queryContextProvider(
-    scope: Construct,
-    options: LoadBalancerQueryContextProviderOptions,
-  ) {
+  protected static _queryContextProvider(scope: Construct, options: LoadBalancerQueryContextProviderOptions) {
     if (Token.isUnresolved(options.userOptions.loadBalancerArn)
       || Object.values(options.userOptions.loadBalancerTags ?? {}).some(Token.isUnresolved)) {
       throw new ValidationError('All arguments to look up a load balancer must be concrete (no Tokens)', scope);
@@ -251,7 +241,6 @@ export abstract class BaseLoadBalancer extends Resource {
         securityGroupIds: ['sg-1234'],
         vpcId: 'vpc-12345',
       } as cxapi.LoadBalancerContextResponse,
-      additionalCacheKey: options.userOptions.additionalCacheKey,
     }).value;
 
     return props;