Skip to content

Commit

Permalink
chore(deps): update cdk-assets (aws#33415)
Browse files Browse the repository at this point in the history
The lastest cdk-assets is required in cdk to mitigate a ECR upload issue. It includes the following fix: cdklabs/cdk-assets#342. The following issues are related to this:

aws#30258
aws#31549
aws#33264

I am keeping aws#31549 open as it is still true. this [feature request](cdklabs/cdk-assets#348) tracks the work to make cdk-assets compatible with containerd

Closes aws#30258 and closes aws#33264
  • Loading branch information
kaizencc authored and yashkh-amzn committed Feb 21, 2025
1 parent 043334d commit 0257beb
Show file tree
Hide file tree
Showing 8 changed files with 1,028 additions and 839 deletions.
20 changes: 20 additions & 0 deletions packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES
Original file line number Diff line number Diff line change
Expand Up @@ -768,6 +768,26 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.


----------------

** [email protected] - https://www.npmjs.com/package/semver/v/7.7.1 | ISC
The ISC License

Copyright (c) Isaac Z. Schlueter and Contributors

Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.

THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.


----------------

** [email protected] - https://www.npmjs.com/package/slice-ansi/v/4.0.0 | MIT
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/integ-runner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"@aws-cdk/cloudformation-diff": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/aws-service-spec": "^0.1.52",
"cdk-assets": "3.0.0-rc.127",
"cdk-assets": "3.0.0-rc.143",
"@aws-cdk/cdk-cli-wrapper": "0.0.0",
"aws-cdk": "0.0.0",
"chalk": "^4",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/toolkit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"@smithy/util-waiter": "3.1.6",
"archiver": "^5.3.2",
"camelcase": "^6.3.0",
"cdk-assets": "^3.0.0-rc.127",
"cdk-assets": "3.0.0-rc.143",
"cdk-from-cfn": "^0.162.0",
"chalk": "^4",
"chokidar": "^3.6.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/* eslint-disable no-console */

exports.handler = async (event: any) => {
console.log('hello world');
console.log(`event ${JSON.stringify(event)}`);
return {
statusCode: 200,
};
};
14 changes: 14 additions & 0 deletions packages/@aws-cdk/toolkit/test/_fixtures/stack-with-asset/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import * as path from 'path';
import * as lambda from 'aws-cdk-lib/aws-lambda';
import * as core from 'aws-cdk-lib/core';

export default async () => {
const app = new core.App();
const stack = new core.Stack(app, 'Stack1');
new lambda.Function(stack, 'Function1', {
code: lambda.Code.fromAsset(path.join(__dirname, 'asset')),
handler: 'index.handler',
runtime: lambda.Runtime.NODEJS_LATEST,
});
return app.synth() as any;
};
490 changes: 256 additions & 234 deletions packages/aws-cdk/THIRD_PARTY_LICENSES

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/aws-cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
"@smithy/util-waiter": "^3.2.0",
"archiver": "^5.3.2",
"camelcase": "^6.3.0",
"cdk-assets": "^3.0.0-rc.127",
"cdk-assets": "3.0.0-rc.143",
"cdk-from-cfn": "^0.162.0",
"chalk": "^4",
"chokidar": "^3.6.0",
Expand Down
Loading

0 comments on commit 0257beb

Please sign in to comment.