@suffolklitlab/alkiln 5.6.0 → 5.7.0-feature-tap1

package/.github/workflows/github_server.yml

@@ -1,7 +1,9 @@
-name: GitHub server tests
+name: GitHub server installation
 
 on:
   push:
+  # Default opened, reopened, synchronize. "edited" is something else.
+  pull_request_target:
   workflow_dispatch:
     inputs:
       tags:
@@ -33,7 +35,9 @@ jobs:
       SECRET_FOR_MISSING_FIELD: secret for missing field
       
     steps:
-      # Place the root directory in this branch
+      #### Developer note: You probably don't need this
+      # Place the root directory in this branch to access
+      # relative paths to action files
       - uses: actions/checkout@v3
 
       - name: ALKiln - Start the isolated temporary docassemble server on GitHub
@@ -83,7 +87,5 @@ jobs:
           INSTALL_METHOD: "server"
           #### Developer note: Useful for temporarily shortening ALKiln tests
           #### to debug the docker install step
-          # ALKILN_TAG_EXPRESSION: @onetest
-      - run: echo "ALkiln finished running ALKiln tests"
-        shell: bash
+          # ALKILN_TAG_EXPRESSION: @a_tag_expression
 

package/.github/workflows/playground.yml

@@ -0,0 +1,58 @@
+name: Playground installation
+
+on:
+  push:
+  # Default: opened, reopened, synchronize. "edited" is not what we want.
+  pull_request_target:
+  workflow_dispatch:
+    inputs:
+      tags:
+        required: False
+        description: 'Optional. Use a "tag expression" specify which tagged tests to run (https://cucumber.io/docs/cucumber/api/#tag-expressions)'
+        default: ''
+
+jobs:
+
+  puppeteer-tests:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    env:
+      #### Developer note: Required
+      SERVER_URL: ${{ secrets.SERVER_URL }}
+      DOCASSEMBLE_DEVELOPER_API_KEY: ${{ secrets.DOCASSEMBLE_DEVELOPER_API_KEY }}
+      #### Developer note: you don't need any of these
+      # Specific to our repo's tests
+      PLAYGROUND_EMAIL: ${{ secrets.PLAYGROUND_EMAIL }}
+      PLAYGROUND_PASSWORD: ${{ secrets.PLAYGROUND_PASSWORD }}
+      PLAYGROUND_ID: ${{ secrets.PLAYGROUND_ID }}
+      USER1_EMAIL: ${{ secrets.USER1_EMAIL }}
+      USER1_PASSWORD: ${{ secrets.USER1_PASSWORD }}
+      SECRET_VAR1: secret-var1-value
+      SECRET_VAR2: secret-var2-value
+      SECRET_FOR_MISSING_FIELD: secret for missing field
+      # Internal
+      _ORIGIN: github
+
+    name: Run ALKiln tests
+    steps:
+      #### Developer note: You probably don't need this
+      # Place the root directory in this branch to access
+      # relative paths to action files
+      - uses: actions/checkout@v3
+
+      #### Developer note: you'll need to replace `.` with the path to
+      #### the repo and branch and leave off the trailing `/`
+      #### For example suffolkLITLab/ALKiln@v5
+      - uses: ./
+        with:
+          SERVER_URL: "${{ env.SERVER_URL }}"
+          DOCASSEMBLE_DEVELOPER_API_KEY: "${{ env.DOCASSEMBLE_DEVELOPER_API_KEY }}"
+          #### Developer note: Useful for temporarily shortening ALKiln tests
+          #### to debug the docker install step
+          # ALKILN_TAG_EXPRESSION: @a_tag_expression
+          #### Developer note: you probalby don't need this
+          ALKILN_VERSION: 5.7.0-feature-tap1

package/.github/workflows/unit_tests.yml

@@ -0,0 +1,35 @@
+name: Unit tests
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+
+  unit-tests:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    name: Run unit tests
+    steps:
+      - name: Set name of artifact folder with date and UTC time
+        # https://www.shell-tips.com/linux/how-to-format-date-and-time-in-linux-macos-and-bash/#how-to-format-a-date-in-bash
+        run: |
+          echo "UNIT_TESTS_ARTIFACT_NAME=_alkiln-misc-$(date +'%Y-%m-%d at %Hh%Mm%Ss' -u)UTC" >> $GITHUB_ENV
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm install
+      - run: npm run unit
+      # Artifacts
+      - name: upload unit tests artifacts folder
+        uses: actions/upload-artifact@v3
+        # This will upload even if a previous step has failed
+        if: ${{ always() }}
+        with:
+          name: ${{ env.UNIT_TESTS_ARTIFACT_NAME }}
+          path: ./_alkiln-*

package/CHANGELOG.md

@@ -45,6 +45,18 @@ Format:
 
 <!-- ## [Unreleased] -->
 
+## [5.7.0] - 2023-11-14
+
+### Added
+- Allow tests to run when a PR is made by switching to docassemblecli's `dainstall` to upload packagese to the Playground. See [#760](https://github.com/SuffolkLITLab/ALKiln/issues/760).
+
+### Internal
+- Workflows:
+  - Split unit tests into their own file. They have to use `npm install` in our repo and we don't want to use that for Playground tests. It avoids trying to push all the node modules to the Playground which would otherwise cause error 413 "too large".
+  - Use our own action in the tests that install on the Playground, to avoid duplicating edits to the action - see [#822](https://github.com/SuffolkLITLab/ALKiln/issues/822).
+  - Rename files
+  - Also see [#822](https://github.com/SuffolkLITLab/ALKiln/issues/822)
+
 ## [5.6.0] - 2023-10-27
 
 ### Changed

package/action.yml

@@ -35,11 +35,15 @@ inputs:
 runs:
   using: "composite"
   steps:
+    # Place the root directory in this branch
+    - uses: actions/checkout@v3
+
     # Set environment variables
-    - name: "ALKiln: Set environment variables"
+    - name: "ALKiln setup info: Set environment variables"
       # Human-readable date/time:
       # https://www.shell-tips.com/linux/how-to-format-date-and-time-in-linux-macos-and-bash/#how-to-format-a-date-in-bash
       run: |
+        # ALKiln setup info: Set environment variables
         echo "ARTIFACT_NAME=alkiln-$(date +'%Y-%m-%d at %Hh%Mm%Ss' -u)UTC" >> $GITHUB_ENV
         echo "REPO_URL=${{ github.server_url }}/${{ github.repository }}" >> $GITHUB_ENV
         echo "BRANCH_PATH=${{ github.ref }}" >> $GITHUB_ENV
@@ -50,59 +54,75 @@ runs:
         echo "SERVER_RELOAD_TIMEOUT_SECONDS=${{ inputs.SERVER_RELOAD_TIMEOUT_SECONDS }}" >> $GITHUB_ENV
         echo "_ORIGIN=github" >> $GITHUB_ENV
       shell: bash
-    - name: "ALKiln: confirm info"
+    - name: "ALKiln setup info: confirm environment variables"
       run: |
+        # ALKiln setup info: confirm environment variables
         echo -e "\nALKiln version is $ALKILN_VERSION\nRepo is $REPO_URL\nBranch ref is $BRANCH_PATH\nMAX_SECONDS_FOR_SETUP is $MAX_SECONDS_FOR_SETUP\nSERVER_RELOAD_TIMEOUT_SECONDS is $SERVER_RELOAD_TIMEOUT_SECONDS\n"
       shell: bash
 
     # Install
-    - name: "ALKiln: Install node packages"
+    - name: "ALKiln setup info: Install node packages"
       uses: actions/setup-node@v3
       with:
         node-version: "18"
     - name: Install ALKiln directly from npm
       run: |
+        # ALKiln setup info: Install ALKiln directly from npm
         npm install -g @suffolklitlab/alkiln@$ALKILN_VERSION
       shell: bash
 
     # Install on playground
-    - name: "ALKiln: Create a Project and pull the package from GitHub"
+
+    # Don't rely on the environment's version of python
+    - uses: actions/setup-python@v4
+      if: ${{ inputs.INSTALL_METHOD == 'playground' }}
+      with:
+        python-version: '3.10'
+    - name: "ALKiln: Create a Project and install the package from GitHub"
       if: ${{ inputs.INSTALL_METHOD == 'playground' }}
-      run: alkiln-setup
+      run: |
+        # ALKiln setup info: Create a Project and install the package from GitHub
+        pip3 install docassemblecli
+        alkiln-setup
       shell: bash
-    - run: echo -e "\n\n====\nALKiln could not create a project on your server's testing account or pull your package into it. Check the messages above this line.\n\n"
+    - name: "ALKiln setup ERROR"
+      run: echo -e "\n\n====\nALKiln ERROR - could not create a project on your server's testing account or pull your package into it. Check the messages above this line.\n\n"
       if: ${{ inputs.INSTALL_METHOD == 'playground' && failure() }}
       shell: bash
 
-    # Install on server
-    - name: "ALKiln: Install the GitHub package onto the server"
+    # Server installations - find folders and save session vars
+    - name: "ALKiln setup info: Install the GitHub package onto the server"
       if: ${{ inputs.INSTALL_METHOD == 'server' }}
       run: alkiln-server-install
       shell: bash
-    - run: echo -e "\n\n====\nALKiln could not install the package on the temporary GitHub docassemble server. Check the steps above this line.\n\n"
+    - name: "ALKiln setup ERROR"
+      run: echo -e "\n\n====\nALKiln ERROR - could not install the package on the temporary GitHub docassemble server. Check the steps above this line.\n\n"
       if: ${{ inputs.INSTALL_METHOD == 'server' && failure() }}
       shell: bash
 
     # run tests
-    - name: "ALKiln: Run tests"
+    - name: "ALKiln info: Run tests"
       if: ${{ success() }}
       run: alkiln-run ${{ inputs.ALKILN_TAG_EXPRESSION || github.event.inputs.tags && format('{0}', github.event.inputs.tags) }}
       shell: bash
     
     # on playground, delete project
-    - name: "ALKiln: Try to delete the project from the playground of the docassemble test account."
+    - name: "ALKiln info: Try to delete the project from the playground of the docassemble test account."
       if: ${{ inputs.INSTALL_METHOD == 'playground' }}
       run: alkiln-takedown
       shell: bash
     
     # Upload artifacts that subscribers can download on the Actions summary page
-    - name: "ALKiln: Upload artifacts folder"
+    - name: "ALKiln info: Upload artifacts folder"
       if: ${{ always() }}
       uses: actions/upload-artifact@v3
       with:
         name: ${{ env.ARTIFACT_NAME }}
         path: ./alkiln-*
 
+    - run: echo "ALkiln finished running tests"
+      shell: bash
+
 # ##################################
 # # A developer's workflow should look similar to the below.
 # # In place of `uses: suffolkLITLab/ALKiln@v5`, they
@@ -123,10 +143,8 @@ runs:
 #     runs-on: ubuntu-latest
 #     name: Run interview tests
 #     steps:
-#       - uses: actions/checkout@v3
 #       - name: Use ALKiln to run tests
 #         uses: suffolkLITLab/ALKiln@v5
 #         with:
 #           SERVER_URL: "${{ secrets.SERVER_URL }}"
 #           DOCASSEMBLE_DEVELOPER_API_KEY: "${{ secrets.DOCASSEMBLE_DEVELOPER_API_KEY }}"
-#       - run: echo "Finished running ALKiln tests"

package/action_for_github_server/action.yml

@@ -1,4 +1,4 @@
-name: "ALKiln/github_server: Isolated docassemble tests"
+name: "ALKiln isolated GitHub docassemble server tests"
 description: "Download and start up a temporary docassemble server on GitHub's servers, in an isolated environment. Avoids docassemble reload errors and other external factors."
 
 # If we want to control the version of the docassemble image, we'd have
@@ -40,9 +40,10 @@ outputs:
 runs:
   using: "composite"
   steps:
+      # Place the root directory in this branch
       - uses: actions/checkout@v3
 
-      - name: "ALKiln github_server - Set environment variables"
+      - name: "ALKiln GitHub server - Set environment variables"
         run: |
           echo "DA_ADMIN_API_KEY=abcd1234abcd1234abcd5678abdc5678" >> $GITHUB_ENV
           echo "MAX_SECONDS_FOR_DOCKER=${{ inputs.MAX_SECONDS_FOR_DOCKER }}" >> $GITHUB_ENV
@@ -57,18 +58,18 @@ runs:
           echo "DA_ADMIN_PASSWORD=$DA_ADMIN_PASSWORD" >> "$GITHUB_OUTPUT"
         shell: bash
 
-      - name: "ALKiln github_server - Get config"
+      - name: "ALKiln GitHub server - Get config"
         run: |
-          # Info: config values
+          # ALKiln GitHub server info: config values
           mkdir /tmp/config
           # Worth making this silent by defining a variable with > /dev/null...?
           if [ -n "${{ inputs.CONFIG_CONTENTS }}" ]
           then
-            echo "ALKiln github_server - The developer did provide a custom docassemble config file as an input into this action."
+            echo "ALKiln GitHub server - The developer did provide a custom docassemble config file as an input into this action."
             echo "${{ inputs.CONFIG_CONTENTS }}" > /tmp/config/myconfig.yml
             echo "CONFIG_ARGS=--env DA_CONFIG=/tmp/config/myconfig.yml --volume /tmp/config:/tmp/config " >> $GITHUB_ENV
           else
-            echo "ALKiln github_server - The developer did NOT provide a custom docassemble config file as an input into this action. Docassemble will use its default config."
+            echo "ALKiln GitHub server - The developer did NOT provide a custom docassemble config file as an input into this action. Docassemble will use its default config."
             echo "CONFIG_ARGS=" >> $GITHUB_ENV
           fi
         shell: bash
@@ -84,7 +85,7 @@ runs:
       # Define the var to prevent/show docker output
       - name: Env var for showing docker output
         run: |
-          # Info: Docker logs visibility decision
+          # ALKiln GitHub server info: Docker logs visibility decision
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
             echo "OUTPUT_DOCKER=${{ inputs.SHOW_DOCKER_OUTPUT }}" >> $GITHUB_ENV
           else
@@ -95,20 +96,20 @@ runs:
       # Messages about output
       - if: ${{ env.OUTPUT_DOCKER == 'false' }}
         run: |
-          # Info: no output
-          printf '===\nALKiln github_server - GitHub will now stop showing output to avoid possibly showing details about your config. If you want to get output to see more of what is going on, use "with:" and set the input "SHOW_DOCKER_OUTPUT" to "true". This output will only be visible to those who can already see the action output, like people with admin or write permissions.\n==='
+          # ALKiln GitHub server info: no output
+          printf '===\nALKiln GitHub server - GitHub will now stop showing output to avoid possibly showing details about your config. If you want to get output to see more of what is going on, use "with:" and set the input "SHOW_DOCKER_OUTPUT" to "true". This output will only be visible to those who can already see the action output, like people with admin or write permissions.\n==='
         shell: bash
       - if: ${{ env.OUTPUT_DOCKER == 'true' }}
         run: |
-          # Info: show output
-          printf '===\nALKiln github_server - GitHub will now show the output of docker creation. ALKiln cannot control this output. If you want to prevent output, use "with:" and set the input "SHOW_DOCKER_OUTPUT" to "false". This output will only be visible to those who can already see the action output, like people with admin or write permissions.\n==='
+          # ALKiln GitHub server info: show output
+          printf '===\nALKiln GitHub server - GitHub will now show the output of docker creation. ALKiln cannot control this output. If you want to prevent output, use "with:" and set the input "SHOW_DOCKER_OUTPUT" to "false". This output will only be visible to those who can already see the action output, like people with admin or write permissions.\n==='
         shell: bash
 
       # No output
-      - name: "ALKiln github_server - Download and start docker silently"
+      - name: "ALKiln GitHub server - Download and start docker silently"
         if: ${{ env.OUTPUT_DOCKER == 'false' }}
         run: |
-          # Info: Silent docker pull/run
+          # ALKiln GitHub server info: Silent docker pull/run
           docker pull jhpyle/docassemble > /dev/null 2>&1
           docker run --name docassemble_container \
                      --env DA_ADMIN_EMAIL="${{ env.DA_ADMIN_EMAIL }}" \
@@ -119,10 +120,10 @@ runs:
                      --memory="4gb" -d -p 80:80 jhpyle/docassemble > /dev/null 2>&1
         shell: bash
       # With output
-      - name: "ALKiln github_server - Download and start docker"
+      - name: "ALKiln GitHub server - Download and start docker"
         if: ${{ env.OUTPUT_DOCKER == 'true' }}
         run: |
-          # Info: Docker pull/run
+          # ALKiln GitHub server info: Docker pull/run
           docker pull jhpyle/docassemble
           docker run --name docassemble_container \
                      --env DA_ADMIN_EMAIL="${{ env.DA_ADMIN_EMAIL }}" \
@@ -136,13 +137,13 @@ runs:
       # Show the time it takes to start the server.
       - if: ${{ env.OUTPUT_DOCKER == 'false' }}
         run: |
-          # Info: temporary visible logs
-          echo "ALKiln github_server - ALKiln will show safe ALKiln-only output temporarily as ALKiln waits for the server to start"
+          # ALKiln GitHub server info: temporary visible logs
+          echo "ALKiln GitHub server - ALKiln will show safe ALKiln-only output temporarily as ALKiln waits for the server to start"
         shell: bash
 
-      - name: "ALKiln github_server - Wait for server to start"
+      - name: "ALKiln GitHub server - Wait for server to start"
         run: |
-          # ALKiln github_server - Wait for server to start
+          # ALKiln GitHub server - Wait for server to start
 
           # Reset the SECONDS variable
           SECONDS=0
@@ -151,23 +152,23 @@ runs:
 
           response="start"
           while [[ $response != *"200"* ]]; do
-            echo "ALKiln github_server - Time elapsed: $SECONDS seconds"
+            echo "ALKiln GitHub server - Time elapsed: $SECONDS seconds"
 
             # Check if max seconds till loading has passed
             if [[ $SECONDS -ge $MAX_SECONDS_FOR_DOCKER ]]; then
-              echo "ALKiln github_server Error: Timed out waiting for docker container to serve the site. If you want to give your docker container more timem to install, set the MAX_SECONDS_FOR_DOCKER input for this action."
+              echo "ALKiln GitHub server Error: Timed out waiting for docker container to serve the site. If you want to give your docker container more timem to install, set the MAX_SECONDS_FOR_DOCKER input for this action."
               exit 1
             fi
 
             # Set the variable to a new string value in each iteration
             response=$(curl -o /dev/null -s -w "%{http_code}\n" http://localhost:80/health_check?ready=1)
-            echo "ALKiln github_server - response is $response"
+            echo "ALKiln GitHub server - response is $response"
 
             # Check if the string includes the desired text
             if [[ $response == *"200"* ]]; then
-              echo "ALKiln github_server - Success! The docker container is ready!"
+              echo "ALKiln GitHub server - Success! The docker container is ready!"
             else
-              echo "ALKiln github_server - The docker container is not ready yet. Will check again in 30 seconds."
+              echo "ALKiln GitHub server - The docker container is not ready yet. Will check again in 30 seconds."
               sleep 30
             fi
 
@@ -178,8 +179,8 @@ runs:
       - name: Message about docassemble install output
         if: ${{ env.OUTPUT_DOCKER == 'false' }}
         run: |
-          # Info: Silent install message
-          echo "ALKiln github_server - ALKiln will now prevent output again"
+          # ALKiln GitHub server info: Silent install message
+          echo "ALKiln GitHub server - ALKiln will now prevent output again"
         shell: bash
 
       # Don't rely on the environment's version of python
@@ -206,18 +207,18 @@ runs:
 
       # Upload artifacts that devs can download on the Actions summary page
       # Only if the developer wants to get that info, though
-      - name: "ALKiln github_server - Get path names with date and time"
+      - name: "ALKiln GitHub server - Get path names with date and time"
         if: ${{ always() && env.OUTPUT_DOCKER == 'true' }}
         run: |
           echo "GITHUB_SERVER_LOG_FILE_NAME=/tmp/alkiln_docker_logs-$(date +'%Y-%m-%d at %Hh%Mm%Ss' -u)UTC.txt" >> $GITHUB_ENV
           echo "GITHUB_SERVER_ARTIFACT_NAME=alkiln_github_server-$(date +'%Y-%m-%d at %Hh%Mm%Ss' -u)UTC" >> $GITHUB_ENV
         shell: bash
-      - name: "ALKiln github_server - Docker output"
+      - name: "ALKiln GitHub server - Docker output"
         if: ${{ always() && env.OUTPUT_DOCKER == 'true' }}
         run: |
           echo "$(docker output docassemble_container)" > "${{ env.GITHUB_SERVER_LOG_FILE_NAME }}"
         shell: bash
-      - name: "ALKiln github_server - Upload artifacts folder"
+      - name: "ALKiln GitHub server - Upload artifacts folder"
         if: ${{ always() && env.OUTPUT_DOCKER == 'true' }}
         uses: actions/upload-artifact@v3
         with:
@@ -225,7 +226,13 @@ runs:
           path: ${{ env.GITHUB_SERVER_LOG_FILE_NAME }}
 
       - run: |
-          # Info: End silent output
-          echo "ALKiln github_server - ALKiln will show output again"
+          # ALKiln GitHub server info: End silent output
+          echo "ALKiln GitHub server - ALKiln will show output again"
+        if: ${{ always() && env.OUTPUT_DOCKER == 'false' }}
+        shell: bash
+
+      - run: |
+          # ALKiln GitHub server info: Done
+          echo "ALKiln GitHub server - ALKiln will show output again"
         if: ${{ always() && env.OUTPUT_DOCKER == 'false' }}
         shell: bash

package/lib/docassemble/docassemble_api_REST.js

@@ -1,14 +1,12 @@
 const axios = require('axios');
-const qs = require('qs');
 
+// Ours
 const session_vars = require('../utils/session_vars' );
 
 /* Requests to make to the developer's docassemble server.
 *   As close to plain requests as we can get so we don't have
 *   to think about this file again.
-* Notes:
-*   - We are not using `.create()` because we want to get
-*   the environment variables fresh every time. */
+*/
 
 let da = {};
 module.exports = da;
@@ -33,82 +31,6 @@ da.get_dev_id = async function ( timeout ) {
 };  // Ends da.get_dev_id()
 
 
-// node -e 'require("./lib/docassemble/docassemble_api_REST.js").create_project( "create1" )'
-da.create_project = async function ( project_name, timeout ) {
-  /* Create a new project on the user's da server. */
-  let options = {
-    method: 'POST',
-    headers: {'X-API-Key': session_vars.get_dev_api_key()},
-    url: `${ session_vars.get_da_server_url() }/api/playground/project`,
-    data: qs.stringify({
-      project: project_name,
-    }),
-    timeout: timeout,
-  };
-
-  try {
-    return await axios.request( options );
-  } catch (error) {
-    let response = error.response || {data: null}
-    throw {...error.toJSON(), data: response.data};
-  }
-};  // Ends da.create_project()
-
-
-// node -e 'require("./lib/docassemble/docassemble_api_REST.js").pull()'
-da.pull = async function ( timeout ) {
-  /* Pull github code into an existing Project. */
-  let options = {
-    method: 'POST',
-    headers: {'X-API-Key': session_vars.get_dev_api_key()},
-    url: `${ session_vars.get_da_server_url() }/api/playground_pull`,
-    data: qs.stringify({
-      project: session_vars.get_project_name(),
-      github_url: session_vars.get_repo_url(),
-      branch: session_vars.get_branch_name(),
-    }),
-    timeout: timeout,
-  };
-
-  try {
-    return await axios.request( options );
-  } catch (error) {
-    let response = error.response || {data: null}
-    throw {...error.toJSON(), data: response.data};
-  }
-};  // Ends da.pull()
-
-
-da.has_playground_task_finished = async function ( task_id, timeout ) {
-  return await da.has_task_finished( "/api/restart_status", task_id, timeout);
-}
-
-da.has_package_task_finished = async function ( task_id, timeout ) {
-  return await da.has_task_finished( "/api/package_update_status", task_id, timeout);
-}
-
-// node -e 'require("./lib/docassemble/docassemble_api_REST.js").has_task_finished()'
-da.has_task_finished = async function ( api_endpoint, task_id, timeout ) {
-  /* Check task status based on `task_id`. */
-  let options = {
-    method: 'GET',
-    headers: {'X-API-Key': session_vars.get_dev_api_key()},
-    url: `${ session_vars.get_da_server_url() }${ api_endpoint }`,
-    params: {
-      task_id: task_id,
-    },
-    timeout: timeout,
-  };
-
-  try {
-    return await axios.request( options );
-  } catch (error) {
-    let response = error.response || {data: null}
-    throw {...error.toJSON(), data: response.data};
-  }
-};  // Ends da.has_task_finished()
-
-
 // node -e 'require("./lib/docassemble/docassemble_api_REST.js").delete_project( "create1" )'
 da.delete_project = async function ( timeout ) {
   /* Delete a project on the user's da server. */
@@ -160,4 +82,4 @@ da.__delete_projects_starting_with = async function ( base_name, starting_num=1,
     }
     name_incrementor++;
   }
-}; // Ends da_i.__delete_projects_starting_with()
+}; // Ends da.__delete_projects_starting_with()