Skip to content

Commit

Permalink
Merge pull request #6555 from aws/bump/1.27.0
Browse files Browse the repository at this point in the history
chore(release): 1.27.0
  • Loading branch information
mergify[bot] authored Mar 3, 2020
2 parents e251651 + 5f7ab72 commit a98c0b3
Show file tree
Hide file tree
Showing 332 changed files with 6,094 additions and 3,199 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: "\U00002753 General Issue"
about: Create a new issue
labels: status/needs-triage
labels: needs-triage
---

<!-- NOTE:📕 If issue regarding developer guide, please create issue [here](https://github.com/awsdocs/aws-cdk-guide/issues) -->
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: "\U0001F41B Bug Report"
about: Report a bug
labels: bug, status/needs-triage
labels: bug, needs-triage
---

<!--
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/doc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: "📕 Documentation issue"
about: Issue in the reference documentation or developer guide
labels: feature-request, status/needs-triage
labels: feature-request, needs-triage
---

<!--
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: "\U0001F680 Feature Request"
about: Request a new feature
labels: feature-request, status/needs-triage
labels: feature-request, needs-triage
---

<!-- short description of the feature you are proposing: -->
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/general-issues.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: "\U00002753 General Issue"
about: Create a new issue
labels: status/needs-triage
labels: needs-triage
---

<!-- NOTE:📕 If there is an issue regarding developer guide, please create an issue [here](https://github.com/awsdocs/aws-cdk-guide/issues) -->
Expand Down
61 changes: 61 additions & 0 deletions .github/ISSUE_TEMPLATE/tracking.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
---
name: "📊 Tracking Issue"
title: "📊Tracking: [service]"
about: Add a module tracking issue (internal use only)
labels: management/tracking
---

Add your +1 👍 to help us prioritize high-level constructs for this service
---

### Overview:
<!--
Summary of the service (leverage the service’s product page for the text) and a link to the relevant AWS Docs.
This should be the same text that we put at the top of the package’s README.md. Also include a link to the
service’s CDK Construct Library API reference page.
-->






[AWS Docs](url) <!-- replace `url` with link to the relevant AWS Docs -->
[CDK API Reference](url) <!-- replace `url` with link to the service's CDK API reference -->


### Implementation:
<!--
Checklist of use cases, constructs, features (such as grant methods) that will ship in this package
(not required until the issue is added to the public roadmap)
- [ ]
- [ ]
-->






### Issue list:
<!--
e.g. checklist of links to feature requests, bugs, and PRs that are in scope for GA release of this module
(not required until the issues is added to the public roadmap)
- [ ]
- [ ]
-->






<!--
Labels to add:
- package/[name] (create new labels if they don’t already exist)
- needs-design (if cfn-only)
- management/roadmap (when added to the roadmap)
- in-progress (when added to “working on it” column of the roadmap)
-->
---
This is a 📊Tracking Issue
6 changes: 3 additions & 3 deletions .github/actions/prlinter/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "prlinter",
"private": true,
"version": "999.0.0",
"version": "0.0.0",
"description": "",
"main": "index.js",
"keywords": [],
"license": "Apache-2.0",
"license": "Apache-2.0",
"author": {
"name": "Amazon Web Services",
"url": "https://aws.amazon.com",
Expand All @@ -16,4 +16,4 @@
"@actions/github": "^2.1.0",
"prlint": "file:../../../tools/prlint"
}
}
}
5 changes: 2 additions & 3 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pull_request_rules:
- name: automatic merge
actions:
comment:
message: Thank you for contributing! Your pull request is now being automatically merged.
message: Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
merge:
strict: smart
method: squash
Expand All @@ -34,15 +34,14 @@ pull_request_rules:
- name: automatic merge
actions:
comment:
message: Thank you for contributing! Your pull request is now being automatically merged without squashing.
message: Thank you for contributing! Your pull request will be updated from master and then merged automatically without squashing (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
merge:
strict: smart
# Merge instead of squash
method: merge
strict_method: merge
delete_head_branch: {}
conditions:
- base!=release
- -title~=(WIP|wip)
- -label~=(blocked|do-not-merge)
# Only if no-squash is set
Expand Down
5 changes: 5 additions & 0 deletions .versionrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"skip": { "tag": true },
"packageFiles": [ { "filename": "lerna.json", "type": "json" } ],
"bumpFiles": [ { "filename": "lerna.json", "type": "json" } ]
}
51 changes: 51 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,57 @@

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.27.0](https://github.com/aws/aws-cdk/compare/v1.26.0...v1.27.0) (2020-03-03)


### ⚠ BREAKING CHANGES

* **cognito:** `UserPool.fromUserPoolAttributes()` has been replaced
by `fromUserPoolId()` and `fromUserPoolArn()`.
* **cognito:** `IUserPool` no longer contains `userPoolProviderName`
and `userPoolProviderUrl`.
* **cognito:** The property `signInType` of `UserPool` has been
renamed to `signInAliases` and given a new type `SignInAliases`. The
list of sign in types are now specified via boolean properties.
* **cognito:** The property `usernameAliasAttributes` of `UserPool` has
been dropped and its functionality merged with the `signInAliases`
property.
* **cognito:** The property `autoVerifiedAttributes` for `UserPool` is
now renamed to `autoVerify` and its default has now changed. The new
default is now determined by the value of `signInAliases`.
* **appsync:** Configuration the user pool authorization is now done through the
authorizationConfig property. This allows us to specify a default
authorization mode out of the supported ones, currently limited to
Cognito user pools and API keys.
* **custom-resources:** `physicalResourceId` and `physicalResourceIdPath`
were unified to a concrete type under the `physicalResourceId` property.
Use `PhysicalResourceId.fromResponse` and `PhysicalResourceId.of` factory
functions to specify it.

### Features

* **appsync:** extend authorization configuration ([#6260](https://github.com/aws/aws-cdk/issues/6260)) ([948881a](https://github.com/aws/aws-cdk/commit/948881a242053aad221487c6ca537145230de87f)), closes [#6246](https://github.com/aws/aws-cdk/issues/6246) [#6247](https://github.com/aws/aws-cdk/issues/6247)
* **aws-ec2:** signal, download and execute helpers for UserData ([#6029](https://github.com/aws/aws-cdk/issues/6029)) ([ee8f169](https://github.com/aws/aws-cdk/commit/ee8f16936c0e5cb412fbdd0f210045261374dac9)), closes [#623](https://github.com/aws/aws-cdk/issues/623)
* **cognito:** refresh modeling of import APIs, sign in & autoverified attrs ([#6422](https://github.com/aws/aws-cdk/issues/6422)) ([c02e852](https://github.com/aws/aws-cdk/commit/c02e8528ac12ff8eb2b5ded7695b544c379e51e2))
* **contributors:** use 0.0.0 as a version marker ([#6463](https://github.com/aws/aws-cdk/issues/6463)) ([d5f88c7](https://github.com/aws/aws-cdk/commit/d5f88c7b3a01e20c202bcb1a5f7baf6c72949b86)), closes [/github.com/aws/aws-cdk/pull/6463/files#diff-6a3371457528722a734f3c51d9238c13](https://github.com/aws//github.com/aws/aws-cdk/pull/6463/files/issues/diff-6a3371457528722a734f3c51d9238c13)
* **custom-resources:** physical resource id union type ([#6518](https://github.com/aws/aws-cdk/issues/6518)) ([d5000bc](https://github.com/aws/aws-cdk/commit/d5000bc1182efb4b218510a2ae211f5362f806d1))
* **lambda-event-sources:** expose `eventSourceMappingId` ([#5689](https://github.com/aws/aws-cdk/issues/5689)) ([5ea2679](https://github.com/aws/aws-cdk/commit/5ea2679c00f706c04ed8cb14f59746475f31e7db)), closes [#5430](https://github.com/aws/aws-cdk/issues/5430)
* **rds:** master secret in DatabaseSecret ([#6415](https://github.com/aws/aws-cdk/issues/6415)) ([a9e5b60](https://github.com/aws/aws-cdk/commit/a9e5b609b20eff9edaf5775cfbe0802177852475)), closes [#6358](https://github.com/aws/aws-cdk/issues/6358)
* **stepfunctions-tasks:** add step functions task to run glue job ([#6258](https://github.com/aws/aws-cdk/issues/6258)) ([15d9bd7](https://github.com/aws/aws-cdk/commit/15d9bd79690c2cb86c541dcb16c9dc88d8e338ad)), closes [#5266](https://github.com/aws/aws-cdk/issues/5266)


### Bug Fixes

* **assert:** `haveResourceLike` and `countResourcesLike` compatibility ([#6202](https://github.com/aws/aws-cdk/issues/6202)) ([86c04f3](https://github.com/aws/aws-cdk/commit/86c04f354b472e6ff0c4af2cb8235ea9017d1c00))
* **cli:** fast "no-op" deploys do not consider tags ([#6472](https://github.com/aws/aws-cdk/issues/6472)) ([5de87c1](https://github.com/aws/aws-cdk/commit/5de87c18b554b0cb903c7d0a68cf75ae32d0eb71)), closes [#6463](https://github.com/aws/aws-cdk/issues/6463)
* **codepipeline:** an action's role imported in a different stack adds a dependency to the CodePipeline stack ([#6458](https://github.com/aws/aws-cdk/issues/6458)) ([86ea564](https://github.com/aws/aws-cdk/commit/86ea564665cf0f90341193755233238e2fd46f54))
* **codepipeline:** automatically named artifacts could contain illegal characters from stage/action names ([#6460](https://github.com/aws/aws-cdk/issues/6460)) ([34aaca4](https://github.com/aws/aws-cdk/commit/34aaca4150e0001b58e154e164be1bedf4ca7f31))
* **core:** adds enableVersionUpgrade property to CfnUpdatePolicy ([#6434](https://github.com/aws/aws-cdk/issues/6434)) ([f8cacb9](https://github.com/aws/aws-cdk/commit/f8cacb9ae24ef7af45362a5212fddde351e67572)), closes [#6158](https://github.com/aws/aws-cdk/issues/6158)
* **custom-resources:** AwsCustomResource with delete only action fails ([#6363](https://github.com/aws/aws-cdk/issues/6363)) ([61a99e7](https://github.com/aws/aws-cdk/commit/61a99e7145e43793f0a27b693a76d85dd2cb61aa)), closes [#6061](https://github.com/aws/aws-cdk/issues/6061)
* **docker:** cannot use cdk docker assets as base image ([#6471](https://github.com/aws/aws-cdk/issues/6471)) ([983dd40](https://github.com/aws/aws-cdk/commit/983dd403d1293f7b1a01dd18f65d65cfee964eba)), closes [#6466](https://github.com/aws/aws-cdk/issues/6466)
* **rds:** setting timezone on DatabaseInstance causes internal failure ([#6534](https://github.com/aws/aws-cdk/issues/6534)) ([9e2ac91](https://github.com/aws/aws-cdk/commit/9e2ac91b98540cc79550346f390eca1561c79744)), closes [#6439](https://github.com/aws/aws-cdk/issues/6439)
* **stepfunctions:** valid reference path '$' fails with an error ([#6483](https://github.com/aws/aws-cdk/issues/6483)) ([221c83b](https://github.com/aws/aws-cdk/commit/221c83b470bb6b5de3df5aa62d8a55056aa6eb24)), closes [#6388](https://github.com/aws/aws-cdk/issues/6388)

## [1.26.0](https://github.com/aws/aws-cdk/compare/v1.25.0...v1.26.0) (2020-02-25)


Expand Down
26 changes: 26 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ and let us know if it's not up-to-date (even better, submit a PR with your corr
- [API Compatibility Checks](#api-compatibility-checks)
- [Examples](#examples)
- [Feature Flags](#feature-flags)
- [Versioning](#versioning)
- [Troubleshooting](#troubleshooting)
- [Debugging](#debugging)
- [Connecting the VS Code Debugger](#connecting-the-vs-code-debugger)
Expand Down Expand Up @@ -381,6 +382,12 @@ If you also wish to package to all languages, make sure you have all the [toolch
$ ./pack.sh
```

> NOTE: in local builds, pack.sh will finish but will fail with an error
> indicating the build artifacts use the marker version (`0.0.0`). This is
> normal, and you can trust the output in `dist/` despite the failure. This is a
> protection we have to make sure we don't accidentally release artifacts with
> the marker version.
### Full Docker build

Clone the repo:
Expand Down Expand Up @@ -659,6 +666,25 @@ CDK](https://github.com/aws/aws-cdk/issues/3398) we will either remove the
legacy behavior or flip the logic for all these features and then
reset the `FEATURE_FLAGS` map for the next cycle.
### Versioning
All `package.json` files in this repo use a stable marker version of `0.0.0`.
This means that when you declare dependencies, you should always use `0.0.0`.
This makes it easier for us to bump a new version (the `bump.sh` script will
just update the central version and create a CHANGELOG entry) and also reduces
the chance of merge conflicts after a new version is released.
Additional scripts that take part in the versioning mechanism:
- `scripts/get-version.js` can be used to obtain the actual version of the repo.
You can use either from JavaScript code by `require('./scripts/get-version')`
or from a shell script `node -p "require('./scripts/get-version')"`.
- `scripts/get-version-marker.js` returns `0.0.0` and used to DRY the version
marker.
- `scripts/align-version.sh` and `scripts/align-version.js` are used to align
all package.json files in the repo to the official version. This script is
invoked in CI builds and should not be used inside a development environment.
## Troubleshooting
Most build issues can be solved by doing a full clean rebuild:
Expand Down
11 changes: 2 additions & 9 deletions bump.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,5 @@ echo "Starting ${version} version bump"

# /bin/bash ./install.sh

# Generate CHANGELOG and create a commit
# --skip.tag because we create the tag as part of creating the github release
npx standard-version \
--bumpFiles package.json \
--release-as ${version} \
--skip.tag=true \
--releaseCommitMessageFormat="chore(release): v{{currentTag}}" \
--commit-all

# Generate CHANGELOG and create a commit (see .versionrc.json)
npx standard-version --release-as ${version}
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": "999.0.0"
"version": "1.27.0"
}
20 changes: 18 additions & 2 deletions pack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,14 @@ done
# Remove a JSII aggregate POM that may have snuk past
rm -rf dist/java/software/amazon/jsii

# Get version from lerna
version="$(cat ${root}/lerna.json | grep version | cut -d '"' -f4)"
# Get version
version="$(node -p "require('./scripts/get-version')")"

# Ensure we don't publish anything beyond 1.x for now
if [[ ! "${version}" == "1."* ]]; then
echo "ERROR: accidentally releasing a major version? Expecting repo version to start with '1.' but got '${version}'"
exit 1
fi

# Get commit from CodePipeline (or git, if we are in CodeBuild)
# If CODEBUILD_RESOLVED_SOURCE_VERSION is not defined (i.e. local
Expand All @@ -79,6 +85,16 @@ HERE
# copy CHANGELOG.md to dist/ for github releases
cp CHANGELOG.md ${distdir}/

# defensive: make sure our artifacts don't use the version marker (this means
# that "pack" will always fails when building in a dev environment)
# when we get to 10.0.0, we can fix this...
marker=$(node -p "require('./scripts/get-version-marker')")
if find dist/ | grep "${marker}"; then
echo "ERROR: build artifacts use the version marker '${marker}' instead of a real version."
echo "This is expected for builds in a development environment but should not happen in CI builds!"
exit 1
fi

# for posterity, print all files in dist
echo "=============================================================================================="
echo " dist contents"
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aws-cdk",
"version": "1.26.0",
"version": "0.0.0",
"private": true,
"pkglint": {
"include": "dependencies/node-version"
Expand All @@ -21,7 +21,7 @@
"jsii-rosetta": "^0.22.0",
"lerna": "^3.20.2",
"standard-version": "^7.1.0",
"typescript": "~3.8.2"
"typescript": "~3.8.3"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -58,4 +58,4 @@
"@aws-cdk/cx-api/semver/**"
]
}
}
}
12 changes: 7 additions & 5 deletions packages/@aws-cdk/alexa-ask/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@

![Stability: Experimental](https://img.shields.io/badge/stability-Experimental-important.svg?style=for-the-badge)

> **This is a _developer preview_ (public beta) module. Releases might lack important features and might have
> future breaking changes.**
> **This is a _developer preview_ (public beta) module.**
>
> This API is still under active development and subject to non-backward
> compatible changes or removal in any future version. Use of the API is not recommended in production
> environments. Experimental APIs are not subject to the Semantic Versioning model.
> All classes with the `Cfn` prefix in this module ([CFN Resources](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib))
> are auto-generated from CloudFormation. They are stable and safe to use.
>
> However, all other classes, i.e., higher level constructs, are under active development and subject to non-backward
> compatible changes or removal in any future version. These are not subject to the [Semantic Versioning](https://semver.org/) model.
> This means that while you may use them, you may need to update your source code when upgrading to a newer version of this package.
---
<!--END STABILITY BANNER-->
Expand Down
Loading

0 comments on commit a98c0b3

Please sign in to comment.