fix(python): Make sure stack name does not contain illegal characters (…

…#3261) * Make sure stack name does not contain illegal characters * Fix name and type of scope passed to Stacks
aws · Jul 9, 2019 · 7d22b2c · 7d22b2c
1 parent 0c30f12
commit 7d22b2c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/...k/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py b/...k/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, app: core.App, id: str, **kwargs) -> None:
-        super().__init__(app, 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/app/python/app.template.py b/packages/aws-cdk/lib/init-templates/app/python/app.template.py
@@ -6,6 +6,6 @@
 
 
 app = core.App()
-%name.PascalCased%Stack(app, "%name%-cdk-1")
+%name.PascalCased%Stack(app, "%name.StackName%")
 
 app.synth()
diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/hello/hello_stack.py b/packages/aws-cdk/lib/init-templates/sample-app/python/hello/hello_stack.py
@@ -11,8 +11,8 @@
 
 class MyStack(core.Stack):
 
-    def __init__(self, app: core.App, id: str, **kwargs) -> None:
-        super().__init__(app, id, **kwargs)
+    def __init__(self, scope: core.Construct, id: str, **kwargs) -> None:
+        super().__init__(scope, id, **kwargs)
 
         queue = sqs.Queue(
             self, "MyFirstQueue",

diff --git a/packages/aws-cdk/lib/init.ts b/packages/aws-cdk/lib/init.ts
@@ -154,7 +154,8 @@ export class InitTemplate {
              .replace(/%cdk-version%/g, cdkVersion)
              .replace(/%cdk-home%/g, CDK_HOME)
              .replace(/%name\.PythonModule%/g, project.name.replace(/-/g, '_'))
-             .replace(/%python-executable%/g, pythonExecutable());
+             .replace(/%python-executable%/g, pythonExecutable())
+             .replace(/%name\.StackName%/g, project.name.replace(/[^A-Za-z0-9-]/g, '-'));
   }
 }