Merge branch 'main' into fix-unhandled-next-token

CHANGELOG.v2.alpha.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.173.4-alpha.0](https://github.com/aws/aws-cdk/compare/v2.173.3-alpha.0...v2.173.4-alpha.0) (2024-12-27)
+
 ## [2.173.3-alpha.0](https://github.com/aws/aws-cdk/compare/v2.173.2-alpha.0...v2.173.3-alpha.0) (2024-12-26)
 
 ## [2.173.2-alpha.0](https://github.com/aws/aws-cdk/compare/v2.173.1-alpha.0...v2.173.2-alpha.0) (2024-12-17)

CHANGELOG.v2.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.173.4](https://github.com/aws/aws-cdk/compare/v2.173.3...v2.173.4) (2024-12-27)
+
+
+### Bug Fixes
+
+* **cli:** cli still fails for some plugins returning `expiration: null` ([#32668](https://github.com/aws/aws-cdk/issues/32668)) ([4da2f65](https://github.com/aws/aws-cdk/commit/4da2f6553cf488897c0ec10cce063bd3168b726f)), closes [#32111](https://github.com/aws/aws-cdk/issues/32111)
+
 ## [2.173.3](https://github.com/aws/aws-cdk/compare/v2.173.2...v2.173.3) (2024-12-26)
 
 

packages/aws-cdk-lib/aws-ecr-assets/README.md

@@ -51,6 +51,11 @@ asset hash.
 Additionally, you can supply `buildSecrets`. Your system must have Buildkit
 enabled, see https://docs.docker.com/build/buildkit/.
 
+Also, similarly to `@aws-cdk/aws-s3-assets`, you can set the CDK_DOCKER environment
+variable in order to provide a custom Docker executable command or path. This may sometimes
+be needed when building in environments where the standard docker cannot be executed
+(see https://github.com/aws/aws-cdk/issues/8460 for details).
+
 SSH agent sockets or keys may be passed to docker build via `buildSsh`.
 
 ```ts
@@ -209,5 +214,5 @@ pull images from this repository.
 If the pulling principal is not in the same account or is an AWS service that
 doesn't assume a role in your account (e.g. AWS CodeBuild), you must either copy the image to a new repository, or
 grant pull permissions on the resource policy of the repository. Since the repository is managed by the CDK bootstrap stack,
-the following permissions must be granted there, or granted manually on the repository: "ecr:GetDownloadUrlForLayer", 
+the following permissions must be granted there, or granted manually on the repository: "ecr:GetDownloadUrlForLayer",
 "ecr:BatchGetImage" and "ecr:BatchCheckLayerAvailability".

packages/aws-cdk/lib/cli-arguments.ts

@@ -2,7 +2,7 @@
 // GENERATED FROM packages/aws-cdk/lib/config.ts.
 // Do not edit by hand; all changes will be overwritten at build time from the config file.
 // -------------------------------------------------------------------------------------------
-/* eslint-disable max-len */
+/* eslint-disable @stylistic/max-len */
 import { Command } from './settings';
 
 /**

packages/aws-cdk/lib/parse-command-line-arguments.ts

@@ -2,7 +2,7 @@
 // GENERATED FROM packages/aws-cdk/lib/config.ts.
 // Do not edit by hand; all changes will be overwritten at build time from the config file.
 // -------------------------------------------------------------------------------------------
-/* eslint-disable max-len */
+/* eslint-disable @stylistic/max-len */
 import { Argv } from 'yargs';
 import * as helpers from './util/yargs-helpers';
 

version.v2.json

@@ -1,4 +1,4 @@
 {
-  "version": "2.173.3",
-  "alphaVersion": "2.173.3-alpha.0"
+  "version": "2.173.4",
+  "alphaVersion": "2.173.4-alpha.0"
 }