From 757290e18755c2e8092f4d2541a0fe9d1fdbda27 Mon Sep 17 00:00:00 2001 From: "Eric Z. Beard" Date: Tue, 26 May 2020 09:40:24 -0700 Subject: [PATCH 01/11] docs(contributing): Add note on global npm installs, change OpenJDK URL --- CONTRIBUTING.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ddd76ca329bbf..ad4328ebde45a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -77,7 +77,8 @@ you need to have the following SDKs and tools locally: - We recommend using a version in [Active LTS](https://nodejs.org/en/about/releases/) - ⚠️ versions `13.0.0` to `13.6.0` are not supported due to compatibility issues with our dependencies. - [Yarn >= 1.19.1](https://yarnpkg.com/lang/en/docs/install) -- [Java OpenJDK 8](http://openjdk.java.net/install/) +- [Java OpenJDK 8](https://docs.aws.amazon.com/corretto/latest/corretto-8-ug/downloads-list.html) +- [Apache Maven](http://maven.apache.org/install.html) - [.NET Core SDK 3.1](https://www.microsoft.com/net/download) - [Python 3.6.5](https://www.python.org/downloads/release/python-365/) - [Ruby 2.5.1](https://www.ruby-lang.org/en/news/2018/03/28/ruby-2-5-1-released/) @@ -91,6 +92,13 @@ $ yarn install $ yarn build ``` +If you get compiler errors when building, a common cause is globally installed tools like tslint and typescript. Try uninstalling them. + +``` +npm uninstall -g tslint +npm uninstall -g typescript +``` + Alternatively, the [Full Docker build](#full-docker-build) workflow can be used so that you don't have to worry about installing all those tools on your local machine and instead only depend on having a working Docker install. @@ -197,7 +205,7 @@ Examples: ### Step 4: Commit -Create a commit with the proposed change changes: +Create a commit with the proposed changes: * Commit title and message (and PR title and description) must adhere to [conventionalcommits](https://www.conventionalcommits.org). * The title must begin with `feat(module): title`, `fix(module): title`, `refactor(module): title` or From b42de3b24396ac92d2f5728e37e4c4440de59296 Mon Sep 17 00:00:00 2001 From: "Eric Z. Beard" Date: Mon, 14 Sep 2020 15:33:18 -0700 Subject: [PATCH 02/11] Added missing package maturities --- packages/@aws-cdk/aws-apigatewayv2/package.json | 1 + packages/@aws-cdk/aws-cloudfront/package.json | 1 + packages/@aws-cdk/aws-cognito/package.json | 1 + 3 files changed, 3 insertions(+) diff --git a/packages/@aws-cdk/aws-apigatewayv2/package.json b/packages/@aws-cdk/aws-apigatewayv2/package.json index 5068cb8ede434..945cb89bb4586 100644 --- a/packages/@aws-cdk/aws-apigatewayv2/package.json +++ b/packages/@aws-cdk/aws-apigatewayv2/package.json @@ -100,6 +100,7 @@ ] }, "stability": "experimental", + "maturity": "experimental", "features": [ { "name": "Higher level constructs for HTTP APIs", diff --git a/packages/@aws-cdk/aws-cloudfront/package.json b/packages/@aws-cdk/aws-cloudfront/package.json index f1a90c70944ba..c78093eac141f 100644 --- a/packages/@aws-cdk/aws-cloudfront/package.json +++ b/packages/@aws-cdk/aws-cloudfront/package.json @@ -95,6 +95,7 @@ "node": ">= 10.13.0 <13 || >=13.7.0" }, "stability": "experimental", + "maturity": "experimental", "features": [ { "name": "Higher level constructs for Distribution", diff --git a/packages/@aws-cdk/aws-cognito/package.json b/packages/@aws-cdk/aws-cognito/package.json index 0affaf0812b44..79edc01537c57 100644 --- a/packages/@aws-cdk/aws-cognito/package.json +++ b/packages/@aws-cdk/aws-cognito/package.json @@ -103,6 +103,7 @@ ] }, "stability": "experimental", + "maturity": "developer-preview", "features": [ { "name": "Higher level constructs for User Pools", From bd9977fe51ad049dc4034bfec4b825eca4c0af39 Mon Sep 17 00:00:00 2001 From: "Eric Z. Beard" Date: Wed, 14 Oct 2020 12:16:31 -0700 Subject: [PATCH 03/11] Change id to stack_id in Python init template --- .../%name.PythonModule%/%name.PythonModule%_stack.template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py index adf164cd876c7..376b10b8e710f 100644 --- a/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py +++ b/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py @@ -3,7 +3,7 @@ class %name.PascalCased%Stack(core.Stack): - def __init__(self, scope: core.Construct, id: str, **kwargs) -> None: + def __init__(self, scope: core.Construct, stack_id: str, **kwargs) -> None: super().__init__(scope, id, **kwargs) # The code that defines your stack goes here From bdcf717295a7c4dbb512ec7ac26c6a893e39375c Mon Sep 17 00:00:00 2001 From: "Eric Z. Beard" Date: Tue, 20 Oct 2020 07:24:47 -0700 Subject: [PATCH 04/11] Change stack_id to construct_id --- .../%name.PythonModule%/%name.PythonModule%_stack.template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py index 376b10b8e710f..cfd42d316ba4d 100644 --- a/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py +++ b/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py @@ -3,7 +3,7 @@ class %name.PascalCased%Stack(core.Stack): - def __init__(self, scope: core.Construct, stack_id: str, **kwargs) -> None: + def __init__(self, scope: core.Construct, construct_id: str, **kwargs) -> None: super().__init__(scope, id, **kwargs) # The code that defines your stack goes here From d14f860d01c45f9e2d37c439b50f70657b217eac Mon Sep 17 00:00:00 2001 From: "Eric Z. Beard" Date: Tue, 20 Oct 2020 07:27:12 -0700 Subject: [PATCH 05/11] Change id to construct_id in Python sample-app --- .../%name.PythonModule%/%name.PythonModule%_stack.template.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py index 910a4b838c933..c20594882b8c0 100644 --- a/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py +++ b/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py @@ -7,9 +7,9 @@ ) -class %name.PascalCased%Stack(core.Stack): +class % name.PascalCased % Stack(core.Stack): - def __init__(self, scope: core.Construct, id: str, **kwargs) -> None: + def __init__(self, scope: core.Construct, construct_id: str, **kwargs) -> None: super().__init__(scope, id, **kwargs) queue = sqs.Queue( From 1907b58c5d589f943b967024e00e5fd9f5ee2192 Mon Sep 17 00:00:00 2001 From: "Eric Z. Beard" Date: Tue, 20 Oct 2020 07:28:23 -0700 Subject: [PATCH 06/11] Fix construct_id --- .../%name.PythonModule%/%name.PythonModule%_stack.template.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py index cfd42d316ba4d..2ef0850e4a972 100644 --- a/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py +++ b/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py @@ -1,9 +1,9 @@ from aws_cdk import core -class %name.PascalCased%Stack(core.Stack): +class % name.PascalCased % Stack(core.Stack): def __init__(self, scope: core.Construct, construct_id: str, **kwargs) -> None: - super().__init__(scope, id, **kwargs) + super().__init__(scope, construct_id, **kwargs) # The code that defines your stack goes here From 0f856e99bb4e7938a9c80c17b29e8d72ec64169c Mon Sep 17 00:00:00 2001 From: "Eric Z. Beard" Date: Fri, 23 Oct 2020 09:47:24 -0700 Subject: [PATCH 07/11] Fix super with construct_id --- .../%name.PythonModule%/%name.PythonModule%_stack.template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py index c20594882b8c0..0b8597b0b6c8a 100644 --- a/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py +++ b/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py @@ -10,7 +10,7 @@ class % name.PascalCased % Stack(core.Stack): def __init__(self, scope: core.Construct, construct_id: str, **kwargs) -> None: - super().__init__(scope, id, **kwargs) + super().__init__(scope, construct_id, **kwargs) queue = sqs.Queue( self, "%name.PascalCased%Queue", From 884be45f969f3ac98e5d3c49e5c6019f6def1e2d Mon Sep 17 00:00:00 2001 From: "Eric Z. Beard" Date: Mon, 26 Oct 2020 15:48:29 -0700 Subject: [PATCH 08/11] Fix broken init templates --- .../%name.PythonModule%/%name.PythonModule%_stack.template.py | 2 +- .../%name.PythonModule%/%name.PythonModule%_stack.template.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py index 2ef0850e4a972..c8d1e9f923221 100644 --- a/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py +++ b/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py @@ -1,7 +1,7 @@ from aws_cdk import core -class % name.PascalCased % Stack(core.Stack): +class %name.PascalCased% Stack(core.Stack): def __init__(self, scope: core.Construct, construct_id: str, **kwargs) -> None: super().__init__(scope, construct_id, **kwargs) diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py index 0b8597b0b6c8a..44167db50d7df 100644 --- a/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py +++ b/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py @@ -7,7 +7,7 @@ ) -class % name.PascalCased % Stack(core.Stack): +class %name.PascalCased% Stack(core.Stack): def __init__(self, scope: core.Construct, construct_id: str, **kwargs) -> None: super().__init__(scope, construct_id, **kwargs) From 504caa555cfe2fc0fb2fe4c6c48660ef78c61cfe Mon Sep 17 00:00:00 2001 From: "Eric Z. Beard" Date: Mon, 26 Oct 2020 15:51:32 -0700 Subject: [PATCH 09/11] Fix missing maturity --- packages/@aws-cdk/aws-elasticsearch/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/@aws-cdk/aws-elasticsearch/package.json b/packages/@aws-cdk/aws-elasticsearch/package.json index 5f42892c18a27..948ace4a8b874 100644 --- a/packages/@aws-cdk/aws-elasticsearch/package.json +++ b/packages/@aws-cdk/aws-elasticsearch/package.json @@ -105,6 +105,7 @@ "node": ">= 10.13.0 <13 || >=13.7.0" }, "stability": "experimental", + "maturity": "experimental", "features": [ { "name": "Higher level constructs for Domain", From 0deff7e359486e94d1b6c1547999b4ba6cc46a03 Mon Sep 17 00:00:00 2001 From: "Eric Z. Beard" Date: Mon, 26 Oct 2020 15:54:11 -0700 Subject: [PATCH 10/11] Fix init templates --- .../%name.PythonModule%/%name.PythonModule%_stack.template.py | 2 +- .../%name.PythonModule%/%name.PythonModule%_stack.template.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py index c8d1e9f923221..9d86ad16906e6 100644 --- a/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py +++ b/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py @@ -1,7 +1,7 @@ from aws_cdk import core -class %name.PascalCased% Stack(core.Stack): +class %name.PascalCased%Stack(core.Stack): def __init__(self, scope: core.Construct, construct_id: str, **kwargs) -> None: super().__init__(scope, construct_id, **kwargs) diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py index 44167db50d7df..ace9c193df291 100644 --- a/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py +++ b/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py @@ -7,7 +7,7 @@ ) -class %name.PascalCased% Stack(core.Stack): +class %name.PascalCased%Stack(core.Stack): def __init__(self, scope: core.Construct, construct_id: str, **kwargs) -> None: super().__init__(scope, construct_id, **kwargs) From 656ba505177b277e4c073cc6100af37cca45a8e8 Mon Sep 17 00:00:00 2001 From: "Eric Z. Beard" Date: Mon, 26 Oct 2020 15:55:35 -0700 Subject: [PATCH 11/11] Fix init templates --- .../%name.PythonModule%/%name.PythonModule%_stack.template.py | 4 ++-- .../%name.PythonModule%/%name.PythonModule%_stack.template.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py index 9d86ad16906e6..adf164cd876c7 100644 --- a/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py +++ b/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py @@ -3,7 +3,7 @@ class %name.PascalCased%Stack(core.Stack): - def __init__(self, scope: core.Construct, construct_id: str, **kwargs) -> None: - super().__init__(scope, construct_id, **kwargs) + def __init__(self, scope: core.Construct, id: str, **kwargs) -> None: + super().__init__(scope, id, **kwargs) # The code that defines your stack goes here diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py index ace9c193df291..910a4b838c933 100644 --- a/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py +++ b/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py @@ -9,8 +9,8 @@ class %name.PascalCased%Stack(core.Stack): - def __init__(self, scope: core.Construct, construct_id: str, **kwargs) -> None: - super().__init__(scope, construct_id, **kwargs) + def __init__(self, scope: core.Construct, id: str, **kwargs) -> None: + super().__init__(scope, id, **kwargs) queue = sqs.Queue( self, "%name.PascalCased%Queue",