fix: append task option at the end of script (#398)

bednar · web-flow · commit 6ff2648cb598 · 2022-08-22T12:52:31.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ The `percentile()` function renamed to `quantile()`.
 
 ### Bug Fixes
 1. [#390](https://github.com/influxdata/influxdb-client-java/pull/390): Rename `percentile()` function renamed to `quantile()` [FluxDSL]
+1. [#398](https://github.com/influxdata/influxdb-client-java/pull/398): Append `task option` at the end of script
 
 ### Dependencies
 Update dependencies:
diff --git a/client/src/main/java/com/influxdb/client/internal/TasksApiImpl.java b/client/src/main/java/com/influxdb/client/internal/TasksApiImpl.java
@@ -722,10 +722,7 @@ private Task createTask(@Nonnull final String name,
             repetition += "\"" + cron + "\"";
         }
 
-        int fromBegin = flux.indexOf("from");
-        String fluxWithOptions = flux.substring(0, fromBegin)
-                + String.format("option task = {name: \"%s\", %s}\n\n", name, repetition)
-                + flux.substring(fromBegin);
+        String fluxWithOptions = String.format("%s\n\noption task = {name: \"%s\", %s}", flux, name, repetition);
 
         task.setFlux(fluxWithOptions);
 
diff --git a/client/src/test/java/com/influxdb/client/ITTasksApi.java b/client/src/test/java/com/influxdb/client/ITTasksApi.java
@@ -157,7 +157,7 @@ void createTaskEvery() {
         Assertions.assertThat(task.getStatus()).isEqualTo(TaskStatusType.ACTIVE);
         Assertions.assertThat(task.getEvery()).isEqualTo("1h");
         Assertions.assertThat(task.getCron()).isNull();
-        Assertions.assertThat(task.getFlux()).endsWith(TASK_FLUX);
+        Assertions.assertThat(task.getFlux()).startsWith(TASK_FLUX);
     }
 
     @Test
@@ -174,7 +174,7 @@ void createTaskCron() {
         Assertions.assertThat(task.getStatus()).isEqualTo(TaskStatusType.ACTIVE);
         Assertions.assertThat(task.getCron()).isEqualTo("0 2 * * *");
         Assertions.assertThat(task.getEvery()).isNull();
-        Assertions.assertThat(task.getFlux()).endsWith(TASK_FLUX);
+        Assertions.assertThat(task.getFlux()).startsWith(TASK_FLUX);
         Assertions.assertThat(task.getLinks()).isNotNull();
         Assertions.assertThat(task.getLinks().getLogs()).isEqualTo("/api/v2/tasks/" + task.getId() + "/logs");
         Assertions.assertThat(task.getLinks().getMembers()).isEqualTo("/api/v2/tasks/" + task.getId() + "/members");
@@ -341,10 +341,10 @@ void updateTask() {
         String taskName = generateName("it task");
         Task cronTask = tasksApi.createTaskCron(taskName, TASK_FLUX, "0 2 * * *", organization);
 
-        String flux = "option task = {\n"
+        String flux = TASK_FLUX + "\n\noption task = {\n"
                 + "    name: \"" + taskName + "\",\n"
                 + "    every: 3m\n"
-                + "}\n\n" + TASK_FLUX;
+                + "}";
 
         cronTask.setCron(null);
         cronTask.setEvery("3m");
@@ -774,6 +774,27 @@ void cloneTaskNotFound() {
                 .hasMessage("HTTP status code: 404; Message: failed to find task: task not found");
     }
 
+    @Test
+    void createTaskWithMoreFrom() {
+        String name = generateName("it task");
+
+        String flux = "procTotal = from(bucket: \"example-bucket\")\n"
+                + "    |> range(start: -5m)\n"
+                + "    |> filter(fn: (r) => r._measurement == \"processes\" and r._field == \"total\")"
+                + "\n\n"
+                + "procTotal";
+        Task task = tasksApi.createTaskCron(name, flux, "0 2 * * *", organization);
+
+        Assertions.assertThat(task).isNotNull();
+        Assertions.assertThat(task.getId()).isNotBlank();
+        Assertions.assertThat(task.getName()).isEqualTo(name);
+        Assertions.assertThat(task.getOrgID()).isEqualTo(organization.getId());
+        Assertions.assertThat(task.getStatus()).isEqualTo(TaskStatusType.ACTIVE);
+        Assertions.assertThat(task.getCron()).isEqualTo("0 2 * * *");
+        Assertions.assertThat(task.getEvery()).isNull();
+        Assertions.assertThat(task.getFlux()).startsWith(flux);
+    }
+
     @Nonnull
     private Authorization addTasksAuthorization(final Organization organization) {
 

Original file line number	Diff line number	Diff line change
`@@ -722,10 +722,7 @@ private Task createTask(@Nonnull final String name,`
`722`	`722`	`repetition += "\"" + cron + "\"";`
`723`	`723`	`}`
`724`	`724`
`725`		`- int fromBegin = flux.indexOf("from");`
`726`		`- String fluxWithOptions = flux.substring(0, fromBegin)`
`727`		`- + String.format("option task = {name: \"%s\", %s}\n\n", name, repetition)`
`728`		`- + flux.substring(fromBegin);`
	`725`	`+ String fluxWithOptions = String.format("%s\n\noption task = {name: \"%s\", %s}", flux, name, repetition);`
`729`	`726`
`730`	`727`	`task.setFlux(fluxWithOptions);`
`731`	`728`