DTS Support

azuremanaged/build.gradle

@@ -16,7 +16,7 @@ plugins {
 
 archivesBaseName = 'durabletask-azuremanaged'
 group 'com.microsoft'
-version = '1.5.0'
+version = '1.5.0-preview.1'
 
 def grpcVersion = '1.59.0'
 def azureCoreVersion = '1.45.0'

azuremanaged/src/main/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerClientExtensions.java

@@ -22,18 +22,16 @@ private DurableTaskSchedulerClientExtensions() {}
      * 
      * @param builder The builder to configure.
      * @param connectionString The connection string for Azure-managed Durable Task Scheduler.
-     * @param tokenCredential The token credential for authentication, or null to use connection string credentials.
      * @throws NullPointerException if builder or connectionString is null
      */
     public static void useDurableTaskScheduler(
             DurableTaskGrpcClientBuilder builder,
-            String connectionString,
-            @Nullable TokenCredential tokenCredential) {
+            String connectionString) {
         Objects.requireNonNull(builder, "builder must not be null");
         Objects.requireNonNull(connectionString, "connectionString must not be null");
 
         configureBuilder(builder, 
-            DurableTaskSchedulerClientOptions.fromConnectionString(connectionString, tokenCredential));
+            DurableTaskSchedulerClientOptions.fromConnectionString(connectionString));
     }
 
     /**
@@ -64,16 +62,14 @@ public static void useDurableTaskScheduler(
      * Creates a DurableTaskGrpcClientBuilder configured for Azure-managed Durable Task Scheduler using a connection string.
      * 
      * @param connectionString The connection string for Azure-managed Durable Task Scheduler.
-     * @param tokenCredential The token credential for authentication, or null to use connection string credentials.
      * @return A new configured DurableTaskGrpcClientBuilder instance.
      * @throws NullPointerException if connectionString is null
      */
     public static DurableTaskGrpcClientBuilder createClientBuilder(
-            String connectionString,
-            @Nullable TokenCredential tokenCredential) {
+            String connectionString) {
         Objects.requireNonNull(connectionString, "connectionString must not be null");
         return createBuilderFromOptions(
-            DurableTaskSchedulerClientOptions.fromConnectionString(connectionString, tokenCredential));
+            DurableTaskSchedulerClientOptions.fromConnectionString(connectionString));
     }
 
     /**

azuremanaged/src/main/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerClientOptions.java

@@ -6,7 +6,6 @@
 import com.azure.core.credential.TokenCredential;
 import com.azure.core.credential.TokenRequestContext;
 import io.grpc.*;
-import javax.annotation.Nullable;
 import java.net.MalformedURLException;
 import java.time.Duration;
 import java.util.Objects;
@@ -34,12 +33,11 @@ public DurableTaskSchedulerClientOptions() {
      * Creates a new instance of DurableTaskSchedulerClientOptions from a connection string.
      * 
      * @param connectionString The connection string to parse.
-     * @param credential The credential to use for authentication. It is nullable for anonymous access.
      * @return A new DurableTaskSchedulerClientOptions object.
      */
-    public static DurableTaskSchedulerClientOptions fromConnectionString(String connectionString, @Nullable TokenCredential credential) {
+    public static DurableTaskSchedulerClientOptions fromConnectionString(String connectionString) {
         DurableTaskSchedulerConnectionString parsedConnectionString = new DurableTaskSchedulerConnectionString(connectionString);
-        return fromConnectionString(parsedConnectionString, credential);
+        return fromConnectionString(parsedConnectionString);
     }
 
     /**
@@ -48,13 +46,13 @@ public static DurableTaskSchedulerClientOptions fromConnectionString(String conn
      * @param connectionString The parsed connection string.
      * @return A new DurableTaskSchedulerClientOptions object.
      */
-    static DurableTaskSchedulerClientOptions fromConnectionString(DurableTaskSchedulerConnectionString connectionString, @Nullable TokenCredential credential) {
+    static DurableTaskSchedulerClientOptions fromConnectionString(DurableTaskSchedulerConnectionString connectionString) {
         // TODO: Parse different credential types from connection string
         DurableTaskSchedulerClientOptions options = new DurableTaskSchedulerClientOptions();
         options.setEndpointAddress(connectionString.getEndpoint());
         options.setTaskHubName(connectionString.getTaskHubName());
-        options.setCredential(credential);
-        options.setAllowInsecureCredentials(credential == null);
+        options.setCredential(connectionString.getCredential());
+        options.setAllowInsecureCredentials(options.getCredential() == null);
         return options;
     }
 
@@ -178,16 +176,6 @@ public DurableTaskSchedulerClientOptions setTokenRefreshMargin(Duration tokenRef
         return this;
     }
 
-    /**
-     * Validates that the options are properly configured.
-     * 
-     * @throws IllegalArgumentException If the options are not properly configured.
-     */
-    public void validate() {
-        Objects.requireNonNull(endpointAddress, "endpointAddress must not be null");
-        Objects.requireNonNull(taskHubName, "taskHubName must not be null");
-    }
-
     /**
      * Creates a gRPC channel using the configured options.
      * 

azuremanaged/src/main/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerConnectionString.java

@@ -8,6 +8,16 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nullable;
+
+import com.azure.core.credential.TokenCredential;
+import com.azure.identity.AzureCliCredentialBuilder;
+import com.azure.identity.AzurePowerShellCredentialBuilder;
+import com.azure.identity.DefaultAzureCredentialBuilder;
+import com.azure.identity.EnvironmentCredentialBuilder;
+import com.azure.identity.ManagedIdentityCredentialBuilder;
+import com.azure.identity.WorkloadIdentityCredentialBuilder;
+
 /**
  * Represents the constituent parts of a connection string for a Durable Task Scheduler service.
  */
@@ -27,9 +37,9 @@ public DurableTaskSchedulerConnectionString(String connectionString) {
         this.properties = parseConnectionString(connectionString);
 
         // Validate required properties
-        getRequiredValue("Endpoint");
-        getRequiredValue("Authentication");
-        getRequiredValue("TaskHub");
+        this.getAuthentication();
+        this.getTaskHubName();
+        this.getEndpoint();
     }
 
     /**
@@ -127,4 +137,54 @@ private static Map<String, String> parseConnectionString(String connectionString
 
         return properties;
     }
+
+    /**
+     * Gets a TokenCredential based on the authentication type specified in the connection string.
+     * 
+     * @return A TokenCredential instance based on the specified authentication type, or null if authentication type is "none".
+     * @throws IllegalArgumentException If the connection string contains an unsupported authentication type.
+     */
+    public @Nullable TokenCredential getCredential() {
+        String authType = getAuthentication();
+
+        // Parse the supported auth types in a case-insensitive way
+        switch (authType.toLowerCase().trim()) {
+            case "defaultazure":
+                return new DefaultAzureCredentialBuilder().build();
+            case "managedidentity":
+                return new ManagedIdentityCredentialBuilder().clientId(getClientId()).build();
+            case "workloadidentity":
+                WorkloadIdentityCredentialBuilder builder = new WorkloadIdentityCredentialBuilder();
+                if (getClientId() != null && !getClientId().isEmpty()) {
+                    builder.clientId(getClientId());
+                }
+
+                if (getTenantId() != null && !getTenantId().isEmpty()) {
+                    builder.tenantId(getTenantId());
+                }
+
+                if (getTokenFilePath() != null && !getTokenFilePath().isEmpty()) {
+                    builder.tokenFilePath(getTokenFilePath());
+                }
+
+                if (getAdditionallyAllowedTenants() != null) {
+                    for (String tenant : getAdditionallyAllowedTenants()) {
+                        builder.additionallyAllowedTenants(tenant);
+                    }
+                }
+
+                return builder.build();
+            case "environment":
+                return new EnvironmentCredentialBuilder().build();
+            case "azurecli":
+                return new AzureCliCredentialBuilder().build();
+            case "azurepowershell":
+                return new AzurePowerShellCredentialBuilder().build();
+            case "none":
+                return null;
+            default:
+                throw new IllegalArgumentException(
+                    String.format("The connection string contains an unsupported authentication type '%s'.", authType));
+        }
+    }
 } 

azuremanaged/src/main/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerWorkerExtensions.java

@@ -22,18 +22,16 @@ private DurableTaskSchedulerWorkerExtensions() {}
      * 
      * @param builder The builder to configure.
      * @param connectionString The connection string for Azure-managed Durable Task Scheduler.
-     * @param tokenCredential The token credential for authentication, or null to use connection string credentials.
      * @throws NullPointerException if builder or connectionString is null
      */
     public static void useDurableTaskScheduler(
             DurableTaskGrpcWorkerBuilder builder,
-            String connectionString,
-            @Nullable TokenCredential tokenCredential) {
+            String connectionString) {
         Objects.requireNonNull(builder, "builder must not be null");
         Objects.requireNonNull(connectionString, "connectionString must not be null");
 
         configureBuilder(builder, 
-            DurableTaskSchedulerWorkerOptions.fromConnectionString(connectionString, tokenCredential));
+            DurableTaskSchedulerWorkerOptions.fromConnectionString(connectionString));
     }
 
     /**
@@ -64,16 +62,14 @@ public static void useDurableTaskScheduler(
      * Creates a DurableTaskGrpcWorkerBuilder configured for Azure-managed Durable Task Scheduler using a connection string.
      * 
      * @param connectionString The connection string for Azure-managed Durable Task Scheduler.
-     * @param tokenCredential The token credential for authentication, or null to use connection string credentials.
      * @return A new configured DurableTaskGrpcWorkerBuilder instance.
      * @throws NullPointerException if connectionString is null
      */
     public static DurableTaskGrpcWorkerBuilder createWorkerBuilder(
-            String connectionString,
-            @Nullable TokenCredential tokenCredential) {
+            String connectionString) {
         Objects.requireNonNull(connectionString, "connectionString must not be null");
         return createBuilderFromOptions(
-            DurableTaskSchedulerWorkerOptions.fromConnectionString(connectionString, tokenCredential));
+            DurableTaskSchedulerWorkerOptions.fromConnectionString(connectionString));
     }
 
     /**

azuremanaged/src/main/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerWorkerOptions.java

@@ -21,7 +21,6 @@
 import java.util.Objects;
 import java.net.URL;
 import java.net.MalformedURLException;
-import javax.annotation.Nullable;
 
 /**
  * Options for configuring the Durable Task Scheduler worker.
@@ -45,27 +44,25 @@ public DurableTaskSchedulerWorkerOptions() {
      * Creates a new instance of DurableTaskSchedulerWorkerOptions from a connection string.
      * 
      * @param connectionString The connection string to parse.
-     * @param credential The token credential for authentication, or null to use connection string credentials.
      * @return A new DurableTaskSchedulerWorkerOptions object.
      */
-    public static DurableTaskSchedulerWorkerOptions fromConnectionString(String connectionString, @Nullable TokenCredential credential) {
+    public static DurableTaskSchedulerWorkerOptions fromConnectionString(String connectionString) {
         DurableTaskSchedulerConnectionString parsedConnectionString = new DurableTaskSchedulerConnectionString(connectionString);
-        return fromConnectionString(parsedConnectionString, credential);
+        return fromConnectionString(parsedConnectionString);
     }
 
     /**
      * Creates a new instance of DurableTaskSchedulerWorkerOptions from a parsed connection string.
      * 
      * @param connectionString The parsed connection string.
-     * @param credential The token credential for authentication, or null to use connection string credentials.
      * @return A new DurableTaskSchedulerWorkerOptions object.
      */
-    static DurableTaskSchedulerWorkerOptions fromConnectionString(DurableTaskSchedulerConnectionString connectionString, @Nullable TokenCredential credential) {
+    static DurableTaskSchedulerWorkerOptions fromConnectionString(DurableTaskSchedulerConnectionString connectionString) {
         DurableTaskSchedulerWorkerOptions options = new DurableTaskSchedulerWorkerOptions();
         options.setEndpointAddress(connectionString.getEndpoint());
         options.setTaskHubName(connectionString.getTaskHubName());
-        options.setCredential(credential);
-        options.setAllowInsecureCredentials(credential == null);
+        options.setCredential(connectionString.getCredential());
+        options.setAllowInsecureCredentials(options.getCredential() == null);
         return options;
     }
 
@@ -189,16 +186,6 @@ public DurableTaskSchedulerWorkerOptions setTokenRefreshMargin(Duration tokenRef
         return this;
     }
 
-    /**
-     * Validates that the options are properly configured.
-     * 
-     * @throws IllegalArgumentException If the options are not properly configured.
-     */
-    public void validate() {
-        Objects.requireNonNull(endpointAddress, "endpointAddress must not be null");
-        Objects.requireNonNull(taskHubName, "taskHubName must not be null");
-    }
-
     /**
      * Creates a gRPC channel using the configured options.
      * 

azuremanaged/src/test/java/com/microsoft/durabletask/azuremanaged/DurableTaskSchedulerClientExtensionsTest.java

@@ -37,7 +37,7 @@ public void useDurableTaskScheduler_WithConnectionString_ConfiguresBuilder() {
 
         // Act
         DurableTaskSchedulerClientExtensions.useDurableTaskScheduler(
-            mockBuilder, VALID_CONNECTION_STRING, mockCredential);
+            mockBuilder, VALID_CONNECTION_STRING);
 
         // Assert
         verify(mockBuilder).grpcChannel(any(Channel.class));
@@ -49,7 +49,7 @@ public void useDurableTaskScheduler_WithConnectionString_ThrowsForNullBuilder()
         // Act & Assert
         assertThrows(NullPointerException.class, 
             () -> DurableTaskSchedulerClientExtensions.useDurableTaskScheduler(
-                null, VALID_CONNECTION_STRING, mockCredential));
+                null, VALID_CONNECTION_STRING));
     }
 
     @Test
@@ -58,7 +58,7 @@ public void useDurableTaskScheduler_WithConnectionString_ThrowsForNullConnection
         // Act & Assert
         assertThrows(NullPointerException.class, 
             () -> DurableTaskSchedulerClientExtensions.useDurableTaskScheduler(
-                mockBuilder, null, mockCredential));
+                mockBuilder, null));
     }
 
     @Test
@@ -107,7 +107,7 @@ public void useDurableTaskScheduler_WithExplicitParameters_ThrowsForNullTaskHubN
     public void createClientBuilder_WithConnectionString_CreatesValidBuilder() {
         // Act
         DurableTaskGrpcClientBuilder result = 
-            DurableTaskSchedulerClientExtensions.createClientBuilder(VALID_CONNECTION_STRING, mockCredential);
+            DurableTaskSchedulerClientExtensions.createClientBuilder(VALID_CONNECTION_STRING);
 
         // Assert
         assertNotNull(result);
@@ -118,7 +118,7 @@ public void createClientBuilder_WithConnectionString_CreatesValidBuilder() {
     public void createClientBuilder_WithConnectionString_ThrowsForNullConnectionString() {
         // Act & Assert
         assertThrows(NullPointerException.class, 
-            () -> DurableTaskSchedulerClientExtensions.createClientBuilder(null, mockCredential));
+            () -> DurableTaskSchedulerClientExtensions.createClientBuilder(null));
     }
 
     @Test