Skip to content

Commit

Permalink
Merge branch 'main' into msk-serverless
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Feb 3, 2025
2 parents 9f93036 + f004c7e commit c4db54e
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 28 deletions.
4 changes: 2 additions & 2 deletions packages/@aws-cdk/cloudformation-diff/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
},
"license": "Apache-2.0",
"dependencies": {
"@aws-cdk/aws-service-spec": "^0.1.50",
"@aws-cdk/service-spec-types": "^0.0.116",
"@aws-cdk/aws-service-spec": "^0.1.51",
"@aws-cdk/service-spec-types": "^0.0.117",
"chalk": "^4",
"diff": "^5.2.0",
"fast-deep-equal": "^3.1.3",
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 @@ -75,7 +75,7 @@
"@aws-cdk/cloud-assembly-schema": "^39.2.0",
"@aws-cdk/cloudformation-diff": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/aws-service-spec": "^0.1.50",
"@aws-cdk/aws-service-spec": "^0.1.51",
"cdk-assets": "3.0.0-rc.127",
"@aws-cdk/cdk-cli-wrapper": "0.0.0",
"aws-cdk": "0.0.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/aws-cdk-lib/aws-ecs/lib/base/task-definition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ export interface TaskDefinitionProps extends CommonTaskDefinitionProps {
* Not supported in Fargate.
*
* @default - No inference accelerators.
* @deprecated ECS TaskDefinition's inferenceAccelerator is EOL since April 2024
*/
readonly inferenceAccelerators?: InferenceAccelerator[];

Expand Down Expand Up @@ -724,6 +725,7 @@ export class TaskDefinition extends TaskDefinitionBase {

/**
* Adds an inference accelerator to the task definition.
* @deprecated ECS TaskDefinition's inferenceAccelerator is EOL since April 2024
*/
public addInferenceAccelerator(inferenceAccelerator: InferenceAccelerator) {
if (isFargateCompatible(this.compatibility)) {
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
"mime-types": "^2.1.35"
},
"devDependencies": {
"@aws-cdk/aws-service-spec": "^0.1.50",
"@aws-cdk/aws-service-spec": "^0.1.51",
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/custom-resource-handlers": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
Expand Down
6 changes: 3 additions & 3 deletions tools/@aws-cdk/spec2cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
},
"license": "Apache-2.0",
"dependencies": {
"@aws-cdk/aws-service-spec": "^0.1.50",
"@aws-cdk/service-spec-importers": "^0.0.63",
"@aws-cdk/service-spec-types": "^0.0.116",
"@aws-cdk/aws-service-spec": "^0.1.51",
"@aws-cdk/service-spec-importers": "^0.0.64",
"@aws-cdk/service-spec-types": "^0.0.117",
"@cdklabs/tskb": "^0.0.3",
"@cdklabs/typewriter": "^0.0.3",
"camelcase": "^6",
Expand Down
35 changes: 14 additions & 21 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@
resolved "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.1.0.tgz#6d3c7860354d4856a7e75375f2f0ecab313b4989"
integrity sha512-7bY3J8GCVxLupn/kNmpPc5VJz8grx+4RKfnnJiO1LG+uxkZfANZG3RMHhE+qQxxwkyQ9/MfPtTpf748UhR425A==

"@aws-cdk/aws-service-spec@^0.1.50":
version "0.1.50"
resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.1.50.tgz#075d525811ccee779a3c9184cd0e121c059e27bb"
integrity sha512-IzjM4Q1bH2vC4dp+i4F+JPEDRNmmqvmUgVWZ+mo1owSzEk5SZjQ3DnTotw+tHvrGZhGSNbRkYR2npbyuyJ4Knw==
"@aws-cdk/aws-service-spec@^0.1.51":
version "0.1.51"
resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.1.51.tgz#2dbc01f897b7452a0092f33b8b1ce60b0bd523b0"
integrity sha512-9EQBahUhfg7HYvgiB3CRdEXoc0VPej4SprcdBa1wuF/f8nJOd3R2hrcQuMKfU+UpZJ5VBF+xoKDcEvbiXu8B6g==
dependencies:
"@aws-cdk/service-spec-types" "^0.0.116"
"@aws-cdk/service-spec-types" "^0.0.117"
"@cdklabs/tskb" "^0.0.3"

"@aws-cdk/cloud-assembly-schema@^39.2.0":
Expand Down Expand Up @@ -114,12 +114,12 @@
resolved "https://registry.npmjs.org/@aws-cdk/lambda-layer-kubectl-v31/-/lambda-layer-kubectl-v31-2.0.0.tgz#d87799d7d0d5dad77af45281a36942e4b7996b6b"
integrity sha512-8JI0sMDbqCubOyt1TbQFEwicYok9KYSrNSfzREgjGJcoPy17/Kd0gbe44ATyLMfjae7dExUhhwKMhr6GK7Hmrw==

"@aws-cdk/service-spec-importers@^0.0.63":
version "0.0.63"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-importers/-/service-spec-importers-0.0.63.tgz#04d20a4c2d2431f4b0d8b204094a211d7ccbe67c"
integrity sha512-uqvi8u7O+ZtueSQ+ZK33+yuuy2FVxUZzeAa19D5hfOP6H/Y1C+0tYQFEuulb6nqpyaKx9hV9ZLBCbe8/ihSwmg==
"@aws-cdk/service-spec-importers@^0.0.64":
version "0.0.64"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-importers/-/service-spec-importers-0.0.64.tgz#8e69644f627c838f8a6523fc6b5e63069fbd6656"
integrity sha512-8EGZaNkY9jUpFbc0h0TY5Knz/l1PcQo8NDxymoEiZqUrUFY0WD3CFCzlzgzlNyY9kpfJLvvbfzyM0q0nHRqaCg==
dependencies:
"@aws-cdk/service-spec-types" "^0.0.115"
"@aws-cdk/service-spec-types" "^0.0.117"
"@cdklabs/tskb" "^0.0.3"
ajv "^6"
canonicalize "^2.0.0"
Expand All @@ -130,17 +130,10 @@
glob "^8"
sort-json "^2.0.1"

"@aws-cdk/service-spec-types@^0.0.115":
version "0.0.115"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.115.tgz#a598b288141a2b77b0a78c72678496a4dd623e00"
integrity sha512-uq/41z+M2l2GxcoIxN5P/IcYYh4xQn04sQPkAG/NWZT3SzrgagMXtmN/NsaoeFxKdKz0pNmwFp/+g81a7Qd4/A==
dependencies:
"@cdklabs/tskb" "^0.0.3"

"@aws-cdk/service-spec-types@^0.0.116":
version "0.0.116"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.116.tgz#60a83cb9df98a464546e0322e8933e231858b8d2"
integrity sha512-SkEPLoFpg33Or0jXHDxvFyLvWnVDo6uGBXEm8vk7ObPS0Ccz9SCAbWdGrd1OvwjjHixpBVZfVJkJhsHwYUAcGA==
"@aws-cdk/service-spec-types@^0.0.117":
version "0.0.117"
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.117.tgz#b428b6556a3fd20b95e52e311e939b3b18a1f791"
integrity sha512-2hMV1i2GtBPCEkZw7gsdiAeTbfMpOXGTD2jh4okiFIvQBDXoKXqL29e7Z4J9pA4KLhNA24SecmFxiiHXhPJ3tA==
dependencies:
"@cdklabs/tskb" "^0.0.3"

Expand Down

0 comments on commit c4db54e

Please sign in to comment.