solve merge conflict

godatadriven · Nov 27, 2023 · 3918b4a · 3918b4a
2 parents f6c3862 + ebbe764
commit 3918b4a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/aws-lambda/pyproject.toml b/aws-lambda/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "databricks-cdk"
-version = "0.11.18"
+version = "0.11.21"
 description = "Deploying databricks resources from cdk"
 authors = ["Peter van 't Hof' <[email protected]>"]
 

diff --git a/typescript/package-lock.json b/typescript/package-lock.json
diff --git a/typescript/package.json b/typescript/package.json
@@ -1,6 +1,6 @@
 {
     "name": "databricks-cdk",
-    "version": "0.11.18",
+    "version": "0.11.21",
     "license": "MIT",
     "description": "With this package databricks resources can be deployed with cdk",
     "type": "commonjs",

diff --git a/typescript/src/resources/deploy-lambda.ts b/typescript/src/resources/deploy-lambda.ts
@@ -47,6 +47,7 @@ export interface CustomDeployLambdaProps {
     readonly databricksPassParam?: string
     readonly databricksAccountParam?: string
     readonly lambdaCode?: aws_lambda.DockerImageCode
+    readonly lambdaName?: string
 }
 
 export abstract class IDatabricksDeployLambda extends Construct {
@@ -326,8 +327,8 @@ export class DatabricksDeployLambda extends IDatabricksDeployLambda {
             ]
         }));
 
-        this.lambda = new aws_lambda.DockerImageFunction(this, "Lambda", {
-            functionName: "DatabricksDeploy",
+        this.lambda = new aws_lambda.DockerImageFunction(this, `${id}Lambda`, {
+            functionName: this.props.lambdaName,
             code: dockerImageCode,
             timeout: Duration.seconds(300),
             role: this.lambdaRole,

diff --git a/typescript/src/resources/unity-catalog/unityCatalogVolume.ts b/typescript/src/resources/unity-catalog/unityCatalogVolume.ts
@@ -33,7 +33,7 @@ export class UnityCatalogVolume extends CustomResource {
             properties: {
                 action: "volume",
                 workspace_url: props.workspace_url,
-                catalog: props.volume,
+                volume: props.volume,
             }
         });
     }

diff --git a/typescript/tests/resources/unity-catalog/unityCatalogVolume.test.ts b/typescript/tests/resources/unity-catalog/unityCatalogVolume.test.ts
@@ -32,7 +32,7 @@ describe("UnityCatalogVolume", () => {
                 "workspace_url": {
                     "Fn::ImportValue": "databricks-workspace-url"
                 },
-                "catalog": {
+                "volume": {
                     "name": "some-name",
                     "catalog_name": "some-catalog-name",
                     "schema_name": "some-schema-name",