Merge pull request #13 from DataDog/darcy.rayner/fix-python-handler-generation

Fix python templating errors

Author: DarcyRaynerDD

package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-plugin-datadog",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Serverless plugin to automatically instrument python and node functions with datadog tracing",
   "main": "dist/index.js",
   "repository": "https://github.com/DataDog/serverless-plugin-datadog",

src/templates/python-template.spec.ts

@@ -0,0 +1,20 @@
+import { pythonTemplate } from "./python-template";
+
+describe("pythonTemplate", () => {
+  it("handles nested directories", () => {
+    const result = pythonTemplate("my/file/path", "method");
+    expect(result).toMatchInlineSnapshot(`
+                  "from datadog_lambda.wrapper import datadog_lambda_wrapper
+                  from my.file.path import method as method_impl
+                  method = datadog_lambda_wrapper(method_impl)"
+            `);
+  });
+  it("handles windows directories", () => {
+    const result = pythonTemplate(`my\\file\\path`, "method");
+    expect(result).toMatchInlineSnapshot(`
+      "from datadog_lambda.wrapper import datadog_lambda_wrapper
+      from my.file.path import method as method_impl
+      method = datadog_lambda_wrapper(method_impl)"
+    `);
+  });
+});

src/templates/python-template.ts

@@ -7,7 +7,7 @@
  */
 
 export function pythonTemplate(filePath: string, method: string) {
-  const newPath = filePath.replace("/", ".").replace("\\", ".");
+  const newPath = filePath.split(/\/|\\/).join(".");
   return `from datadog_lambda.wrapper import datadog_lambda_wrapper
 from ${newPath} import ${method} as ${method}_impl
 ${method} = datadog_lambda_wrapper(${method}_impl)`;