some fixes

godatadriven · Dec 17, 2024 · 0c96744 · 0c96744
1 parent b0f2679
commit 0c96744
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/aws-lambda/src/databricks_cdk/resources/handler.py b/aws-lambda/src/databricks_cdk/resources/handler.py
@@ -2,7 +2,7 @@
 from typing import Optional
 
 import cfnresponse
-from databricks_cdk.resources.service_principals.secrets import create_or_update_service_principal_secrets, delete_service_principal_secrets
+from databricks_cdk.resources.service_principals.service_principal_secrets import ServicePrincipalSecretsProperties, create_or_update_service_principal_secrets, delete_service_principal_secrets
 from pydantic import BaseModel, ValidationError
 
 from databricks_cdk.resources.account.credentials import (
@@ -231,7 +231,7 @@ def create_or_update_resource(event: DatabricksEvent) -> CnfResponse:
         return create_or_update_service_principal(ServicePrincipalProperties(**event.ResourceProperties))
     elif action == "service-principal-secrets":
         return create_or_update_service_principal_secrets(
-            ServicePrincipalProperties(**event.ResourceProperties), event.PhysicalResourceId,
+            ServicePrincipalSecretsProperties(**event.ResourceProperties), event.PhysicalResourceId,
         )
     else:
         raise RuntimeError(f"Unknown action: {action}")
@@ -343,7 +343,7 @@ def delete_resource(event: DatabricksEvent) -> CnfResponse:
         )
     elif action == "service-principal-secrets":
         return delete_service_principal_secrets(
-            ServicePrincipalProperties(**event.ResourceProperties), event.PhysicalResourceId
+            ServicePrincipalSecretsProperties(**event.ResourceProperties), event.PhysicalResourceId
         )
     else:
         raise RuntimeError(f"Unknown action: {action}")

diff --git a/...k/resources/service_principals/secrets.py → ...e_principals/service_principal_secrets.py b/...k/resources/service_principals/secrets.py → ...e_principals/service_principal_secrets.py
diff --git a/...ources/service_principals/test_secrets.py → ...ncipals/test_service_principal_secrets.py b/...ources/service_principals/test_secrets.py → ...ncipals/test_service_principal_secrets.py
@@ -4,7 +4,7 @@
 from databricks.sdk.errors import NotFound
 from databricks.sdk.service.oauth2 import SecretInfo, CreateServicePrincipalSecretResponse
 
-from databricks_cdk.resources.service_principals.secrets import (
+from databricks_cdk.resources.service_principals.service_principal_secrets import (
     ServicePrincipalSecretsCreationError,
     ServicePrincipalSecretsProperties,
     create_service_principal_secrets,

diff --git a/typescript/src/resources/service-principals/servicePrincipal.ts b/typescript/src/resources/service-principals/servicePrincipal.ts
@@ -38,4 +38,12 @@ export class ServicePrincipal extends CustomResource {
             }
         });
     }
+
+    public servicePrincipalId(): string {
+        return this.getAttString("physical_resource_id");
+    }
+
+    public servicePrincipalName(): string {
+        return this.getAttString("name");
+    }
 }
diff --git a/typescript/src/resources/service-principals/servicePrincipalSecrets.ts b/typescript/src/resources/service-principals/servicePrincipalSecrets.ts
@@ -3,7 +3,7 @@ import { Construct } from "constructs";
 
 
 export interface ServicePrincipalSecretsProperties {
-    service_principal_id: number
+    service_principal_id: string
 }
 
 export interface ServicePrincipalSecretsProps extends ServicePrincipalSecretsProperties {