feat(import): Add integration tests and template project for csharp

cdk8s-team · Sep 19, 2024 · 8f7576e · 8f7576e
1 parent c4441bb
commit 8f7576e
Show file tree

Hide file tree

Showing 12 changed files with 129 additions and 3 deletions.
diff --git a/.projen/tasks.json b/.projen/tasks.json
diff --git a/package.json b/package.json
diff --git a/src/cli/cmds/import.ts b/src/cli/cmds/import.ts
@@ -7,7 +7,7 @@ import { parseImports } from '../../util';
 const config = readConfigSync();
 
 const DEFAULT_OUTDIR = 'imports';
-const LANGUAGES = ['dotnet', 'typescript', 'python', 'java', 'go'];
+const LANGUAGES = ['csharp', 'typescript', 'python', 'java', 'go'];
 
 class Command implements yargs.CommandModule {
   public readonly command = 'import [SPEC]';

diff --git a/src/import/base.ts b/src/import/base.ts
@@ -7,7 +7,7 @@ import { mkdtemp } from '../util';
 export enum Language {
   TYPESCRIPT = 'typescript',
   PYTHON = 'python',
-  DOTNET = 'dotnet',
+  CSHARP = 'csharp',
   JAVA = 'java',
   GO = 'go',
 }
@@ -146,7 +146,7 @@ export abstract class ImportBase {
           }
 
           // csharp!
-          if (options.targetLanguage === Language.DOTNET) {
+          if (options.targetLanguage === Language.CSHARP) {
             const csharpName = module.name.replace(/\//g, '.').replace(/-/g, '_').replace(/(?:^|_)([a-z])/g, (_, char) => char.toUpperCase());
             opts.csharp = {
               outdir: outdir,

diff --git a/templates/csharp-app/MyApp/Cdk8s.Imports/Cdk8s.Imports.esproj b/templates/csharp-app/MyApp/Cdk8s.Imports/Cdk8s.Imports.esproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.VisualStudio.JavaScript.Sdk/1.0.586930">
+
+    <PropertyGroup>
+        <BuildCommand>npm run import</BuildCommand>
+        <SolutionPath>$(SolutionDir)Strive.Platform.Automation.sln</SolutionPath>
+    </PropertyGroup>
+
+    <Target Name="RemoveProjectsFromSolution" BeforeTargets="Build">
+        <ItemGroup>
+            <ProjectFiles Include="$(SolutionDir)Imports\Imports.*\**\*.csproj" />
+        </ItemGroup>
+
+        <Exec Command="dotnet sln $(SolutionPath) remove @(ProjectFiles -> '&quot;%(FullPath)&quot;', ' ')" />
+    </Target>
+
+    <Target Name="AddProjectsToSolution" AfterTargets="Build">
+        <ItemGroup>
+            <ProjectFiles Include="$(SolutionDir)Imports\Imports.*\**\*.csproj" />
+        </ItemGroup>
+
+        <Exec Command="dotnet sln $(SolutionPath) add @(ProjectFiles -> '&quot;%(FullPath)&quot;', ' ')" />
+    </Target>
+
+</Project>
diff --git a/templates/csharp-app/MyApp/Cdk8s.Imports/cdk8s.yaml b/templates/csharp-app/MyApp/Cdk8s.Imports/cdk8s.yaml
@@ -0,0 +1,3 @@
+language: csharp
+imports:
+  - k8s
diff --git a/templates/csharp-app/MyApp/Cdk8s.Imports/package.json b/templates/csharp-app/MyApp/Cdk8s.Imports/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "imports",
+  "version": "0.0.1",
+  "private": true,
+  "scripts": {
+    "import": "cdk8s import -o ../Imports"
+  },
+  "dependencies": {
+    "cdk8s-cli": "{{ cdk8s_cli_spec }}"
+  }
+}
diff --git a/templates/csharp-app/MyApp/Imports/.gitkeep b/templates/csharp-app/MyApp/Imports/.gitkeep
diff --git a/templates/csharp-app/MyApp/MyApp.sln b/templates/csharp-app/MyApp/MyApp.sln
@@ -0,0 +1,23 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+#
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyApp", "MyApp\MyApp.csproj", "{D0E5713E-D58F-482D-92C0-504C9AB84DD5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cdk8s.Imports", "Cdk8s.Imports\Cdk8s.Imports.esproj", "{5337F2AB-8B52-48F8-9AA5-0DC7CEFAF8A4}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D0E5713E-D58F-482D-92C0-504C9AB84DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0E5713E-D58F-482D-92C0-504C9AB84DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0E5713E-D58F-482D-92C0-504C9AB84DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0E5713E-D58F-482D-92C0-504C9AB84DD5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5337F2AB-8B52-48F8-9AA5-0DC7CEFAF8A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5337F2AB-8B52-48F8-9AA5-0DC7CEFAF8A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5337F2AB-8B52-48F8-9AA5-0DC7CEFAF8A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5337F2AB-8B52-48F8-9AA5-0DC7CEFAF8A4}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
+
diff --git a/templates/csharp-app/MyApp/MyApp/MyApp.csproj b/templates/csharp-app/MyApp/MyApp/MyApp.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Imports\Imports.*\**\*.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Org.Cdk8s" Version="{{ cdk8s_core_version }}" />
+    </ItemGroup>
+
+</Project>
diff --git a/templates/csharp-app/MyApp/MyApp/Program.cs b/templates/csharp-app/MyApp/MyApp/Program.cs
@@ -0,0 +1,9 @@
+using Constructs;
+using Org.Cdk8s;
+
+var app = new App();
+_ = new Main(app, "{{ $base }}");
+
+app.Synth();
+
+public class Main(Construct scope, string id, IChartProps? props = null) : Chart(scope, id, props);
diff --git a/test/integ/init.test.ts b/test/integ/init.test.ts
@@ -41,6 +41,10 @@ test('python-app-npm', () => {
   init('python-app', cliNpmdir);
 });
 
+test('csharp-app-npm', () => {
+  init('csharp-app', cliNpmdir);
+});
+
 test('typescript-app-yarn', () => {
   init('typescript-app', cliYarndir);
 });
@@ -57,6 +61,10 @@ test('python-app-yarn', () => {
   init('python-app', cliYarndir);
 });
 
+test('csharp-app-yarn', () => {
+  init('csharp-app', cliYarndir);
+});
+
 function init(template: string, clidir: string) {
 
   const workdir = mkdtempSync(join(tmpdir(), 'cdk8s-init-test-'));