Restructured the whole solution to leverage interfaces.

Author: Gijsreyn

.vscode/launch.json

@@ -0,0 +1,22 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Extension (HTTP)",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "Build Solution",
+      "program": "${workspaceFolder}/src/bin/Debug/databricks-extension",
+      "args": [
+        "--http",
+        "5001"
+      ],
+      "cwd": "${workspaceFolder}",
+      "env": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "stopAtEntry": false,
+      "console": "internalConsole"
+    }
+  ]
+}

.vscode/tasks.json

@@ -0,0 +1,17 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Build Solution",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "build",
+        "${workspaceFolder}",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    }
+  ]
+}

CHANGELOG.md

@@ -1,6 +1,12 @@
 <!-- markdownlint-disable MD024 -->
 # Changelog
 
+## [0.1.7] - 2025-08-14
+
+### Changed
+
+- Restructured the whole solution to leverage interfaces.
+
 ## [0.1.6] - 2025-08-10
 
 ### Added

bicepconfig.json

@@ -11,7 +11,7 @@
     "currentProfile": "AzureCloud"
   },
   "extensions": {
-    "databricksExtension": "br:acrdbtextension.azurecr.io/extension/databricks:v0.1.6"
+    "databricksExtension": "./output/databricks-extension"
   },
   "implicitExtensions": []
 }

examples/compute/cluster.basic.bicep

@@ -14,7 +14,6 @@ resource cluster 'Cluster' = {
     maxWorkers: 8
   }
   nodeTypeId: 'Standard_DS3_v2'
-
 }
 
 output clusterName string = cluster.clusterName

examples/workspace/repo.basic.bicep

@@ -11,8 +11,8 @@ extension databricksExtension with {
 }
 
 resource gitRepo 'Repo' = {
-  provider: 'GitHub'
-  url: 'https://github.com/Azure/bicep'
+  provider: 'gitHub'
+  url: 'https://github.com/Gijsreyn/bicep-ext-databricks'
   branch: 'main'
 }
 

src/Handlers/BaseHandler.cs

@@ -1,8 +1,8 @@
-using Azure.Identity;
 using Bicep.Local.Extension.Host.Handlers;
 using Microsoft.Azure.Databricks.Client;
-using System.Net.Http.Headers;
-using System.Text;
+using Microsoft.Extensions.Logging;
+using Bicep.Extension.Databricks.Services;
+using System.Net.Http;
 using System.Text.Json;
 
 namespace Bicep.Extension.Databricks.Handlers;
@@ -11,121 +11,30 @@ public abstract class BaseHandler<TResource, TIdentifiers> : TypedResourceHandle
     where TResource : class, TIdentifiers
     where TIdentifiers : class
 {
-    private DatabricksClient? _databricksClient;
-    private readonly HttpClient _httpClient;
+    protected readonly ILogger _logger;
+    private readonly IDatabricksClientFactory _factory;
 
-    protected BaseHandler()
+    protected BaseHandler(IDatabricksClientFactory factory, ILogger logger)
     {
-        _httpClient = new HttpClient();
+        _factory = factory;
+        _logger = logger;
     }
 
-    private async Task<string> GetAccessTokenAsync(CancellationToken cancellationToken)
-    {
-        var envToken = Environment.GetEnvironmentVariable("DATABRICKS_ACCESS_TOKEN");
-        if (!string.IsNullOrEmpty(envToken))
-        {
-            Console.WriteLine("[TRACE] Using DATABRICKS_ACCESS_TOKEN from environment variable");
-            return envToken;
-        }
-        else
-        {
-            Console.WriteLine("[TRACE] Getting token using DefaultAzureCredential");
-            var credential = new DefaultAzureCredential();
-            var tokenResponse = await credential.GetTokenAsync(
-                new Azure.Core.TokenRequestContext(["2ff814a6-3304-4ab8-85cb-cd0e6f879c1d/.default"]),
-                cancellationToken);
-            return tokenResponse.Token;
-        }
-    }
-
-    private async Task<DatabricksClient> GetDatabricksClient(ResourceRequest request, CancellationToken cancellationToken)
-    {
-        if (_databricksClient != null)
-        {
-            return _databricksClient;
-        }
-
-        var accessToken = await GetAccessTokenAsync(cancellationToken);
+    protected Task<DatabricksClient> GetClientAsync(string workspaceUrl, CancellationToken ct, int? timeoutSeconds = null)
+        => _factory.GetClientAsync(workspaceUrl, ct, timeoutSeconds);
 
-        var baseUrl = request.Config.WorkspaceUrl.TrimEnd('/');
-        Console.WriteLine($"[TRACE] Creating DatabricksClient for workspace: {baseUrl}");
-        
-        _databricksClient = DatabricksClient.CreateClient(baseUrl, accessToken);
-        return _databricksClient;
-    }
-
-    protected async Task<DatabricksClient> GetClientAsync(ResourceRequest request, CancellationToken cancellationToken)
+    protected async Task<T?> CallDatabricksApiForResponse<T>(string workspaceUrl, HttpMethod method, string relativePath, CancellationToken ct, object? payload = null, int? timeoutSeconds = null)
     {
-        return await GetDatabricksClient(request, cancellationToken);
-    }
-
-    protected async Task<string> CallDatabricksApiForResponse(
-        ResourceRequest request,
-        string apiPath,
-        object requestBody,
-        CancellationToken cancellationToken)
-    {
-        var accessToken = await GetAccessTokenAsync(cancellationToken);
-
-        _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
-
-        var databricksUrl = request.Config.WorkspaceUrl.TrimEnd('/');
-        var endpoint = $"{databricksUrl}{apiPath}";
-
-        var json = JsonSerializer.Serialize(requestBody, new JsonSerializerOptions
-        {
-            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-            DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull
-        });
-
-        var content = new StringContent(json, Encoding.UTF8, "application/json");
-
-        HttpResponseMessage response;
-        if (string.IsNullOrEmpty(json) || json == "{}")
-        {
-            // For GET requests or requests with empty body, use GET method
-            response = await _httpClient.GetAsync(endpoint, cancellationToken);
-        }
-        else
-        {
-            // For requests with payload, use POST method
-            response = await _httpClient.PostAsync(endpoint, content, cancellationToken);
-        }
-
-        var responseContent = await response.Content.ReadAsStringAsync(cancellationToken);
-
+        var response = await (_factory as IDatabricksClientFactory).CallApiAsync(workspaceUrl, method, relativePath, ct, payload, timeoutSeconds);
         if (!response.IsSuccessStatusCode)
         {
-            throw new InvalidOperationException($"Failed to call Databricks API {apiPath}. Status: {response.StatusCode}, Error: {responseContent}");
+            var body = await response.Content.ReadAsStringAsync(ct);
+            throw new InvalidOperationException($"Databricks API call failed: {(int)response.StatusCode} {response.ReasonPhrase} Body={body}");
         }
-
-        return responseContent;
+        if (typeof(T) == typeof(object) || response.Content.Headers.ContentLength == 0)
+            return default;
+        var json = await response.Content.ReadAsStringAsync(ct);
+        return JsonSerializer.Deserialize<T>(json, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
     }
 
-    protected async Task<ResourceResponse> CallDatabricksApi(
-        ResourceRequest request,
-        string apiPath,
-        object requestBody,
-        CancellationToken cancellationToken)
-    {
-        // Call the API and get the response content
-        await CallDatabricksApiForResponse(request, apiPath, requestBody, cancellationToken);
-
-        return GetResponse(request);
-    }
-
-    protected ResourceResponse CreateResourceResponse<TDatabricksResult>(
-        TDatabricksResult databricksResult, 
-        string resourceType,
-        Func<TDatabricksResult, TIdentifiers> createIdentifiers,
-        Func<TDatabricksResult, TResource> createResource)
-    {
-        return new ResourceResponse
-        {
-            Type = resourceType,
-            ApiVersion = "2.0",
-            Identifiers = createIdentifiers(databricksResult),
-            Properties = createResource(databricksResult)
-        };
-    }
 }