fix: update Java pipeline project to resolve sample issues

aws · May 13, 2022 · c8592fc · c8592fc
1 parent 061dcff
commit c8592fc
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 20 deletions.
diff --git a/e2e-tests/test/pdk-pipeline-py-e2e.test.ts b/e2e-tests/test/pdk-pipeline-py-e2e.test.ts
@@ -16,7 +16,7 @@ describe('pdk-pipeline-py E2E Tests', () => {
       // https://github.com/projen/projen/blob/e5899dd04a575209424a08fe90bde99e07ac6c7b/src/common.ts#L5
       process.env.NODE_ENV='_test';
 
-      execSync('npx projen new --from aws-prototyping-sdk pdk-pipeline-py --no-git', {
+      execSync('npx projen new --from aws-prototyping-sdk pdk-pipeline-py --no-git --module-name=e2e_python', {
         cwd: tempFolder,
         env: process.env, // This is important to make sure we use the local registry!
         stdio: 'inherit',

diff --git a/packages/aws-prototyping-sdk/src/index.ts b/packages/aws-prototyping-sdk/src/index.ts
@@ -1,5 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-export * as pdk_pipeline from "./pdk_pipeline";
-export * as pdk_projen from "./pdk_projen";
+export class Hello {
+  public sayHello() {
+    return "hello, world!";
+  }
+}
diff --git a/packages/aws-prototyping-sdk/src/pdk_projen/pdk_pipeline_java/pdk-pipeline-java-project.ts b/packages/aws-prototyping-sdk/src/pdk_projen/pdk_pipeline_java/pdk-pipeline-java-project.ts
@@ -22,9 +22,9 @@ export class PDKPipelineJavaProject extends AwsCdkJavaApp {
       junit: false,
       ...options,
       mainClass:
-        options.mainClass ||
-        'software.aws.Pipeline -Dexec.classpathScope="test"',
-      cdkVersion: options.cdkVersion || "2.0.0",
+        options.mainClass !== "org.acme.MyApp"
+          ? options.mainClass
+          : 'software.aws.Pipeline -Dexec.classpathScope="test"',
     });
 
     this.addDependency("software.aws.awsprototypingsdk/aws-prototyping-sdk@^0");
@@ -33,16 +33,48 @@ export class PDKPipelineJavaProject extends AwsCdkJavaApp {
     this.addTestDependency("org.junit.jupiter/junit-jupiter-api@5.7.0");
     this.addTestDependency("org.junit.jupiter/junit-jupiter-engine@5.7.0");
 
-    new SampleDir(this, "src", {
-      sourceDir: path.join(
-        __dirname,
-        "..",
-        "..",
-        "..",
-        "samples",
-        "sample-pdk-pipeline-java",
-        "src"
-      ),
-    });
+    const mainPackage = this.mainClass
+      .split(" ")[0]
+      .split(".")
+      .slice(0, -1)
+      .join(".");
+    new SampleDir(
+      this,
+      path.join("src", "main", "java", ...mainPackage.split(".")),
+      {
+        sourceDir: path.join(
+          __dirname,
+          "..",
+          "..",
+          "..",
+          "samples",
+          "sample-pdk-pipeline-java",
+          "src",
+          "main",
+          "java",
+          "software",
+          "aws"
+        ),
+      }
+    );
+    new SampleDir(
+      this,
+      path.join("src", "test", "java", ...mainPackage.split(".")),
+      {
+        sourceDir: path.join(
+          __dirname,
+          "..",
+          "..",
+          "..",
+          "samples",
+          "sample-pdk-pipeline-java",
+          "src",
+          "test",
+          "java",
+          "software",
+          "aws"
+        ),
+      }
+    );
   }
 }
diff --git a/packages/aws-prototyping-sdk/src/pdk_projen/pdk_pipeline_py/pdk-pipeline-py-project.ts b/packages/aws-prototyping-sdk/src/pdk_projen/pdk_pipeline_py/pdk-pipeline-py-project.ts
@@ -25,7 +25,6 @@ export class PDKPipelinePyProject extends AwsCdkPythonApp {
       ...options,
       appEntrypoint:
         options.appEntrypoint || `${options.moduleName}/pipeline.py`,
-      cdkVersion: options.cdkVersion || "2.0.0",
     });
 
     ["aws-prototyping-sdk", "pyhumps"].forEach((dep) =>

diff --git a/packages/aws-prototyping-sdk/src/pdk_projen/pdk_pipeline_ts/pdk-pipeline-ts-project.ts b/packages/aws-prototyping-sdk/src/pdk_projen/pdk_pipeline_ts/pdk-pipeline-ts-project.ts
@@ -30,7 +30,6 @@ export class PDKPipelineTsProject extends AwsCdkTypeScriptApp {
       sampleCode: false,
       ...options,
       appEntrypoint: options.appEntrypoint || "pipeline.ts",
-      cdkVersion: options.cdkVersion || "2.0.0",
     });
 
     this.addDeps("aws-prototyping-sdk");

diff --git a/packages/aws-prototyping-sdk/test/hello.test.ts b/packages/aws-prototyping-sdk/test/hello.test.ts
@@ -0,0 +1,8 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { Hello } from "../src";
+
+test("hello", () => {
+  expect(new Hello().sayHello()).toBe("hello, world!");
+});
diff --git a/samples/sample-pdk-pipeline-py/tests/test_example.py b/samples/sample-pdk-pipeline-py/tests/test_example.py
@@ -0,0 +1,15 @@
+import pytest
+
+from infra.example import hello
+
+@pytest.mark.parametrize(
+    ("name", "expected"),
+    [
+        ("A. Musing", "Hello A. Musing!"),
+        ("traveler", "Hello traveler!"),
+        ("projen developer", "Hello projen developer!"),
+    ],
+)
+def test_hello(name, expected):
+    """Example test with parametrization."""
+    assert hello(name) == expected
diff --git a/yarn.lock b/yarn.lock