Skip to content

Commit

Permalink
chore(release): 1.61.1 (#10034)
Browse files Browse the repository at this point in the history
See CHANGELOG

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
  • Loading branch information
mergify[bot] authored Aug 28, 2020
2 parents 72e6727 + 0748889 commit 347918f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

## [1.61.1](https://github.com/aws/aws-cdk/compare/v1.61.0...v1.61.1) (2020-08-28)


### Bug Fixes

* **cli:** unable to upgrade new style bootstrap to version ([#10030](https://github.com/aws/aws-cdk/issues/10030)) ([8d3e422](https://github.com/aws/aws-cdk/commit/8d3e422809c29da926bae878276619a59ae82ecb)), closes [#10016](https://github.com/aws/aws-cdk/issues/10016)

## [1.61.0](https://github.com/aws/aws-cdk/compare/v1.60.0...v1.61.0) (2020-08-27)


Expand Down Expand Up @@ -39,7 +46,7 @@ All notable changes to this project will be documented in this file. See [standa
### ⚠ BREAKING CHANGES TO EXPERIMENTAL FEATURES

* **cloudfront:** Distribution: `.domains` must be specified if `certificate` is provided.
* **appsync:** **appsync.addXxxDataSource** `name` and `description` props are now optional and in an `DataSourceOptions` interface.
* **appsync:** **appsync.addXxxDataSource** `name` and `description` props are now optional and in an `DataSourceOptions` interface.
- **appsync**: the props `name` and `description` in `addXxxDataSource` have been moved into new props `options` of type `DataSourceOptions`
- **appsync**: `DataSourceOptions.name` defaults to id
- **appsync**: `DataSourceOptions.description` defaults to undefined
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"tools/*"
],
"rejectCycles": "true",
"version": "1.61.0"
"version": "1.61.1"
}
4 changes: 2 additions & 2 deletions packages/aws-cdk/lib/api/bootstrap/deploy-bootstrap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as fs from 'fs-extra';
import { Mode, SdkProvider } from '../aws-auth';
import { deployStack, DeployStackResult } from '../deploy-stack';
import { DEFAULT_TOOLKIT_STACK_NAME, ToolkitInfo } from '../toolkit-info';
import { BOOTSTRAP_VERSION_OUTPUT, BootstrapEnvironmentOptions } from './bootstrap-props';
import { BOOTSTRAP_VERSION_OUTPUT, BootstrapEnvironmentOptions, BOOTSTRAP_VERSION_RESOURCE } from './bootstrap-props';

/**
* Perform the actual deployment of a bootstrap stack, given a template and some parameters
Expand Down Expand Up @@ -61,7 +61,7 @@ export async function deployBootstrapStack(
function bootstrapVersionFromTemplate(template: any): number {
const versionSources = [
template.Outputs?.[BOOTSTRAP_VERSION_OUTPUT]?.Value,
template.Resources?.[BOOTSTRAP_VERSION_OUTPUT]?.Properties?.Value,
template.Resources?.[BOOTSTRAP_VERSION_RESOURCE]?.Properties?.Value,
];

for (const vs of versionSources) {
Expand Down

0 comments on commit 347918f

Please sign in to comment.