fix: prevent recursion in task regex (#6639)

influxdata · Mar 3, 2023 · 022199e · 022199e
1 parent 9153cab
commit 022199e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/cypress/e2e/shared/tasks.test.ts b/cypress/e2e/shared/tasks.test.ts
@@ -132,13 +132,18 @@ describe('Tasks - TSM', () => {
 
     cy.focused()
 
-    cy.getByTestID('flux-editor').monacoType(`option task = {
+    cy.getByTestID('flux-editor')
+      .monacoType(
+        `option task = {
     name: "Option Test",
     every: 24h,
     offset: 20m
   }
   from(bucket: "defbuck")
-    |> range(start: -2m)`)
+    |> range(start: -2m)`
+      )
+      // Fix bug with monaco error inserting an extra } here.
+      .monacoType('{backSpace}')
 
     cy.getByTestID('task-form-name')
       .click()

diff --git a/src/tasks/containers/TaskPage.tsx b/src/tasks/containers/TaskPage.tsx
@@ -145,7 +145,9 @@ class TaskPage extends PureComponent<Props> {
     // if the script has a pre-defined option task = {}
     // we want the taskOptions to take precedence over what is provided in the script
     // currently we delete that part of the script
-    script = script.replace(new RegExp('option\\s+task\\s+=\\s+{(.|\\s)*}'), '')
+
+    const removeTaskOptionsRegex = /option\s+task\s+=\s+{(\s|\S)*?}/
+    script = script.replace(removeTaskOptionsRegex, '')
 
     if (!isValidFlux(script)) {
       this.props.invalidFlux()