diff --git a/packages/aws-cdk/lib/init-templates/v1/app/csharp/.template.gitignore b/packages/aws-cdk/lib/init-templates/app/csharp/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/csharp/.template.gitignore rename to packages/aws-cdk/lib/init-templates/app/csharp/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/v1/app/csharp/README.md b/packages/aws-cdk/lib/init-templates/app/csharp/README.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/csharp/README.md rename to packages/aws-cdk/lib/init-templates/app/csharp/README.md diff --git a/packages/aws-cdk/lib/init-templates/v1/app/csharp/add-project.hook.ts b/packages/aws-cdk/lib/init-templates/app/csharp/add-project.hook.ts similarity index 95% rename from packages/aws-cdk/lib/init-templates/v1/app/csharp/add-project.hook.ts rename to packages/aws-cdk/lib/init-templates/app/csharp/add-project.hook.ts index 37b1fe6ad3e5f..c839c1e01db08 100644 --- a/packages/aws-cdk/lib/init-templates/v1/app/csharp/add-project.hook.ts +++ b/packages/aws-cdk/lib/init-templates/app/csharp/add-project.hook.ts @@ -1,6 +1,6 @@ import * as child_process from 'child_process'; import * as path from 'path'; -import { InvokeHook } from '../../../../init'; +import { InvokeHook } from '../../../init'; export const invoke: InvokeHook = async (targetDirectory: string) => { const slnPath = path.join(targetDirectory, 'src', '%name.PascalCased%.sln'); diff --git a/packages/aws-cdk/lib/init-templates/v1/app/csharp/cdk.template.json b/packages/aws-cdk/lib/init-templates/app/csharp/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/csharp/cdk.template.json rename to packages/aws-cdk/lib/init-templates/app/csharp/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/v1/app/csharp/src/%name.PascalCased%.template.sln b/packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%.template.sln similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/csharp/src/%name.PascalCased%.template.sln rename to packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%.template.sln diff --git a/packages/aws-cdk/lib/init-templates/v2/app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj b/packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj rename to packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj diff --git a/packages/aws-cdk/lib/init-templates/v2/app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs b/packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs rename to packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs diff --git a/packages/aws-cdk/lib/init-templates/v1/app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs b/packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs rename to packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs diff --git a/packages/aws-cdk/lib/init-templates/v2/app/csharp/src/%name.PascalCased%/Program.template.cs b/packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/Program.template.cs similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/csharp/src/%name.PascalCased%/Program.template.cs rename to packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/Program.template.cs diff --git a/packages/aws-cdk/lib/init-templates/v1/app/fsharp/.template.gitignore b/packages/aws-cdk/lib/init-templates/app/fsharp/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/fsharp/.template.gitignore rename to packages/aws-cdk/lib/init-templates/app/fsharp/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/v1/app/fsharp/README.md b/packages/aws-cdk/lib/init-templates/app/fsharp/README.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/fsharp/README.md rename to packages/aws-cdk/lib/init-templates/app/fsharp/README.md diff --git a/packages/aws-cdk/lib/init-templates/v2/app/fsharp/add-project.hook.ts b/packages/aws-cdk/lib/init-templates/app/fsharp/add-project.hook.ts similarity index 95% rename from packages/aws-cdk/lib/init-templates/v2/app/fsharp/add-project.hook.ts rename to packages/aws-cdk/lib/init-templates/app/fsharp/add-project.hook.ts index b9b091fa35ff1..efeed98d57ee2 100644 --- a/packages/aws-cdk/lib/init-templates/v2/app/fsharp/add-project.hook.ts +++ b/packages/aws-cdk/lib/init-templates/app/fsharp/add-project.hook.ts @@ -1,6 +1,6 @@ import * as child_process from 'child_process'; import * as path from 'path'; -import { InvokeHook } from '../../../../init'; +import { InvokeHook } from '../../../init'; export const invoke: InvokeHook = async (targetDirectory: string) => { const slnPath = path.join(targetDirectory, 'src', '%name.PascalCased%.sln'); diff --git a/packages/aws-cdk/lib/init-templates/v1/app/fsharp/cdk.template.json b/packages/aws-cdk/lib/init-templates/app/fsharp/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/fsharp/cdk.template.json rename to packages/aws-cdk/lib/init-templates/app/fsharp/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/v1/app/fsharp/src/%name.PascalCased%.template.sln b/packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%.template.sln similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/fsharp/src/%name.PascalCased%.template.sln rename to packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%.template.sln diff --git a/packages/aws-cdk/lib/init-templates/v2/app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj b/packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj rename to packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj diff --git a/packages/aws-cdk/lib/init-templates/v1/app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs b/packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs rename to packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs diff --git a/packages/aws-cdk/lib/init-templates/v1/app/fsharp/src/%name.PascalCased%/Program.template.fs b/packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%/Program.template.fs similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/fsharp/src/%name.PascalCased%/Program.template.fs rename to packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%/Program.template.fs diff --git a/packages/aws-cdk/lib/init-templates/v2/app/go/%name%.template.go b/packages/aws-cdk/lib/init-templates/app/go/%name%.template.go similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/go/%name%.template.go rename to packages/aws-cdk/lib/init-templates/app/go/%name%.template.go diff --git a/packages/aws-cdk/lib/init-templates/v2/app/go/%name%_test.template.go b/packages/aws-cdk/lib/init-templates/app/go/%name%_test.template.go similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/go/%name%_test.template.go rename to packages/aws-cdk/lib/init-templates/app/go/%name%_test.template.go diff --git a/packages/aws-cdk/lib/init-templates/v1/app/go/.template.gitignore b/packages/aws-cdk/lib/init-templates/app/go/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/go/.template.gitignore rename to packages/aws-cdk/lib/init-templates/app/go/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/v1/app/go/README.md b/packages/aws-cdk/lib/init-templates/app/go/README.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/go/README.md rename to packages/aws-cdk/lib/init-templates/app/go/README.md diff --git a/packages/aws-cdk/lib/init-templates/v1/app/go/cdk.template.json b/packages/aws-cdk/lib/init-templates/app/go/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/go/cdk.template.json rename to packages/aws-cdk/lib/init-templates/app/go/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/v2/app/go/go.template.mod b/packages/aws-cdk/lib/init-templates/app/go/go.template.mod similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/go/go.template.mod rename to packages/aws-cdk/lib/init-templates/app/go/go.template.mod diff --git a/packages/aws-cdk/lib/init-templates/v1/app/info.json b/packages/aws-cdk/lib/init-templates/app/info.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/info.json rename to packages/aws-cdk/lib/init-templates/app/info.json diff --git a/packages/aws-cdk/lib/init-templates/v1/app/java/.template.gitignore b/packages/aws-cdk/lib/init-templates/app/java/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/java/.template.gitignore rename to packages/aws-cdk/lib/init-templates/app/java/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/v1/app/java/README.md b/packages/aws-cdk/lib/init-templates/app/java/README.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/java/README.md rename to packages/aws-cdk/lib/init-templates/app/java/README.md diff --git a/packages/aws-cdk/lib/init-templates/v1/app/java/cdk.json b/packages/aws-cdk/lib/init-templates/app/java/cdk.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/java/cdk.json rename to packages/aws-cdk/lib/init-templates/app/java/cdk.json diff --git a/packages/aws-cdk/lib/init-templates/v2/app/java/pom.xml b/packages/aws-cdk/lib/init-templates/app/java/pom.xml similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/java/pom.xml rename to packages/aws-cdk/lib/init-templates/app/java/pom.xml diff --git a/packages/aws-cdk/lib/init-templates/v2/app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java b/packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java rename to packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java diff --git a/packages/aws-cdk/lib/init-templates/v2/app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java b/packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java rename to packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java diff --git a/packages/aws-cdk/lib/init-templates/v2/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java b/packages/aws-cdk/lib/init-templates/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java rename to packages/aws-cdk/lib/init-templates/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/java/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/app/java/sub-placeholders.hook.ts similarity index 82% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/java/sub-placeholders.hook.ts rename to packages/aws-cdk/lib/init-templates/app/java/sub-placeholders.hook.ts index 98c27ef042b9c..a33a366d99eff 100644 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/java/sub-placeholders.hook.ts +++ b/packages/aws-cdk/lib/init-templates/app/java/sub-placeholders.hook.ts @@ -1,4 +1,4 @@ -import { InvokeHook } from '../../../../init'; +import { InvokeHook } from '../../../init'; export const invoke: InvokeHook = async (_, context) => { // File cannot be named like regular template because it needs to be diff --git a/packages/aws-cdk/lib/init-templates/v1/app/javascript/.template.gitignore b/packages/aws-cdk/lib/init-templates/app/javascript/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/javascript/.template.gitignore rename to packages/aws-cdk/lib/init-templates/app/javascript/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/v1/app/javascript/.template.npmignore b/packages/aws-cdk/lib/init-templates/app/javascript/.template.npmignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/javascript/.template.npmignore rename to packages/aws-cdk/lib/init-templates/app/javascript/.template.npmignore diff --git a/packages/aws-cdk/lib/init-templates/v1/app/javascript/README.md b/packages/aws-cdk/lib/init-templates/app/javascript/README.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/javascript/README.md rename to packages/aws-cdk/lib/init-templates/app/javascript/README.md diff --git a/packages/aws-cdk/lib/init-templates/v2/app/javascript/bin/%name%.template.js b/packages/aws-cdk/lib/init-templates/app/javascript/bin/%name%.template.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/javascript/bin/%name%.template.js rename to packages/aws-cdk/lib/init-templates/app/javascript/bin/%name%.template.js diff --git a/packages/aws-cdk/lib/init-templates/v1/app/javascript/cdk.template.json b/packages/aws-cdk/lib/init-templates/app/javascript/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/javascript/cdk.template.json rename to packages/aws-cdk/lib/init-templates/app/javascript/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/jest.config.js b/packages/aws-cdk/lib/init-templates/app/javascript/jest.config.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/jest.config.js rename to packages/aws-cdk/lib/init-templates/app/javascript/jest.config.js diff --git a/packages/aws-cdk/lib/init-templates/v2/app/javascript/lib/%name%-stack.template.js b/packages/aws-cdk/lib/init-templates/app/javascript/lib/%name%-stack.template.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/javascript/lib/%name%-stack.template.js rename to packages/aws-cdk/lib/init-templates/app/javascript/lib/%name%-stack.template.js diff --git a/packages/aws-cdk/lib/init-templates/v2/app/javascript/package.json b/packages/aws-cdk/lib/init-templates/app/javascript/package.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/javascript/package.json rename to packages/aws-cdk/lib/init-templates/app/javascript/package.json diff --git a/packages/aws-cdk/lib/init-templates/v1/app/typescript/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/app/javascript/sub-placeholders.hook.ts similarity index 83% rename from packages/aws-cdk/lib/init-templates/v1/app/typescript/sub-placeholders.hook.ts rename to packages/aws-cdk/lib/init-templates/app/javascript/sub-placeholders.hook.ts index 039bb00d6f43f..a23cf905e5564 100644 --- a/packages/aws-cdk/lib/init-templates/v1/app/typescript/sub-placeholders.hook.ts +++ b/packages/aws-cdk/lib/init-templates/app/javascript/sub-placeholders.hook.ts @@ -1,4 +1,4 @@ -import { InvokeHook } from '../../../../init'; +import { InvokeHook } from '../../../init'; export const invoke: InvokeHook = async (_, context) => { // File cannot be named like regular template because it needs to be diff --git a/packages/aws-cdk/lib/init-templates/v2/app/javascript/test/%name%.test.template.js b/packages/aws-cdk/lib/init-templates/app/javascript/test/%name%.test.template.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/javascript/test/%name%.test.template.js rename to packages/aws-cdk/lib/init-templates/app/javascript/test/%name%.test.template.js diff --git a/packages/aws-cdk/lib/init-templates/v2/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 similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py rename to packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py diff --git a/packages/aws-cdk/lib/init-templates/v1/app/python/%name.PythonModule%/__init__.py b/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/__init__.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/python/%name.PythonModule%/__init__.py rename to packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/__init__.py diff --git a/packages/aws-cdk/lib/init-templates/v2/app/python/.template.gitignore b/packages/aws-cdk/lib/init-templates/app/python/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/python/.template.gitignore rename to packages/aws-cdk/lib/init-templates/app/python/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/v1/app/python/README.template.md b/packages/aws-cdk/lib/init-templates/app/python/README.template.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/python/README.template.md rename to packages/aws-cdk/lib/init-templates/app/python/README.template.md diff --git a/packages/aws-cdk/lib/init-templates/v2/app/python/app.template.py b/packages/aws-cdk/lib/init-templates/app/python/app.template.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/python/app.template.py rename to packages/aws-cdk/lib/init-templates/app/python/app.template.py diff --git a/packages/aws-cdk/lib/init-templates/v1/app/python/cdk.template.json b/packages/aws-cdk/lib/init-templates/app/python/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/python/cdk.template.json rename to packages/aws-cdk/lib/init-templates/app/python/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/v1/app/python/requirements-dev.txt b/packages/aws-cdk/lib/init-templates/app/python/requirements-dev.txt similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/python/requirements-dev.txt rename to packages/aws-cdk/lib/init-templates/app/python/requirements-dev.txt diff --git a/packages/aws-cdk/lib/init-templates/v2/app/python/requirements.txt b/packages/aws-cdk/lib/init-templates/app/python/requirements.txt similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/python/requirements.txt rename to packages/aws-cdk/lib/init-templates/app/python/requirements.txt diff --git a/packages/aws-cdk/lib/init-templates/v1/app/python/source.bat b/packages/aws-cdk/lib/init-templates/app/python/source.bat similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/python/source.bat rename to packages/aws-cdk/lib/init-templates/app/python/source.bat diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/app/python/sub-placeholders.hook.ts similarity index 83% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/python/sub-placeholders.hook.ts rename to packages/aws-cdk/lib/init-templates/app/python/sub-placeholders.hook.ts index 67bf2a9c6e8f4..da4718522f3b9 100644 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/sub-placeholders.hook.ts +++ b/packages/aws-cdk/lib/init-templates/app/python/sub-placeholders.hook.ts @@ -1,4 +1,4 @@ -import { InvokeHook } from '../../../../init'; +import { InvokeHook } from '../../../init'; export const invoke: InvokeHook = async (_, context) => { // File cannot be named like regular template because it needs to be diff --git a/packages/aws-cdk/lib/init-templates/v1/app/python/tests/__init__.py b/packages/aws-cdk/lib/init-templates/app/python/tests/__init__.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/python/tests/__init__.py rename to packages/aws-cdk/lib/init-templates/app/python/tests/__init__.py diff --git a/packages/aws-cdk/lib/init-templates/v1/app/python/tests/unit/__init__.py b/packages/aws-cdk/lib/init-templates/app/python/tests/unit/__init__.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/python/tests/unit/__init__.py rename to packages/aws-cdk/lib/init-templates/app/python/tests/unit/__init__.py diff --git a/packages/aws-cdk/lib/init-templates/v2/app/python/tests/unit/test_%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/app/python/tests/unit/test_%name.PythonModule%_stack.template.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/python/tests/unit/test_%name.PythonModule%_stack.template.py rename to packages/aws-cdk/lib/init-templates/app/python/tests/unit/test_%name.PythonModule%_stack.template.py diff --git a/packages/aws-cdk/lib/init-templates/v1/app/typescript/.template.gitignore b/packages/aws-cdk/lib/init-templates/app/typescript/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/typescript/.template.gitignore rename to packages/aws-cdk/lib/init-templates/app/typescript/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/v1/app/typescript/.template.npmignore b/packages/aws-cdk/lib/init-templates/app/typescript/.template.npmignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/typescript/.template.npmignore rename to packages/aws-cdk/lib/init-templates/app/typescript/.template.npmignore diff --git a/packages/aws-cdk/lib/init-templates/v1/app/typescript/README.md b/packages/aws-cdk/lib/init-templates/app/typescript/README.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/typescript/README.md rename to packages/aws-cdk/lib/init-templates/app/typescript/README.md diff --git a/packages/aws-cdk/lib/init-templates/v2/app/typescript/bin/%name%.template.ts b/packages/aws-cdk/lib/init-templates/app/typescript/bin/%name%.template.ts similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/typescript/bin/%name%.template.ts rename to packages/aws-cdk/lib/init-templates/app/typescript/bin/%name%.template.ts diff --git a/packages/aws-cdk/lib/init-templates/v1/app/typescript/cdk.template.json b/packages/aws-cdk/lib/init-templates/app/typescript/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/typescript/cdk.template.json rename to packages/aws-cdk/lib/init-templates/app/typescript/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/v1/app/typescript/jest.config.js b/packages/aws-cdk/lib/init-templates/app/typescript/jest.config.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/typescript/jest.config.js rename to packages/aws-cdk/lib/init-templates/app/typescript/jest.config.js diff --git a/packages/aws-cdk/lib/init-templates/v2/app/typescript/lib/%name%-stack.template.ts b/packages/aws-cdk/lib/init-templates/app/typescript/lib/%name%-stack.template.ts similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/typescript/lib/%name%-stack.template.ts rename to packages/aws-cdk/lib/init-templates/app/typescript/lib/%name%-stack.template.ts diff --git a/packages/aws-cdk/lib/init-templates/v2/app/typescript/package.json b/packages/aws-cdk/lib/init-templates/app/typescript/package.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/typescript/package.json rename to packages/aws-cdk/lib/init-templates/app/typescript/package.json diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/app/typescript/sub-placeholders.hook.ts similarity index 83% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/sub-placeholders.hook.ts rename to packages/aws-cdk/lib/init-templates/app/typescript/sub-placeholders.hook.ts index 039bb00d6f43f..a23cf905e5564 100644 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/sub-placeholders.hook.ts +++ b/packages/aws-cdk/lib/init-templates/app/typescript/sub-placeholders.hook.ts @@ -1,4 +1,4 @@ -import { InvokeHook } from '../../../../init'; +import { InvokeHook } from '../../../init'; export const invoke: InvokeHook = async (_, context) => { // File cannot be named like regular template because it needs to be diff --git a/packages/aws-cdk/lib/init-templates/v2/app/typescript/test/%name%.test.template.ts b/packages/aws-cdk/lib/init-templates/app/typescript/test/%name%.test.template.ts similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/typescript/test/%name%.test.template.ts rename to packages/aws-cdk/lib/init-templates/app/typescript/test/%name%.test.template.ts diff --git a/packages/aws-cdk/lib/init-templates/v1/app/typescript/tsconfig.json b/packages/aws-cdk/lib/init-templates/app/typescript/tsconfig.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/app/typescript/tsconfig.json rename to packages/aws-cdk/lib/init-templates/app/typescript/tsconfig.json diff --git a/packages/aws-cdk/lib/init-templates/v1/lib/info.json b/packages/aws-cdk/lib/init-templates/lib/info.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/lib/info.json rename to packages/aws-cdk/lib/init-templates/lib/info.json diff --git a/packages/aws-cdk/lib/init-templates/v1/lib/typescript/.template.gitignore b/packages/aws-cdk/lib/init-templates/lib/typescript/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/lib/typescript/.template.gitignore rename to packages/aws-cdk/lib/init-templates/lib/typescript/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/v1/lib/typescript/.template.npmignore b/packages/aws-cdk/lib/init-templates/lib/typescript/.template.npmignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/lib/typescript/.template.npmignore rename to packages/aws-cdk/lib/init-templates/lib/typescript/.template.npmignore diff --git a/packages/aws-cdk/lib/init-templates/v2/lib/typescript/README.template.md b/packages/aws-cdk/lib/init-templates/lib/typescript/README.template.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/lib/typescript/README.template.md rename to packages/aws-cdk/lib/init-templates/lib/typescript/README.template.md diff --git a/packages/aws-cdk/lib/init-templates/v1/lib/typescript/jest.config.js b/packages/aws-cdk/lib/init-templates/lib/typescript/jest.config.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/lib/typescript/jest.config.js rename to packages/aws-cdk/lib/init-templates/lib/typescript/jest.config.js diff --git a/packages/aws-cdk/lib/init-templates/v2/lib/typescript/lib/index.template.ts b/packages/aws-cdk/lib/init-templates/lib/typescript/lib/index.template.ts similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/lib/typescript/lib/index.template.ts rename to packages/aws-cdk/lib/init-templates/lib/typescript/lib/index.template.ts diff --git a/packages/aws-cdk/lib/init-templates/v2/lib/typescript/package.json b/packages/aws-cdk/lib/init-templates/lib/typescript/package.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/lib/typescript/package.json rename to packages/aws-cdk/lib/init-templates/lib/typescript/package.json diff --git a/packages/aws-cdk/lib/init-templates/v1/lib/typescript/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/lib/typescript/sub-placeholders.hook.ts similarity index 83% rename from packages/aws-cdk/lib/init-templates/v1/lib/typescript/sub-placeholders.hook.ts rename to packages/aws-cdk/lib/init-templates/lib/typescript/sub-placeholders.hook.ts index 039bb00d6f43f..a23cf905e5564 100644 --- a/packages/aws-cdk/lib/init-templates/v1/lib/typescript/sub-placeholders.hook.ts +++ b/packages/aws-cdk/lib/init-templates/lib/typescript/sub-placeholders.hook.ts @@ -1,4 +1,4 @@ -import { InvokeHook } from '../../../../init'; +import { InvokeHook } from '../../../init'; export const invoke: InvokeHook = async (_, context) => { // File cannot be named like regular template because it needs to be diff --git a/packages/aws-cdk/lib/init-templates/v2/lib/typescript/test/%name%.test.template.ts b/packages/aws-cdk/lib/init-templates/lib/typescript/test/%name%.test.template.ts similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/lib/typescript/test/%name%.test.template.ts rename to packages/aws-cdk/lib/init-templates/lib/typescript/test/%name%.test.template.ts diff --git a/packages/aws-cdk/lib/init-templates/v1/lib/typescript/tsconfig.json b/packages/aws-cdk/lib/init-templates/lib/typescript/tsconfig.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/lib/typescript/tsconfig.json rename to packages/aws-cdk/lib/init-templates/lib/typescript/tsconfig.json diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/.template.gitignore b/packages/aws-cdk/lib/init-templates/sample-app/csharp/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/.template.gitignore rename to packages/aws-cdk/lib/init-templates/sample-app/csharp/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/README.template.md b/packages/aws-cdk/lib/init-templates/sample-app/csharp/README.template.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/README.template.md rename to packages/aws-cdk/lib/init-templates/sample-app/csharp/README.template.md diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/add-project.hook.ts b/packages/aws-cdk/lib/init-templates/sample-app/csharp/add-project.hook.ts similarity index 95% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/add-project.hook.ts rename to packages/aws-cdk/lib/init-templates/sample-app/csharp/add-project.hook.ts index 37b1fe6ad3e5f..c839c1e01db08 100644 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/add-project.hook.ts +++ b/packages/aws-cdk/lib/init-templates/sample-app/csharp/add-project.hook.ts @@ -1,6 +1,6 @@ import * as child_process from 'child_process'; import * as path from 'path'; -import { InvokeHook } from '../../../../init'; +import { InvokeHook } from '../../../init'; export const invoke: InvokeHook = async (targetDirectory: string) => { const slnPath = path.join(targetDirectory, 'src', '%name.PascalCased%.sln'); diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/cdk.template.json b/packages/aws-cdk/lib/init-templates/sample-app/csharp/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/cdk.template.json rename to packages/aws-cdk/lib/init-templates/sample-app/csharp/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/src/%name.PascalCased%.template.sln b/packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%.template.sln similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/src/%name.PascalCased%.template.sln rename to packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%.template.sln diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj b/packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj rename to packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs b/packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs rename to packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs b/packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs rename to packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/src/%name.PascalCased%/Program.template.cs b/packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/Program.template.cs similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/src/%name.PascalCased%/Program.template.cs rename to packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/Program.template.cs diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/.template.gitignore b/packages/aws-cdk/lib/init-templates/sample-app/fsharp/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/.template.gitignore rename to packages/aws-cdk/lib/init-templates/sample-app/fsharp/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/README.template.md b/packages/aws-cdk/lib/init-templates/sample-app/fsharp/README.template.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/README.template.md rename to packages/aws-cdk/lib/init-templates/sample-app/fsharp/README.template.md diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/add-project.hook.ts b/packages/aws-cdk/lib/init-templates/sample-app/fsharp/add-project.hook.ts similarity index 95% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/add-project.hook.ts rename to packages/aws-cdk/lib/init-templates/sample-app/fsharp/add-project.hook.ts index b9b091fa35ff1..efeed98d57ee2 100644 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/add-project.hook.ts +++ b/packages/aws-cdk/lib/init-templates/sample-app/fsharp/add-project.hook.ts @@ -1,6 +1,6 @@ import * as child_process from 'child_process'; import * as path from 'path'; -import { InvokeHook } from '../../../../init'; +import { InvokeHook } from '../../../init'; export const invoke: InvokeHook = async (targetDirectory: string) => { const slnPath = path.join(targetDirectory, 'src', '%name.PascalCased%.sln'); diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/cdk.template.json b/packages/aws-cdk/lib/init-templates/sample-app/fsharp/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/cdk.template.json rename to packages/aws-cdk/lib/init-templates/sample-app/fsharp/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/src/%name.PascalCased%.template.sln b/packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%.template.sln similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/src/%name.PascalCased%.template.sln rename to packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%.template.sln diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj b/packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj rename to packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs b/packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs rename to packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/src/%name.PascalCased%/Program.template.fs b/packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%/Program.template.fs similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/src/%name.PascalCased%/Program.template.fs rename to packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%/Program.template.fs diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/go/%name%.template.go b/packages/aws-cdk/lib/init-templates/sample-app/go/%name%.template.go similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/go/%name%.template.go rename to packages/aws-cdk/lib/init-templates/sample-app/go/%name%.template.go diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/go/%name%_test.template.go b/packages/aws-cdk/lib/init-templates/sample-app/go/%name%_test.template.go similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/go/%name%_test.template.go rename to packages/aws-cdk/lib/init-templates/sample-app/go/%name%_test.template.go diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/go/.template.gitignore b/packages/aws-cdk/lib/init-templates/sample-app/go/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/go/.template.gitignore rename to packages/aws-cdk/lib/init-templates/sample-app/go/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/go/README.md b/packages/aws-cdk/lib/init-templates/sample-app/go/README.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/go/README.md rename to packages/aws-cdk/lib/init-templates/sample-app/go/README.md diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/go/cdk.template.json b/packages/aws-cdk/lib/init-templates/sample-app/go/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/go/cdk.template.json rename to packages/aws-cdk/lib/init-templates/sample-app/go/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/go/go.template.mod b/packages/aws-cdk/lib/init-templates/sample-app/go/go.template.mod similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/go/go.template.mod rename to packages/aws-cdk/lib/init-templates/sample-app/go/go.template.mod diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/info.json b/packages/aws-cdk/lib/init-templates/sample-app/info.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/info.json rename to packages/aws-cdk/lib/init-templates/sample-app/info.json diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/java/.template.gitignore b/packages/aws-cdk/lib/init-templates/sample-app/java/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/java/.template.gitignore rename to packages/aws-cdk/lib/init-templates/sample-app/java/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/java/README.template.md b/packages/aws-cdk/lib/init-templates/sample-app/java/README.template.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/java/README.template.md rename to packages/aws-cdk/lib/init-templates/sample-app/java/README.template.md diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/java/cdk.json b/packages/aws-cdk/lib/init-templates/sample-app/java/cdk.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/java/cdk.json rename to packages/aws-cdk/lib/init-templates/sample-app/java/cdk.json diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/java/pom.xml b/packages/aws-cdk/lib/init-templates/sample-app/java/pom.xml similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/java/pom.xml rename to packages/aws-cdk/lib/init-templates/sample-app/java/pom.xml diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java b/packages/aws-cdk/lib/init-templates/sample-app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java rename to packages/aws-cdk/lib/init-templates/sample-app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java b/packages/aws-cdk/lib/init-templates/sample-app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java rename to packages/aws-cdk/lib/init-templates/sample-app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java b/packages/aws-cdk/lib/init-templates/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java rename to packages/aws-cdk/lib/init-templates/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java diff --git a/packages/aws-cdk/lib/init-templates/v1/app/java/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/sample-app/java/sub-placeholders.hook.ts similarity index 82% rename from packages/aws-cdk/lib/init-templates/v1/app/java/sub-placeholders.hook.ts rename to packages/aws-cdk/lib/init-templates/sample-app/java/sub-placeholders.hook.ts index 98c27ef042b9c..a33a366d99eff 100644 --- a/packages/aws-cdk/lib/init-templates/v1/app/java/sub-placeholders.hook.ts +++ b/packages/aws-cdk/lib/init-templates/sample-app/java/sub-placeholders.hook.ts @@ -1,4 +1,4 @@ -import { InvokeHook } from '../../../../init'; +import { InvokeHook } from '../../../init'; export const invoke: InvokeHook = async (_, context) => { // File cannot be named like regular template because it needs to be diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/.template.gitignore b/packages/aws-cdk/lib/init-templates/sample-app/javascript/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/.template.gitignore rename to packages/aws-cdk/lib/init-templates/sample-app/javascript/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/.template.npmignore b/packages/aws-cdk/lib/init-templates/sample-app/javascript/.template.npmignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/.template.npmignore rename to packages/aws-cdk/lib/init-templates/sample-app/javascript/.template.npmignore diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/README.template.md b/packages/aws-cdk/lib/init-templates/sample-app/javascript/README.template.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/README.template.md rename to packages/aws-cdk/lib/init-templates/sample-app/javascript/README.template.md diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/bin/%name%.template.js b/packages/aws-cdk/lib/init-templates/sample-app/javascript/bin/%name%.template.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/bin/%name%.template.js rename to packages/aws-cdk/lib/init-templates/sample-app/javascript/bin/%name%.template.js diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/cdk.template.json b/packages/aws-cdk/lib/init-templates/sample-app/javascript/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/cdk.template.json rename to packages/aws-cdk/lib/init-templates/sample-app/javascript/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/v2/app/javascript/jest.config.js b/packages/aws-cdk/lib/init-templates/sample-app/javascript/jest.config.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/app/javascript/jest.config.js rename to packages/aws-cdk/lib/init-templates/sample-app/javascript/jest.config.js diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/lib/%name%-stack.template.js b/packages/aws-cdk/lib/init-templates/sample-app/javascript/lib/%name%-stack.template.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/lib/%name%-stack.template.js rename to packages/aws-cdk/lib/init-templates/sample-app/javascript/lib/%name%-stack.template.js diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/package.json b/packages/aws-cdk/lib/init-templates/sample-app/javascript/package.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/package.json rename to packages/aws-cdk/lib/init-templates/sample-app/javascript/package.json diff --git a/packages/aws-cdk/lib/init-templates/v1/app/javascript/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/sample-app/javascript/sub-placeholders.hook.ts similarity index 83% rename from packages/aws-cdk/lib/init-templates/v1/app/javascript/sub-placeholders.hook.ts rename to packages/aws-cdk/lib/init-templates/sample-app/javascript/sub-placeholders.hook.ts index 039bb00d6f43f..a23cf905e5564 100644 --- a/packages/aws-cdk/lib/init-templates/v1/app/javascript/sub-placeholders.hook.ts +++ b/packages/aws-cdk/lib/init-templates/sample-app/javascript/sub-placeholders.hook.ts @@ -1,4 +1,4 @@ -import { InvokeHook } from '../../../../init'; +import { InvokeHook } from '../../../init'; export const invoke: InvokeHook = async (_, context) => { // File cannot be named like regular template because it needs to be diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/test/%name%.test.template.js b/packages/aws-cdk/lib/init-templates/sample-app/javascript/test/%name%.test.template.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/test/%name%.test.template.js rename to packages/aws-cdk/lib/init-templates/sample-app/javascript/test/%name%.test.template.js diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/tsconfig.json b/packages/aws-cdk/lib/init-templates/sample-app/javascript/tsconfig.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/tsconfig.json rename to packages/aws-cdk/lib/init-templates/sample-app/javascript/tsconfig.json diff --git a/packages/aws-cdk/lib/init-templates/v2/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 similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py rename to packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/%name.PythonModule%/__init__.py b/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/__init__.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/python/%name.PythonModule%/__init__.py rename to packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/__init__.py diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/.template.gitignore b/packages/aws-cdk/lib/init-templates/sample-app/python/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/python/.template.gitignore rename to packages/aws-cdk/lib/init-templates/sample-app/python/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/python/README.template.md b/packages/aws-cdk/lib/init-templates/sample-app/python/README.template.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/python/README.template.md rename to packages/aws-cdk/lib/init-templates/sample-app/python/README.template.md diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/python/app.template.py b/packages/aws-cdk/lib/init-templates/sample-app/python/app.template.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/python/app.template.py rename to packages/aws-cdk/lib/init-templates/sample-app/python/app.template.py diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/cdk.template.json b/packages/aws-cdk/lib/init-templates/sample-app/python/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/python/cdk.template.json rename to packages/aws-cdk/lib/init-templates/sample-app/python/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/requirements-dev.txt b/packages/aws-cdk/lib/init-templates/sample-app/python/requirements-dev.txt similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/python/requirements-dev.txt rename to packages/aws-cdk/lib/init-templates/sample-app/python/requirements-dev.txt diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/python/requirements.txt b/packages/aws-cdk/lib/init-templates/sample-app/python/requirements.txt similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/python/requirements.txt rename to packages/aws-cdk/lib/init-templates/sample-app/python/requirements.txt diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/source.bat b/packages/aws-cdk/lib/init-templates/sample-app/python/source.bat similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/python/source.bat rename to packages/aws-cdk/lib/init-templates/sample-app/python/source.bat diff --git a/packages/aws-cdk/lib/init-templates/v2/app/python/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/sample-app/python/sub-placeholders.hook.ts similarity index 83% rename from packages/aws-cdk/lib/init-templates/v2/app/python/sub-placeholders.hook.ts rename to packages/aws-cdk/lib/init-templates/sample-app/python/sub-placeholders.hook.ts index 67bf2a9c6e8f4..da4718522f3b9 100644 --- a/packages/aws-cdk/lib/init-templates/v2/app/python/sub-placeholders.hook.ts +++ b/packages/aws-cdk/lib/init-templates/sample-app/python/sub-placeholders.hook.ts @@ -1,4 +1,4 @@ -import { InvokeHook } from '../../../../init'; +import { InvokeHook } from '../../../init'; export const invoke: InvokeHook = async (_, context) => { // File cannot be named like regular template because it needs to be diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/tests/__init__.py b/packages/aws-cdk/lib/init-templates/sample-app/python/tests/__init__.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/python/tests/__init__.py rename to packages/aws-cdk/lib/init-templates/sample-app/python/tests/__init__.py diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/tests/unit/__init__.py b/packages/aws-cdk/lib/init-templates/sample-app/python/tests/unit/__init__.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/python/tests/unit/__init__.py rename to packages/aws-cdk/lib/init-templates/sample-app/python/tests/unit/__init__.py diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/python/tests/unit/test_%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/sample-app/python/tests/unit/test_%name.PythonModule%_stack.template.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/python/tests/unit/test_%name.PythonModule%_stack.template.py rename to packages/aws-cdk/lib/init-templates/sample-app/python/tests/unit/test_%name.PythonModule%_stack.template.py diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/.template.gitignore b/packages/aws-cdk/lib/init-templates/sample-app/typescript/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/.template.gitignore rename to packages/aws-cdk/lib/init-templates/sample-app/typescript/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/.template.npmignore b/packages/aws-cdk/lib/init-templates/sample-app/typescript/.template.npmignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/.template.npmignore rename to packages/aws-cdk/lib/init-templates/sample-app/typescript/.template.npmignore diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/README.template.md b/packages/aws-cdk/lib/init-templates/sample-app/typescript/README.template.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/README.template.md rename to packages/aws-cdk/lib/init-templates/sample-app/typescript/README.template.md diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/bin/%name%.template.ts b/packages/aws-cdk/lib/init-templates/sample-app/typescript/bin/%name%.template.ts similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/bin/%name%.template.ts rename to packages/aws-cdk/lib/init-templates/sample-app/typescript/bin/%name%.template.ts diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/cdk.template.json b/packages/aws-cdk/lib/init-templates/sample-app/typescript/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/cdk.template.json rename to packages/aws-cdk/lib/init-templates/sample-app/typescript/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/jest.config.js b/packages/aws-cdk/lib/init-templates/sample-app/typescript/jest.config.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/jest.config.js rename to packages/aws-cdk/lib/init-templates/sample-app/typescript/jest.config.js diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/lib/%name%-stack.template.ts b/packages/aws-cdk/lib/init-templates/sample-app/typescript/lib/%name%-stack.template.ts similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/lib/%name%-stack.template.ts rename to packages/aws-cdk/lib/init-templates/sample-app/typescript/lib/%name%-stack.template.ts diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/package.json b/packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/package.json rename to packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json diff --git a/packages/aws-cdk/lib/init-templates/sample-app/typescript/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/sample-app/typescript/sub-placeholders.hook.ts new file mode 100644 index 0000000000000..a23cf905e5564 --- /dev/null +++ b/packages/aws-cdk/lib/init-templates/sample-app/typescript/sub-placeholders.hook.ts @@ -0,0 +1,7 @@ +import { InvokeHook } from '../../../init'; + +export const invoke: InvokeHook = async (_, context) => { + // File cannot be named like regular template because it needs to be + // processed by dependency updaters. + await context.substitutePlaceholdersIn('package.json'); +}; diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/test/%name%.test.template.ts b/packages/aws-cdk/lib/init-templates/sample-app/typescript/test/%name%.test.template.ts similarity index 100% rename from packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/test/%name%.test.template.ts rename to packages/aws-cdk/lib/init-templates/sample-app/typescript/test/%name%.test.template.ts diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/tsconfig.json b/packages/aws-cdk/lib/init-templates/sample-app/typescript/tsconfig.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/tsconfig.json rename to packages/aws-cdk/lib/init-templates/sample-app/typescript/tsconfig.json diff --git a/packages/aws-cdk/lib/init-templates/v1/app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj b/packages/aws-cdk/lib/init-templates/v1/app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj deleted file mode 100644 index 4572e92eafed1..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - Exe - netcoreapp3.1 - - Major - - - - - - - - - - diff --git a/packages/aws-cdk/lib/init-templates/v1/app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs b/packages/aws-cdk/lib/init-templates/v1/app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs deleted file mode 100644 index 6aadf6a3a0e05..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Amazon.CDK; - -namespace %name.PascalCased% -{ - public class %name.PascalCased%Stack : Stack - { - internal %name.PascalCased%Stack(Construct scope, string id, IStackProps props = null) : base(scope, id, props) - { - // The code that defines your stack goes here - } - } -} diff --git a/packages/aws-cdk/lib/init-templates/v1/app/csharp/src/%name.PascalCased%/Program.template.cs b/packages/aws-cdk/lib/init-templates/v1/app/csharp/src/%name.PascalCased%/Program.template.cs deleted file mode 100644 index ec6a50b8bdc00..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/csharp/src/%name.PascalCased%/Program.template.cs +++ /dev/null @@ -1,45 +0,0 @@ -using Amazon.CDK; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace %name.PascalCased% -{ - sealed class Program - { - public static void Main(string[] args) - { - var app = new App(); - new %name.PascalCased%Stack(app, "%name.PascalCased%Stack", new StackProps - { - // If you don't specify 'env', this stack will be environment-agnostic. - // Account/Region-dependent features and context lookups will not work, - // but a single synthesized template can be deployed anywhere. - - // Uncomment the next block to specialize this stack for the AWS Account - // and Region that are implied by the current CLI configuration. - /* - Env = new Amazon.CDK.Environment - { - Account = System.Environment.GetEnvironmentVariable("CDK_DEFAULT_ACCOUNT"), - Region = System.Environment.GetEnvironmentVariable("CDK_DEFAULT_REGION"), - } - */ - - // Uncomment the next block if you know exactly what Account and Region you - // want to deploy the stack to. - /* - Env = new Amazon.CDK.Environment - { - Account = "123456789012", - Region = "us-east-1", - } - */ - - // For more information, see https://docs.aws.amazon.com/cdk/latest/guide/environments.html - }); - - app.Synth(); - } - } -} diff --git a/packages/aws-cdk/lib/init-templates/v1/app/fsharp/add-project.hook.ts b/packages/aws-cdk/lib/init-templates/v1/app/fsharp/add-project.hook.ts deleted file mode 100644 index b9b091fa35ff1..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/fsharp/add-project.hook.ts +++ /dev/null @@ -1,33 +0,0 @@ -import * as child_process from 'child_process'; -import * as path from 'path'; -import { InvokeHook } from '../../../../init'; - -export const invoke: InvokeHook = async (targetDirectory: string) => { - const slnPath = path.join(targetDirectory, 'src', '%name.PascalCased%.sln'); - const fsprojPath = path.join(targetDirectory, 'src', '%name.PascalCased%', '%name.PascalCased%.fsproj'); - - const child = child_process.spawn('dotnet', ['sln', slnPath, 'add', fsprojPath], { - // Need this for Windows where we want .cmd and .bat to be found as well. - shell: true, - stdio: ['ignore', 'pipe', 'inherit'], - }); - - await new Promise((resolve, reject) => { - const stdout = new Array(); - - child.stdout.on('data', chunk => { - process.stdout.write(chunk); - stdout.push(chunk); - }); - - child.once('error', reject); - - child.once('exit', code => { - if (code === 0) { - resolve(Buffer.concat(stdout).toString('utf-8')); - } else { - reject(new Error(`Could not add project %name.PascalCased%.fsproj to solution %name.PascalCased%.sln. Error code: ${code}`)); - } - }); - }); -}; diff --git a/packages/aws-cdk/lib/init-templates/v1/app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj b/packages/aws-cdk/lib/init-templates/v1/app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj deleted file mode 100644 index 1ecb568dddb47..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - Exe - netcoreapp3.1 - - Major - - - - - - - - - - - - - - - diff --git a/packages/aws-cdk/lib/init-templates/v1/app/go/%name%.template.go b/packages/aws-cdk/lib/init-templates/v1/app/go/%name%.template.go deleted file mode 100644 index 742ed4c64ce7b..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/go/%name%.template.go +++ /dev/null @@ -1,68 +0,0 @@ -package main - -import ( - "github.com/aws/aws-cdk-go/awscdk" - // "github.com/aws/aws-cdk-go/awscdk/awssqs" - "github.com/aws/constructs-go/constructs/v3" - // "github.com/aws/jsii-runtime-go" -) - -type %name.PascalCased%StackProps struct { - awscdk.StackProps -} - -func New%name.PascalCased%Stack(scope constructs.Construct, id string, props *%name.PascalCased%StackProps) awscdk.Stack { - var sprops awscdk.StackProps - if props != nil { - sprops = props.StackProps - } - stack := awscdk.NewStack(scope, &id, &sprops) - - // The code that defines your stack goes here - - // example resource - // queue := awssqs.NewQueue(stack, jsii.String("%name.PascalCased%Queue"), &awssqs.QueueProps{ - // VisibilityTimeout: awscdk.Duration_Seconds(jsii.Number(300)), - // }) - - return stack -} - -func main() { - app := awscdk.NewApp(nil) - - New%name.PascalCased%Stack(app, "%name.PascalCased%Stack", &%name.PascalCased%StackProps{ - awscdk.StackProps{ - Env: env(), - }, - }) - - app.Synth(nil) -} - -// env determines the AWS environment (account+region) in which our stack is to -// be deployed. For more information see: https://docs.aws.amazon.com/cdk/latest/guide/environments.html -func env() *awscdk.Environment { - // If unspecified, this stack will be "environment-agnostic". - // Account/Region-dependent features and context lookups will not work, but a - // single synthesized template can be deployed anywhere. - //--------------------------------------------------------------------------- - return nil - - // Uncomment if you know exactly what account and region you want to deploy - // the stack to. This is the recommendation for production stacks. - //--------------------------------------------------------------------------- - // return &awscdk.Environment{ - // Account: jsii.String("123456789012"), - // Region: jsii.String("us-east-1"), - // } - - // Uncomment to specialize this stack for the AWS Account and Region that are - // implied by the current CLI configuration. This is recommended for dev - // stacks. - //--------------------------------------------------------------------------- - // return &awscdk.Environment{ - // Account: jsii.String(os.Getenv("CDK_DEFAULT_ACCOUNT")), - // Region: jsii.String(os.Getenv("CDK_DEFAULT_REGION")), - // } -} diff --git a/packages/aws-cdk/lib/init-templates/v1/app/go/%name%_test.template.go b/packages/aws-cdk/lib/init-templates/v1/app/go/%name%_test.template.go deleted file mode 100644 index 78742540bc2f7..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/go/%name%_test.template.go +++ /dev/null @@ -1,26 +0,0 @@ -package main - -// import ( -// "testing" - -// "github.com/aws/aws-cdk-go/awscdk" -// "github.com/aws/aws-cdk-go/awscdk/assertions" -// "github.com/aws/jsii-runtime-go" -// ) - -// example tests. To run these tests, uncomment this file along with the -// example resource in %name%_test.go -// func Test%name.PascalCased%Stack(t *testing.T) { -// // GIVEN -// app := awscdk.NewApp(nil) - -// // WHEN -// stack := New%name.PascalCased%Stack(app, "MyStack", nil) - -// // THEN -// template := assertions.Template_FromStack(stack) - -// template.HasResourceProperties(jsii.String("AWS::SQS::Queue"), map[string]interface{}{ -// "VisibilityTimeout": 300, -// }) -// } diff --git a/packages/aws-cdk/lib/init-templates/v1/app/go/go.template.mod b/packages/aws-cdk/lib/init-templates/v1/app/go/go.template.mod deleted file mode 100644 index 5dbef39984826..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/go/go.template.mod +++ /dev/null @@ -1,9 +0,0 @@ -module %name% - -go 1.16 - -require ( - github.com/aws/aws-cdk-go/awscdk v%cdk-version%-devpreview - github.com/aws/constructs-go/constructs/v3 v3.3.71 - github.com/aws/jsii-runtime-go v1.26.0 -) diff --git a/packages/aws-cdk/lib/init-templates/v1/app/java/pom.xml b/packages/aws-cdk/lib/init-templates/v1/app/java/pom.xml deleted file mode 100644 index b8b00e798209c..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/java/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - 4.0.0 - - com.myorg - %name% - 0.1 - - - UTF-8 - %cdk-version% - 5.7.1 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - - org.codehaus.mojo - exec-maven-plugin - 3.0.0 - - com.myorg.%name.PascalCased%App - - - - - - - - - software.amazon.awscdk - core - ${cdk.version} - - - software.amazon.awscdk - assertions - ${cdk.version} - test - - - - org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - diff --git a/packages/aws-cdk/lib/init-templates/v1/app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java b/packages/aws-cdk/lib/init-templates/v1/app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java deleted file mode 100644 index f3eb72f9dfe0c..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.myorg; - -import software.amazon.awscdk.core.App; -import software.amazon.awscdk.core.Environment; -import software.amazon.awscdk.core.StackProps; - -import java.util.Arrays; - -public class %name.PascalCased%App { - public static void main(final String[] args) { - App app = new App(); - - new %name.PascalCased%Stack(app, "%name.PascalCased%Stack", StackProps.builder() - // If you don't specify 'env', this stack will be environment-agnostic. - // Account/Region-dependent features and context lookups will not work, - // but a single synthesized template can be deployed anywhere. - - // Uncomment the next block to specialize this stack for the AWS Account - // and Region that are implied by the current CLI configuration. - /* - .env(Environment.builder() - .account(System.getenv("CDK_DEFAULT_ACCOUNT")) - .region(System.getenv("CDK_DEFAULT_REGION")) - .build()) - */ - - // Uncomment the next block if you know exactly what Account and Region you - // want to deploy the stack to. - /* - .env(Environment.builder() - .account("123456789012") - .region("us-east-1") - .build()) - */ - - // For more information, see https://docs.aws.amazon.com/cdk/latest/guide/environments.html - .build()); - - app.synth(); - } -} diff --git a/packages/aws-cdk/lib/init-templates/v1/app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java b/packages/aws-cdk/lib/init-templates/v1/app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java deleted file mode 100644 index a4dbab1dbd8b9..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.myorg; - -import software.amazon.awscdk.core.Construct; -import software.amazon.awscdk.core.Stack; -import software.amazon.awscdk.core.StackProps; -// import software.amazon.awscdk.services.sqs.Queue; -// import software.amazon.awscdk.core.Duration; - -public class %name.PascalCased%Stack extends Stack { - public %name.PascalCased%Stack(final Construct scope, final String id) { - this(scope, id, null); - } - - public %name.PascalCased%Stack(final Construct scope, final String id, final StackProps props) { - super(scope, id, props); - - // The code that defines your stack goes here - - // example resource - // final Queue queue = Queue.Builder.create(this, "%name.PascalCased%Queue") - // .visibilityTimeout(Duration.seconds(300)) - // .build(); - } -} diff --git a/packages/aws-cdk/lib/init-templates/v1/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java b/packages/aws-cdk/lib/init-templates/v1/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java deleted file mode 100644 index e095565be7920..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java +++ /dev/null @@ -1,26 +0,0 @@ -// package com.myorg; - -// import software.amazon.awscdk.core.App; -// import software.amazon.awscdk.assertions.Template; -// import java.io.IOException; - -// import java.util.HashMap; - -// import org.junit.jupiter.api.Test; - -// example test. To run these tests, uncomment this file, along with the -// example resource in java/src/main/java/com/myorg/%name.PascalCased%Stack.java -// public class %name.PascalCased%Test { - -// @Test -// public void testStack() throws IOException { -// App app = new App(); -// %name.PascalCased%Stack stack = new %name.PascalCased%Stack(app, "test"); - -// Template template = Template.fromStack(stack); - -// template.hasResourceProperties("AWS::SQS::Queue", new HashMap() {{ -// put("VisibilityTimeout", 300); -// }}); -// } -// } diff --git a/packages/aws-cdk/lib/init-templates/v1/app/javascript/bin/%name%.template.js b/packages/aws-cdk/lib/init-templates/v1/app/javascript/bin/%name%.template.js deleted file mode 100644 index 1a99b7e2c55ec..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/javascript/bin/%name%.template.js +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env node - -const cdk = require('@aws-cdk/core'); -const { %name.PascalCased%Stack } = require('../lib/%name%-stack'); - -const app = new cdk.App(); -new %name.PascalCased%Stack(app, '%name.PascalCased%Stack', { - /* If you don't specify 'env', this stack will be environment-agnostic. - * Account/Region-dependent features and context lookups will not work, - * but a single synthesized template can be deployed anywhere. */ - - /* Uncomment the next line to specialize this stack for the AWS Account - * and Region that are implied by the current CLI configuration. */ - // env: { account: process.env.CDK_DEFAULT_ACCOUNT, region: process.env.CDK_DEFAULT_REGION }, - - /* Uncomment the next line if you know exactly what Account and Region you - * want to deploy the stack to. */ - // env: { account: '123456789012', region: 'us-east-1' }, - - /* For more information, see https://docs.aws.amazon.com/cdk/latest/guide/environments.html */ -}); \ No newline at end of file diff --git a/packages/aws-cdk/lib/init-templates/v1/app/javascript/jest.config.js b/packages/aws-cdk/lib/init-templates/v1/app/javascript/jest.config.js deleted file mode 100644 index 668e089fb02b3..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/javascript/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - testEnvironment: "node" -} diff --git a/packages/aws-cdk/lib/init-templates/v1/app/javascript/lib/%name%-stack.template.js b/packages/aws-cdk/lib/init-templates/v1/app/javascript/lib/%name%-stack.template.js deleted file mode 100644 index 8004c54a568aa..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/javascript/lib/%name%-stack.template.js +++ /dev/null @@ -1,23 +0,0 @@ -const cdk = require('@aws-cdk/core'); -// const sqs = require('@aws-cdk/aws-sqs'); - -class %name.PascalCased%Stack extends cdk.Stack { - /** - * - * @param {cdk.Construct} scope - * @param {string} id - * @param {cdk.StackProps=} props - */ - constructor(scope, id, props) { - super(scope, id, props); - - // The code that defines your stack goes here - - // example resource - // const queue = new sqs.Queue(this, '%name.PascalCased%Queue', { - // visibilityTimeout: cdk.Duration.seconds(300) - // }); - } -} - -module.exports = { %name.PascalCased%Stack } diff --git a/packages/aws-cdk/lib/init-templates/v1/app/javascript/package.json b/packages/aws-cdk/lib/init-templates/v1/app/javascript/package.json deleted file mode 100644 index 8643f0e069fe8..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/javascript/package.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "%name%", - "version": "0.1.0", - "bin": { - "%name%": "bin/%name%.js" - }, - "scripts": { - "build": "echo \"The build step is not required when using JavaScript!\" && exit 0", - "cdk": "cdk", - "test": "jest" - }, - "devDependencies": { - "@aws-cdk/assertions": "%cdk-version%", - "aws-cdk": "%cdk-version%", - "jest": "^27.5.1" - }, - "dependencies": { - "@aws-cdk/core": "%cdk-version%" - } -} diff --git a/packages/aws-cdk/lib/init-templates/v1/app/javascript/test/%name%.test.template.js b/packages/aws-cdk/lib/init-templates/v1/app/javascript/test/%name%.test.template.js deleted file mode 100644 index 514cd34e9faf1..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/javascript/test/%name%.test.template.js +++ /dev/null @@ -1,18 +0,0 @@ -// const { Template } = require('@aws-cdk/assertions'); -// const cdk = require('@aws-cdk/core'); -// const %name.PascalCased% = require('../lib/%name%-stack'); - -// example test. To run these tests, uncomment this file along with the -// example resource in lib/%name%-stack.js -test('SQS Queue Created', () => { -// const app = new cdk.App(); -// // WHEN -// const stack = new %name.PascalCased%.%name.PascalCased%Stack(app, 'MyTestStack'); -// // THEN -// const template = Template.fromStack(stack); - -// template.hasResourceProperties('AWS::SQS::Queue', { -// VisibilityTimeout: 300 -// }); -}); - diff --git a/packages/aws-cdk/lib/init-templates/v1/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/v1/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py deleted file mode 100644 index 9c5de032e839d..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py +++ /dev/null @@ -1,24 +0,0 @@ -from aws_cdk import ( - core as cdk - # aws_sqs as sqs, -) - -# For consistency with other languages, `cdk` is the preferred import name for -# the CDK's core module. The following line also imports it as `core` for use -# with examples from the CDK Developer's Guide, which are in the process of -# being updated to use `cdk`. You may delete this import if you don't need it. -from aws_cdk import core - - -class %name.PascalCased%Stack(cdk.Stack): - - def __init__(self, scope: cdk.Construct, construct_id: str, **kwargs) -> None: - super().__init__(scope, construct_id, **kwargs) - - # The code that defines your stack goes here - - # example resource - # queue = sqs.Queue( - # self, "%name.PascalCased%Queue", - # visibility_timeout=cdk.Duration.seconds(300), - # ) diff --git a/packages/aws-cdk/lib/init-templates/v1/app/python/.template.gitignore b/packages/aws-cdk/lib/init-templates/v1/app/python/.template.gitignore deleted file mode 100644 index 58505a0211c74..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/python/.template.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -*.swp -package-lock.json -__pycache__ -.pytest_cache -.env -.venv -*.egg-info - -# CDK asset staging directory -.cdk.staging -cdk.out diff --git a/packages/aws-cdk/lib/init-templates/v1/app/python/app.template.py b/packages/aws-cdk/lib/init-templates/v1/app/python/app.template.py deleted file mode 100644 index a63ab8ac2e62e..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/python/app.template.py +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python3 -import os - -from aws_cdk import core as cdk - -# For consistency with TypeScript code, `cdk` is the preferred import name for -# the CDK's core module. The following line also imports it as `core` for use -# with examples from the CDK Developer's Guide, which are in the process of -# being updated to use `cdk`. You may delete this import if you don't need it. -from aws_cdk import core - -from %name.PythonModule%.%name.PythonModule%_stack import %name.PascalCased%Stack - - -app = core.App() -%name.PascalCased%Stack(app, "%name.PascalCased%Stack", - # If you don't specify 'env', this stack will be environment-agnostic. - # Account/Region-dependent features and context lookups will not work, - # but a single synthesized template can be deployed anywhere. - - # Uncomment the next line to specialize this stack for the AWS Account - # and Region that are implied by the current CLI configuration. - - #env=core.Environment(account=os.getenv('CDK_DEFAULT_ACCOUNT'), region=os.getenv('CDK_DEFAULT_REGION')), - - # Uncomment the next line if you know exactly what Account and Region you - # want to deploy the stack to. */ - - #env=core.Environment(account='123456789012', region='us-east-1'), - - # For more information, see https://docs.aws.amazon.com/cdk/latest/guide/environments.html - ) - -app.synth() diff --git a/packages/aws-cdk/lib/init-templates/v1/app/python/requirements.txt b/packages/aws-cdk/lib/init-templates/v1/app/python/requirements.txt deleted file mode 100644 index 87cbb00cfac55..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/python/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -aws-cdk.core>=%cdk-version% -aws-cdk.assertions>=%cdk-version% diff --git a/packages/aws-cdk/lib/init-templates/v1/app/python/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/v1/app/python/sub-placeholders.hook.ts deleted file mode 100644 index 67bf2a9c6e8f4..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/python/sub-placeholders.hook.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { InvokeHook } from '../../../../init'; - -export const invoke: InvokeHook = async (_, context) => { - // File cannot be named like regular template because it needs to be - // processed by dependency updaters. - await context.substitutePlaceholdersIn('requirements.txt'); -}; diff --git a/packages/aws-cdk/lib/init-templates/v1/app/python/tests/unit/test_%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/v1/app/python/tests/unit/test_%name.PythonModule%_stack.template.py deleted file mode 100644 index 1b0e4b66e9aaa..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/python/tests/unit/test_%name.PythonModule%_stack.template.py +++ /dev/null @@ -1,19 +0,0 @@ -# from aws_cdk import ( -# core, -# assertions -# ) - -# from %name.PythonModule%.%name.PythonModule%_stack import %name.PascalCased%Stack - - -# 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(): -# 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 diff --git a/packages/aws-cdk/lib/init-templates/v1/app/typescript/bin/%name%.template.ts b/packages/aws-cdk/lib/init-templates/v1/app/typescript/bin/%name%.template.ts deleted file mode 100644 index 9479fc651f175..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/typescript/bin/%name%.template.ts +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env node -import 'source-map-support/register'; -import * as cdk from '@aws-cdk/core'; -import { %name.PascalCased%Stack } from '../lib/%name%-stack'; - -const app = new cdk.App(); -new %name.PascalCased%Stack(app, '%name.PascalCased%Stack', { - /* If you don't specify 'env', this stack will be environment-agnostic. - * Account/Region-dependent features and context lookups will not work, - * but a single synthesized template can be deployed anywhere. */ - - /* Uncomment the next line to specialize this stack for the AWS Account - * and Region that are implied by the current CLI configuration. */ - // env: { account: process.env.CDK_DEFAULT_ACCOUNT, region: process.env.CDK_DEFAULT_REGION }, - - /* Uncomment the next line if you know exactly what Account and Region you - * want to deploy the stack to. */ - // env: { account: '123456789012', region: 'us-east-1' }, - - /* For more information, see https://docs.aws.amazon.com/cdk/latest/guide/environments.html */ -}); diff --git a/packages/aws-cdk/lib/init-templates/v1/app/typescript/lib/%name%-stack.template.ts b/packages/aws-cdk/lib/init-templates/v1/app/typescript/lib/%name%-stack.template.ts deleted file mode 100644 index 82fd9a48ac0dd..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/typescript/lib/%name%-stack.template.ts +++ /dev/null @@ -1,15 +0,0 @@ -import * as cdk from '@aws-cdk/core'; -// import * as sqs from '@aws-cdk/aws-sqs'; - -export class %name.PascalCased%Stack extends cdk.Stack { - constructor(scope: cdk.Construct, id: string, props?: cdk.StackProps) { - super(scope, id, props); - - // The code that defines your stack goes here - - // example resource - // const queue = new sqs.Queue(this, '%name.PascalCased%Queue', { - // visibilityTimeout: cdk.Duration.seconds(300) - // }); - } -} diff --git a/packages/aws-cdk/lib/init-templates/v1/app/typescript/package.json b/packages/aws-cdk/lib/init-templates/v1/app/typescript/package.json deleted file mode 100644 index 19862aa845b6e..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/typescript/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "%name%", - "version": "0.1.0", - "bin": { - "%name%": "bin/%name%.js" - }, - "scripts": { - "build": "tsc", - "watch": "tsc -w", - "test": "jest", - "cdk": "cdk" - }, - "devDependencies": { - "@aws-cdk/assertions": "%cdk-version%", - "@types/prettier": "2.6.0", - "@types/jest": "^27.5.2", - "@types/node": "10.17.27", - "jest": "^27.5.1", - "ts-jest": "^27.1.4", - "aws-cdk": "%cdk-version%", - "ts-node": "^10.8.1", - "typescript": "~3.9.7" - }, - "dependencies": { - "@aws-cdk/core": "%cdk-version%", - "source-map-support": "^0.5.21" - } -} diff --git a/packages/aws-cdk/lib/init-templates/v1/app/typescript/test/%name%.test.template.ts b/packages/aws-cdk/lib/init-templates/v1/app/typescript/test/%name%.test.template.ts deleted file mode 100644 index d41f3aaf74d04..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/app/typescript/test/%name%.test.template.ts +++ /dev/null @@ -1,17 +0,0 @@ -// import { Template } from '@aws-cdk/assertions'; -// import * as cdk from '@aws-cdk/core'; -// import * as %name.PascalCased% from '../lib/%name%-stack'; - -// example test. To run these tests, uncomment this file along with the -// example resource in lib/%name%-stack.ts -test('SQS Queue Created', () => { -// const app = new cdk.App(); -// // WHEN -// const stack = new %name.PascalCased%.%name.PascalCased%Stack(app, 'MyTestStack'); -// // THEN -// const template = Template.fromStack(stack); - -// template.hasResourceProperties('AWS::SQS::Queue', { -// VisibilityTimeout: 300 -// }); -}); diff --git a/packages/aws-cdk/lib/init-templates/v1/lib/typescript/README.template.md b/packages/aws-cdk/lib/init-templates/v1/lib/typescript/README.template.md deleted file mode 100644 index f867c7347abe8..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/lib/typescript/README.template.md +++ /dev/null @@ -1,12 +0,0 @@ -# Welcome to your CDK TypeScript Construct Library project - -You should explore the contents of this project. It demonstrates a CDK Construct Library that includes a construct (`%name.PascalCased%`) -which contains an Amazon SQS queue that is subscribed to an Amazon SNS topic. - -The construct defines an interface (`%name.PascalCased%Props`) to configure the visibility timeout of the queue. - -## Useful commands - -* `npm run build` compile typescript to js -* `npm run watch` watch for changes and compile -* `npm run test` perform the jest unit tests \ No newline at end of file diff --git a/packages/aws-cdk/lib/init-templates/v1/lib/typescript/lib/index.template.ts b/packages/aws-cdk/lib/init-templates/v1/lib/typescript/lib/index.template.ts deleted file mode 100644 index 49c002d8e8271..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/lib/typescript/lib/index.template.ts +++ /dev/null @@ -1,20 +0,0 @@ -import * as cdk from '@aws-cdk/core'; -// import * as sqs from '@aws-cdk/aws-sqs'; - -export interface %name.PascalCased%Props { - // Define construct properties here -} - -export class %name.PascalCased% extends cdk.Construct { - - constructor(scope: cdk.Construct, id: string, props: %name.PascalCased%Props = {}) { - super(scope, id); - - // Define construct contents here - - // example resource - // const queue = new sqs.Queue(this, '%name.PascalCased%Queue', { - // visibilityTimeout: cdk.Duration.seconds(300) - // }); - } -} diff --git a/packages/aws-cdk/lib/init-templates/v1/lib/typescript/package.json b/packages/aws-cdk/lib/init-templates/v1/lib/typescript/package.json deleted file mode 100644 index 77bcfe180e8d0..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/lib/typescript/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "%name%", - "version": "0.1.0", - "main": "lib/index.js", - "types": "lib/index.d.ts", - "scripts": { - "build": "tsc", - "watch": "tsc -w", - "test": "jest" - }, - "devDependencies": { - "@aws-cdk/assertions": "%cdk-version%", - "@types/jest": "^27.5.2", - "@types/prettier": "2.6.0", - "@types/node": "10.17.27", - "jest": "^27.5.1", - "ts-jest": "^27.1.4", - "typescript": "~3.9.7" - }, - "peerDependencies": { - "@aws-cdk/core": "%cdk-version%" - }, - "dependencies": { - "@aws-cdk/core": "%cdk-version%" - } -} diff --git a/packages/aws-cdk/lib/init-templates/v1/lib/typescript/test/%name%.test.template.ts b/packages/aws-cdk/lib/init-templates/v1/lib/typescript/test/%name%.test.template.ts deleted file mode 100644 index 641b974082aa7..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/lib/typescript/test/%name%.test.template.ts +++ /dev/null @@ -1,18 +0,0 @@ -// import { Template } from '@aws-cdk/assertions'; -// import * as cdk from '@aws-cdk/core'; -// import * as %name.PascalCased% from '../lib/index'; - -// example test. To run these tests, uncomment this file along with the -// example resource in lib/index.ts -test('SQS Queue Created', () => { -// const app = new cdk.App(); -// const stack = new cdk.Stack(app, 'TestStack'); -// // WHEN -// new %name.PascalCased%.%name.PascalCased%(stack, 'MyTestConstruct'); -// // THEN -// const template = Template.fromStack(stack); - -// template.hasResourceProperties('AWS::SQS::Queue', { -// VisibilityTimeout: 300 -// }); -}); diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/README.template.md b/packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/README.template.md deleted file mode 100644 index a9915823b7a48..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/README.template.md +++ /dev/null @@ -1,22 +0,0 @@ -# Welcome to your CDK C# project! - -You should explore the contents of this project. It demonstrates a CDK app with an instance of a stack (`%name.PascalCased%Stack`) -which contains an Amazon SQS queue that is subscribed to an Amazon SNS topic. - -The `cdk.json` file tells the CDK Toolkit how to execute your app. - -It uses the [.NET Core CLI](https://docs.microsoft.com/dotnet/articles/core/) to compile and execute your project. - -## Tutorial -See [this useful workshop](https://cdkworkshop.com/40-dotnet.html) on working with the AWS CDK for C# projects. - -## Useful commands - -* `dotnet build src` compile this app -* `cdk ls` list all stacks in the app -* `cdk synth` emits the synthesized CloudFormation template -* `cdk deploy` deploy this stack to your default AWS account/region -* `cdk diff` compare deployed stack with current state -* `cdk docs` open CDK documentation - -Enjoy! diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj b/packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj deleted file mode 100644 index 859978ce84abb..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - Exe - netcoreapp3.1 - - Major - - - - - - - - - - - - - - diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs b/packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs deleted file mode 100644 index 365330ed65925..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Amazon.CDK; -using Amazon.CDK.AWS.SNS; -using Amazon.CDK.AWS.SNS.Subscriptions; -using Amazon.CDK.AWS.SQS; - -namespace %name.PascalCased% -{ - public class %name.PascalCased%Stack : Stack - { - internal %name.PascalCased%Stack(Construct scope, string id, IStackProps props = null) : base(scope, id, props) - { - // The CDK includes built-in constructs for most resource types, such as Queues and Topics. - var queue = new Queue(this, "%name.PascalCased%Queue", new QueueProps - { - VisibilityTimeout = Duration.Seconds(300) - }); - - var topic = new Topic(this, "%name.PascalCased%Topic"); - - topic.AddSubscription(new SqsSubscription(queue)); - } - } -} diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/add-project.hook.ts b/packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/add-project.hook.ts deleted file mode 100644 index b9b091fa35ff1..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/add-project.hook.ts +++ /dev/null @@ -1,33 +0,0 @@ -import * as child_process from 'child_process'; -import * as path from 'path'; -import { InvokeHook } from '../../../../init'; - -export const invoke: InvokeHook = async (targetDirectory: string) => { - const slnPath = path.join(targetDirectory, 'src', '%name.PascalCased%.sln'); - const fsprojPath = path.join(targetDirectory, 'src', '%name.PascalCased%', '%name.PascalCased%.fsproj'); - - const child = child_process.spawn('dotnet', ['sln', slnPath, 'add', fsprojPath], { - // Need this for Windows where we want .cmd and .bat to be found as well. - shell: true, - stdio: ['ignore', 'pipe', 'inherit'], - }); - - await new Promise((resolve, reject) => { - const stdout = new Array(); - - child.stdout.on('data', chunk => { - process.stdout.write(chunk); - stdout.push(chunk); - }); - - child.once('error', reject); - - child.once('exit', code => { - if (code === 0) { - resolve(Buffer.concat(stdout).toString('utf-8')); - } else { - reject(new Error(`Could not add project %name.PascalCased%.fsproj to solution %name.PascalCased%.sln. Error code: ${code}`)); - } - }); - }); -}; diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj b/packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj deleted file mode 100644 index 4edb9ddfe2e66..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - Exe - netcoreapp3.1 - - Major - - - - - - - - - - - - - - - - - - diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs b/packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs deleted file mode 100644 index 1582e37f4faaf..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs +++ /dev/null @@ -1,14 +0,0 @@ -namespace %name.PascalCased% - -open Amazon.CDK -open Amazon.CDK.AWS.SNS -open Amazon.CDK.AWS.SNS.Subscriptions -open Amazon.CDK.AWS.SQS - -type %name.PascalCased%Stack(scope, id, props) as this = - inherit Stack(scope, id, props) - - let queue = Queue(this, "%name.PascalCased%Queue", QueueProps(VisibilityTimeout = Duration.Seconds(300.))) - - let topic = Topic(this, "%name.PascalCased%Topic") - do topic.AddSubscription(SqsSubscription(queue)) diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/go/%name%.template.go b/packages/aws-cdk/lib/init-templates/v1/sample-app/go/%name%.template.go deleted file mode 100644 index 5ac97c495740f..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/go/%name%.template.go +++ /dev/null @@ -1,71 +0,0 @@ -package main - -import ( - "github.com/aws/aws-cdk-go/awscdk" - "github.com/aws/aws-cdk-go/awscdk/awssns" - "github.com/aws/aws-cdk-go/awscdk/awssnssubscriptions" - "github.com/aws/aws-cdk-go/awscdk/awssqs" - "github.com/aws/constructs-go/constructs/v3" - "github.com/aws/jsii-runtime-go" -) - -type %name.PascalCased%StackProps struct { - awscdk.StackProps -} - -func New%name.PascalCased%Stack(scope constructs.Construct, id string, props *%name.PascalCased%StackProps) awscdk.Stack { - var sprops awscdk.StackProps - if props != nil { - sprops = props.StackProps - } - stack := awscdk.NewStack(scope, &id, &sprops) - - - queue := awssqs.NewQueue(stack, jsii.String("%name.PascalCased%Queue"), &awssqs.QueueProps{ - VisibilityTimeout: awscdk.Duration_Seconds(jsii.Number(300)), - }) - - topic := awssns.NewTopic(stack, jsii.String("%name.PascalCased%Topic"), &awssns.TopicProps{}) - topic.AddSubscription(awssnssubscriptions.NewSqsSubscription(queue, &awssnssubscriptions.SqsSubscriptionProps{})) - - return stack -} - -func main() { - app := awscdk.NewApp(nil) - - New%name.PascalCased%Stack(app, "%name.PascalCased%Stack", &%name.PascalCased%StackProps{ - awscdk.StackProps{ - Env: env(), - }, - }) - - app.Synth(nil) -} - -// env determines the AWS environment (account+region) in which our stack is to -// be deployed. For more information see: https://docs.aws.amazon.com/cdk/latest/guide/environments.html -func env() *awscdk.Environment { - // If unspecified, this stack will be "environment-agnostic". - // Account/Region-dependent features and context lookups will not work, but a - // single synthesized template can be deployed anywhere. - //--------------------------------------------------------------------------- - return nil - - // Uncomment if you know exactly what account and region you want to deploy - // the stack to. This is the recommendation for production stacks. - //--------------------------------------------------------------------------- - // return &awscdk.Environment{ - // Account: jsii.String("123456789012"), - // Region: jsii.String("us-east-1"), - // } - - // Uncomment to specialize this stack for the AWS Account and Region that are - // implied by the current CLI configuration. This is recommended for dev - // stacks. - //--------------------------------------------------------------------------- - // return &awscdk.Environment{ - // Account: jsii.String(os.Getenv("CDK_DEFAULT_ACCOUNT")), - // Region: jsii.String(os.Getenv("CDK_DEFAULT_REGION")), - // } -} diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/go/%name%_test.template.go b/packages/aws-cdk/lib/init-templates/v1/sample-app/go/%name%_test.template.go deleted file mode 100644 index 834f4830cf23e..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/go/%name%_test.template.go +++ /dev/null @@ -1,25 +0,0 @@ -package main - -import ( - "testing" - - "github.com/aws/aws-cdk-go/awscdk" - "github.com/aws/aws-cdk-go/awscdk/assertions" - "github.com/aws/jsii-runtime-go" -) - -func Test%name.PascalCased%Stack(t *testing.T) { - // GIVEN - app := awscdk.NewApp(nil) - - // WHEN - stack := New%name.PascalCased%Stack(app, "MyStack", nil) - - // THEN - template := assertions.Template_FromStack(stack) - - template.HasResourceProperties(jsii.String("AWS::SQS::Queue"), map[string]interface{}{ - "VisibilityTimeout": 300, - }) - template.ResourceCountIs(jsii.String("AWS::SNS::Topic"), jsii.Number(1)) -} diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/go/go.template.mod b/packages/aws-cdk/lib/init-templates/v1/sample-app/go/go.template.mod deleted file mode 100644 index 5dbef39984826..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/go/go.template.mod +++ /dev/null @@ -1,9 +0,0 @@ -module %name% - -go 1.16 - -require ( - github.com/aws/aws-cdk-go/awscdk v%cdk-version%-devpreview - github.com/aws/constructs-go/constructs/v3 v3.3.71 - github.com/aws/jsii-runtime-go v1.26.0 -) diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/java/README.template.md b/packages/aws-cdk/lib/init-templates/v1/sample-app/java/README.template.md deleted file mode 100644 index d73d043e81c0e..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/java/README.template.md +++ /dev/null @@ -1,23 +0,0 @@ -# Welcome to your CDK Java project! - -You should explore the contents of this project. It demonstrates a CDK app with an instance of a stack (`%name.PascalCased%Stack`) -which contains an Amazon SQS queue that is subscribed to an Amazon SNS topic. - -The `cdk.json` file tells the CDK Toolkit how to execute your app. - -It is a [Maven](https://maven.apache.org/) based project, so you can open this project with any Maven compatible Java IDE to build and run tests. - -## Tutorial -See [this useful workshop](https://cdkworkshop.com/50-java.html) on working with the AWS CDK for Java projects. - - -## Useful commands - - * `mvn package` compile and run tests - * `cdk ls` list all stacks in the app - * `cdk synth` emits the synthesized CloudFormation template - * `cdk deploy` deploy this stack to your default AWS account/region - * `cdk diff` compare deployed stack with current state - * `cdk docs` open CDK documentation - -Enjoy! diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/java/pom.xml b/packages/aws-cdk/lib/init-templates/v1/sample-app/java/pom.xml deleted file mode 100644 index e25c5e7c23a9b..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/java/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - 4.0.0 - com.myorg - %name% - 0.1 - - UTF-8 - %cdk-version% - 5.7.1 - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - org.codehaus.mojo - exec-maven-plugin - 3.0.0 - - com.myorg.%name.PascalCased%App - - - - - - - - software.amazon.awscdk - core - ${cdk.version} - - - - - software.amazon.awscdk - sns - ${cdk.version} - - - software.amazon.awscdk - sns-subscriptions - ${cdk.version} - - - software.amazon.awscdk - sqs - ${cdk.version} - - - software.amazon.awscdk - assertions - ${cdk.version} - test - - - - org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java b/packages/aws-cdk/lib/init-templates/v1/sample-app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java deleted file mode 100644 index 9d8276ef625e4..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.myorg; - -import software.amazon.awscdk.core.App; - -public final class %name.PascalCased%App { - public static void main(final String[] args) { - App app = new App(); - - new %name.PascalCased%Stack(app, "%name.PascalCased%Stack"); - - app.synth(); - } -} diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java b/packages/aws-cdk/lib/init-templates/v1/sample-app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java deleted file mode 100644 index 9f1e6e5ee6268..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.myorg; - -import software.amazon.awscdk.core.Construct; -import software.amazon.awscdk.core.Duration; -import software.amazon.awscdk.core.Stack; -import software.amazon.awscdk.core.StackProps; -import software.amazon.awscdk.services.sns.Topic; -import software.amazon.awscdk.services.sns.subscriptions.SqsSubscription; -import software.amazon.awscdk.services.sqs.Queue; - -public class %name.PascalCased%Stack extends Stack { - public %name.PascalCased%Stack(final Construct parent, final String id) { - this(parent, id, null); - } - - public %name.PascalCased%Stack(final Construct parent, final String id, final StackProps props) { - super(parent, id, props); - - final Queue queue = Queue.Builder.create(this, "%name.PascalCased%Queue") - .visibilityTimeout(Duration.seconds(300)) - .build(); - - final Topic topic = Topic.Builder.create(this, "%name.PascalCased%Topic") - .displayName("My First Topic Yeah") - .build(); - - topic.addSubscription(new SqsSubscription(queue)); - } -} diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java b/packages/aws-cdk/lib/init-templates/v1/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java deleted file mode 100644 index 5cbbe8a127e4f..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.myorg; - -import software.amazon.awscdk.core.App; -import software.amazon.awscdk.assertions.Template; -import software.amazon.awscdk.assertions.Match; -import java.io.IOException; - -import java.util.HashMap; - -import org.junit.jupiter.api.Test; - -public class %name.PascalCased%StackTest { - - @Test - public void testStack() throws IOException { - App app = new App(); - %name.PascalCased%Stack stack = new %name.PascalCased%Stack(app, "test"); - - Template template = Template.fromStack(stack); - - template.hasResourceProperties("AWS::SQS::Queue", new HashMap() {{ - put("VisibilityTimeout", 300); - }}); - template.resourceCountIs("AWS::SNS::Topic", 1); - } -} diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/README.template.md b/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/README.template.md deleted file mode 100644 index a0b32e5815589..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/README.template.md +++ /dev/null @@ -1,17 +0,0 @@ -# Welcome to your CDK JavaScript project - -You should explore the contents of this project. It demonstrates a CDK app with an instance of a stack (`%name.PascalCased%Stack`) -which contains an Amazon SQS queue that is subscribed to an Amazon SNS topic. - -The `cdk.json` file tells the CDK Toolkit how to execute your app. The build step is not required when using JavaScript. - -## Tutorial - -See [this useful workshop](https://cdkworkshop.com/20-typescript.html) on working with the AWS CDK for Typescript projects. - -## Useful commands - -* `npm run test` perform the jest unit tests -* `cdk deploy` deploy this stack to your default AWS account/region -* `cdk diff` compare deployed stack with current state -* `cdk synth` emits the synthesized CloudFormation template diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/bin/%name%.template.js b/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/bin/%name%.template.js deleted file mode 100644 index 7b10196e54f23..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/bin/%name%.template.js +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env node -const cdk = require('@aws-cdk/core'); -const { %name.PascalCased%Stack } = require('../lib/%name%-stack'); - -const app = new cdk.App(); -new %name.PascalCased%Stack(app, '%name.PascalCased%Stack'); diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/lib/%name%-stack.template.js b/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/lib/%name%-stack.template.js deleted file mode 100644 index ef14c40799701..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/lib/%name%-stack.template.js +++ /dev/null @@ -1,25 +0,0 @@ -const sns = require('@aws-cdk/aws-sns'); -const subs = require('@aws-cdk/aws-sns-subscriptions'); -const sqs = require('@aws-cdk/aws-sqs'); -const cdk = require('@aws-cdk/core'); - -class %name.PascalCased%Stack extends cdk.Stack { - /** - * @param {cdk.App} scope - * @param {string} id - * @param {cdk.StackProps=} props - */ - constructor(scope, id, props) { - super(scope, id, props); - - const queue = new sqs.Queue(this, '%name.PascalCased%Queue', { - visibilityTimeout: cdk.Duration.seconds(300) - }); - - const topic = new sns.Topic(this, '%name.PascalCased%Topic'); - - topic.addSubscription(new subs.SqsSubscription(queue)); - } -} - -module.exports = { %name.PascalCased%Stack } diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/package.json b/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/package.json deleted file mode 100644 index c90acf364b381..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/package.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "%name%", - "version": "0.1.0", - "bin": { - "%name%": "bin/%name%.js" - }, - "scripts": { - "build": "echo \"The build step is not required when using JavaScript!\" && exit 0", - "cdk": "cdk", - "test": "jest" - }, - "devDependencies": { - "@aws-cdk/assertions": "%cdk-version%", - "aws-cdk": "%cdk-version%", - "jest": "^27.5.1" - }, - "dependencies": { - "@aws-cdk/aws-sns": "%cdk-version%", - "@aws-cdk/aws-sns-subscriptions": "%cdk-version%", - "@aws-cdk/aws-sqs": "%cdk-version%", - "@aws-cdk/core": "%cdk-version%" - } -} diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/test/%name%.test.template.js b/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/test/%name%.test.template.js deleted file mode 100644 index 4e53341387c69..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/javascript/test/%name%.test.template.js +++ /dev/null @@ -1,25 +0,0 @@ -const { Template, Match } = require('@aws-cdk/assertions'); -const cdk = require('@aws-cdk/core'); -const %name.PascalCased% = require('../lib/%name%-stack'); - -test('SQS Queue Created', () => { - const app = new cdk.App(); - // WHEN - const stack = new %name.PascalCased%.%name.PascalCased%Stack(app, 'MyTestStack'); - // THEN - const template = Template.fromStack(stack); - - template.hasResourceProperties('AWS::SQS::Queue', { - VisibilityTimeout: 300 - }); -}); - -test('SNS Topic Created', () => { - const app = new cdk.App(); - // WHEN - const stack = new %name.PascalCased%.%name.PascalCased%Stack(app, 'MyTestStack'); - // THEN - const template = Template.fromStack(stack); - - template.resourceCountIs('AWS::SNS::Topic', 1); -}); diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/v1/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py deleted file mode 100644 index ace9c193df291..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py +++ /dev/null @@ -1,24 +0,0 @@ -from aws_cdk import ( - aws_iam as iam, - aws_sqs as sqs, - aws_sns as sns, - aws_sns_subscriptions as subs, - core -) - - -class %name.PascalCased%Stack(core.Stack): - - def __init__(self, scope: core.Construct, construct_id: str, **kwargs) -> None: - super().__init__(scope, construct_id, **kwargs) - - queue = sqs.Queue( - self, "%name.PascalCased%Queue", - visibility_timeout=core.Duration.seconds(300), - ) - - topic = sns.Topic( - self, "%name.PascalCased%Topic" - ) - - topic.add_subscription(subs.SqsSubscription(queue)) diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/README.template.md b/packages/aws-cdk/lib/init-templates/v1/sample-app/python/README.template.md deleted file mode 100644 index 0b737ad6a5651..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/README.template.md +++ /dev/null @@ -1,68 +0,0 @@ - -# Welcome to your CDK Python project! - -You should explore the contents of this project. It demonstrates a CDK app with an instance of a stack (`%name.PythonModule%_stack`) -which contains an Amazon SQS queue that is subscribed to an Amazon SNS topic. - -The `cdk.json` file tells the CDK Toolkit how to execute your app. - -This project is set up like a standard Python project. The initialization process also creates -a virtualenv within this project, stored under the .venv directory. To create the virtualenv -it assumes that there is a `python3` executable in your path with access to the `venv` package. -If for any reason the automatic creation of the virtualenv fails, you can create the virtualenv -manually once the init process completes. - -To manually create a virtualenv on MacOS and Linux: - -``` -$ %python-executable% -m venv .venv -``` - -After the init process completes and the virtualenv is created, you can use the following -step to activate your virtualenv. - -``` -$ source .venv/bin/activate -``` - -If you are a Windows platform, you would activate the virtualenv like this: - -``` -% .venv\Scripts\activate.bat -``` - -Once the virtualenv is activated, you can install the required dependencies. - -``` -$ pip install -r requirements.txt -``` - -At this point you can now synthesize the CloudFormation template for this code. - -``` -$ cdk synth -``` - -You can now begin exploring the source code, contained in the hello directory. -There is also a very trivial test included that can be run like this: - -``` -$ pytest -``` - -To add additional dependencies, for example other CDK libraries, just add to -your requirements.txt file and rerun the `pip install -r requirements.txt` -command. - -## Tutorial -See [this useful workshop](https://cdkworkshop.com/30-python.html) on working with the AWS CDK for Python projects. - -## Useful commands - - * `cdk ls` list all stacks in the app - * `cdk synth` emits the synthesized CloudFormation template - * `cdk deploy` deploy this stack to your default AWS account/region - * `cdk diff` compare deployed stack with current state - * `cdk docs` open CDK documentation - -Enjoy! diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/app.template.py b/packages/aws-cdk/lib/init-templates/v1/sample-app/python/app.template.py deleted file mode 100644 index 808bc22af32e4..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/app.template.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python3 - -from aws_cdk import core - -from %name.PythonModule%.%name.PythonModule%_stack import %name.PascalCased%Stack - - -app = core.App() -%name.PascalCased%Stack(app, "%name.StackName%") - -app.synth() diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/requirements.txt b/packages/aws-cdk/lib/init-templates/v1/sample-app/python/requirements.txt deleted file mode 100644 index 6c20aced0687a..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -aws-cdk.core==%cdk-version% -aws-cdk.aws_iam==%cdk-version% -aws-cdk.aws_sqs==%cdk-version% -aws-cdk.aws_sns==%cdk-version% -aws-cdk.aws_sns_subscriptions==%cdk-version% -aws-cdk.aws_s3==%cdk-version% -aws-cdk.assertions==%cdk-version% diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/tests/unit/test_%name.PythonModule%_stack.template.py b/packages/aws-cdk/lib/init-templates/v1/sample-app/python/tests/unit/test_%name.PythonModule%_stack.template.py deleted file mode 100644 index 99a6a26b4a15e..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/python/tests/unit/test_%name.PythonModule%_stack.template.py +++ /dev/null @@ -1,24 +0,0 @@ -from aws_cdk import ( - core, - assertions - ) - -from %name.PythonModule%.%name.PythonModule%_stack import %name.PascalCased%Stack - - -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 - }) - - -def test_sns_topic_created(): - app = core.App() - stack = %name.PascalCased%Stack(app, "%name.StackName%") - template = assertions.Template.from_stack(stack) - - template.resource_count_is("AWS::SNS::Topic", 1) diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/README.template.md b/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/README.template.md deleted file mode 100644 index e4b88733875af..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/README.template.md +++ /dev/null @@ -1,19 +0,0 @@ -# Welcome to your CDK TypeScript project - -You should explore the contents of this project. It demonstrates a CDK app with an instance of a stack (`%name.PascalCased%Stack`) -which contains an Amazon SQS queue that is subscribed to an Amazon SNS topic. - -The `cdk.json` file tells the CDK Toolkit how to execute your app. - -## Tutorial - -See [this useful workshop](https://cdkworkshop.com/20-typescript.html) on working with the AWS CDK for Typescript projects. - -## Useful commands - -* `npm run build` compile typescript to js -* `npm run watch` watch for changes and compile -* `npm run test` perform the jest unit tests -* `cdk deploy` deploy this stack to your default AWS account/region -* `cdk diff` compare deployed stack with current state -* `cdk synth` emits the synthesized CloudFormation template diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/bin/%name%.template.ts b/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/bin/%name%.template.ts deleted file mode 100644 index e5a8898954256..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/bin/%name%.template.ts +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env node -import * as cdk from '@aws-cdk/core'; -import { %name.PascalCased%Stack } from '../lib/%name%-stack'; - -const app = new cdk.App(); -new %name.PascalCased%Stack(app, '%name.PascalCased%Stack'); diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/lib/%name%-stack.template.ts b/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/lib/%name%-stack.template.ts deleted file mode 100644 index c6971d5499e24..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/lib/%name%-stack.template.ts +++ /dev/null @@ -1,18 +0,0 @@ -import * as sns from '@aws-cdk/aws-sns'; -import * as subs from '@aws-cdk/aws-sns-subscriptions'; -import * as sqs from '@aws-cdk/aws-sqs'; -import * as cdk from '@aws-cdk/core'; - -export class %name.PascalCased%Stack extends cdk.Stack { - constructor(scope: cdk.App, id: string, props?: cdk.StackProps) { - super(scope, id, props); - - const queue = new sqs.Queue(this, '%name.PascalCased%Queue', { - visibilityTimeout: cdk.Duration.seconds(300) - }); - - const topic = new sns.Topic(this, '%name.PascalCased%Topic'); - - topic.addSubscription(new subs.SqsSubscription(queue)); - } -} diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/package.json b/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/package.json deleted file mode 100644 index 4b59361dd3346..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "%name%", - "version": "0.1.0", - "bin": { - "%name%": "bin/%name%.js" - }, - "scripts": { - "build": "tsc", - "watch": "tsc -w", - "test": "jest", - "cdk": "cdk" - }, - "devDependencies": { - "aws-cdk": "%cdk-version%", - "@aws-cdk/assertions": "%cdk-version%", - "@types/jest": "^27.5.2", - "@types/node": "10.17.27", - "@types/prettier": "2.6.0", - "jest": "^27.5.1", - "ts-jest": "^27.1.4", - "ts-node": "^10.8.1", - "typescript": "~3.9.7" - }, - "dependencies": { - "@aws-cdk/aws-sns": "%cdk-version%", - "@aws-cdk/aws-sns-subscriptions": "%cdk-version%", - "@aws-cdk/aws-sqs": "%cdk-version%", - "@aws-cdk/core": "%cdk-version%" - } -} diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/sub-placeholders.hook.ts deleted file mode 100644 index 039bb00d6f43f..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/sub-placeholders.hook.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { InvokeHook } from '../../../../init'; - -export const invoke: InvokeHook = async (_, context) => { - // File cannot be named like regular template because it needs to be - // processed by dependency updaters. - await context.substitutePlaceholdersIn('package.json'); -}; diff --git a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/test/%name%.test.template.ts b/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/test/%name%.test.template.ts deleted file mode 100644 index 45cd6cca71ba4..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v1/sample-app/typescript/test/%name%.test.template.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Template, Match } from '@aws-cdk/assertions'; -import * as cdk from '@aws-cdk/core'; -import * as %name.PascalCased% from '../lib/%name%-stack'; - -test('SQS Queue Created', () => { - const app = new cdk.App(); - // WHEN - const stack = new %name.PascalCased%.%name.PascalCased%Stack(app, 'MyTestStack'); - // THEN - const template = Template.fromStack(stack); - - template.hasResourceProperties('AWS::SQS::Queue', { - VisibilityTimeout: 300 - }); -}); - -test('SNS Topic Created', () => { - const app = new cdk.App(); - // WHEN - const stack = new %name.PascalCased%.%name.PascalCased%Stack(app, 'MyTestStack'); - // THEN - const template = Template.fromStack(stack); - - template.resourceCountIs('AWS::SNS::Topic', 1); -}); diff --git a/packages/aws-cdk/lib/init-templates/v2/app/csharp/.template.gitignore b/packages/aws-cdk/lib/init-templates/v2/app/csharp/.template.gitignore deleted file mode 100644 index a4609e7587f3c..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/csharp/.template.gitignore +++ /dev/null @@ -1,342 +0,0 @@ -# CDK asset staging directory -.cdk.staging -cdk.out - -# Created by https://www.gitignore.io/api/csharp - -### Csharp ### -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - - -# End of https://www.gitignore.io/api/csharp \ No newline at end of file diff --git a/packages/aws-cdk/lib/init-templates/v2/app/csharp/README.md b/packages/aws-cdk/lib/init-templates/v2/app/csharp/README.md deleted file mode 100644 index d2eb4e9e33144..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/csharp/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# Welcome to your CDK C# project! - -This is a blank project for CDK development with C#. - -The `cdk.json` file tells the CDK Toolkit how to execute your app. - -It uses the [.NET Core CLI](https://docs.microsoft.com/dotnet/articles/core/) to compile and execute your project. - -## Useful commands - -* `dotnet build src` compile this app -* `cdk deploy` deploy this stack to your default AWS account/region -* `cdk diff` compare deployed stack with current state -* `cdk synth` emits the synthesized CloudFormation template \ No newline at end of file diff --git a/packages/aws-cdk/lib/init-templates/v2/app/csharp/add-project.hook.ts b/packages/aws-cdk/lib/init-templates/v2/app/csharp/add-project.hook.ts deleted file mode 100644 index 37b1fe6ad3e5f..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/csharp/add-project.hook.ts +++ /dev/null @@ -1,33 +0,0 @@ -import * as child_process from 'child_process'; -import * as path from 'path'; -import { InvokeHook } from '../../../../init'; - -export const invoke: InvokeHook = async (targetDirectory: string) => { - const slnPath = path.join(targetDirectory, 'src', '%name.PascalCased%.sln'); - const csprojPath = path.join(targetDirectory, 'src', '%name.PascalCased%', '%name.PascalCased%.csproj'); - - const child = child_process.spawn('dotnet', ['sln', slnPath, 'add', csprojPath], { - // Need this for Windows where we want .cmd and .bat to be found as well. - shell: true, - stdio: ['ignore', 'pipe', 'inherit'], - }); - - await new Promise((resolve, reject) => { - const stdout = new Array(); - - child.stdout.on('data', chunk => { - process.stdout.write(chunk); - stdout.push(chunk); - }); - - child.once('error', reject); - - child.once('exit', code => { - if (code === 0) { - resolve(Buffer.concat(stdout).toString('utf-8')); - } else { - reject(new Error(`Could not add project %name.PascalCased%.csproj to solution %name.PascalCased%.sln. Error code: ${code}`)); - } - }); - }); -}; diff --git a/packages/aws-cdk/lib/init-templates/v2/app/csharp/cdk.template.json b/packages/aws-cdk/lib/init-templates/v2/app/csharp/cdk.template.json deleted file mode 100644 index 054ecec595e7c..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/csharp/cdk.template.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "app": "dotnet run --project src/%name.PascalCased%/%name.PascalCased%.csproj", - "watch": { - "include": ["**"], - "exclude": [ - "README.md", - "cdk*.json", - "src/*/obj", - "src/*/bin", - "src/*.sln", - "src/*/GlobalSuppressions.cs", - "src/*/*.csproj" - ] - } -} diff --git a/packages/aws-cdk/lib/init-templates/v2/app/csharp/src/%name.PascalCased%.template.sln b/packages/aws-cdk/lib/init-templates/v2/app/csharp/src/%name.PascalCased%.template.sln deleted file mode 100644 index 2f92ebd9bda92..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/csharp/src/%name.PascalCased%.template.sln +++ /dev/null @@ -1,18 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/packages/aws-cdk/lib/init-templates/v2/app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs b/packages/aws-cdk/lib/init-templates/v2/app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs deleted file mode 100644 index 26233fcb54b5c..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs +++ /dev/null @@ -1 +0,0 @@ -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Potential Code Quality Issues", "RECS0026:Possible unassigned object created by 'new'", Justification = "Constructs add themselves to the scope in which they are created")] diff --git a/packages/aws-cdk/lib/init-templates/v2/app/fsharp/.template.gitignore b/packages/aws-cdk/lib/init-templates/v2/app/fsharp/.template.gitignore deleted file mode 100644 index a4609e7587f3c..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/fsharp/.template.gitignore +++ /dev/null @@ -1,342 +0,0 @@ -# CDK asset staging directory -.cdk.staging -cdk.out - -# Created by https://www.gitignore.io/api/csharp - -### Csharp ### -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - - -# End of https://www.gitignore.io/api/csharp \ No newline at end of file diff --git a/packages/aws-cdk/lib/init-templates/v2/app/fsharp/README.md b/packages/aws-cdk/lib/init-templates/v2/app/fsharp/README.md deleted file mode 100644 index 7054ece6a0f7a..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/fsharp/README.md +++ /dev/null @@ -1,18 +0,0 @@ -## Welcome to your CDK F# project! - -This is a blank project for CDK development with F#. - -The `cdk.json` file tells the CDK Toolkit how to execute your app. - -It uses the [.NET Core CLI](https://docs.microsoft.com/dotnet/articles/core/) to compile and execute your project. - -## Useful commands - -* `dotnet build src` compile this app -* `cdk ls` list all stacks in the app -* `cdk synth` emits the synthesized CloudFormation template -* `cdk deploy` deploy this stack to your default AWS account/region -* `cdk diff` compare deployed stack with current state -* `cdk docs` open CDK documentation - -Enjoy! diff --git a/packages/aws-cdk/lib/init-templates/v2/app/fsharp/cdk.template.json b/packages/aws-cdk/lib/init-templates/v2/app/fsharp/cdk.template.json deleted file mode 100644 index b7b6120fd4bca..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/fsharp/cdk.template.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "app": "dotnet run --project src/%name.PascalCased%/%name.PascalCased%.fsproj", - "watch": { - "include": ["**"], - "exclude": [ - "README.md", - "cdk*.json", - "src/*/obj", - "src/*/bin", - "src/*.sln", - "src/*/*.fsproj" - ] - } -} diff --git a/packages/aws-cdk/lib/init-templates/v2/app/fsharp/src/%name.PascalCased%.template.sln b/packages/aws-cdk/lib/init-templates/v2/app/fsharp/src/%name.PascalCased%.template.sln deleted file mode 100644 index d73885e1eacb9..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/fsharp/src/%name.PascalCased%.template.sln +++ /dev/null @@ -1,18 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/packages/aws-cdk/lib/init-templates/v2/app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs b/packages/aws-cdk/lib/init-templates/v2/app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs deleted file mode 100644 index 5e4d9ef94e748..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs +++ /dev/null @@ -1,8 +0,0 @@ -namespace %name.PascalCased% - -open Amazon.CDK - -type %name.PascalCased%Stack(scope, id, props) as this = - inherit Stack(scope, id, props) - - // The code that defines your stack goes here diff --git a/packages/aws-cdk/lib/init-templates/v2/app/fsharp/src/%name.PascalCased%/Program.template.fs b/packages/aws-cdk/lib/init-templates/v2/app/fsharp/src/%name.PascalCased%/Program.template.fs deleted file mode 100644 index dc618af3fbbf1..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/fsharp/src/%name.PascalCased%/Program.template.fs +++ /dev/null @@ -1,11 +0,0 @@ -open Amazon.CDK -open %name.PascalCased% - -[] -let main _ = - let app = App(null) - - %name.PascalCased%Stack(app, "%name.PascalCased%Stack", StackProps()) |> ignore - - app.Synth() |> ignore - 0 diff --git a/packages/aws-cdk/lib/init-templates/v2/app/go/.template.gitignore b/packages/aws-cdk/lib/init-templates/v2/app/go/.template.gitignore deleted file mode 100644 index 92fe1ec34b4b6..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/go/.template.gitignore +++ /dev/null @@ -1,19 +0,0 @@ -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Test binary, built with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out - -# go.sum should be committed -!go.sum - -# CDK asset staging directory -.cdk.staging -cdk.out diff --git a/packages/aws-cdk/lib/init-templates/v2/app/go/README.md b/packages/aws-cdk/lib/init-templates/v2/app/go/README.md deleted file mode 100644 index 5487d820bcc15..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/go/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# Welcome to your CDK Go project! - -This is a blank project for CDK development with Go. - -**NOTICE**: Go support is still in Developer Preview. This implies that APIs may -change while we address early feedback from the community. We would love to hear -about your experience through GitHub issues. - -## Useful commands - - * `cdk deploy` deploy this stack to your default AWS account/region - * `cdk diff` compare deployed stack with current state - * `cdk synth` emits the synthesized CloudFormation template - * `go test` run unit tests diff --git a/packages/aws-cdk/lib/init-templates/v2/app/go/cdk.template.json b/packages/aws-cdk/lib/init-templates/v2/app/go/cdk.template.json deleted file mode 100644 index a25485ed0951b..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/go/cdk.template.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "app": "go mod download && go run %name%.go", - "watch": { - "include": ["**"], - "exclude": [ - "README.md", - "cdk*.json", - "go.mod", - "go.sum", - "**/*test.go" - ] - } -} diff --git a/packages/aws-cdk/lib/init-templates/v2/app/info.json b/packages/aws-cdk/lib/init-templates/v2/app/info.json deleted file mode 100644 index 1a96dac2b1103..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/info.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "Template for a CDK Application", - "aliases": ["application", "default"] -} diff --git a/packages/aws-cdk/lib/init-templates/v2/app/java/.template.gitignore b/packages/aws-cdk/lib/init-templates/v2/app/java/.template.gitignore deleted file mode 100644 index 1db21f162937f..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/java/.template.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -.classpath.txt -target -.classpath -.project -.idea -.settings -.vscode -*.iml - -# CDK asset staging directory -.cdk.staging -cdk.out - diff --git a/packages/aws-cdk/lib/init-templates/v2/app/java/README.md b/packages/aws-cdk/lib/init-templates/v2/app/java/README.md deleted file mode 100644 index 516ef71a25f0b..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/java/README.md +++ /dev/null @@ -1,18 +0,0 @@ -# Welcome to your CDK Java project! - -This is a blank project for CDK development with Java. - -The `cdk.json` file tells the CDK Toolkit how to execute your app. - -It is a [Maven](https://maven.apache.org/) based project, so you can open this project with any Maven compatible Java IDE to build and run tests. - -## Useful commands - - * `mvn package` compile and run tests - * `cdk ls` list all stacks in the app - * `cdk synth` emits the synthesized CloudFormation template - * `cdk deploy` deploy this stack to your default AWS account/region - * `cdk diff` compare deployed stack with current state - * `cdk docs` open CDK documentation - -Enjoy! diff --git a/packages/aws-cdk/lib/init-templates/v2/app/java/cdk.json b/packages/aws-cdk/lib/init-templates/v2/app/java/cdk.json deleted file mode 100644 index b21c3e47a9552..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/java/cdk.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "app": "mvn -e -q compile exec:java", - "watch": { - "include": ["**"], - "exclude": [ - "README.md", - "cdk*.json", - "target", - "pom.xml", - "src/test" - ] - } -} diff --git a/packages/aws-cdk/lib/init-templates/v2/app/java/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/v2/app/java/sub-placeholders.hook.ts deleted file mode 100644 index 98c27ef042b9c..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/java/sub-placeholders.hook.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { InvokeHook } from '../../../../init'; - -export const invoke: InvokeHook = async (_, context) => { - // File cannot be named like regular template because it needs to be - // processed by dependency updaters. - await context.substitutePlaceholdersIn('pom.xml'); -}; diff --git a/packages/aws-cdk/lib/init-templates/v2/app/javascript/.template.gitignore b/packages/aws-cdk/lib/init-templates/v2/app/javascript/.template.gitignore deleted file mode 100644 index 21dc76264a308..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/javascript/.template.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules - -# CDK asset staging directory -.cdk.staging -cdk.out diff --git a/packages/aws-cdk/lib/init-templates/v2/app/javascript/.template.npmignore b/packages/aws-cdk/lib/init-templates/v2/app/javascript/.template.npmignore deleted file mode 100644 index 5de422a0b42a0..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/javascript/.template.npmignore +++ /dev/null @@ -1,3 +0,0 @@ -# CDK asset staging directory -.cdk.staging -cdk.out diff --git a/packages/aws-cdk/lib/init-templates/v2/app/javascript/README.md b/packages/aws-cdk/lib/init-templates/v2/app/javascript/README.md deleted file mode 100644 index e275326a4243e..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/javascript/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# Welcome to your CDK JavaScript project - -This is a blank project for CDK development with JavaScript. - -The `cdk.json` file tells the CDK Toolkit how to execute your app. The build step is not required when using JavaScript. - -## Useful commands - -* `npm run test` perform the jest unit tests -* `cdk deploy` deploy this stack to your default AWS account/region -* `cdk diff` compare deployed stack with current state -* `cdk synth` emits the synthesized CloudFormation template diff --git a/packages/aws-cdk/lib/init-templates/v2/app/javascript/cdk.template.json b/packages/aws-cdk/lib/init-templates/v2/app/javascript/cdk.template.json deleted file mode 100644 index 6056727247dff..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/javascript/cdk.template.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "app": "node bin/%name%.js", - "watch": { - "include": ["**"], - "exclude": [ - "README.md", - "cdk*.json", - "jest.config.js", - "package*.json", - "yarn.lock", - "node_modules", - "test" - ] - } -} diff --git a/packages/aws-cdk/lib/init-templates/v2/app/javascript/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/v2/app/javascript/sub-placeholders.hook.ts deleted file mode 100644 index 039bb00d6f43f..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/javascript/sub-placeholders.hook.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { InvokeHook } from '../../../../init'; - -export const invoke: InvokeHook = async (_, context) => { - // File cannot be named like regular template because it needs to be - // processed by dependency updaters. - await context.substitutePlaceholdersIn('package.json'); -}; diff --git a/packages/aws-cdk/lib/init-templates/v2/app/python/%name.PythonModule%/__init__.py b/packages/aws-cdk/lib/init-templates/v2/app/python/%name.PythonModule%/__init__.py deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/packages/aws-cdk/lib/init-templates/v2/app/python/README.template.md b/packages/aws-cdk/lib/init-templates/v2/app/python/README.template.md deleted file mode 100644 index 778d1bcd2f424..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/python/README.template.md +++ /dev/null @@ -1,58 +0,0 @@ - -# Welcome to your CDK Python project! - -This is a blank project for CDK development with Python. - -The `cdk.json` file tells the CDK Toolkit how to execute your app. - -This project is set up like a standard Python project. The initialization -process also creates a virtualenv within this project, stored under the `.venv` -directory. To create the virtualenv it assumes that there is a `python3` -(or `python` for Windows) executable in your path with access to the `venv` -package. If for any reason the automatic creation of the virtualenv fails, -you can create the virtualenv manually. - -To manually create a virtualenv on MacOS and Linux: - -``` -$ %python-executable% -m venv .venv -``` - -After the init process completes and the virtualenv is created, you can use the following -step to activate your virtualenv. - -``` -$ source .venv/bin/activate -``` - -If you are a Windows platform, you would activate the virtualenv like this: - -``` -% .venv\Scripts\activate.bat -``` - -Once the virtualenv is activated, you can install the required dependencies. - -``` -$ pip install -r requirements.txt -``` - -At this point you can now synthesize the CloudFormation template for this code. - -``` -$ cdk synth -``` - -To add additional dependencies, for example other CDK libraries, just add -them to your `setup.py` file and rerun the `pip install -r requirements.txt` -command. - -## Useful commands - - * `cdk ls` list all stacks in the app - * `cdk synth` emits the synthesized CloudFormation template - * `cdk deploy` deploy this stack to your default AWS account/region - * `cdk diff` compare deployed stack with current state - * `cdk docs` open CDK documentation - -Enjoy! diff --git a/packages/aws-cdk/lib/init-templates/v2/app/python/cdk.template.json b/packages/aws-cdk/lib/init-templates/v2/app/python/cdk.template.json deleted file mode 100644 index 1c467275741e1..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/python/cdk.template.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "app": "%python-executable% app.py", - "watch": { - "include": ["**"], - "exclude": [ - "README.md", - "cdk*.json", - "requirements*.txt", - "source.bat", - "**/__init__.py", - "python/__pycache__", - "tests" - ] - } -} diff --git a/packages/aws-cdk/lib/init-templates/v2/app/python/requirements-dev.txt b/packages/aws-cdk/lib/init-templates/v2/app/python/requirements-dev.txt deleted file mode 100644 index 927094516e657..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/python/requirements-dev.txt +++ /dev/null @@ -1 +0,0 @@ -pytest==6.2.5 diff --git a/packages/aws-cdk/lib/init-templates/v2/app/python/source.bat b/packages/aws-cdk/lib/init-templates/v2/app/python/source.bat deleted file mode 100644 index 9e1a83442abd7..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/python/source.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off - -rem The sole purpose of this script is to make the command -rem -rem source .venv/bin/activate -rem -rem (which activates a Python virtualenv on Linux or Mac OS X) work on Windows. -rem On Windows, this command just runs this batch file (the argument is ignored). -rem -rem Now we don't need to document a Windows command for activating a virtualenv. - -echo Executing .venv\Scripts\activate.bat for you -.venv\Scripts\activate.bat diff --git a/packages/aws-cdk/lib/init-templates/v2/app/python/tests/__init__.py b/packages/aws-cdk/lib/init-templates/v2/app/python/tests/__init__.py deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/packages/aws-cdk/lib/init-templates/v2/app/python/tests/unit/__init__.py b/packages/aws-cdk/lib/init-templates/v2/app/python/tests/unit/__init__.py deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/packages/aws-cdk/lib/init-templates/v2/app/typescript/.template.gitignore b/packages/aws-cdk/lib/init-templates/v2/app/typescript/.template.gitignore deleted file mode 100644 index f60797b6a9168..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/typescript/.template.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -*.js -!jest.config.js -*.d.ts -node_modules - -# CDK asset staging directory -.cdk.staging -cdk.out diff --git a/packages/aws-cdk/lib/init-templates/v2/app/typescript/.template.npmignore b/packages/aws-cdk/lib/init-templates/v2/app/typescript/.template.npmignore deleted file mode 100644 index c1d6d45dcf388..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/typescript/.template.npmignore +++ /dev/null @@ -1,6 +0,0 @@ -*.ts -!*.d.ts - -# CDK asset staging directory -.cdk.staging -cdk.out diff --git a/packages/aws-cdk/lib/init-templates/v2/app/typescript/README.md b/packages/aws-cdk/lib/init-templates/v2/app/typescript/README.md deleted file mode 100644 index 320efc02a9275..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/typescript/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# Welcome to your CDK TypeScript project - -This is a blank project for CDK development with TypeScript. - -The `cdk.json` file tells the CDK Toolkit how to execute your app. - -## Useful commands - -* `npm run build` compile typescript to js -* `npm run watch` watch for changes and compile -* `npm run test` perform the jest unit tests -* `cdk deploy` deploy this stack to your default AWS account/region -* `cdk diff` compare deployed stack with current state -* `cdk synth` emits the synthesized CloudFormation template diff --git a/packages/aws-cdk/lib/init-templates/v2/app/typescript/cdk.template.json b/packages/aws-cdk/lib/init-templates/v2/app/typescript/cdk.template.json deleted file mode 100644 index e9b5bea306944..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/typescript/cdk.template.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "app": "npx ts-node --prefer-ts-exts bin/%name%.ts", - "watch": { - "include": ["**"], - "exclude": [ - "README.md", - "cdk*.json", - "**/*.d.ts", - "**/*.js", - "tsconfig.json", - "package*.json", - "yarn.lock", - "node_modules", - "test" - ] - } -} diff --git a/packages/aws-cdk/lib/init-templates/v2/app/typescript/jest.config.js b/packages/aws-cdk/lib/init-templates/v2/app/typescript/jest.config.js deleted file mode 100644 index 08263b8954a42..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/typescript/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - testEnvironment: 'node', - roots: ['/test'], - testMatch: ['**/*.test.ts'], - transform: { - '^.+\\.tsx?$': 'ts-jest' - } -}; diff --git a/packages/aws-cdk/lib/init-templates/v2/app/typescript/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/v2/app/typescript/sub-placeholders.hook.ts deleted file mode 100644 index 039bb00d6f43f..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/typescript/sub-placeholders.hook.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { InvokeHook } from '../../../../init'; - -export const invoke: InvokeHook = async (_, context) => { - // File cannot be named like regular template because it needs to be - // processed by dependency updaters. - await context.substitutePlaceholdersIn('package.json'); -}; diff --git a/packages/aws-cdk/lib/init-templates/v2/app/typescript/tsconfig.json b/packages/aws-cdk/lib/init-templates/v2/app/typescript/tsconfig.json deleted file mode 100644 index 9f8e8beabd233..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/app/typescript/tsconfig.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "compilerOptions": { - "target": "ES2018", - "module": "commonjs", - "lib": [ - "es2018" - ], - "declaration": true, - "strict": true, - "noImplicitAny": true, - "strictNullChecks": true, - "noImplicitThis": true, - "alwaysStrict": true, - "noUnusedLocals": false, - "noUnusedParameters": false, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": false, - "inlineSourceMap": true, - "inlineSources": true, - "experimentalDecorators": true, - "strictPropertyInitialization": false, - "typeRoots": [ - "./node_modules/@types" - ] - }, - "exclude": [ - "node_modules", - "cdk.out" - ] -} diff --git a/packages/aws-cdk/lib/init-templates/v2/lib/info.json b/packages/aws-cdk/lib/init-templates/v2/lib/info.json deleted file mode 100644 index ccc35fd2fe3fe..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/lib/info.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "Template for a CDK Construct Library", - "aliases": "library" -} diff --git a/packages/aws-cdk/lib/init-templates/v2/lib/typescript/.template.gitignore b/packages/aws-cdk/lib/init-templates/v2/lib/typescript/.template.gitignore deleted file mode 100644 index f60797b6a9168..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/lib/typescript/.template.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -*.js -!jest.config.js -*.d.ts -node_modules - -# CDK asset staging directory -.cdk.staging -cdk.out diff --git a/packages/aws-cdk/lib/init-templates/v2/lib/typescript/.template.npmignore b/packages/aws-cdk/lib/init-templates/v2/lib/typescript/.template.npmignore deleted file mode 100644 index c1d6d45dcf388..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/lib/typescript/.template.npmignore +++ /dev/null @@ -1,6 +0,0 @@ -*.ts -!*.d.ts - -# CDK asset staging directory -.cdk.staging -cdk.out diff --git a/packages/aws-cdk/lib/init-templates/v2/lib/typescript/jest.config.js b/packages/aws-cdk/lib/init-templates/v2/lib/typescript/jest.config.js deleted file mode 100644 index 08263b8954a42..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/lib/typescript/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - testEnvironment: 'node', - roots: ['/test'], - testMatch: ['**/*.test.ts'], - transform: { - '^.+\\.tsx?$': 'ts-jest' - } -}; diff --git a/packages/aws-cdk/lib/init-templates/v2/lib/typescript/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/v2/lib/typescript/sub-placeholders.hook.ts deleted file mode 100644 index 039bb00d6f43f..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/lib/typescript/sub-placeholders.hook.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { InvokeHook } from '../../../../init'; - -export const invoke: InvokeHook = async (_, context) => { - // File cannot be named like regular template because it needs to be - // processed by dependency updaters. - await context.substitutePlaceholdersIn('package.json'); -}; diff --git a/packages/aws-cdk/lib/init-templates/v2/lib/typescript/tsconfig.json b/packages/aws-cdk/lib/init-templates/v2/lib/typescript/tsconfig.json deleted file mode 100644 index 9f8e8beabd233..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/lib/typescript/tsconfig.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "compilerOptions": { - "target": "ES2018", - "module": "commonjs", - "lib": [ - "es2018" - ], - "declaration": true, - "strict": true, - "noImplicitAny": true, - "strictNullChecks": true, - "noImplicitThis": true, - "alwaysStrict": true, - "noUnusedLocals": false, - "noUnusedParameters": false, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": false, - "inlineSourceMap": true, - "inlineSources": true, - "experimentalDecorators": true, - "strictPropertyInitialization": false, - "typeRoots": [ - "./node_modules/@types" - ] - }, - "exclude": [ - "node_modules", - "cdk.out" - ] -} diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/.template.gitignore b/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/.template.gitignore deleted file mode 100644 index a4609e7587f3c..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/.template.gitignore +++ /dev/null @@ -1,342 +0,0 @@ -# CDK asset staging directory -.cdk.staging -cdk.out - -# Created by https://www.gitignore.io/api/csharp - -### Csharp ### -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - - -# End of https://www.gitignore.io/api/csharp \ No newline at end of file diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/add-project.hook.ts b/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/add-project.hook.ts deleted file mode 100644 index 37b1fe6ad3e5f..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/add-project.hook.ts +++ /dev/null @@ -1,33 +0,0 @@ -import * as child_process from 'child_process'; -import * as path from 'path'; -import { InvokeHook } from '../../../../init'; - -export const invoke: InvokeHook = async (targetDirectory: string) => { - const slnPath = path.join(targetDirectory, 'src', '%name.PascalCased%.sln'); - const csprojPath = path.join(targetDirectory, 'src', '%name.PascalCased%', '%name.PascalCased%.csproj'); - - const child = child_process.spawn('dotnet', ['sln', slnPath, 'add', csprojPath], { - // Need this for Windows where we want .cmd and .bat to be found as well. - shell: true, - stdio: ['ignore', 'pipe', 'inherit'], - }); - - await new Promise((resolve, reject) => { - const stdout = new Array(); - - child.stdout.on('data', chunk => { - process.stdout.write(chunk); - stdout.push(chunk); - }); - - child.once('error', reject); - - child.once('exit', code => { - if (code === 0) { - resolve(Buffer.concat(stdout).toString('utf-8')); - } else { - reject(new Error(`Could not add project %name.PascalCased%.csproj to solution %name.PascalCased%.sln. Error code: ${code}`)); - } - }); - }); -}; diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/cdk.template.json b/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/cdk.template.json deleted file mode 100644 index 054ecec595e7c..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/cdk.template.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "app": "dotnet run --project src/%name.PascalCased%/%name.PascalCased%.csproj", - "watch": { - "include": ["**"], - "exclude": [ - "README.md", - "cdk*.json", - "src/*/obj", - "src/*/bin", - "src/*.sln", - "src/*/GlobalSuppressions.cs", - "src/*/*.csproj" - ] - } -} diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/src/%name.PascalCased%.template.sln b/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/src/%name.PascalCased%.template.sln deleted file mode 100644 index 2f92ebd9bda92..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/src/%name.PascalCased%.template.sln +++ /dev/null @@ -1,18 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs b/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs deleted file mode 100644 index 26233fcb54b5c..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs +++ /dev/null @@ -1 +0,0 @@ -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Potential Code Quality Issues", "RECS0026:Possible unassigned object created by 'new'", Justification = "Constructs add themselves to the scope in which they are created")] diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/src/%name.PascalCased%/Program.template.cs b/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/src/%name.PascalCased%/Program.template.cs deleted file mode 100644 index 20d5337f09888..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/csharp/src/%name.PascalCased%/Program.template.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Amazon.CDK; - -namespace %name.PascalCased% -{ - sealed class Program - { - public static void Main(string[] args) - { - var app = new App(); - new %name.PascalCased%Stack(app, "%name.PascalCased%Stack"); - - app.Synth(); - } - } -} diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/.template.gitignore b/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/.template.gitignore deleted file mode 100644 index a4609e7587f3c..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/.template.gitignore +++ /dev/null @@ -1,342 +0,0 @@ -# CDK asset staging directory -.cdk.staging -cdk.out - -# Created by https://www.gitignore.io/api/csharp - -### Csharp ### -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - - -# End of https://www.gitignore.io/api/csharp \ No newline at end of file diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/README.template.md b/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/README.template.md deleted file mode 100644 index d1bfcf9a90ccf..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/README.template.md +++ /dev/null @@ -1,20 +0,0 @@ - -# Welcome to your CDK F# project! - -You should explore the contents of this project. It demonstrates a CDK app with an instance of a stack (`%name.PascalCased%Stack`) -which contains an Amazon SQS queue that is subscribed to an Amazon SNS topic. - -The `cdk.json` file tells the CDK Toolkit how to execute your app. - -It uses the [.NET Core CLI](https://docs.microsoft.com/dotnet/articles/core/) to compile and execute your project. - -## Useful commands - -* `dotnet build src` compile this app -* `cdk ls` list all stacks in the app -* `cdk synth` emits the synthesized CloudFormation template -* `cdk deploy` deploy this stack to your default AWS account/region -* `cdk diff` compare deployed stack with current state -* `cdk docs` open CDK documentation - -Enjoy! diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/cdk.template.json b/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/cdk.template.json deleted file mode 100644 index b7b6120fd4bca..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/cdk.template.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "app": "dotnet run --project src/%name.PascalCased%/%name.PascalCased%.fsproj", - "watch": { - "include": ["**"], - "exclude": [ - "README.md", - "cdk*.json", - "src/*/obj", - "src/*/bin", - "src/*.sln", - "src/*/*.fsproj" - ] - } -} diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/src/%name.PascalCased%.template.sln b/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/src/%name.PascalCased%.template.sln deleted file mode 100644 index d73885e1eacb9..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/src/%name.PascalCased%.template.sln +++ /dev/null @@ -1,18 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/src/%name.PascalCased%/Program.template.fs b/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/src/%name.PascalCased%/Program.template.fs deleted file mode 100644 index dc618af3fbbf1..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/fsharp/src/%name.PascalCased%/Program.template.fs +++ /dev/null @@ -1,11 +0,0 @@ -open Amazon.CDK -open %name.PascalCased% - -[] -let main _ = - let app = App(null) - - %name.PascalCased%Stack(app, "%name.PascalCased%Stack", StackProps()) |> ignore - - app.Synth() |> ignore - 0 diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/go/.template.gitignore b/packages/aws-cdk/lib/init-templates/v2/sample-app/go/.template.gitignore deleted file mode 100644 index 92fe1ec34b4b6..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/go/.template.gitignore +++ /dev/null @@ -1,19 +0,0 @@ -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Test binary, built with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out - -# go.sum should be committed -!go.sum - -# CDK asset staging directory -.cdk.staging -cdk.out diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/go/README.md b/packages/aws-cdk/lib/init-templates/v2/sample-app/go/README.md deleted file mode 100644 index 9b8d4b29f26e3..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/go/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# Welcome to your CDK Go project! - -This is a blank project for Go development with CDK. - -**NOTICE**: Go support is still in Developer Preview. This implies that APIs may -change while we address early feedback from the community. We would love to hear -about your experience through GitHub issues. - -## Useful commands - - * `cdk deploy` deploy this stack to your default AWS account/region - * `cdk diff` compare deployed stack with current state - * `cdk synth` emits the synthesized CloudFormation template - * `go test` run unit tests diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/go/cdk.template.json b/packages/aws-cdk/lib/init-templates/v2/sample-app/go/cdk.template.json deleted file mode 100644 index a25485ed0951b..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/go/cdk.template.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "app": "go mod download && go run %name%.go", - "watch": { - "include": ["**"], - "exclude": [ - "README.md", - "cdk*.json", - "go.mod", - "go.sum", - "**/*test.go" - ] - } -} diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/info.json b/packages/aws-cdk/lib/init-templates/v2/sample-app/info.json deleted file mode 100644 index 1451c2576eb63..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/info.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "Example CDK Application with some constructs", - "aliases": ["sample", "example"] -} diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/java/.template.gitignore b/packages/aws-cdk/lib/init-templates/v2/sample-app/java/.template.gitignore deleted file mode 100644 index 1db21f162937f..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/java/.template.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -.classpath.txt -target -.classpath -.project -.idea -.settings -.vscode -*.iml - -# CDK asset staging directory -.cdk.staging -cdk.out - diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/java/cdk.json b/packages/aws-cdk/lib/init-templates/v2/sample-app/java/cdk.json deleted file mode 100644 index b21c3e47a9552..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/java/cdk.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "app": "mvn -e -q compile exec:java", - "watch": { - "include": ["**"], - "exclude": [ - "README.md", - "cdk*.json", - "target", - "pom.xml", - "src/test" - ] - } -} diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/java/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/v2/sample-app/java/sub-placeholders.hook.ts deleted file mode 100644 index 98c27ef042b9c..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/java/sub-placeholders.hook.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { InvokeHook } from '../../../../init'; - -export const invoke: InvokeHook = async (_, context) => { - // File cannot be named like regular template because it needs to be - // processed by dependency updaters. - await context.substitutePlaceholdersIn('pom.xml'); -}; diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/.template.gitignore b/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/.template.gitignore deleted file mode 100644 index 21dc76264a308..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/.template.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules - -# CDK asset staging directory -.cdk.staging -cdk.out diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/.template.npmignore b/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/.template.npmignore deleted file mode 100644 index 5de422a0b42a0..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/.template.npmignore +++ /dev/null @@ -1,3 +0,0 @@ -# CDK asset staging directory -.cdk.staging -cdk.out diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/cdk.template.json b/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/cdk.template.json deleted file mode 100644 index 6056727247dff..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/cdk.template.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "app": "node bin/%name%.js", - "watch": { - "include": ["**"], - "exclude": [ - "README.md", - "cdk*.json", - "jest.config.js", - "package*.json", - "yarn.lock", - "node_modules", - "test" - ] - } -} diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/jest.config.js b/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/jest.config.js deleted file mode 100644 index 95495de92eb8c..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/jest.config.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - testEnvironment: 'node' -} diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/sub-placeholders.hook.ts deleted file mode 100644 index 039bb00d6f43f..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/sub-placeholders.hook.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { InvokeHook } from '../../../../init'; - -export const invoke: InvokeHook = async (_, context) => { - // File cannot be named like regular template because it needs to be - // processed by dependency updaters. - await context.substitutePlaceholdersIn('package.json'); -}; diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/tsconfig.json b/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/tsconfig.json deleted file mode 100644 index 47ad92078bbef..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/javascript/tsconfig.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "compilerOptions": { - "target": "ES2018", - "module": "commonjs", - "lib": [ - "es2016", - "es2017.object", - "es2017.string" - ], - "declaration": true, - "strict": true, - "noImplicitAny": true, - "strictNullChecks": true, - "noImplicitThis": true, - "alwaysStrict": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": false, - "inlineSourceMap": true, - "inlineSources": true, - "experimentalDecorators": true, - "strictPropertyInitialization": false, - "allowJs": true, - "checkJs": true, - "noEmit": true, - "typeRoots": [ - "./node_modules/@types" - ] - }, - "exclude": [ - "node_modules", - "cdk.out" - ] -} diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/python/%name.PythonModule%/__init__.py b/packages/aws-cdk/lib/init-templates/v2/sample-app/python/%name.PythonModule%/__init__.py deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/python/.template.gitignore b/packages/aws-cdk/lib/init-templates/v2/sample-app/python/.template.gitignore deleted file mode 100644 index 95f954427c747..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/python/.template.gitignore +++ /dev/null @@ -1,22 +0,0 @@ -*.swp -package-lock.json -.pytest_cache -*.egg-info - -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# CDK Context & Staging files -.cdk.staging/ -cdk.out/ \ No newline at end of file diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/python/cdk.template.json b/packages/aws-cdk/lib/init-templates/v2/sample-app/python/cdk.template.json deleted file mode 100644 index 1c467275741e1..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/python/cdk.template.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "app": "%python-executable% app.py", - "watch": { - "include": ["**"], - "exclude": [ - "README.md", - "cdk*.json", - "requirements*.txt", - "source.bat", - "**/__init__.py", - "python/__pycache__", - "tests" - ] - } -} diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/python/requirements-dev.txt b/packages/aws-cdk/lib/init-templates/v2/sample-app/python/requirements-dev.txt deleted file mode 100644 index 927094516e657..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/python/requirements-dev.txt +++ /dev/null @@ -1 +0,0 @@ -pytest==6.2.5 diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/python/source.bat b/packages/aws-cdk/lib/init-templates/v2/sample-app/python/source.bat deleted file mode 100644 index 9e1a83442abd7..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/python/source.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off - -rem The sole purpose of this script is to make the command -rem -rem source .venv/bin/activate -rem -rem (which activates a Python virtualenv on Linux or Mac OS X) work on Windows. -rem On Windows, this command just runs this batch file (the argument is ignored). -rem -rem Now we don't need to document a Windows command for activating a virtualenv. - -echo Executing .venv\Scripts\activate.bat for you -.venv\Scripts\activate.bat diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/python/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/v2/sample-app/python/sub-placeholders.hook.ts deleted file mode 100644 index 67bf2a9c6e8f4..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/python/sub-placeholders.hook.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { InvokeHook } from '../../../../init'; - -export const invoke: InvokeHook = async (_, context) => { - // File cannot be named like regular template because it needs to be - // processed by dependency updaters. - await context.substitutePlaceholdersIn('requirements.txt'); -}; diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/python/tests/__init__.py b/packages/aws-cdk/lib/init-templates/v2/sample-app/python/tests/__init__.py deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/python/tests/unit/__init__.py b/packages/aws-cdk/lib/init-templates/v2/sample-app/python/tests/unit/__init__.py deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/.template.gitignore b/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/.template.gitignore deleted file mode 100644 index f60797b6a9168..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/.template.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -*.js -!jest.config.js -*.d.ts -node_modules - -# CDK asset staging directory -.cdk.staging -cdk.out diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/.template.npmignore b/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/.template.npmignore deleted file mode 100644 index c1d6d45dcf388..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/.template.npmignore +++ /dev/null @@ -1,6 +0,0 @@ -*.ts -!*.d.ts - -# CDK asset staging directory -.cdk.staging -cdk.out diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/cdk.template.json b/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/cdk.template.json deleted file mode 100644 index e9b5bea306944..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/cdk.template.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "app": "npx ts-node --prefer-ts-exts bin/%name%.ts", - "watch": { - "include": ["**"], - "exclude": [ - "README.md", - "cdk*.json", - "**/*.d.ts", - "**/*.js", - "tsconfig.json", - "package*.json", - "yarn.lock", - "node_modules", - "test" - ] - } -} diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/jest.config.js b/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/jest.config.js deleted file mode 100644 index 08263b8954a42..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/jest.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - testEnvironment: 'node', - roots: ['/test'], - testMatch: ['**/*.test.ts'], - transform: { - '^.+\\.tsx?$': 'ts-jest' - } -}; diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/sub-placeholders.hook.ts b/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/sub-placeholders.hook.ts deleted file mode 100644 index 039bb00d6f43f..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/sub-placeholders.hook.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { InvokeHook } from '../../../../init'; - -export const invoke: InvokeHook = async (_, context) => { - // File cannot be named like regular template because it needs to be - // processed by dependency updaters. - await context.substitutePlaceholdersIn('package.json'); -}; diff --git a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/tsconfig.json b/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/tsconfig.json deleted file mode 100644 index 9f8e8beabd233..0000000000000 --- a/packages/aws-cdk/lib/init-templates/v2/sample-app/typescript/tsconfig.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "compilerOptions": { - "target": "ES2018", - "module": "commonjs", - "lib": [ - "es2018" - ], - "declaration": true, - "strict": true, - "noImplicitAny": true, - "strictNullChecks": true, - "noImplicitThis": true, - "alwaysStrict": true, - "noUnusedLocals": false, - "noUnusedParameters": false, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": false, - "inlineSourceMap": true, - "inlineSources": true, - "experimentalDecorators": true, - "strictPropertyInitialization": false, - "typeRoots": [ - "./node_modules/@types" - ] - }, - "exclude": [ - "node_modules", - "cdk.out" - ] -} diff --git a/packages/aws-cdk/lib/init.ts b/packages/aws-cdk/lib/init.ts index 98c7e2d9cf80a..0a6d1dc0cf458 100644 --- a/packages/aws-cdk/lib/init.ts +++ b/packages/aws-cdk/lib/init.ts @@ -3,11 +3,9 @@ import * as path from 'path'; import * as cxapi from '@aws-cdk/cx-api'; import * as chalk from 'chalk'; import * as fs from 'fs-extra'; -import * as semver from 'semver'; import { error, print, warning } from './logging'; import { cdkHomeDir, rootDir } from './util/directories'; import { rangeFromSemver } from './util/version-range'; -import { versionNumber } from './version'; export type SubstitutePlaceholders = (...fileNames: string[]) => Promise; @@ -242,22 +240,9 @@ interface ProjectInfo { readonly name: string; } -function versionedTemplatesDir(): Promise { - return new Promise(async resolve => { - let currentVersion = versionNumber(); - // If the CLI is invoked from source (i.e., developement), rather than from a packaged distribution, - // the version number will be '0.0.0'. We will (currently) default to the v1 templates in this case. - if (currentVersion === '0.0.0') { - currentVersion = '1.0.0'; - } - const majorVersion = semver.major(currentVersion); - resolve(path.join(rootDir(), 'lib', 'init-templates', `v${majorVersion}`)); - }); -} - export async function availableInitTemplates(): Promise { return new Promise(async resolve => { - const templatesDir = await versionedTemplatesDir(); + const templatesDir = path.join(rootDir(), 'lib', 'init-templates'); const templateNames = await listDirectory(templatesDir); const templates = new Array(); for (const templateName of templateNames) { @@ -286,6 +271,7 @@ export async function availableInitLanguages(): Promise { async function listDirectory(dirPath: string) { return (await fs.readdir(dirPath)) .filter(p => !p.startsWith('.')) + .filter(p => !(p === 'LICENSE')) .sort(); } diff --git a/packages/aws-cdk/test/init.test.ts b/packages/aws-cdk/test/init.test.ts index 6341d708259b0..fc4750beef69f 100644 --- a/packages/aws-cdk/test/init.test.ts +++ b/packages/aws-cdk/test/init.test.ts @@ -1,25 +1,10 @@ -/** - * The init templates rely on parsing the current major version to find the correct template directory. - * During tests, the current package version is '0.0.0', rather than a specific version. - * The below mocks the versionNumber to return the major version (and so init template version) specified. - */ -let mockMajorVersion = '1.0.0'; -jest.mock('../lib/version', () => ({ - versionNumber: () => mockMajorVersion, -})); - import * as os from 'os'; import * as path from 'path'; import * as cxapi from '@aws-cdk/cx-api'; import * as fs from 'fs-extra'; import { availableInitTemplates, cliInit } from '../lib/init'; -describe.each(['1', '2'])('v%s tests', (majorVersion) => { - beforeEach(() => { - mockMajorVersion = `${majorVersion}.0.0`; - jest.resetAllMocks(); - }); - +describe('constructs version', () => { cliTest('create a TypeScript library project', async (workDir) => { await cliInit('lib', 'typescript', false, undefined /* canUseNetwork */, workDir); @@ -45,6 +30,68 @@ describe.each(['1', '2'])('v%s tests', (majorVersion) => { expect(await fs.pathExists(path.join(workDir, '.git'))).toBeTruthy(); }); + cliTest('create a Java app project', async (workDir) => { + await cliInit('app', 'java', false, true, workDir); + + expect(await fs.pathExists(path.join(workDir, 'pom.xml'))).toBeTruthy(); + + const pom = (await fs.readFile(path.join(workDir, 'pom.xml'), 'utf8')).split(/\r?\n/); + const matches = pom.map(line => line.match(/\(.*)\<\/constructs\.version\>/)) + .filter(l => l); + + expect(matches.length).toEqual(1); + matches.forEach(m => { + const version = m && m[1]; + expect(version).toMatch(/\[10\.[\d]+\.[\d]+,11\.0\.0\)/); + }); + }); + + cliTest('create a .NET app project in csharp', async (workDir) => { + await cliInit('app', 'csharp', false, true, workDir); + + const csprojFile = (await recursiveListFiles(workDir)).filter(f => f.endsWith('.csproj'))[0]; + const slnFile = (await recursiveListFiles(workDir)).filter(f => f.endsWith('.sln'))[0]; + expect(csprojFile).toBeDefined(); + expect(slnFile).toBeDefined(); + + const csproj = (await fs.readFile(csprojFile, 'utf8')).split(/\r?\n/); + const sln = (await fs.readFile(slnFile, 'utf8')).split(/\r?\n/); + + expect(csproj).toContainEqual(expect.stringMatching(/\ { + await cliInit('app', 'fsharp', false, true, workDir); + + const fsprojFile = (await recursiveListFiles(workDir)).filter(f => f.endsWith('.fsproj'))[0]; + const slnFile = (await recursiveListFiles(workDir)).filter(f => f.endsWith('.sln'))[0]; + expect(fsprojFile).toBeDefined(); + expect(slnFile).toBeDefined(); + + const fsproj = (await fs.readFile(fsprojFile, 'utf8')).split(/\r?\n/); + const sln = (await fs.readFile(slnFile, 'utf8')).split(/\r?\n/); + + expect(fsproj).toContainEqual(expect.stringMatching(/\ { + await cliInit('app', 'python', false, true, workDir); + + expect(await fs.pathExists(path.join(workDir, 'requirements.txt'))).toBeTruthy(); + const setupPy = (await fs.readFile(path.join(workDir, 'requirements.txt'), 'utf8')).split(/\r?\n/); + // return RegExpMatchArray (result of line.match()) for every lines that match re. + const matches = setupPy.map(line => line.match(/^constructs(.*)/)) + .filter(l => l); + + expect(matches.length).toEqual(1); + matches.forEach(m => { + const version = m && m[1]; + expect(version).toMatch(/>=10\.\d+\.\d,<11\.0\.0/); + }); + }); + cliTest('--generate-only should skip git init', async (workDir) => { await cliInit('app', 'javascript', false, true, workDir); @@ -99,59 +146,7 @@ describe.each(['1', '2'])('v%s tests', (majorVersion) => { 30_000); }); -describe('constructs version', () => { - beforeEach(() => { - mockMajorVersion = '2.0.0'; - jest.resetAllMocks(); - }); - - cliTest('java', async (workDir) => { - await cliInit('app', 'java', false, true, workDir); - - expect(await fs.pathExists(path.join(workDir, 'pom.xml'))).toBeTruthy(); - - const pom = (await fs.readFile(path.join(workDir, 'pom.xml'), 'utf8')).split(/\r?\n/); - const matches = pom.map(line => line.match(/\(.*)\<\/constructs\.version\>/)) - .filter(l => l); - - expect(matches.length).toEqual(1); - matches.forEach(m => { - const version = m && m[1]; - expect(version).toMatch(/\[10\.[\d]+\.[\d]+,11\.0\.0\)/); - }); - }); - - cliTest('.NET', async (workDir) => { - await cliInit('app', 'csharp', false, true, workDir); - - const csprojFile = (await recursiveListFiles(workDir)).filter(f => f.endsWith('.csproj'))[0]; - expect(csprojFile).toBeDefined(); - - const csproj = (await fs.readFile(csprojFile, 'utf8')).split(/\r?\n/); - - expect(csproj).toContainEqual(expect.stringMatching(/\ { - await cliInit('app', 'python', false, true, workDir); - - expect(await fs.pathExists(path.join(workDir, 'requirements.txt'))).toBeTruthy(); - const setupPy = (await fs.readFile(path.join(workDir, 'requirements.txt'), 'utf8')).split(/\r?\n/); - // return RegExpMatchArray (result of line.match()) for every lines that match re. - const matches = setupPy.map(line => line.match(/^constructs(.*)/)) - .filter(l => l); - - expect(matches.length).toEqual(1); - matches.forEach(m => { - const version = m && m[1]; - expect(version).toMatch(/>=10\.\d+\.\d,<11\.0\.0/); - }); - }); -}); - -test('when no version number is present (e.g., local development), the v1 templates are chosen by default', async () => { - mockMajorVersion = '0.0.0'; - jest.resetAllMocks(); +test('when no version number is present (e.g., local development), the v2 templates are chosen by default', async () => { expect((await availableInitTemplates()).length).toBeGreaterThan(0); });