fix(datafactory): rollback duration to v1 properties

kestra-io · Sep 30, 2024 · 18dbfc3 · 18dbfc3
1 parent 8f3d9e7
commit 18dbfc3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/main/java/io/kestra/plugin/azure/datafactory/AbstractDataFactoryConnection.java b/src/main/java/io/kestra/plugin/azure/datafactory/AbstractDataFactoryConnection.java
@@ -71,7 +71,7 @@ private TokenCredential credentials(RunContext runContext) throws IllegalVariabl
         return new DefaultAzureCredentialBuilder().tenantId(tenantId).build();
     }
 
-    private ClientCertificateCredential getClientCertificateCredential(String clientId, String tenantId, String pemCertificate) {
+    private ClientCertificateCredential getClientCertificateCredential(String tenantId, String clientId, String pemCertificate) {
         return new ClientCertificateCredentialBuilder()
                 .clientId(clientId)
                 .tenantId(tenantId)

diff --git a/src/main/java/io/kestra/plugin/azure/datafactory/CreateRun.java b/src/main/java/io/kestra/plugin/azure/datafactory/CreateRun.java
@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import io.kestra.core.models.annotations.Example;
 import io.kestra.core.models.annotations.Plugin;
+import io.kestra.core.models.annotations.PluginProperty;
 import io.kestra.core.models.executions.metrics.Counter;
 import io.kestra.core.models.executions.metrics.Timer;
 import io.kestra.core.models.property.Property;
@@ -79,8 +80,6 @@
 public class CreateRun extends AbstractDataFactoryConnection implements RunnableTask<CreateRun.Output> {
     private static final String PIPELINE_SUCCEEDED_STATUS = "Succeeded";
     private static final List<String> PIPELINE_FAILED_STATUS = List.of("Failed", "Canceling", "Cancelled");
-    private static final Duration WAIT_UNTIL_COMPLETION = Duration.ofHours(1);
-    private static final Duration COMPLETION_CHECK_INTERVAL = Duration.ofSeconds(5);
 
     @Schema(title = "Factory name")
     private Property<String> factoryName;
@@ -104,6 +103,22 @@ public class CreateRun extends AbstractDataFactoryConnection implements Runnable
     @Builder.Default
     private Property<Boolean> wait = Property.of(Boolean.TRUE);
 
+    @Schema(
+            title = "Wait until completion duration",
+            description = "Maximum duration to wait for the pipeline to resolve. After this time the task will time out"
+    )
+    @PluginProperty
+    @Builder.Default
+    private Duration waitUntilCompletion = Duration.ofHours(1L);
+
+    @Schema(
+            title = "Completion check interval",
+            description = "The frequency with which the task checks whether the pipeline has completed."
+    )
+    @Builder.Default
+    @PluginProperty
+    private final Duration completionCheckInterval = Duration.ofSeconds(5L);
+
     @Override
     public CreateRun.Output run(RunContext runContext) throws Exception {
         Logger logger = runContext.logger();
@@ -154,7 +169,7 @@ public CreateRun.Output run(RunContext runContext) throws Exception {
                 }
 
                 return PIPELINE_SUCCEEDED_STATUS.equals(runStatus);
-            }, COMPLETION_CHECK_INTERVAL, WAIT_UNTIL_COMPLETION);
+            }, completionCheckInterval, waitUntilCompletion);
         } catch (TimeoutException | RuntimeException e) {
             logger.error("Pipeline '{}' with runId '{} finished with status '{}'", pipelineName, runId, runningPipelineResponse.get().status());
             throw new RuntimeException(runningPipelineResponse.get().message());