chore: append task option at the end of script

Author: bednar

influxdb_client/client/tasks_api.py

@@ -64,11 +64,7 @@ def _create_task(name: str, flux: str, every, cron, org_id: str) -> Task:
             repetition += "cron: "
             repetition += '"' + cron + '"'
 
-        from_index = flux.index("from")
-        flux_with_options = \
-            flux[0:from_index] + \
-            'option task = {{name: "{}", {}}} \n\n'.format(name, repetition) + \
-            flux[from_index:]
+        flux_with_options = '{} \n\noption task = {{name: "{}", {}}}'.format(flux, name, repetition)
         task.flux = flux_with_options
 
         return task

tests/test_TasksApi.py

@@ -121,7 +121,7 @@ def test_create_task_every(self):
         self.assertEqual(task.status, "active")
         self.assertEqual(task.every, "1h")
         self.assertEqual(task.cron, None)
-        self.assertTrue(task.flux.endswith(TASK_FLUX))
+        self.assertTrue(task.flux.startswith(TASK_FLUX))
 
     def test_create_task_cron(self):
         task_name = self.generate_name("it task")
@@ -137,7 +137,7 @@ def test_create_task_cron(self):
         self.assertEqual(task.cron, "0 2 * * *")
         # self.assertEqualIgnoringWhitespace(task.flux, flux)
 
-        self.assertTrue(task.flux.endswith(TASK_FLUX))
+        self.assertTrue(task.flux.startswith(TASK_FLUX))
         # self.assertEqual(task.links, "active")
 
         links = task.links
@@ -165,8 +165,8 @@ def test_create_with_import(self):
         self.assertEqual(task.org_id, self.organization.id)
         self.assertEqual(task.status, "active")
         self.assertEqual(task.cron, "10 0 * * * *")
-        self.assertTrue(task.flux.startswith('import "http"\n\noption task = '))
-        self.assertTrue(task.flux.endswith('    |> aggregateWindow(every: 1h, fn: mean)'))
+        self.assertTrue(task.flux.startswith(task_flux))
+        self.assertTrue(task.flux.splitlines()[-1].startswith('option task = '))
 
     def test_find_task_by_id(self):
         task_name = self.generate_name("it task")
@@ -199,12 +199,12 @@ def test_update_task(self):
         cron_task = self.tasks_api.create_task_cron(task_name, TASK_FLUX, "0 2 * * *", self.organization.id)
 
         flux = '''
+        {flux}
+        
         option task = {{
             name: "{task_name}",
             every: 3m
         }}
-        
-        {flux}
         '''.format(task_name=task_name, flux=TASK_FLUX)
 
         cron_task.cron = None