Skip to content

Commit

Permalink
Merge branch 'main' into fix-access-point
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Jan 12, 2025
2 parents 0d5c17d + 899bc87 commit 0d81b37
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.v2.alpha.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.175.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.175.0-alpha.0...v2.175.1-alpha.0) (2025-01-10)

## [2.175.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.174.1-alpha.0...v2.175.0-alpha.0) (2025-01-09)


Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.v2.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

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.175.1](https://github.com/aws/aws-cdk/compare/v2.175.0...v2.175.1) (2025-01-10)

### Bug Fixes

* **cli:** "no stack found in the main cloud assembly" ([#32839](https://github.com/aws/aws-cdk/issues/32839)) ([7b68908](https://github.com/aws/aws-cdk/commit/7b68908dbebde02037d8b7650f4bb10d4c5db89d)), closes [aws/aws-cdk#32636](https://github.com/aws/aws-cdk/issues/32636) [#32836](https://github.com/aws/aws-cdk/issues/32836) [#32836](https://github.com/aws/aws-cdk/issues/32836)

## [2.175.0](https://github.com/aws/aws-cdk/compare/v2.174.1...v2.175.0) (2025-01-09)


Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cloudformation-diff/lib/diff/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ export enum ResourceImpact {
* of property-level impacts.
* @param one the current worst impact so far.
* @param two the new impact being considered (can be undefined, as we may not always be
* able to determine some peroperty's impact).
* able to determine some properties impact).
*/
function worstImpact(one: ResourceImpact, two?: ResourceImpact): ResourceImpact {
if (!two) { return one; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export function compareLoggingProps(oldProps: Partial<EKS.CreateClusterCommandIn
if (newProps.logging?.clusterLogging === undefined && oldProps.logging?.clusterLogging === undefined) {
return newProps;
}
// if newProps containes LogSetup
// if newProps contains LogSetup
if (newProps.logging && newProps.logging.clusterLogging && newProps.logging.clusterLogging.length > 0) {
enabledTypes = newProps.logging.clusterLogging[0].types!;
// if oldProps contains LogSetup with enabled:true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def get_handler(event, context):
json_path = props['JsonPath']
timeout_seconds = props['TimeoutSeconds']

# json path should be surrouded with '{}'
# json path should be surrounded with '{}'
path = '{{{0}}}'.format(json_path)
if request_type == 'Create' or request_type == 'Update':
output = wait_for_output(['get', '-n', object_namespace, object_type, object_name, "-o=jsonpath='{{{0}}}'".format(json_path)], int(timeout_seconds))
Expand Down
4 changes: 2 additions & 2 deletions version.v2.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "2.175.0",
"alphaVersion": "2.175.0-alpha.0"
"version": "2.175.1",
"alphaVersion": "2.175.1-alpha.0"
}

0 comments on commit 0d81b37

Please sign in to comment.