From c3934817ea15bb3187f67112a1d56c13aa555524 Mon Sep 17 00:00:00 2001 From: Trevor Burnham Date: Wed, 8 Jan 2025 15:27:54 -0500 Subject: [PATCH 1/5] fix(cloudwatch): render region and accountId when directly set on metrics (#32325) ### Issue # Closes #28731 ### Reason for this change Currently, if a user creates a metric that includes `region` and `accountId`, those fields are omitted when the metric renders in a stack with those same values. The intended behavior is to omit those fields when they're implicitly set via `metric.attachTo(stack)`, not to omit them when set directly by the user. ### Description of changes This is a second attempt at #29935, which was auto-closed after the pull request linter complained that there were no integration test changes. This time around I've tried to satisfy the linter. Otherwise, the changes are the same as before: The key changes here are on the `Metric` class. Previously, `region` and `account` were public properties that were set by `metric.attachTo(stack)`, making it impossible to differentiate whether they were set directly or via `attachTo`. To differentiate them while maintaining backward compatibility, I took this approach: 1. `attachTo` sets internal properties called `stackRegion` and `stackAccount`. Setting `region` and `account` directly sets internal properties called `regionOverride` and `accountOverride`. 2. The public `region` and `account` properties are now getters that return the override (if set) and fall back on the stack properties. 3. The `toMetricConfig()` method returns the `region` and `account` from the getters, but also includes the `regionOverride` and `accountOverride`. That way, everything that looks at `region` and `account` works the same way it did before, except in `metricGraphJson`, which skips the "if different from stack" tokenization if the overrides are set. ### Description of how you validated changes 1. Confirmed that all existing unit tests pass. 2. Added a new unit test to show that `region` and `account` are now preserved when set directly on a metric. 3. Modified an integration test to show how setting `region` and `account` on a metric affects the snapshot. ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- ...hboardAndWidgetWithStartAndEnd.assets.json | 6 +- ...oardAndWidgetWithStartAndEnd.template.json | 6 +- .../cdk.out | 2 +- ...efaultTestDeployAssert4D8483F4.assets.json | 2 +- .../integ.json | 2 +- .../manifest.json | 6 +- .../tree.json | 10 +-- ...dashboard-and-widget-with-start-and-end.ts | 2 + .../aws-cloudwatch/lib/metric-types.ts | 14 ++++ .../aws-cdk-lib/aws-cloudwatch/lib/metric.ts | 71 +++++++++++++++---- .../lib/private/make-enumerable.ts | 9 +++ .../aws-cloudwatch/lib/private/rendering.ts | 12 +++- .../test/cross-environment.test.ts | 13 ++++ .../aws-cloudwatch/test/metrics.test.ts | 29 ++++++++ 14 files changed, 154 insertions(+), 30 deletions(-) create mode 100644 packages/aws-cdk-lib/aws-cloudwatch/lib/private/make-enumerable.ts diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/DashboardAndWidgetWithStartAndEnd.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/DashboardAndWidgetWithStartAndEnd.assets.json index 048b1a92a7635..0716094f8358f 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/DashboardAndWidgetWithStartAndEnd.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/DashboardAndWidgetWithStartAndEnd.assets.json @@ -1,7 +1,7 @@ { - "version": "34.0.0", + "version": "38.0.1", "files": { - "874df94f43f12341a3001f4b19d4e1bba754a4fc3a33c6a592ae6c265fc99a44": { + "ffda0354b028815a1953777c34e49bbf4ec8eb0eb04ccd47e60eff77dbcefe33": { "source": { "path": "DashboardAndWidgetWithStartAndEnd.template.json", "packaging": "file" @@ -9,7 +9,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "874df94f43f12341a3001f4b19d4e1bba754a4fc3a33c6a592ae6c265fc99a44.json", + "objectKey": "ffda0354b028815a1953777c34e49bbf4ec8eb0eb04ccd47e60eff77dbcefe33.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/DashboardAndWidgetWithStartAndEnd.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/DashboardAndWidgetWithStartAndEnd.template.json index 9ff3f1cedf6cc..8f7e608fdb1e3 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/DashboardAndWidgetWithStartAndEnd.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/DashboardAndWidgetWithStartAndEnd.template.json @@ -11,15 +11,15 @@ { "Ref": "AWS::Region" }, - "\",\"metrics\":[[\"CDK/Test\",\"Metric\"]],\"start\":\"-P7D\",\"end\":\"2018-12-17T06:00:00.000Z\"}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":3,\"properties\":{\"view\":\"timeSeries\",\"region\":\"", + "\",\"metrics\":[[\"CDK/Test\",\"Metric\",{\"accountId\":\"1234\",\"region\":\"us-north-5\"}]],\"start\":\"-P7D\",\"end\":\"2018-12-17T06:00:00.000Z\"}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":3,\"properties\":{\"view\":\"timeSeries\",\"region\":\"", { "Ref": "AWS::Region" }, - "\",\"metrics\":[[\"CDK/Test\",\"Metric\"]],\"yAxis\":{},\"start\":\"-P7D\",\"end\":\"2018-12-17T06:00:00.000Z\"}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":9,\"properties\":{\"view\":\"gauge\",\"region\":\"", + "\",\"metrics\":[[\"CDK/Test\",\"Metric\",{\"accountId\":\"1234\",\"region\":\"us-north-5\"}]],\"yAxis\":{},\"start\":\"-P7D\",\"end\":\"2018-12-17T06:00:00.000Z\"}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":9,\"properties\":{\"view\":\"gauge\",\"region\":\"", { "Ref": "AWS::Region" }, - "\",\"metrics\":[[\"CDK/Test\",\"Metric\"]],\"yAxis\":{\"left\":{\"min\":0,\"max\":100}},\"start\":\"-P7D\",\"end\":\"2018-12-17T06:00:00.000Z\"}}]}" + "\",\"metrics\":[[\"CDK/Test\",\"Metric\",{\"accountId\":\"1234\",\"region\":\"us-north-5\"}]],\"yAxis\":{\"left\":{\"min\":0,\"max\":100}},\"start\":\"-P7D\",\"end\":\"2018-12-17T06:00:00.000Z\"}}]}" ] ] } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/cdk.out index 2313ab5436501..c6e612584e352 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"34.0.0"} \ No newline at end of file +{"version":"38.0.1"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/cdkintegdashboardandwidgetwithstartandendDefaultTestDeployAssert4D8483F4.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/cdkintegdashboardandwidgetwithstartandendDefaultTestDeployAssert4D8483F4.assets.json index eff956f039962..382c5bbbce8d5 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/cdkintegdashboardandwidgetwithstartandendDefaultTestDeployAssert4D8483F4.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/cdkintegdashboardandwidgetwithstartandendDefaultTestDeployAssert4D8483F4.assets.json @@ -1,5 +1,5 @@ { - "version": "34.0.0", + "version": "38.0.1", "files": { "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { "source": { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/integ.json index 0ef12514015b1..f68abd5b184d3 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "34.0.0", + "version": "38.0.1", "testCases": { "cdk-integ-dashboard-and-widget-with-start-and-end/DefaultTest": { "stacks": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/manifest.json index da40c03020eed..2a45f59d0938e 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "34.0.0", + "version": "38.0.1", "artifacts": { "DashboardAndWidgetWithStartAndEnd.assets": { "type": "cdk:asset-manifest", @@ -14,10 +14,11 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "DashboardAndWidgetWithStartAndEnd.template.json", + "terminationProtection": false, "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/874df94f43f12341a3001f4b19d4e1bba754a4fc3a33c6a592ae6c265fc99a44.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/ffda0354b028815a1953777c34e49bbf4ec8eb0eb04ccd47e60eff77dbcefe33.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -67,6 +68,7 @@ "environment": "aws://unknown-account/unknown-region", "properties": { "templateFile": "cdkintegdashboardandwidgetwithstartandendDefaultTestDeployAssert4D8483F4.template.json", + "terminationProtection": false, "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/tree.json index dec19d3db0811..397fccf676f79 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.js.snapshot/tree.json @@ -26,15 +26,15 @@ { "Ref": "AWS::Region" }, - "\",\"metrics\":[[\"CDK/Test\",\"Metric\"]],\"start\":\"-P7D\",\"end\":\"2018-12-17T06:00:00.000Z\"}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":3,\"properties\":{\"view\":\"timeSeries\",\"region\":\"", + "\",\"metrics\":[[\"CDK/Test\",\"Metric\",{\"accountId\":\"1234\",\"region\":\"us-north-5\"}]],\"start\":\"-P7D\",\"end\":\"2018-12-17T06:00:00.000Z\"}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":3,\"properties\":{\"view\":\"timeSeries\",\"region\":\"", { "Ref": "AWS::Region" }, - "\",\"metrics\":[[\"CDK/Test\",\"Metric\"]],\"yAxis\":{},\"start\":\"-P7D\",\"end\":\"2018-12-17T06:00:00.000Z\"}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":9,\"properties\":{\"view\":\"gauge\",\"region\":\"", + "\",\"metrics\":[[\"CDK/Test\",\"Metric\",{\"accountId\":\"1234\",\"region\":\"us-north-5\"}]],\"yAxis\":{},\"start\":\"-P7D\",\"end\":\"2018-12-17T06:00:00.000Z\"}},{\"type\":\"metric\",\"width\":6,\"height\":6,\"x\":0,\"y\":9,\"properties\":{\"view\":\"gauge\",\"region\":\"", { "Ref": "AWS::Region" }, - "\",\"metrics\":[[\"CDK/Test\",\"Metric\"]],\"yAxis\":{\"left\":{\"min\":0,\"max\":100}},\"start\":\"-P7D\",\"end\":\"2018-12-17T06:00:00.000Z\"}}]}" + "\",\"metrics\":[[\"CDK/Test\",\"Metric\",{\"accountId\":\"1234\",\"region\":\"us-north-5\"}]],\"yAxis\":{\"left\":{\"min\":0,\"max\":100}},\"start\":\"-P7D\",\"end\":\"2018-12-17T06:00:00.000Z\"}}]}" ] ] } @@ -86,7 +86,7 @@ "path": "cdk-integ-dashboard-and-widget-with-start-and-end/DefaultTest/Default", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.4.2" } }, "DeployAssert": { @@ -132,7 +132,7 @@ "path": "Tree", "constructInfo": { "fqn": "constructs.Construct", - "version": "10.2.70" + "version": "10.4.2" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.ts index 280845d4e60ab..38e68985deb12 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.ts +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch/test/integ.dashboard-and-widget-with-start-and-end.ts @@ -11,6 +11,8 @@ class TestStack extends Stack { const testMetric = new Metric({ namespace: 'CDK/Test', metricName: 'Metric', + account: '1234', + region: 'us-north-5', }); const singleValueWidget = new SingleValueWidget({ diff --git a/packages/aws-cdk-lib/aws-cloudwatch/lib/metric-types.ts b/packages/aws-cdk-lib/aws-cloudwatch/lib/metric-types.ts index 7b02013c48a27..46efb0bc56a87 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch/lib/metric-types.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch/lib/metric-types.ts @@ -323,6 +323,20 @@ export interface MetricStatConfig { * @default Deployment account. */ readonly account?: string; + + /** + * Region set directly on the metric, not inherited from the attached stack. + * + * @default No override. + */ + readonly regionOverride?: string; + + /** + * Account set directly on the metric, not inherited from the attached stack. + * + * @default No override. + */ + readonly accountOverride?: string; } /** diff --git a/packages/aws-cdk-lib/aws-cloudwatch/lib/metric.ts b/packages/aws-cdk-lib/aws-cloudwatch/lib/metric.ts index 428598e9602b5..a39a439ddcabf 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch/lib/metric.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch/lib/metric.ts @@ -6,6 +6,7 @@ import { normalizeStatistic, pairStatisticToString, parseStatistic, singleStatis import { Stats } from './stats'; import * as iam from '../../aws-iam'; import * as cdk from '../../core'; +import { makeEnumerable } from './private/make-enumerable'; export type DimensionHash = { [dim: string]: any }; @@ -115,6 +116,20 @@ export interface CommonMetricOptions { * @default - Deployment region. */ readonly region?: string; + + /** + * Account of the stack this metric is attached to. + * + * @default - Deployment account. + */ + readonly stackAccount?: string; + + /** + * Region of the stack this metric is attached to. + * + * @default - Deployment region. + */ + readonly stackRegion?: string; } /** @@ -306,11 +321,17 @@ export class Metric implements IMetric { /** Unit of the metric. */ public readonly unit?: Unit; - /** Account which this metric comes from */ - public readonly account?: string; + /** Account of the stack this metric is attached to. */ + readonly #stackAccount?: string; + + /** Region of the stack this metric is attached to. */ + readonly #stackRegion?: string; - /** Region which this metric comes from. */ - public readonly region?: string; + /** Account set directly on the metric, taking precedence over the stack account. */ + readonly #accountOverride?: string; + + /** Region set directly on the metric, taking precedence over the stack region. */ + readonly #regionOverride?: string; /** * Warnings attached to this metric. @@ -352,8 +373,14 @@ export class Metric implements IMetric { this.label = props.label; this.color = props.color; this.unit = props.unit; - this.account = props.account; - this.region = props.region; + this.#accountOverride = props.account; + this.#regionOverride = props.region; + this.#stackAccount = props.stackAccount; + this.#stackRegion = props.stackRegion; + + // Make getters enumerable. + makeEnumerable(Metric.prototype, this, 'account'); + makeEnumerable(Metric.prototype, this, 'region'); } /** @@ -369,8 +396,10 @@ export class Metric implements IMetric { && (props.color === undefined || props.color === this.color) && (props.statistic === undefined || props.statistic === this.statistic) && (props.unit === undefined || props.unit === this.unit) - && (props.account === undefined || props.account === this.account) - && (props.region === undefined || props.region === this.region) + && (props.account === undefined || props.account === this.#accountOverride) + && (props.region === undefined || props.region === this.#regionOverride) + && (props.stackAccount === undefined || props.stackAccount === this.#stackAccount) + && (props.stackRegion === undefined || props.stackRegion === this.#stackRegion) // For these we're not going to do deep equality, misses some opportunity for optimization // but that's okay. && (props.dimensions === undefined) @@ -388,8 +417,10 @@ export class Metric implements IMetric { unit: ifUndefined(props.unit, this.unit), label: ifUndefined(props.label, this.label), color: ifUndefined(props.color, this.color), - account: ifUndefined(props.account, this.account), - region: ifUndefined(props.region, this.region), + account: ifUndefined(props.account, this.#accountOverride), + region: ifUndefined(props.region, this.#regionOverride), + stackAccount: ifUndefined(props.stackAccount, this.#stackAccount), + stackRegion: ifUndefined(props.stackRegion, this.#stackRegion), }); } @@ -409,11 +440,25 @@ export class Metric implements IMetric { const stack = cdk.Stack.of(scope); return this.with({ - region: cdk.Token.isUnresolved(stack.region) ? undefined : stack.region, - account: cdk.Token.isUnresolved(stack.account) ? undefined : stack.account, + stackAccount: cdk.Token.isUnresolved(stack.account) ? undefined : stack.account, + stackRegion: cdk.Token.isUnresolved(stack.region) ? undefined : stack.region, }); } + /** + * Account which this metric comes from. + */ + public get account(): string | undefined { + return this.#accountOverride || this.#stackAccount; + } + + /** + * Region which this metric comes from. + */ + public get region(): string | undefined { + return this.#regionOverride || this.#stackRegion; + } + public toMetricConfig(): MetricConfig { const dims = this.dimensionsAsList(); return { @@ -426,6 +471,8 @@ export class Metric implements IMetric { unitFilter: this.unit, account: this.account, region: this.region, + accountOverride: this.#accountOverride, + regionOverride: this.#regionOverride, }, renderingProperties: { color: this.color, diff --git a/packages/aws-cdk-lib/aws-cloudwatch/lib/private/make-enumerable.ts b/packages/aws-cdk-lib/aws-cloudwatch/lib/private/make-enumerable.ts new file mode 100644 index 0000000000000..ab721bfa9f605 --- /dev/null +++ b/packages/aws-cdk-lib/aws-cloudwatch/lib/private/make-enumerable.ts @@ -0,0 +1,9 @@ +/** + * Make a property from the specified prototype enumerable on the specific instance. + */ +export function makeEnumerable(prototype: object, instance: object, propertyKey: string) { + Object.defineProperty(instance, propertyKey, { + ...Object.getOwnPropertyDescriptor(prototype, propertyKey), + enumerable: true, + }); +} diff --git a/packages/aws-cdk-lib/aws-cloudwatch/lib/private/rendering.ts b/packages/aws-cdk-lib/aws-cloudwatch/lib/private/rendering.ts index 1aff96bbd120b..db815e42986c4 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch/lib/private/rendering.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch/lib/private/rendering.ts @@ -47,8 +47,16 @@ function metricGraphJson(metric: IMetric, yAxis?: string, id?: string) { } // Metric attributes that are rendered to graph options - if (stat.account) { options.accountId = accountIfDifferentFromStack(stat.account); } - if (stat.region) { options.region = regionIfDifferentFromStack(stat.region); } + if (stat.accountOverride) { + options.accountId = stat.accountOverride; + } else if (stat.account) { + options.accountId = accountIfDifferentFromStack(stat.account); + } + if (stat.regionOverride) { + options.region = stat.regionOverride; + } else if (stat.region) { + options.region = regionIfDifferentFromStack(stat.region); + } if (stat.period && stat.period.toSeconds() !== 300) { options.period = stat.period.toSeconds(); } if (stat.statistic && stat.statistic !== 'Average') { options.stat = stat.statistic; } }, diff --git a/packages/aws-cdk-lib/aws-cloudwatch/test/cross-environment.test.ts b/packages/aws-cdk-lib/aws-cloudwatch/test/cross-environment.test.ts index 14a68d64355fd..ece55e300cf21 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch/test/cross-environment.test.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch/test/cross-environment.test.ts @@ -59,7 +59,20 @@ describe('cross environment', () => { graphMetricsAre(new Stack(), graph, [ ['Test', 'ACount', { accountId: '1234', region: 'us-north-5' }], ]); + }); + test('metric with explicit account and region that match stack will render as-is', () => { + // GIVEN + const graph = new GraphWidget({ + left: [ + a.with({ account: '1234', region: 'us-north-5' }), + ], + }); + + // THEN + graphMetricsAre(new Stack(undefined, undefined, { env: { region: 'us-north-5', account: '1234' } }), graph, [ + ['Test', 'ACount', { accountId: '1234', region: 'us-north-5' }], + ]); }); test('metric attached to agnostic stack will not render in agnostic stack', () => { diff --git a/packages/aws-cdk-lib/aws-cloudwatch/test/metrics.test.ts b/packages/aws-cdk-lib/aws-cloudwatch/test/metrics.test.ts index 42f3bd14a1fbb..3fb54f4e1b58d 100644 --- a/packages/aws-cdk-lib/aws-cloudwatch/test/metrics.test.ts +++ b/packages/aws-cdk-lib/aws-cloudwatch/test/metrics.test.ts @@ -273,6 +273,35 @@ describe('Metrics', () => { expect(metric.statistic).toEqual(customStat); }); + test('region and account getters are enumerable', () => { + const metric = new Metric({ + namespace: 'Test', + metricName: 'Metric', + period: cdk.Duration.minutes(10), + region: 'test-region', + account: 'test-account', + }); + + expect(metric.region).toBe('test-region'); + expect(metric.account).toBe('test-account'); + + const metricObject = { ...metric }; + expect(metricObject).toEqual(expect.objectContaining({ + region: 'test-region', + account: 'test-account', + })); + + // Check that private fields are not included. + // @ts-expect-error + expect(metricObject.accountOverride).toBeUndefined(); + // @ts-expect-error + expect(metricObject.stackAccount).toBeUndefined(); + // @ts-expect-error + expect(metricObject.regionOverride).toBeUndefined(); + // @ts-expect-error + expect(metricObject.stackRegion).toBeUndefined(); + }); + test('statistic is properly parsed', () => { const checkParsingSingle = (statistic: string, statPrefix: string, statName: string, value: number) => { const parsed = parseStatistic(statistic); From d82f2143048cf3e8629319649c7b06c80e4717f7 Mon Sep 17 00:00:00 2001 From: Grace Luo <54298030+gracelu0@users.noreply.github.com> Date: Wed, 8 Jan 2025 16:03:09 -0800 Subject: [PATCH 2/5] chore(cx-api): only include v1 feature flags in the `Flags with a different default in v2` section (#32766) ### Issue # (if applicable) Closes #. ### Reason for this change The docs listing feature flags in v1 with a different default in v2 currently includes some feature flags that were introduced in v2: https://github.com/aws/aws-cdk/blob/main/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md#flags-with-a-different-default-in-v2 . ### Description of changes Update the filter to check if the feature flag was introduced in v1 to avoid accidentally including v2 feature flags with default `true`. ### Describe any new or updated permissions being added N/A ### Description of how you validated changes ran `yarn build` to update `FEATURE_FLAGS.md` ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md | 5 +---- packages/aws-cdk-lib/cx-api/build-tools/flag-report.ts | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md b/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md index af60cf74ac326..de5aece1f4e59 100644 --- a/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md +++ b/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md @@ -219,10 +219,7 @@ Here is an example of a `cdk.json` file that restores v1 behavior for these flag "@aws-cdk/aws-rds:lowercaseDbIdentifier": false, "@aws-cdk/aws-apigateway:usagePlanKeyOrderInsensitiveId": false, "@aws-cdk/aws-lambda:recognizeVersionProps": false, - "@aws-cdk/aws-cloudfront:defaultSecurityPolicyTLSv1.2_2021": false, - "@aws-cdk/pipelines:reduceAssetRoleTrustScope": false, - "@aws-cdk/aws-stepfunctions-tasks:useNewS3UriParametersForBedrockInvokeModelTask": false, - "@aws-cdk/core:aspectStabilization": false + "@aws-cdk/aws-cloudfront:defaultSecurityPolicyTLSv1.2_2021": false } } ``` diff --git a/packages/aws-cdk-lib/cx-api/build-tools/flag-report.ts b/packages/aws-cdk-lib/cx-api/build-tools/flag-report.ts index c777b6fc9701f..4987193d082a2 100644 --- a/packages/aws-cdk-lib/cx-api/build-tools/flag-report.ts +++ b/packages/aws-cdk-lib/cx-api/build-tools/flag-report.ts @@ -65,7 +65,7 @@ function changedFlags() { } function migrateJson() { - const changedInV2 = flags(flag => !!flag.defaults?.v2 && !!flag.introducedIn.v2); + const changedInV2 = flags(flag => !!flag.defaults?.v2 && !!flag.introducedIn.v2 && !!flag.introducedIn.v1); const context = Object.fromEntries(changedInV2.map(([name, _]) => [name, false])); From 8a96454bdb30b8be635506e7c2bf93bd182b1dab Mon Sep 17 00:00:00 2001 From: Xia Zhao <78883180+xazhao@users.noreply.github.com> Date: Wed, 8 Jan 2025 16:37:39 -0800 Subject: [PATCH 3/5] chore(eks-v2-alpha): remove nested stack (#32692) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Reason for this change In the current EKS module, `kubectlProvider` is created in a nested stack. The nested stack here is not necessary and hence moving it to the main stack. ### Description of changes Move `kubectlProvider` to the main stack. ### Describe any new or updated permissions being added ### Description of how you validated changes Updated unit tests so they all passed ### Checklist - [ ] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- .../aws-eks-v2-alpha/lib/kubectl-provider.ts | 4 +- .../aws-eks-v2-alpha/test/cluster.test.ts | 153 +++++------------- .../test/k8s-object-value.test.ts | 8 +- .../aws-eks-v2-alpha/test/k8s-patch.test.ts | 4 +- .../test/service-account.test.ts | 16 +- 5 files changed, 59 insertions(+), 126 deletions(-) diff --git a/packages/@aws-cdk/aws-eks-v2-alpha/lib/kubectl-provider.ts b/packages/@aws-cdk/aws-eks-v2-alpha/lib/kubectl-provider.ts index 5823788ededeb..0ddbc3477ff67 100644 --- a/packages/@aws-cdk/aws-eks-v2-alpha/lib/kubectl-provider.ts +++ b/packages/@aws-cdk/aws-eks-v2-alpha/lib/kubectl-provider.ts @@ -2,7 +2,7 @@ import { Construct, IConstruct } from 'constructs'; import { ICluster, Cluster } from './cluster'; import * as iam from 'aws-cdk-lib/aws-iam'; import * as lambda from 'aws-cdk-lib/aws-lambda'; -import { Duration, Stack, NestedStack, Names, CfnCondition, Fn, Aws } from 'aws-cdk-lib/core'; +import { Duration, Stack, Names, CfnCondition, Fn, Aws } from 'aws-cdk-lib/core'; import * as cr from 'aws-cdk-lib/custom-resources'; import { AwsCliLayer } from 'aws-cdk-lib/lambda-layer-awscli'; import { KubectlLayer } from 'aws-cdk-lib/lambda-layer-kubectl'; @@ -61,7 +61,7 @@ export interface IKubectlProvider extends IConstruct { /** * Implementation of Kubectl Lambda */ -export class KubectlProvider extends NestedStack implements IKubectlProvider { +export class KubectlProvider extends Construct implements IKubectlProvider { /** * Take existing provider or create new based on cluster diff --git a/packages/@aws-cdk/aws-eks-v2-alpha/test/cluster.test.ts b/packages/@aws-cdk/aws-eks-v2-alpha/test/cluster.test.ts index 0d8908645dde9..0ac8a5d54c5a8 100644 --- a/packages/@aws-cdk/aws-eks-v2-alpha/test/cluster.test.ts +++ b/packages/@aws-cdk/aws-eks-v2-alpha/test/cluster.test.ts @@ -1084,7 +1084,7 @@ describe('cluster', () => { Type: 'Custom::AWSCDK-EKS-KubernetesResource', Properties: { ServiceToken: { - 'Fn::ImportValue': 'Stack:ExportsOutputFnGetAttawscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6BOutputsStackawscdkawseksKubectlProviderframeworkonEvent8897FD9BArn49BEF20C', + 'Fn::ImportValue': 'Stack:ExportsOutputFnGetAttawscdkawseksKubectlProviderframeworkonEvent0A650005Arn27EC41A8', }, Manifest: '[{\"foo\":\"bar\"}]', ClusterName: { 'Fn::ImportValue': 'Stack:ExportsOutputRefcluster611F8AFFA07FC079' }, @@ -2069,11 +2069,9 @@ describe('cluster', () => { }, }); - // the kubectl provider is inside a nested stack. - const nested = stack.node.tryFindChild('@aws-cdk/aws-eks.KubectlProvider') as cdk.NestedStack; - Template.fromStack(nested).hasResourceProperties('AWS::Lambda::Function', { + Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', { VpcConfig: { - SecurityGroupIds: [{ Ref: 'referencetoStackCluster17032651AClusterSecurityGroupId' }], + SecurityGroupIds: [{ 'Fn::GetAtt': ['Cluster192CD0375', 'ClusterSecurityGroupId'] }], }, }); }); @@ -2101,9 +2099,7 @@ describe('cluster', () => { }, }); - // the kubectl provider is inside a nested stack. - const nested = stack.node.tryFindChild('@aws-cdk/aws-eks.KubectlProvider') as cdk.NestedStack; - Template.fromStack(nested).hasResourceProperties('AWS::Lambda::Function', { + Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', { Environment: { Variables: { Foo: 'Bar', @@ -2139,11 +2135,9 @@ describe('cluster', () => { }, }); - // the kubectl provider is inside a nested stack. - const nested = stack.node.tryFindChild('@aws-cdk/aws-eks.KubectlProvider') as cdk.NestedStack; - Template.fromStack(nested).hasResourceProperties('AWS::Lambda::Function', { + Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', { Role: { - Ref: 'referencetoStackKubectlIamRole02F8947EArn', + 'Fn::GetAtt': ['awscdkawseksKubectlProviderframeworkonEventServiceRoleF4FAF053', 'Arn'], }, }); }); @@ -2165,10 +2159,9 @@ describe('cluster', () => { chart, }); - const nested = stack.node.tryFindChild('Imported-KubectlProvider') as cdk.NestedStack; - Template.fromStack(nested).hasResourceProperties('AWS::Lambda::Function', { + Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', { Role: { - Ref: 'referencetoKubectlLambdaRole7D084D94Arn', + 'Fn::GetAtt': ['ImportedKubectlProviderframeworkonEventServiceRole6603B49A', 'Arn'], }, }); Template.fromStack(stack).hasResourceProperties(HelmChart.RESOURCE_TYPE, { @@ -2199,11 +2192,9 @@ describe('cluster', () => { vpcSubnets: [{ subnetType: ec2.SubnetType.PUBLIC }], }); - const nested = stack.node.tryFindChild('@aws-cdk/aws-eks.KubectlProvider') as cdk.NestedStack; - // we don't attach vpc config in case endpoint is public only, regardless of whether // the vpc has private subnets or not. - Template.fromStack(nested).hasResourceProperties('AWS::Lambda::Function', { + Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', { VpcConfig: Match.absent(), }); }); @@ -2217,11 +2208,9 @@ describe('cluster', () => { endpointAccess: eks.EndpointAccess.PUBLIC, }); - const nested = stack.node.tryFindChild('@aws-cdk/aws-eks.KubectlProvider') as cdk.NestedStack; - // we don't attach vpc config in case endpoint is public only, regardless of whether // the vpc has private subnets or not. - Template.fromStack(nested).hasResourceProperties('AWS::Lambda::Function', { + Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', { VpcConfig: Match.absent(), }); }); @@ -2248,11 +2237,9 @@ describe('cluster', () => { endpointAccess: eks.EndpointAccess.PRIVATE, }); - const nested = stack.node.tryFindChild('@aws-cdk/aws-eks.KubectlProvider') as cdk.NestedStack; - - const functions = Template.fromStack(nested).findResources('AWS::Lambda::Function'); - expect(functions.Handler886CB40B.Properties.VpcConfig.SubnetIds.length).not.toEqual(0); - expect(functions.Handler886CB40B.Properties.VpcConfig.SecurityGroupIds.length).not.toEqual(0); + const functions = Template.fromStack(stack).findResources('AWS::Lambda::Function'); + expect(functions.awscdkawseksKubectlProviderHandlerAABA4423.Properties.VpcConfig.SubnetIds.length).not.toEqual(0); + expect(functions.awscdkawseksKubectlProviderHandlerAABA4423.Properties.VpcConfig.SecurityGroupIds.length).not.toEqual(0); }); test('private and non restricted public without private subnets', () => { @@ -2265,11 +2252,9 @@ describe('cluster', () => { vpcSubnets: [{ subnetType: ec2.SubnetType.PUBLIC }], }); - const nested = stack.node.tryFindChild('@aws-cdk/aws-eks.KubectlProvider') as cdk.NestedStack; - // we don't have private subnets, but we don't need them since public access // is not restricted. - Template.fromStack(nested).hasResourceProperties('AWS::Lambda::Function', { + Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', { VpcConfig: Match.absent(), }); }); @@ -2283,12 +2268,10 @@ describe('cluster', () => { endpointAccess: eks.EndpointAccess.PUBLIC_AND_PRIVATE, }); - const nested = stack.node.tryFindChild('@aws-cdk/aws-eks.KubectlProvider') as cdk.NestedStack; - // we have private subnets so we should use them. - const functions = Template.fromStack(nested).findResources('AWS::Lambda::Function'); - expect(functions.Handler886CB40B.Properties.VpcConfig.SubnetIds.length).not.toEqual(0); - expect(functions.Handler886CB40B.Properties.VpcConfig.SecurityGroupIds.length).not.toEqual(0); + const functions = Template.fromStack(stack).findResources('AWS::Lambda::Function'); + expect(functions.awscdkawseksKubectlProviderHandlerAABA4423.Properties.VpcConfig.SubnetIds.length).not.toEqual(0); + expect(functions.awscdkawseksKubectlProviderHandlerAABA4423.Properties.VpcConfig.SecurityGroupIds.length).not.toEqual(0); }); test('private and restricted public without private subnets', () => { @@ -2313,12 +2296,10 @@ describe('cluster', () => { endpointAccess: eks.EndpointAccess.PUBLIC_AND_PRIVATE.onlyFrom('1.2.3.4/32'), }); - const nested = stack.node.tryFindChild('@aws-cdk/aws-eks.KubectlProvider') as cdk.NestedStack; - // we have private subnets so we should use them. - const functions = Template.fromStack(nested).findResources('AWS::Lambda::Function'); - expect(functions.Handler886CB40B.Properties.VpcConfig.SubnetIds.length).not.toEqual(0); - expect(functions.Handler886CB40B.Properties.VpcConfig.SecurityGroupIds.length).not.toEqual(0); + const functions = Template.fromStack(stack).findResources('AWS::Lambda::Function'); + expect(functions.awscdkawseksKubectlProviderHandlerAABA4423.Properties.VpcConfig.SubnetIds.length).not.toEqual(0); + expect(functions.awscdkawseksKubectlProviderHandlerAABA4423.Properties.VpcConfig.SecurityGroupIds.length).not.toEqual(0); }); test('private endpoint access selects only private subnets from looked up vpc', () => { @@ -2372,8 +2353,7 @@ describe('cluster', () => { endpointAccess: eks.EndpointAccess.PRIVATE, }); - const nested = stack.node.tryFindChild('@aws-cdk/aws-eks.KubectlProvider') as cdk.NestedStack; - Template.fromStack(nested).hasResourceProperties('AWS::Lambda::Function', { + Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', { VpcConfig: { SubnetIds: ['subnet-private-in-us-east-1a'] }, }); }); @@ -2437,8 +2417,7 @@ describe('cluster', () => { }], }); - const nested = stack.node.tryFindChild('@aws-cdk/aws-eks.KubectlProvider') as cdk.NestedStack; - Template.fromStack(nested).hasResourceProperties('AWS::Lambda::Function', { + Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', { VpcConfig: { SubnetIds: ['subnet-private-in-us-east-1a'] }, }); }); @@ -2462,11 +2441,10 @@ describe('cluster', () => { }], }); - const nested = stack.node.tryFindChild('@aws-cdk/aws-eks.KubectlProvider') as cdk.NestedStack; - Template.fromStack(nested).hasResourceProperties('AWS::Lambda::Function', { + Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', { VpcConfig: { SubnetIds: [ - { Ref: 'referencetoStackVpcPrivateSubnet1Subnet8E6A14CBRef' }, + { Ref: 'VpcPrivateSubnet1Subnet536B997A' }, 'subnet-unknown', ], }, @@ -2488,8 +2466,7 @@ describe('cluster', () => { }], }); - const nested = stack.node.tryFindChild('@aws-cdk/aws-eks.KubectlProvider') as cdk.NestedStack; - Template.fromStack(nested).hasResourceProperties('AWS::Lambda::Function', { + Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', { VpcConfig: { SubnetIds: ['subnet1'] }, }); }); @@ -2541,21 +2518,19 @@ describe('cluster', () => { }, }); - // the kubectl provider is inside a nested stack. - const nested = stack.node.tryFindChild('@aws-cdk/aws-eks.KubectlProvider') as cdk.NestedStack; - Template.fromStack(nested).hasResourceProperties('AWS::Lambda::Function', { + Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', { VpcConfig: { SecurityGroupIds: [ { - Ref: 'referencetoStackCluster17032651AClusterSecurityGroupId', + 'Fn::GetAtt': ['Cluster192CD0375', 'ClusterSecurityGroupId'], }, ], SubnetIds: [ { - Ref: 'referencetoStackVpcPrivate1Subnet1Subnet6764A0F6Ref', + Ref: 'VpcPrivate1Subnet1SubnetC688B2B1', }, { - Ref: 'referencetoStackVpcPrivate1Subnet2SubnetDFD49645Ref', + Ref: 'VpcPrivate1Subnet2SubnetA2AF15C7', }, ], }, @@ -2604,10 +2579,8 @@ describe('cluster', () => { }, }); - // the kubectl provider is inside a nested stack. - const nested = stack.node.tryFindChild('@aws-cdk/aws-eks.KubectlProvider') as cdk.NestedStack; - const functions = Template.fromStack(nested).findResources('AWS::Lambda::Function'); - expect(functions.Handler886CB40B.Properties.VpcConfig.SubnetIds.length).toEqual(16); + const functions = Template.fromStack(stack).findResources('AWS::Lambda::Function'); + expect(functions.awscdkawseksKubectlProviderHandlerAABA4423.Properties.VpcConfig.SubnetIds.length).toEqual(16); }); test('kubectl provider considers vpc subnet selection', () => { @@ -2653,27 +2626,25 @@ describe('cluster', () => { }, }); - // the kubectl provider is inside a nested stack. - const nested = stack.node.tryFindChild('@aws-cdk/aws-eks.KubectlProvider') as cdk.NestedStack; - Template.fromStack(nested).hasResourceProperties('AWS::Lambda::Function', { + Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', { VpcConfig: { SecurityGroupIds: [ { - Ref: 'referencetoStackCluster17032651AClusterSecurityGroupId', + 'Fn::GetAtt': ['Cluster192CD0375', 'ClusterSecurityGroupId'], }, ], SubnetIds: [ { - Ref: 'referencetoStackVpcPrivate1Subnet1Subnet6764A0F6Ref', + Ref: 'VpcPrivate1Subnet1SubnetC688B2B1', }, { - Ref: 'referencetoStackVpcPrivate1Subnet2SubnetDFD49645Ref', + Ref: 'VpcPrivate1Subnet2SubnetA2AF15C7', }, { - Ref: 'referencetoStackVpcPrivate2Subnet1Subnet586AD392Ref', + Ref: 'VpcPrivate2Subnet1SubnetE13E2E30', }, { - Ref: 'referencetoStackVpcPrivate2Subnet2SubnetE42148C0Ref', + Ref: 'VpcPrivate2Subnet2Subnet158A38AB', }, ], }, @@ -2734,8 +2705,8 @@ describe('cluster', () => { expect(resources[expectedKubernetesGetId].Properties).toEqual({ ServiceToken: { 'Fn::GetAtt': [ - 'awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B', - 'Outputs.StackawscdkawseksKubectlProviderframeworkonEvent8897FD9BArn', + 'awscdkawseksKubectlProviderframeworkonEvent0A650005', + 'Arn', ], }, ClusterName: { @@ -2773,10 +2744,9 @@ describe('cluster', () => { }); // THEN - const providerStack = stack.node.tryFindChild('@aws-cdk/aws-eks.KubectlProvider') as cdk.NestedStack; - Template.fromStack(providerStack).hasResourceProperties('AWS::Lambda::Function', { + Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', { Layers: [ - { Ref: 'AwsCliLayerF44AAF94' }, + { Ref: 'awscdkawseksKubectlProviderAwsCliLayerF72FE066' }, 'arn:of:layer', ], }); @@ -2833,11 +2803,10 @@ describe('cluster', () => { }); // THEN - const providerStack = stack.node.tryFindChild('@aws-cdk/aws-eks.KubectlProvider') as cdk.NestedStack; - Template.fromStack(providerStack).hasResourceProperties('AWS::Lambda::Function', { + Template.fromStack(stack).hasResourceProperties('AWS::Lambda::Function', { Layers: [ 'arn:of:layer', - { Ref: 'KubectlLayer600207B5' }, + { Ref: 'awscdkawseksKubectlProviderKubectlLayerA7F2FE55' }, ], }); }); @@ -2870,42 +2839,6 @@ describe('cluster', () => { }); }); - test('custom memory size for kubectl provider', () => { - // GIVEN - const { stack, vpc, app } = testFixture(); - - // WHEN - new eks.Cluster(stack, 'Cluster', { - vpc, - version: CLUSTER_VERSION, - kubectlMemory: cdk.Size.gibibytes(2), - }); - - // THEN - const casm = app.synth(); - const providerNestedStackTemplate = JSON.parse(fs.readFileSync(path.join(casm.directory, 'StackawscdkawseksKubectlProvider7346F799.nested.template.json'), 'utf-8')); - expect(providerNestedStackTemplate?.Resources?.Handler886CB40B?.Properties?.MemorySize).toEqual(2048); - }); - - test('custom memory size for imported clusters', () => { - // GIVEN - const { stack, app } = testFixture(); - - // WHEN - const cluster = eks.Cluster.fromClusterAttributes(stack, 'Imported', { - clusterName: 'my-cluster', - kubectlRoleArn: 'arn:aws:iam::123456789012:role/MyRole', - kubectlMemory: cdk.Size.gibibytes(4), - }); - - cluster.addManifest('foo', { bar: 123 }); - - // THEN - const casm = app.synth(); - const providerNestedStackTemplate = JSON.parse(fs.readFileSync(path.join(casm.directory, 'StackStackImported1CBA9C50KubectlProviderAA00BA49.nested.template.json'), 'utf-8')); - expect(providerNestedStackTemplate?.Resources?.Handler886CB40B?.Properties?.MemorySize).toEqual(4096); - }); - test('create a cluster using custom kubernetes network config', () => { // GIVEN const { stack } = testFixture(); diff --git a/packages/@aws-cdk/aws-eks-v2-alpha/test/k8s-object-value.test.ts b/packages/@aws-cdk/aws-eks-v2-alpha/test/k8s-object-value.test.ts index e82267161c35f..af23712d33d1c 100644 --- a/packages/@aws-cdk/aws-eks-v2-alpha/test/k8s-object-value.test.ts +++ b/packages/@aws-cdk/aws-eks-v2-alpha/test/k8s-object-value.test.ts @@ -29,8 +29,8 @@ describe('k8s object value', () => { Properties: { ServiceToken: { 'Fn::GetAtt': [ - 'awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B', - 'Outputs.awscdkawseksKubectlProviderframeworkonEvent0A650005Arn', + 'awscdkawseksKubectlProviderframeworkonEvent0A650005', + 'Arn', ], }, ClusterName: { Ref: 'MyCluster4C1BA579' }, @@ -70,8 +70,8 @@ describe('k8s object value', () => { Properties: { ServiceToken: { 'Fn::GetAtt': [ - 'awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B', - 'Outputs.awscdkawseksKubectlProviderframeworkonEvent0A650005Arn', + 'awscdkawseksKubectlProviderframeworkonEvent0A650005', + 'Arn', ], }, ClusterName: { Ref: 'MyCluster4C1BA579' }, diff --git a/packages/@aws-cdk/aws-eks-v2-alpha/test/k8s-patch.test.ts b/packages/@aws-cdk/aws-eks-v2-alpha/test/k8s-patch.test.ts index 32e2acbfd13a9..c76e5dcfdd9ee 100644 --- a/packages/@aws-cdk/aws-eks-v2-alpha/test/k8s-patch.test.ts +++ b/packages/@aws-cdk/aws-eks-v2-alpha/test/k8s-patch.test.ts @@ -23,8 +23,8 @@ describe('k8s patch', () => { Template.fromStack(stack).hasResourceProperties('Custom::AWSCDK-EKS-KubernetesPatch', { ServiceToken: { 'Fn::GetAtt': [ - 'awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B', - 'Outputs.awscdkawseksKubectlProviderframeworkonEvent0A650005Arn', + 'awscdkawseksKubectlProviderframeworkonEvent0A650005', + 'Arn', ], }, ResourceName: 'myResourceName', diff --git a/packages/@aws-cdk/aws-eks-v2-alpha/test/service-account.test.ts b/packages/@aws-cdk/aws-eks-v2-alpha/test/service-account.test.ts index e2f4a79dcc24b..3ddbdabd9ea12 100644 --- a/packages/@aws-cdk/aws-eks-v2-alpha/test/service-account.test.ts +++ b/packages/@aws-cdk/aws-eks-v2-alpha/test/service-account.test.ts @@ -18,8 +18,8 @@ describe('service account', () => { Template.fromStack(stack).hasResourceProperties(eks.KubernetesManifest.RESOURCE_TYPE, { ServiceToken: { 'Fn::GetAtt': [ - 'awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B', - 'Outputs.StackawscdkawseksKubectlProviderframeworkonEvent8897FD9BArn', + 'awscdkawseksKubectlProviderframeworkonEvent0A650005', + 'Arn', ], }, Manifest: { @@ -83,8 +83,8 @@ describe('service account', () => { Template.fromStack(stack).hasResourceProperties(eks.KubernetesManifest.RESOURCE_TYPE, { ServiceToken: { 'Fn::GetAtt': [ - 'awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B', - 'Outputs.StackawscdkawseksKubectlProviderframeworkonEvent8897FD9BArn', + 'awscdkawseksKubectlProviderframeworkonEvent0A650005', + 'Arn', ], }, Manifest: { @@ -141,8 +141,8 @@ describe('service account', () => { Template.fromStack(stack).hasResourceProperties(eks.KubernetesManifest.RESOURCE_TYPE, { ServiceToken: { 'Fn::GetAtt': [ - 'awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B', - 'Outputs.StackawscdkawseksKubectlProviderframeworkonEvent8897FD9BArn', + 'awscdkawseksKubectlProviderframeworkonEvent0A650005', + 'Arn', ], }, Manifest: { @@ -190,8 +190,8 @@ describe('service account', () => { Template.fromStack(stack).hasResourceProperties(eks.KubernetesManifest.RESOURCE_TYPE, { ServiceToken: { 'Fn::GetAtt': [ - 'StackClusterF0EB02FAKubectlProviderNestedStackStackClusterF0EB02FAKubectlProviderNestedStackResource739D12C4', - 'Outputs.StackStackClusterF0EB02FAKubectlProviderframeworkonEvent8377F076Arn', + 'StackClusterF0EB02FAKubectlProviderframeworkonEvent0A3AB271', + 'Arn', ], }, PruneLabel: 'aws.cdk.eks/prune-c8d8e1722a4f3ed332f8ac74cb3d962f01fbb62291', From f2ade565bc393b14a0e8ce9a7d8bbb7d42607cd1 Mon Sep 17 00:00:00 2001 From: Leonardo Gama <51037424+Leo10Gama@users.noreply.github.com> Date: Wed, 8 Jan 2025 17:09:57 -0800 Subject: [PATCH 4/5] chore(example-library): update example resource (#32802) ### Issue # (if applicable) N/A ### Reason for this change The `example-resource.ts` library is slightly out of date with how CDK is structured today. These changes aim to align the file with what we do today. ### Description of changes Altered the core import, as we do not (AFAIK) follow this convention any more: ```ts import * as core from 'aws-cdk-lib/core'; // before import { ... } from 'aws-cdk-lib/core'; // after ``` In addition, slightly changed around some comment phrasing. ### Describe any new or updated permissions being added N/A ### Description of how you validated changes Semantic changes; tests still continue to pass. ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- .../lib/example-resource.ts | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/@aws-cdk/example-construct-library/lib/example-resource.ts b/packages/@aws-cdk/example-construct-library/lib/example-resource.ts index 8308bb0a340f5..9715ef09581e9 100644 --- a/packages/@aws-cdk/example-construct-library/lib/example-resource.ts +++ b/packages/@aws-cdk/example-construct-library/lib/example-resource.ts @@ -11,9 +11,9 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as events from 'aws-cdk-lib/aws-events'; import * as iam from 'aws-cdk-lib/aws-iam'; import * as s3 from 'aws-cdk-lib/aws-s3'; -import * as core from 'aws-cdk-lib/core'; import { Construct } from 'constructs'; -// for files that are part of this package, we do import individual classes or functions +// for files that are part of this package or part of core, we do import individual classes or functions +import { CfnWaitCondition, CfnWaitConditionHandle, Fn, IResource, RemovalPolicy, Resource, Stack, Token } from 'aws-cdk-lib/core'; import { exampleResourceArnComponents } from './private/example-resource-common'; /** @@ -58,7 +58,7 @@ import { exampleResourceArnComponents } from './private/example-resource-common' */ export interface IExampleResource extends // all L2 interfaces need to extend IResource - core.IResource, + IResource, // Only for resources that have an associated IAM Role. // Allows this resource to be the target in calls like bucket.grantRead(exampleResource). @@ -149,7 +149,7 @@ export interface IExampleResource extends * * Notice that the class is not exported - it's not part of the public API of this module! */ -abstract class ExampleResourceBase extends core.Resource implements IExampleResource { +abstract class ExampleResourceBase extends Resource implements IExampleResource { // these stay abstract at this level public abstract readonly exampleResourceArn: string; public abstract readonly exampleResourceName: string; @@ -319,7 +319,7 @@ export interface ExampleResourceProps { * * @default RemovalPolicy.RETAIN */ - readonly removalPolicy?: core.RemovalPolicy; + readonly removalPolicy?: RemovalPolicy; } /** @@ -364,7 +364,7 @@ export class ExampleResource extends ExampleResourceBase { // using the Stack.formatArn helper method from the core library. // We have to know the ARN components of ExampleResource in a few places, so, // to avoid duplication, extract that into a module-private function - public readonly exampleResourceArn = core.Stack.of(scope) + public readonly exampleResourceArn = Stack.of(scope) .formatArn(exampleResourceArnComponents(exampleResourceName)); } @@ -382,8 +382,8 @@ export class ExampleResource extends ExampleResourceBase { /** * The constructor of a construct has always 3 arguments: - * the parent Construct, the string identifier, - * locally unique within the scope of the parent, + * the parent Construct, the string identifier + * (locally unique within the scope of the parent), * and a properties struct. * * If the props only have optional properties, like in our case, @@ -412,7 +412,7 @@ export class ExampleResource extends ExampleResourceBase { // so, we need to use the Token.isUnresolved() method from the core library // to skip validation in that case. if (props.waitConditionHandleName !== undefined && - !core.Token.isUnresolved(props.waitConditionHandleName) && + !Token.isUnresolved(props.waitConditionHandleName) && !/^[_a-zA-Z]+$/.test(props.waitConditionHandleName)) { throw new Error('waitConditionHandleName must be non-empty and contain only letters and underscores, ' + `got: '${props.waitConditionHandleName}'`); @@ -435,12 +435,12 @@ export class ExampleResource extends ExampleResourceBase { // This guarantees that they get scoped correctly, // and the CDK will make sure their locally-unique identifiers // are globally unique, which makes your L2 compose. - const waitConditionHandle = new core.CfnWaitConditionHandle(this, 'WaitConditionHandle'); + const waitConditionHandle = new CfnWaitConditionHandle(this, 'WaitConditionHandle'); // The 'main' L1 you create should always have the logical ID 'Resource'. // This is important, so that the ConstructNode.defaultChild method works correctly. // The local variable representing the L1 is often called 'resource' as well. - const resource = new core.CfnWaitCondition(this, 'Resource', { + const resource = new CfnWaitCondition(this, 'Resource', { count: 0, handle: waitConditionHandle.ref, timeout: '10', @@ -460,7 +460,7 @@ export class ExampleResource extends ExampleResourceBase { // and the ARN for your resource is of the form 'arn:aws::::resource/physical-name', // which is quite common, // you can use Fn::Select and Fn::Split to take out the part after the '/' from the ARN: - core.Fn.select(1, core.Fn.split('/', resource.ref)), + Fn.select(1, Fn.split('/', resource.ref)), ); this.exampleResourceArn = this.getResourceArnAttribute( // A lot of the L1 classes have an 'attrArn' property - @@ -469,7 +469,7 @@ export class ExampleResource extends ExampleResourceBase { // you can often formulate the ARN yourself, // using the Stack.formatArn helper function. // Here, we assume resource.ref returns the physical name of the resource. - core.Stack.of(this).formatArn(exampleResourceArnComponents(resource.ref)), + Stack.of(this).formatArn(exampleResourceArnComponents(resource.ref)), // always use the protected physicalName property for this second argument exampleResourceArnComponents(this.physicalName)); @@ -505,7 +505,7 @@ export class ExampleResource extends ExampleResourceBase { // this is how you apply the removal policy resource.applyRemovalPolicy(props.removalPolicy, { // this is the default to apply if props.removalPolicy is undefined - default: core.RemovalPolicy.RETAIN, + default: RemovalPolicy.RETAIN, }); } } From bb59b5a40582e0d23bf8e0c20de4ef1bf17eb352 Mon Sep 17 00:00:00 2001 From: Mohamed Elasmar <71043312+moelasmar@users.noreply.github.com> Date: Thu, 9 Jan 2025 03:57:09 -0800 Subject: [PATCH 5/5] chore(tools): update lambda runtime tests github action (#32788) The GH Action workflow was missing the required permission to update the PR to automatically update the integ test cases ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- .github/workflows/lambda-runtime-tests.yml | 6 +- ...efaultTestDeployAssertD40B5C28.assets.json | 12 +- ...aultTestDeployAssertD40B5C28.template.json | 145 +----- .../index.js | 1 - ...cdk-integ-lambda-nodejs-latest.assets.json | 6 +- ...k-integ-lambda-nodejs-latest.template.json | 103 +--- .../cdk.out | 2 +- .../integ.json | 2 +- .../manifest.json | 170 ++++--- .../tree.json | 328 +++---------- .../test/integ.nodejs.build.images.ts | 6 +- .../index.js | 85 ++-- ...-lambda-golang-provided-al2023.assets.json | 6 +- ...ambda-golang-provided-al2023.template.json | 28 +- .../cdk.out | 2 +- .../integ.json | 2 +- ...efaultTestDeployAssert366012A1.assets.json | 12 +- ...aultTestDeployAssert366012A1.template.json | 34 +- .../manifest.json | 90 ++-- .../tree.json | 96 ++-- .../test/integ.function.provided.runtimes.ts | 6 +- .../index.js | 85 ++-- .../cdk.out | 2 +- ...ambda-python-test-build-images.assets.json | 49 +- ...bda-python-test-build-images.template.json | 141 ++---- .../integ.json | 2 +- ...efaultTestDeployAssertB7623923.assets.json | 12 +- ...aultTestDeployAssertB7623923.template.json | 177 ++----- .../manifest.json | 236 ++++++---- .../tree.json | 440 +++++------------- .../test/integ.python.build.images.ts | 8 +- 31 files changed, 861 insertions(+), 1433 deletions(-) rename packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/{asset.14d52bdadae57c6ec2c7b715c5420ae5c3001a8252558f7219f6207e4f405a97.bundle => asset.bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.bundle}/index.js (99%) rename packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/{asset.b98abee59e034ed29eeb601684dc34752baa86509a7d457d72305d4e19ecc80b.bundle => asset.bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.bundle}/index.js (99%) rename packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/{asset.b98abee59e034ed29eeb601684dc34752baa86509a7d457d72305d4e19ecc80b.bundle => asset.bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.bundle}/index.js (99%) diff --git a/.github/workflows/lambda-runtime-tests.yml b/.github/workflows/lambda-runtime-tests.yml index b4afacdef12f7..6914e76f08cff 100644 --- a/.github/workflows/lambda-runtime-tests.yml +++ b/.github/workflows/lambda-runtime-tests.yml @@ -8,6 +8,8 @@ jobs: update-lambda-tests: if: github.repository == 'aws/aws-cdk' runs-on: ubuntu-latest + permissions: + contents: write steps: - uses: actions/checkout@v4 with: @@ -44,4 +46,6 @@ jobs: git config --global user.email 'aws-cdk-automation@users.noreply.github.com' git add . git commit -m "chore: update lambda runtime integration tests" - git push origin ${{ github.event.pull_request.head.ref }} \ No newline at end of file + git push origin ${{ github.event.pull_request.head.ref }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/LambdaNodeJsLatestIntegDefaultTestDeployAssertD40B5C28.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/LambdaNodeJsLatestIntegDefaultTestDeployAssertD40B5C28.assets.json index cdb72a8ca209b..7af6c1aca67ba 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/LambdaNodeJsLatestIntegDefaultTestDeployAssertD40B5C28.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/LambdaNodeJsLatestIntegDefaultTestDeployAssertD40B5C28.assets.json @@ -1,20 +1,20 @@ { - "version": "38.0.1", + "version": "39.0.0", "files": { - "14d52bdadae57c6ec2c7b715c5420ae5c3001a8252558f7219f6207e4f405a97": { + "bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981": { "source": { - "path": "asset.14d52bdadae57c6ec2c7b715c5420ae5c3001a8252558f7219f6207e4f405a97.bundle", + "path": "asset.bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.bundle", "packaging": "zip" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "14d52bdadae57c6ec2c7b715c5420ae5c3001a8252558f7219f6207e4f405a97.zip", + "objectKey": "bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "a8fae5feb4da6bd9bf0e9597ed8af7943191e43bac68591782214d4eecdaa6c2": { + "406b08db0a8c94d3b8953b7cca80917d4f7d4f48f23fc990126340d7d3b585b4": { "source": { "path": "LambdaNodeJsLatestIntegDefaultTestDeployAssertD40B5C28.template.json", "packaging": "file" @@ -22,7 +22,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "a8fae5feb4da6bd9bf0e9597ed8af7943191e43bac68591782214d4eecdaa6c2.json", + "objectKey": "406b08db0a8c94d3b8953b7cca80917d4f7d4f48f23fc990126340d7d3b585b4.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/LambdaNodeJsLatestIntegDefaultTestDeployAssertD40B5C28.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/LambdaNodeJsLatestIntegDefaultTestDeployAssertD40B5C28.template.json index 2ddf445f88a6e..93b2d9d2d9ee9 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/LambdaNodeJsLatestIntegDefaultTestDeployAssertD40B5C28.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/LambdaNodeJsLatestIntegDefaultTestDeployAssertD40B5C28.template.json @@ -1,6 +1,6 @@ { "Resources": { - "LambdaInvoke6eb068149a1c4cf460ad6e8d302d9779": { + "LambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786": { "Type": "Custom::DeployAssert@SdkCallLambdainvoke", "Properties": { "ServiceToken": { @@ -19,7 +19,7 @@ [ "\"", { - "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs18x0F8243A883990873F" + "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs18x8E61B45C0D1332CA" }, "\"" ] @@ -27,17 +27,17 @@ } }, "flattenResponse": "false", - "salt": "1732911897880" + "salt": "1736381079246" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "LambdaInvoke6eb068149a1c4cf460ad6e8d302d9779InvokeACFD02A8": { + "LambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786Invoke0196D5F9": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", "FunctionName": { - "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs18x0F8243A883990873F" + "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs18x8E61B45C0D1332CA" }, "Principal": { "Fn::GetAtt": [ @@ -106,7 +106,7 @@ }, ":function:", { - "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs18x0F8243A883990873F" + "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs18x8E61B45C0D1332CA" } ] ] @@ -146,7 +146,7 @@ }, ":function:", { - "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs20x133AD5CB790AA33D0" + "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs20x20EDE4EE45E884C9" } ] ] @@ -186,47 +186,7 @@ }, ":function:", { - "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs18x2566B78741C5F85C9" - } - ] - ] - } - ] - }, - { - "Action": [ - "lambda:Invoke" - ], - "Effect": "Allow", - "Resource": [ - "*" - ] - }, - { - "Action": [ - "lambda:InvokeFunction" - ], - "Effect": "Allow", - "Resource": [ - { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":lambda:", - { - "Ref": "AWS::Region" - }, - ":", - { - "Ref": "AWS::AccountId" - }, - ":function:", - { - "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs22x3C06C9D2E5FED86BD" + "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs22xAA4F54D576AB7928" } ] ] @@ -255,7 +215,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "14d52bdadae57c6ec2c7b715c5420ae5c3001a8252558f7219f6207e4f405a97.zip" + "S3Key": "bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.zip" }, "Timeout": 120, "Handler": "index.handler", @@ -267,7 +227,7 @@ } } }, - "LambdaInvokec29f0f68556d046db3755c7cbfbe7e19": { + "LambdaInvokedd13d1be8acd5c33cf49dd164c4d4607": { "Type": "Custom::DeployAssert@SdkCallLambdainvoke", "Properties": { "ServiceToken": { @@ -286,7 +246,7 @@ [ "\"", { - "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs20x133AD5CB790AA33D0" + "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs20x20EDE4EE45E884C9" }, "\"" ] @@ -294,17 +254,17 @@ } }, "flattenResponse": "false", - "salt": "1732911897883" + "salt": "1736381079248" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "LambdaInvokec29f0f68556d046db3755c7cbfbe7e19Invoke2D8CBC7D": { + "LambdaInvokedd13d1be8acd5c33cf49dd164c4d4607Invoke0DDAB5A0": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", "FunctionName": { - "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs20x133AD5CB790AA33D0" + "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs20x20EDE4EE45E884C9" }, "Principal": { "Fn::GetAtt": [ @@ -314,7 +274,7 @@ } } }, - "LambdaInvokea874c7c1c2bb0bdf9469eb5260003abf": { + "LambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1dec": { "Type": "Custom::DeployAssert@SdkCallLambdainvoke", "Properties": { "ServiceToken": { @@ -333,7 +293,7 @@ [ "\"", { - "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs18x2566B78741C5F85C9" + "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs22xAA4F54D576AB7928" }, "\"" ] @@ -341,64 +301,17 @@ } }, "flattenResponse": "false", - "salt": "1732911897885" + "salt": "1736381079249" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "LambdaInvokea874c7c1c2bb0bdf9469eb5260003abfInvoke07459D4C": { + "LambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1decInvokeE046A313": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", "FunctionName": { - "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs18x2566B78741C5F85C9" - }, - "Principal": { - "Fn::GetAtt": [ - "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73", - "Arn" - ] - } - } - }, - "LambdaInvokec6dea6fa9264d7676abde417ce6fbf04": { - "Type": "Custom::DeployAssert@SdkCallLambdainvoke", - "Properties": { - "ServiceToken": { - "Fn::GetAtt": [ - "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F", - "Arn" - ] - }, - "service": "Lambda", - "api": "invoke", - "expected": "{\"$ObjectLike\":{\"StatusCode\":200,\"ExecutedVersion\":\"$LATEST\"}}", - "parameters": { - "FunctionName": { - "Fn::Join": [ - "", - [ - "\"", - { - "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs22x3C06C9D2E5FED86BD" - }, - "\"" - ] - ] - } - }, - "flattenResponse": "false", - "salt": "1732911897888" - }, - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete" - }, - "LambdaInvokec6dea6fa9264d7676abde417ce6fbf04InvokeE894AC2C": { - "Type": "AWS::Lambda::Permission", - "Properties": { - "Action": "lambda:InvokeFunction", - "FunctionName": { - "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs22x3C06C9D2E5FED86BD" + "Fn::ImportValue": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs22xAA4F54D576AB7928" }, "Principal": { "Fn::GetAtt": [ @@ -410,34 +323,26 @@ } }, "Outputs": { - "AssertionResultsLambdaInvoke6eb068149a1c4cf460ad6e8d302d9779": { - "Value": { - "Fn::GetAtt": [ - "LambdaInvoke6eb068149a1c4cf460ad6e8d302d9779", - "assertion" - ] - } - }, - "AssertionResultsLambdaInvokec29f0f68556d046db3755c7cbfbe7e19": { + "AssertionResultsLambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786": { "Value": { "Fn::GetAtt": [ - "LambdaInvokec29f0f68556d046db3755c7cbfbe7e19", + "LambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786", "assertion" ] } }, - "AssertionResultsLambdaInvokea874c7c1c2bb0bdf9469eb5260003abf": { + "AssertionResultsLambdaInvokedd13d1be8acd5c33cf49dd164c4d4607": { "Value": { "Fn::GetAtt": [ - "LambdaInvokea874c7c1c2bb0bdf9469eb5260003abf", + "LambdaInvokedd13d1be8acd5c33cf49dd164c4d4607", "assertion" ] } }, - "AssertionResultsLambdaInvokec6dea6fa9264d7676abde417ce6fbf04": { + "AssertionResultsLambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1dec": { "Value": { "Fn::GetAtt": [ - "LambdaInvokec6dea6fa9264d7676abde417ce6fbf04", + "LambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1dec", "assertion" ] } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/asset.14d52bdadae57c6ec2c7b715c5420ae5c3001a8252558f7219f6207e4f405a97.bundle/index.js b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/asset.bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.bundle/index.js similarity index 99% rename from packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/asset.14d52bdadae57c6ec2c7b715c5420ae5c3001a8252558f7219f6207e4f405a97.bundle/index.js rename to packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/asset.bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.bundle/index.js index 16f64848011a2..60e59701bc0e1 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/asset.14d52bdadae57c6ec2c7b715c5420ae5c3001a8252558f7219f6207e4f405a97.bundle/index.js +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/asset.bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.bundle/index.js @@ -152,7 +152,6 @@ var init_matcher = __esm({ */ toHumanStrings() { const failures = new Array(); - debugger; recurse(this, []); return failures.map((r) => { const loc = r.path.length === 0 ? "" : ` at /${r.path.join("/")}`; diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/cdk-integ-lambda-nodejs-latest.assets.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/cdk-integ-lambda-nodejs-latest.assets.json index 5f1f270384eb0..c32e03b2e698e 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/cdk-integ-lambda-nodejs-latest.assets.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/cdk-integ-lambda-nodejs-latest.assets.json @@ -1,5 +1,5 @@ { - "version": "38.0.1", + "version": "39.0.0", "files": { "c2ab4a8654a5392d58fe69a7991514d5af7a4538d8dce56aa9fa7047dd354e89": { "source": { @@ -14,7 +14,7 @@ } } }, - "aba2e7081fd7768d494b8d7cccdf3ff455105faff5992c2a0266e1dda44c9ee4": { + "477ce67601e6e951d890733213d534b4ba281d2486796a51455a573cd5f0ad62": { "source": { "path": "cdk-integ-lambda-nodejs-latest.template.json", "packaging": "file" @@ -22,7 +22,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "aba2e7081fd7768d494b8d7cccdf3ff455105faff5992c2a0266e1dda44c9ee4.json", + "objectKey": "477ce67601e6e951d890733213d534b4ba281d2486796a51455a573cd5f0ad62.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/cdk-integ-lambda-nodejs-latest.template.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/cdk-integ-lambda-nodejs-latest.template.json index e658b74f65aa5..74edea0fa0328 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/cdk-integ-lambda-nodejs-latest.template.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/cdk-integ-lambda-nodejs-latest.template.json @@ -1,6 +1,6 @@ { "Resources": { - "funcnodejs18x0ServiceRole9E76897D": { + "funcnodejs18xServiceRoleAEA986D3": { "Type": "AWS::IAM::Role", "Properties": { "AssumeRolePolicyDocument": { @@ -31,7 +31,7 @@ ] } }, - "funcnodejs18x0F8243A88": { + "funcnodejs18x8E61B45C": { "Type": "AWS::Lambda::Function", "Properties": { "Code": { @@ -43,17 +43,17 @@ "Handler": "index.handler", "Role": { "Fn::GetAtt": [ - "funcnodejs18x0ServiceRole9E76897D", + "funcnodejs18xServiceRoleAEA986D3", "Arn" ] }, "Runtime": "nodejs18.x" }, "DependsOn": [ - "funcnodejs18x0ServiceRole9E76897D" + "funcnodejs18xServiceRoleAEA986D3" ] }, - "funcnodejs20x1ServiceRole9F252C30": { + "funcnodejs20xServiceRoleD34C713B": { "Type": "AWS::IAM::Role", "Properties": { "AssumeRolePolicyDocument": { @@ -84,7 +84,7 @@ ] } }, - "funcnodejs20x133AD5CB7": { + "funcnodejs20x20EDE4EE": { "Type": "AWS::Lambda::Function", "Properties": { "Code": { @@ -96,17 +96,17 @@ "Handler": "index.handler", "Role": { "Fn::GetAtt": [ - "funcnodejs20x1ServiceRole9F252C30", + "funcnodejs20xServiceRoleD34C713B", "Arn" ] }, "Runtime": "nodejs20.x" }, "DependsOn": [ - "funcnodejs20x1ServiceRole9F252C30" + "funcnodejs20xServiceRoleD34C713B" ] }, - "funcnodejs18x2ServiceRoleF0EC8A13": { + "funcnodejs22xServiceRole4249784B": { "Type": "AWS::IAM::Role", "Properties": { "AssumeRolePolicyDocument": { @@ -137,7 +137,7 @@ ] } }, - "funcnodejs18x2566B7874": { + "funcnodejs22xAA4F54D5": { "Type": "AWS::Lambda::Function", "Properties": { "Code": { @@ -149,101 +149,40 @@ "Handler": "index.handler", "Role": { "Fn::GetAtt": [ - "funcnodejs18x2ServiceRoleF0EC8A13", - "Arn" - ] - }, - "Runtime": "nodejs18.x" - }, - "DependsOn": [ - "funcnodejs18x2ServiceRoleF0EC8A13" - ] - }, - "funcnodejs22x3ServiceRole326FAF7D": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "lambda.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - }, - "ManagedPolicyArns": [ - { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" - ] - ] - } - ] - } - }, - "funcnodejs22x3C06C9D2E": { - "Type": "AWS::Lambda::Function", - "Properties": { - "Code": { - "S3Bucket": { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "S3Key": "c2ab4a8654a5392d58fe69a7991514d5af7a4538d8dce56aa9fa7047dd354e89.zip" - }, - "Handler": "index.handler", - "Role": { - "Fn::GetAtt": [ - "funcnodejs22x3ServiceRole326FAF7D", + "funcnodejs22xServiceRole4249784B", "Arn" ] }, "Runtime": "nodejs22.x" }, "DependsOn": [ - "funcnodejs22x3ServiceRole326FAF7D" + "funcnodejs22xServiceRole4249784B" ] } }, "Outputs": { - "ExportsOutputReffuncnodejs18x0F8243A883990873F": { - "Value": { - "Ref": "funcnodejs18x0F8243A88" - }, - "Export": { - "Name": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs18x0F8243A883990873F" - } - }, - "ExportsOutputReffuncnodejs20x133AD5CB790AA33D0": { + "ExportsOutputReffuncnodejs18x8E61B45C0D1332CA": { "Value": { - "Ref": "funcnodejs20x133AD5CB7" + "Ref": "funcnodejs18x8E61B45C" }, "Export": { - "Name": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs20x133AD5CB790AA33D0" + "Name": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs18x8E61B45C0D1332CA" } }, - "ExportsOutputReffuncnodejs18x2566B78741C5F85C9": { + "ExportsOutputReffuncnodejs20x20EDE4EE45E884C9": { "Value": { - "Ref": "funcnodejs18x2566B7874" + "Ref": "funcnodejs20x20EDE4EE" }, "Export": { - "Name": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs18x2566B78741C5F85C9" + "Name": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs20x20EDE4EE45E884C9" } }, - "ExportsOutputReffuncnodejs22x3C06C9D2E5FED86BD": { + "ExportsOutputReffuncnodejs22xAA4F54D576AB7928": { "Value": { - "Ref": "funcnodejs22x3C06C9D2E" + "Ref": "funcnodejs22xAA4F54D5" }, "Export": { - "Name": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs22x3C06C9D2E5FED86BD" + "Name": "cdk-integ-lambda-nodejs-latest:ExportsOutputReffuncnodejs22xAA4F54D576AB7928" } } }, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/cdk.out b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/cdk.out index c6e612584e352..91e1a8b9901d5 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/cdk.out +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"38.0.1"} \ No newline at end of file +{"version":"39.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/integ.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/integ.json index 90cfa3696e175..c19418eded0d3 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/integ.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "38.0.1", + "version": "39.0.0", "testCases": { "LambdaNodeJsLatestInteg/DefaultTest": { "stacks": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/manifest.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/manifest.json index cd0c336fdb994..db039f1a9e636 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/manifest.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "38.0.1", + "version": "39.0.0", "artifacts": { "cdk-integ-lambda-nodejs-latest.assets": { "type": "cdk:asset-manifest", @@ -18,7 +18,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/aba2e7081fd7768d494b8d7cccdf3ff455105faff5992c2a0266e1dda44c9ee4.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/477ce67601e6e951d890733213d534b4ba281d2486796a51455a573cd5f0ad62.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -34,88 +34,142 @@ "cdk-integ-lambda-nodejs-latest.assets" ], "metadata": { - "/cdk-integ-lambda-nodejs-latest/func-nodejs18.x-0/ServiceRole/Resource": [ + "/cdk-integ-lambda-nodejs-latest/func-nodejs18.x/ServiceRole/Resource": [ { "type": "aws:cdk:logicalId", - "data": "funcnodejs18x0ServiceRole9E76897D" + "data": "funcnodejs18xServiceRoleAEA986D3" } ], - "/cdk-integ-lambda-nodejs-latest/func-nodejs18.x-0/Resource": [ + "/cdk-integ-lambda-nodejs-latest/func-nodejs18.x/Resource": [ { "type": "aws:cdk:logicalId", - "data": "funcnodejs18x0F8243A88" + "data": "funcnodejs18x8E61B45C" } ], - "/cdk-integ-lambda-nodejs-latest/func-nodejs20.x-1/ServiceRole/Resource": [ + "/cdk-integ-lambda-nodejs-latest/func-nodejs20.x/ServiceRole/Resource": [ { "type": "aws:cdk:logicalId", - "data": "funcnodejs20x1ServiceRole9F252C30" + "data": "funcnodejs20xServiceRoleD34C713B" } ], - "/cdk-integ-lambda-nodejs-latest/func-nodejs20.x-1/Resource": [ + "/cdk-integ-lambda-nodejs-latest/func-nodejs20.x/Resource": [ { "type": "aws:cdk:logicalId", - "data": "funcnodejs20x133AD5CB7" + "data": "funcnodejs20x20EDE4EE" } ], - "/cdk-integ-lambda-nodejs-latest/func-nodejs18.x-2/ServiceRole/Resource": [ + "/cdk-integ-lambda-nodejs-latest/func-nodejs22.x/ServiceRole/Resource": [ { "type": "aws:cdk:logicalId", - "data": "funcnodejs18x2ServiceRoleF0EC8A13" + "data": "funcnodejs22xServiceRole4249784B" } ], - "/cdk-integ-lambda-nodejs-latest/func-nodejs18.x-2/Resource": [ + "/cdk-integ-lambda-nodejs-latest/func-nodejs22.x/Resource": [ { "type": "aws:cdk:logicalId", - "data": "funcnodejs18x2566B7874" + "data": "funcnodejs22xAA4F54D5" } ], - "/cdk-integ-lambda-nodejs-latest/func-nodejs22.x-3/ServiceRole/Resource": [ + "/cdk-integ-lambda-nodejs-latest/Exports/Output{\"Ref\":\"funcnodejs18x8E61B45C\"}": [ { "type": "aws:cdk:logicalId", - "data": "funcnodejs22x3ServiceRole326FAF7D" + "data": "ExportsOutputReffuncnodejs18x8E61B45C0D1332CA" } ], - "/cdk-integ-lambda-nodejs-latest/func-nodejs22.x-3/Resource": [ + "/cdk-integ-lambda-nodejs-latest/Exports/Output{\"Ref\":\"funcnodejs20x20EDE4EE\"}": [ { "type": "aws:cdk:logicalId", - "data": "funcnodejs22x3C06C9D2E" + "data": "ExportsOutputReffuncnodejs20x20EDE4EE45E884C9" } ], - "/cdk-integ-lambda-nodejs-latest/Exports/Output{\"Ref\":\"funcnodejs18x0F8243A88\"}": [ + "/cdk-integ-lambda-nodejs-latest/Exports/Output{\"Ref\":\"funcnodejs22xAA4F54D5\"}": [ { "type": "aws:cdk:logicalId", - "data": "ExportsOutputReffuncnodejs18x0F8243A883990873F" + "data": "ExportsOutputReffuncnodejs22xAA4F54D576AB7928" } ], - "/cdk-integ-lambda-nodejs-latest/Exports/Output{\"Ref\":\"funcnodejs20x133AD5CB7\"}": [ + "/cdk-integ-lambda-nodejs-latest/BootstrapVersion": [ { "type": "aws:cdk:logicalId", - "data": "ExportsOutputReffuncnodejs20x133AD5CB790AA33D0" + "data": "BootstrapVersion" } ], - "/cdk-integ-lambda-nodejs-latest/Exports/Output{\"Ref\":\"funcnodejs18x2566B7874\"}": [ + "/cdk-integ-lambda-nodejs-latest/CheckBootstrapVersion": [ { "type": "aws:cdk:logicalId", - "data": "ExportsOutputReffuncnodejs18x2566B78741C5F85C9" + "data": "CheckBootstrapVersion" } ], - "/cdk-integ-lambda-nodejs-latest/Exports/Output{\"Ref\":\"funcnodejs22x3C06C9D2E\"}": [ + "funcnodejs18x0ServiceRole9E76897D": [ { "type": "aws:cdk:logicalId", - "data": "ExportsOutputReffuncnodejs22x3C06C9D2E5FED86BD" + "data": "funcnodejs18x0ServiceRole9E76897D", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] } ], - "/cdk-integ-lambda-nodejs-latest/BootstrapVersion": [ + "funcnodejs18x0F8243A88": [ { "type": "aws:cdk:logicalId", - "data": "BootstrapVersion" + "data": "funcnodejs18x0F8243A88", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] } ], - "/cdk-integ-lambda-nodejs-latest/CheckBootstrapVersion": [ + "funcnodejs20x1ServiceRole9F252C30": [ { "type": "aws:cdk:logicalId", - "data": "CheckBootstrapVersion" + "data": "funcnodejs20x1ServiceRole9F252C30", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "funcnodejs20x133AD5CB7": [ + { + "type": "aws:cdk:logicalId", + "data": "funcnodejs20x133AD5CB7", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "funcnodejs18x2ServiceRoleF0EC8A13": [ + { + "type": "aws:cdk:logicalId", + "data": "funcnodejs18x2ServiceRoleF0EC8A13", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "funcnodejs18x2566B7874": [ + { + "type": "aws:cdk:logicalId", + "data": "funcnodejs18x2566B7874", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "funcnodejs22x3ServiceRole326FAF7D": [ + { + "type": "aws:cdk:logicalId", + "data": "funcnodejs22x3ServiceRole326FAF7D", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "funcnodejs22x3C06C9D2E": [ + { + "type": "aws:cdk:logicalId", + "data": "funcnodejs22x3C06C9D2E", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] } ] }, @@ -138,7 +192,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a8fae5feb4da6bd9bf0e9597ed8af7943191e43bac68591782214d4eecdaa6c2.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/406b08db0a8c94d3b8953b7cca80917d4f7d4f48f23fc990126340d7d3b585b4.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -155,22 +209,22 @@ "LambdaNodeJsLatestIntegDefaultTestDeployAssertD40B5C28.assets" ], "metadata": { - "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke6eb068149a1c4cf460ad6e8d302d9779/Default/Default": [ + "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786/Default/Default": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvoke6eb068149a1c4cf460ad6e8d302d9779" + "data": "LambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786" } ], - "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke6eb068149a1c4cf460ad6e8d302d9779/Invoke": [ + "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786/Invoke": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvoke6eb068149a1c4cf460ad6e8d302d9779InvokeACFD02A8" + "data": "LambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786Invoke0196D5F9" } ], - "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke6eb068149a1c4cf460ad6e8d302d9779/AssertionResults": [ + "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786/AssertionResults": [ { "type": "aws:cdk:logicalId", - "data": "AssertionResultsLambdaInvoke6eb068149a1c4cf460ad6e8d302d9779" + "data": "AssertionResultsLambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786" } ], "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role": [ @@ -191,58 +245,40 @@ "data": "LatestNodeRuntimeMap" } ], - "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec29f0f68556d046db3755c7cbfbe7e19/Default/Default": [ - { - "type": "aws:cdk:logicalId", - "data": "LambdaInvokec29f0f68556d046db3755c7cbfbe7e19" - } - ], - "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec29f0f68556d046db3755c7cbfbe7e19/Invoke": [ - { - "type": "aws:cdk:logicalId", - "data": "LambdaInvokec29f0f68556d046db3755c7cbfbe7e19Invoke2D8CBC7D" - } - ], - "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec29f0f68556d046db3755c7cbfbe7e19/AssertionResults": [ - { - "type": "aws:cdk:logicalId", - "data": "AssertionResultsLambdaInvokec29f0f68556d046db3755c7cbfbe7e19" - } - ], - "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokea874c7c1c2bb0bdf9469eb5260003abf/Default/Default": [ + "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokedd13d1be8acd5c33cf49dd164c4d4607/Default/Default": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvokea874c7c1c2bb0bdf9469eb5260003abf" + "data": "LambdaInvokedd13d1be8acd5c33cf49dd164c4d4607" } ], - "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokea874c7c1c2bb0bdf9469eb5260003abf/Invoke": [ + "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokedd13d1be8acd5c33cf49dd164c4d4607/Invoke": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvokea874c7c1c2bb0bdf9469eb5260003abfInvoke07459D4C" + "data": "LambdaInvokedd13d1be8acd5c33cf49dd164c4d4607Invoke0DDAB5A0" } ], - "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokea874c7c1c2bb0bdf9469eb5260003abf/AssertionResults": [ + "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokedd13d1be8acd5c33cf49dd164c4d4607/AssertionResults": [ { "type": "aws:cdk:logicalId", - "data": "AssertionResultsLambdaInvokea874c7c1c2bb0bdf9469eb5260003abf" + "data": "AssertionResultsLambdaInvokedd13d1be8acd5c33cf49dd164c4d4607" } ], - "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec6dea6fa9264d7676abde417ce6fbf04/Default/Default": [ + "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1dec/Default/Default": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvokec6dea6fa9264d7676abde417ce6fbf04" + "data": "LambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1dec" } ], - "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec6dea6fa9264d7676abde417ce6fbf04/Invoke": [ + "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1dec/Invoke": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvokec6dea6fa9264d7676abde417ce6fbf04InvokeE894AC2C" + "data": "LambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1decInvokeE046A313" } ], - "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec6dea6fa9264d7676abde417ce6fbf04/AssertionResults": [ + "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1dec/AssertionResults": [ { "type": "aws:cdk:logicalId", - "data": "AssertionResultsLambdaInvokec6dea6fa9264d7676abde417ce6fbf04" + "data": "AssertionResultsLambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1dec" } ], "/LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/BootstrapVersion": [ diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/tree.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/tree.json index fb57e340328d8..98e5d5f774291 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/tree.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.js.snapshot/tree.json @@ -8,17 +8,17 @@ "id": "cdk-integ-lambda-nodejs-latest", "path": "cdk-integ-lambda-nodejs-latest", "children": { - "func-nodejs18.x-0": { - "id": "func-nodejs18.x-0", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x-0", + "func-nodejs18.x": { + "id": "func-nodejs18.x", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x", "children": { "ServiceRole": { "id": "ServiceRole", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x-0/ServiceRole", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x/ServiceRole", "children": { "ImportServiceRole": { "id": "ImportServiceRole", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x-0/ServiceRole/ImportServiceRole", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x/ServiceRole/ImportServiceRole", "constructInfo": { "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" @@ -26,7 +26,7 @@ }, "Resource": { "id": "Resource", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x-0/ServiceRole/Resource", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x/ServiceRole/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::Role", "aws:cdk:cloudformation:props": { @@ -71,11 +71,11 @@ }, "Code": { "id": "Code", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x-0/Code", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x/Code", "children": { "Stage": { "id": "Stage", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x-0/Code/Stage", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x/Code/Stage", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", "version": "0.0.0" @@ -83,7 +83,7 @@ }, "AssetBucket": { "id": "AssetBucket", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x-0/Code/AssetBucket", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x/Code/AssetBucket", "constructInfo": { "fqn": "aws-cdk-lib.aws_s3.BucketBase", "version": "0.0.0" @@ -97,7 +97,7 @@ }, "Resource": { "id": "Resource", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x-0/Resource", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::Lambda::Function", "aws:cdk:cloudformation:props": { @@ -110,7 +110,7 @@ "handler": "index.handler", "role": { "Fn::GetAtt": [ - "funcnodejs18x0ServiceRole9E76897D", + "funcnodejs18xServiceRoleAEA986D3", "Arn" ] }, @@ -128,17 +128,17 @@ "version": "0.0.0" } }, - "func-nodejs20.x-1": { - "id": "func-nodejs20.x-1", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs20.x-1", + "func-nodejs20.x": { + "id": "func-nodejs20.x", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs20.x", "children": { "ServiceRole": { "id": "ServiceRole", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs20.x-1/ServiceRole", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs20.x/ServiceRole", "children": { "ImportServiceRole": { "id": "ImportServiceRole", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs20.x-1/ServiceRole/ImportServiceRole", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs20.x/ServiceRole/ImportServiceRole", "constructInfo": { "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" @@ -146,7 +146,7 @@ }, "Resource": { "id": "Resource", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs20.x-1/ServiceRole/Resource", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs20.x/ServiceRole/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::Role", "aws:cdk:cloudformation:props": { @@ -191,11 +191,11 @@ }, "Code": { "id": "Code", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs20.x-1/Code", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs20.x/Code", "children": { "Stage": { "id": "Stage", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs20.x-1/Code/Stage", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs20.x/Code/Stage", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", "version": "0.0.0" @@ -203,7 +203,7 @@ }, "AssetBucket": { "id": "AssetBucket", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs20.x-1/Code/AssetBucket", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs20.x/Code/AssetBucket", "constructInfo": { "fqn": "aws-cdk-lib.aws_s3.BucketBase", "version": "0.0.0" @@ -217,7 +217,7 @@ }, "Resource": { "id": "Resource", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs20.x-1/Resource", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs20.x/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::Lambda::Function", "aws:cdk:cloudformation:props": { @@ -230,7 +230,7 @@ "handler": "index.handler", "role": { "Fn::GetAtt": [ - "funcnodejs20x1ServiceRole9F252C30", + "funcnodejs20xServiceRoleD34C713B", "Arn" ] }, @@ -248,17 +248,17 @@ "version": "0.0.0" } }, - "func-nodejs18.x-2": { - "id": "func-nodejs18.x-2", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x-2", + "func-nodejs22.x": { + "id": "func-nodejs22.x", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs22.x", "children": { "ServiceRole": { "id": "ServiceRole", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x-2/ServiceRole", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs22.x/ServiceRole", "children": { "ImportServiceRole": { "id": "ImportServiceRole", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x-2/ServiceRole/ImportServiceRole", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs22.x/ServiceRole/ImportServiceRole", "constructInfo": { "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" @@ -266,7 +266,7 @@ }, "Resource": { "id": "Resource", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x-2/ServiceRole/Resource", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs22.x/ServiceRole/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::Role", "aws:cdk:cloudformation:props": { @@ -311,11 +311,11 @@ }, "Code": { "id": "Code", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x-2/Code", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs22.x/Code", "children": { "Stage": { "id": "Stage", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x-2/Code/Stage", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs22.x/Code/Stage", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", "version": "0.0.0" @@ -323,7 +323,7 @@ }, "AssetBucket": { "id": "AssetBucket", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x-2/Code/AssetBucket", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs22.x/Code/AssetBucket", "constructInfo": { "fqn": "aws-cdk-lib.aws_s3.BucketBase", "version": "0.0.0" @@ -337,7 +337,7 @@ }, "Resource": { "id": "Resource", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs18.x-2/Resource", + "path": "cdk-integ-lambda-nodejs-latest/func-nodejs22.x/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::Lambda::Function", "aws:cdk:cloudformation:props": { @@ -350,127 +350,7 @@ "handler": "index.handler", "role": { "Fn::GetAtt": [ - "funcnodejs18x2ServiceRoleF0EC8A13", - "Arn" - ] - }, - "runtime": "nodejs18.x" - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_lambda.CfnFunction", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_lambda_nodejs.NodejsFunction", - "version": "0.0.0" - } - }, - "func-nodejs22.x-3": { - "id": "func-nodejs22.x-3", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs22.x-3", - "children": { - "ServiceRole": { - "id": "ServiceRole", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs22.x-3/ServiceRole", - "children": { - "ImportServiceRole": { - "id": "ImportServiceRole", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs22.x-3/ServiceRole/ImportServiceRole", - "constructInfo": { - "fqn": "aws-cdk-lib.Resource", - "version": "0.0.0" - } - }, - "Resource": { - "id": "Resource", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs22.x-3/ServiceRole/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Role", - "aws:cdk:cloudformation:props": { - "assumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "lambda.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - }, - "managedPolicyArns": [ - { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" - ] - ] - } - ] - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_iam.CfnRole", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_iam.Role", - "version": "0.0.0" - } - }, - "Code": { - "id": "Code", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs22.x-3/Code", - "children": { - "Stage": { - "id": "Stage", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs22.x-3/Code/Stage", - "constructInfo": { - "fqn": "aws-cdk-lib.AssetStaging", - "version": "0.0.0" - } - }, - "AssetBucket": { - "id": "AssetBucket", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs22.x-3/Code/AssetBucket", - "constructInfo": { - "fqn": "aws-cdk-lib.aws_s3.BucketBase", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_s3_assets.Asset", - "version": "0.0.0" - } - }, - "Resource": { - "id": "Resource", - "path": "cdk-integ-lambda-nodejs-latest/func-nodejs22.x-3/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::Lambda::Function", - "aws:cdk:cloudformation:props": { - "code": { - "s3Bucket": { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "s3Key": "c2ab4a8654a5392d58fe69a7991514d5af7a4538d8dce56aa9fa7047dd354e89.zip" - }, - "handler": "index.handler", - "role": { - "Fn::GetAtt": [ - "funcnodejs22x3ServiceRole326FAF7D", + "funcnodejs22xServiceRole4249784B", "Arn" ] }, @@ -492,33 +372,25 @@ "id": "Exports", "path": "cdk-integ-lambda-nodejs-latest/Exports", "children": { - "Output{\"Ref\":\"funcnodejs18x0F8243A88\"}": { - "id": "Output{\"Ref\":\"funcnodejs18x0F8243A88\"}", - "path": "cdk-integ-lambda-nodejs-latest/Exports/Output{\"Ref\":\"funcnodejs18x0F8243A88\"}", + "Output{\"Ref\":\"funcnodejs18x8E61B45C\"}": { + "id": "Output{\"Ref\":\"funcnodejs18x8E61B45C\"}", + "path": "cdk-integ-lambda-nodejs-latest/Exports/Output{\"Ref\":\"funcnodejs18x8E61B45C\"}", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" } }, - "Output{\"Ref\":\"funcnodejs20x133AD5CB7\"}": { - "id": "Output{\"Ref\":\"funcnodejs20x133AD5CB7\"}", - "path": "cdk-integ-lambda-nodejs-latest/Exports/Output{\"Ref\":\"funcnodejs20x133AD5CB7\"}", + "Output{\"Ref\":\"funcnodejs20x20EDE4EE\"}": { + "id": "Output{\"Ref\":\"funcnodejs20x20EDE4EE\"}", + "path": "cdk-integ-lambda-nodejs-latest/Exports/Output{\"Ref\":\"funcnodejs20x20EDE4EE\"}", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" } }, - "Output{\"Ref\":\"funcnodejs18x2566B7874\"}": { - "id": "Output{\"Ref\":\"funcnodejs18x2566B7874\"}", - "path": "cdk-integ-lambda-nodejs-latest/Exports/Output{\"Ref\":\"funcnodejs18x2566B7874\"}", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnOutput", - "version": "0.0.0" - } - }, - "Output{\"Ref\":\"funcnodejs22x3C06C9D2E\"}": { - "id": "Output{\"Ref\":\"funcnodejs22x3C06C9D2E\"}", - "path": "cdk-integ-lambda-nodejs-latest/Exports/Output{\"Ref\":\"funcnodejs22x3C06C9D2E\"}", + "Output{\"Ref\":\"funcnodejs22xAA4F54D5\"}": { + "id": "Output{\"Ref\":\"funcnodejs22xAA4F54D5\"}", + "path": "cdk-integ-lambda-nodejs-latest/Exports/Output{\"Ref\":\"funcnodejs22xAA4F54D5\"}", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" @@ -572,17 +444,17 @@ "id": "DeployAssert", "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert", "children": { - "LambdaInvoke6eb068149a1c4cf460ad6e8d302d9779": { - "id": "LambdaInvoke6eb068149a1c4cf460ad6e8d302d9779", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke6eb068149a1c4cf460ad6e8d302d9779", + "LambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786": { + "id": "LambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786", "children": { "SdkProvider": { "id": "SdkProvider", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke6eb068149a1c4cf460ad6e8d302d9779/SdkProvider", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786/SdkProvider", "children": { "AssertionsProvider": { "id": "AssertionsProvider", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke6eb068149a1c4cf460ad6e8d302d9779/SdkProvider/AssertionsProvider", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786/SdkProvider/AssertionsProvider", "constructInfo": { "fqn": "constructs.Construct", "version": "10.4.2" @@ -596,11 +468,11 @@ }, "Default": { "id": "Default", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke6eb068149a1c4cf460ad6e8d302d9779/Default", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786/Default", "children": { "Default": { "id": "Default", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke6eb068149a1c4cf460ad6e8d302d9779/Default/Default", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786/Default/Default", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -614,7 +486,7 @@ }, "Invoke": { "id": "Invoke", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke6eb068149a1c4cf460ad6e8d302d9779/Invoke", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786/Invoke", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -622,7 +494,7 @@ }, "AssertionResults": { "id": "AssertionResults", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke6eb068149a1c4cf460ad6e8d302d9779/AssertionResults", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke9ea7744a5544a5c6ffed51cd6ff34786/AssertionResults", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" @@ -676,79 +548,17 @@ "version": "0.0.0" } }, - "LambdaInvokec29f0f68556d046db3755c7cbfbe7e19": { - "id": "LambdaInvokec29f0f68556d046db3755c7cbfbe7e19", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec29f0f68556d046db3755c7cbfbe7e19", - "children": { - "SdkProvider": { - "id": "SdkProvider", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec29f0f68556d046db3755c7cbfbe7e19/SdkProvider", - "children": { - "AssertionsProvider": { - "id": "AssertionsProvider", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec29f0f68556d046db3755c7cbfbe7e19/SdkProvider/AssertionsProvider", - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.4.2" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/integ-tests-alpha.AssertionsProvider", - "version": "0.0.0" - } - }, - "Default": { - "id": "Default", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec29f0f68556d046db3755c7cbfbe7e19/Default", - "children": { - "Default": { - "id": "Default", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec29f0f68556d046db3755c7cbfbe7e19/Default/Default", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.CustomResource", - "version": "0.0.0" - } - }, - "Invoke": { - "id": "Invoke", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec29f0f68556d046db3755c7cbfbe7e19/Invoke", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "0.0.0" - } - }, - "AssertionResults": { - "id": "AssertionResults", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec29f0f68556d046db3755c7cbfbe7e19/AssertionResults", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnOutput", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/integ-tests-alpha.LambdaInvokeFunction", - "version": "0.0.0" - } - }, - "LambdaInvokea874c7c1c2bb0bdf9469eb5260003abf": { - "id": "LambdaInvokea874c7c1c2bb0bdf9469eb5260003abf", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokea874c7c1c2bb0bdf9469eb5260003abf", + "LambdaInvokedd13d1be8acd5c33cf49dd164c4d4607": { + "id": "LambdaInvokedd13d1be8acd5c33cf49dd164c4d4607", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokedd13d1be8acd5c33cf49dd164c4d4607", "children": { "SdkProvider": { "id": "SdkProvider", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokea874c7c1c2bb0bdf9469eb5260003abf/SdkProvider", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokedd13d1be8acd5c33cf49dd164c4d4607/SdkProvider", "children": { "AssertionsProvider": { "id": "AssertionsProvider", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokea874c7c1c2bb0bdf9469eb5260003abf/SdkProvider/AssertionsProvider", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokedd13d1be8acd5c33cf49dd164c4d4607/SdkProvider/AssertionsProvider", "constructInfo": { "fqn": "constructs.Construct", "version": "10.4.2" @@ -762,11 +572,11 @@ }, "Default": { "id": "Default", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokea874c7c1c2bb0bdf9469eb5260003abf/Default", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokedd13d1be8acd5c33cf49dd164c4d4607/Default", "children": { "Default": { "id": "Default", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokea874c7c1c2bb0bdf9469eb5260003abf/Default/Default", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokedd13d1be8acd5c33cf49dd164c4d4607/Default/Default", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -780,7 +590,7 @@ }, "Invoke": { "id": "Invoke", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokea874c7c1c2bb0bdf9469eb5260003abf/Invoke", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokedd13d1be8acd5c33cf49dd164c4d4607/Invoke", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -788,7 +598,7 @@ }, "AssertionResults": { "id": "AssertionResults", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokea874c7c1c2bb0bdf9469eb5260003abf/AssertionResults", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokedd13d1be8acd5c33cf49dd164c4d4607/AssertionResults", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" @@ -800,17 +610,17 @@ "version": "0.0.0" } }, - "LambdaInvokec6dea6fa9264d7676abde417ce6fbf04": { - "id": "LambdaInvokec6dea6fa9264d7676abde417ce6fbf04", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec6dea6fa9264d7676abde417ce6fbf04", + "LambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1dec": { + "id": "LambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1dec", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1dec", "children": { "SdkProvider": { "id": "SdkProvider", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec6dea6fa9264d7676abde417ce6fbf04/SdkProvider", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1dec/SdkProvider", "children": { "AssertionsProvider": { "id": "AssertionsProvider", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec6dea6fa9264d7676abde417ce6fbf04/SdkProvider/AssertionsProvider", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1dec/SdkProvider/AssertionsProvider", "constructInfo": { "fqn": "constructs.Construct", "version": "10.4.2" @@ -824,11 +634,11 @@ }, "Default": { "id": "Default", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec6dea6fa9264d7676abde417ce6fbf04/Default", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1dec/Default", "children": { "Default": { "id": "Default", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec6dea6fa9264d7676abde417ce6fbf04/Default/Default", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1dec/Default/Default", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -842,7 +652,7 @@ }, "Invoke": { "id": "Invoke", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec6dea6fa9264d7676abde417ce6fbf04/Invoke", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1dec/Invoke", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -850,7 +660,7 @@ }, "AssertionResults": { "id": "AssertionResults", - "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvokec6dea6fa9264d7676abde417ce6fbf04/AssertionResults", + "path": "LambdaNodeJsLatestInteg/DefaultTest/DeployAssert/LambdaInvoke7f65e5f1728f1ebc1dc4358d2a6d1dec/AssertionResults", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.ts index a536c6e31e741..87e6168c831fc 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.ts +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/test/integ.nodejs.build.images.ts @@ -15,8 +15,10 @@ class TestStack extends Stack { Runtime.NODEJS_18_X, Runtime.NODEJS_20_X, Runtime.NODEJS_LATEST, Runtime.NODEJS_22_X, ]; - runtimes.forEach((runtime, index) => { - this.lambdaFunctions.push(new lambda.NodejsFunction(this, `func-${runtime.name}-${index}`, { + const uniqueRuntimes: Runtime[] = runtimes.filter((value, index, array) => array.findIndex(value1 => value1.runtimeEquals(value)) === index); + + uniqueRuntimes.forEach((runtime) => { + this.lambdaFunctions.push(new lambda.NodejsFunction(this, `func-${runtime.name}`, { entry: path.join(__dirname, 'integ-handlers/dependencies.ts'), runtime: runtime, bundling: { diff --git a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/asset.b98abee59e034ed29eeb601684dc34752baa86509a7d457d72305d4e19ecc80b.bundle/index.js b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/asset.bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.bundle/index.js similarity index 99% rename from packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/asset.b98abee59e034ed29eeb601684dc34752baa86509a7d457d72305d4e19ecc80b.bundle/index.js rename to packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/asset.bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.bundle/index.js index b585fd2bb4a19..60e59701bc0e1 100644 --- a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/asset.b98abee59e034ed29eeb601684dc34752baa86509a7d457d72305d4e19ecc80b.bundle/index.js +++ b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/asset.bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.bundle/index.js @@ -152,7 +152,6 @@ var init_matcher = __esm({ */ toHumanStrings() { const failures = new Array(); - debugger; recurse(this, []); return failures.map((r) => { const loc = r.path.length === 0 ? "" : ` at /${r.path.join("/")}`; @@ -23574,9 +23573,9 @@ var require_safer = __commonJS({ } }); -// ../../../node_modules/iconv-lite/lib/bom-handling.js +// ../../../node_modules/encoding/node_modules/iconv-lite/lib/bom-handling.js var require_bom_handling = __commonJS({ - "../../../node_modules/iconv-lite/lib/bom-handling.js"(exports2) { + "../../../node_modules/encoding/node_modules/iconv-lite/lib/bom-handling.js"(exports2) { "use strict"; var BOMChar = "\uFEFF"; exports2.PrependBOM = PrependBOMWrapper; @@ -23618,9 +23617,9 @@ var require_bom_handling = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/internal.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/internal.js var require_internal = __commonJS({ - "../../../node_modules/iconv-lite/encodings/internal.js"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/internal.js"(exports2, module2) { "use strict"; var Buffer2 = require_safer().Buffer; module2.exports = { @@ -23770,9 +23769,9 @@ var require_internal = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/utf32.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/utf32.js var require_utf32 = __commonJS({ - "../../../node_modules/iconv-lite/encodings/utf32.js"(exports2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/utf32.js"(exports2) { "use strict"; var Buffer2 = require_safer().Buffer; exports2._utf32 = Utf32Codec; @@ -23989,9 +23988,9 @@ var require_utf32 = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/utf16.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/utf16.js var require_utf16 = __commonJS({ - "../../../node_modules/iconv-lite/encodings/utf16.js"(exports2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/utf16.js"(exports2) { "use strict"; var Buffer2 = require_safer().Buffer; exports2.utf16be = Utf16BECodec; @@ -24123,9 +24122,9 @@ var require_utf16 = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/utf7.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/utf7.js var require_utf7 = __commonJS({ - "../../../node_modules/iconv-lite/encodings/utf7.js"(exports2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/utf7.js"(exports2) { "use strict"; var Buffer2 = require_safer().Buffer; exports2.utf7 = Utf7Codec; @@ -24324,9 +24323,9 @@ var require_utf7 = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/sbcs-codec.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/sbcs-codec.js var require_sbcs_codec = __commonJS({ - "../../../node_modules/iconv-lite/encodings/sbcs-codec.js"(exports2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/sbcs-codec.js"(exports2) { "use strict"; var Buffer2 = require_safer().Buffer; exports2._sbcs = SBCSCodec; @@ -24380,9 +24379,9 @@ var require_sbcs_codec = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/sbcs-data.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/sbcs-data.js var require_sbcs_data = __commonJS({ - "../../../node_modules/iconv-lite/encodings/sbcs-data.js"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/sbcs-data.js"(exports2, module2) { "use strict"; module2.exports = { // Not supported by iconv, not sure why. @@ -24533,9 +24532,9 @@ var require_sbcs_data = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/sbcs-data-generated.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/sbcs-data-generated.js var require_sbcs_data_generated = __commonJS({ - "../../../node_modules/iconv-lite/encodings/sbcs-data-generated.js"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/sbcs-data-generated.js"(exports2, module2) { "use strict"; module2.exports = { "437": "cp437", @@ -24988,9 +24987,9 @@ var require_sbcs_data_generated = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/dbcs-codec.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/dbcs-codec.js var require_dbcs_codec = __commonJS({ - "../../../node_modules/iconv-lite/encodings/dbcs-codec.js"(exports2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/dbcs-codec.js"(exports2) { "use strict"; var Buffer2 = require_safer().Buffer; exports2._dbcs = DBCSCodec; @@ -25405,9 +25404,9 @@ var require_dbcs_codec = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/tables/shiftjis.json +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/shiftjis.json var require_shiftjis = __commonJS({ - "../../../node_modules/iconv-lite/encodings/tables/shiftjis.json"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/shiftjis.json"(exports2, module2) { module2.exports = [ ["0", "\0", 128], ["a1", "\uFF61", 62], @@ -25536,9 +25535,9 @@ var require_shiftjis = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/tables/eucjp.json +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/eucjp.json var require_eucjp = __commonJS({ - "../../../node_modules/iconv-lite/encodings/tables/eucjp.json"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/eucjp.json"(exports2, module2) { module2.exports = [ ["0", "\0", 127], ["8ea1", "\uFF61", 62], @@ -25724,9 +25723,9 @@ var require_eucjp = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/tables/cp936.json +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/cp936.json var require_cp936 = __commonJS({ - "../../../node_modules/iconv-lite/encodings/tables/cp936.json"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/cp936.json"(exports2, module2) { module2.exports = [ ["0", "\0", 127, "\u20AC"], ["8140", "\u4E02\u4E04\u4E05\u4E06\u4E0F\u4E12\u4E17\u4E1F\u4E20\u4E21\u4E23\u4E26\u4E29\u4E2E\u4E2F\u4E31\u4E33\u4E35\u4E37\u4E3C\u4E40\u4E41\u4E42\u4E44\u4E46\u4E4A\u4E51\u4E55\u4E57\u4E5A\u4E5B\u4E62\u4E63\u4E64\u4E65\u4E67\u4E68\u4E6A", 5, "\u4E72\u4E74", 9, "\u4E7F", 6, "\u4E87\u4E8A"], @@ -25994,9 +25993,9 @@ var require_cp936 = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/tables/gbk-added.json +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/gbk-added.json var require_gbk_added = __commonJS({ - "../../../node_modules/iconv-lite/encodings/tables/gbk-added.json"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/gbk-added.json"(exports2, module2) { module2.exports = [ ["a140", "\uE4C6", 62], ["a180", "\uE505", 32], @@ -26056,16 +26055,16 @@ var require_gbk_added = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/tables/gb18030-ranges.json +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/gb18030-ranges.json var require_gb18030_ranges = __commonJS({ - "../../../node_modules/iconv-lite/encodings/tables/gb18030-ranges.json"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/gb18030-ranges.json"(exports2, module2) { module2.exports = { uChars: [128, 165, 169, 178, 184, 216, 226, 235, 238, 244, 248, 251, 253, 258, 276, 284, 300, 325, 329, 334, 364, 463, 465, 467, 469, 471, 473, 475, 477, 506, 594, 610, 712, 716, 730, 930, 938, 962, 970, 1026, 1104, 1106, 8209, 8215, 8218, 8222, 8231, 8241, 8244, 8246, 8252, 8365, 8452, 8454, 8458, 8471, 8482, 8556, 8570, 8596, 8602, 8713, 8720, 8722, 8726, 8731, 8737, 8740, 8742, 8748, 8751, 8760, 8766, 8777, 8781, 8787, 8802, 8808, 8816, 8854, 8858, 8870, 8896, 8979, 9322, 9372, 9548, 9588, 9616, 9622, 9634, 9652, 9662, 9672, 9676, 9680, 9702, 9735, 9738, 9793, 9795, 11906, 11909, 11913, 11917, 11928, 11944, 11947, 11951, 11956, 11960, 11964, 11979, 12284, 12292, 12312, 12319, 12330, 12351, 12436, 12447, 12535, 12543, 12586, 12842, 12850, 12964, 13200, 13215, 13218, 13253, 13263, 13267, 13270, 13384, 13428, 13727, 13839, 13851, 14617, 14703, 14801, 14816, 14964, 15183, 15471, 15585, 16471, 16736, 17208, 17325, 17330, 17374, 17623, 17997, 18018, 18212, 18218, 18301, 18318, 18760, 18811, 18814, 18820, 18823, 18844, 18848, 18872, 19576, 19620, 19738, 19887, 40870, 59244, 59336, 59367, 59413, 59417, 59423, 59431, 59437, 59443, 59452, 59460, 59478, 59493, 63789, 63866, 63894, 63976, 63986, 64016, 64018, 64021, 64025, 64034, 64037, 64042, 65074, 65093, 65107, 65112, 65127, 65132, 65375, 65510, 65536], gbChars: [0, 36, 38, 45, 50, 81, 89, 95, 96, 100, 103, 104, 105, 109, 126, 133, 148, 172, 175, 179, 208, 306, 307, 308, 309, 310, 311, 312, 313, 341, 428, 443, 544, 545, 558, 741, 742, 749, 750, 805, 819, 820, 7922, 7924, 7925, 7927, 7934, 7943, 7944, 7945, 7950, 8062, 8148, 8149, 8152, 8164, 8174, 8236, 8240, 8262, 8264, 8374, 8380, 8381, 8384, 8388, 8390, 8392, 8393, 8394, 8396, 8401, 8406, 8416, 8419, 8424, 8437, 8439, 8445, 8482, 8485, 8496, 8521, 8603, 8936, 8946, 9046, 9050, 9063, 9066, 9076, 9092, 9100, 9108, 9111, 9113, 9131, 9162, 9164, 9218, 9219, 11329, 11331, 11334, 11336, 11346, 11361, 11363, 11366, 11370, 11372, 11375, 11389, 11682, 11686, 11687, 11692, 11694, 11714, 11716, 11723, 11725, 11730, 11736, 11982, 11989, 12102, 12336, 12348, 12350, 12384, 12393, 12395, 12397, 12510, 12553, 12851, 12962, 12973, 13738, 13823, 13919, 13933, 14080, 14298, 14585, 14698, 15583, 15847, 16318, 16434, 16438, 16481, 16729, 17102, 17122, 17315, 17320, 17402, 17418, 17859, 17909, 17911, 17915, 17916, 17936, 17939, 17961, 18664, 18703, 18814, 18962, 19043, 33469, 33470, 33471, 33484, 33485, 33490, 33497, 33501, 33505, 33513, 33520, 33536, 33550, 37845, 37921, 37948, 38029, 38038, 38064, 38065, 38066, 38069, 38075, 38076, 38078, 39108, 39109, 39113, 39114, 39115, 39116, 39265, 39394, 189e3] }; } }); -// ../../../node_modules/iconv-lite/encodings/tables/cp949.json +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/cp949.json var require_cp949 = __commonJS({ - "../../../node_modules/iconv-lite/encodings/tables/cp949.json"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/cp949.json"(exports2, module2) { module2.exports = [ ["0", "\0", 127], ["8141", "\uAC02\uAC03\uAC05\uAC06\uAC0B", 4, "\uAC18\uAC1E\uAC1F\uAC21\uAC22\uAC23\uAC25", 6, "\uAC2E\uAC32\uAC33\uAC34"], @@ -26342,9 +26341,9 @@ var require_cp949 = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/tables/cp950.json +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/cp950.json var require_cp950 = __commonJS({ - "../../../node_modules/iconv-lite/encodings/tables/cp950.json"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/cp950.json"(exports2, module2) { module2.exports = [ ["0", "\0", 127], ["a140", "\u3000\uFF0C\u3001\u3002\uFF0E\u2027\uFF1B\uFF1A\uFF1F\uFF01\uFE30\u2026\u2025\uFE50\uFE51\uFE52\xB7\uFE54\uFE55\uFE56\uFE57\uFF5C\u2013\uFE31\u2014\uFE33\u2574\uFE34\uFE4F\uFF08\uFF09\uFE35\uFE36\uFF5B\uFF5D\uFE37\uFE38\u3014\u3015\uFE39\uFE3A\u3010\u3011\uFE3B\uFE3C\u300A\u300B\uFE3D\uFE3E\u3008\u3009\uFE3F\uFE40\u300C\u300D\uFE41\uFE42\u300E\u300F\uFE43\uFE44\uFE59\uFE5A"], @@ -26525,9 +26524,9 @@ var require_cp950 = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/tables/big5-added.json +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/big5-added.json var require_big5_added = __commonJS({ - "../../../node_modules/iconv-lite/encodings/tables/big5-added.json"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/big5-added.json"(exports2, module2) { module2.exports = [ ["8740", "\u43F0\u4C32\u4603\u45A6\u4578\u{27267}\u4D77\u45B3\u{27CB1}\u4CE2\u{27CC5}\u3B95\u4736\u4744\u4C47\u4C40\u{242BF}\u{23617}\u{27352}\u{26E8B}\u{270D2}\u4C57\u{2A351}\u474F\u45DA\u4C85\u{27C6C}\u4D07\u4AA4\u46A1\u{26B23}\u7225\u{25A54}\u{21A63}\u{23E06}\u{23F61}\u664D\u56FB"], ["8767", "\u7D95\u591D\u{28BB9}\u3DF4\u9734\u{27BEF}\u5BDB\u{21D5E}\u5AA4\u3625\u{29EB0}\u5AD1\u5BB7\u5CFC\u676E\u8593\u{29945}\u7461\u749D\u3875\u{21D53}\u{2369E}\u{26021}\u3EEC"], @@ -26653,9 +26652,9 @@ var require_big5_added = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/dbcs-data.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/dbcs-data.js var require_dbcs_data = __commonJS({ - "../../../node_modules/iconv-lite/encodings/dbcs-data.js"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/dbcs-data.js"(exports2, module2) { "use strict"; module2.exports = { // == Japanese/ShiftJIS ==================================================== @@ -26900,9 +26899,9 @@ var require_dbcs_data = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/index.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/index.js var require_encodings = __commonJS({ - "../../../node_modules/iconv-lite/encodings/index.js"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/index.js"(exports2, module2) { "use strict"; var modules = [ require_internal(), @@ -26927,9 +26926,9 @@ var require_encodings = __commonJS({ } }); -// ../../../node_modules/iconv-lite/lib/streams.js +// ../../../node_modules/encoding/node_modules/iconv-lite/lib/streams.js var require_streams = __commonJS({ - "../../../node_modules/iconv-lite/lib/streams.js"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/lib/streams.js"(exports2, module2) { "use strict"; var Buffer2 = require_safer().Buffer; module2.exports = function(stream_module) { @@ -27022,9 +27021,9 @@ var require_streams = __commonJS({ } }); -// ../../../node_modules/iconv-lite/lib/index.js +// ../../../node_modules/encoding/node_modules/iconv-lite/lib/index.js var require_lib2 = __commonJS({ - "../../../node_modules/iconv-lite/lib/index.js"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/lib/index.js"(exports2, module2) { "use strict"; var Buffer2 = require_safer().Buffer; var bomHandling = require_bom_handling(); diff --git a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/cdk-integ-lambda-golang-provided-al2023.assets.json b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/cdk-integ-lambda-golang-provided-al2023.assets.json index 5fe8b813a1182..455f1c8bbbd4a 100644 --- a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/cdk-integ-lambda-golang-provided-al2023.assets.json +++ b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/cdk-integ-lambda-golang-provided-al2023.assets.json @@ -1,5 +1,5 @@ { - "version": "38.0.1", + "version": "39.0.0", "files": { "3ca3899fd89ffddaa38e2f556f7357f6e178b0d94502b5dc21dce70490ed642f": { "source": { @@ -14,7 +14,7 @@ } } }, - "34293767b5134bd2028237f5362259b4594a9e316e6ac19bbc42f610af769649": { + "3f0e36eb78dda330bbc187441af285d86fc089f15d6e7bd0cc02e6c2ee42df39": { "source": { "path": "cdk-integ-lambda-golang-provided-al2023.template.json", "packaging": "file" @@ -22,7 +22,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "34293767b5134bd2028237f5362259b4594a9e316e6ac19bbc42f610af769649.json", + "objectKey": "3f0e36eb78dda330bbc187441af285d86fc089f15d6e7bd0cc02e6c2ee42df39.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/cdk-integ-lambda-golang-provided-al2023.template.json b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/cdk-integ-lambda-golang-provided-al2023.template.json index 435eea9fad102..b98ea67886bd3 100644 --- a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/cdk-integ-lambda-golang-provided-al2023.template.json +++ b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/cdk-integ-lambda-golang-provided-al2023.template.json @@ -1,6 +1,6 @@ { "Resources": { - "gohandlerprovidedal20ServiceRole8426AEF6": { + "gohandlerprovidedal2ServiceRole0304E98B": { "Type": "AWS::IAM::Role", "Properties": { "AssumeRolePolicyDocument": { @@ -31,7 +31,7 @@ ] } }, - "gohandlerprovidedal20A3EC5933": { + "gohandlerprovidedal263372523": { "Type": "AWS::Lambda::Function", "Properties": { "Code": { @@ -43,17 +43,17 @@ "Handler": "bootstrap", "Role": { "Fn::GetAtt": [ - "gohandlerprovidedal20ServiceRole8426AEF6", + "gohandlerprovidedal2ServiceRole0304E98B", "Arn" ] }, "Runtime": "provided.al2" }, "DependsOn": [ - "gohandlerprovidedal20ServiceRole8426AEF6" + "gohandlerprovidedal2ServiceRole0304E98B" ] }, - "gohandlerprovidedal20231ServiceRole68A34C3F": { + "gohandlerprovidedal2023ServiceRole27484815": { "Type": "AWS::IAM::Role", "Properties": { "AssumeRolePolicyDocument": { @@ -84,7 +84,7 @@ ] } }, - "gohandlerprovidedal2023182E754E4": { + "gohandlerprovidedal2023FA840EAA": { "Type": "AWS::Lambda::Function", "Properties": { "Code": { @@ -96,32 +96,32 @@ "Handler": "bootstrap", "Role": { "Fn::GetAtt": [ - "gohandlerprovidedal20231ServiceRole68A34C3F", + "gohandlerprovidedal2023ServiceRole27484815", "Arn" ] }, "Runtime": "provided.al2023" }, "DependsOn": [ - "gohandlerprovidedal20231ServiceRole68A34C3F" + "gohandlerprovidedal2023ServiceRole27484815" ] } }, "Outputs": { - "ExportsOutputRefgohandlerprovidedal20A3EC5933F5EA8606": { + "ExportsOutputRefgohandlerprovidedal2633725233CB9A54A": { "Value": { - "Ref": "gohandlerprovidedal20A3EC5933" + "Ref": "gohandlerprovidedal263372523" }, "Export": { - "Name": "cdk-integ-lambda-golang-provided-al2023:ExportsOutputRefgohandlerprovidedal20A3EC5933F5EA8606" + "Name": "cdk-integ-lambda-golang-provided-al2023:ExportsOutputRefgohandlerprovidedal2633725233CB9A54A" } }, - "ExportsOutputRefgohandlerprovidedal2023182E754E4D088A80B": { + "ExportsOutputRefgohandlerprovidedal2023FA840EAA50E75800": { "Value": { - "Ref": "gohandlerprovidedal2023182E754E4" + "Ref": "gohandlerprovidedal2023FA840EAA" }, "Export": { - "Name": "cdk-integ-lambda-golang-provided-al2023:ExportsOutputRefgohandlerprovidedal2023182E754E4D088A80B" + "Name": "cdk-integ-lambda-golang-provided-al2023:ExportsOutputRefgohandlerprovidedal2023FA840EAA50E75800" } } }, diff --git a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/cdk.out b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/cdk.out index c6e612584e352..91e1a8b9901d5 100644 --- a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/cdk.out +++ b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"38.0.1"} \ No newline at end of file +{"version":"39.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/integ.json b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/integ.json index 8ba08298d5139..8ec551e6624d8 100644 --- a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/integ.json +++ b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "38.0.1", + "version": "39.0.0", "testCases": { "lambda-go-runtime/DefaultTest": { "stacks": [ diff --git a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/lambdagoruntimeDefaultTestDeployAssert366012A1.assets.json b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/lambdagoruntimeDefaultTestDeployAssert366012A1.assets.json index 6e4c211319246..0c3194218bf12 100644 --- a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/lambdagoruntimeDefaultTestDeployAssert366012A1.assets.json +++ b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/lambdagoruntimeDefaultTestDeployAssert366012A1.assets.json @@ -1,20 +1,20 @@ { - "version": "38.0.1", + "version": "39.0.0", "files": { - "b98abee59e034ed29eeb601684dc34752baa86509a7d457d72305d4e19ecc80b": { + "bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981": { "source": { - "path": "asset.b98abee59e034ed29eeb601684dc34752baa86509a7d457d72305d4e19ecc80b.bundle", + "path": "asset.bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.bundle", "packaging": "zip" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "b98abee59e034ed29eeb601684dc34752baa86509a7d457d72305d4e19ecc80b.zip", + "objectKey": "bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "665413b584435ebdf5f793a7d2380a56e3148d53574757886dc43130ffda7d9d": { + "ce322481ad3bfac89a715809309aa35d5b70de5dfc6cd6732f7bd3c6a590023d": { "source": { "path": "lambdagoruntimeDefaultTestDeployAssert366012A1.template.json", "packaging": "file" @@ -22,7 +22,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "665413b584435ebdf5f793a7d2380a56e3148d53574757886dc43130ffda7d9d.json", + "objectKey": "ce322481ad3bfac89a715809309aa35d5b70de5dfc6cd6732f7bd3c6a590023d.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/lambdagoruntimeDefaultTestDeployAssert366012A1.template.json b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/lambdagoruntimeDefaultTestDeployAssert366012A1.template.json index fa42272b8ac2c..f53ab7a8ae459 100644 --- a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/lambdagoruntimeDefaultTestDeployAssert366012A1.template.json +++ b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/lambdagoruntimeDefaultTestDeployAssert366012A1.template.json @@ -1,6 +1,6 @@ { "Resources": { - "LambdaInvokef3b58fd2af78e934527e05bc469d07dc": { + "LambdaInvoke2b6e8ea895f068736d6c24688beb0ea1": { "Type": "Custom::DeployAssert@SdkCallLambdainvoke", "Properties": { "ServiceToken": { @@ -19,7 +19,7 @@ [ "\"", { - "Fn::ImportValue": "cdk-integ-lambda-golang-provided-al2023:ExportsOutputRefgohandlerprovidedal20A3EC5933F5EA8606" + "Fn::ImportValue": "cdk-integ-lambda-golang-provided-al2023:ExportsOutputRefgohandlerprovidedal2633725233CB9A54A" }, "\"" ] @@ -27,17 +27,17 @@ } }, "flattenResponse": "false", - "salt": "1732467508037" + "salt": "1736374512627" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "LambdaInvokef3b58fd2af78e934527e05bc469d07dcInvokeFB39F386": { + "LambdaInvoke2b6e8ea895f068736d6c24688beb0ea1InvokeECEDC4C5": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", "FunctionName": { - "Fn::ImportValue": "cdk-integ-lambda-golang-provided-al2023:ExportsOutputRefgohandlerprovidedal20A3EC5933F5EA8606" + "Fn::ImportValue": "cdk-integ-lambda-golang-provided-al2023:ExportsOutputRefgohandlerprovidedal2633725233CB9A54A" }, "Principal": { "Fn::GetAtt": [ @@ -106,7 +106,7 @@ }, ":function:", { - "Fn::ImportValue": "cdk-integ-lambda-golang-provided-al2023:ExportsOutputRefgohandlerprovidedal20A3EC5933F5EA8606" + "Fn::ImportValue": "cdk-integ-lambda-golang-provided-al2023:ExportsOutputRefgohandlerprovidedal2633725233CB9A54A" } ] ] @@ -146,7 +146,7 @@ }, ":function:", { - "Fn::ImportValue": "cdk-integ-lambda-golang-provided-al2023:ExportsOutputRefgohandlerprovidedal2023182E754E4D088A80B" + "Fn::ImportValue": "cdk-integ-lambda-golang-provided-al2023:ExportsOutputRefgohandlerprovidedal2023FA840EAA50E75800" } ] ] @@ -175,7 +175,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "b98abee59e034ed29eeb601684dc34752baa86509a7d457d72305d4e19ecc80b.zip" + "S3Key": "bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.zip" }, "Timeout": 120, "Handler": "index.handler", @@ -187,7 +187,7 @@ } } }, - "LambdaInvokee64be71dc9e61c18c827e4067293abf7": { + "LambdaInvokee243f6063740d52875d805d005f0d7bf": { "Type": "Custom::DeployAssert@SdkCallLambdainvoke", "Properties": { "ServiceToken": { @@ -206,7 +206,7 @@ [ "\"", { - "Fn::ImportValue": "cdk-integ-lambda-golang-provided-al2023:ExportsOutputRefgohandlerprovidedal2023182E754E4D088A80B" + "Fn::ImportValue": "cdk-integ-lambda-golang-provided-al2023:ExportsOutputRefgohandlerprovidedal2023FA840EAA50E75800" }, "\"" ] @@ -214,17 +214,17 @@ } }, "flattenResponse": "false", - "salt": "1732467508039" + "salt": "1736374512629" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "LambdaInvokee64be71dc9e61c18c827e4067293abf7Invoke6B51EA75": { + "LambdaInvokee243f6063740d52875d805d005f0d7bfInvoke13D1276D": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", "FunctionName": { - "Fn::ImportValue": "cdk-integ-lambda-golang-provided-al2023:ExportsOutputRefgohandlerprovidedal2023182E754E4D088A80B" + "Fn::ImportValue": "cdk-integ-lambda-golang-provided-al2023:ExportsOutputRefgohandlerprovidedal2023FA840EAA50E75800" }, "Principal": { "Fn::GetAtt": [ @@ -236,18 +236,18 @@ } }, "Outputs": { - "AssertionResultsLambdaInvokef3b58fd2af78e934527e05bc469d07dc": { + "AssertionResultsLambdaInvoke2b6e8ea895f068736d6c24688beb0ea1": { "Value": { "Fn::GetAtt": [ - "LambdaInvokef3b58fd2af78e934527e05bc469d07dc", + "LambdaInvoke2b6e8ea895f068736d6c24688beb0ea1", "assertion" ] } }, - "AssertionResultsLambdaInvokee64be71dc9e61c18c827e4067293abf7": { + "AssertionResultsLambdaInvokee243f6063740d52875d805d005f0d7bf": { "Value": { "Fn::GetAtt": [ - "LambdaInvokee64be71dc9e61c18c827e4067293abf7", + "LambdaInvokee243f6063740d52875d805d005f0d7bf", "assertion" ] } diff --git a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/manifest.json b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/manifest.json index 2a0b7a2ec1d31..c22b9a5a673b7 100644 --- a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "38.0.1", + "version": "39.0.0", "artifacts": { "cdk-integ-lambda-golang-provided-al2023.assets": { "type": "cdk:asset-manifest", @@ -18,7 +18,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/34293767b5134bd2028237f5362259b4594a9e316e6ac19bbc42f610af769649.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/3f0e36eb78dda330bbc187441af285d86fc089f15d6e7bd0cc02e6c2ee42df39.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -34,40 +34,40 @@ "cdk-integ-lambda-golang-provided-al2023.assets" ], "metadata": { - "/cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2-0/ServiceRole/Resource": [ + "/cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2/ServiceRole/Resource": [ { "type": "aws:cdk:logicalId", - "data": "gohandlerprovidedal20ServiceRole8426AEF6" + "data": "gohandlerprovidedal2ServiceRole0304E98B" } ], - "/cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2-0/Resource": [ + "/cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2/Resource": [ { "type": "aws:cdk:logicalId", - "data": "gohandlerprovidedal20A3EC5933" + "data": "gohandlerprovidedal263372523" } ], - "/cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023-1/ServiceRole/Resource": [ + "/cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023/ServiceRole/Resource": [ { "type": "aws:cdk:logicalId", - "data": "gohandlerprovidedal20231ServiceRole68A34C3F" + "data": "gohandlerprovidedal2023ServiceRole27484815" } ], - "/cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023-1/Resource": [ + "/cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023/Resource": [ { "type": "aws:cdk:logicalId", - "data": "gohandlerprovidedal2023182E754E4" + "data": "gohandlerprovidedal2023FA840EAA" } ], - "/cdk-integ-lambda-golang-provided-al2023/Exports/Output{\"Ref\":\"gohandlerprovidedal20A3EC5933\"}": [ + "/cdk-integ-lambda-golang-provided-al2023/Exports/Output{\"Ref\":\"gohandlerprovidedal263372523\"}": [ { "type": "aws:cdk:logicalId", - "data": "ExportsOutputRefgohandlerprovidedal20A3EC5933F5EA8606" + "data": "ExportsOutputRefgohandlerprovidedal2633725233CB9A54A" } ], - "/cdk-integ-lambda-golang-provided-al2023/Exports/Output{\"Ref\":\"gohandlerprovidedal2023182E754E4\"}": [ + "/cdk-integ-lambda-golang-provided-al2023/Exports/Output{\"Ref\":\"gohandlerprovidedal2023FA840EAA\"}": [ { "type": "aws:cdk:logicalId", - "data": "ExportsOutputRefgohandlerprovidedal2023182E754E4D088A80B" + "data": "ExportsOutputRefgohandlerprovidedal2023FA840EAA50E75800" } ], "/cdk-integ-lambda-golang-provided-al2023/BootstrapVersion": [ @@ -81,6 +81,42 @@ "type": "aws:cdk:logicalId", "data": "CheckBootstrapVersion" } + ], + "gohandlerprovidedal20ServiceRole8426AEF6": [ + { + "type": "aws:cdk:logicalId", + "data": "gohandlerprovidedal20ServiceRole8426AEF6", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "gohandlerprovidedal20A3EC5933": [ + { + "type": "aws:cdk:logicalId", + "data": "gohandlerprovidedal20A3EC5933", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "gohandlerprovidedal20231ServiceRole68A34C3F": [ + { + "type": "aws:cdk:logicalId", + "data": "gohandlerprovidedal20231ServiceRole68A34C3F", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "gohandlerprovidedal2023182E754E4": [ + { + "type": "aws:cdk:logicalId", + "data": "gohandlerprovidedal2023182E754E4", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } ] }, "displayName": "cdk-integ-lambda-golang-provided-al2023" @@ -102,7 +138,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/665413b584435ebdf5f793a7d2380a56e3148d53574757886dc43130ffda7d9d.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/ce322481ad3bfac89a715809309aa35d5b70de5dfc6cd6732f7bd3c6a590023d.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -119,22 +155,22 @@ "lambdagoruntimeDefaultTestDeployAssert366012A1.assets" ], "metadata": { - "/lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokef3b58fd2af78e934527e05bc469d07dc/Default/Default": [ + "/lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvoke2b6e8ea895f068736d6c24688beb0ea1/Default/Default": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvokef3b58fd2af78e934527e05bc469d07dc" + "data": "LambdaInvoke2b6e8ea895f068736d6c24688beb0ea1" } ], - "/lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokef3b58fd2af78e934527e05bc469d07dc/Invoke": [ + "/lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvoke2b6e8ea895f068736d6c24688beb0ea1/Invoke": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvokef3b58fd2af78e934527e05bc469d07dcInvokeFB39F386" + "data": "LambdaInvoke2b6e8ea895f068736d6c24688beb0ea1InvokeECEDC4C5" } ], - "/lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokef3b58fd2af78e934527e05bc469d07dc/AssertionResults": [ + "/lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvoke2b6e8ea895f068736d6c24688beb0ea1/AssertionResults": [ { "type": "aws:cdk:logicalId", - "data": "AssertionResultsLambdaInvokef3b58fd2af78e934527e05bc469d07dc" + "data": "AssertionResultsLambdaInvoke2b6e8ea895f068736d6c24688beb0ea1" } ], "/lambda-go-runtime/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role": [ @@ -155,22 +191,22 @@ "data": "LatestNodeRuntimeMap" } ], - "/lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee64be71dc9e61c18c827e4067293abf7/Default/Default": [ + "/lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee243f6063740d52875d805d005f0d7bf/Default/Default": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvokee64be71dc9e61c18c827e4067293abf7" + "data": "LambdaInvokee243f6063740d52875d805d005f0d7bf" } ], - "/lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee64be71dc9e61c18c827e4067293abf7/Invoke": [ + "/lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee243f6063740d52875d805d005f0d7bf/Invoke": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvokee64be71dc9e61c18c827e4067293abf7Invoke6B51EA75" + "data": "LambdaInvokee243f6063740d52875d805d005f0d7bfInvoke13D1276D" } ], - "/lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee64be71dc9e61c18c827e4067293abf7/AssertionResults": [ + "/lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee243f6063740d52875d805d005f0d7bf/AssertionResults": [ { "type": "aws:cdk:logicalId", - "data": "AssertionResultsLambdaInvokee64be71dc9e61c18c827e4067293abf7" + "data": "AssertionResultsLambdaInvokee243f6063740d52875d805d005f0d7bf" } ], "/lambda-go-runtime/DefaultTest/DeployAssert/BootstrapVersion": [ diff --git a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/tree.json b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/tree.json index 5e6926e4949fe..cda75186195a3 100644 --- a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/tree.json +++ b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.js.snapshot/tree.json @@ -8,17 +8,17 @@ "id": "cdk-integ-lambda-golang-provided-al2023", "path": "cdk-integ-lambda-golang-provided-al2023", "children": { - "go-handler-provided.al2-0": { - "id": "go-handler-provided.al2-0", - "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2-0", + "go-handler-provided.al2": { + "id": "go-handler-provided.al2", + "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2", "children": { "ServiceRole": { "id": "ServiceRole", - "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2-0/ServiceRole", + "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2/ServiceRole", "children": { "ImportServiceRole": { "id": "ImportServiceRole", - "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2-0/ServiceRole/ImportServiceRole", + "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2/ServiceRole/ImportServiceRole", "constructInfo": { "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" @@ -26,7 +26,7 @@ }, "Resource": { "id": "Resource", - "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2-0/ServiceRole/Resource", + "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2/ServiceRole/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::Role", "aws:cdk:cloudformation:props": { @@ -71,11 +71,11 @@ }, "Code": { "id": "Code", - "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2-0/Code", + "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2/Code", "children": { "Stage": { "id": "Stage", - "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2-0/Code/Stage", + "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2/Code/Stage", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", "version": "0.0.0" @@ -83,7 +83,7 @@ }, "AssetBucket": { "id": "AssetBucket", - "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2-0/Code/AssetBucket", + "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2/Code/AssetBucket", "constructInfo": { "fqn": "aws-cdk-lib.aws_s3.BucketBase", "version": "0.0.0" @@ -97,7 +97,7 @@ }, "Resource": { "id": "Resource", - "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2-0/Resource", + "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::Lambda::Function", "aws:cdk:cloudformation:props": { @@ -110,7 +110,7 @@ "handler": "bootstrap", "role": { "Fn::GetAtt": [ - "gohandlerprovidedal20ServiceRole8426AEF6", + "gohandlerprovidedal2ServiceRole0304E98B", "Arn" ] }, @@ -124,21 +124,21 @@ } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_lambda.Function", + "fqn": "@aws-cdk/aws-lambda-go-alpha.GoFunction", "version": "0.0.0" } }, - "go-handler-provided.al2023-1": { - "id": "go-handler-provided.al2023-1", - "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023-1", + "go-handler-provided.al2023": { + "id": "go-handler-provided.al2023", + "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023", "children": { "ServiceRole": { "id": "ServiceRole", - "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023-1/ServiceRole", + "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023/ServiceRole", "children": { "ImportServiceRole": { "id": "ImportServiceRole", - "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023-1/ServiceRole/ImportServiceRole", + "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023/ServiceRole/ImportServiceRole", "constructInfo": { "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" @@ -146,7 +146,7 @@ }, "Resource": { "id": "Resource", - "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023-1/ServiceRole/Resource", + "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023/ServiceRole/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::Role", "aws:cdk:cloudformation:props": { @@ -191,11 +191,11 @@ }, "Code": { "id": "Code", - "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023-1/Code", + "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023/Code", "children": { "Stage": { "id": "Stage", - "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023-1/Code/Stage", + "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023/Code/Stage", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", "version": "0.0.0" @@ -203,7 +203,7 @@ }, "AssetBucket": { "id": "AssetBucket", - "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023-1/Code/AssetBucket", + "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023/Code/AssetBucket", "constructInfo": { "fqn": "aws-cdk-lib.aws_s3.BucketBase", "version": "0.0.0" @@ -217,7 +217,7 @@ }, "Resource": { "id": "Resource", - "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023-1/Resource", + "path": "cdk-integ-lambda-golang-provided-al2023/go-handler-provided.al2023/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::Lambda::Function", "aws:cdk:cloudformation:props": { @@ -230,7 +230,7 @@ "handler": "bootstrap", "role": { "Fn::GetAtt": [ - "gohandlerprovidedal20231ServiceRole68A34C3F", + "gohandlerprovidedal2023ServiceRole27484815", "Arn" ] }, @@ -244,7 +244,7 @@ } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_lambda.Function", + "fqn": "@aws-cdk/aws-lambda-go-alpha.GoFunction", "version": "0.0.0" } }, @@ -252,17 +252,17 @@ "id": "Exports", "path": "cdk-integ-lambda-golang-provided-al2023/Exports", "children": { - "Output{\"Ref\":\"gohandlerprovidedal20A3EC5933\"}": { - "id": "Output{\"Ref\":\"gohandlerprovidedal20A3EC5933\"}", - "path": "cdk-integ-lambda-golang-provided-al2023/Exports/Output{\"Ref\":\"gohandlerprovidedal20A3EC5933\"}", + "Output{\"Ref\":\"gohandlerprovidedal263372523\"}": { + "id": "Output{\"Ref\":\"gohandlerprovidedal263372523\"}", + "path": "cdk-integ-lambda-golang-provided-al2023/Exports/Output{\"Ref\":\"gohandlerprovidedal263372523\"}", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" } }, - "Output{\"Ref\":\"gohandlerprovidedal2023182E754E4\"}": { - "id": "Output{\"Ref\":\"gohandlerprovidedal2023182E754E4\"}", - "path": "cdk-integ-lambda-golang-provided-al2023/Exports/Output{\"Ref\":\"gohandlerprovidedal2023182E754E4\"}", + "Output{\"Ref\":\"gohandlerprovidedal2023FA840EAA\"}": { + "id": "Output{\"Ref\":\"gohandlerprovidedal2023FA840EAA\"}", + "path": "cdk-integ-lambda-golang-provided-al2023/Exports/Output{\"Ref\":\"gohandlerprovidedal2023FA840EAA\"}", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" @@ -316,17 +316,17 @@ "id": "DeployAssert", "path": "lambda-go-runtime/DefaultTest/DeployAssert", "children": { - "LambdaInvokef3b58fd2af78e934527e05bc469d07dc": { - "id": "LambdaInvokef3b58fd2af78e934527e05bc469d07dc", - "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokef3b58fd2af78e934527e05bc469d07dc", + "LambdaInvoke2b6e8ea895f068736d6c24688beb0ea1": { + "id": "LambdaInvoke2b6e8ea895f068736d6c24688beb0ea1", + "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvoke2b6e8ea895f068736d6c24688beb0ea1", "children": { "SdkProvider": { "id": "SdkProvider", - "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokef3b58fd2af78e934527e05bc469d07dc/SdkProvider", + "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvoke2b6e8ea895f068736d6c24688beb0ea1/SdkProvider", "children": { "AssertionsProvider": { "id": "AssertionsProvider", - "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokef3b58fd2af78e934527e05bc469d07dc/SdkProvider/AssertionsProvider", + "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvoke2b6e8ea895f068736d6c24688beb0ea1/SdkProvider/AssertionsProvider", "constructInfo": { "fqn": "constructs.Construct", "version": "10.4.2" @@ -340,11 +340,11 @@ }, "Default": { "id": "Default", - "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokef3b58fd2af78e934527e05bc469d07dc/Default", + "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvoke2b6e8ea895f068736d6c24688beb0ea1/Default", "children": { "Default": { "id": "Default", - "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokef3b58fd2af78e934527e05bc469d07dc/Default/Default", + "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvoke2b6e8ea895f068736d6c24688beb0ea1/Default/Default", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -358,7 +358,7 @@ }, "Invoke": { "id": "Invoke", - "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokef3b58fd2af78e934527e05bc469d07dc/Invoke", + "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvoke2b6e8ea895f068736d6c24688beb0ea1/Invoke", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -366,7 +366,7 @@ }, "AssertionResults": { "id": "AssertionResults", - "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokef3b58fd2af78e934527e05bc469d07dc/AssertionResults", + "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvoke2b6e8ea895f068736d6c24688beb0ea1/AssertionResults", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" @@ -420,17 +420,17 @@ "version": "0.0.0" } }, - "LambdaInvokee64be71dc9e61c18c827e4067293abf7": { - "id": "LambdaInvokee64be71dc9e61c18c827e4067293abf7", - "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee64be71dc9e61c18c827e4067293abf7", + "LambdaInvokee243f6063740d52875d805d005f0d7bf": { + "id": "LambdaInvokee243f6063740d52875d805d005f0d7bf", + "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee243f6063740d52875d805d005f0d7bf", "children": { "SdkProvider": { "id": "SdkProvider", - "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee64be71dc9e61c18c827e4067293abf7/SdkProvider", + "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee243f6063740d52875d805d005f0d7bf/SdkProvider", "children": { "AssertionsProvider": { "id": "AssertionsProvider", - "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee64be71dc9e61c18c827e4067293abf7/SdkProvider/AssertionsProvider", + "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee243f6063740d52875d805d005f0d7bf/SdkProvider/AssertionsProvider", "constructInfo": { "fqn": "constructs.Construct", "version": "10.4.2" @@ -444,11 +444,11 @@ }, "Default": { "id": "Default", - "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee64be71dc9e61c18c827e4067293abf7/Default", + "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee243f6063740d52875d805d005f0d7bf/Default", "children": { "Default": { "id": "Default", - "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee64be71dc9e61c18c827e4067293abf7/Default/Default", + "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee243f6063740d52875d805d005f0d7bf/Default/Default", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -462,7 +462,7 @@ }, "Invoke": { "id": "Invoke", - "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee64be71dc9e61c18c827e4067293abf7/Invoke", + "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee243f6063740d52875d805d005f0d7bf/Invoke", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -470,7 +470,7 @@ }, "AssertionResults": { "id": "AssertionResults", - "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee64be71dc9e61c18c827e4067293abf7/AssertionResults", + "path": "lambda-go-runtime/DefaultTest/DeployAssert/LambdaInvokee243f6063740d52875d805d005f0d7bf/AssertionResults", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" diff --git a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.ts b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.ts index 0448fc396fb46..e12ed671185df 100644 --- a/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.ts +++ b/packages/@aws-cdk/aws-lambda-go-alpha/test/integ.function.provided.runtimes.ts @@ -13,8 +13,10 @@ class TestStack extends Stack { Runtime.PROVIDED_AL2, Runtime.PROVIDED_AL2023, ]; - runtimes.forEach((runtime, index) => { - this.lambdaFunctions.push(new lambda.GoFunction(this, `go-handler-${runtime.name}-${index}`, { + const uniqueRuntimes: Runtime[] = runtimes.filter((value, index, array) => array.findIndex(value1 => value1.runtimeEquals(value)) === index); + + uniqueRuntimes.forEach((runtime) => { + this.lambdaFunctions.push(new lambda.GoFunction(this, `go-handler-${runtime.name}`, { entry: path.join(__dirname, 'lambda-handler-vendor', 'cmd', 'api'), runtime: runtime, bundling: { diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/asset.b98abee59e034ed29eeb601684dc34752baa86509a7d457d72305d4e19ecc80b.bundle/index.js b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/asset.bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.bundle/index.js similarity index 99% rename from packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/asset.b98abee59e034ed29eeb601684dc34752baa86509a7d457d72305d4e19ecc80b.bundle/index.js rename to packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/asset.bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.bundle/index.js index b585fd2bb4a19..60e59701bc0e1 100644 --- a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/asset.b98abee59e034ed29eeb601684dc34752baa86509a7d457d72305d4e19ecc80b.bundle/index.js +++ b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/asset.bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.bundle/index.js @@ -152,7 +152,6 @@ var init_matcher = __esm({ */ toHumanStrings() { const failures = new Array(); - debugger; recurse(this, []); return failures.map((r) => { const loc = r.path.length === 0 ? "" : ` at /${r.path.join("/")}`; @@ -23574,9 +23573,9 @@ var require_safer = __commonJS({ } }); -// ../../../node_modules/iconv-lite/lib/bom-handling.js +// ../../../node_modules/encoding/node_modules/iconv-lite/lib/bom-handling.js var require_bom_handling = __commonJS({ - "../../../node_modules/iconv-lite/lib/bom-handling.js"(exports2) { + "../../../node_modules/encoding/node_modules/iconv-lite/lib/bom-handling.js"(exports2) { "use strict"; var BOMChar = "\uFEFF"; exports2.PrependBOM = PrependBOMWrapper; @@ -23618,9 +23617,9 @@ var require_bom_handling = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/internal.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/internal.js var require_internal = __commonJS({ - "../../../node_modules/iconv-lite/encodings/internal.js"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/internal.js"(exports2, module2) { "use strict"; var Buffer2 = require_safer().Buffer; module2.exports = { @@ -23770,9 +23769,9 @@ var require_internal = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/utf32.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/utf32.js var require_utf32 = __commonJS({ - "../../../node_modules/iconv-lite/encodings/utf32.js"(exports2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/utf32.js"(exports2) { "use strict"; var Buffer2 = require_safer().Buffer; exports2._utf32 = Utf32Codec; @@ -23989,9 +23988,9 @@ var require_utf32 = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/utf16.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/utf16.js var require_utf16 = __commonJS({ - "../../../node_modules/iconv-lite/encodings/utf16.js"(exports2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/utf16.js"(exports2) { "use strict"; var Buffer2 = require_safer().Buffer; exports2.utf16be = Utf16BECodec; @@ -24123,9 +24122,9 @@ var require_utf16 = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/utf7.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/utf7.js var require_utf7 = __commonJS({ - "../../../node_modules/iconv-lite/encodings/utf7.js"(exports2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/utf7.js"(exports2) { "use strict"; var Buffer2 = require_safer().Buffer; exports2.utf7 = Utf7Codec; @@ -24324,9 +24323,9 @@ var require_utf7 = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/sbcs-codec.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/sbcs-codec.js var require_sbcs_codec = __commonJS({ - "../../../node_modules/iconv-lite/encodings/sbcs-codec.js"(exports2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/sbcs-codec.js"(exports2) { "use strict"; var Buffer2 = require_safer().Buffer; exports2._sbcs = SBCSCodec; @@ -24380,9 +24379,9 @@ var require_sbcs_codec = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/sbcs-data.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/sbcs-data.js var require_sbcs_data = __commonJS({ - "../../../node_modules/iconv-lite/encodings/sbcs-data.js"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/sbcs-data.js"(exports2, module2) { "use strict"; module2.exports = { // Not supported by iconv, not sure why. @@ -24533,9 +24532,9 @@ var require_sbcs_data = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/sbcs-data-generated.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/sbcs-data-generated.js var require_sbcs_data_generated = __commonJS({ - "../../../node_modules/iconv-lite/encodings/sbcs-data-generated.js"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/sbcs-data-generated.js"(exports2, module2) { "use strict"; module2.exports = { "437": "cp437", @@ -24988,9 +24987,9 @@ var require_sbcs_data_generated = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/dbcs-codec.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/dbcs-codec.js var require_dbcs_codec = __commonJS({ - "../../../node_modules/iconv-lite/encodings/dbcs-codec.js"(exports2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/dbcs-codec.js"(exports2) { "use strict"; var Buffer2 = require_safer().Buffer; exports2._dbcs = DBCSCodec; @@ -25405,9 +25404,9 @@ var require_dbcs_codec = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/tables/shiftjis.json +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/shiftjis.json var require_shiftjis = __commonJS({ - "../../../node_modules/iconv-lite/encodings/tables/shiftjis.json"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/shiftjis.json"(exports2, module2) { module2.exports = [ ["0", "\0", 128], ["a1", "\uFF61", 62], @@ -25536,9 +25535,9 @@ var require_shiftjis = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/tables/eucjp.json +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/eucjp.json var require_eucjp = __commonJS({ - "../../../node_modules/iconv-lite/encodings/tables/eucjp.json"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/eucjp.json"(exports2, module2) { module2.exports = [ ["0", "\0", 127], ["8ea1", "\uFF61", 62], @@ -25724,9 +25723,9 @@ var require_eucjp = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/tables/cp936.json +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/cp936.json var require_cp936 = __commonJS({ - "../../../node_modules/iconv-lite/encodings/tables/cp936.json"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/cp936.json"(exports2, module2) { module2.exports = [ ["0", "\0", 127, "\u20AC"], ["8140", "\u4E02\u4E04\u4E05\u4E06\u4E0F\u4E12\u4E17\u4E1F\u4E20\u4E21\u4E23\u4E26\u4E29\u4E2E\u4E2F\u4E31\u4E33\u4E35\u4E37\u4E3C\u4E40\u4E41\u4E42\u4E44\u4E46\u4E4A\u4E51\u4E55\u4E57\u4E5A\u4E5B\u4E62\u4E63\u4E64\u4E65\u4E67\u4E68\u4E6A", 5, "\u4E72\u4E74", 9, "\u4E7F", 6, "\u4E87\u4E8A"], @@ -25994,9 +25993,9 @@ var require_cp936 = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/tables/gbk-added.json +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/gbk-added.json var require_gbk_added = __commonJS({ - "../../../node_modules/iconv-lite/encodings/tables/gbk-added.json"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/gbk-added.json"(exports2, module2) { module2.exports = [ ["a140", "\uE4C6", 62], ["a180", "\uE505", 32], @@ -26056,16 +26055,16 @@ var require_gbk_added = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/tables/gb18030-ranges.json +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/gb18030-ranges.json var require_gb18030_ranges = __commonJS({ - "../../../node_modules/iconv-lite/encodings/tables/gb18030-ranges.json"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/gb18030-ranges.json"(exports2, module2) { module2.exports = { uChars: [128, 165, 169, 178, 184, 216, 226, 235, 238, 244, 248, 251, 253, 258, 276, 284, 300, 325, 329, 334, 364, 463, 465, 467, 469, 471, 473, 475, 477, 506, 594, 610, 712, 716, 730, 930, 938, 962, 970, 1026, 1104, 1106, 8209, 8215, 8218, 8222, 8231, 8241, 8244, 8246, 8252, 8365, 8452, 8454, 8458, 8471, 8482, 8556, 8570, 8596, 8602, 8713, 8720, 8722, 8726, 8731, 8737, 8740, 8742, 8748, 8751, 8760, 8766, 8777, 8781, 8787, 8802, 8808, 8816, 8854, 8858, 8870, 8896, 8979, 9322, 9372, 9548, 9588, 9616, 9622, 9634, 9652, 9662, 9672, 9676, 9680, 9702, 9735, 9738, 9793, 9795, 11906, 11909, 11913, 11917, 11928, 11944, 11947, 11951, 11956, 11960, 11964, 11979, 12284, 12292, 12312, 12319, 12330, 12351, 12436, 12447, 12535, 12543, 12586, 12842, 12850, 12964, 13200, 13215, 13218, 13253, 13263, 13267, 13270, 13384, 13428, 13727, 13839, 13851, 14617, 14703, 14801, 14816, 14964, 15183, 15471, 15585, 16471, 16736, 17208, 17325, 17330, 17374, 17623, 17997, 18018, 18212, 18218, 18301, 18318, 18760, 18811, 18814, 18820, 18823, 18844, 18848, 18872, 19576, 19620, 19738, 19887, 40870, 59244, 59336, 59367, 59413, 59417, 59423, 59431, 59437, 59443, 59452, 59460, 59478, 59493, 63789, 63866, 63894, 63976, 63986, 64016, 64018, 64021, 64025, 64034, 64037, 64042, 65074, 65093, 65107, 65112, 65127, 65132, 65375, 65510, 65536], gbChars: [0, 36, 38, 45, 50, 81, 89, 95, 96, 100, 103, 104, 105, 109, 126, 133, 148, 172, 175, 179, 208, 306, 307, 308, 309, 310, 311, 312, 313, 341, 428, 443, 544, 545, 558, 741, 742, 749, 750, 805, 819, 820, 7922, 7924, 7925, 7927, 7934, 7943, 7944, 7945, 7950, 8062, 8148, 8149, 8152, 8164, 8174, 8236, 8240, 8262, 8264, 8374, 8380, 8381, 8384, 8388, 8390, 8392, 8393, 8394, 8396, 8401, 8406, 8416, 8419, 8424, 8437, 8439, 8445, 8482, 8485, 8496, 8521, 8603, 8936, 8946, 9046, 9050, 9063, 9066, 9076, 9092, 9100, 9108, 9111, 9113, 9131, 9162, 9164, 9218, 9219, 11329, 11331, 11334, 11336, 11346, 11361, 11363, 11366, 11370, 11372, 11375, 11389, 11682, 11686, 11687, 11692, 11694, 11714, 11716, 11723, 11725, 11730, 11736, 11982, 11989, 12102, 12336, 12348, 12350, 12384, 12393, 12395, 12397, 12510, 12553, 12851, 12962, 12973, 13738, 13823, 13919, 13933, 14080, 14298, 14585, 14698, 15583, 15847, 16318, 16434, 16438, 16481, 16729, 17102, 17122, 17315, 17320, 17402, 17418, 17859, 17909, 17911, 17915, 17916, 17936, 17939, 17961, 18664, 18703, 18814, 18962, 19043, 33469, 33470, 33471, 33484, 33485, 33490, 33497, 33501, 33505, 33513, 33520, 33536, 33550, 37845, 37921, 37948, 38029, 38038, 38064, 38065, 38066, 38069, 38075, 38076, 38078, 39108, 39109, 39113, 39114, 39115, 39116, 39265, 39394, 189e3] }; } }); -// ../../../node_modules/iconv-lite/encodings/tables/cp949.json +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/cp949.json var require_cp949 = __commonJS({ - "../../../node_modules/iconv-lite/encodings/tables/cp949.json"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/cp949.json"(exports2, module2) { module2.exports = [ ["0", "\0", 127], ["8141", "\uAC02\uAC03\uAC05\uAC06\uAC0B", 4, "\uAC18\uAC1E\uAC1F\uAC21\uAC22\uAC23\uAC25", 6, "\uAC2E\uAC32\uAC33\uAC34"], @@ -26342,9 +26341,9 @@ var require_cp949 = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/tables/cp950.json +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/cp950.json var require_cp950 = __commonJS({ - "../../../node_modules/iconv-lite/encodings/tables/cp950.json"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/cp950.json"(exports2, module2) { module2.exports = [ ["0", "\0", 127], ["a140", "\u3000\uFF0C\u3001\u3002\uFF0E\u2027\uFF1B\uFF1A\uFF1F\uFF01\uFE30\u2026\u2025\uFE50\uFE51\uFE52\xB7\uFE54\uFE55\uFE56\uFE57\uFF5C\u2013\uFE31\u2014\uFE33\u2574\uFE34\uFE4F\uFF08\uFF09\uFE35\uFE36\uFF5B\uFF5D\uFE37\uFE38\u3014\u3015\uFE39\uFE3A\u3010\u3011\uFE3B\uFE3C\u300A\u300B\uFE3D\uFE3E\u3008\u3009\uFE3F\uFE40\u300C\u300D\uFE41\uFE42\u300E\u300F\uFE43\uFE44\uFE59\uFE5A"], @@ -26525,9 +26524,9 @@ var require_cp950 = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/tables/big5-added.json +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/big5-added.json var require_big5_added = __commonJS({ - "../../../node_modules/iconv-lite/encodings/tables/big5-added.json"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/tables/big5-added.json"(exports2, module2) { module2.exports = [ ["8740", "\u43F0\u4C32\u4603\u45A6\u4578\u{27267}\u4D77\u45B3\u{27CB1}\u4CE2\u{27CC5}\u3B95\u4736\u4744\u4C47\u4C40\u{242BF}\u{23617}\u{27352}\u{26E8B}\u{270D2}\u4C57\u{2A351}\u474F\u45DA\u4C85\u{27C6C}\u4D07\u4AA4\u46A1\u{26B23}\u7225\u{25A54}\u{21A63}\u{23E06}\u{23F61}\u664D\u56FB"], ["8767", "\u7D95\u591D\u{28BB9}\u3DF4\u9734\u{27BEF}\u5BDB\u{21D5E}\u5AA4\u3625\u{29EB0}\u5AD1\u5BB7\u5CFC\u676E\u8593\u{29945}\u7461\u749D\u3875\u{21D53}\u{2369E}\u{26021}\u3EEC"], @@ -26653,9 +26652,9 @@ var require_big5_added = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/dbcs-data.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/dbcs-data.js var require_dbcs_data = __commonJS({ - "../../../node_modules/iconv-lite/encodings/dbcs-data.js"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/dbcs-data.js"(exports2, module2) { "use strict"; module2.exports = { // == Japanese/ShiftJIS ==================================================== @@ -26900,9 +26899,9 @@ var require_dbcs_data = __commonJS({ } }); -// ../../../node_modules/iconv-lite/encodings/index.js +// ../../../node_modules/encoding/node_modules/iconv-lite/encodings/index.js var require_encodings = __commonJS({ - "../../../node_modules/iconv-lite/encodings/index.js"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/encodings/index.js"(exports2, module2) { "use strict"; var modules = [ require_internal(), @@ -26927,9 +26926,9 @@ var require_encodings = __commonJS({ } }); -// ../../../node_modules/iconv-lite/lib/streams.js +// ../../../node_modules/encoding/node_modules/iconv-lite/lib/streams.js var require_streams = __commonJS({ - "../../../node_modules/iconv-lite/lib/streams.js"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/lib/streams.js"(exports2, module2) { "use strict"; var Buffer2 = require_safer().Buffer; module2.exports = function(stream_module) { @@ -27022,9 +27021,9 @@ var require_streams = __commonJS({ } }); -// ../../../node_modules/iconv-lite/lib/index.js +// ../../../node_modules/encoding/node_modules/iconv-lite/lib/index.js var require_lib2 = __commonJS({ - "../../../node_modules/iconv-lite/lib/index.js"(exports2, module2) { + "../../../node_modules/encoding/node_modules/iconv-lite/lib/index.js"(exports2, module2) { "use strict"; var Buffer2 = require_safer().Buffer; var bomHandling = require_bom_handling(); diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/cdk.out b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/cdk.out index c6e612584e352..91e1a8b9901d5 100644 --- a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/cdk.out +++ b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/cdk.out @@ -1 +1 @@ -{"version":"38.0.1"} \ No newline at end of file +{"version":"39.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/integ-lambda-python-test-build-images.assets.json b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/integ-lambda-python-test-build-images.assets.json index cf399cec24a51..00a2f22a5c3c5 100644 --- a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/integ-lambda-python-test-build-images.assets.json +++ b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/integ-lambda-python-test-build-images.assets.json @@ -1,85 +1,72 @@ { - "version": "38.0.1", + "version": "39.0.0", "files": { - "5460d7e540a2c310c947f772c884382675ac0a06ba60e11fb8c1864feb6d642a": { + "f0d84a92fcedcb86c75a171578ce1049be08692d576eefe2785798d3966559f8": { "source": { - "path": "asset.5460d7e540a2c310c947f772c884382675ac0a06ba60e11fb8c1864feb6d642a", + "path": "asset.f0d84a92fcedcb86c75a171578ce1049be08692d576eefe2785798d3966559f8", "packaging": "zip" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "5460d7e540a2c310c947f772c884382675ac0a06ba60e11fb8c1864feb6d642a.zip", + "objectKey": "f0d84a92fcedcb86c75a171578ce1049be08692d576eefe2785798d3966559f8.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "c6315ec36c3caa6d7af488cc4a3d4e2cdb314e006f146c196b2c29acf018cf00": { + "603cf7a1b4100a862c9deef2e2868ed4e835a95f8aaf0c2179fc73c560603ab7": { "source": { - "path": "asset.c6315ec36c3caa6d7af488cc4a3d4e2cdb314e006f146c196b2c29acf018cf00", + "path": "asset.603cf7a1b4100a862c9deef2e2868ed4e835a95f8aaf0c2179fc73c560603ab7", "packaging": "zip" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "c6315ec36c3caa6d7af488cc4a3d4e2cdb314e006f146c196b2c29acf018cf00.zip", + "objectKey": "603cf7a1b4100a862c9deef2e2868ed4e835a95f8aaf0c2179fc73c560603ab7.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "7c56b2150fc5df63cdcdb3596617be55b3c8b5b8d6aff8a254740ac53ff247f9": { + "2eec7314a6eaa29434975bf12ae867f360393e41ee78fc2bab858fe940ff18f1": { "source": { - "path": "asset.7c56b2150fc5df63cdcdb3596617be55b3c8b5b8d6aff8a254740ac53ff247f9", + "path": "asset.2eec7314a6eaa29434975bf12ae867f360393e41ee78fc2bab858fe940ff18f1", "packaging": "zip" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "7c56b2150fc5df63cdcdb3596617be55b3c8b5b8d6aff8a254740ac53ff247f9.zip", + "objectKey": "2eec7314a6eaa29434975bf12ae867f360393e41ee78fc2bab858fe940ff18f1.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "e09f78a4fdb87fb9eb5035afda64212ecf2ad072580e870a2d665036d482b5f7": { + "4556386f866bfec99a16c2d6a08ccafd85513a07078f7253255a132cde85644d": { "source": { - "path": "asset.e09f78a4fdb87fb9eb5035afda64212ecf2ad072580e870a2d665036d482b5f7", + "path": "asset.4556386f866bfec99a16c2d6a08ccafd85513a07078f7253255a132cde85644d", "packaging": "zip" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "e09f78a4fdb87fb9eb5035afda64212ecf2ad072580e870a2d665036d482b5f7.zip", + "objectKey": "4556386f866bfec99a16c2d6a08ccafd85513a07078f7253255a132cde85644d.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "5873808ef8cdd51f37645d88568d2c07313b9bc5990984c12df6c3725b2f4b69": { + "0287b06105fd20f2a11d7afcd2939968452bad969729dde7d1ac46cc71b1b18a": { "source": { - "path": "asset.5873808ef8cdd51f37645d88568d2c07313b9bc5990984c12df6c3725b2f4b69", + "path": "asset.0287b06105fd20f2a11d7afcd2939968452bad969729dde7d1ac46cc71b1b18a", "packaging": "zip" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "5873808ef8cdd51f37645d88568d2c07313b9bc5990984c12df6c3725b2f4b69.zip", + "objectKey": "0287b06105fd20f2a11d7afcd2939968452bad969729dde7d1ac46cc71b1b18a.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "fc9e9296f7d6c6238ccc33e0f45e0183f3c9aae92eca22d6b4744633e439b802": { - "source": { - "path": "asset.fc9e9296f7d6c6238ccc33e0f45e0183f3c9aae92eca22d6b4744633e439b802", - "packaging": "zip" - }, - "destinations": { - "current_account-current_region": { - "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "fc9e9296f7d6c6238ccc33e0f45e0183f3c9aae92eca22d6b4744633e439b802.zip", - "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" - } - } - }, - "b137af517a6361552724231af66a692319b567f04214dac25b362dc47335e5d3": { + "a7a4fb29dd2634794668ee93203cee2f6731c30c1934ef6fbe0f80ca8b0962f9": { "source": { "path": "integ-lambda-python-test-build-images.template.json", "packaging": "file" @@ -87,7 +74,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "b137af517a6361552724231af66a692319b567f04214dac25b362dc47335e5d3.json", + "objectKey": "a7a4fb29dd2634794668ee93203cee2f6731c30c1934ef6fbe0f80ca8b0962f9.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/integ-lambda-python-test-build-images.template.json b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/integ-lambda-python-test-build-images.template.json index c18d29c41c3f9..e9124db0f3544 100644 --- a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/integ-lambda-python-test-build-images.template.json +++ b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/integ-lambda-python-test-build-images.template.json @@ -1,6 +1,6 @@ { "Resources": { - "funcpython380ServiceRoleEAFB3F8E": { + "funcpython39ServiceRole0E545AAB": { "Type": "AWS::IAM::Role", "Properties": { "AssumeRolePolicyDocument": { @@ -31,82 +31,29 @@ ] } }, - "funcpython380BF74015B": { + "funcpython395C6514A4": { "Type": "AWS::Lambda::Function", "Properties": { "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5460d7e540a2c310c947f772c884382675ac0a06ba60e11fb8c1864feb6d642a.zip" + "S3Key": "f0d84a92fcedcb86c75a171578ce1049be08692d576eefe2785798d3966559f8.zip" }, "Handler": "index.handler", "Role": { "Fn::GetAtt": [ - "funcpython380ServiceRoleEAFB3F8E", - "Arn" - ] - }, - "Runtime": "python3.8" - }, - "DependsOn": [ - "funcpython380ServiceRoleEAFB3F8E" - ] - }, - "funcpython391ServiceRoleB031D4B2": { - "Type": "AWS::IAM::Role", - "Properties": { - "AssumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "lambda.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - }, - "ManagedPolicyArns": [ - { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" - ] - ] - } - ] - } - }, - "funcpython391BF9E5A5D": { - "Type": "AWS::Lambda::Function", - "Properties": { - "Code": { - "S3Bucket": { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "S3Key": "c6315ec36c3caa6d7af488cc4a3d4e2cdb314e006f146c196b2c29acf018cf00.zip" - }, - "Handler": "index.handler", - "Role": { - "Fn::GetAtt": [ - "funcpython391ServiceRoleB031D4B2", + "funcpython39ServiceRole0E545AAB", "Arn" ] }, "Runtime": "python3.9" }, "DependsOn": [ - "funcpython391ServiceRoleB031D4B2" + "funcpython39ServiceRole0E545AAB" ] }, - "funcpython3102ServiceRole2EEE2C30": { + "funcpython310ServiceRole420BCC1A": { "Type": "AWS::IAM::Role", "Properties": { "AssumeRolePolicyDocument": { @@ -137,29 +84,29 @@ ] } }, - "funcpython310250533D21": { + "funcpython310172B0718": { "Type": "AWS::Lambda::Function", "Properties": { "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "7c56b2150fc5df63cdcdb3596617be55b3c8b5b8d6aff8a254740ac53ff247f9.zip" + "S3Key": "603cf7a1b4100a862c9deef2e2868ed4e835a95f8aaf0c2179fc73c560603ab7.zip" }, "Handler": "index.handler", "Role": { "Fn::GetAtt": [ - "funcpython3102ServiceRole2EEE2C30", + "funcpython310ServiceRole420BCC1A", "Arn" ] }, "Runtime": "python3.10" }, "DependsOn": [ - "funcpython3102ServiceRole2EEE2C30" + "funcpython310ServiceRole420BCC1A" ] }, - "funcpython3113ServiceRole85D1934B": { + "funcpython311ServiceRoleE57E73A3": { "Type": "AWS::IAM::Role", "Properties": { "AssumeRolePolicyDocument": { @@ -190,29 +137,29 @@ ] } }, - "funcpython3113A38A32E0": { + "funcpython3111F585CD4": { "Type": "AWS::Lambda::Function", "Properties": { "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "e09f78a4fdb87fb9eb5035afda64212ecf2ad072580e870a2d665036d482b5f7.zip" + "S3Key": "2eec7314a6eaa29434975bf12ae867f360393e41ee78fc2bab858fe940ff18f1.zip" }, "Handler": "index.handler", "Role": { "Fn::GetAtt": [ - "funcpython3113ServiceRole85D1934B", + "funcpython311ServiceRoleE57E73A3", "Arn" ] }, "Runtime": "python3.11" }, "DependsOn": [ - "funcpython3113ServiceRole85D1934B" + "funcpython311ServiceRoleE57E73A3" ] }, - "funcpython3124ServiceRoleC78288F5": { + "funcpython312ServiceRole100DA5E2": { "Type": "AWS::IAM::Role", "Properties": { "AssumeRolePolicyDocument": { @@ -243,29 +190,29 @@ ] } }, - "funcpython3124329A17EA": { + "funcpython3122CBD643A": { "Type": "AWS::Lambda::Function", "Properties": { "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "5873808ef8cdd51f37645d88568d2c07313b9bc5990984c12df6c3725b2f4b69.zip" + "S3Key": "4556386f866bfec99a16c2d6a08ccafd85513a07078f7253255a132cde85644d.zip" }, "Handler": "index.handler", "Role": { "Fn::GetAtt": [ - "funcpython3124ServiceRoleC78288F5", + "funcpython312ServiceRole100DA5E2", "Arn" ] }, "Runtime": "python3.12" }, "DependsOn": [ - "funcpython3124ServiceRoleC78288F5" + "funcpython312ServiceRole100DA5E2" ] }, - "funcpython3135ServiceRoleA06F3D90": { + "funcpython313ServiceRoleB9C1B3D0": { "Type": "AWS::IAM::Role", "Properties": { "AssumeRolePolicyDocument": { @@ -296,76 +243,68 @@ ] } }, - "funcpython313531E5474B": { + "funcpython313412235A8": { "Type": "AWS::Lambda::Function", "Properties": { "Code": { "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "fc9e9296f7d6c6238ccc33e0f45e0183f3c9aae92eca22d6b4744633e439b802.zip" + "S3Key": "0287b06105fd20f2a11d7afcd2939968452bad969729dde7d1ac46cc71b1b18a.zip" }, "Handler": "index.handler", "Role": { "Fn::GetAtt": [ - "funcpython3135ServiceRoleA06F3D90", + "funcpython313ServiceRoleB9C1B3D0", "Arn" ] }, "Runtime": "python3.13" }, "DependsOn": [ - "funcpython3135ServiceRoleA06F3D90" + "funcpython313ServiceRoleB9C1B3D0" ] } }, "Outputs": { - "ExportsOutputReffuncpython380BF74015B373B58A8": { - "Value": { - "Ref": "funcpython380BF74015B" - }, - "Export": { - "Name": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython380BF74015B373B58A8" - } - }, - "ExportsOutputReffuncpython391BF9E5A5D2A1CC211": { + "ExportsOutputReffuncpython395C6514A4FF6AA1CF": { "Value": { - "Ref": "funcpython391BF9E5A5D" + "Ref": "funcpython395C6514A4" }, "Export": { - "Name": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython391BF9E5A5D2A1CC211" + "Name": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython395C6514A4FF6AA1CF" } }, - "ExportsOutputReffuncpython310250533D219FAC6CD2": { + "ExportsOutputReffuncpython310172B07183FDAB4C5": { "Value": { - "Ref": "funcpython310250533D21" + "Ref": "funcpython310172B0718" }, "Export": { - "Name": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython310250533D219FAC6CD2" + "Name": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython310172B07183FDAB4C5" } }, - "ExportsOutputReffuncpython3113A38A32E025FF457A": { + "ExportsOutputReffuncpython3111F585CD475F56B0A": { "Value": { - "Ref": "funcpython3113A38A32E0" + "Ref": "funcpython3111F585CD4" }, "Export": { - "Name": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython3113A38A32E025FF457A" + "Name": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython3111F585CD475F56B0A" } }, - "ExportsOutputReffuncpython3124329A17EAFCC62348": { + "ExportsOutputReffuncpython3122CBD643AA9BB5D5A": { "Value": { - "Ref": "funcpython3124329A17EA" + "Ref": "funcpython3122CBD643A" }, "Export": { - "Name": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython3124329A17EAFCC62348" + "Name": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython3122CBD643AA9BB5D5A" } }, - "ExportsOutputReffuncpython313531E5474BAFBC149D": { + "ExportsOutputReffuncpython313412235A8A629B84E": { "Value": { - "Ref": "funcpython313531E5474B" + "Ref": "funcpython313412235A8" }, "Export": { - "Name": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython313531E5474BAFBC149D" + "Name": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython313412235A8A629B84E" } } }, diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/integ.json b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/integ.json index e0f176a8b25ac..fdd58c195f8b5 100644 --- a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/integ.json +++ b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/integ.json @@ -1,5 +1,5 @@ { - "version": "38.0.1", + "version": "39.0.0", "testCases": { "lambda-python-build-images/DefaultTest": { "stacks": [ diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/lambdapythonbuildimagesDefaultTestDeployAssertB7623923.assets.json b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/lambdapythonbuildimagesDefaultTestDeployAssertB7623923.assets.json index 4f6b71ce2cb23..6aba9a520ab5f 100644 --- a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/lambdapythonbuildimagesDefaultTestDeployAssertB7623923.assets.json +++ b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/lambdapythonbuildimagesDefaultTestDeployAssertB7623923.assets.json @@ -1,20 +1,20 @@ { - "version": "38.0.1", + "version": "39.0.0", "files": { - "b98abee59e034ed29eeb601684dc34752baa86509a7d457d72305d4e19ecc80b": { + "bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981": { "source": { - "path": "asset.b98abee59e034ed29eeb601684dc34752baa86509a7d457d72305d4e19ecc80b.bundle", + "path": "asset.bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.bundle", "packaging": "zip" }, "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "b98abee59e034ed29eeb601684dc34752baa86509a7d457d72305d4e19ecc80b.zip", + "objectKey": "bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.zip", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } }, - "0220f10efe41cfec1b747afa780558e4d437f4596192126f3f52b044d9f78a7c": { + "ad166f40f32315b00dfabd440c98523d82500dc16a52cf7e474a92efec36c7f2": { "source": { "path": "lambdapythonbuildimagesDefaultTestDeployAssertB7623923.template.json", "packaging": "file" @@ -22,7 +22,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "0220f10efe41cfec1b747afa780558e4d437f4596192126f3f52b044d9f78a7c.json", + "objectKey": "ad166f40f32315b00dfabd440c98523d82500dc16a52cf7e474a92efec36c7f2.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/lambdapythonbuildimagesDefaultTestDeployAssertB7623923.template.json b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/lambdapythonbuildimagesDefaultTestDeployAssertB7623923.template.json index aea26d0fe4f65..b7b1e11337631 100644 --- a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/lambdapythonbuildimagesDefaultTestDeployAssertB7623923.template.json +++ b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/lambdapythonbuildimagesDefaultTestDeployAssertB7623923.template.json @@ -1,6 +1,6 @@ { "Resources": { - "LambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57a": { + "LambdaInvoke4650aafbbe2e36433a126276d078658c": { "Type": "Custom::DeployAssert@SdkCallLambdainvoke", "Properties": { "ServiceToken": { @@ -19,7 +19,7 @@ [ "\"", { - "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython380BF74015B373B58A8" + "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython395C6514A4FF6AA1CF" }, "\"" ] @@ -27,17 +27,17 @@ } }, "flattenResponse": "false", - "salt": "1732468146431" + "salt": "1736369711421" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "LambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57aInvoke616147C3": { + "LambdaInvoke4650aafbbe2e36433a126276d078658cInvoke00F25FEC": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", "FunctionName": { - "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython380BF74015B373B58A8" + "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython395C6514A4FF6AA1CF" }, "Principal": { "Fn::GetAtt": [ @@ -106,7 +106,7 @@ }, ":function:", { - "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython380BF74015B373B58A8" + "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython395C6514A4FF6AA1CF" } ] ] @@ -146,7 +146,7 @@ }, ":function:", { - "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython391BF9E5A5D2A1CC211" + "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython310172B07183FDAB4C5" } ] ] @@ -186,7 +186,7 @@ }, ":function:", { - "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython310250533D219FAC6CD2" + "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython3111F585CD475F56B0A" } ] ] @@ -226,7 +226,7 @@ }, ":function:", { - "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython3113A38A32E025FF457A" + "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython3122CBD643AA9BB5D5A" } ] ] @@ -266,47 +266,7 @@ }, ":function:", { - "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython3124329A17EAFCC62348" - } - ] - ] - } - ] - }, - { - "Action": [ - "lambda:Invoke" - ], - "Effect": "Allow", - "Resource": [ - "*" - ] - }, - { - "Action": [ - "lambda:InvokeFunction" - ], - "Effect": "Allow", - "Resource": [ - { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":lambda:", - { - "Ref": "AWS::Region" - }, - ":", - { - "Ref": "AWS::AccountId" - }, - ":function:", - { - "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython313531E5474BAFBC149D" + "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython313412235A8A629B84E" } ] ] @@ -335,7 +295,7 @@ "S3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "S3Key": "b98abee59e034ed29eeb601684dc34752baa86509a7d457d72305d4e19ecc80b.zip" + "S3Key": "bfcf4228d6660f50e81f19efdb64c6388dda6796296eb239decdff1dbc2f4981.zip" }, "Timeout": 120, "Handler": "index.handler", @@ -347,7 +307,7 @@ } } }, - "LambdaInvoke4707fc22bb930064a0aa4daddd8e9724": { + "LambdaInvoke27dacea55ae28848262afba8ca16ad80": { "Type": "Custom::DeployAssert@SdkCallLambdainvoke", "Properties": { "ServiceToken": { @@ -366,7 +326,7 @@ [ "\"", { - "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython391BF9E5A5D2A1CC211" + "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython310172B07183FDAB4C5" }, "\"" ] @@ -374,17 +334,17 @@ } }, "flattenResponse": "false", - "salt": "1732468146440" + "salt": "1736369711423" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "LambdaInvoke4707fc22bb930064a0aa4daddd8e9724InvokeDA192FC8": { + "LambdaInvoke27dacea55ae28848262afba8ca16ad80Invoke71D9945A": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", "FunctionName": { - "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython391BF9E5A5D2A1CC211" + "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython310172B07183FDAB4C5" }, "Principal": { "Fn::GetAtt": [ @@ -394,7 +354,7 @@ } } }, - "LambdaInvokea14da806a02dc330fe79e6272b5cb4a2": { + "LambdaInvokef88cb886ad84615afbbcb0f0c3db07f0": { "Type": "Custom::DeployAssert@SdkCallLambdainvoke", "Properties": { "ServiceToken": { @@ -413,7 +373,7 @@ [ "\"", { - "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython310250533D219FAC6CD2" + "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython3111F585CD475F56B0A" }, "\"" ] @@ -421,17 +381,17 @@ } }, "flattenResponse": "false", - "salt": "1732468146441" + "salt": "1736369711423" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "LambdaInvokea14da806a02dc330fe79e6272b5cb4a2InvokeE5D4E2D2": { + "LambdaInvokef88cb886ad84615afbbcb0f0c3db07f0InvokeD196D5AF": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", "FunctionName": { - "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython310250533D219FAC6CD2" + "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython3111F585CD475F56B0A" }, "Principal": { "Fn::GetAtt": [ @@ -441,7 +401,7 @@ } } }, - "LambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4": { + "LambdaInvokeb44964fb0d419ef7e8d915cdb662e346": { "Type": "Custom::DeployAssert@SdkCallLambdainvoke", "Properties": { "ServiceToken": { @@ -460,7 +420,7 @@ [ "\"", { - "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython3113A38A32E025FF457A" + "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython3122CBD643AA9BB5D5A" }, "\"" ] @@ -468,17 +428,17 @@ } }, "flattenResponse": "false", - "salt": "1732468146441" + "salt": "1736369711423" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "LambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4Invoke8FCD61D9": { + "LambdaInvokeb44964fb0d419ef7e8d915cdb662e346Invoke47E1EFBF": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", "FunctionName": { - "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython3113A38A32E025FF457A" + "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython3122CBD643AA9BB5D5A" }, "Principal": { "Fn::GetAtt": [ @@ -488,7 +448,7 @@ } } }, - "LambdaInvoke93b8a4fb01c1d0d88873f49b99b27bba": { + "LambdaInvokec96c44400b6e11ce551edcc6cedc0f39": { "Type": "Custom::DeployAssert@SdkCallLambdainvoke", "Properties": { "ServiceToken": { @@ -507,7 +467,7 @@ [ "\"", { - "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython3124329A17EAFCC62348" + "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython313412235A8A629B84E" }, "\"" ] @@ -515,64 +475,17 @@ } }, "flattenResponse": "false", - "salt": "1732468146441" + "salt": "1736369711424" }, "UpdateReplacePolicy": "Delete", "DeletionPolicy": "Delete" }, - "LambdaInvoke93b8a4fb01c1d0d88873f49b99b27bbaInvoke5AB32309": { + "LambdaInvokec96c44400b6e11ce551edcc6cedc0f39InvokeE744DC6B": { "Type": "AWS::Lambda::Permission", "Properties": { "Action": "lambda:InvokeFunction", "FunctionName": { - "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython3124329A17EAFCC62348" - }, - "Principal": { - "Fn::GetAtt": [ - "SingletonFunction1488541a7b23466481b69b4408076b81Role37ABCE73", - "Arn" - ] - } - } - }, - "LambdaInvoke25576161f786619878cd1227f298bb94": { - "Type": "Custom::DeployAssert@SdkCallLambdainvoke", - "Properties": { - "ServiceToken": { - "Fn::GetAtt": [ - "SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F", - "Arn" - ] - }, - "service": "Lambda", - "api": "invoke", - "expected": "{\"$ObjectLike\":{\"Payload\":\"200\"}}", - "parameters": { - "FunctionName": { - "Fn::Join": [ - "", - [ - "\"", - { - "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython313531E5474BAFBC149D" - }, - "\"" - ] - ] - } - }, - "flattenResponse": "false", - "salt": "1732468146441" - }, - "UpdateReplacePolicy": "Delete", - "DeletionPolicy": "Delete" - }, - "LambdaInvoke25576161f786619878cd1227f298bb94Invoke2EB3CA92": { - "Type": "AWS::Lambda::Permission", - "Properties": { - "Action": "lambda:InvokeFunction", - "FunctionName": { - "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython313531E5474BAFBC149D" + "Fn::ImportValue": "integ-lambda-python-test-build-images:ExportsOutputReffuncpython313412235A8A629B84E" }, "Principal": { "Fn::GetAtt": [ @@ -584,50 +497,42 @@ } }, "Outputs": { - "AssertionResultsLambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57a": { - "Value": { - "Fn::GetAtt": [ - "LambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57a", - "assertion" - ] - } - }, - "AssertionResultsLambdaInvoke4707fc22bb930064a0aa4daddd8e9724": { + "AssertionResultsLambdaInvoke4650aafbbe2e36433a126276d078658c": { "Value": { "Fn::GetAtt": [ - "LambdaInvoke4707fc22bb930064a0aa4daddd8e9724", + "LambdaInvoke4650aafbbe2e36433a126276d078658c", "assertion" ] } }, - "AssertionResultsLambdaInvokea14da806a02dc330fe79e6272b5cb4a2": { + "AssertionResultsLambdaInvoke27dacea55ae28848262afba8ca16ad80": { "Value": { "Fn::GetAtt": [ - "LambdaInvokea14da806a02dc330fe79e6272b5cb4a2", + "LambdaInvoke27dacea55ae28848262afba8ca16ad80", "assertion" ] } }, - "AssertionResultsLambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4": { + "AssertionResultsLambdaInvokef88cb886ad84615afbbcb0f0c3db07f0": { "Value": { "Fn::GetAtt": [ - "LambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4", + "LambdaInvokef88cb886ad84615afbbcb0f0c3db07f0", "assertion" ] } }, - "AssertionResultsLambdaInvoke93b8a4fb01c1d0d88873f49b99b27bba": { + "AssertionResultsLambdaInvokeb44964fb0d419ef7e8d915cdb662e346": { "Value": { "Fn::GetAtt": [ - "LambdaInvoke93b8a4fb01c1d0d88873f49b99b27bba", + "LambdaInvokeb44964fb0d419ef7e8d915cdb662e346", "assertion" ] } }, - "AssertionResultsLambdaInvoke25576161f786619878cd1227f298bb94": { + "AssertionResultsLambdaInvokec96c44400b6e11ce551edcc6cedc0f39": { "Value": { "Fn::GetAtt": [ - "LambdaInvoke25576161f786619878cd1227f298bb94", + "LambdaInvokec96c44400b6e11ce551edcc6cedc0f39", "assertion" ] } diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/manifest.json b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/manifest.json index ede2fe7a3351b..3809077de5a5e 100644 --- a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/manifest.json @@ -1,5 +1,5 @@ { - "version": "38.0.1", + "version": "39.0.0", "artifacts": { "integ-lambda-python-test-build-images.assets": { "type": "cdk:asset-manifest", @@ -18,7 +18,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/b137af517a6361552724231af66a692319b567f04214dac25b362dc47335e5d3.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a7a4fb29dd2634794668ee93203cee2f6731c30c1934ef6fbe0f80ca8b0962f9.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -34,124 +34,196 @@ "integ-lambda-python-test-build-images.assets" ], "metadata": { - "/integ-lambda-python-test-build-images/func-python3.8-0/ServiceRole/Resource": [ + "/integ-lambda-python-test-build-images/func-python3.9/ServiceRole/Resource": [ { "type": "aws:cdk:logicalId", - "data": "funcpython380ServiceRoleEAFB3F8E" + "data": "funcpython39ServiceRole0E545AAB" } ], - "/integ-lambda-python-test-build-images/func-python3.8-0/Resource": [ + "/integ-lambda-python-test-build-images/func-python3.9/Resource": [ { "type": "aws:cdk:logicalId", - "data": "funcpython380BF74015B" + "data": "funcpython395C6514A4" } ], - "/integ-lambda-python-test-build-images/func-python3.9-1/ServiceRole/Resource": [ + "/integ-lambda-python-test-build-images/func-python3.10/ServiceRole/Resource": [ { "type": "aws:cdk:logicalId", - "data": "funcpython391ServiceRoleB031D4B2" + "data": "funcpython310ServiceRole420BCC1A" } ], - "/integ-lambda-python-test-build-images/func-python3.9-1/Resource": [ + "/integ-lambda-python-test-build-images/func-python3.10/Resource": [ { "type": "aws:cdk:logicalId", - "data": "funcpython391BF9E5A5D" + "data": "funcpython310172B0718" } ], - "/integ-lambda-python-test-build-images/func-python3.10-2/ServiceRole/Resource": [ + "/integ-lambda-python-test-build-images/func-python3.11/ServiceRole/Resource": [ { "type": "aws:cdk:logicalId", - "data": "funcpython3102ServiceRole2EEE2C30" + "data": "funcpython311ServiceRoleE57E73A3" } ], - "/integ-lambda-python-test-build-images/func-python3.10-2/Resource": [ + "/integ-lambda-python-test-build-images/func-python3.11/Resource": [ { "type": "aws:cdk:logicalId", - "data": "funcpython310250533D21" + "data": "funcpython3111F585CD4" } ], - "/integ-lambda-python-test-build-images/func-python3.11-3/ServiceRole/Resource": [ + "/integ-lambda-python-test-build-images/func-python3.12/ServiceRole/Resource": [ { "type": "aws:cdk:logicalId", - "data": "funcpython3113ServiceRole85D1934B" + "data": "funcpython312ServiceRole100DA5E2" } ], - "/integ-lambda-python-test-build-images/func-python3.11-3/Resource": [ + "/integ-lambda-python-test-build-images/func-python3.12/Resource": [ { "type": "aws:cdk:logicalId", - "data": "funcpython3113A38A32E0" + "data": "funcpython3122CBD643A" } ], - "/integ-lambda-python-test-build-images/func-python3.12-4/ServiceRole/Resource": [ + "/integ-lambda-python-test-build-images/func-python3.13/ServiceRole/Resource": [ { "type": "aws:cdk:logicalId", - "data": "funcpython3124ServiceRoleC78288F5" + "data": "funcpython313ServiceRoleB9C1B3D0" } ], - "/integ-lambda-python-test-build-images/func-python3.12-4/Resource": [ + "/integ-lambda-python-test-build-images/func-python3.13/Resource": [ { "type": "aws:cdk:logicalId", - "data": "funcpython3124329A17EA" + "data": "funcpython313412235A8" } ], - "/integ-lambda-python-test-build-images/func-python3.13-5/ServiceRole/Resource": [ + "/integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython395C6514A4\"}": [ { "type": "aws:cdk:logicalId", - "data": "funcpython3135ServiceRoleA06F3D90" + "data": "ExportsOutputReffuncpython395C6514A4FF6AA1CF" } ], - "/integ-lambda-python-test-build-images/func-python3.13-5/Resource": [ + "/integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython310172B0718\"}": [ { "type": "aws:cdk:logicalId", - "data": "funcpython313531E5474B" + "data": "ExportsOutputReffuncpython310172B07183FDAB4C5" } ], - "/integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython380BF74015B\"}": [ + "/integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython3111F585CD4\"}": [ { "type": "aws:cdk:logicalId", - "data": "ExportsOutputReffuncpython380BF74015B373B58A8" + "data": "ExportsOutputReffuncpython3111F585CD475F56B0A" } ], - "/integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython391BF9E5A5D\"}": [ + "/integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython3122CBD643A\"}": [ { "type": "aws:cdk:logicalId", - "data": "ExportsOutputReffuncpython391BF9E5A5D2A1CC211" + "data": "ExportsOutputReffuncpython3122CBD643AA9BB5D5A" } ], - "/integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython310250533D21\"}": [ + "/integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython313412235A8\"}": [ { "type": "aws:cdk:logicalId", - "data": "ExportsOutputReffuncpython310250533D219FAC6CD2" + "data": "ExportsOutputReffuncpython313412235A8A629B84E" } ], - "/integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython3113A38A32E0\"}": [ + "/integ-lambda-python-test-build-images/BootstrapVersion": [ { "type": "aws:cdk:logicalId", - "data": "ExportsOutputReffuncpython3113A38A32E025FF457A" + "data": "BootstrapVersion" } ], - "/integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython3124329A17EA\"}": [ + "/integ-lambda-python-test-build-images/CheckBootstrapVersion": [ { "type": "aws:cdk:logicalId", - "data": "ExportsOutputReffuncpython3124329A17EAFCC62348" + "data": "CheckBootstrapVersion" } ], - "/integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython313531E5474B\"}": [ + "funcpython390ServiceRole02A01172": [ { "type": "aws:cdk:logicalId", - "data": "ExportsOutputReffuncpython313531E5474BAFBC149D" + "data": "funcpython390ServiceRole02A01172", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] } ], - "/integ-lambda-python-test-build-images/BootstrapVersion": [ + "funcpython3900426EA0F": [ { "type": "aws:cdk:logicalId", - "data": "BootstrapVersion" + "data": "funcpython3900426EA0F", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] } ], - "/integ-lambda-python-test-build-images/CheckBootstrapVersion": [ + "funcpython3101ServiceRole383A2D2B": [ { "type": "aws:cdk:logicalId", - "data": "CheckBootstrapVersion" + "data": "funcpython3101ServiceRole383A2D2B", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "funcpython3101663DCBA4": [ + { + "type": "aws:cdk:logicalId", + "data": "funcpython3101663DCBA4", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "funcpython3112ServiceRole28831AE7": [ + { + "type": "aws:cdk:logicalId", + "data": "funcpython3112ServiceRole28831AE7", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "funcpython311237E1A864": [ + { + "type": "aws:cdk:logicalId", + "data": "funcpython311237E1A864", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "funcpython3123ServiceRole518636DC": [ + { + "type": "aws:cdk:logicalId", + "data": "funcpython3123ServiceRole518636DC", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "funcpython31232EE13CCD": [ + { + "type": "aws:cdk:logicalId", + "data": "funcpython31232EE13CCD", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "funcpython3134ServiceRole83E60B67": [ + { + "type": "aws:cdk:logicalId", + "data": "funcpython3134ServiceRole83E60B67", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] + } + ], + "funcpython31342B5CC056": [ + { + "type": "aws:cdk:logicalId", + "data": "funcpython31342B5CC056", + "trace": [ + "!!DESTRUCTIVE_CHANGES: WILL_DESTROY" + ] } ] }, @@ -174,7 +246,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0220f10efe41cfec1b747afa780558e4d437f4596192126f3f52b044d9f78a7c.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/ad166f40f32315b00dfabd440c98523d82500dc16a52cf7e474a92efec36c7f2.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ @@ -191,22 +263,22 @@ "lambdapythonbuildimagesDefaultTestDeployAssertB7623923.assets" ], "metadata": { - "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57a/Default/Default": [ + "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4650aafbbe2e36433a126276d078658c/Default/Default": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57a" + "data": "LambdaInvoke4650aafbbe2e36433a126276d078658c" } ], - "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57a/Invoke": [ + "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4650aafbbe2e36433a126276d078658c/Invoke": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57aInvoke616147C3" + "data": "LambdaInvoke4650aafbbe2e36433a126276d078658cInvoke00F25FEC" } ], - "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57a/AssertionResults": [ + "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4650aafbbe2e36433a126276d078658c/AssertionResults": [ { "type": "aws:cdk:logicalId", - "data": "AssertionResultsLambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57a" + "data": "AssertionResultsLambdaInvoke4650aafbbe2e36433a126276d078658c" } ], "/lambda-python-build-images/DefaultTest/DeployAssert/SingletonFunction1488541a7b23466481b69b4408076b81/Role": [ @@ -227,94 +299,76 @@ "data": "LatestNodeRuntimeMap" } ], - "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4707fc22bb930064a0aa4daddd8e9724/Default/Default": [ - { - "type": "aws:cdk:logicalId", - "data": "LambdaInvoke4707fc22bb930064a0aa4daddd8e9724" - } - ], - "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4707fc22bb930064a0aa4daddd8e9724/Invoke": [ - { - "type": "aws:cdk:logicalId", - "data": "LambdaInvoke4707fc22bb930064a0aa4daddd8e9724InvokeDA192FC8" - } - ], - "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4707fc22bb930064a0aa4daddd8e9724/AssertionResults": [ - { - "type": "aws:cdk:logicalId", - "data": "AssertionResultsLambdaInvoke4707fc22bb930064a0aa4daddd8e9724" - } - ], - "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokea14da806a02dc330fe79e6272b5cb4a2/Default/Default": [ + "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke27dacea55ae28848262afba8ca16ad80/Default/Default": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvokea14da806a02dc330fe79e6272b5cb4a2" + "data": "LambdaInvoke27dacea55ae28848262afba8ca16ad80" } ], - "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokea14da806a02dc330fe79e6272b5cb4a2/Invoke": [ + "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke27dacea55ae28848262afba8ca16ad80/Invoke": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvokea14da806a02dc330fe79e6272b5cb4a2InvokeE5D4E2D2" + "data": "LambdaInvoke27dacea55ae28848262afba8ca16ad80Invoke71D9945A" } ], - "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokea14da806a02dc330fe79e6272b5cb4a2/AssertionResults": [ + "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke27dacea55ae28848262afba8ca16ad80/AssertionResults": [ { "type": "aws:cdk:logicalId", - "data": "AssertionResultsLambdaInvokea14da806a02dc330fe79e6272b5cb4a2" + "data": "AssertionResultsLambdaInvoke27dacea55ae28848262afba8ca16ad80" } ], - "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4/Default/Default": [ + "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokef88cb886ad84615afbbcb0f0c3db07f0/Default/Default": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4" + "data": "LambdaInvokef88cb886ad84615afbbcb0f0c3db07f0" } ], - "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4/Invoke": [ + "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokef88cb886ad84615afbbcb0f0c3db07f0/Invoke": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4Invoke8FCD61D9" + "data": "LambdaInvokef88cb886ad84615afbbcb0f0c3db07f0InvokeD196D5AF" } ], - "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4/AssertionResults": [ + "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokef88cb886ad84615afbbcb0f0c3db07f0/AssertionResults": [ { "type": "aws:cdk:logicalId", - "data": "AssertionResultsLambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4" + "data": "AssertionResultsLambdaInvokef88cb886ad84615afbbcb0f0c3db07f0" } ], - "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke93b8a4fb01c1d0d88873f49b99b27bba/Default/Default": [ + "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokeb44964fb0d419ef7e8d915cdb662e346/Default/Default": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvoke93b8a4fb01c1d0d88873f49b99b27bba" + "data": "LambdaInvokeb44964fb0d419ef7e8d915cdb662e346" } ], - "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke93b8a4fb01c1d0d88873f49b99b27bba/Invoke": [ + "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokeb44964fb0d419ef7e8d915cdb662e346/Invoke": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvoke93b8a4fb01c1d0d88873f49b99b27bbaInvoke5AB32309" + "data": "LambdaInvokeb44964fb0d419ef7e8d915cdb662e346Invoke47E1EFBF" } ], - "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke93b8a4fb01c1d0d88873f49b99b27bba/AssertionResults": [ + "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokeb44964fb0d419ef7e8d915cdb662e346/AssertionResults": [ { "type": "aws:cdk:logicalId", - "data": "AssertionResultsLambdaInvoke93b8a4fb01c1d0d88873f49b99b27bba" + "data": "AssertionResultsLambdaInvokeb44964fb0d419ef7e8d915cdb662e346" } ], - "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke25576161f786619878cd1227f298bb94/Default/Default": [ + "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokec96c44400b6e11ce551edcc6cedc0f39/Default/Default": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvoke25576161f786619878cd1227f298bb94" + "data": "LambdaInvokec96c44400b6e11ce551edcc6cedc0f39" } ], - "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke25576161f786619878cd1227f298bb94/Invoke": [ + "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokec96c44400b6e11ce551edcc6cedc0f39/Invoke": [ { "type": "aws:cdk:logicalId", - "data": "LambdaInvoke25576161f786619878cd1227f298bb94Invoke2EB3CA92" + "data": "LambdaInvokec96c44400b6e11ce551edcc6cedc0f39InvokeE744DC6B" } ], - "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke25576161f786619878cd1227f298bb94/AssertionResults": [ + "/lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokec96c44400b6e11ce551edcc6cedc0f39/AssertionResults": [ { "type": "aws:cdk:logicalId", - "data": "AssertionResultsLambdaInvoke25576161f786619878cd1227f298bb94" + "data": "AssertionResultsLambdaInvokec96c44400b6e11ce551edcc6cedc0f39" } ], "/lambda-python-build-images/DefaultTest/DeployAssert/BootstrapVersion": [ diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/tree.json b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/tree.json index 9fac798f32075..2a6f00aae62b7 100644 --- a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/tree.json +++ b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.js.snapshot/tree.json @@ -8,17 +8,17 @@ "id": "integ-lambda-python-test-build-images", "path": "integ-lambda-python-test-build-images", "children": { - "func-python3.8-0": { - "id": "func-python3.8-0", - "path": "integ-lambda-python-test-build-images/func-python3.8-0", + "func-python3.9": { + "id": "func-python3.9", + "path": "integ-lambda-python-test-build-images/func-python3.9", "children": { "ServiceRole": { "id": "ServiceRole", - "path": "integ-lambda-python-test-build-images/func-python3.8-0/ServiceRole", + "path": "integ-lambda-python-test-build-images/func-python3.9/ServiceRole", "children": { "ImportServiceRole": { "id": "ImportServiceRole", - "path": "integ-lambda-python-test-build-images/func-python3.8-0/ServiceRole/ImportServiceRole", + "path": "integ-lambda-python-test-build-images/func-python3.9/ServiceRole/ImportServiceRole", "constructInfo": { "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" @@ -26,7 +26,7 @@ }, "Resource": { "id": "Resource", - "path": "integ-lambda-python-test-build-images/func-python3.8-0/ServiceRole/Resource", + "path": "integ-lambda-python-test-build-images/func-python3.9/ServiceRole/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::Role", "aws:cdk:cloudformation:props": { @@ -71,11 +71,11 @@ }, "Code": { "id": "Code", - "path": "integ-lambda-python-test-build-images/func-python3.8-0/Code", + "path": "integ-lambda-python-test-build-images/func-python3.9/Code", "children": { "Stage": { "id": "Stage", - "path": "integ-lambda-python-test-build-images/func-python3.8-0/Code/Stage", + "path": "integ-lambda-python-test-build-images/func-python3.9/Code/Stage", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", "version": "0.0.0" @@ -83,7 +83,7 @@ }, "AssetBucket": { "id": "AssetBucket", - "path": "integ-lambda-python-test-build-images/func-python3.8-0/Code/AssetBucket", + "path": "integ-lambda-python-test-build-images/func-python3.9/Code/AssetBucket", "constructInfo": { "fqn": "aws-cdk-lib.aws_s3.BucketBase", "version": "0.0.0" @@ -97,7 +97,7 @@ }, "Resource": { "id": "Resource", - "path": "integ-lambda-python-test-build-images/func-python3.8-0/Resource", + "path": "integ-lambda-python-test-build-images/func-python3.9/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::Lambda::Function", "aws:cdk:cloudformation:props": { @@ -105,132 +105,12 @@ "s3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "s3Key": "5460d7e540a2c310c947f772c884382675ac0a06ba60e11fb8c1864feb6d642a.zip" + "s3Key": "f0d84a92fcedcb86c75a171578ce1049be08692d576eefe2785798d3966559f8.zip" }, "handler": "index.handler", "role": { "Fn::GetAtt": [ - "funcpython380ServiceRoleEAFB3F8E", - "Arn" - ] - }, - "runtime": "python3.8" - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_lambda.CfnFunction", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_lambda.Function", - "version": "0.0.0" - } - }, - "func-python3.9-1": { - "id": "func-python3.9-1", - "path": "integ-lambda-python-test-build-images/func-python3.9-1", - "children": { - "ServiceRole": { - "id": "ServiceRole", - "path": "integ-lambda-python-test-build-images/func-python3.9-1/ServiceRole", - "children": { - "ImportServiceRole": { - "id": "ImportServiceRole", - "path": "integ-lambda-python-test-build-images/func-python3.9-1/ServiceRole/ImportServiceRole", - "constructInfo": { - "fqn": "aws-cdk-lib.Resource", - "version": "0.0.0" - } - }, - "Resource": { - "id": "Resource", - "path": "integ-lambda-python-test-build-images/func-python3.9-1/ServiceRole/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::IAM::Role", - "aws:cdk:cloudformation:props": { - "assumeRolePolicyDocument": { - "Statement": [ - { - "Action": "sts:AssumeRole", - "Effect": "Allow", - "Principal": { - "Service": "lambda.amazonaws.com" - } - } - ], - "Version": "2012-10-17" - }, - "managedPolicyArns": [ - { - "Fn::Join": [ - "", - [ - "arn:", - { - "Ref": "AWS::Partition" - }, - ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole" - ] - ] - } - ] - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_iam.CfnRole", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_iam.Role", - "version": "0.0.0" - } - }, - "Code": { - "id": "Code", - "path": "integ-lambda-python-test-build-images/func-python3.9-1/Code", - "children": { - "Stage": { - "id": "Stage", - "path": "integ-lambda-python-test-build-images/func-python3.9-1/Code/Stage", - "constructInfo": { - "fqn": "aws-cdk-lib.AssetStaging", - "version": "0.0.0" - } - }, - "AssetBucket": { - "id": "AssetBucket", - "path": "integ-lambda-python-test-build-images/func-python3.9-1/Code/AssetBucket", - "constructInfo": { - "fqn": "aws-cdk-lib.aws_s3.BucketBase", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.aws_s3_assets.Asset", - "version": "0.0.0" - } - }, - "Resource": { - "id": "Resource", - "path": "integ-lambda-python-test-build-images/func-python3.9-1/Resource", - "attributes": { - "aws:cdk:cloudformation:type": "AWS::Lambda::Function", - "aws:cdk:cloudformation:props": { - "code": { - "s3Bucket": { - "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" - }, - "s3Key": "c6315ec36c3caa6d7af488cc4a3d4e2cdb314e006f146c196b2c29acf018cf00.zip" - }, - "handler": "index.handler", - "role": { - "Fn::GetAtt": [ - "funcpython391ServiceRoleB031D4B2", + "funcpython39ServiceRole0E545AAB", "Arn" ] }, @@ -244,21 +124,21 @@ } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_lambda.Function", + "fqn": "@aws-cdk/aws-lambda-python-alpha.PythonFunction", "version": "0.0.0" } }, - "func-python3.10-2": { - "id": "func-python3.10-2", - "path": "integ-lambda-python-test-build-images/func-python3.10-2", + "func-python3.10": { + "id": "func-python3.10", + "path": "integ-lambda-python-test-build-images/func-python3.10", "children": { "ServiceRole": { "id": "ServiceRole", - "path": "integ-lambda-python-test-build-images/func-python3.10-2/ServiceRole", + "path": "integ-lambda-python-test-build-images/func-python3.10/ServiceRole", "children": { "ImportServiceRole": { "id": "ImportServiceRole", - "path": "integ-lambda-python-test-build-images/func-python3.10-2/ServiceRole/ImportServiceRole", + "path": "integ-lambda-python-test-build-images/func-python3.10/ServiceRole/ImportServiceRole", "constructInfo": { "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" @@ -266,7 +146,7 @@ }, "Resource": { "id": "Resource", - "path": "integ-lambda-python-test-build-images/func-python3.10-2/ServiceRole/Resource", + "path": "integ-lambda-python-test-build-images/func-python3.10/ServiceRole/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::Role", "aws:cdk:cloudformation:props": { @@ -311,11 +191,11 @@ }, "Code": { "id": "Code", - "path": "integ-lambda-python-test-build-images/func-python3.10-2/Code", + "path": "integ-lambda-python-test-build-images/func-python3.10/Code", "children": { "Stage": { "id": "Stage", - "path": "integ-lambda-python-test-build-images/func-python3.10-2/Code/Stage", + "path": "integ-lambda-python-test-build-images/func-python3.10/Code/Stage", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", "version": "0.0.0" @@ -323,7 +203,7 @@ }, "AssetBucket": { "id": "AssetBucket", - "path": "integ-lambda-python-test-build-images/func-python3.10-2/Code/AssetBucket", + "path": "integ-lambda-python-test-build-images/func-python3.10/Code/AssetBucket", "constructInfo": { "fqn": "aws-cdk-lib.aws_s3.BucketBase", "version": "0.0.0" @@ -337,7 +217,7 @@ }, "Resource": { "id": "Resource", - "path": "integ-lambda-python-test-build-images/func-python3.10-2/Resource", + "path": "integ-lambda-python-test-build-images/func-python3.10/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::Lambda::Function", "aws:cdk:cloudformation:props": { @@ -345,12 +225,12 @@ "s3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "s3Key": "7c56b2150fc5df63cdcdb3596617be55b3c8b5b8d6aff8a254740ac53ff247f9.zip" + "s3Key": "603cf7a1b4100a862c9deef2e2868ed4e835a95f8aaf0c2179fc73c560603ab7.zip" }, "handler": "index.handler", "role": { "Fn::GetAtt": [ - "funcpython3102ServiceRole2EEE2C30", + "funcpython310ServiceRole420BCC1A", "Arn" ] }, @@ -364,21 +244,21 @@ } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_lambda.Function", + "fqn": "@aws-cdk/aws-lambda-python-alpha.PythonFunction", "version": "0.0.0" } }, - "func-python3.11-3": { - "id": "func-python3.11-3", - "path": "integ-lambda-python-test-build-images/func-python3.11-3", + "func-python3.11": { + "id": "func-python3.11", + "path": "integ-lambda-python-test-build-images/func-python3.11", "children": { "ServiceRole": { "id": "ServiceRole", - "path": "integ-lambda-python-test-build-images/func-python3.11-3/ServiceRole", + "path": "integ-lambda-python-test-build-images/func-python3.11/ServiceRole", "children": { "ImportServiceRole": { "id": "ImportServiceRole", - "path": "integ-lambda-python-test-build-images/func-python3.11-3/ServiceRole/ImportServiceRole", + "path": "integ-lambda-python-test-build-images/func-python3.11/ServiceRole/ImportServiceRole", "constructInfo": { "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" @@ -386,7 +266,7 @@ }, "Resource": { "id": "Resource", - "path": "integ-lambda-python-test-build-images/func-python3.11-3/ServiceRole/Resource", + "path": "integ-lambda-python-test-build-images/func-python3.11/ServiceRole/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::Role", "aws:cdk:cloudformation:props": { @@ -431,11 +311,11 @@ }, "Code": { "id": "Code", - "path": "integ-lambda-python-test-build-images/func-python3.11-3/Code", + "path": "integ-lambda-python-test-build-images/func-python3.11/Code", "children": { "Stage": { "id": "Stage", - "path": "integ-lambda-python-test-build-images/func-python3.11-3/Code/Stage", + "path": "integ-lambda-python-test-build-images/func-python3.11/Code/Stage", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", "version": "0.0.0" @@ -443,7 +323,7 @@ }, "AssetBucket": { "id": "AssetBucket", - "path": "integ-lambda-python-test-build-images/func-python3.11-3/Code/AssetBucket", + "path": "integ-lambda-python-test-build-images/func-python3.11/Code/AssetBucket", "constructInfo": { "fqn": "aws-cdk-lib.aws_s3.BucketBase", "version": "0.0.0" @@ -457,7 +337,7 @@ }, "Resource": { "id": "Resource", - "path": "integ-lambda-python-test-build-images/func-python3.11-3/Resource", + "path": "integ-lambda-python-test-build-images/func-python3.11/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::Lambda::Function", "aws:cdk:cloudformation:props": { @@ -465,12 +345,12 @@ "s3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "s3Key": "e09f78a4fdb87fb9eb5035afda64212ecf2ad072580e870a2d665036d482b5f7.zip" + "s3Key": "2eec7314a6eaa29434975bf12ae867f360393e41ee78fc2bab858fe940ff18f1.zip" }, "handler": "index.handler", "role": { "Fn::GetAtt": [ - "funcpython3113ServiceRole85D1934B", + "funcpython311ServiceRoleE57E73A3", "Arn" ] }, @@ -484,21 +364,21 @@ } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_lambda.Function", + "fqn": "@aws-cdk/aws-lambda-python-alpha.PythonFunction", "version": "0.0.0" } }, - "func-python3.12-4": { - "id": "func-python3.12-4", - "path": "integ-lambda-python-test-build-images/func-python3.12-4", + "func-python3.12": { + "id": "func-python3.12", + "path": "integ-lambda-python-test-build-images/func-python3.12", "children": { "ServiceRole": { "id": "ServiceRole", - "path": "integ-lambda-python-test-build-images/func-python3.12-4/ServiceRole", + "path": "integ-lambda-python-test-build-images/func-python3.12/ServiceRole", "children": { "ImportServiceRole": { "id": "ImportServiceRole", - "path": "integ-lambda-python-test-build-images/func-python3.12-4/ServiceRole/ImportServiceRole", + "path": "integ-lambda-python-test-build-images/func-python3.12/ServiceRole/ImportServiceRole", "constructInfo": { "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" @@ -506,7 +386,7 @@ }, "Resource": { "id": "Resource", - "path": "integ-lambda-python-test-build-images/func-python3.12-4/ServiceRole/Resource", + "path": "integ-lambda-python-test-build-images/func-python3.12/ServiceRole/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::Role", "aws:cdk:cloudformation:props": { @@ -551,11 +431,11 @@ }, "Code": { "id": "Code", - "path": "integ-lambda-python-test-build-images/func-python3.12-4/Code", + "path": "integ-lambda-python-test-build-images/func-python3.12/Code", "children": { "Stage": { "id": "Stage", - "path": "integ-lambda-python-test-build-images/func-python3.12-4/Code/Stage", + "path": "integ-lambda-python-test-build-images/func-python3.12/Code/Stage", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", "version": "0.0.0" @@ -563,7 +443,7 @@ }, "AssetBucket": { "id": "AssetBucket", - "path": "integ-lambda-python-test-build-images/func-python3.12-4/Code/AssetBucket", + "path": "integ-lambda-python-test-build-images/func-python3.12/Code/AssetBucket", "constructInfo": { "fqn": "aws-cdk-lib.aws_s3.BucketBase", "version": "0.0.0" @@ -577,7 +457,7 @@ }, "Resource": { "id": "Resource", - "path": "integ-lambda-python-test-build-images/func-python3.12-4/Resource", + "path": "integ-lambda-python-test-build-images/func-python3.12/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::Lambda::Function", "aws:cdk:cloudformation:props": { @@ -585,12 +465,12 @@ "s3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "s3Key": "5873808ef8cdd51f37645d88568d2c07313b9bc5990984c12df6c3725b2f4b69.zip" + "s3Key": "4556386f866bfec99a16c2d6a08ccafd85513a07078f7253255a132cde85644d.zip" }, "handler": "index.handler", "role": { "Fn::GetAtt": [ - "funcpython3124ServiceRoleC78288F5", + "funcpython312ServiceRole100DA5E2", "Arn" ] }, @@ -604,21 +484,21 @@ } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_lambda.Function", + "fqn": "@aws-cdk/aws-lambda-python-alpha.PythonFunction", "version": "0.0.0" } }, - "func-python3.13-5": { - "id": "func-python3.13-5", - "path": "integ-lambda-python-test-build-images/func-python3.13-5", + "func-python3.13": { + "id": "func-python3.13", + "path": "integ-lambda-python-test-build-images/func-python3.13", "children": { "ServiceRole": { "id": "ServiceRole", - "path": "integ-lambda-python-test-build-images/func-python3.13-5/ServiceRole", + "path": "integ-lambda-python-test-build-images/func-python3.13/ServiceRole", "children": { "ImportServiceRole": { "id": "ImportServiceRole", - "path": "integ-lambda-python-test-build-images/func-python3.13-5/ServiceRole/ImportServiceRole", + "path": "integ-lambda-python-test-build-images/func-python3.13/ServiceRole/ImportServiceRole", "constructInfo": { "fqn": "aws-cdk-lib.Resource", "version": "0.0.0" @@ -626,7 +506,7 @@ }, "Resource": { "id": "Resource", - "path": "integ-lambda-python-test-build-images/func-python3.13-5/ServiceRole/Resource", + "path": "integ-lambda-python-test-build-images/func-python3.13/ServiceRole/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::IAM::Role", "aws:cdk:cloudformation:props": { @@ -671,11 +551,11 @@ }, "Code": { "id": "Code", - "path": "integ-lambda-python-test-build-images/func-python3.13-5/Code", + "path": "integ-lambda-python-test-build-images/func-python3.13/Code", "children": { "Stage": { "id": "Stage", - "path": "integ-lambda-python-test-build-images/func-python3.13-5/Code/Stage", + "path": "integ-lambda-python-test-build-images/func-python3.13/Code/Stage", "constructInfo": { "fqn": "aws-cdk-lib.AssetStaging", "version": "0.0.0" @@ -683,7 +563,7 @@ }, "AssetBucket": { "id": "AssetBucket", - "path": "integ-lambda-python-test-build-images/func-python3.13-5/Code/AssetBucket", + "path": "integ-lambda-python-test-build-images/func-python3.13/Code/AssetBucket", "constructInfo": { "fqn": "aws-cdk-lib.aws_s3.BucketBase", "version": "0.0.0" @@ -697,7 +577,7 @@ }, "Resource": { "id": "Resource", - "path": "integ-lambda-python-test-build-images/func-python3.13-5/Resource", + "path": "integ-lambda-python-test-build-images/func-python3.13/Resource", "attributes": { "aws:cdk:cloudformation:type": "AWS::Lambda::Function", "aws:cdk:cloudformation:props": { @@ -705,12 +585,12 @@ "s3Bucket": { "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" }, - "s3Key": "fc9e9296f7d6c6238ccc33e0f45e0183f3c9aae92eca22d6b4744633e439b802.zip" + "s3Key": "0287b06105fd20f2a11d7afcd2939968452bad969729dde7d1ac46cc71b1b18a.zip" }, "handler": "index.handler", "role": { "Fn::GetAtt": [ - "funcpython3135ServiceRoleA06F3D90", + "funcpython313ServiceRoleB9C1B3D0", "Arn" ] }, @@ -724,7 +604,7 @@ } }, "constructInfo": { - "fqn": "aws-cdk-lib.aws_lambda.Function", + "fqn": "@aws-cdk/aws-lambda-python-alpha.PythonFunction", "version": "0.0.0" } }, @@ -732,49 +612,41 @@ "id": "Exports", "path": "integ-lambda-python-test-build-images/Exports", "children": { - "Output{\"Ref\":\"funcpython380BF74015B\"}": { - "id": "Output{\"Ref\":\"funcpython380BF74015B\"}", - "path": "integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython380BF74015B\"}", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnOutput", - "version": "0.0.0" - } - }, - "Output{\"Ref\":\"funcpython391BF9E5A5D\"}": { - "id": "Output{\"Ref\":\"funcpython391BF9E5A5D\"}", - "path": "integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython391BF9E5A5D\"}", + "Output{\"Ref\":\"funcpython395C6514A4\"}": { + "id": "Output{\"Ref\":\"funcpython395C6514A4\"}", + "path": "integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython395C6514A4\"}", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" } }, - "Output{\"Ref\":\"funcpython310250533D21\"}": { - "id": "Output{\"Ref\":\"funcpython310250533D21\"}", - "path": "integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython310250533D21\"}", + "Output{\"Ref\":\"funcpython310172B0718\"}": { + "id": "Output{\"Ref\":\"funcpython310172B0718\"}", + "path": "integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython310172B0718\"}", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" } }, - "Output{\"Ref\":\"funcpython3113A38A32E0\"}": { - "id": "Output{\"Ref\":\"funcpython3113A38A32E0\"}", - "path": "integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython3113A38A32E0\"}", + "Output{\"Ref\":\"funcpython3111F585CD4\"}": { + "id": "Output{\"Ref\":\"funcpython3111F585CD4\"}", + "path": "integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython3111F585CD4\"}", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" } }, - "Output{\"Ref\":\"funcpython3124329A17EA\"}": { - "id": "Output{\"Ref\":\"funcpython3124329A17EA\"}", - "path": "integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython3124329A17EA\"}", + "Output{\"Ref\":\"funcpython3122CBD643A\"}": { + "id": "Output{\"Ref\":\"funcpython3122CBD643A\"}", + "path": "integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython3122CBD643A\"}", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" } }, - "Output{\"Ref\":\"funcpython313531E5474B\"}": { - "id": "Output{\"Ref\":\"funcpython313531E5474B\"}", - "path": "integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython313531E5474B\"}", + "Output{\"Ref\":\"funcpython313412235A8\"}": { + "id": "Output{\"Ref\":\"funcpython313412235A8\"}", + "path": "integ-lambda-python-test-build-images/Exports/Output{\"Ref\":\"funcpython313412235A8\"}", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" @@ -828,17 +700,17 @@ "id": "DeployAssert", "path": "lambda-python-build-images/DefaultTest/DeployAssert", "children": { - "LambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57a": { - "id": "LambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57a", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57a", + "LambdaInvoke4650aafbbe2e36433a126276d078658c": { + "id": "LambdaInvoke4650aafbbe2e36433a126276d078658c", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4650aafbbe2e36433a126276d078658c", "children": { "SdkProvider": { "id": "SdkProvider", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57a/SdkProvider", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4650aafbbe2e36433a126276d078658c/SdkProvider", "children": { "AssertionsProvider": { "id": "AssertionsProvider", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57a/SdkProvider/AssertionsProvider", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4650aafbbe2e36433a126276d078658c/SdkProvider/AssertionsProvider", "constructInfo": { "fqn": "constructs.Construct", "version": "10.4.2" @@ -852,11 +724,11 @@ }, "Default": { "id": "Default", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57a/Default", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4650aafbbe2e36433a126276d078658c/Default", "children": { "Default": { "id": "Default", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57a/Default/Default", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4650aafbbe2e36433a126276d078658c/Default/Default", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -870,7 +742,7 @@ }, "Invoke": { "id": "Invoke", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57a/Invoke", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4650aafbbe2e36433a126276d078658c/Invoke", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -878,7 +750,7 @@ }, "AssertionResults": { "id": "AssertionResults", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4fc1d0a7bd77a13e1f50b9923bf9e57a/AssertionResults", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4650aafbbe2e36433a126276d078658c/AssertionResults", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" @@ -932,79 +804,17 @@ "version": "0.0.0" } }, - "LambdaInvoke4707fc22bb930064a0aa4daddd8e9724": { - "id": "LambdaInvoke4707fc22bb930064a0aa4daddd8e9724", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4707fc22bb930064a0aa4daddd8e9724", - "children": { - "SdkProvider": { - "id": "SdkProvider", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4707fc22bb930064a0aa4daddd8e9724/SdkProvider", - "children": { - "AssertionsProvider": { - "id": "AssertionsProvider", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4707fc22bb930064a0aa4daddd8e9724/SdkProvider/AssertionsProvider", - "constructInfo": { - "fqn": "constructs.Construct", - "version": "10.4.2" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/integ-tests-alpha.AssertionsProvider", - "version": "0.0.0" - } - }, - "Default": { - "id": "Default", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4707fc22bb930064a0aa4daddd8e9724/Default", - "children": { - "Default": { - "id": "Default", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4707fc22bb930064a0aa4daddd8e9724/Default/Default", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "aws-cdk-lib.CustomResource", - "version": "0.0.0" - } - }, - "Invoke": { - "id": "Invoke", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4707fc22bb930064a0aa4daddd8e9724/Invoke", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnResource", - "version": "0.0.0" - } - }, - "AssertionResults": { - "id": "AssertionResults", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke4707fc22bb930064a0aa4daddd8e9724/AssertionResults", - "constructInfo": { - "fqn": "aws-cdk-lib.CfnOutput", - "version": "0.0.0" - } - } - }, - "constructInfo": { - "fqn": "@aws-cdk/integ-tests-alpha.LambdaInvokeFunction", - "version": "0.0.0" - } - }, - "LambdaInvokea14da806a02dc330fe79e6272b5cb4a2": { - "id": "LambdaInvokea14da806a02dc330fe79e6272b5cb4a2", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokea14da806a02dc330fe79e6272b5cb4a2", + "LambdaInvoke27dacea55ae28848262afba8ca16ad80": { + "id": "LambdaInvoke27dacea55ae28848262afba8ca16ad80", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke27dacea55ae28848262afba8ca16ad80", "children": { "SdkProvider": { "id": "SdkProvider", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokea14da806a02dc330fe79e6272b5cb4a2/SdkProvider", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke27dacea55ae28848262afba8ca16ad80/SdkProvider", "children": { "AssertionsProvider": { "id": "AssertionsProvider", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokea14da806a02dc330fe79e6272b5cb4a2/SdkProvider/AssertionsProvider", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke27dacea55ae28848262afba8ca16ad80/SdkProvider/AssertionsProvider", "constructInfo": { "fqn": "constructs.Construct", "version": "10.4.2" @@ -1018,11 +828,11 @@ }, "Default": { "id": "Default", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokea14da806a02dc330fe79e6272b5cb4a2/Default", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke27dacea55ae28848262afba8ca16ad80/Default", "children": { "Default": { "id": "Default", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokea14da806a02dc330fe79e6272b5cb4a2/Default/Default", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke27dacea55ae28848262afba8ca16ad80/Default/Default", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -1036,7 +846,7 @@ }, "Invoke": { "id": "Invoke", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokea14da806a02dc330fe79e6272b5cb4a2/Invoke", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke27dacea55ae28848262afba8ca16ad80/Invoke", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -1044,7 +854,7 @@ }, "AssertionResults": { "id": "AssertionResults", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokea14da806a02dc330fe79e6272b5cb4a2/AssertionResults", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke27dacea55ae28848262afba8ca16ad80/AssertionResults", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" @@ -1056,17 +866,17 @@ "version": "0.0.0" } }, - "LambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4": { - "id": "LambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4", + "LambdaInvokef88cb886ad84615afbbcb0f0c3db07f0": { + "id": "LambdaInvokef88cb886ad84615afbbcb0f0c3db07f0", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokef88cb886ad84615afbbcb0f0c3db07f0", "children": { "SdkProvider": { "id": "SdkProvider", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4/SdkProvider", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokef88cb886ad84615afbbcb0f0c3db07f0/SdkProvider", "children": { "AssertionsProvider": { "id": "AssertionsProvider", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4/SdkProvider/AssertionsProvider", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokef88cb886ad84615afbbcb0f0c3db07f0/SdkProvider/AssertionsProvider", "constructInfo": { "fqn": "constructs.Construct", "version": "10.4.2" @@ -1080,11 +890,11 @@ }, "Default": { "id": "Default", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4/Default", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokef88cb886ad84615afbbcb0f0c3db07f0/Default", "children": { "Default": { "id": "Default", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4/Default/Default", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokef88cb886ad84615afbbcb0f0c3db07f0/Default/Default", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -1098,7 +908,7 @@ }, "Invoke": { "id": "Invoke", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4/Invoke", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokef88cb886ad84615afbbcb0f0c3db07f0/Invoke", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -1106,7 +916,7 @@ }, "AssertionResults": { "id": "AssertionResults", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoked94ae5ddb38d1dc5e431fe152e2d51f4/AssertionResults", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokef88cb886ad84615afbbcb0f0c3db07f0/AssertionResults", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" @@ -1118,17 +928,17 @@ "version": "0.0.0" } }, - "LambdaInvoke93b8a4fb01c1d0d88873f49b99b27bba": { - "id": "LambdaInvoke93b8a4fb01c1d0d88873f49b99b27bba", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke93b8a4fb01c1d0d88873f49b99b27bba", + "LambdaInvokeb44964fb0d419ef7e8d915cdb662e346": { + "id": "LambdaInvokeb44964fb0d419ef7e8d915cdb662e346", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokeb44964fb0d419ef7e8d915cdb662e346", "children": { "SdkProvider": { "id": "SdkProvider", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke93b8a4fb01c1d0d88873f49b99b27bba/SdkProvider", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokeb44964fb0d419ef7e8d915cdb662e346/SdkProvider", "children": { "AssertionsProvider": { "id": "AssertionsProvider", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke93b8a4fb01c1d0d88873f49b99b27bba/SdkProvider/AssertionsProvider", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokeb44964fb0d419ef7e8d915cdb662e346/SdkProvider/AssertionsProvider", "constructInfo": { "fqn": "constructs.Construct", "version": "10.4.2" @@ -1142,11 +952,11 @@ }, "Default": { "id": "Default", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke93b8a4fb01c1d0d88873f49b99b27bba/Default", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokeb44964fb0d419ef7e8d915cdb662e346/Default", "children": { "Default": { "id": "Default", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke93b8a4fb01c1d0d88873f49b99b27bba/Default/Default", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokeb44964fb0d419ef7e8d915cdb662e346/Default/Default", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -1160,7 +970,7 @@ }, "Invoke": { "id": "Invoke", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke93b8a4fb01c1d0d88873f49b99b27bba/Invoke", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokeb44964fb0d419ef7e8d915cdb662e346/Invoke", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -1168,7 +978,7 @@ }, "AssertionResults": { "id": "AssertionResults", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke93b8a4fb01c1d0d88873f49b99b27bba/AssertionResults", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokeb44964fb0d419ef7e8d915cdb662e346/AssertionResults", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" @@ -1180,17 +990,17 @@ "version": "0.0.0" } }, - "LambdaInvoke25576161f786619878cd1227f298bb94": { - "id": "LambdaInvoke25576161f786619878cd1227f298bb94", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke25576161f786619878cd1227f298bb94", + "LambdaInvokec96c44400b6e11ce551edcc6cedc0f39": { + "id": "LambdaInvokec96c44400b6e11ce551edcc6cedc0f39", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokec96c44400b6e11ce551edcc6cedc0f39", "children": { "SdkProvider": { "id": "SdkProvider", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke25576161f786619878cd1227f298bb94/SdkProvider", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokec96c44400b6e11ce551edcc6cedc0f39/SdkProvider", "children": { "AssertionsProvider": { "id": "AssertionsProvider", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke25576161f786619878cd1227f298bb94/SdkProvider/AssertionsProvider", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokec96c44400b6e11ce551edcc6cedc0f39/SdkProvider/AssertionsProvider", "constructInfo": { "fqn": "constructs.Construct", "version": "10.4.2" @@ -1204,11 +1014,11 @@ }, "Default": { "id": "Default", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke25576161f786619878cd1227f298bb94/Default", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokec96c44400b6e11ce551edcc6cedc0f39/Default", "children": { "Default": { "id": "Default", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke25576161f786619878cd1227f298bb94/Default/Default", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokec96c44400b6e11ce551edcc6cedc0f39/Default/Default", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -1222,7 +1032,7 @@ }, "Invoke": { "id": "Invoke", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke25576161f786619878cd1227f298bb94/Invoke", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokec96c44400b6e11ce551edcc6cedc0f39/Invoke", "constructInfo": { "fqn": "aws-cdk-lib.CfnResource", "version": "0.0.0" @@ -1230,7 +1040,7 @@ }, "AssertionResults": { "id": "AssertionResults", - "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvoke25576161f786619878cd1227f298bb94/AssertionResults", + "path": "lambda-python-build-images/DefaultTest/DeployAssert/LambdaInvokec96c44400b6e11ce551edcc6cedc0f39/AssertionResults", "constructInfo": { "fqn": "aws-cdk-lib.CfnOutput", "version": "0.0.0" diff --git a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.ts b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.ts index 119ec95ea5ea2..72c53a0fb0f0f 100644 --- a/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.ts +++ b/packages/@aws-cdk/aws-lambda-python-alpha/test/integ.python.build.images.ts @@ -19,11 +19,13 @@ class TestStack extends Stack { super(scope, id, props); const runtimes: Runtime[]= [ - Runtime.PYTHON_3_8, Runtime.PYTHON_3_9, Runtime.PYTHON_3_10, Runtime.PYTHON_3_11, Runtime.PYTHON_3_12, Runtime.PYTHON_3_13, + Runtime.PYTHON_3_9, Runtime.PYTHON_3_10, Runtime.PYTHON_3_11, Runtime.PYTHON_3_12, Runtime.PYTHON_3_13, ]; - runtimes.forEach((runtime, index) => { - const func = new lambda.PythonFunction(this, `func-${runtime.name}-${index}`, { + const uniqueRuntimes: Runtime[] = runtimes.filter((value, index, array) => array.findIndex(value1 => value1.runtimeEquals(value)) === index); + + uniqueRuntimes.forEach((runtime) => { + const func = new lambda.PythonFunction(this, `func-${runtime.name}`, { entry: path.join(__dirname, 'lambda-handler'), runtime: runtime, });