Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: java and python templates are broken #17357

Merged
merged 10 commits into from Nov 6, 2021
Merged

fix: java and python templates are broken #17357

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9fc10d1
python app template to include basic test
iliapolo Nov 5, 2021
9f6b938
python app template to include basic test
iliapolo Nov 5, 2021
7c56742
replace Map.of with HashMap init to support java 8
iliapolo Nov 5, 2021
4539cf4
Merge branch 'master' into epolon/init-templates-broken
mergify[bot] Nov 5, 2021
6b67d56
Update CONTRIBUTING.md
iliapolo Nov 5, 2021
b84b9ce
Merge branch 'master' into epolon/init-templates-broken
iliapolo Nov 5, 2021
d691334
Merge branch 'master' into epolon/init-templates-broken
iliapolo Nov 5, 2021
90b8fec
Merge branch 'master' into epolon/init-templates-broken
iliapolo Nov 5, 2021
7b35160
Merge branch 'master' into epolon/init-templates-broken
iliapolo Nov 5, 2021
ee1bab0
Merge branch 'master' into epolon/init-templates-broken
mergify[bot] Nov 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...b/init-templates/v1/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
// import software.amazon.awscdk.assertions.Template;
// import java.io.IOException;

// import java.util.Map;
// import java.util.HashMap;

// import org.junit.jupiter.api.Test;

Expand All @@ -19,8 +19,8 @@

// Template template = Template.fromStack(stack);

// template.hasResourceProperties("AWS::SQS::Queue", Map.of(
// "VisibilityTimeout", 300
// ));
// template.hasResourceProperties("AWS::SQS::Queue", new HashMap<String, Number>() {{
// put("VisibilityTimeout", 300);
// }});
// }
// }
4 changes: 2 additions & 2 deletions packages/aws-cdk/lib/init-templates/v1/app/python/requirements.template.txt
View file
Open in desktop
@@ -1,2 +1,2 @@
aws-cdk.core>=%cdk-version%,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was just a random but I stumbled upon

aws-cdk.assertions>=%cdk-version%,
aws-cdk.core>=%cdk-version%
aws-cdk.assertions>=%cdk-version%
3 changes: 2 additions & 1 deletion ...dk/lib/init-templates/v1/app/python/tests/unit/test_%name.PythonModule%_stack.template.py
View file
Open in desktop
Expand Up @@ -8,11 +8,12 @@

# example tests. To run these tests, uncomment this file along with the example
# resource in %name.PythonModule%/%name.PythonModule%_stack.py
# def test_sqs_queue_created():
def test_sqs_queue_created():
# app = core.App()
# stack = %name.PascalCased%Stack(app, "%name.StackName%")
# template = assertions.Template.from_stack(stack)

# template.has_resource_properties("AWS::SQS::Queue", {
# "VisibilityTimeout": 300
# })
pass
8 changes: 4 additions & 4 deletions ...ates/v1/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
import software.amazon.awscdk.assertions.Match;
import java.io.IOException;

import java.util.Map;
import java.util.HashMap;

import org.junit.jupiter.api.Test;

Expand All @@ -18,9 +18,9 @@ public void testStack() throws IOException {

Template template = Template.fromStack(stack);

template.hasResourceProperties("AWS::SQS::Queue", Map.of(
"VisibilityTimeout", 300
));
template.hasResourceProperties("AWS::SQS::Queue", new HashMap<String, Number>() {{
put("VisibilityTimeout", 300);
}});
template.resourceCountIs("AWS::SNS::Topic", 1);
}
}
8 changes: 4 additions & 4 deletions ...b/init-templates/v2/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
// import software.amazon.awscdk.assertions.alpha.Template;
// import java.io.IOException;

// import java.util.Map;
// import java.util.HashMap;

// import org.junit.jupiter.api.Test;

Expand All @@ -19,8 +19,8 @@

// Template template = Template.fromStack(stack);

// template.hasResourceProperties("AWS::SQS::Queue", Map.of(
// "VisibilityTimeout", 300
// ));
// template.hasResourceProperties("AWS::SQS::Queue", new HashMap<String, Number>() {{
// put("VisibilityTimeout", 300);
// }});
// }
// }
8 changes: 4 additions & 4 deletions ...ates/v2/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
import software.amazon.awscdk.assertions.alpha.Match;
import java.io.IOException;

import java.util.Map;
import java.util.HashMap;

import org.junit.jupiter.api.Test;

Expand All @@ -18,9 +18,9 @@ public void testStack() throws IOException {

Template template = Template.fromStack(stack);

template.hasResourceProperties("AWS::SQS::Queue", Map.of(
"VisibilityTimeout", 300
));
template.hasResourceProperties("AWS::SQS::Queue", new HashMap<String, Number>() {{
put("VisibilityTimeout", 300);
}});

template.resourceCountIs("AWS::SNS::Topic", 1);
}
Expand Down