From dfefb58998c7a9bd8e9483a8e7a7e7c2a69654f4 Mon Sep 17 00:00:00 2001 From: Lucas Schejtman Date: Tue, 12 Mar 2019 09:45:38 +0000 Subject: [PATCH] feat(core): add fsharp init-template (#1912) --- .../app/fsharp/.template.gitignore | 339 ++++++++++++++++++ .../lib/init-templates/app/fsharp/README.md | 20 ++ .../app/fsharp/add-project.hook.ts | 33 ++ .../lib/init-templates/app/fsharp/cdk.json | 4 + .../app/fsharp/src/HelloCdk.sln | 18 + .../src/HelloCdk/HelloCdk.template.fsproj | 15 + .../app/fsharp/src/HelloCdk/HelloConstruct.fs | 20 ++ .../app/fsharp/src/HelloCdk/HelloStack.fs | 21 ++ .../app/fsharp/src/HelloCdk/Program.fs | 10 + packages/aws-cdk/tsconfig.json | 3 +- 10 files changed, 482 insertions(+), 1 deletion(-) create mode 100644 packages/aws-cdk/lib/init-templates/app/fsharp/.template.gitignore create mode 100644 packages/aws-cdk/lib/init-templates/app/fsharp/README.md create mode 100644 packages/aws-cdk/lib/init-templates/app/fsharp/add-project.hook.ts create mode 100644 packages/aws-cdk/lib/init-templates/app/fsharp/cdk.json create mode 100644 packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk.sln create mode 100644 packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk/HelloCdk.template.fsproj create mode 100644 packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk/HelloConstruct.fs create mode 100644 packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk/HelloStack.fs create mode 100644 packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk/Program.fs diff --git a/packages/aws-cdk/lib/init-templates/app/fsharp/.template.gitignore b/packages/aws-cdk/lib/init-templates/app/fsharp/.template.gitignore new file mode 100644 index 0000000000000..8f83e36d4919a --- /dev/null +++ b/packages/aws-cdk/lib/init-templates/app/fsharp/.template.gitignore @@ -0,0 +1,339 @@ + +# 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/master/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/app/fsharp/README.md b/packages/aws-cdk/lib/init-templates/app/fsharp/README.md new file mode 100644 index 0000000000000..b1fdeb70bf281 --- /dev/null +++ b/packages/aws-cdk/lib/init-templates/app/fsharp/README.md @@ -0,0 +1,20 @@ + +# CDK HelloWorld + +Welcome to your CDK .NET project! + +You should explore the contents of this template. It demonstrates a CDK app with two instances of +a stack (`HelloStack`) which also uses a user-defined construct (`HelloConstruct`). + +The `cdk.json` file tells the CDK Toolkit how to execute your app. It uses the `dotnet` CLI to do this. + +# 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/app/fsharp/add-project.hook.ts b/packages/aws-cdk/lib/init-templates/app/fsharp/add-project.hook.ts new file mode 100644 index 0000000000000..7ead771eff800 --- /dev/null +++ b/packages/aws-cdk/lib/init-templates/app/fsharp/add-project.hook.ts @@ -0,0 +1,33 @@ +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", "HelloCdk.sln"); + const fsprojPath = path.join(targetDirectory, "src", "HelloCdk", "HelloCdk.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 HelloCdk.fsproj to solution HelloCdk.sln. Error code: ${code}`)); + } + }); + }); +}; diff --git a/packages/aws-cdk/lib/init-templates/app/fsharp/cdk.json b/packages/aws-cdk/lib/init-templates/app/fsharp/cdk.json new file mode 100644 index 0000000000000..1a6ba44e7f6b3 --- /dev/null +++ b/packages/aws-cdk/lib/init-templates/app/fsharp/cdk.json @@ -0,0 +1,4 @@ +{ + "app": "dotnet src/HelloCdk/bin/Debug/netcoreapp2.1/HelloCdk.dll" +} + \ No newline at end of file diff --git a/packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk.sln b/packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk.sln new file mode 100644 index 0000000000000..d73885e1eacb9 --- /dev/null +++ b/packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk.sln @@ -0,0 +1,18 @@ + +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/app/fsharp/src/HelloCdk/HelloCdk.template.fsproj b/packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk/HelloCdk.template.fsproj new file mode 100644 index 0000000000000..0e5b6d7b23e73 --- /dev/null +++ b/packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk/HelloCdk.template.fsproj @@ -0,0 +1,15 @@ + + + + Exe + netcoreapp2.1 + + + + + + + + + + \ No newline at end of file diff --git a/packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk/HelloConstruct.fs b/packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk/HelloConstruct.fs new file mode 100644 index 0000000000000..244fa722abc3a --- /dev/null +++ b/packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk/HelloConstruct.fs @@ -0,0 +1,20 @@ +namespace HelloCdk + +open Amazon.CDK +open Amazon.CDK.AWS.S3 + +type HelloConstructProps = { BucketCount : int } + +type HelloConstruct(parent, id, props) as this = + inherit Construct(parent, id) + + let mutable buckets = List.empty + + do + buckets <- List.init props.BucketCount + (fun i -> Bucket(this, "Bucket" + i.ToString(), BucketProps())) + () + + member public __.GrantRead(principal) = + List.iter + (fun (bucket : Bucket) -> bucket.GrantRead(principal, "*")) buckets diff --git a/packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk/HelloStack.fs b/packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk/HelloStack.fs new file mode 100644 index 0000000000000..7a2b374ab6d6c --- /dev/null +++ b/packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk/HelloStack.fs @@ -0,0 +1,21 @@ +namespace HelloCdk + +open HelloCdk + +open System +open Amazon.CDK +open Amazon.CDK.AWS.IAM +open Amazon.CDK.AWS.SNS +open Amazon.CDK.AWS.SQS + +type MyStack(scope, name, props) as this = + inherit Stack(scope, name, props) + + let queue = Queue(this, "MyFirstQueue", QueueProps(VisibilityTimeoutSec = Nullable(300.))) + let topic = Topic(this, "MyFirstTopic", TopicProps(DisplayName = "My First Topic Yeah")) + let hello = HelloConstruct(this, "Buckets", { BucketCount = 5 }) + let user = User(this, "MyUser", UserProps()) + + do + topic.SubscribeQueue(queue) |> ignore + hello.GrantRead(user) diff --git a/packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk/Program.fs b/packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk/Program.fs new file mode 100644 index 0000000000000..c1dd2660f020f --- /dev/null +++ b/packages/aws-cdk/lib/init-templates/app/fsharp/src/HelloCdk/Program.fs @@ -0,0 +1,10 @@ +open Amazon.CDK +open HelloCdk + +[] +let main _ = + let app = App() + MyStack(app, "hello-cdk-1", StackProps()) |> ignore + MyStack(app, "hello-cdk-2", StackProps()) |> ignore + app.Run() + 0 diff --git a/packages/aws-cdk/tsconfig.json b/packages/aws-cdk/tsconfig.json index d501742da728f..0c02dab2c6a45 100644 --- a/packages/aws-cdk/tsconfig.json +++ b/packages/aws-cdk/tsconfig.json @@ -26,7 +26,8 @@ "lib/init-templates/**/*" ], "files": [ - "lib/init-templates/app/csharp/add-project.hook.ts" + "lib/init-templates/app/csharp/add-project.hook.ts", + "lib/init-templates/app/fsharp/add-project.hook.ts" ] }