progress

.github/change-versions.sh

@@ -4,7 +4,7 @@ VERSION=$1
 echo "Updating versions to: $VERSION"
 
 sed -i -e "/^version =/s/= .*/= \"$VERSION\"/" backend/Cargo.toml
-sed -i -e "/^export const VERSION =/s/= .*/= \"v$VERSION\";/" cli/main.ts
+sed -i -e "/^const VERSION =/s/= .*/= \"v$VERSION\";/" cli/main.ts
 sed -i -e "/version: /s/: .*/: $VERSION/" backend/windmill-api/openapi.yaml
 sed -i -e "/version: /s/: .*/: $VERSION/" openflow.openapi.yaml
 sed -i -e "/\"version\": /s/: .*,/: \"$VERSION\",/" frontend/package.json

.github/workflows/backend-test.yml

@@ -40,4 +40,4 @@ jobs:
             backend -> target
       - name: cargo test
         timeout-minutes: 10
-        run: mkdir frontend/build && cd backend && touch windmill-api/openapi-deref.yaml && DATABASE_URL=postgres://postgres:changeme@postgres:5432/windmill DISABLE_NSJAIL=false cargo test --all -- --nocapture
+        run: mkdir frontend/build && cd backend && touch windmill-api/openapi-deref.yaml && DATABASE_URL=postgres://postgres:changeme@postgres:5432/windmill cargo test --all -- --nocapture

.github/workflows/change-versions.yml

@@ -10,7 +10,6 @@ jobs:
     container: node:18
     steps:
       - uses: actions/checkout@v3
-      - run: git config --system --add safe.directory /__w/windmill/windmill
       - name: Change versions
         run: ./.github/change-versions.sh "$(cat version.txt)"
       - uses: actions-rs/toolchain@v1

.github/workflows/deploy_to_windmill.yml

@@ -0,0 +1,20 @@
+name: Deploy to windmill.dev
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - "community/**"
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Deploy to windmill.dev
+        uses: windmill-labs/windmill-gh-action-deploy@v2.0.0
+        with:
+          dry_run: false
+          input_dir: community
+          windmill_workspace: starter
+          windmill_token: ${{ secrets.WINDMILL_API_TOKEN }}

.github/workflows/docker-image.yml

@@ -109,38 +109,38 @@ jobs:
             ${{ steps.meta-ee-public.outputs.labels }}
             org.opencontainers.image.licenses=Windmill-Enterprise-License
 
-  # disabled until we make it 100% reliable and add more meaningful tests
-  # playwright:
-  #   runs-on: [self-hosted, new]
-  #   needs: [build]
-  #   services:
-  #     postgres:
-  #       image: postgres
-  #       env:
-  #         POSTGRES_DB: windmill
-  #         POSTGRES_USER: admin
-  #         POSTGRES_PASSWORD: changeme
-  #       ports:
-  #         - 5432:5432
-  #       options: >-
-  #         --health-cmd pg_isready
-  #         --health-interval 10s
-  #         --health-timeout 5s
-  #         --health-retries 5
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - name: "Docker"
-  #       run: echo "::set-output name=id::$(docker run --network=host --rm -d -p 8000:8000 --privileged -it -e DATABASE_URL=postgres://admin:changeme@localhost:5432/windmill -e BASE_INTERNAL_URL=http://localhost:8000 ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest)"
-  #       id: docker-container
-  #     - uses: actions/setup-node@v3
-  #       with:
-  #         node-version: 16
-  #     - name: "Playwright run"
-  #       timeout-minutes: 2
-  #       run: cd frontend && npm ci @playwright/test && npx playwright install && export BASE_URL=http://localhost:8000 && npm run test
-  #     - name: "Clean up"
-  #       run: docker kill ${{ steps.docker-container.outputs.id }}
-  #       if: always()
+
+  playwright:
+    runs-on: [self-hosted, new]
+    needs: [build]
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_DB: windmill
+          POSTGRES_USER: admin
+          POSTGRES_PASSWORD: changeme
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    steps:
+      - uses: actions/checkout@v3
+      - name: "Docker"
+        run: echo "::set-output name=id::$(docker run --network=host --rm -d -p 8000:8000 --privileged -it -e DATABASE_URL=postgres://admin:changeme@localhost:5432/windmill -e BASE_INTERNAL_URL=http://localhost:8000 ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest)"
+        id: docker-container
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - name: "Playwright run"
+        timeout-minutes: 2
+        run: cd frontend && npm ci @playwright/test && npx playwright install && export BASE_URL=http://localhost:8000 && npm run test
+      - name: "Clean up"
+        run: docker kill ${{ steps.docker-container.outputs.id }}
+        if: always()
 
 
   publish_privately_heavy:
@@ -182,7 +182,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push privately
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v3
         if: github.event_name != 'pull_request'
         with:
           context: .
@@ -222,7 +222,7 @@ jobs:
           password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           
       - name: Build and push privately
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v3
         if: github.event_name != 'pull_request'
         with:
           context: .

.github/workflows/pypi_on_release.yml

@@ -65,7 +65,7 @@ jobs:
           password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
       - name: Build and push publicly
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v3
         with:
           context: "{{defaultContext}}:lsp"
           push: true

.github/workflows/uffizzi-build.yml

@@ -25,12 +25,12 @@ jobs:
         run: echo "UUID_TAG_APP=$(uuidgen)" >> $GITHUB_ENV
       - name: Docker metadata
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v3
         with:
           images: registry.uffizzi.com/${{ env.UUID_TAG_APP }}
           tags: type=raw,value=60d
       - name: Build and Push Image to registry.uffizzi.com ephemeral registry
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v2
         with:
           push: true
           context: ./

CHANGELOG.md

@@ -1,497 +1,6 @@
 # Changelog
 
 
-## [1.83.1](https://github.com/windmill-labs/windmill/compare/v1.83.0...v1.83.1) (2023-03-28)
-
-
-### Bug Fixes
-
-* **cli:** plain secrets might be undefined ([569a55e](https://github.com/windmill-labs/windmill/commit/569a55e45b34641b0fb4569387166f3aa89ce35f))
-
-## [1.83.0](https://github.com/windmill-labs/windmill/compare/v1.82.0...v1.83.0) (2023-03-28)
-
-
-### Features
-
-* **backend:** allow relative imports for python ([a5500ea](https://github.com/windmill-labs/windmill/commit/a5500ea40a77b2e0408e2a644190a8f65b18cd1d))
-* **backend:** execute /bin/bash instead of /bin/sh for bash scripts ([021fa23](https://github.com/windmill-labs/windmill/commit/021fa23f9ffcd11548977a4589eb9bc2815243cf))
-* **backend:** improve relative importsfor deno ([eaac598](https://github.com/windmill-labs/windmill/commit/eaac598af308cedea8f0f8fc7c189a4640b4366b))
-* **backend:** increase timeout for premium workspace ([00b70d9](https://github.com/windmill-labs/windmill/commit/00b70d9aaac8ae979782492d7754060a3c2c9567))
-* **frontend:** add pagination ([33c07d3](https://github.com/windmill-labs/windmill/commit/33c07d3e63f96673719ecb15e45f4cd9e18be80e))
-* **frontend:** Add quick style settings to app editor ([#1308](https://github.com/windmill-labs/windmill/issues/1308)) ([ac24862](https://github.com/windmill-labs/windmill/commit/ac2486219cd91df3a7fe11d37894797a881cac6c))
-* **frontend:** add recompute as a primitive ([449d3ae](https://github.com/windmill-labs/windmill/commit/449d3ae5ddeceef3fbcb7a815a4dba16c9639fb3))
-* **frontend:** add textareacomponent + fix multiselect style + select multi components ([2b31653](https://github.com/windmill-labs/windmill/commit/2b31653a8aa06807678e8609cfa62cf0f2f55dce))
-* **frontend:** multiselect components for apps ([577dec5](https://github.com/windmill-labs/windmill/commit/577dec5c5733cdf88e8586ce6c27159920c69c8a))
-* **frontend:** use rich json editor for arrays of objects and for object in ArgInput ([b95afaa](https://github.com/windmill-labs/windmill/commit/b95afaa9bb41b102181657453a564f44f4511983))
-
-
-### Bug Fixes
-
-* **apps:** improve app table actionButtons behavior under many clicks ([8e3d8ac](https://github.com/windmill-labs/windmill/commit/8e3d8acc80de971ee115d6903d24864d8263f08b))
-* **cli:** add --plain-secrets ([98d51e2](https://github.com/windmill-labs/windmill/commit/98d51e219df1680507114f9b57ec0b0a4a234b5c))
-* **frontend:** add a modal that is always mounted to make sure compon… ([#1328](https://github.com/windmill-labs/windmill/issues/1328)) ([a527cb8](https://github.com/windmill-labs/windmill/commit/a527cb8222a2ff80dae38ebae7dc5ea0979d74c5))
-* **frontend:** Disable app keyboard navigation on focused inputs ([#1326](https://github.com/windmill-labs/windmill/issues/1326)) ([da24e9a](https://github.com/windmill-labs/windmill/commit/da24e9ab0625a7503c498c179022ea4011a03170))
-* **frontend:** persist description for schemas ([1a48673](https://github.com/windmill-labs/windmill/commit/1a4867302f72aaae8f422ac8f53812c116cc383d))
-* **frontend:** Revert app upload input ([#1330](https://github.com/windmill-labs/windmill/issues/1330)) ([fa457bb](https://github.com/windmill-labs/windmill/commit/fa457bb7099bd31c2315eaf7f7f2c40900b2ae39))
-* **frontend:** Small app fixes ([#1331](https://github.com/windmill-labs/windmill/issues/1331)) ([75306c8](https://github.com/windmill-labs/windmill/commit/75306c831616d9a01cc3a4681732aab93153f1a9))
-
-## [1.82.0](https://github.com/windmill-labs/windmill/compare/v1.81.0...v1.82.0) (2023-03-24)
-
-
-### Features
-
-* **backend:** introduce RESTART_ZOMBIE_JOBS and ZOMBIE_JOB_TIMEOUT ([47a7f71](https://github.com/windmill-labs/windmill/commit/47a7f7163aae3fe807e766c824085b4d1b75c8c8))
-
-
-### Bug Fixes
-
-* **backend:** do not consider FlowPreview as potential zombie job ([f7c30b5](https://github.com/windmill-labs/windmill/commit/f7c30b5d2f16e15f36208e07126557fd7ed84801))
-* **backend:** increase dynamic js timeout + improve client passing ([34e25f0](https://github.com/windmill-labs/windmill/commit/34e25f0f96fe637cc42f4017a064c40def5d67ef))
-* **cli:** improve diff speed + fix replacing cli ([b999c98](https://github.com/windmill-labs/windmill/commit/b999c9894b4011b735f37df485fe403c22c00512))
-* **frontend:** Fix AppTable error display + clear errors when removing a component + properly detect that latest component run had an error ([#1322](https://github.com/windmill-labs/windmill/issues/1322)) ([c15bc8a](https://github.com/windmill-labs/windmill/commit/c15bc8a7bfb3bef2634e6093088967137cd06239))
-* **frontend:** fix refresh with manual dependencies ([#1319](https://github.com/windmill-labs/windmill/issues/1319)) ([a47031a](https://github.com/windmill-labs/windmill/commit/a47031a41e6a3392101e280dcd1aea098f898447))
-* **frontend:** fix settings panel ([#1323](https://github.com/windmill-labs/windmill/issues/1323)) ([30b8e47](https://github.com/windmill-labs/windmill/commit/30b8e474df5b71b7e7b36d3fe5974a289cf0dfae))
-* **frontend:** Fix transformer ([#1321](https://github.com/windmill-labs/windmill/issues/1321)) ([addabcc](https://github.com/windmill-labs/windmill/commit/addabcceb0c90782ba4a934bb3822f8cc9865069))
-* **frontend:** remove unnecessary div ([#1318](https://github.com/windmill-labs/windmill/issues/1318)) ([e193a0b](https://github.com/windmill-labs/windmill/commit/e193a0bcdf6690b007594d2f1325a7ec26603129))
-
-## [1.81.0](https://github.com/windmill-labs/windmill/compare/v1.80.1...v1.81.0) (2023-03-21)
-
-
-### Features
-
-* **apps:** add action on form/button/formbutton ([2593218](https://github.com/windmill-labs/windmill/commit/2593218cbf07c05521a270797055ddb22dc22b8d))
-
-
-### Bug Fixes
-
-* **frontend:** Remove action outline on preview mode ([#1313](https://github.com/windmill-labs/windmill/issues/1313)) ([a7c4f1a](https://github.com/windmill-labs/windmill/commit/a7c4f1a12e02e8627a5955b75d572e9cf11d8122))
-
-## [1.80.1](https://github.com/windmill-labs/windmill/compare/v1.80.0...v1.80.1) (2023-03-21)
-
-
-### Bug Fixes
-
-* **cli:** add support for non metadataed scripts ([42f6d2e](https://github.com/windmill-labs/windmill/commit/42f6d2e0ee6294f8a1d97f5f62f2adb6edfd2fed))
-
-## [1.80.0](https://github.com/windmill-labs/windmill/compare/v1.79.0...v1.80.0) (2023-03-20)
-
-
-### Features
-
-* **apps:** add transformers for data sources ([0abacac](https://github.com/windmill-labs/windmill/commit/0abacac06c7dd586b48c66ff47b7589fe692205b))
-* **frontend:** App set tab ([#1307](https://github.com/windmill-labs/windmill/issues/1307)) ([48413a7](https://github.com/windmill-labs/windmill/commit/48413a78c5e7e0ee8208711f15135d81136b7386))
-
-
-### Bug Fixes
-
-* **frontend:** add missing optional chaining ([#1306](https://github.com/windmill-labs/windmill/issues/1306)) ([29b1cc6](https://github.com/windmill-labs/windmill/commit/29b1cc6ff0ebc5edcad24a1780113889c507075d))
-* **frontend:** App button triggered by ([#1304](https://github.com/windmill-labs/windmill/issues/1304)) ([cf2d031](https://github.com/windmill-labs/windmill/commit/cf2d031e8e89faa2cd7fa58436cbe7cf4d9045f9))
-
-## [1.79.0](https://github.com/windmill-labs/windmill/compare/v1.78.0...v1.79.0) (2023-03-17)
-
-
-### Features
-
-* **frontend:** add listeners for frontend scripts ([597e38e](https://github.com/windmill-labs/windmill/commit/597e38ef367d38fa97fc443ccb2c721e5964fece))
-* **frontend:** add table actions navigation ([#1298](https://github.com/windmill-labs/windmill/issues/1298)) ([c3ba1a6](https://github.com/windmill-labs/windmill/commit/c3ba1a6ab97484a08a5a20187bb858a5af7025cb))
-* **frontend:** App component triggers ([#1303](https://github.com/windmill-labs/windmill/issues/1303)) ([078cb1b](https://github.com/windmill-labs/windmill/commit/078cb1bf3e4de08cb018578f04d24392a6462f69))
-* **frontend:** Component control ([#1293](https://github.com/windmill-labs/windmill/issues/1293)) ([bd927a2](https://github.com/windmill-labs/windmill/commit/bd927a27ed9581dbf67ea3694f9d989f8d71d2ed))
-
-
-### Bug Fixes
-
-* **frontend:** App panel styling ([#1284](https://github.com/windmill-labs/windmill/issues/1284)) ([c1dd35c](https://github.com/windmill-labs/windmill/commit/c1dd35c3f0fcbc1be43273f82a873c3c07863417))
-* **frontend:** Display app context search on top ([#1300](https://github.com/windmill-labs/windmill/issues/1300)) ([bd3ee81](https://github.com/windmill-labs/windmill/commit/bd3ee81b14846f16ccd16461de99b46fe68be6ba))
-* **frontend:** fix horizontal splitpanes ([#1301](https://github.com/windmill-labs/windmill/issues/1301)) ([ea3dab4](https://github.com/windmill-labs/windmill/commit/ea3dab411b3d5dd772e04c8831e789e2470aaf28))
-* **frontend:** fix map render ([#1297](https://github.com/windmill-labs/windmill/issues/1297)) ([0092721](https://github.com/windmill-labs/windmill/commit/00927210fd68c31cb793ef4f0efea05711ebcf00))
-* **frontend:** Hide archive toggle with empty list ([#1296](https://github.com/windmill-labs/windmill/issues/1296)) ([bac831b](https://github.com/windmill-labs/windmill/commit/bac831b23ce85a683ddbd4537900670a0b7d12a8))
-
-## [1.78.0](https://github.com/windmill-labs/windmill/compare/v1.77.0...v1.78.0) (2023-03-16)
-
-
-### Features
-
-* **frontend:** app textcomponent editable + tooltip ([11567d6](https://github.com/windmill-labs/windmill/commit/11567d6280ea60f1a8c3c6607c724179775cbbe3))
-
-
-### Bug Fixes
-
-* **backend:** whitelist for include_header was ignored in some cases ([183a459](https://github.com/windmill-labs/windmill/commit/183a4591df700ab4720de6e92a83631256940089))
-* **frontend:** improve rendering performance after component moving ([6f890f2](https://github.com/windmill-labs/windmill/commit/6f890f2120885f90d986fbd655096b45bf9de539))
-* **frontend:** remove staticOutputs from apps ([dbdfd62](https://github.com/windmill-labs/windmill/commit/dbdfd626386398180ecba7976714f86365eeccd8))
-
-## [1.77.0](https://github.com/windmill-labs/windmill/compare/v1.76.0...v1.77.0) (2023-03-14)
-
-
-### Features
-
-* **apps:** state can be used as input in apps ([2f0acb9](https://github.com/windmill-labs/windmill/commit/2f0acb9ffa8dace4a886527dcee49809d019b271))
-* **apps:** tabs can be made pages or invisible + better frontend scripts reactivity ([cd645d0](https://github.com/windmill-labs/windmill/commit/cd645d0935f2d06e0ff71f14d2cf63accd378ff3))
-* **deno:** add support for custom npm repo ([#1291](https://github.com/windmill-labs/windmill/issues/1291)) ([944795f](https://github.com/windmill-labs/windmill/commit/944795f6eeaa7d01ab1a35a80570a55c363723e6))
-* **frontend:** add setTab to frontend scripts ([c2a97c5](https://github.com/windmill-labs/windmill/commit/c2a97c53cfff0fdb35dd8bc249490566eebdc1a9))
-* **frontend:** app components output panel ([#1283](https://github.com/windmill-labs/windmill/issues/1283)) ([751edcf](https://github.com/windmill-labs/windmill/commit/751edcf9b8e0976a1d073603c9eff5dc6e714490))
-
-
-### Bug Fixes
-
-* **backend:** do not cache reference to workspace scripts ([eb73f2a](https://github.com/windmill-labs/windmill/commit/eb73f2a687f6faad301b9038ab8585450bec7481))
-* **frontend:** fix app tabs ([#1288](https://github.com/windmill-labs/windmill/issues/1288)) ([c71a577](https://github.com/windmill-labs/windmill/commit/c71a577fead90c9cd01a736b54d859ec4f0b7807))
-* **frontend:** fix container deletion ([#1287](https://github.com/windmill-labs/windmill/issues/1287)) ([bc870bd](https://github.com/windmill-labs/windmill/commit/bc870bd03eb76cb8bc0e0c861f6cd8a9c661186b))
-* **frontend:** Update setting accordion ([#1285](https://github.com/windmill-labs/windmill/issues/1285)) ([dea12e8](https://github.com/windmill-labs/windmill/commit/dea12e8870ece998bb6607723cbaab9b9a958f22))
-
-## [1.76.0](https://github.com/windmill-labs/windmill/compare/v1.75.0...v1.76.0) (2023-03-13)
-
-
-### Features
-
-* **frontend:** add frontend (JS)  scripts to apps ([f0b1b1f](https://github.com/windmill-labs/windmill/commit/f0b1b1f752731ba434b960a75624118152f53c00))
-* **frontend:** Copy, Cut and Paste ([#1279](https://github.com/windmill-labs/windmill/issues/1279)) ([82c139e](https://github.com/windmill-labs/windmill/commit/82c139ed0992be401e250cfb7ecc0fca61b76772))
-* **frontend:** disabled for action buttons can now depend on row ([75f87e7](https://github.com/windmill-labs/windmill/commit/75f87e7e1117a9c12afcf626379e94b134a9a493))
-* **frontend:** improve drag-n-drop behavior ([cfd489a](https://github.com/windmill-labs/windmill/commit/cfd489a55059e7b6843f99bab261c70b3852e6a2))
-
-
-### Bug Fixes
-
-* **backend:** improve worker ping api ([c958480](https://github.com/windmill-labs/windmill/commit/c958480ce83844a989f58dd5a70eb288582e2194))
-* **frontend:** General fixes and updates ([#1281](https://github.com/windmill-labs/windmill/issues/1281)) ([3e5a179](https://github.com/windmill-labs/windmill/commit/3e5a179eb8cd8001f49c92305141dade1571e20f))
-
-## [1.75.0](https://github.com/windmill-labs/windmill/compare/v1.74.2...v1.75.0) (2023-03-11)
-
-
-### Features
-
-* add filter jobs by args or result ([3b44f9a](https://github.com/windmill-labs/windmill/commit/3b44f9a72ca0466a44963a4b9657a0ee59b44753))
-* **apps:** add resource picker ([8681e83](https://github.com/windmill-labs/windmill/commit/8681e83b574141acbf7e5a389a9e8a4f340336d1))
-* **bash:** add default argument handling for bash ([1d5c194](https://github.com/windmill-labs/windmill/commit/1d5c194f09ffba963d52e418c5954843d84ae337))
-* **frontend-apps:** add variable picker for static string input on apps ([bc440f8](https://github.com/windmill-labs/windmill/commit/bc440f8d4154ce464c0e027d93b7a0a3b76d782e))
-* **frontend:** make runs filters synced with query args ([61a5e1f](https://github.com/windmill-labs/windmill/commit/61a5e1f1accc988628b785b3b9be04c4ea719874))
-
-
-### Bug Fixes
-
-* **backend:** add killpill for lines reading ([7c825c2](https://github.com/windmill-labs/windmill/commit/7c825c212dd0f1e8be427eabd9a9756303241d1b))
-* **cli:** many small fixes ([ce32370](https://github.com/windmill-labs/windmill/commit/ce323709a94d27fb24214719180ea1aafc66d646))
-
-## [1.74.2](https://github.com/windmill-labs/windmill/compare/v1.74.1...v1.74.2) (2023-03-09)
-
-
-### Bug Fixes
-
-* **frontend:** fix splitpanes navigation ([#1276](https://github.com/windmill-labs/windmill/issues/1276)) ([8d5c5b8](https://github.com/windmill-labs/windmill/commit/8d5c5b88a35d7a3bad1d8ddf2d940026825241eb))
-
-## [1.74.1](https://github.com/windmill-labs/windmill/compare/v1.74.0...v1.74.1) (2023-03-09)
-
-
-### Bug Fixes
-
-* **apps:** proper reactivity for non rendered static components ([ae53baf](https://github.com/windmill-labs/windmill/commit/ae53bafaf6777f928113f84b2c6ed6a2ed341844))
-* **ci:** make windmill compile again by pinning swc deps ([2ea15d5](https://github.com/windmill-labs/windmill/commit/2ea15d5035e5e15473968db3c0501a4dddff5cd0))
-
-## [1.74.0](https://github.com/windmill-labs/windmill/compare/v1.73.1...v1.74.0) (2023-03-09)
-
-
-### Features
-
-* add delete by path for scripts ([0c2cf92](https://github.com/windmill-labs/windmill/commit/0c2cf92dd3df9610e649f15e23921a4ca0d94e6a))
-* **frontend:** Add color picker input to app ([#1270](https://github.com/windmill-labs/windmill/issues/1270)) ([88e537a](https://github.com/windmill-labs/windmill/commit/88e537ad1fb4c207f38fbe951c82106bef6491a3))
-* **frontend:** add expand ([#1268](https://github.com/windmill-labs/windmill/issues/1268)) ([b854ee3](https://github.com/windmill-labs/windmill/commit/b854ee34393534bde104e2e6f606108fd66d38dc))
-* **frontend:** add hash to ctx in apps ([b1a45b1](https://github.com/windmill-labs/windmill/commit/b1a45b1e708aa6f19f8be9c949507083e044f2d8))
-* **frontend:** Add key navigation in app editor ([#1273](https://github.com/windmill-labs/windmill/issues/1273)) ([6b0fb75](https://github.com/windmill-labs/windmill/commit/6b0fb75d23e2151c88b07814139d203c1bd0578d))
-
-
-### Bug Fixes
-
-* **cli:** improve visibility of the active workspace ([e6344da](https://github.com/windmill-labs/windmill/commit/e6344dac6d1be04b46231fa8ef8579fd12ca8f37))
-* **frontend:** add confirmation modal to delete script/flow/app ([a4adcb5](https://github.com/windmill-labs/windmill/commit/a4adcb5192c11f7bf47a0d259825e474779378d7))
-* **frontend:** Clean up app editor ([#1267](https://github.com/windmill-labs/windmill/issues/1267)) ([0a5e181](https://github.com/windmill-labs/windmill/commit/0a5e181a3aa966fb8211bee0d9174fc16353b31f))
-* **frontend:** Minor changes ([#1272](https://github.com/windmill-labs/windmill/issues/1272)) ([3b6ae0c](https://github.com/windmill-labs/windmill/commit/3b6ae0cc49461b858d9cfff79eae9a7569465235))
-* **frontend:** simplify input bindings ([b2de531](https://github.com/windmill-labs/windmill/commit/b2de531a46e4b120d7106d361b727746bec516dd))
-
-## [1.73.1](https://github.com/windmill-labs/windmill/compare/v1.73.0...v1.73.1) (2023-03-07)
-
-
-### Bug Fixes
-
-* **frontend:** load flow is not initialized ([719d475](https://github.com/windmill-labs/windmill/commit/719d4752621d462b1cfaa0d27930fba7586be779))
-
-## [1.73.0](https://github.com/windmill-labs/windmill/compare/v1.72.0...v1.73.0) (2023-03-07)
-
-
-### Features
-
-* **frontend:** add a way to automatically resize ([#1259](https://github.com/windmill-labs/windmill/issues/1259)) ([24f58ef](https://github.com/windmill-labs/windmill/commit/24f58efd9994a2201c1b1d9bbfb11734c57068e3))
-* **frontend:** add ability to move nodes ([614fb50](https://github.com/windmill-labs/windmill/commit/614fb5022aa7d5428fb96b7ee3a20794edd1e9d3))
-* **frontend:** Add app PDF viewer ([#1254](https://github.com/windmill-labs/windmill/issues/1254)) ([3e5d09e](https://github.com/windmill-labs/windmill/commit/3e5d09ef0b5619186bee5ec6d442cbfd12a6e8d5))
-* **frontend:** add fork/save buttons + consistent styling for slider/range ([9e9f8ef](https://github.com/windmill-labs/windmill/commit/9e9f8efb8ee389ea75e99b67ef720756959ca737))
-* **frontend:** add history to flows and apps ([9e4d90a](https://github.com/windmill-labs/windmill/commit/9e4d90ad37a57ff1f515eea0c82cf603649e915d))
-* **frontend:** Fix object viewer style ([#1255](https://github.com/windmill-labs/windmill/issues/1255)) ([94f1aad](https://github.com/windmill-labs/windmill/commit/94f1aadef2b09ac1962478f11b27cc708b8328f1))
-* **frontend:** refactor entire flow builder UX ([2ac51b0](https://github.com/windmill-labs/windmill/commit/2ac51b0af08bdef7ce3c7e874e9983b9fc00478a))
-
-
-### Bug Fixes
-
-* **frontend:** arginput + apppreview fixes ([e2c4545](https://github.com/windmill-labs/windmill/commit/e2c45452401022b00285b21551ffaf35a114be33))
-* **frontend:** fix app map reactivity ([#1260](https://github.com/windmill-labs/windmill/issues/1260)) ([2557e13](https://github.com/windmill-labs/windmill/commit/2557e136bd0df1a023819b7d9b2235e30d7140b6))
-* **frontend:** fix branch deletion ([#1261](https://github.com/windmill-labs/windmill/issues/1261)) ([a999eb2](https://github.com/windmill-labs/windmill/commit/a999eb21121a7c0010621448324e0c77caf2b3f6))
-* **frontend:** Side menu z-index issue ([#1265](https://github.com/windmill-labs/windmill/issues/1265)) ([c638897](https://github.com/windmill-labs/windmill/commit/c638897fdcd58f55b0929f91641b21a6f9d25ead))
-
-## [1.72.0](https://github.com/windmill-labs/windmill/compare/v1.71.0...v1.72.0) (2023-03-02)
-
-
-### Features
-
-* **backend:** get_result_by_id do a downward pass to find node at any depth ([#1249](https://github.com/windmill-labs/windmill/issues/1249)) ([4c913dc](https://github.com/windmill-labs/windmill/commit/4c913dc4b6be03571a015c97a13829adffb61479))
-* **frontend:** Add app map component ([#1251](https://github.com/windmill-labs/windmill/issues/1251)) ([ed25d9f](https://github.com/windmill-labs/windmill/commit/ed25d9f186d9925f75404cb193a025d8a41c4540))
-* **frontend:** app splitpanes ([#1248](https://github.com/windmill-labs/windmill/issues/1248)) ([f4d79ee](https://github.com/windmill-labs/windmill/commit/f4d79ee2633e6cdab0fa2410108b31cfa77e10da))
-
-
-### Bug Fixes
-
-* **backend:** improve result retrieval ([c4463bb](https://github.com/windmill-labs/windmill/commit/c4463bb029907f3c8d77abb194f872aae7876bf6))
-* **backend:** incorrect get_result_by_id for  list_result job ([2a75cd2](https://github.com/windmill-labs/windmill/commit/2a75cd250ea5e01849fc8bbb69bf44f147d0acb8))
-* **cli:** fix workspace option + run script/flow + whoami ([35ea2b2](https://github.com/windmill-labs/windmill/commit/35ea2b27b12159c68c8507ec1f8686028c975387))
-* **frontend:** background script not showing inputs ([55eb48c](https://github.com/windmill-labs/windmill/commit/55eb48c55332431304cedbf3bcbbbcff61ec3645))
-* **frontend:** fix table bindings ([2679386](https://github.com/windmill-labs/windmill/commit/2679386bf87a56352269911bd89e52df5ee9f314))
-* **frontend:** rework app reactivity ([94b20d2](https://github.com/windmill-labs/windmill/commit/94b20d2f5e3b551974c57ea82b6e3dc16e97b9b8))
-* **frontend:** rework app reactivity ([1753cb7](https://github.com/windmill-labs/windmill/commit/1753cb7da658f47be974c15da82c71a8e19309a6))
-
-## [1.71.0](https://github.com/windmill-labs/windmill/compare/v1.70.1...v1.71.0) (2023-02-28)
-
-
-### Features
-
-* **backend:** use counter for sleep/execution/pull durations ([e568690](https://github.com/windmill-labs/windmill/commit/e56869092a03fec4703ddd9ef65c89edb8122962))
-* **cli:** add autocompletions ([287b2db](https://github.com/windmill-labs/windmill/commit/287b2db22f7b56e90bcd0c4727c00096695c2e0d))
-* **frontend:** App drawer ([#1246](https://github.com/windmill-labs/windmill/issues/1246)) ([8a0d115](https://github.com/windmill-labs/windmill/commit/8a0d1158c4d7e970cb91e1adf4838e5efdbb39ff))
-* **frontend:** drawer for editing workspace scripts in flows ([6adc875](https://github.com/windmill-labs/windmill/commit/6adc87561070d8aceaba1838008cd7e6be2e2660))
-
-
-### Bug Fixes
-
-* **frontend:** Add more app custom css ([#1229](https://github.com/windmill-labs/windmill/issues/1229)) ([a4e4d18](https://github.com/windmill-labs/windmill/commit/a4e4d188ad10443dd0b7f104389594efc768dc59))
-* **frontend:** Add more app custom css ([#1247](https://github.com/windmill-labs/windmill/issues/1247)) ([1bb5ed9](https://github.com/windmill-labs/windmill/commit/1bb5ed9ae01fd7998b06833b6222e5dd5d774d35))
-* **frontend:** display currently selected filter even if not in list ([42d1cd6](https://github.com/windmill-labs/windmill/commit/42d1cd6456620ba917c560c87d736dc93634adff))
-* **frontend:** Fix deeply nested move ([#1245](https://github.com/windmill-labs/windmill/issues/1245)) ([a67f10e](https://github.com/windmill-labs/windmill/commit/a67f10eeb6fdb44bbb3a510badcc5ad0ae187a2b))
-* **frontend:** invisible subgrids have h-0 + app policies fix ([2244e83](https://github.com/windmill-labs/windmill/commit/2244e83b9da803a4cf46ab0825d7cb6cb0e24872))
-
-## [1.70.1](https://github.com/windmill-labs/windmill/compare/v1.70.0...v1.70.1) (2023-02-27)
-
-
-### Bug Fixes
-
-* **cli:** make cli resilient to systems without openable browsers ([c051ffe](https://github.com/windmill-labs/windmill/commit/c051ffeb42c1cff609f93da7745036ea722e17d4))
-* **frontend:** Disable move in nested subgrid ([#1238](https://github.com/windmill-labs/windmill/issues/1238)) ([70eab30](https://github.com/windmill-labs/windmill/commit/70eab303bd45111ae198d9b710bfd6f9f59e53b0))
-* **frontend:** Fix inline scripts list ([#1240](https://github.com/windmill-labs/windmill/issues/1240)) ([97602ac](https://github.com/windmill-labs/windmill/commit/97602ac6db1404d36d160a431ffcea6c0f567a48))
-* **frontend:** Fix subgrid lock ([#1232](https://github.com/windmill-labs/windmill/issues/1232)) ([8ee9d67](https://github.com/windmill-labs/windmill/commit/8ee9d67f4faa91446338b41c664ef91913eb8b81))
-
-## [1.70.1](https://github.com/windmill-labs/windmill/compare/v1.70.0...v1.70.1) (2023-02-27)
-
-
-### Bug Fixes
-
-* **cli:** make cli resilient to systems without openable browsers ([c051ffe](https://github.com/windmill-labs/windmill/commit/c051ffeb42c1cff609f93da7745036ea722e17d4))
-* **frontend:** Disable move in nested subgrid ([#1238](https://github.com/windmill-labs/windmill/issues/1238)) ([70eab30](https://github.com/windmill-labs/windmill/commit/70eab303bd45111ae198d9b710bfd6f9f59e53b0))
-* **frontend:** Fix subgrid lock ([#1232](https://github.com/windmill-labs/windmill/issues/1232)) ([8ee9d67](https://github.com/windmill-labs/windmill/commit/8ee9d67f4faa91446338b41c664ef91913eb8b81))
-
-## [1.70.0](https://github.com/windmill-labs/windmill/compare/v1.69.3...v1.70.0) (2023-02-27)
-
-
-### Features
-
-* **apps:** add ag grid ([b690d80](https://github.com/windmill-labs/windmill/commit/b690d801d4aa5695ee558e81d1ed114074dfcb83))
-* **frontend:** move to other grid ([#1230](https://github.com/windmill-labs/windmill/issues/1230)) ([104e4ac](https://github.com/windmill-labs/windmill/commit/104e4ac5e790c30e6fb6b27726776693038d4f19))
-
-
-### Bug Fixes
-
-* app setup and sync now uses 1.69.3 ([d38aff2](https://github.com/windmill-labs/windmill/commit/d38aff2fe228f23eb18c3991392928c064e6aca2))
-* **frontend:** Fix duplication ([#1237](https://github.com/windmill-labs/windmill/issues/1237)) ([e87f4fc](https://github.com/windmill-labs/windmill/commit/e87f4fc44b847a573f5acafc0348fbcbfcb2258f))
-* **frontend:** fix graph viewer id assignment ([e1f686d](https://github.com/windmill-labs/windmill/commit/e1f686d8508cfc1f73c43be08facc44217ca8de0))
-
-## [1.69.3](https://github.com/windmill-labs/windmill/compare/v1.69.2...v1.69.3) (2023-02-24)
-
-
-### Bug Fixes
-
-* **deno:** fix denoify buffer handling ([c2e5afd](https://github.com/windmill-labs/windmill/commit/c2e5afd4e07fb63375832f308da8c744616ee188))
-
-## [1.69.2](https://github.com/windmill-labs/windmill/compare/v1.69.1...v1.69.2) (2023-02-24)
-
-
-### Bug Fixes
-
-* **app:** fix all nested behavior ([dd28308](https://github.com/windmill-labs/windmill/commit/dd28308c3cf1877ba3f19dcd2bd20bf1c7896a99))
-* **frontend:** delete grid item ([008c30f](https://github.com/windmill-labs/windmill/commit/008c30fcaad64af512407f9889a9881fafac0868))
-* **frontend:** duplicate ([483407c](https://github.com/windmill-labs/windmill/commit/483407cdf0e1ed61de180a904934e950fed4adc3))
-* **frontend:** Fix findGridItem ([a8295d0](https://github.com/windmill-labs/windmill/commit/a8295d0b5acd08cec42b7939d907df5c25132644))
-* **frontend:** Fix findGridItem ([5bb77ed](https://github.com/windmill-labs/windmill/commit/5bb77edf45740a75e969b1bef31580271c9d5505))
-* **frontend:** Fix next id ([8ddcf4d](https://github.com/windmill-labs/windmill/commit/8ddcf4d9c1a8d6dd20ee241a3f308811c49e58f1))
-* **frontend:** gridtab ([fa105b4](https://github.com/windmill-labs/windmill/commit/fa105b4caeaa2d0e9704a48f6caf8d846839c23e))
-* **frontend:** rewrote utils ([ea1b2c2](https://github.com/windmill-labs/windmill/commit/ea1b2c29b95282df347ef9c5973917fa3880e843))
-* **frontend:** wip ([33ebe2d](https://github.com/windmill-labs/windmill/commit/33ebe2da8e81476be62a2567d5012573a8a010b6))
-
-## [1.69.1](https://github.com/windmill-labs/windmill/compare/v1.69.0...v1.69.1) (2023-02-24)
-
-
-### Bug Fixes
-
-* **deno:** remove mysql support waiting for deno fix ([dd7e8c7](https://github.com/windmill-labs/windmill/commit/dd7e8c742c83f6a1d13e4343ca626c0b5efc06fb))
-* **deno:** remove mysql support waiting for deno fix ([2f78132](https://github.com/windmill-labs/windmill/commit/2f78132e081bdf3d7468e022f0e981ebfa52cfb3))
-* **frontend:** containers and tab fixes v1 ([27cac3f](https://github.com/windmill-labs/windmill/commit/27cac3ffe69c4dac160e9e55ffd1eb8ea348d487))
-* **frontend:** containers and tab fixes v1 ([705703a](https://github.com/windmill-labs/windmill/commit/705703a5e2f2dc7ceb4c215221f72bf624799841))
-* **frontend:** containers and tab fixes v1 ([fac31c6](https://github.com/windmill-labs/windmill/commit/fac31c6628b289ad6aae92434e312c4be281a4d2))
-
-## [1.69.0](https://github.com/windmill-labs/windmill/compare/v1.68.0...v1.69.0) (2023-02-23)
-
-
-### Features
-
-* **frontend:** Duplicate component ([#1228](https://github.com/windmill-labs/windmill/issues/1228)) ([089a6b6](https://github.com/windmill-labs/windmill/commit/089a6b6ae52e8d28dd15e2f9a6ad900c5853d0a1))
-* **frontend:** Properly delete tab content ([#1227](https://github.com/windmill-labs/windmill/issues/1227)) ([857ee5f](https://github.com/windmill-labs/windmill/commit/857ee5f318466d12bf0d41515451798df087ab74))
-* **frontend:** Support deeply nested components ([#1225](https://github.com/windmill-labs/windmill/issues/1225)) ([6ad876e](https://github.com/windmill-labs/windmill/commit/6ad876ebb45a934b7a4dc980cf38a5228d7d11f1))
-
-
-### Bug Fixes
-
-* **cli:** .wmillignore whitelist behavior ([d543650](https://github.com/windmill-labs/windmill/commit/d543650b313c434e794ad800aefe4aeda83c0fed))
-
-## [1.68.0](https://github.com/windmill-labs/windmill/compare/v1.67.4...v1.68.0) (2023-02-23)
-
-
-### Features
-
-* **frontend:** Add more app component CSS customisation ([#1218](https://github.com/windmill-labs/windmill/issues/1218)) ([6044e3b](https://github.com/windmill-labs/windmill/commit/6044e3b6ef92e89b8f15f38bc2d0986ec64105d5))
-
-
-### Bug Fixes
-
-* **cli:** better ergonomics around workspace add ([40c12e6](https://github.com/windmill-labs/windmill/commit/40c12e6139c7b42d7ab169bab2dd37f8b43bea06))
-* **cli:** better ergonomics around workspaces ([3b7160e](https://github.com/windmill-labs/windmill/commit/3b7160e84aa454bdb5f343da99cfd97a6b319937))
-
-## [1.67.4](https://github.com/windmill-labs/windmill/compare/v1.67.3...v1.67.4) (2023-02-23)
-
-
-### Bug Fixes
-
-* **backend:** workflow check for has_failure_module ([e54dc3f](https://github.com/windmill-labs/windmill/commit/e54dc3ff97e4454a15b9efe25cc12f6c9e1e176b))
-
-## [1.67.3](https://github.com/windmill-labs/windmill/compare/v1.67.2...v1.67.3) (2023-02-23)
-
-
-### Bug Fixes
-
-* **cli:** ignone non wmill looking files ([ec57c59](https://github.com/windmill-labs/windmill/commit/ec57c5977f122b629a07e05bc3551662d518ce30))
-
-## [1.67.2](https://github.com/windmill-labs/windmill/compare/v1.67.1...v1.67.2) (2023-02-23)
-
-
-### Bug Fixes
-
-* **cli:** ignone non wmill looking files ([969e89f](https://github.com/windmill-labs/windmill/commit/969e89f8bbc10f6712920321b70ede35f19ab9ed))
-
-## [1.67.1](https://github.com/windmill-labs/windmill/compare/v1.67.0...v1.67.1) (2023-02-22)
-
-
-### Bug Fixes
-
-* **cli:** coloring nits ([3fa24ad](https://github.com/windmill-labs/windmill/commit/3fa24adad0a07ba2f469c545b28251b035efdf90))
-
-## [1.67.0](https://github.com/windmill-labs/windmill/compare/v1.66.1...v1.67.0) (2023-02-22)
-
-
-### Features
-
-* **frontend:** Add app sub grids ([#1208](https://github.com/windmill-labs/windmill/issues/1208)) ([dbc59e9](https://github.com/windmill-labs/windmill/commit/dbc59e952143ee5813780ad13794cef4e036911c))
-
-
-### Bug Fixes
-
-* **cli:** add --fail-conflicts to ci push ([0085b46](https://github.com/windmill-labs/windmill/commit/0085b46c1e3b8267fcafcb06ce72b4d820e49df5))
-
-## [1.66.1](https://github.com/windmill-labs/windmill/compare/v1.66.0...v1.66.1) (2023-02-22)
-
-
-### Bug Fixes
-
-* **cli:** delete workspace instead of archiving them ([70dfc8b](https://github.com/windmill-labs/windmill/commit/70dfc8b8d0293d80da7db14caa1b9eb0ed67653d))
-
-## [1.66.0](https://github.com/windmill-labs/windmill/compare/v1.65.0...v1.66.0) (2023-02-22)
-
-
-### Features
-
-* add delete flows ([e81f7bd](https://github.com/windmill-labs/windmill/commit/e81f7bd7239b73710da2a4ddec0da7805c13da06))
-* CLI refactor v1 ([e31d2ae](https://github.com/windmill-labs/windmill/commit/e31d2ae27f886e774ffc429eea80057f4f9f4213))
-* **frontend:** Add image app component ([#1213](https://github.com/windmill-labs/windmill/issues/1213)) ([a4b773a](https://github.com/windmill-labs/windmill/commit/a4b773af294554c5787f02ebda363c8d9a3eff1b))
-
-## [1.65.0](https://github.com/windmill-labs/windmill/compare/v1.64.0...v1.65.0) (2023-02-21)
-
-
-### Features
-
-* **apps:** add asJson for customcss ([71d6dad](https://github.com/windmill-labs/windmill/commit/71d6dad37cc239952ce7799609c02474b0b1fc81))
-* **apps:** add custom css for apps ([7f00e1c](https://github.com/windmill-labs/windmill/commit/7f00e1c1a8f2e905b0677d82ba547f55dc23b3e0))
-* **backend:** Zip Workspace Export ([#1201](https://github.com/windmill-labs/windmill/issues/1201)) ([5d109b3](https://github.com/windmill-labs/windmill/commit/5d109b3cd4b7749788f9cb9fcbe1949c45eedf1f))
-* **frontend:** Add divider app component ([#1209](https://github.com/windmill-labs/windmill/issues/1209)) ([c33e79e](https://github.com/windmill-labs/windmill/commit/c33e79e0b8d5ba1103d87fdd47fcd0e1071e19de))
-* **frontend:** Add file input app component ([#1211](https://github.com/windmill-labs/windmill/issues/1211)) ([d4b6d69](https://github.com/windmill-labs/windmill/commit/d4b6d691264bf21e4e2c97548aaad9aa80678a6b))
-* **frontend:** Add icon app component ([#1207](https://github.com/windmill-labs/windmill/issues/1207)) ([e4791c2](https://github.com/windmill-labs/windmill/commit/e4791c2b7e3a0e6b90c37bc1200f9cd0ab3b6845))
-
-## [1.64.0](https://github.com/windmill-labs/windmill/compare/v1.63.2...v1.64.0) (2023-02-16)
-
-
-### Features
-
-* **frontend:** Trigger settings drawer with URL hash ([#1185](https://github.com/windmill-labs/windmill/issues/1185)) ([8445697](https://github.com/windmill-labs/windmill/commit/8445697e31394ac11f3b8aa10af1546cc9c0041c))
-
-## [1.63.2](https://github.com/windmill-labs/windmill/compare/v1.63.1...v1.63.2) (2023-02-15)
-
-
-### Bug Fixes
-
-* **psql:** update pg client ([a2fbc57](https://github.com/windmill-labs/windmill/commit/a2fbc5702509bb259bae106baa9a6146360ec5dd))
-
-## [1.63.1](https://github.com/windmill-labs/windmill/compare/v1.63.0...v1.63.1) (2023-02-14)
-
-
-### Bug Fixes
-
-* update hub sync script ([03eb144](https://github.com/windmill-labs/windmill/commit/03eb1444c4a5dfbd170ba8d200784e530ca2f771))
-
-## [1.63.0](https://github.com/windmill-labs/windmill/compare/v1.62.0...v1.63.0) (2023-02-14)
-
-
-### Features
-
-* add mem peak info ([f584062](https://github.com/windmill-labs/windmill/commit/f584062f13aa7da8e767fd35de1aef7bbb67c3c8))
-* **frontend:** Minimal support for custom filenames ([#1190](https://github.com/windmill-labs/windmill/issues/1190)) ([b03b3be](https://github.com/windmill-labs/windmill/commit/b03b3be154efb0984f9623c27acc05617f125bc5))
-* **worker:** set oom_adj to 1000 to prioritize killing subprocess ([265fbc5](https://github.com/windmill-labs/windmill/commit/265fbc5835d029d510a794e171392884cb20bdae))
-
-
-### Bug Fixes
-
-* **python:** return none if argument is missing ([3f2754b](https://github.com/windmill-labs/windmill/commit/3f2754b3305f6cb65373d532ff0db6020bf07e45))
-* Update references to the docs ([#1191](https://github.com/windmill-labs/windmill/issues/1191)) ([a574270](https://github.com/windmill-labs/windmill/commit/a574270bc259f423c984259cd7d9a6d91b77815c))
-
-## [1.62.0](https://github.com/windmill-labs/windmill/compare/v1.61.1...v1.62.0) (2023-02-03)
-
-
-### Features
-
-* add INCLUDE_HEADERS env variable to pass value from request headers ([0921ba0](https://github.com/windmill-labs/windmill/commit/0921ba008535e945f2ec3255728c2e8c1f4c36dc))
-* add WHITELIST_WORKSPACES and BLACKLIST_WORKSPACES ([99568ea](https://github.com/windmill-labs/windmill/commit/99568eaa473d57123a7dde4007f8812e0053fb3f))
-* Add workspace webhook ([#1158](https://github.com/windmill-labs/windmill/issues/1158)) ([b9ac60f](https://github.com/windmill-labs/windmill/commit/b9ac60f8bb0662e364606c4b7b8a6e3c1e7e4041))
-* adding worker_busy ([23007f7](https://github.com/windmill-labs/windmill/commit/23007f7a71630fc2040e1be39db83ba56689e3c4))
-* **cli:** 2-Way sync ([#1071](https://github.com/windmill-labs/windmill/issues/1071)) ([cdd1619](https://github.com/windmill-labs/windmill/commit/cdd16195aeaf32e1f1d0648f48e4843954d16d9c))
-* **frontend:** App initial loading animations ([#1176](https://github.com/windmill-labs/windmill/issues/1176)) ([3305481](https://github.com/windmill-labs/windmill/commit/3305481d5d4ce598ceb57256cea851869cdaf25e))
-* **python:** add ADDITIONAL_PYTHON_PATHS ([14b32be](https://github.com/windmill-labs/windmill/commit/14b32be8b229372c57a167fd74cb958a96f0e8e6))
-
-
-### Bug Fixes
-
-* **frontend:** Render popups above components in app editor ([#1171](https://github.com/windmill-labs/windmill/issues/1171)) ([bc8d1a3](https://github.com/windmill-labs/windmill/commit/bc8d1a375ec7886357ce0ef5971bb35013c94d61))
-* **frontend:** Various fixes and improvements ([#1177](https://github.com/windmill-labs/windmill/issues/1177)) ([9f5500c](https://github.com/windmill-labs/windmill/commit/9f5500c1965ea50796d3bf289c0f9e0c929427f4))
-* navigate to new script page before saving script ([f171cd8](https://github.com/windmill-labs/windmill/commit/f171cd8b7c46677173572bac256cbb489a1b8526))
-
 ## [1.61.1](https://github.com/windmill-labs/windmill/compare/v1.61.0...v1.61.1) (2023-01-31)
 
 

Caddyfile

@@ -1,15 +1,5 @@
-{
-        auto_https off
-}
-
-http://{$BASE_URL} {
-        bind {$ADDRESS}
+{$BASE_URL} {
         bind {$ADDRESS}
         reverse_proxy /ws/* http://lsp:3001
-}
-
-https://{$BASE_URL}  {  
-  bind {$ADDRESS}
-  reverse_proxy /ws/* http://lsp:3001
-}
+        reverse_proxy /* http://windmill:8000
 }

Dockerfile

@@ -73,7 +73,7 @@ ARG features=""
 
 COPY --from=planner /windmill/recipe.json recipe.json
 
-RUN CARGO_NET_GIT_FETCH_WITH_CLI=true RUST_BACKTRACE=1 cargo chef cook --release --features "$features" --recipe-path recipe.json
+RUN CARGO_NET_GIT_FETCH_WITH_CLI=true cargo chef cook --release --features "$features" --recipe-path recipe.json
 
 COPY ./openflow.openapi.yaml /openflow.openapi.yaml
 COPY ./backend ./
@@ -85,8 +85,7 @@ COPY .git/ .git/
 RUN CARGO_NET_GIT_FETCH_WITH_CLI=true cargo build --release --features "$features"
 
 
-FROM python:3.11.2-slim-buster
-ARG TARGETPLATFORM
+FROM python:3.11.1-slim-buster
 
 ARG APP=/usr/src/app
 
@@ -130,10 +129,6 @@ COPY --from=nsjail /nsjail/nsjail /bin/nsjail
 
 COPY --from=denoland/deno:latest /usr/bin/deno /usr/bin/deno
 
-# docker does not support conditional COPY and we want to use the same Dockerfile for both amd64 and arm64 and privilege the official image
-COPY --from=lukechannings/deno:latest /usr/bin/deno /usr/bin/deno-arm
-RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then rm /usr/bin/deno-arm; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then mv /usr/bin/deno-arm /usr/bin/deno; fi
-
 RUN mkdir -p ${APP}
 
 WORKDIR ${APP}

LICENSE

@@ -8,9 +8,5 @@ or belonging to one of the below cases:
 
 The files under backend/ are AGPL Licensed.
 The files under frontend/ are AGPL Licensed.
-The files under python-client/ deno-client/ go-client/ are Apache 2.0 Licensed.
-
-The openapi files, including the OpenFlow spec is Apache 2.0 Licensed.
-
-All third party components incorporated into the Windmill Software are licensed under the
-original license provided by the owner of the applicable component.
+The files under python-client/ are Apache 2.0 Licensed.
+The files under community/ are Apache 2.0 Licensed.

README.md

@@ -5,7 +5,7 @@
     <em>.</em>
 </p>
 <p align=center>
-Open-source developer infrastructure for internal tools. Self-hostable alternative to Airplane, Pipedream, Superblocks and a simplified Temporal with autogenerated UIs to trigger workflows and scripts as internal apps. Scripts are turned into UIs and no-code modules, no-code modules can be composed into very rich flows, and script and flows can be triggered from internal UIs made with a low-code builder. The script languages supported are: Python, Typescript, Go, Bash, SQL.
+Open-source developer infrastructure for internal tools. Self-hostable alternative to Airplane, Pipedream, Superblocks and a simplified Temporal with autogenerated UIs to trigger workflows and scripts as internal apps. Scripts are turned into UIs and no-code modules, no-code modules can be composed into very rich flows, and script and flows can be triggered from internal UIs made with a low-code builder. The script languages supported are: Python, Typescript, Go, Bash.
 </p>
 
 <p align="center">
@@ -20,36 +20,55 @@ Open-source developer infrastructure for internal tools. Self-hostable alternati
 </a>
 </p>
 
+---
+
+**Try it (personal workspaces are free forever)**: <https://app.windmill.dev>
+
+**Documentation**: <https://docs.windmill.dev>
+
+**Discord**: <https://discord.gg/V7PM2YHsPB>
+
+**Hub**: <https://hub.windmill.dev>
+
+**Contributor's guide**: <https://docs.windmill.dev/docs/contributors_guide>
+
+**Roadmap**: <https://github.com/orgs/windmill-labs/projects/2>
+
+You can show your support for the project by starring this repo.
+
+Windmill Labs offers commercial licenses, an enterprise edition, local hub
+mirrors, and support: contact ruben@windmill.dev.
+
+---
+
+# Windmill
+
 <p align="center">
-  <a href="https://app.windmill.dev">Try it</a> - <a href="https://docs.windmill.dev/docs/intro/">Docs</a> - <a href="https://discord.gg/V7PM2YHsPB">Discord</a> - <a href="https://hub.windmill.dev">Hub</a> - <a href="https://docs.windmill.dev/docs/misc/contributing">Contributor's guide</a>
+<b>Disclaimer: </b>Windmill is in <b>BETA</b>. It is secure to run in production but we are still <a href="https://github.com/orgs/windmill-labs/projects/2">improving the product fast<a/>.
 </p>
 
-# Windmill - Turn scripts into workflows and UIs that you can share and run at scale
+![Windmill Screenshot](./imgs/windmill-flow.png)
+![Windmill Screenshot](./imgs/windmill.png)
 
-Windmill is <b>fully open-sourced (AGPLv3)</b> and Windmill Labs offers
-dedicated instance and commercial support and licenses.
+Windmill is <b>fully open-sourced (AGPLv3)</b>:
 
-![Windmill Diagram](/imgs/stacks.svg)
-
-https://user-images.githubusercontent.com/275584/218350457-bc2fdc3b-e667-4da5-a2bd-3bacc1f0ec79.mp4
-
-- [Windmill - Turn scripts into workflows and UIs that you can share and run at scale](#windmill---turn-scripts-into-workflows-and-uis-that-you-can-share-and-run-at-scale)
+- [Windmill](#windmill)
   - [Main Concepts](#main-concepts)
-  - [Show me some actual script code](#show-me-some-actual-script-code)
   - [CLI](#cli)
-    - [Running scripts locally](#running-scripts-locally)
+  - [Layout](#layout)
   - [Stack](#stack)
   - [Security](#security)
-    - [Sandboxing](#sandboxing)
+    - [Sandboxing and workload isolation](#sandboxing-and-workload-isolation)
     - [Secrets, credentials and sensitive values](#secrets-credentials-and-sensitive-values)
   - [Performance](#performance)
   - [Architecture](#architecture)
+    - [Big-picture Architecture](#big-picture-architecture)
+    - [Technical Architecture](#technical-architecture)
   - [How to self-host](#how-to-self-host)
     - [Docker compose](#docker-compose)
     - [Kubernetes (k8s) and Helm charts](#kubernetes-k8s-and-helm-charts)
-    - [Postgres without superuser](#postgres-without-superuser)
     - [Commercial license](#commercial-license)
-    - [OAuth for self-hosting](#oauth-for-self-hosting)
+    - [OAuth for self-hosting (very optional)](#oauth-for-self-hosting-very-optional)
     - [Resource types](#resource-types)
   - [Environment Variables](#environment-variables)
   - [Run a local dev setup](#run-a-local-dev-setup)
@@ -75,57 +94,25 @@ https://user-images.githubusercontent.com/275584/218350457-bc2fdc3b-e667-4da5-a2
 4. Build complex UI on top of your scripts and flows.
    ![Step 5](./imgs/windmill-builder.png)
 
-Scripts and flows can also be triggered by a cron schedule '_/5 _ \* \* \*' or
+Scripts and flows can also be triggered by a cron schedule '*/5 * * * *' or
 through webhooks.
 
 You can build your entire infra on top of Windmill!
 
-## Show me some actual script code
-
-```typescript
-import * as wmill from "https://deno.land/x/windmill@v1.62.0/mod.ts";
-//import any dependency  from npm
-
-import cowsay from "npm:cowsay@1.5.0";
-
-export async function main(
-  a: number,
-  // unions generate enums
-  b: "my" | "enum",
-  // default parameters prefill the field
-  d = "default arg",
-  // nested objects work c = { nested: "object" },
-  // permissioned and typed json
-  db: wmill.Resource<"postgresql">
-) {
-  const email = Deno.env.get("WM_EMAIL");
-  // variables are permissioned and by path
-  let variable = await wmill.getVariable("f/company-folder/my_secret");
-  const lastTimeRun = await wmill.getState();
-  // logs are printed and always inspectable
-  console.log(cowsay.say({ text: "hello " + email + " " + lastTimeRun }));
-  await wmill.setState(Date.now());
-
-  // return is serialized as JSON
-  return { foo: d, variable };
-}
-```
-
 ## CLI
 
 We have a powerful CLI to interact with the windmill platform and sync your
-scripts from local files, github repos and to run scripts and flows on the
-instance from local commands. See
+scripts from your own github repo. See
 [more details](https://github.com/windmill-labs/windmill/tree/main/cli)
 
 ![CLI Screencast](./cli/vhs/output/setup.gif)
 
-### Running scripts locally
+## Layout
 
-You can run your script locally easily, you simply need to pass the right
-environment variables for the `wmill` client library to fetch resource and
-variables from your instance if necessary. See more:
-<https://docs.windmill.dev/docs/advanced/local_development/>
+- `backend/`: Rust backend
+- `frontend`: Svelte frontend
+- `lsp/`: Lsp asssistant for the monaco editor
+- `<lang>-client/`: Windmill client for the given `<lang>`
 
 ## Stack
 
@@ -148,7 +135,7 @@ variables from your instance if necessary. See more:
 
 ## Security
 
-### Sandboxing
+### Sandboxing and workload isolation
 
 Windmill uses [nsjail](https://github.com/google/nsjail) on top of the deno
 sandboxing. It is production multi-tenant grade secure. Do not take our word for
@@ -174,22 +161,33 @@ back to the database is ~50ms. A typical lightweight deno job will take around
 
 <p align="center">
 
+### Big-picture Architecture
+
 <img src="./imgs/diagram.svg">
 
+### Technical Architecture
+
+<img src="./imgs/architecture.svg">
+
 </p>
 
 ## How to self-host
 
 We only provide docker-compose setup here. For more advanced setups, like
 compiling from source or using without a postgres super user, see
-[documentation](https://docs.windmill.dev/docs/advanced/self_host)
+[documentation](https://docs.windmill.dev/docs/how-tos/self_host)
 
 ### Docker compose
 
 `docker compose up` with the following docker-compose is sufficient:
 <https://github.com/windmill-labs/windmill/blob/main/docker-compose.yml>
 
-Go to http://localhost et voilà :)
+Go to https://localhost et voilà :)
+
+For older kernels < 4.18, set `DISABLE_NUSER=true` as env variable, otherwise
+nsjail will not be able to launch the isolated scripts.
+
+To disable nsjail altogether, set `DISABLE_NSJAIL=true`.
 
 The default super-admin user is: admin@windmill.dev / changeme
 
@@ -197,14 +195,7 @@ From there, you can create other users (do not forget to change the password!)
 
 ### Kubernetes (k8s) and Helm charts
 
-We publish helm charts at:
-<https://github.com/windmill-labs/windmill-helm-charts>
-
-### Postgres without superuser
-
-If you do not want, or cannot (for instance, in AWS Aurora or Cloud sql) use a
-postgres superuser, you can run `./init-db-as-superuser.sql` to init the
-required users for windmill.
+We publish helm charts at: <https://github.com/windmill-labs/windmill-helm-charts>
 
 ### Commercial license
 
@@ -216,14 +207,14 @@ comfortable with AGPLv3.
 To re-expose any Windmill parts to your users as a feature of your product, or
 to build a feature on top of Windmill, to comply with AGPLv3 your product must
 be AGPLv3 or you must get a commercial license. Contact us at
-<ruben@windmill.dev> if you have any doubts.
+<license@windmill.dev> if you have any doubts.
 
 In addition, a commercial license grants you a dedicated engineer to transition
 your current infrastructure to Windmill, support with tight SLA, audit logs
 export features, SSO, unlimited users creation, advanced permission managing
 features such as groups and the ability to create more than one workspace.
 
-### OAuth for self-hosting
+### OAuth for self-hosting (very optional)
 
 To get the same oauth integrations as Windmill Cloud, mount `oauth.json` with
 the following format:
@@ -240,13 +231,12 @@ the following format:
 
 and mount it at `/usr/src/app/oauth.json`.
 
-The redirect url for the oauth clients is:
-`<instance_url>/user/login_callback/<client>`
+The redirect url for the oauth clients is: `<instance_url>/user/login_callback/<client>`
 
 [The list of all possible "connect an app" oauth clients](https://github.com/windmill-labs/windmill/blob/main/backend/oauth_connect.json)
 
 To add more "connect an app" OAuth clients to the Windmill project, read the
-[Contributor's guide](https://docs.windmill.dev/docs/misc/contributing). We
+[Contributor's guide](https://docs.windmill.dev/docs/contributors_guide). We
 welcome contributions!
 
 You may also add your own custom OAuth2 IdP and OAuth2 Resource provider:
@@ -278,26 +268,22 @@ You may also add your own custom OAuth2 IdP and OAuth2 Resource provider:
 ### Resource types
 
 You will also want to import all the approved resource types from
-[WindmillHub](https://hub.windmill.dev). A setup script will prompt you to have
-it being synced automatically everyday.
+[WindmillHub](https://hub.windmill.dev). There is no automatic way to do this
+automatically currently, but it will be possible using a command with the
+upcoming CLI tool.
 
 ## Environment Variables
 
 | Environment Variable name | Default                | Description                                                                                                                                                                                        | Api Server/Worker/All |
 | ------------------------- | ---------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- |
 | DATABASE_URL              |                        | The Postgres database url.                                                                                                                                                                         | All                   |
-| DISABLE_NSJAIL            | true                   | Disable Nsjail Sandboxing                                                                                                                                                                          | Worker                |
-| SERVER_BIND_ADDR          | 0.0.0.0                | IP Address on which to bind listening socket                                                                                                                                                       | Server                |
-| PORT                      | 8000                   | Exposed port                                                                                                                                                                                       | Server                |
-| NUM_WORKERS               | 3                      | The number of worker per Worker instance (set to 1 on Eks to have 1 pod = 1 worker, set to 0 for an API only instance)                                                                             | Worker                |
-| DISABLE_SERVER            | false                  | Binary would operate as a worker only instance                                                                                                                                                     | Worker                |
+| DISABLE_NSJAIL            | true                   | Disable Nsjail Sandboxing                                                                                                                                                                          |                       |
+| NUM_WORKERS               | 3                      | The number of worker per Worker instance (set to 1 on Eks to have 1 pod = 1 worker)                                                                                                                | Worker                |
 | METRICS_ADDR              | None                   | The socket addr at which to expose Prometheus metrics at the /metrics path. Set to "true" to expose it on port 8001                                                                                | All                   |
 | JSON_FMT                  | false                  | Output the logs in json format instead of logfmt                                                                                                                                                   | All                   |
 | BASE_URL                  | http://localhost:8000  | The base url that is exposed publicly to access your instance                                                                                                                                      | Server                |
 | BASE_INTERNAL_URL         | http://localhost:8000  | The base url that is reachable by your workers to talk to the Servers. This help avoiding going through the external load balancer for VPC-internal requests.                                      | Worker                |
-| TIMEOUT                   | 300                    | The maximum time of execution of a script. When reached, the job is failed as having timedout.                                                                                                     | Worker                |
-| ZOMBIE_JOB_TIMEOUT        | 30                     | The timeout after which a job is considered to be zombie if the worker did not send pings about processing the job (every server check for zombie jobs every 30s)                                  | Server                |
-| RESTART_ZOMBIE_JOBS       | true                   | If true then a zombie job is restarted (in-place with the same uuid and some logs), if false the zombie job is failed                                                                              | Server                |
+| TIMEOUT                   | 300                    | The timeout in seconds for the execution of a script                                                                                                                                               | Worker                |
 | SLEEP_QUEUE               | 50                     | The number of ms to sleep in between the last check for new jobs in the DB. It is multiplied by NUM_WORKERS such that in average, for one worker instance, there is one pull every SLEEP_QUEUE ms. | Worker                |
 | MAX_LOG_SIZE              | 500000                 | The maximum number of characters a job can emit (log + result)                                                                                                                                     | Worker                |
 | DISABLE_NUSER             | false                  | If Nsjail is enabled, disable the nsjail's `clone_newuser` setting                                                                                                                                 | Worker                |
@@ -307,6 +293,7 @@ it being synced automatically everyday.
 | TAR_CACHE_RATE (EE only)  | 100                    | The rate at which to tar the cache of the workers. 100 means every 100th job in average (uniformly randomly distributed).                                                                          | Worker                |
 | SLACK_SIGNING_SECRET      | None                   | The signing secret of your Slack app. See [Slack documentation](https://api.slack.com/authentication/verifying-requests-from-slack)                                                                | Server                |
 | COOKIE_DOMAIN             | None                   | The domain of the cookie. If not set, the cookie will be set by the browser based on the full origin                                                                                               | Server                |
+| SERVE_CSP                 | None                   | The CSP directives to use when serving the frontend static assets                                                                                                                                  | Server                |
 | DENO_PATH                 | /usr/bin/deno          | The path to the deno binary.                                                                                                                                                                       | Worker                |
 | PYTHON_PATH               | /usr/local/bin/python3 | The path to the python binary.                                                                                                                                                                     | Worker                |
 | GO_PATH                   | /usr/bin/go            | The path to the go binary.                                                                                                                                                                         | Worker                |
@@ -321,13 +308,12 @@ it being synced automatically everyday.
 | QUEUE_LIMIT_WAIT_RESULT   | None                   | The number of max jobs in the queue before rejecting immediately the request in 'run_wait_result' endpoint. Takes precedence on the query arg. If none is specified, there are no limit.           | Worker                |
 | DENO_AUTH_TOKENS          | None                   | Custom DENO_AUTH_TOKENS to pass to worker to allow the use of private modules                                                                                                                      | Worker                |
 | DENO_FLAGS                | None                   | Override the flags passed to deno (default --allow-all) to tighten permissions. Minimum permissions needed are "--allow-read=args.json --allow-write=result.json"                                  | Worker                |
-| NPM_CONFIG_REGISTRY       | None                   | Registry to use for NPM dependencies, set if you have a private repository you need to use instead of the default public NPM registry                                                              | Worker                |
-| PIP_LOCAL_DEPENDENCIES    | None                   | Specify dependencies that are installed locally and do not need to be solved nor installed again                                                                                                   |                       |
+| PIP_LOCAL_DEPENDENCIES    | None                   | Specify dependencies that are installed locally and do not need to be solved nor installed again                                                                                                   |
 | ADDITIONAL_PYTHON_PATHS   | None                   | Specify python paths (separated by a :) to be appended to the PYTHONPATH of the python jobs. To be used with PIP_LOCAL_DEPENDENCIES to use python codebases within Windmill                        | Worker                |
 | INCLUDE_HEADERS           | None                   | Whitelist of headers that are passed to jobs as args (separated by a comma)                                                                                                                        | Server                |
-| WHITELIST_WORKSPACES      | None                   | Whitelist of workspaces this worker takes job from                                                                                                                                                 | Worker                |
-| BLACKLIST_WORKSPACES      | None                   | Blacklist of workspaces this worker takes job from                                                                                                                                                 | Worker                |
-| NEW_USER_WEBHOOK          | None                   | Webhook to notify of a new user added, signup/invite. Can hook back to windmill to send emails                                                                                                     | Server                |
+
+
+
 
 ## Run a local dev setup
 
@@ -374,4 +360,4 @@ running options.
 
 ## Copyright
 
-Windmill Labs, Inc 2023
+Windmill Labs, Inc 2022

backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.83.1"
+version = "1.61.1"
 authors.workspace = true
 edition.workspace = true
 
@@ -19,7 +19,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.83.1"
+version = "1.61.1"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
@@ -28,11 +28,7 @@ name = "windmill"
 path = "./src/main.rs"
 
 [features]
-enterprise = [
-    "windmill-worker/enterprise",
-    "windmill-queue/enterprise",
-    "windmill-api/enterprise",
-]
+enterprise = ["windmill-worker/enterprise", "windmill-queue/enterprise", "windmill-api/enterprise"]
 
 [dependencies]
 anyhow.workspace = true
@@ -87,7 +83,7 @@ chrono = { version = "^0", features = ["serde"] }
 tracing = "^0"
 tracing-subscriber = { version = "^0", features = ["env-filter", "json"] }
 prometheus = { version = "^0", default-features = false }
-cookie = { version = "0.17.0" }
+cookie = { version = "0.16.2" }
 phf = { version = "0.11", features = ["macros"] }
 rust-embed = "^6"
 mime_guess = "^2"
@@ -122,10 +118,10 @@ itertools = "^0"
 regex = "^1"
 deno_core = "^0"
 async-recursion = "^1"
-swc_common = "0.29.39"
-swc_ecma_parser = "0.128.2"
-swc_ecma_ast = "0.98.1"
-base64 = "0.21.0"
+swc_common = "^0"
+swc_ecma_parser = "^0"
+swc_ecma_ast = "^0"
+base64 = "^0"
 unicode-general-category = "^0"
 hmac = "0.12.1"
 sha2 = "0.10.6"
@@ -148,9 +144,4 @@ serde_derive = "1.0.147"
 const_format = { version = "0.2", features = ["rust_1_64", "rust_1_51"] }
 dyn-iter = "0.2.0"
 rsa = "0.7.2"
-async-stripe = { version = "0.14", features = [
-    "runtime-tokio-hyper",
-    "checkout",
-] }
-async_zip = { version = "0.0.11", features = ["full"] }
-once_cell = "1.17.1"
+async-stripe = { version = "0.14", features = ["runtime-tokio-hyper", "checkout"] }

backend/migrations/20221214105402_first_time_users.down.sql

@@ -1 +0,0 @@
--- Add down migration script here

backend/migrations/20221214105402_first_time_users.up.sql

@@ -1,12 +0,0 @@
--- Add up migration script here
-ALTER TABLE
-    password
-ADD
-    first_time_user boolean NOT NULL DEFAULT (false);
-
-UPDATE
-    password
-SET
-    first_time_user = true
-WHERE
-    email = 'admin@windmill.dev';

backend/migrations/20230126023323_webhook.down.sql

@@ -1 +0,0 @@
--- Add down migration script here

backend/migrations/20230126023323_webhook.up.sql

@@ -1,5 +0,0 @@
--- Add up migration script here
-ALTER TABLE
-    workspace_settings
-ADD
-    COLUMN webhook text;

backend/migrations/20230204182500_add_mem_peak.down.sql

@@ -1 +0,0 @@
--- Add down migration script here

backend/migrations/20230204182500_add_mem_peak.up.sql

@@ -1,3 +0,0 @@
--- Add up migration script here
-ALTER TABLE queue ADD COLUMN mem_peak INTEGER;
-ALTER TABLE completed_job ADD COLUMN mem_peak INTEGER;

backend/migrations/20230210145514_first_time_app.down.sql

@@ -1 +0,0 @@
--- Add down migration script here

backend/migrations/20230213145545_change_admin_app.down.sql

@@ -1 +0,0 @@
--- Add down migration script here

backend/migrations/20230214022802_goto_logout_setup.down.sql

@@ -1 +0,0 @@
--- Add down migration script here

backend/migrations/20230214135931_migrate_hub_sync_script.down.sql

@@ -1 +0,0 @@
--- Add down migration script here

backend/migrations/20230214135931_migrate_hub_sync_script.up.sql

@@ -1,16 +0,0 @@
--- Add up migration script here
--- Add up migration script here
-UPDATE script SET content = 'import wmill from "https://deno.land/x/wmill@v1.63.1/main.ts";
-export async function main() {
-  await run(
-    "workspace", "add", "__automation", "admins", Deno.env.get("BASE_INTERNAL_URL") + "/", "--token", Deno.env.get("WM_TOKEN"));
-
-  await run("hub", "pull");
-}
-
-async function run(...cmd: string[]) {
-  console.log("Running \"" + cmd.join('' '') + "\"");
-  await wmill.parse(cmd);
-}', summary = 'Synchronize Hub Resource types with admins workspace',
-description = 'Basic administrative script to sync latest resource types from hub to share to every workspace. Recommended to run at least once. On a schedule by default.'
-WHERE hash = -28028598712388162 AND workspace_id = 'admins';

backend/migrations/20230214144244_improve_app_setup.down.sql

@@ -1 +0,0 @@
--- Add down migration script here

backend/migrations/20230226130307_update_included_scripts_with_deno_changes.down.sql

@@ -1 +0,0 @@
--- Add down migration script here

backend/migrations/20230227100232_update_included_scripts_with_deno_changes.down.sql

@@ -1 +0,0 @@
--- Add down migration script here

backend/migrations/20230227131521_update_included_scripts_with_deno_changes.down.sql

@@ -1 +0,0 @@
--- Add down migration script here

backend/migrations/20230227131521_update_included_scripts_with_deno_changes.up.sql

@@ -1,16 +0,0 @@
--- Add up migration script here
-
-UPDATE script SET content = 'import wmill from "https://deno.land/x/wmill@v1.70.1/main.ts";
-export async function main() {
-  await run(
-    "workspace", "add", "__automation", "admins", Deno.env.get("BASE_INTERNAL_URL") + "/", "--token", Deno.env.get("WM_TOKEN"));
-
-  await run("hub", "pull");
-}
-
-async function run(...cmd: string[]) {
-  console.log("Running \"" + cmd.join('' '') + "\"");
-  await wmill.parse(cmd);
-}', summary = 'Synchronize Hub Resource types with admins workspace',
-description = 'Basic administrative script to sync latest resource types from hub to share to every workspace. Recommended to run at least once. On a schedule by default.'
-WHERE hash = -28028598712388162 AND workspace_id = 'admins';

backend/migrations/20230303064952_add_root_leaf_jobs.down.sql

@@ -1 +0,0 @@
--- Add down migration script here

backend/migrations/20230303064952_add_root_leaf_jobs.up.sql

@@ -1,3 +0,0 @@
--- Add up migration script here
-ALTER TABLE queue ADD COLUMN root_job uuid;
-ALTER TABLE queue ADD COLUMN leaf_jobs jsonb;

backend/migrations/20230327115727_update_app_setup.down.sql

@@ -1 +0,0 @@
--- Add down migration script here

backend/migrations/20230327201258_add_granular_share_apps.down.sql

@@ -1 +0,0 @@
--- Add down migration script here

backend/migrations/20230327201258_add_granular_share_apps.up.sql

@@ -1,11 +0,0 @@
--- Add up migration script here
-CREATE POLICY see_extra_perms_user ON app FOR ALL
-USING (extra_perms ? CONCAT('u/', current_setting('session.user')))
-WITH CHECK ((extra_perms ->> CONCAT('u/', current_setting('session.user')))::boolean);
-
-CREATE POLICY see_extra_perms_groups ON app FOR ALL
-USING (extra_perms ?| regexp_split_to_array(current_setting('session.pgroups'), ',')::text[])
-WITH CHECK (exists(
-    SELECT key, value FROM jsonb_each_text(extra_perms) 
-    WHERE SPLIT_PART(key, '/', 1) = 'g' AND key = ANY(regexp_split_to_array(current_setting('session.pgroups'), ',')::text[])
-    AND value::boolean));

backend/parsers/windmill-parser-bash/Cargo.toml

@@ -16,5 +16,4 @@ unicode-general-category.workspace = true
 itertools.workspace = true
 anyhow.workspace = true
 regex.workspace = true
-lazy_static.workspace = true
-serde_json.workspace = true
+lazy_static.workspace = true

backend/parsers/windmill-parser-bash/src/lib.rs

@@ -1,8 +1,6 @@
 #![allow(non_snake_case)] // TODO: switch to parse_* function naming
 
-use anyhow::anyhow;
 use regex::Regex;
-use serde_json::json;
 
 use std::collections::HashMap;
 use windmill_parser::{Arg, MainArgSignature, Typ};
@@ -19,32 +17,19 @@ pub fn parse_bash_sig(code: &str) -> windmill_common::error::Result<MainArgSigna
     }
 }
 
-lazy_static::lazy_static! {
-    static ref RE: Regex = Regex::new(r#"(?m)^(\w+)="\$(?:(\d+)|\{(\d+):-(.*)\})"$"#).unwrap();
-}
-
 fn parse_file(code: &str) -> anyhow::Result<Option<Vec<Arg>>> {
-    let mut hm: HashMap<i32, (String, Option<String>)> = HashMap::new();
-    for cap in RE.captures_iter(code) {
-        hm.insert(
-            cap.get(2)
-                .or(cap.get(3))
-                .and_then(|x| x.as_str().parse::<i32>().ok())
-                .ok_or_else(|| anyhow!("Impossible to parse arg digit"))?,
-            (
-                cap[1].to_string(),
-                cap.get(4).map(|x| x.as_str().to_string()),
-            ),
-        );
+    let mut hm = HashMap::new();
+    let re = Regex::new(r#"(?m)^(\w+)="\$(\d+)"$"#).unwrap();
+    for cap in re.captures_iter(code) {
+        hm.insert(cap[2].parse::<i32>()?, cap[1].to_string());
     }
     let mut args = vec![];
     for i in 1..20 {
         if hm.contains_key(&i) {
-            let (name, default) = hm.get(&i).unwrap();
             args.push(Arg {
-                name: name.clone(),
+                name: hm[&i].clone(),
                 typ: Typ::Str(None),
-                default: default.clone().map(|x| json!(x)),
+                default: None,
                 otyp: None,
                 has_default: false,
             });
@@ -58,8 +43,6 @@ fn parse_file(code: &str) -> anyhow::Result<Option<Vec<Arg>>> {
 #[cfg(test)]
 mod tests {
 
-    use serde_json::json;
-
     use super::*;
 
     #[test]
@@ -67,7 +50,8 @@ mod tests {
         let code = r#"
 token="$1"
 image="$2"
-digest="${3:-latest with spaces}"
+digest="${3:-latest}"
+foo="$4"
 
 "#;
         //println!("{}", serde_json::to_string()?);
@@ -90,13 +74,6 @@ digest="${3:-latest with spaces}"
                         typ: Typ::Str(None),
                         default: None,
                         has_default: false
-                    },
-                    Arg {
-                        otyp: None,
-                        name: "digest".to_string(),
-                        typ: Typ::Str(None),
-                        default: Some(json!("latest with spaces")),
-                        has_default: false
                     }
                 ]
             }

backend/parsers/windmill-parser-go/src/lib.rs

@@ -58,9 +58,6 @@ fn parse_go_typ(typ: &parser_go_ast::Expr) -> (Option<String>, Typ) {
             Some((*name).to_string()),
             match *name {
                 "int" => Typ::Int,
-                "int16" => Typ::Int,
-                "int32" => Typ::Int,
-                "int64" => Typ::Int,
                 "string" => Typ::Str(None),
                 "bool" => Typ::Bool,
                 _ => Typ::Unknown,

backend/parsers/windmill-parser-py/src/lib.rs

@@ -17,8 +17,10 @@ use serde_json::json;
 use windmill_common::error;
 use windmill_parser::{json_to_typ, Arg, MainArgSignature, Typ};
 
-use rustpython_parser as parser;
-use rustpython_parser::ast::{Constant, ExprKind, Located, StmtKind};
+use rustpython_parser::{
+    ast::{Constant, ExprKind, Located, StmtKind},
+    parser,
+};
 
 const DEF_MAIN: &str = "def main(";
 const FUNCTION_CALL: &str = "<function call>";
@@ -181,7 +183,6 @@ static PYTHON_IMPORTS_REPLACEMENT: phf::Map<&'static str, &'static str> = phf_ma
     "git" => "GitPython",
     "u" => "requests",
     "f" => "requests",
-    "." => "requests",
     "shopify" => "ShopifyAPI",
     "seleniumwire" => "selenium-wire",
     "openbb-terminal" => "openbb[all]",
@@ -225,23 +226,12 @@ pub fn parse_python_imports(code: &str) -> error::Result<Vec<String>> {
                     StmtKind::Import { names } => Some(
                         names
                             .into_iter()
-                            .map(|x| {
-                                let name = x.node.name;
-                                if name.starts_with('.') {
-                                    ".".to_string()
-                                } else {
-                                    name.split('.').next().unwrap_or("").to_string()
-                                }
-                            })
+                            .map(|x| x.node.name.split('.').next().unwrap_or("").to_string())
                             .map(replace_import)
                             .collect::<Vec<String>>(),
                     ),
-                    StmtKind::ImportFrom { level, module: Some(mod_), names: _ } => {
-                        let imprt = if level.is_some() && level.unwrap() > 0 {
-                            ".".to_string()
-                        } else {
-                            mod_.split('.').next().unwrap_or("").replace("_", "-")
-                        };
+                    StmtKind::ImportFrom { level: _, module: Some(mod_), names: _ } => {
+                        let imprt = mod_.split('.').next().unwrap_or("").replace("_", "-");
 
                         Some(vec![replace_import(imprt)])
                     }
@@ -454,7 +444,6 @@ import os
 import wmill
 from zanzibar.estonie import talin
 import matplotlib.pyplot as plt
-from . import tests
 
 def main():
     pass
@@ -462,7 +451,7 @@ def main():
 ";
         let r = parse_python_imports(code)?;
         // println!("{}", serde_json::to_string(&r)?);
-        assert_eq!(r, vec!["wmill", "zanzibar", "matplotlib", "requests"]);
+        assert_eq!(r, vec!["wmill", "zanzibar", "matplotlib"]);
         Ok(())
     }
 

backend/parsers/windmill-parser-ts/src/lib.rs

@@ -246,7 +246,7 @@ fn tstype_to_typ(ts_type: &TsType) -> (Typ, bool) {
 pub fn eval_sync(code: &str) -> Result<serde_json::Value, String> {
     let mut context = JsRuntime::new(RuntimeOptions::default());
     let code = format!("let x = {}; x", code);
-    let res = context.execute_script("<anon>", code);
+    let res = context.execute_script("<anon>", &code);
     match res {
         Ok(global) => {
             let scope = &mut context.handle_scope();

backend/src/main.rs

@@ -6,16 +6,14 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
-use std::net::{IpAddr, Ipv4Addr, SocketAddr};
+use std::net::SocketAddr;
 
 use git_version::git_version;
 use sqlx::{Pool, Postgres};
 use windmill_common::utils::rd_string;
+use windmill_worker::WorkerConfig;
 
 const GIT_VERSION: &str = git_version!(args = ["--tag", "--always"], fallback = "unknown-version");
-const DEFAULT_NUM_WORKERS: usize = 3;
-const DEFAULT_PORT: u16 = 8000;
-const DEFAULT_SERVER_BIND_ADDR: Ipv4Addr = Ipv4Addr::new(0, 0, 0, 0);
 
 mod ee;
 
@@ -28,7 +26,7 @@ async fn main() -> anyhow::Result<()> {
     let num_workers = std::env::var("NUM_WORKERS")
         .ok()
         .and_then(|x| x.parse::<i32>().ok())
-        .unwrap_or(DEFAULT_NUM_WORKERS as i32);
+        .unwrap_or(windmill_common::DEFAULT_NUM_WORKERS as i32);
 
     let metrics_addr: Option<SocketAddr> = std::env::var("METRICS_ADDR")
         .ok()
@@ -40,18 +38,6 @@ async fn main() -> anyhow::Result<()> {
         .transpose()?
         .flatten();
 
-    let server_bind_address: IpAddr = std::env::var("SERVER_BIND_ADDR")
-        .ok()
-        .and_then(|x| x.parse().ok())
-        .unwrap_or(IpAddr::from(DEFAULT_SERVER_BIND_ADDR));
-
-    let port: u16 = std::env::var("PORT")
-        .ok()
-        .and_then(|x| x.parse::<u16>().ok())
-        .unwrap_or(DEFAULT_PORT as u16);
-    let base_internal_url: String = std::env::var("BASE_INTERNAL_URL")
-        .unwrap_or_else(|_| format!("http://localhost:{}", port.to_string()));
-
     let server_mode = !std::env::var("DISABLE_SERVER")
         .ok()
         .and_then(|x| x.parse::<bool>().ok())
@@ -66,90 +52,99 @@ async fn main() -> anyhow::Result<()> {
     let (tx, rx) = tokio::sync::broadcast::channel::<()>(3);
     let shutdown_signal = windmill_common::shutdown_signal(tx);
 
-    #[cfg(feature = "enterprise")]
-    tracing::info!(
-        "
-##############################
-Windmill Enterprise Edition {GIT_VERSION}
-##############################"
-    );
+    let base_url = std::env::var("BASE_URL").unwrap_or_else(|_| "http://localhost".to_string());
 
-    #[cfg(not(feature = "enterprise"))]
-    tracing::info!(
-        "
-##############################
-Windmill Community Edition {GIT_VERSION}
-##############################"
-    );
-
-    display_config(vec![
-        "DISABLE_NSJAIL",
-        "DISABLE_SERVER",
-        "NUM_WORKERS",
-        "METRICS_ADDR",
-        "JSON_FMT",
-        "BASE_URL",
-        "BASE_INTERNAL_URL",
-        "TIMEOUT",
-        "ZOMBIE_JOB_TIMEOUT",
-        "RESTART_ZOMBIE_JOBS",
-        "SLEEP_QUEUE",
-        "MAX_LOG_SIZE",
-        "SERVER_BIND_ADDR",
-        "PORT",
-        "KEEP_JOB_DIR",
-        "S3_CACHE_BUCKET",
-        "TAR_CACHE_RATE",
-        "COOKIE_DOMAIN",
-        "PYTHON_PATH",
-        "DENO_PATH",
-        "GO_PATH",
-        "PIP_INDEX_URL",
-        "PIP_EXTRA_INDEX_URL",
-        "PIP_TRUSTED_HOST",
-        "PATH",
-        "HOME",
-        "DATABASE_CONNECTIONS",
-        "TIMEOUT_WAIT_RESULT",
-        "QUEUE_LIMIT_WAIT_RESULT",
-        "DENO_AUTH_TOKENS",
-        "DENO_FLAGS",
-        "NPM_CONFIG_REGISTRY",
-        "PIP_LOCAL_DEPENDENCIES",
-        "ADDITIONAL_PYTHON_PATHS",
-        "INCLUDE_HEADERS",
-        "WHITELIST_WORKSPACES",
-        "BLACKLIST_WORKSPACES",
-        "NEW_USER_WEBHOOK",
-        "CLOUD_HOSTED",
-    ]);
+    let base_internal_url =
+        std::env::var("BASE_INTERNAL_URL").unwrap_or_else(|_| "http://localhost:8000".to_string());
+    let timeout = std::env::var("TIMEOUT")
+        .ok()
+        .and_then(|x| x.parse::<i32>().ok())
+        .unwrap_or(windmill_common::DEFAULT_TIMEOUT);
 
     if server_mode || num_workers > 0 {
-        let addr = SocketAddr::from((server_bind_address, port));
+        let addr = SocketAddr::from(([0, 0, 0, 0], 8000));
 
+        let base_url2 = base_url.clone();
         let server_f = async {
             if server_mode {
-                windmill_api::run_server(db.clone(), addr, rx.resubscribe()).await?;
+                windmill_api::run_server(db.clone(), addr, base_url, rx.resubscribe()).await?;
             }
             Ok(()) as anyhow::Result<()>
         };
 
+        let base_url = base_url2.clone();
         let workers_f = async {
             if num_workers > 0 {
+                let sleep_queue = std::env::var("SLEEP_QUEUE")
+                    .ok()
+                    .and_then(|x| x.parse::<u64>().ok())
+                    .unwrap_or(windmill_common::DEFAULT_SLEEP_QUEUE);
+                let disable_nuser = std::env::var("DISABLE_NUSER")
+                    .ok()
+                    .and_then(|x| x.parse::<bool>().ok())
+                    .unwrap_or(false);
+                let disable_nsjail = std::env::var("DISABLE_NSJAIL")
+                    .ok()
+                    .and_then(|x| x.parse::<bool>().ok())
+                    .unwrap_or(true);
+                let keep_job_dir = std::env::var("KEEP_JOB_DIR")
+                    .ok()
+                    .and_then(|x| x.parse::<bool>().ok())
+                    .unwrap_or(false);
+                let license_key = std::env::var("LICENSE_KEY").ok();
+                let sync_bucket = std::env::var("S3_CACHE_BUCKET")
+                    .ok()
+                    .map(|e| Some(e))
+                    .unwrap_or(None);
+
+                #[cfg(feature = "enterprise")]
+                tracing::info!(
+                        "
+##############################
+Windmill Enterprise Edition {GIT_VERSION} LICENSE_KEY: {license_key:?}, S3_CACHE_BUCKET: {sync_bucket:?}
+##############################"
+                    );
+
+                #[cfg(not(feature = "enterprise"))]
+                tracing::info!(
+                    "
+##############################
+Windmill Community Edition {GIT_VERSION}
+##############################"
+                );
+
+                tracing::info!(
+                    "DISABLE_NSJAIL: {disable_nsjail}, DISABLE_NUSER: {disable_nuser}, BASE_URL: \
+                     {base_url}, SLEEP_QUEUE: {sleep_queue}, NUM_WORKERS: {num_workers}, TIMEOUT: \
+                     {timeout}, KEEP_JOB_DIR: {keep_job_dir}"
+                );
+
                 run_workers(
                     db.clone(),
-                    rx.resubscribe(),
+                    addr,
+                    timeout,
                     num_workers,
-                    base_internal_url.clone(),
+                    sleep_queue,
+                    WorkerConfig {
+                        disable_nsjail,
+                        disable_nuser,
+                        base_internal_url,
+                        base_url,
+                        keep_job_dir,
+                    },
+                    rx.resubscribe(),
+                    sync_bucket,
+                    license_key,
                 )
                 .await?;
             }
             Ok(()) as anyhow::Result<()>
         };
 
+        let base_url = base_url2;
         let monitor_f = async {
             if server_mode {
-                monitor_db(&db, rx.resubscribe(), &base_internal_url);
+                monitor_db(&db, timeout, base_url, rx.resubscribe());
             }
             Ok(()) as anyhow::Result<()>
         };
@@ -164,52 +159,38 @@ Windmill Community Edition {GIT_VERSION}
         };
 
         futures::try_join!(shutdown_signal, server_f, metrics_f, workers_f, monitor_f)?;
-    } else {
-        tracing::info!("Nothing to do, exiting.");
     }
     Ok(())
 }
 
-fn display_config(envs: Vec<&str>) {
-    tracing::info!(
-        "config: {}",
-        envs.iter()
-            .filter(|env| std::env::var(env).is_ok())
-            .map(|env| {
-                format!(
-                    "{}: {}",
-                    env,
-                    std::env::var(env).unwrap_or_else(|_| "not set".to_string())
-                )
-            })
-            .collect::<Vec<String>>()
-            .join(", ")
-    )
-}
-
 pub fn monitor_db(
     db: &Pool<Postgres>,
+    timeout: i32,
+    base_url: String,
     rx: tokio::sync::broadcast::Receiver<()>,
-    base_internal_url: &str,
 ) {
     let db1 = db.clone();
     let db2 = db.clone();
 
     let rx2 = rx.resubscribe();
-    let base_internal_url = base_internal_url.to_string();
+
     tokio::spawn(async move {
-        windmill_worker::handle_zombie_jobs_periodically(&db1, rx, &base_internal_url).await
+        windmill_worker::handle_zombie_jobs_periodically(&db1, timeout, &base_url, rx).await
     });
     tokio::spawn(async move { windmill_api::delete_expired_items_perdiodically(&db2, rx2).await });
 }
 
 pub async fn run_workers(
     db: Pool<Postgres>,
-    rx: tokio::sync::broadcast::Receiver<()>,
+    addr: SocketAddr,
+    timeout: i32,
     num_workers: i32,
-    base_internal_url: String,
+    sleep_queue: u64,
+    worker_config: WorkerConfig,
+    rx: tokio::sync::broadcast::Receiver<()>,
+    mut periodic_script: Option<String>,
+    license_key: Option<String>,
 ) -> anyhow::Result<()> {
-    let license_key = std::env::var("LICENSE_KEY").ok();
     #[cfg(feature = "enterprise")]
     ee::verify_license_key(license_key)?;
 
@@ -217,6 +198,12 @@ pub async fn run_workers(
     if license_key.is_some() {
         panic!("License key is required ONLY for the enterprise edition");
     }
+    #[cfg(not(feature = "enterprise"))]
+    if !worker_config.disable_nsjail {
+        tracing::warn!(
+            "NSJAIL to sandbox process in untrusted environments is an enterprise feature but allowed to be used for testing purposes"
+        );
+    }
 
     let instance_name = rd_string(5);
     let monitor = tokio_metrics::TaskMonitor::new();
@@ -236,17 +223,22 @@ pub async fn run_workers(
         let worker_name = format!("dt-worker-{}-{}", &instance_name, rd_string(5));
         let ip = ip.clone();
         let rx = rx.resubscribe();
-        let base_internal_url = base_internal_url.clone();
+        let worker_config = worker_config.clone();
+        let wp = periodic_script.take();
         handles.push(tokio::spawn(monitor.instrument(async move {
-            tracing::info!(worker = %worker_name, "starting worker");
+            tracing::info!(addr = %addr.to_string(), worker = %worker_name, "starting worker");
             windmill_worker::run_worker(
                 &db1,
+                timeout,
                 &instance_name,
                 worker_name,
                 i as u64,
+                num_workers as u64,
                 &ip,
+                sleep_queue,
+                worker_config,
+                wp,
                 rx,
-                &base_internal_url,
             )
             .await
         })));

backend/tests/worker.rs

@@ -6,8 +6,10 @@ use windmill_common::{
     flow_status::{FlowStatus, FlowStatusModule},
     flows::{FlowModule, FlowModuleValue, FlowValue, InputTransform},
     scripts::ScriptLang,
+    DEFAULT_SLEEP_QUEUE,
 };
 use windmill_queue::{get_queued_job, JobPayload, RawCode};
+use windmill_worker::WorkerConfig;
 
 async fn initialize_tracing() {
     use std::sync::Once;
@@ -87,7 +89,14 @@ impl ApiServer {
         let addr = sock.local_addr().unwrap();
         drop(sock);
 
-        let task = tokio::task::spawn(windmill_api::run_server(db.clone(), addr, rx));
+        let task = tokio::task::spawn({
+            windmill_api::run_server(
+                db.clone(),
+                addr,
+                format!("http://localhost:{}", addr.port()),
+                rx,
+            )
+        });
 
         return Self { addr, tx, task };
     }
@@ -686,7 +695,7 @@ def main(error, port):
             result,
             json!({
                 "recv": 42,
-                "from failure module": {"error": {"name": "IndexError", "stack": "  File \"/tmp/tmp/main/step_0.py\", line 5, in main\n    return sock.recv(1)[0]\n", "message": "index out of range"}},
+                "from failure module": {"error": {"name": "IndexError", "stack": "  File \"/tmp/inner.py\", line 5, in main\n    return sock.recv(1)[0]\n", "message": "index out of range"}},
             })
         );
     }
@@ -836,7 +845,6 @@ impl RunJob {
             /* scheduled_for_o */ None,
             /* schedule_path */ None,
             /* parent_job */ None,
-            /* root job  */ None,
             /* is_flow_step */ false,
             /* running */ false,
             None,
@@ -909,20 +917,43 @@ fn spawn_test_worker(
 ) {
     let (tx, rx) = tokio::sync::broadcast::channel(1);
     let db = db.to_owned();
+    let timeout = 4_000;
     let worker_instance: &str = "test worker instance";
     let worker_name: String = next_worker_name();
     let i_worker: u64 = Default::default();
+    let num_workers: u64 = 2;
     let ip: &str = Default::default();
+    let sleep_queue: u64 = DEFAULT_SLEEP_QUEUE / num_workers;
+    let port = port;
+    let worker_config = WorkerConfig {
+        base_internal_url: format!("http://localhost:{port}"),
+        base_url: format!("http://localhost:{port}"),
+        disable_nuser: std::env::var("DISABLE_NUSER")
+            .ok()
+            .and_then(|x| x.parse::<bool>().ok())
+            .unwrap_or(false),
+        disable_nsjail: std::env::var("DISABLE_NSJAIL")
+            .ok()
+            .and_then(|x| x.parse::<bool>().ok())
+            .unwrap_or(false),
+        keep_job_dir: std::env::var("KEEP_JOB_DIR")
+            .ok()
+            .and_then(|x| x.parse::<bool>().ok())
+            .unwrap_or(false),
+    };
     let future = async move {
-        let base_internal_url = format!("http://localhost:{}", port);
         windmill_worker::run_worker(
             &db,
+            timeout,
             worker_instance,
             worker_name,
             i_worker,
+            num_workers,
             ip,
+            sleep_queue,
+            worker_config,
+            None,
             rx,
-            &base_internal_url,
         )
         .await
     };
@@ -2069,7 +2100,7 @@ async fn test_branchall_skip_failure(db: Pool<Postgres>) {
 
     assert_eq!(
         result,
-        serde_json::json!([{"error": {"name": "Error", "stack": "Error: failure\n    at main (file:///tmp/main.ts:1:31)\n    at run (file:///tmp/wrapper.ts:9:26)\n    at file:///tmp/wrapper.ts:14:1", "message": "failure"}}, [1,3]])
+        serde_json::json!([{"error": {"name": "Error", "stack": "Error: failure\n    at main (file:///tmp/inner.ts:1:31)\n    at run (file:///tmp/main.ts:9:26)\n    at file:///tmp/main.ts:14:1", "message": "failure"}}, [1,3]])
     );
 
     let flow: FlowValue = serde_json::from_value(json!({
@@ -2103,7 +2134,7 @@ async fn test_branchall_skip_failure(db: Pool<Postgres>) {
 
     assert_eq!(
         result,
-        serde_json::json!([ {"error": {"name": "Error", "stack": "Error: failure\n    at main (file:///tmp/main.ts:1:31)\n    at run (file:///tmp/wrapper.ts:9:26)\n    at file:///tmp/wrapper.ts:14:1", "message": "failure"}}, [1, 2]])
+        serde_json::json!([ {"error": {"name": "Error", "stack": "Error: failure\n    at main (file:///tmp/inner.ts:1:31)\n    at run (file:///tmp/main.ts:9:26)\n    at file:///tmp/main.ts:14:1", "message": "failure"}}, [1, 2]])
     );
 }
 

backend/windmill-api/Cargo.toml

@@ -8,8 +8,12 @@ edition.workspace = true
 name = "windmill_api"
 path = "src/lib.rs"
 
+[[bin]]
+name = "windmill_api"
+path = "src/main.rs"
+
 [features]
-enterprise = ["windmill-queue/enterprise", "async-stripe"]
+enterprise = ["windmill-queue/enterprise"]
 
 [dependencies]
 windmill-queue.workspace = true
@@ -65,8 +69,5 @@ hmac.workspace = true
 cookie.workspace = true
 sha2.workspace = true
 urlencoding.workspace = true
-async-stripe = { workspace = true, optional = true }
-lazy_static.workspace = true
-prometheus.workspace = true
-async_zip.workspace = true
-regex.workspace = true
+async-stripe.workspace = true
+lazy_static.workspace = true

backend/windmill-api/openapi.yaml

@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.83.1
+  version: 1.61.1
   title: Windmill API
 
   contact:
@@ -204,6 +204,7 @@ paths:
               schema:
                 type: string
 
+
   /w/{workspace}/users/is_owner/{path}:
     get:
       summary: is owner of path
@@ -882,8 +883,6 @@ paths:
                     type: string
                   customer_id:
                     type: string
-                  webhook:
-                    type: string
 
   /w/{workspace}/workspaces/premium_info:
     get:
@@ -963,33 +962,6 @@ paths:
               schema:
                 type: string
 
-  /w/{workspace}/workspaces/edit_webhook:
-    post:
-      summary: edit webhook
-      operationId: editWebhook
-      tags:
-        - workspace
-      parameters:
-        - $ref: "#/components/parameters/WorkspaceId"
-      requestBody:
-        description: WorkspaceWebhook
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                webhook:
-                  type: string
-
-      responses:
-        "200":
-          description: status
-          content:
-            text/plain:
-              schema:
-                type: string
-
   /w/{workspace}/users/list:
     get:
       summary: list users
@@ -1091,10 +1063,6 @@ paths:
         - variable
       parameters:
         - $ref: "#/components/parameters/WorkspaceId"
-        - name: already_encrypted
-          in: query
-          schema:
-            type: boolean
       requestBody:
         description: new variable
         required: true
@@ -1136,10 +1104,6 @@ paths:
       parameters:
         - $ref: "#/components/parameters/WorkspaceId"
         - $ref: "#/components/parameters/Path"
-        - name: already_encrypted
-          in: query
-          schema:
-            type: boolean
       requestBody:
         description: updated variable
         required: true
@@ -1548,7 +1512,7 @@ paths:
         required: true
         content:
           application/json:
-            schema:
+            schema: 
               type: object
               properties:
                 value: {}
@@ -2102,6 +2066,7 @@ paths:
                 items:
                   type: string
 
+
   /w/{workspace}/scripts/create:
     post:
       summary: create script
@@ -2276,7 +2241,7 @@ paths:
 
   /w/{workspace}/scripts/delete/h/{hash}:
     post:
-      summary: delete script by hash (erase content but keep hash, require admin)
+      summary: delete script by hash (erase content but keep hash)
       operationId: deleteScriptByHash
       tags:
         - script
@@ -2291,23 +2256,6 @@ paths:
               schema:
                 $ref: "#/components/schemas/Script"
 
-  /w/{workspace}/scripts/delete/p/{path}:
-    post:
-      summary: delete all scripts at a given path (require admin)
-      operationId: deleteScriptByPath
-      tags:
-        - script
-      parameters:
-        - $ref: "#/components/parameters/WorkspaceId"
-        - $ref: "#/components/parameters/ScriptPath"
-      responses:
-        "200":
-          description: script path
-          content:
-            application/json:
-              schema:
-                type: string
-
   /w/{workspace}/scripts/get/p/{path}:
     get:
       summary: get script by path
@@ -2553,6 +2501,11 @@ paths:
           required: true
           schema:
             type: string
+        - name: skip_direct
+          description: Skip checking that the node is part of the given flow.
+          in: query
+          schema:
+            type: boolean
       responses:
         "200":
           description: job result
@@ -2726,23 +2679,6 @@ paths:
               schema:
                 type: string
 
-  /w/{workspace}/flows/delete/{path}:
-    delete:
-      summary: delete flow by path
-      operationId: deleteFlowByPath
-      tags:
-        - flow
-      parameters:
-        - $ref: "#/components/parameters/WorkspaceId"
-        - $ref: "#/components/parameters/ScriptPath"
-      responses:
-        "200":
-          description: flow delete
-          content:
-            text/plain:
-              schema:
-                type: string
-
   /w/{workspace}/apps/list:
     get:
       summary: list all available apps
@@ -2833,6 +2769,7 @@ paths:
               schema:
                 $ref: "#/components/schemas/AppWithLastVersion"
 
+
   /w/{workspace}/apps/secret_of/{path}:
     get:
       summary: get public secret of app
@@ -3165,14 +3102,12 @@ paths:
         - $ref: "#/components/parameters/ScriptExactPath"
         - $ref: "#/components/parameters/ScriptStartPath"
         - $ref: "#/components/parameters/ScriptExactHash"
-        - $ref: "#/components/parameters/StartedBefore"
-        - $ref: "#/components/parameters/StartedAfter"
+        - $ref: "#/components/parameters/CreatedBefore"
+        - $ref: "#/components/parameters/CreatedAfter"
         - $ref: "#/components/parameters/Success"
         - $ref: "#/components/parameters/JobKinds"
         - $ref: "#/components/parameters/Suspended"
         - $ref: "#/components/parameters/Running"
-        - $ref: "#/components/parameters/ArgsFilter"
-        - $ref: "#/components/parameters/ResultFilter"
       responses:
         "200":
           description: All available queued jobs
@@ -3197,12 +3132,10 @@ paths:
         - $ref: "#/components/parameters/ScriptExactPath"
         - $ref: "#/components/parameters/ScriptStartPath"
         - $ref: "#/components/parameters/ScriptExactHash"
-        - $ref: "#/components/parameters/StartedBefore"
-        - $ref: "#/components/parameters/StartedAfter"
+        - $ref: "#/components/parameters/CreatedBefore"
+        - $ref: "#/components/parameters/CreatedAfter"
         - $ref: "#/components/parameters/Success"
         - $ref: "#/components/parameters/JobKinds"
-        - $ref: "#/components/parameters/ArgsFilter"
-        - $ref: "#/components/parameters/ResultFilter"
         - name: is_skipped
           description: is the job skipped
           in: query
@@ -3236,11 +3169,9 @@ paths:
         - $ref: "#/components/parameters/ScriptExactPath"
         - $ref: "#/components/parameters/ScriptStartPath"
         - $ref: "#/components/parameters/ScriptExactHash"
-        - $ref: "#/components/parameters/StartedBefore"
-        - $ref: "#/components/parameters/StartedAfter"
+        - $ref: "#/components/parameters/CreatedBefore"
+        - $ref: "#/components/parameters/CreatedAfter"
         - $ref: "#/components/parameters/JobKinds"
-        - $ref: "#/components/parameters/ArgsFilter"
-        - $ref: "#/components/parameters/ResultFilter"
         - name: is_skipped
           description: is the job skipped
           in: query
@@ -3332,8 +3263,6 @@ paths:
                     type: boolean
                   new_logs:
                     type: string
-                  mem_peak:
-                    type: integer
 
   /w/{workspace}/jobs/completed/get/{id}:
     get:
@@ -3352,22 +3281,6 @@ paths:
               schema:
                 $ref: "#/components/schemas/CompletedJob"
 
-  /w/{workspace}/jobs/completed/get_result/{id}:
-    get:
-      summary: get completed job result
-      operationId: getCompletedJobResult
-      tags:
-        - job
-      parameters:
-        - $ref: "#/components/parameters/WorkspaceId"
-        - $ref: "#/components/parameters/JobId"
-      responses:
-        "200":
-          description: result
-          content:
-            application/json:
-              schema: {}
-
   /w/{workspace}/jobs/completed/delete/{id}:
     post:
       summary: delete completed job (erase content but keep run id)
@@ -3441,7 +3354,7 @@ paths:
 
   /w/{workspace}/jobs/resume_urls/{id}/{resume_id}:
     get:
-      summary: get resume urls given a job_id, resume_id and a nonce to resume a flow
+      summary:  get resume urls given a job_id, resume_id and a nonce to resume a flow
       operationId: getResumeUrls
       tags:
         - job
@@ -3467,7 +3380,7 @@ paths:
                 properties:
                   approvalPage:
                     type: string
-                  resume:
+                  resume: 
                     type: string
                   cancel:
                     type: string
@@ -4112,7 +4025,7 @@ paths:
                   type: string
                 owners:
                   type: array
-                  items:
+                  items: 
                     type: string
                 extra_perms:
                   additionalProperties:
@@ -4146,7 +4059,7 @@ paths:
               properties:
                 owners:
                   type: array
-                  items:
+                  items: 
                     type: string
                 extra_perms:
                   additionalProperties:
@@ -4317,8 +4230,7 @@ paths:
           required: true
           schema:
             type: string
-            enum:
-              [script, group_, resource, schedule, variable, flow, folder, app]
+            enum: [script, group_, resource, schedule, variable, flow, folder, app]
       responses:
         "200":
           description: acls
@@ -4343,8 +4255,7 @@ paths:
           required: true
           schema:
             type: string
-            enum:
-              [script, group_, resource, schedule, variable, flow, folder, app]
+            enum: [script, group_, resource, schedule, variable, flow, folder, app]
       requestBody:
         description: acl to add
         required: true
@@ -4380,8 +4291,7 @@ paths:
           required: true
           schema:
             type: string
-            enum:
-              [script, group_, resource, schedule, variable, flow, folder, app]
+            enum: [script, group_, resource, schedule, variable, flow, folder, app]
       requestBody:
         description: acl to add
         required: true
@@ -4401,18 +4311,19 @@ paths:
               schema:
                 type: string
 
+
   /w/{workspace}/capture_u/{path}:
-    post:
-      summary: update flow preview capture
-      operationId: updateCapture
-      tags:
-        - capture
-      parameters:
-        - $ref: "#/components/parameters/WorkspaceId"
-        - $ref: "#/components/parameters/Path"
-      responses:
-        "204":
-          description: flow preview captured
+      post:
+        summary: update flow preview capture
+        operationId: updateCapture
+        tags:
+          - capture
+        parameters:
+          - $ref: "#/components/parameters/WorkspaceId"
+          - $ref: "#/components/parameters/Path"
+        responses:
+          "204":
+            description: flow preview captured
 
   /w/{workspace}/capture/{path}:
     put:
@@ -4619,15 +4530,15 @@ components:
       in: query
       schema:
         type: string
-    StartedBefore:
-      name: started_before
+    CreatedBefore:
+      name: created_before
       description: filter on created before (inclusive) timestamp
       in: query
       schema:
         type: string
         format: date-time
-    StartedAfter:
-      name: started_after
+    CreatedAfter:
+      name: created_after
       description: filter on created after (exclusive) timestamp
       in: query
       schema:
@@ -4651,19 +4562,6 @@ components:
       in: query
       schema:
         type: boolean
-    ArgsFilter:
-      name: args
-      description: filter on jobs containing those args as a json subset (@> in postgres)
-      in: query
-      schema:
-        type: string
-
-    ResultFilter:
-      name: result
-      description: filter on jobs containing those result as a json subset (@> in postgres)
-      in: query
-      schema:
-        type: string
     After:
       name: after
       description: filter on created after (exclusive) timestamp
@@ -4863,8 +4761,6 @@ components:
           type: string
         visible_to_owner:
           type: boolean
-        mem_peak:
-          type: integer
       required:
         - id
         - running
@@ -4951,8 +4847,6 @@ components:
           type: string
         visible_to_owner:
           type: boolean
-        mem_peak:
-          type: integer
       required:
         - id
         - created_by
@@ -5568,8 +5462,9 @@ components:
           type: string
         worker_instance:
           type: string
-        last_ping:
-          type: number
+        ping_at:
+          type: string
+          format: date-time
         started_at:
           type: string
           format: date-time

backend/windmill-api/src/apps.rs

@@ -12,8 +12,6 @@ use crate::{
     jobs::script_path_to_payload,
     users::{require_owner_of_path, Authed, OptAuthed},
     variables::build_crypt,
-    webhook_util::{WebhookMessage, WebhookShared},
-    HTTP_CLIENT,
 };
 use axum::{
     extract::{Extension, Json, Path, Query},
@@ -22,6 +20,7 @@ use axum::{
 };
 use hyper::StatusCode;
 use magic_crypt::MagicCryptTrait;
+use reqwest::Client;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Map, Value};
 use sha2::{Digest, Sha256};
@@ -170,7 +169,7 @@ async fn list_apps(
         )
         .order_desc("favorite.path IS NOT NULL")
         .order_by("app_version.created_at", true)
-        .and_where("app.workspace_id = ?".bind(&w_id))
+        .and_where("app.workspace_id = ? OR app.workspace_id = 'starter'".bind(&w_id))
         .offset(offset)
         .limit(per_page)
         .clone();
@@ -311,19 +310,11 @@ async fn get_secret_id(
 async fn create_app(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path(w_id): Path<String>,
-    Json(mut app): Json<CreateApp>,
+    Json(app): Json<CreateApp>,
 ) -> Result<(StatusCode, String)> {
     let mut tx = user_db.begin(&authed).await?;
 
-    app.policy.on_behalf_of = Some(username_to_permissioned_as(&authed.username));
-    app.policy.on_behalf_of_email = Some(authed.email);
-
-    if &app.path == "" {
-        return Err(Error::BadRequest("App path cannot be empty".to_string()));
-    }
-
     let id = sqlx::query_scalar!(
         "INSERT INTO app
             (workspace_id, path, summary, policy, versions)
@@ -365,19 +356,17 @@ async fn create_app(
         None,
     )
     .await?;
-
     tx.commit().await?;
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::CreateApp { workspace: w_id, path: app.path.clone() },
-    );
 
     Ok((StatusCode::CREATED, app.path))
 }
 
-async fn list_hub_apps(Authed { email, .. }: Authed) -> JsonResult<serde_json::Value> {
+async fn list_hub_apps(
+    Authed { email, .. }: Authed,
+    Extension(http_client): Extension<Client>,
+) -> JsonResult<serde_json::Value> {
     let flows = list_elems_from_hub(
-        &HTTP_CLIENT,
+        http_client,
         "https://hub.windmill.dev/searchUiData?approved=true",
         &email,
     )
@@ -388,9 +377,10 @@ async fn list_hub_apps(Authed { email, .. }: Authed) -> JsonResult<serde_json::V
 pub async fn get_hub_app_by_id(
     Authed { email, .. }: Authed,
     Path(id): Path<i32>,
+    Extension(http_client): Extension<Client>,
 ) -> JsonResult<serde_json::Value> {
     let value = http_get_from_hub(
-        &HTTP_CLIENT,
+        http_client,
         &format!("https://hub.windmill.dev/apps/{id}/json"),
         &email,
         false,
@@ -405,7 +395,6 @@ pub async fn get_hub_app_by_id(
 async fn delete_app(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path((w_id, path)): Path<(String, StripPath)>,
 ) -> Result<String> {
     let path = path.to_path();
@@ -429,10 +418,6 @@ async fn delete_app(
     )
     .await?;
     tx.commit().await?;
-    webhook.send_message(
-        w_id.clone().clone(),
-        WebhookMessage::DeleteApp { workspace: w_id, path: path.to_owned() },
-    );
 
     Ok(format!("app {} deleted", path))
 }
@@ -440,7 +425,6 @@ async fn delete_app(
 async fn update_app(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Extension(db): Extension<DB>,
     Path((w_id, path)): Path<(String, StripPath)>,
     Json(ns): Json<EditApp>,
@@ -470,9 +454,7 @@ async fn update_app(
             sqlb.set_str("summary", nsummary);
         }
 
-        if let Some(mut npolicy) = ns.policy {
-            npolicy.on_behalf_of = Some(username_to_permissioned_as(&authed.username));
-            npolicy.on_behalf_of_email = Some(authed.email);
+        if let Some(npolicy) = ns.policy {
             sqlb.set(
                 "policy",
                 &format!(
@@ -532,14 +514,6 @@ async fn update_app(
     )
     .await?;
     tx.commit().await?;
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::UpdateApp {
-            workspace: w_id,
-            old_path: path.to_owned(),
-            new_path: npath.clone(),
-        },
-    );
 
     Ok(format!("app {} updated (npath: {:?})", path, npath))
 }
@@ -679,7 +653,6 @@ async fn execute_component(
         None,
         None,
         None,
-        None,
         false,
         false,
         None,
@@ -737,9 +710,6 @@ fn build_args(
     path: String,
     args: &Map<String, Value>,
 ) -> Result<Map<String, Value>> {
-    // disallow var and res access in args coming from the user for security reasons
-    args.into_iter()
-        .try_for_each(|x| disallow_var_res_access(x.1))?;
     let static_args = policy
         .triggerables
         .get(&path)
@@ -760,20 +730,3 @@ fn build_args(
     }
     Ok(args)
 }
-
-fn disallow_var_res_access(args: &serde_json::Value) -> Result<()> {
-    match args {
-        Value::Object(v) => v.into_iter().try_for_each(|x| disallow_var_res_access(x.1)),
-        Value::Array(arr) => arr.into_iter().try_for_each(|v| disallow_var_res_access(v)),
-        Value::String(s) => {
-            if s.starts_with("$var:") || s.starts_with("$res:") {
-                Err(Error::BadRequest(format!(
-                    "For security reasons, variable or resource access is not allowed as dynamic argument"
-                )))
-            } else {
-                Ok(())
-            }
-        }
-        _ => Ok(()),
-    }
-}

backend/windmill-api/src/capture.rs

@@ -7,12 +7,11 @@
  */
 
 use axum::{
-    extract::{Extension, Path, Query},
+    extract::{Extension, Path},
     routing::{get, post, put},
     Json, Router,
 };
-use hyper::{HeaderMap, StatusCode};
-use serde::Deserialize;
+use hyper::StatusCode;
 use windmill_common::{
     error::{JsonResult, Result},
     utils::{not_found_if_none, StripPath},
@@ -20,7 +19,6 @@ use windmill_common::{
 
 use crate::{
     db::{UserDB, DB},
-    jobs::add_include_headers,
     users::Authed,
 };
 
@@ -85,21 +83,13 @@ pub async fn new_payload(
     Ok(StatusCode::CREATED)
 }
 
-#[derive(Deserialize, Clone)]
-pub struct IncludeHeaderQuery {
-    include_header: Option<String>,
-}
-
 pub async fn update_payload(
     Extension(db): Extension<DB>,
     Path((w_id, path)): Path<(String, StripPath)>,
-    Query(run_query): Query<IncludeHeaderQuery>,
-    headers: HeaderMap,
-    Json(args): Json<Option<serde_json::Map<String, serde_json::Value>>>,
+    Json(payload): Json<serde_json::Value>,
 ) -> Result<StatusCode> {
     let mut tx = db.begin().await?;
 
-    let args = add_include_headers(&run_query.include_header, headers, args.unwrap_or_default());
     sqlx::query!(
         "
        UPDATE capture
@@ -109,7 +99,7 @@ pub async fn update_payload(
         ",
         &w_id,
         &path.to_path(),
-        serde_json::json!(args),
+        &payload,
     )
     .execute(&mut tx)
     .await?;

backend/windmill-api/src/flows.rs

@@ -7,11 +7,12 @@
  */
 
 use hyper::StatusCode;
+use reqwest::Client;
 use sql_builder::prelude::*;
 
 use axum::{
     extract::{Extension, Path, Query},
-    routing::{delete, get, post},
+    routing::{get, post},
     Json, Router,
 };
 use sql_builder::SqlBuilder;
@@ -31,8 +32,6 @@ use crate::{
     db::{UserDB, DB},
     schedule::clear_schedule,
     users::{require_owner_of_path, Authed},
-    webhook_util::{WebhookMessage, WebhookShared},
-    HTTP_CLIENT,
 };
 
 pub fn workspaced_service() -> Router {
@@ -41,7 +40,6 @@ pub fn workspaced_service() -> Router {
         .route("/create", post(create_flow))
         .route("/update/*path", post(update_flow))
         .route("/archive/*path", post(archive_flow_by_path))
-        .route("/delete/*path", delete(delete_flow_by_path))
         .route("/get/*path", get(get_flow_by_path))
         .route("/exists/*path", get(exists_flow_by_path))
         .route("/list_paths", get(list_paths))
@@ -82,7 +80,7 @@ async fn list_flows(
         )
         .order_desc("favorite.path IS NOT NULL")
         .order_by("edited_at", lq.order_desc.unwrap_or(true))
-        .and_where("o.workspace_id = ?".bind(&w_id))
+        .and_where("o.workspace_id = ? OR o.workspace_id = 'starter'".bind(&w_id))
         .offset(offset)
         .limit(per_page)
         .clone();
@@ -112,9 +110,12 @@ async fn list_flows(
     Ok(Json(rows))
 }
 
-async fn list_hub_flows(Authed { email, .. }: Authed) -> JsonResult<serde_json::Value> {
+async fn list_hub_flows(
+    Authed { email, .. }: Authed,
+    Extension(http_client): Extension<Client>,
+) -> JsonResult<serde_json::Value> {
     let flows = list_elems_from_hub(
-        &HTTP_CLIENT,
+        http_client,
         "https://hub.windmill.dev/searchFlowData?approved=true",
         &email,
     )
@@ -143,9 +144,10 @@ async fn list_paths(
 pub async fn get_hub_flow_by_id(
     Authed { email, .. }: Authed,
     Path(id): Path<i32>,
+    Extension(http_client): Extension<Client>,
 ) -> JsonResult<serde_json::Value> {
     let value = http_get_from_hub(
-        &HTTP_CLIENT,
+        http_client,
         &format!("https://hub.windmill.dev/flows/{id}/json"),
         &email,
         false,
@@ -179,7 +181,6 @@ async fn check_path_conflict<'c>(
 async fn create_flow(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path(w_id): Path<String>,
     Json(nf): Json<NewFlow>,
 ) -> Result<(StatusCode, String)> {
@@ -220,10 +221,6 @@ async fn create_flow(
     .await?;
 
     tx.commit().await?;
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::CreateFlow { workspace: w_id.clone(), path: nf.path.clone() },
-    );
 
     let tx = user_db.begin(&authed).await?;
     let (dependency_job_uuid, mut tx) = push(
@@ -237,7 +234,6 @@ async fn create_flow(
         None,
         None,
         None,
-        None,
         false,
         false,
         None,
@@ -284,7 +280,6 @@ async fn update_flow(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
     Extension(db): Extension<DB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path((w_id, flow_path)): Path<(String, StripPath)>,
     Json(nf): Json<NewFlow>,
 ) -> Result<String> {
@@ -373,14 +368,6 @@ async fn update_flow(
     .await?;
 
     tx.commit().await?;
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::UpdateFlow {
-            workspace: w_id.clone(),
-            old_path: flow_path.to_owned(),
-            new_path: nf.path.clone(),
-        },
-    );
 
     let tx = user_db.begin(&authed).await?;
     let (dependency_job_uuid, mut tx) = push(
@@ -394,7 +381,6 @@ async fn update_flow(
         None,
         None,
         None,
-        None,
         false,
         false,
         None,
@@ -429,12 +415,13 @@ async fn get_flow_by_path(
     let path = path.to_path();
     let mut tx = user_db.begin(&authed).await?;
 
-    let flow_o =
-        sqlx::query_as::<_, Flow>("SELECT * FROM flow WHERE path = $1 AND workspace_id = $2")
-            .bind(path)
-            .bind(w_id)
-            .fetch_optional(&mut tx)
-            .await?;
+    let flow_o = sqlx::query_as::<_, Flow>(
+        "SELECT * FROM flow WHERE path = $1 AND (workspace_id = $2 OR workspace_id = 'starter')",
+    )
+    .bind(path)
+    .bind(w_id)
+    .fetch_optional(&mut tx)
+    .await?;
     tx.commit().await?;
 
     let flow = not_found_if_none(flow_o, "Flow", path)?;
@@ -448,7 +435,8 @@ async fn exists_flow_by_path(
     let path = path.to_path();
 
     let exists = sqlx::query_scalar!(
-        "SELECT EXISTS(SELECT 1 FROM flow WHERE path = $1 AND workspace_id = $2)",
+        "SELECT EXISTS(SELECT 1 FROM flow WHERE path = $1 AND (workspace_id = $2 OR workspace_id \
+         = 'starter'))",
         path,
         w_id
     )
@@ -462,7 +450,6 @@ async fn exists_flow_by_path(
 async fn archive_flow_by_path(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path((w_id, path)): Path<(String, StripPath)>,
 ) -> Result<String> {
     let path = path.to_path();
@@ -487,50 +474,10 @@ async fn archive_flow_by_path(
     )
     .await?;
     tx.commit().await?;
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::ArchiveFlow { workspace: w_id, path: path.to_owned() },
-    );
 
     Ok(format!("Flow {path} archived"))
 }
 
-async fn delete_flow_by_path(
-    authed: Authed,
-    Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
-    Path((w_id, path)): Path<(String, StripPath)>,
-) -> Result<String> {
-    let path = path.to_path();
-    let mut tx = user_db.begin(&authed).await?;
-
-    sqlx::query!(
-        "DELETE FROM flow WHERE path = $1 AND workspace_id = $2",
-        path,
-        &w_id
-    )
-    .execute(&mut tx)
-    .await?;
-
-    audit_log(
-        &mut tx,
-        &authed.username,
-        "flows.delete",
-        ActionKind::Delete,
-        &w_id,
-        Some(path),
-        Some([("workspace", w_id.as_str())].into()),
-    )
-    .await?;
-    tx.commit().await?;
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::DeleteFlow { workspace: w_id, path: path.to_owned() },
-    );
-
-    Ok(format!("Flow {path} deleted"))
-}
-
 #[cfg(test)]
 mod tests {
 
@@ -640,6 +587,8 @@ mod tests {
                 "type": "script",
                 "path": "test"
               },
+              "stop_after_if": null,
+              "summary": null
             },
             {
               "id": "b",
@@ -648,12 +597,15 @@ mod tests {
                 "input_transforms": {},
                 "type": "rawscript",
                 "content": "test",
+                "lock": null,
+                "path": null,
                 "language": "deno"
               },
               "stop_after_if": {
                   "expr": "foo = 'bar'",
                   "skip_if_stopped": false
-              }
+              },
+              "summary": null
             },
             {
               "id": "c",
@@ -675,7 +627,8 @@ mod tests {
               "stop_after_if": {
                   "expr": "previous.isEmpty()",
                   "skip_if_stopped": false,
-              }
+              },
+              "summary": null
             }
           ],
           "failure_module": {
@@ -689,7 +642,8 @@ mod tests {
             "stop_after_if": {
                 "expr": "previous.isEmpty()",
                 "skip_if_stopped": false
-            }
+            },
+            "summary": null
           }
         });
         assert_eq!(dbg!(serde_json::json!(fv)), dbg!(expect));

backend/windmill-api/src/folders.rs

@@ -9,18 +9,16 @@
 use crate::{
     db::{UserDB, DB},
     users::Authed,
-    webhook_util::{WebhookMessage, WebhookShared},
 };
 use axum::{
     extract::{Extension, Path, Query},
     routing::{delete, get, post},
     Json, Router,
 };
-use lazy_static::lazy_static;
-use regex::Regex;
+use itertools::Itertools;
 use windmill_audit::{audit_log, ActionKind};
 use windmill_common::{
-    error::{self, to_anyhow, Error, JsonResult, Result},
+    error::{self, Error, JsonResult, Result},
     users::username_to_permissioned_as,
     utils::{not_found_if_none, paginate, Pagination},
 };
@@ -138,25 +136,14 @@ async fn check_name_conflict<'c>(
     return Ok(());
 }
 
-lazy_static! {
-    static ref VALID_FOLDER_NAME: Regex = Regex::new(r#"^[a-zA-Z_0-9]+$"#).unwrap();
-}
-
 async fn create_folder(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path(w_id): Path<String>,
     Json(ng): Json<NewFolder>,
 ) -> Result<String> {
     let mut tx = user_db.begin(&authed).await?;
 
-    if !VALID_FOLDER_NAME.is_match(&ng.name) {
-        return Err(windmill_common::error::Error::BadRequest(format!(
-            "Folder name can only contain alphanumeric characters, underscores"
-        )));
-    }
-
     check_name_conflict(&mut tx, &w_id, &ng.name).await?;
     let owner = username_to_permissioned_as(&authed.username);
     let owners = &ng.owners.unwrap_or(vec![owner.clone()]);
@@ -206,12 +193,8 @@ async fn create_folder(
         None,
     )
     .await?;
-    tx.commit().await?;
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::CreateFolder { workspace: w_id, name: ng.name.clone() },
-    );
 
+    tx.commit().await?;
     Ok(format!("Created folder {}", ng.name))
 }
 
@@ -262,7 +245,6 @@ pub async fn require_is_owner(
 async fn update_folder(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path((w_id, name)): Path<(String, String)>,
     Json(ng): Json<UpdateFolder>,
 ) -> Result<String> {
@@ -273,26 +255,13 @@ async fn update_folder(
     sqlb.and_where_eq("workspace_id", "?".bind(&w_id));
 
     if let Some(display_name) = ng.display_name {
-        sqlb.set("display_name", "?".bind(&display_name));
+        sqlb.set("display_name", display_name);
     }
     if let Some(owners) = ng.owners {
-        sqlb.set(
-            "owners",
-            "?".bind(&format!(
-                "{{{}}}",
-                owners
-                    .iter()
-                    .map(|x| format!("\"{x}\""))
-                    .collect::<Vec<_>>()
-                    .join(","),
-            )),
-        );
+        sqlb.set_str("owners", format!("{{{}}}", owners.into_iter().join(",")));
     }
     if let Some(extra_perms) = ng.extra_perms {
-        sqlb.set(
-            "extra_perms",
-            "?".bind(&serde_json::to_string(&extra_perms).map_err(to_anyhow)?),
-        );
+        sqlb.set_str("extra_perms", extra_perms.to_string());
     }
 
     sqlb.returning("*");
@@ -329,12 +298,8 @@ async fn update_folder(
         None,
     )
     .await?;
-    tx.commit().await?;
-    webhook.send_message(
-        w_id.clone().clone(),
-        WebhookMessage::UpdateFolder { workspace: w_id, name: name.to_owned() },
-    );
 
+    tx.commit().await?;
     Ok(format!("Updated folder {}", name))
 }
 
@@ -451,7 +416,6 @@ async fn get_folder_usage(
 async fn delete_folder(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path((w_id, name)): Path<(String, String)>,
 ) -> Result<String> {
     let mut tx = user_db.begin(&authed).await?;
@@ -476,12 +440,6 @@ async fn delete_folder(
     )
     .await?;
     tx.commit().await?;
-
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::DeleteFolder { workspace: w_id, name: name.clone() },
-    );
-
     Ok(format!("delete folder at name {}", name))
 }
 
@@ -489,7 +447,6 @@ async fn add_owner(
     authed: Authed,
     Extension(db): Extension<DB>,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path((w_id, name)): Path<(String, String)>,
     Json(Owner { owner }): Json<Owner>,
 ) -> Result<String> {
@@ -520,12 +477,6 @@ async fn add_owner(
     )
     .await?;
     tx.commit().await?;
-
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::UpdateFolder { workspace: w_id, name: name.clone() },
-    );
-
     Ok(format!("Added {} to folder {}", owner, name))
 }
 
@@ -559,7 +510,6 @@ async fn remove_owner(
     authed: Authed,
     Extension(db): Extension<DB>,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path((w_id, name)): Path<(String, String)>,
     Json(Owner { owner }): Json<Owner>,
 ) -> Result<String> {
@@ -590,11 +540,5 @@ async fn remove_owner(
     )
     .await?;
     tx.commit().await?;
-
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::UpdateFolder { workspace: w_id, name: name.clone() },
-    );
-
     Ok(format!("Removed {} to folder {}", owner, name))
 }

backend/windmill-api/src/jobs.rs

@@ -6,6 +6,8 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
+use std::sync::Arc;
+
 use anyhow::Context;
 use axum::{
     extract::{FromRequest, Json, Path, Query},
@@ -34,9 +36,9 @@ use windmill_queue::{get_queued_job, push, JobKind, JobPayload, QueuedJob, RawCo
 
 use crate::{
     db::{UserDB, DB},
-    users::{require_owner_of_path, Authed, OptAuthed},
+    users::{require_owner_of_path, Authed},
     variables::get_workspace_key,
-    BASE_URL,
+    BaseUrl, QueueLimitWaitResult, TimeoutWaitResult,
 };
 
 pub fn workspaced_service() -> Router {
@@ -60,6 +62,7 @@ pub fn workspaced_service() -> Router {
         .route("/run/preview_flow", post(run_preview_flow_job))
         .route("/list", get(list_jobs))
         .route("/queue/list", get(list_queue_jobs))
+        .route("/queue/cancel/:id", post(cancel_job_api))
         .route("/completed/list", get(list_completed_jobs))
         .route("/completed/get/:id", get(get_completed_job))
         .route("/completed/get_result/:id", get(get_completed_job_result))
@@ -97,36 +100,32 @@ pub fn global_service() -> Router {
         )
         .route("/get/:id", get(get_job))
         .route("/getupdate/:id", get(get_job_update))
-        .route("/queue/cancel/:id", post(cancel_job_api))
 }
 
 async fn get_result_by_id(
     Extension(db): Extension<DB>,
-    Path((w_id, flow_id, node_id)): Path<(String, Uuid, String)>,
+    Query(ResultByIdQuery { skip_direct }): Query<ResultByIdQuery>,
+    Path((w_id, flow_id, node_id)): Path<(String, String, String)>,
 ) -> windmill_common::error::JsonResult<serde_json::Value> {
-    let res = windmill_queue::get_result_by_id(db, w_id, flow_id, node_id).await?;
+    let res = windmill_queue::get_result_by_id(db, skip_direct, w_id, flow_id, node_id).await?;
     Ok(Json(res))
 }
 
 async fn cancel_job_api(
-    OptAuthed(opt_authed): OptAuthed,
-    Extension(db): Extension<DB>,
+    authed: Authed,
+    Extension(user_db): Extension<UserDB>,
     Path((w_id, id)): Path<(String, Uuid)>,
     Json(CancelJob { reason }): Json<CancelJob>,
 ) -> error::Result<String> {
-    let tx = db.begin().await?;
+    let tx = user_db.begin(&authed).await?;
 
-    let username = match opt_authed {
-        Some(authed) => authed.username,
-        None => "anonymous".to_string(),
-    };
-
-    let (mut tx, job_option) = windmill_queue::cancel_job(&username, reason, id, &w_id, tx).await?;
+    let (mut tx, job_option) =
+        windmill_queue::cancel_job(&authed.username, reason, id, &w_id, tx).await?;
 
     if let Some(id) = job_option {
         audit_log(
             &mut tx,
-            &username,
+            &authed.username,
             "jobs.cancel",
             ActionKind::Delete,
             &w_id,
@@ -155,7 +154,8 @@ pub async fn get_path_for_hash<'c>(
     hash: i64,
 ) -> error::Result<String> {
     let path = sqlx::query_scalar!(
-        "select path from script where hash = $1 AND workspace_id = $2",
+        "select path from script where hash = $1 AND (workspace_id = $2 OR workspace_id = \
+         'starter')",
         hash,
         w_id
     )
@@ -180,6 +180,11 @@ async fn get_job(
     Ok(Json(job))
 }
 
+#[derive(Deserialize)]
+pub struct ResultByIdQuery {
+    pub skip_direct: bool,
+}
+
 pub async fn get_job_by_id<'c>(
     mut tx: Transaction<'c, Postgres>,
     w_id: &str,
@@ -253,8 +258,6 @@ pub struct CompletedJob {
     pub is_skipped: bool,
     pub email: String,
     pub visible_to_owner: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mem_peak: Option<i32>,
 }
 
 #[derive(Deserialize, Clone)]
@@ -293,51 +296,41 @@ impl RunJobQuery {
     fn add_include_headers(
         &self,
         headers: HeaderMap,
-        args: serde_json::Map<String, serde_json::Value>,
+        mut args: serde_json::Map<String, serde_json::Value>,
     ) -> serde_json::Map<String, serde_json::Value> {
-        return add_include_headers(&self.include_header, headers, args);
+        let whitelist = self
+            .include_header
+            .as_ref()
+            .map(|s| s.split(",").map(|s| s.to_string()).collect::<Vec<_>>())
+            .unwrap_or_default();
+        whitelist
+            .iter()
+            .chain(INCLUDE_HEADERS.iter())
+            .for_each(|h| {
+                if let Some(v) = headers.get(h) {
+                    args.insert(
+                        h.to_string().to_lowercase().replace('-', "_"),
+                        serde_json::Value::String(v.to_str().unwrap().to_string()),
+                    );
+                }
+            });
+        args
     }
 }
 
-pub fn add_include_headers(
-    include_header: &Option<String>,
-    headers: HeaderMap,
-    mut args: serde_json::Map<String, serde_json::Value>,
-) -> serde_json::Map<String, serde_json::Value> {
-    let whitelist = include_header
-        .as_ref()
-        .map(|s| s.split(",").map(|s| s.to_string()).collect::<Vec<_>>())
-        .unwrap_or_default();
-
-    whitelist
-        .iter()
-        .chain(INCLUDE_HEADERS.iter())
-        .for_each(|h| {
-            if let Some(v) = headers.get(h) {
-                args.insert(
-                    h.to_string().to_lowercase().replace('-', "_"),
-                    serde_json::Value::String(v.to_str().unwrap().to_string()),
-                );
-            }
-        });
-    args
-}
-
 #[derive(Deserialize)]
 pub struct ListQueueQuery {
     pub script_path_start: Option<String>,
     pub script_path_exact: Option<String>,
     pub script_hash: Option<String>,
     pub created_by: Option<String>,
-    pub started_before: Option<chrono::DateTime<chrono::Utc>>,
-    pub started_after: Option<chrono::DateTime<chrono::Utc>>,
+    pub created_before: Option<chrono::DateTime<chrono::Utc>>,
+    pub created_after: Option<chrono::DateTime<chrono::Utc>>,
     pub running: Option<bool>,
     pub parent_job: Option<String>,
     pub order_desc: Option<bool>,
     pub job_kinds: Option<String>,
     pub suspended: Option<bool>,
-    // filter by matching a subset of the args using base64 encoded json subset
-    pub args: Option<String>,
 }
 
 fn list_queue_jobs_query(w_id: &str, lq: &ListQueueQuery, fields: &[&str]) -> SqlBuilder {
@@ -366,11 +359,11 @@ fn list_queue_jobs_query(w_id: &str, lq: &ListQueueQuery, fields: &[&str]) -> Sq
     if let Some(pj) = &lq.parent_job {
         sqlb.and_where_eq("parent_job", "?".bind(pj));
     }
-    if let Some(dt) = &lq.started_before {
-        sqlb.and_where_le("started_at", format!("to_timestamp({})", dt.timestamp()));
+    if let Some(dt) = &lq.created_before {
+        sqlb.and_where_lt("created_at", format!("to_timestamp({})", dt.timestamp()));
     }
-    if let Some(dt) = &lq.started_after {
-        sqlb.and_where_ge("started_at", format!("to_timestamp({})", dt.timestamp()));
+    if let Some(dt) = &lq.created_after {
+        sqlb.and_where_gt("created_at", format!("to_timestamp({})", dt.timestamp()));
     }
 
     if let Some(s) = &lq.suspended {
@@ -380,7 +373,6 @@ fn list_queue_jobs_query(w_id: &str, lq: &ListQueueQuery, fields: &[&str]) -> Sq
             sqlb.and_where_eq("suspend", 0);
         }
     }
-
     if let Some(jk) = &lq.job_kinds {
         sqlb.and_where_in(
             "job_kind",
@@ -388,10 +380,6 @@ fn list_queue_jobs_query(w_id: &str, lq: &ListQueueQuery, fields: &[&str]) -> Sq
         );
     }
 
-    if let Some(args) = &lq.args {
-        sqlb.and_where("args @> ?".bind(&args.replace("'", "''")));
-    }
-
     sqlb
 }
 
@@ -464,14 +452,13 @@ async fn list_jobs(
             script_path_exact: lq.script_path_exact,
             script_hash: lq.script_hash,
             created_by: lq.created_by,
-            started_before: lq.started_before,
-            started_after: lq.started_after,
+            created_before: lq.created_before,
+            created_after: lq.created_after,
             running: None,
             parent_job: lq.parent_job,
             order_desc: Some(true),
             job_kinds: lq.job_kinds,
             suspended: lq.suspended,
-            args: lq.args,
         },
         &[
             "'QueuedJob' as typ",
@@ -485,7 +472,7 @@ async fn list_jobs(
             "running",
             "script_hash",
             "script_path",
-            "CASE WHEN pg_column_size(args) > 1000 THEN '\"too large args\"'::jsonb ELSE args END",
+            "args",
             "null as duration_ms",
             "null as success",
             "false as deleted",
@@ -500,7 +487,6 @@ async fn list_jobs(
             "email",
             "visible_to_owner",
             "suspend",
-            "mem_peak",
         ],
     );
     let sqlc = list_completed_jobs_query(
@@ -520,7 +506,7 @@ async fn list_jobs(
             "null as running",
             "script_hash",
             "script_path",
-            "CASE WHEN pg_column_size(args) > 1000 THEN '\"too large args\"'::jsonb ELSE args END",
+            "args",
             "duration_ms",
             "success",
             "deleted",
@@ -535,7 +521,6 @@ async fn list_jobs(
             "email",
             "visible_to_owner",
             "null as suspend",
-            "mem_peak",
         ],
     );
     let sql = format!(
@@ -936,16 +921,16 @@ pub async fn get_resume_urls(
     Extension(user_db): Extension<UserDB>,
     Path((w_id, job_id, resume_id)): Path<(String, Uuid, u32)>,
     Query(approver): Query<QueryApprover>,
+    Extension(base_url): Extension<Arc<BaseUrl>>,
 ) -> error::JsonResult<ResumeUrls> {
     let key = get_workspace_key(&w_id, &mut user_db.begin(&authed).await?).await?;
     let signature = create_signature(key, job_id, resume_id, approver.approver.clone())?;
+    let base_url = base_url.0.clone();
     let approver = approver
         .approver
         .as_ref()
         .map(|x| format!("?approver={}", encode(x)))
         .unwrap_or_else(String::new);
-
-    let base_url = BASE_URL.as_str();
     let res = ResumeUrls {
         approvalPage: format!(
             "{base_url}/approve/{w_id}/{job_id}/{resume_id}/{signature}{approver}"
@@ -1013,7 +998,6 @@ struct UnifiedJob {
     email: String,
     visible_to_owner: bool,
     suspend: Option<i32>,
-    mem_peak: Option<i32>,
 }
 
 impl From<UnifiedJob> for Job {
@@ -1048,7 +1032,6 @@ impl From<UnifiedJob> for Job {
                 is_skipped: uj.is_skipped,
                 email: uj.email,
                 visible_to_owner: uj.visible_to_owner,
-                mem_peak: uj.mem_peak,
             }),
             "QueuedJob" => Job::QueuedJob(QueuedJob {
                 workspace_id: uj.workspace_id,
@@ -1081,9 +1064,6 @@ impl From<UnifiedJob> for Job {
                 email: uj.email,
                 visible_to_owner: uj.visible_to_owner,
                 suspend: uj.suspend,
-                mem_peak: uj.mem_peak,
-                root_job: None,
-                leaf_jobs: None,
             }),
             t => panic!("job type {} not valid", t),
         }
@@ -1146,14 +1126,14 @@ where
         struct InPayload {
             payload: Option<String>,
         }
-    }
-}
 
-fn decode_payload<D: DeserializeOwned, T: AsRef<[u8]>>(t: T) -> anyhow::Result<D> {
-    let vec = base64::engine::general_purpose::URL_SAFE
-        .decode(t)
-        .context("invalid base64")?;
-    serde_json::from_slice(vec.as_slice()).context("invalid json")
+        fn decode_payload<D: DeserializeOwned, T: AsRef<[u8]>>(t: T) -> anyhow::Result<D> {
+            let vec = base64::engine::general_purpose::URL_SAFE
+                .decode(t)
+                .context("invalid base64")?;
+            serde_json::from_slice(vec.as_slice()).context("invalid json")
+        }
+    }
 }
 pub async fn run_flow_by_path(
     authed: Authed,
@@ -1179,7 +1159,6 @@ pub async fn run_flow_by_path(
         scheduled_for,
         None,
         run_query.parent_job,
-        run_query.parent_job,
         false,
         false,
         None,
@@ -1215,7 +1194,6 @@ pub async fn run_job_by_path(
         scheduled_for,
         None,
         run_query.parent_job,
-        run_query.parent_job,
         false,
         false,
         None,
@@ -1330,26 +1308,18 @@ pub async fn check_queue_too_long(db: DB, queue_limit: Option<i64>) -> error::Re
     }
     Ok(())
 }
-
-lazy_static::lazy_static! {
-    pub static ref QUEUE_LIMIT_WAIT_RESULT: Option<i64> = std::env::var("QUEUE_LIMIT_WAIT_RESULT")
-        .ok()
-        .and_then(|x| x.parse().ok());
-    pub static ref TIMEOUT_WAIT_RESULT: i32 = std::env::var("TIMEOUT_WAIT_RESULT")
-        .ok()
-        .and_then(|x| x.parse().ok())
-        .unwrap_or(20);
-}
 pub async fn run_wait_result_job_by_path(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
     Extension(db): Extension<DB>,
+    Extension(timeout): Extension<Arc<TimeoutWaitResult>>,
+    Extension(queue_limit): Extension<Arc<QueueLimitWaitResult>>,
     Path((w_id, script_path)): Path<(String, StripPath)>,
     Query(run_query): Query<RunJobQuery>,
     headers: HeaderMap,
     Json(args): Json<Option<serde_json::Map<String, serde_json::Value>>>,
 ) -> error::JsonResult<serde_json::Value> {
-    check_queue_too_long(db, QUEUE_LIMIT_WAIT_RESULT.or(run_query.queue_limit)).await?;
+    check_queue_too_long(db, queue_limit.0.or(run_query.queue_limit)).await?;
     let script_path = script_path.to_path();
     let mut tx = user_db.clone().begin(&authed).await?;
     let job_payload = script_path_to_payload(script_path, &mut tx, &w_id).await?;
@@ -1368,7 +1338,6 @@ pub async fn run_wait_result_job_by_path(
         scheduled_for,
         None,
         run_query.parent_job,
-        run_query.parent_job,
         false,
         false,
         None,
@@ -1380,7 +1349,7 @@ pub async fn run_wait_result_job_by_path(
     run_wait_result(
         authed,
         Extension(user_db),
-        *TIMEOUT_WAIT_RESULT,
+        timeout.0,
         uuid,
         Path((w_id, script_path)),
     )
@@ -1391,6 +1360,7 @@ pub async fn run_wait_result_job_by_hash(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
     Extension(db): Extension<DB>,
+    Extension(timeout): Extension<Arc<TimeoutWaitResult>>,
     Path((w_id, script_hash)): Path<(String, ScriptHash)>,
     Query(run_query): Query<RunJobQuery>,
     headers: HeaderMap,
@@ -1415,7 +1385,6 @@ pub async fn run_wait_result_job_by_hash(
         scheduled_for,
         None,
         run_query.parent_job,
-        run_query.parent_job,
         false,
         false,
         None,
@@ -1427,7 +1396,7 @@ pub async fn run_wait_result_job_by_hash(
     run_wait_result(
         authed,
         Extension(user_db),
-        *TIMEOUT_WAIT_RESULT,
+        timeout.0,
         uuid,
         Path((w_id, script_hash)),
     )
@@ -1438,6 +1407,7 @@ pub async fn run_wait_result_flow_by_path(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
     Extension(db): Extension<DB>,
+    Extension(timeout): Extension<Arc<TimeoutWaitResult>>,
     Path((w_id, flow_path)): Path<(String, StripPath)>,
     Query(run_query): Query<RunJobQuery>,
     headers: HeaderMap,
@@ -1461,7 +1431,6 @@ pub async fn run_wait_result_flow_by_path(
         scheduled_for,
         None,
         run_query.parent_job,
-        run_query.parent_job,
         false,
         false,
         None,
@@ -1474,7 +1443,7 @@ pub async fn run_wait_result_flow_by_path(
     run_wait_result(
         authed,
         Extension(user_db),
-        *TIMEOUT_WAIT_RESULT,
+        timeout.0,
         uuid,
         Path((w_id, flow_path)),
     )
@@ -1524,7 +1493,6 @@ async fn run_preview_job(
         scheduled_for,
         None,
         None,
-        None,
         false,
         false,
         None,
@@ -1558,7 +1526,6 @@ async fn run_preview_flow_job(
         scheduled_for,
         None,
         None,
-        None,
         false,
         false,
         None,
@@ -1594,7 +1561,6 @@ pub async fn run_job_by_hash(
         scheduled_for,
         None,
         run_query.parent_job,
-        run_query.parent_job,
         false,
         false,
         None,
@@ -1616,7 +1582,6 @@ pub struct JobUpdate {
     pub running: Option<bool>,
     pub completed: Option<bool>,
     pub new_logs: Option<String>,
-    pub mem_peak: Option<i32>,
 }
 
 async fn get_job_update(
@@ -1626,8 +1591,8 @@ async fn get_job_update(
 ) -> error::JsonResult<JobUpdate> {
     let mut tx = db.begin().await?;
 
-    let record = sqlx::query!(
-        "SELECT substr(logs, $1) as logs, mem_peak FROM queue WHERE workspace_id = $2 AND id = $3",
+    let logs = query_scalar!(
+        "SELECT substr(logs, $1) as logs FROM queue WHERE workspace_id = $2 AND id = $3",
         log_offset,
         &w_id,
         &id
@@ -1635,13 +1600,12 @@ async fn get_job_update(
     .fetch_optional(&mut tx)
     .await?;
 
-    if let Some(record) = record {
+    if let Some(logs) = logs {
         tx.commit().await?;
         Ok(Json(JobUpdate {
             running: if !running { Some(true) } else { None },
             completed: None,
-            new_logs: record.logs,
-            mem_peak: record.mem_peak,
+            new_logs: logs,
         }))
     } else {
         let logs = query_scalar!(
@@ -1659,7 +1623,6 @@ async fn get_job_update(
             running: Some(false),
             completed: Some(true),
             new_logs: logs,
-            mem_peak: record.map(|r| r.mem_peak).flatten(),
         }))
     }
 }
@@ -1697,11 +1660,11 @@ fn list_completed_jobs_query(
     if let Some(pj) = &lq.parent_job {
         sqlb.and_where_eq("parent_job", "?".bind(pj));
     }
-    if let Some(dt) = &lq.started_before {
-        sqlb.and_where_le("started_at", format!("to_timestamp({})", dt.timestamp()));
+    if let Some(dt) = &lq.created_before {
+        sqlb.and_where_lt("created_at", format!("to_timestamp({})", dt.timestamp()));
     }
-    if let Some(dt) = &lq.started_after {
-        sqlb.and_where_ge("started_at", format!("to_timestamp({})", dt.timestamp()));
+    if let Some(dt) = &lq.created_after {
+        sqlb.and_where_gt("created_at", format!("to_timestamp({})", dt.timestamp()));
     }
     if let Some(sk) = &lq.is_skipped {
         sqlb.and_where_eq("is_skipped", sk);
@@ -1716,14 +1679,6 @@ fn list_completed_jobs_query(
         );
     }
 
-    if let Some(args) = &lq.args {
-        sqlb.and_where("args @> ?".bind(&args.replace("'", "''")));
-    }
-
-    if let Some(result) = &lq.result {
-        sqlb.and_where("result @> ?".bind(&result.replace("'", "''")));
-    }
-
     sqlb
 }
 #[derive(Deserialize, Clone)]
@@ -1732,8 +1687,8 @@ pub struct ListCompletedQuery {
     pub script_path_exact: Option<String>,
     pub script_hash: Option<String>,
     pub created_by: Option<String>,
-    pub started_before: Option<chrono::DateTime<chrono::Utc>>,
-    pub started_after: Option<chrono::DateTime<chrono::Utc>>,
+    pub created_before: Option<chrono::DateTime<chrono::Utc>>,
+    pub created_after: Option<chrono::DateTime<chrono::Utc>>,
     pub success: Option<bool>,
     pub parent_job: Option<String>,
     pub order_desc: Option<bool>,
@@ -1741,10 +1696,6 @@ pub struct ListCompletedQuery {
     pub is_skipped: Option<bool>,
     pub is_flow_step: Option<bool>,
     pub suspended: Option<bool>,
-    // filter by matching a subset of the args using base64 encoded json subset
-    pub args: Option<String>,
-    // filter by matching a subset of the result using base64 encoded json subset
-    pub result: Option<String>,
 }
 
 async fn list_completed_jobs(
@@ -1789,7 +1740,6 @@ async fn list_completed_jobs(
             "is_skipped",
             "email",
             "visible_to_owner",
-            "mem_peak",
         ],
     )
     .sql()?;
@@ -1811,7 +1761,6 @@ async fn get_completed_job(
     .fetch_optional(&db)
     .await?;
 
-    tracing::info!("job_o: {:?}", job_o);
     let job = not_found_if_none(job_o, "Completed Job", id.to_string())?;
     Ok(Json(job))
 }

backend/windmill-api/src/lib.rs

@@ -6,24 +6,21 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
-use crate::oauth2::AllClients;
 use argon2::Argon2;
 use axum::{middleware::from_extractor, routing::get, Extension, Router};
 use db::DB;
 use git_version::git_version;
-use reqwest::Client;
 use std::{net::SocketAddr, sync::Arc};
 use tower::ServiceBuilder;
 use tower_cookies::CookieManagerLayer;
 use tower_http::trace::TraceLayer;
-use windmill_common::utils::rd_string;
+use windmill_common::{error::to_anyhow, utils::rd_string};
 
 use crate::{
     db::UserDB,
     oauth2::{build_oauth_clients, SlackVerifier},
     tracing_init::{MyMakeSpan, MyOnResponse},
     users::{Authed, OptAuthed},
-    webhook_util::WebhookShared,
 };
 
 mod apps;
@@ -45,39 +42,26 @@ mod tracing_init;
 mod users;
 mod utils;
 mod variables;
-mod webhook_util;
 mod worker_ping;
 mod workspaces;
 
 pub const GIT_VERSION: &str =
     git_version!(args = ["--tag", "--always"], fallback = "unknown-version");
 
+pub struct BaseUrl(String);
+pub struct IsSecure(bool);
+pub struct CookieDomain(Option<String>);
+pub struct CloudHosted(bool);
+pub struct ContentSecurityPolicy(String);
+pub struct TimeoutWaitResult(i32);
+pub struct QueueLimitWaitResult(Option<i64>);
+
 pub use users::delete_expired_items_perdiodically;
 
-lazy_static::lazy_static! {
-    pub static ref BASE_URL: String = std::env::var("BASE_URL").unwrap_or_else(|_| "http://localhost".to_string());
-
-
-    pub static ref COOKIE_DOMAIN: Option<String> = std::env::var("COOKIE_DOMAIN").ok();
-
-    pub static ref SLACK_SIGNING_SECRET: Option<SlackVerifier> = std::env::var("SLACK_SIGNING_SECRET")
-        .ok()
-        .map(|x| SlackVerifier::new(x).unwrap());
-
-        static ref IS_SECURE: bool = BASE_URL.starts_with("https://");
-
-    pub static ref HTTP_CLIENT: Client = reqwest::ClientBuilder::new()
-        .user_agent("windmill/beta")
-        .build().unwrap();
-
-    pub static ref OAUTH_CLIENTS: AllClients = build_oauth_clients(&BASE_URL)
-        .map_err(|e| tracing::error!("Error building oauth clients: {}", e))
-        .unwrap();
-}
-
 pub async fn run_server(
     db: DB,
     addr: SocketAddr,
+    base_url: String,
     mut rx: tokio::sync::broadcast::Receiver<()>,
 ) -> anyhow::Result<()> {
     let user_db = UserDB::new(db.clone());
@@ -87,7 +71,16 @@ pub async fn run_server(
         std::env::var("SUPERADMIN_SECRET").ok(),
     ));
     let argon2 = Arc::new(Argon2::default());
-
+    let basic_clients = Arc::new(build_oauth_clients(&base_url).await?);
+    let slack_verifier = Arc::new(
+        std::env::var("SLACK_SIGNING_SECRET")
+            .ok()
+            .map(|x| SlackVerifier::new(x).unwrap()),
+    );
+    let http_client = reqwest::ClientBuilder::new()
+        .user_agent("windmill/beta")
+        .build()
+        .map_err(to_anyhow)?;
     let middleware_stack = ServiceBuilder::new()
         .layer(
             TraceLayer::new_for_http()
@@ -98,8 +91,22 @@ pub async fn run_server(
         .layer(Extension(db.clone()))
         .layer(Extension(user_db))
         .layer(Extension(auth_cache.clone()))
-        .layer(CookieManagerLayer::new())
-        .layer(Extension(WebhookShared::new(rx.resubscribe(), db.clone())));
+        .layer(Extension(basic_clients))
+        .layer(Extension(Arc::new(BaseUrl(base_url.to_string()))))
+        .layer(Extension(Arc::new(ContentSecurityPolicy(
+            std::env::var("SERVE_CSP").unwrap_or("".to_owned()),
+        ))))
+        .layer(Extension(Arc::new(CloudHosted(
+            std::env::var("CLOUD_HOSTED").is_ok(),
+        ))))
+        .layer(Extension(Arc::new(IsSecure(
+            base_url.starts_with("https://"),
+        ))))
+        .layer(Extension(Arc::new(CookieDomain(
+            std::env::var("COOKIE_DOMAIN").ok(),
+        ))))
+        .layer(Extension(http_client))
+        .layer(CookieManagerLayer::new());
     // build our application with a route
     let app = Router::new()
         .nest(
@@ -109,7 +116,21 @@ pub async fn run_server(
                     "/w/:workspace_id",
                     Router::new()
                         .nest("/scripts", scripts::workspaced_service())
-                        .nest("/jobs", jobs::workspaced_service())
+                        .nest(
+                            "/jobs",
+                            jobs::workspaced_service()
+                                .layer(Extension(Arc::new(TimeoutWaitResult(
+                                    std::env::var("TIMEOUT_WAIT_RESULT")
+                                        .ok()
+                                        .and_then(|x| x.parse().ok())
+                                        .unwrap_or(20),
+                                ))))
+                                .layer(Extension(Arc::new(QueueLimitWaitResult(
+                                    std::env::var("QUEUE_LIMIT_WAIT_RESULT")
+                                        .ok()
+                                        .and_then(|x| x.parse().ok()),
+                                )))),
+                        )
                         .nest(
                             "/users",
                             users::workspaced_service().layer(Extension(argon2.clone())),
@@ -150,7 +171,10 @@ pub async fn run_server(
                     "/auth",
                     users::make_unauthed_service().layer(Extension(argon2)),
                 )
-                .nest("/oauth", oauth2::global_service())
+                .nest(
+                    "/oauth",
+                    oauth2::global_service().layer(Extension(slack_verifier)),
+                )
                 .route("/version", get(git_v))
                 .route("/openapi.yaml", get(openapi)),
         )

backend/windmill-api/src/main.rs

@@ -0,0 +1,70 @@
+/*
+ * Author: Ruben Fiszel
+ * Copyright: Windmill Labs, Inc 2022
+ * This file and its contents are licensed under the AGPLv3 License.
+ * Please see the included NOTICE for copyright information and
+ * LICENSE-AGPL for a copy of the license.
+ */
+
+use std::net::SocketAddr;
+
+use anyhow::Ok;
+
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
+    windmill_common::tracing_init::initialize_tracing();
+
+    let db = windmill_common::connect_db(true).await?;
+
+    let num_workers = std::env::var("NUM_WORKERS")
+        .ok()
+        .and_then(|x| x.parse::<i32>().ok())
+        .unwrap_or(windmill_common::DEFAULT_NUM_WORKERS as i32);
+
+    let metrics_addr: Option<SocketAddr> = std::env::var("METRICS_ADDR")
+        .ok()
+        .map(|s| {
+            s.parse::<bool>()
+                .map(|b| b.then(|| SocketAddr::from(([0, 0, 0, 0], 8001))))
+                .or_else(|_| s.parse::<SocketAddr>().map(Some))
+        })
+        .transpose()?
+        .flatten();
+
+    let server_mode = !std::env::var("DISABLE_SERVER")
+        .ok()
+        .and_then(|x| x.parse::<bool>().ok())
+        .unwrap_or(false);
+
+    if server_mode {
+        windmill_api::migrate_db(&db).await?;
+    }
+
+    let (tx, rx) = tokio::sync::broadcast::channel::<()>(3);
+    let shutdown_signal = windmill_common::shutdown_signal(tx);
+
+    let base_url = std::env::var("BASE_URL").unwrap_or_else(|_| "http://localhost".to_string());
+
+    if server_mode || num_workers > 0 {
+        let addr = SocketAddr::from(([0, 0, 0, 0], 8000));
+
+        let server_f = async {
+            if server_mode {
+                windmill_api::run_server(db.clone(), addr, base_url, rx.resubscribe()).await?;
+            }
+            Ok(()) as anyhow::Result<()>
+        };
+
+        let metrics_f = async {
+            match metrics_addr {
+                Some(addr) => windmill_common::serve_metrics(addr, rx.resubscribe())
+                    .await
+                    .map_err(anyhow::Error::from),
+                None => Ok(()),
+            }
+        };
+
+        futures::try_join!(shutdown_signal, server_f, metrics_f)?;
+    }
+    Ok(())
+}

backend/windmill-api/src/main3.rs

@@ -1,69 +0,0 @@
-// /*
-//  * Author: Ruben Fiszel
-//  * Copyright: Windmill Labs, Inc 2022
-//  * This file and its contents are licensed under the AGPLv3 License.
-//  * Please see the included NOTICE for copyright information and
-//  * LICENSE-AGPL for a copy of the license.
-//  */
-// use std::net::SocketAddr;
-
-// use anyhow::Ok;
-
-// pub const DEFAULT_NUM_WORKERS: usize = 3;
-
-// #[tokio::main]
-// async fn main() -> anyhow::Result<()> {
-//     windmill_common::tracing_init::initialize_tracing();
-
-//     let db = windmill_common::connect_db(true).await?;
-
-//     let num_workers = std::env::var("NUM_WORKERS")
-//         .ok()
-//         .and_then(|x| x.parse::<i32>().ok())
-//         .unwrap_or(DEFAULT_NUM_WORKERS as i32);
-
-//     let metrics_addr: Option<SocketAddr> = std::env::var("METRICS_ADDR")
-//         .ok()
-//         .map(|s| {
-//             s.parse::<bool>()
-//                 .map(|b| b.then(|| SocketAddr::from(([0, 0, 0, 0], 8001))))
-//                 .or_else(|_| s.parse::<SocketAddr>().map(Some))
-//         })
-//         .transpose()?
-//         .flatten();
-
-//     let server_mode = !std::env::var("DISABLE_SERVER")
-//         .ok()
-//         .and_then(|x| x.parse::<bool>().ok())
-//         .unwrap_or(false);
-
-//     if server_mode {
-//         windmill_api::migrate_db(&db).await?;
-//     }
-
-//     let (tx, rx) = tokio::sync::broadcast::channel::<()>(3);
-//     let shutdown_signal = windmill_common::shutdown_signal(tx);
-
-//     if server_mode || num_workers > 0 {
-//         let addr = SocketAddr::from(([0, 0, 0, 0], 8000));
-
-//         let server_f = async {
-//             if server_mode {
-//                 windmill_api::run_server(db.clone(), addr, rx.resubscribe()).await?;
-//             }
-//             Ok(()) as anyhow::Result<()>
-//         };
-
-//         let metrics_f = async {
-//             match metrics_addr {
-//                 Some(addr) => windmill_common::serve_metrics(addr, rx.resubscribe())
-//                     .await
-//                     .map_err(anyhow::Error::from),
-//                 None => Ok(()),
-//             }
-//         };
-
-//         futures::try_join!(shutdown_signal, server_f, metrics_f)?;
-//     }
-//     Ok(())
-// }

backend/windmill-api/src/oauth2.rs

@@ -8,6 +8,8 @@
 
 use std::{collections::HashMap, fmt::Debug};
 
+use std::sync::Arc;
+
 use anyhow::Context;
 use axum::extract::FromRequestParts;
 use axum::http::request::Parts;
@@ -27,25 +29,26 @@ use oauth2::{Client as OClient, *};
 use reqwest::Client;
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use sqlx::{Postgres, Transaction};
+use tokio::{fs::File, io::AsyncReadExt};
 use tower_cookies::{Cookie, Cookies};
 use windmill_audit::{audit_log, ActionKind};
-use windmill_common::users::username_to_permissioned_as;
 use windmill_common::utils::{not_found_if_none, now_from_db};
 
-use crate::users::{truncate_token, Authed, NEW_USER_WEBHOOK};
+use crate::users::{truncate_token, Authed};
 use crate::workspaces::invite_user_to_all_auto_invite_worspaces;
 use crate::{
     db::{UserDB, DB},
     variables::{build_crypt, encrypt},
     workspaces::WorkspaceSettings,
+    BaseUrl,
 };
-use crate::{BASE_URL, HTTP_CLIENT, IS_SECURE, OAUTH_CLIENTS, SLACK_SIGNING_SECRET};
+use crate::{CookieDomain, IsSecure};
 use windmill_common::error::{self, to_anyhow, Error};
 use windmill_common::oauth2::*;
 
 use windmill_queue::JobPayload;
 
-use std::{fs, str};
+use std::str;
 
 pub fn global_service() -> Router {
     Router::new()
@@ -108,7 +111,7 @@ pub struct AllClients {
     pub slack: Option<OClient>,
 }
 
-pub fn build_oauth_clients(base_url: &str) -> anyhow::Result<AllClients> {
+pub async fn build_oauth_clients(base_url: &str) -> anyhow::Result<AllClients> {
     let connect_configs = serde_json::from_str::<HashMap<String, OAuthConfig>>(include_str!(
         "../../oauth_connect.json"
     ))?;
@@ -116,12 +119,14 @@ pub fn build_oauth_clients(base_url: &str) -> anyhow::Result<AllClients> {
         "../../oauth_login.json"
     ))?;
 
+    let mut content = String::new();
     let path = "./oauth.json";
-    let content = if std::path::Path::new(path).exists() {
-        fs::read_to_string(path).map_err(to_anyhow)?
+    if std::path::Path::new(path).exists() {
+        let mut file = File::open(path).await?;
+        file.read_to_string(&mut content).await?;
     } else {
-        "{}".to_string()
-    };
+        content.push_str("{}");
+    }
 
     let oauths: HashMap<String, OAuthClient> =
         match serde_json::from_str::<HashMap<String, OAuthClient>>(&content) {
@@ -283,10 +288,12 @@ pub struct SlackBotToken {
 async fn connect(
     Path(client_name): Path<String>,
     Query(query): Query<HashMap<String, String>>,
+    Extension(clients): Extension<Arc<AllClients>>,
+    Extension(is_secure): Extension<Arc<IsSecure>>,
     cookies: Cookies,
 ) -> error::Result<Redirect> {
     let mut query = query.clone();
-    let connects = &OAUTH_CLIENTS.connects;
+    let connects = &clients.connects;
     let scopes = query
         .get("scopes")
         .map(|x| x.split('+').map(|x| x.to_owned()).collect());
@@ -302,7 +309,7 @@ async fn connect(
         cookies,
         scopes,
         extra_params,
-        *IS_SECURE,
+        is_secure.0,
     )
 }
 
@@ -369,9 +376,11 @@ async fn delete_account(
     Ok(format!("Deleted account id {id}"))
 }
 
-async fn list_logins() -> error::JsonResult<Vec<String>> {
+async fn list_logins(
+    Extension(clients): Extension<Arc<AllClients>>,
+) -> error::JsonResult<Vec<String>> {
     Ok(Json(
-        OAUTH_CLIENTS
+        clients
             .logins
             .keys()
             .map(|x| x.to_owned())
@@ -384,9 +393,11 @@ struct ScopesAndParams {
     scopes: Vec<String>,
     extra_params: Option<HashMap<String, String>>,
 }
-async fn list_connects() -> error::JsonResult<HashMap<String, ScopesAndParams>> {
+async fn list_connects(
+    Extension(clients): Extension<Arc<AllClients>>,
+) -> error::JsonResult<HashMap<String, ScopesAndParams>> {
     Ok(Json(
-        (&OAUTH_CLIENTS.connects)
+        (&clients.connects)
             .into_iter()
             .map(|(k, v)| {
                 (
@@ -401,8 +412,12 @@ async fn list_connects() -> error::JsonResult<HashMap<String, ScopesAndParams>>
     ))
 }
 
-async fn connect_slack(cookies: Cookies) -> error::Result<Redirect> {
-    let mut client = OAUTH_CLIENTS
+async fn connect_slack(
+    Extension(clients): Extension<Arc<AllClients>>,
+    Extension(is_secure): Extension<Arc<IsSecure>>,
+    cookies: Cookies,
+) -> error::Result<Redirect> {
+    let mut client = clients
         .slack
         .as_ref()
         .ok_or_else(|| error::Error::BadRequest("slack client not setup".to_string()))?
@@ -413,7 +428,7 @@ async fn connect_slack(cookies: Cookies) -> error::Result<Redirect> {
     client.add_scope("commands");
     let url = client.authorize_url(&state);
 
-    set_cookie(&state, cookies, *IS_SECURE);
+    set_cookie(&state, cookies, is_secure.0);
     Ok(Redirect::to(url.as_str()))
 }
 
@@ -455,9 +470,14 @@ async fn disconnect_slack(
     Ok(format!("slack disconnected"))
 }
 
-async fn login(Path(client_name): Path<String>, cookies: Cookies) -> error::Result<Redirect> {
-    let clients = &OAUTH_CLIENTS.logins;
-    oauth_redirect(clients, client_name, cookies, None, None, *IS_SECURE)
+async fn login(
+    Extension(clients): Extension<Arc<AllClients>>,
+    Extension(is_secure): Extension<Arc<IsSecure>>,
+    Path(client_name): Path<String>,
+    cookies: Cookies,
+) -> error::Result<Redirect> {
+    let clients = &clients.logins;
+    oauth_redirect(clients, client_name, cookies, None, None, is_secure.0)
 }
 
 #[derive(Deserialize)]
@@ -468,11 +488,13 @@ async fn refresh_token(
     authed: Authed,
     Path((w_id, id)): Path<(String, i32)>,
     Extension(user_db): Extension<UserDB>,
+    Extension(clients): Extension<Arc<AllClients>>,
+    Extension(http_client): Extension<Client>,
     Json(VariablePath { path }): Json<VariablePath>,
 ) -> error::Result<String> {
     let tx = user_db.begin(&authed).await?;
 
-    _refresh_token(tx, &path, w_id, id).await?;
+    _refresh_token(tx, &path, w_id, id, clients, http_client).await?;
 
     Ok(format!("Token at path {path} refreshed"))
 }
@@ -482,6 +504,8 @@ pub async fn _refresh_token<'c>(
     path: &str,
     w_id: String,
     id: i32,
+    clients: Arc<AllClients>,
+    http_client: Client,
 ) -> error::Result<String> {
     let account = sqlx::query!(
         "SELECT client, refresh_token FROM account WHERE workspace_id = $1 AND id = $2",
@@ -491,14 +515,14 @@ pub async fn _refresh_token<'c>(
     .fetch_optional(&mut tx)
     .await?;
     let account = not_found_if_none(account, "Account", &id.to_string())?;
-    let client = (&OAUTH_CLIENTS
+    let client = (&clients
         .connects
         .get(&account.client)
         .ok_or_else(|| error::Error::BadRequest("invalid client".to_string()))?
         .client)
         .to_owned();
 
-    let token = _exchange_token(client, &account.refresh_token).await;
+    let token = _exchange_token(client, &account.refresh_token, http_client).await;
 
     if let Err(token_err) = token {
         sqlx::query!(
@@ -556,10 +580,14 @@ pub async fn _refresh_token<'c>(
     Ok(token_str)
 }
 
-async fn _exchange_token(client: OClient, refresh_token: &str) -> Result<TokenResponse, Error> {
+async fn _exchange_token(
+    client: OClient,
+    refresh_token: &str,
+    http_client: Client,
+) -> Result<TokenResponse, Error> {
     let token_json = client
         .exchange_refresh_token(&RefreshToken::from(refresh_token.clone()))
-        .with_client(&HTTP_CLIENT)
+        .with_client(&http_client)
         .execute::<serde_json::Value>()
         .await
         .map_err(to_anyhow)?;
@@ -580,9 +608,11 @@ pub struct OAuthCallback {
 async fn connect_callback(
     cookies: Cookies,
     Path(client_name): Path<String>,
+    Extension(clients): Extension<Arc<AllClients>>,
+    Extension(http_client): Extension<Client>,
     Json(callback): Json<OAuthCallback>,
 ) -> error::JsonResult<TokenResponse> {
-    let client_w_scopes = OAUTH_CLIENTS
+    let client_w_scopes = &clients
         .connects
         .get(&client_name)
         .ok_or_else(|| error::Error::BadRequest("invalid client".to_string()))?;
@@ -590,7 +620,7 @@ async fn connect_callback(
     let client = client_w_scopes.client.to_owned();
     let extra_params = client_w_scopes.extra_params_callback.clone();
     let token_response =
-        exchange_code::<TokenResponse>(callback, &cookies, client, &HTTP_CLIENT, extra_params)
+        exchange_code::<TokenResponse>(callback, &cookies, client, &http_client, extra_params)
             .await?;
 
     Ok(Json(token_response))
@@ -601,15 +631,17 @@ async fn connect_slack_callback(
     authed: Authed,
     cookies: Cookies,
     Extension(user_db): Extension<UserDB>,
+    Extension(clients): Extension<Arc<AllClients>>,
+    Extension(http_client): Extension<Client>,
     Json(callback): Json<OAuthCallback>,
 ) -> error::Result<String> {
-    let client = OAUTH_CLIENTS
+    let client = clients
         .slack
         .as_ref()
         .ok_or_else(|| error::Error::BadRequest("slack client not setup".to_string()))?
         .to_owned();
     let token =
-        exchange_code::<SlackTokenResponse>(callback, &cookies, client, &HTTP_CLIENT, None).await?;
+        exchange_code::<SlackTokenResponse>(callback, &cookies, client, &http_client, None).await?;
 
     let mut tx = user_db.begin(&authed).await?;
 
@@ -625,26 +657,14 @@ async fn connect_slack_callback(
     )
     .execute(&mut tx)
     .await?;
-    sqlx::query_as!(
-        Group,
-        "INSERT INTO group_ (workspace_id, name, summary, extra_perms) VALUES ($1, $2, $3, $4) ON CONFLICT DO NOTHING",
-        w_id,
-        "slack",
-        "The group slack commands act on belhalf of",
-        serde_json::json!({username_to_permissioned_as(&authed.username): true})
-    )
-    .execute(&mut tx)
-    .await?;
-
     sqlx::query!(
         "INSERT INTO folder
-                (workspace_id, name, display_name, owners, extra_perms)
-                VALUES ($1, $2, $3, $4, $5) ON CONFLICT DO NOTHING",
+                (workspace_id, name, owners, extra_perms)
+                VALUES ($1, $2, $3, $4) ON CONFLICT DO NOTHING",
         &w_id,
         "slack_bot",
-        "Slack bot",
-        &["g/slack".to_string()],
-        serde_json::json!({"g/slack": true})
+        &[],
+        serde_json::json!({})
     )
     .execute(&mut tx)
     .await?;
@@ -727,17 +747,23 @@ where
 
 async fn slack_command(
     SlackSig { sig, ts }: SlackSig,
+    Extension(slack_verifier): Extension<Arc<Option<SlackVerifier>>>,
     Extension(db): Extension<DB>,
+    Extension(base_url): Extension<Arc<BaseUrl>>,
     body: Bytes,
 ) -> error::Result<String> {
     let form: SlackCommand = serde_urlencoded::from_bytes(&body)
         .map_err(|_| error::Error::BadRequest("invalid payload".to_string()))?;
 
     let body = String::from_utf8_lossy(&body);
-    if let Some(sv) = SLACK_SIGNING_SECRET.as_ref() {
-        if sv.verify(&ts, &body, &sig).ok().is_none() {
-            return Err(error::Error::BadRequest("verification failed".to_owned()));
-        }
+    if slack_verifier
+        .as_ref()
+        .as_ref()
+        .map(|sv| sv.verify(&ts, &body, &sig).ok())
+        .flatten()
+        .is_none()
+    {
+        return Err(error::Error::BadRequest("verification failed".to_owned()));
     }
 
     let mut tx = db.begin().await?;
@@ -781,7 +807,6 @@ async fn slack_command(
                 None,
                 None,
                 None,
-                None,
                 false,
                 false,
                 None,
@@ -789,7 +814,7 @@ async fn slack_command(
             )
             .await?;
             tx.commit().await?;
-            let url = BASE_URL.to_owned();
+            let url = base_url.0.to_owned();
             return Ok(format!(
                 "Job launched. See details at {url}/run/{uuid}?workspace={}",
                 &settings.workspace_id
@@ -814,27 +839,31 @@ pub struct UserInfo {
 async fn login_callback(
     Path(client_name): Path<String>,
     cookies: Cookies,
+    Extension(clients): Extension<Arc<AllClients>>,
     Extension(db): Extension<DB>,
+    Extension(http_client): Extension<Client>,
+    Extension(is_secure): Extension<Arc<IsSecure>>,
+    Extension(cookie_domain): Extension<Arc<CookieDomain>>,
     Json(callback): Json<OAuthCallback>,
 ) -> error::Result<String> {
-    let client_w_config = &OAUTH_CLIENTS
+    let client_w_config = &clients
         .logins
         .get(&client_name)
         .ok_or_else(|| error::Error::BadRequest("invalid client".to_string()))?;
     let client = client_w_config.client.to_owned();
     let token_res =
-        exchange_code::<TokenResponse>(callback, &cookies, client, &HTTP_CLIENT, None).await;
+        exchange_code::<TokenResponse>(callback, &cookies, client, &http_client, None).await;
 
     if let Ok(token) = token_res {
         let token = &token.access_token.to_string();
         let userinfo_url = client_w_config.userinfo_url.as_ref().ok_or_else(|| {
             Error::BadConfig(format!("Missing userinfo_url in client {client_name}"))
         })?;
-        let user = http_get_user_info::<UserInfo>(&HTTP_CLIENT, userinfo_url, token).await?;
+        let user = http_get_user_info::<UserInfo>(&http_client, userinfo_url, token).await?;
 
         let email = match client_name.as_str() {
             "github" => http_get_user_info::<Vec<GHEmailInfo>>(
-                &HTTP_CLIENT,
+                &http_client,
                 "https://api.github.com/user/emails",
                 token,
             )
@@ -870,7 +899,15 @@ async fn login_callback(
         if let Some((email, login_type, super_admin)) = login {
             let login_type = serde_json::json!(login_type);
             if login_type == client_name {
-                crate::users::create_session_token(&email, super_admin, &mut tx, cookies).await?;
+                crate::users::create_session_token(
+                    &email,
+                    super_admin,
+                    &mut tx,
+                    cookies,
+                    is_secure.0,
+                    &cookie_domain.as_ref().0,
+                )
+                .await?;
             } else {
                 return Err(error::Error::BadRequest(format!(
                     "an user with the email associated to this login exists but with a different \
@@ -905,7 +942,15 @@ async fn login_callback(
             tx.commit().await?;
             invite_user_to_all_auto_invite_worspaces(&db, &email).await?;
             tx = db.begin().await?;
-            crate::users::create_session_token(&email, false, &mut tx, cookies).await?;
+            crate::users::create_session_token(
+                &email,
+                false,
+                &mut tx,
+                cookies,
+                is_secure.0,
+                &cookie_domain.as_ref().0,
+            )
+            .await?;
             audit_log(
                 &mut tx,
                 &email,
@@ -916,7 +961,6 @@ async fn login_callback(
                 Some([("method", &client_name[..])].into()),
             )
             .await?;
-
             let demo_exists =
                 sqlx::query_scalar!("SELECT EXISTS(SELECT 1 FROM workspace WHERE id = 'demo')")
                     .fetch_one(&mut tx)
@@ -938,16 +982,6 @@ async fn login_callback(
             }
         }
         tx.commit().await?;
-
-        if let Some(new_user_webhook) = NEW_USER_WEBHOOK.clone() {
-            let _ = HTTP_CLIENT
-                .post(&new_user_webhook)
-                .json(&serde_json::json!({"email" : &email, "event": "oauth_signup"}))
-                .send()
-                .await
-                .map_err(|e| tracing::error!("Error sending new user webhook: {}", e.to_string()));
-        }
-
         Ok("Successfully logged in".to_string())
     } else {
         Err(error::Error::BadRequest(format!(
@@ -1069,7 +1103,7 @@ fn set_cookie(state: &State, cookies: Cookies, is_secure: bool) {
     let csrf = state.to_base64();
     let mut cookie = Cookie::new("csrf", csrf);
     cookie.set_secure(is_secure);
-    cookie.set_same_site(Some(cookie::SameSite::Lax));
+    cookie.set_same_site(cookie::SameSite::Lax);
     cookie.set_http_only(true);
     cookie.set_path("/");
     cookies.add(cookie);

backend/windmill-api/src/resources.rs

@@ -9,7 +9,6 @@
 use crate::{
     db::{UserDB, DB},
     users::{require_owner_of_path, Authed},
-    webhook_util::{WebhookMessage, WebhookShared},
 };
 use axum::{
     extract::{Extension, Path, Query},
@@ -142,7 +141,7 @@ async fn list_resources(
         .join("account")
         .on("variable.account = account.id AND account.workspace_id = variable.workspace_id")
         .order_by("path", true)
-        .and_where("resource.workspace_id = ?".bind(&w_id))
+        .and_where("resource.workspace_id = ? OR resource.workspace_id = 'starter'".bind(&w_id))
         .offset(offset)
         .limit(per_page)
         .clone();
@@ -187,7 +186,7 @@ async fn get_resource(
         FROM resource
         LEFT JOIN variable ON variable.path = resource.path AND variable.workspace_id = resource.workspace_id
         LEFT JOIN account ON variable.account = account.id AND account.workspace_id = resource.workspace_id
-        WHERE resource.path = $1 AND resource.workspace_id = $2",
+        WHERE resource.path = $1 AND (resource.workspace_id = $2 OR resource.workspace_id = 'starter')",
         path.to_owned(),
         &w_id
     )
@@ -226,7 +225,8 @@ async fn get_resource_value(
     let mut tx = user_db.begin(&authed).await?;
 
     let value_o = sqlx::query_scalar!(
-        "SELECT value from resource WHERE path = $1 AND workspace_id = $2",
+        "SELECT value from resource WHERE path = $1 AND (workspace_id = $2 OR workspace_id = \
+         'starter')",
         path.to_owned(),
         &w_id
     )
@@ -263,7 +263,6 @@ async fn check_path_conflict<'c>(
 async fn create_resource(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path(w_id): Path<String>,
     Json(resource): Json<CreateResource>,
 ) -> Result<(StatusCode, String)> {
@@ -294,11 +293,6 @@ async fn create_resource(
     .await?;
     tx.commit().await?;
 
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::CreateResource { workspace: w_id, path: resource.path.clone() },
-    );
-
     Ok((
         StatusCode::CREATED,
         format!("resource {} created", resource.path),
@@ -308,7 +302,6 @@ async fn create_resource(
 async fn delete_resource(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path((w_id, path)): Path<(String, StripPath)>,
 ) -> Result<String> {
     let path = path.to_path();
@@ -340,18 +333,12 @@ async fn delete_resource(
     .await?;
     tx.commit().await?;
 
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::DeleteResource { workspace: w_id, path: path.to_owned() },
-    );
-
     Ok(format!("resource {} deleted", path))
 }
 
 async fn update_resource(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Extension(db): Extension<DB>,
     Path((w_id, path)): Path<(String, StripPath)>,
     Json(ns): Json<EditResource>,
@@ -413,15 +400,6 @@ async fn update_resource(
     .await?;
     tx.commit().await?;
 
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::UpdateResource {
-            workspace: w_id,
-            old_path: path.to_owned(),
-            new_path: npath.clone(),
-        },
-    );
-
     Ok(format!("resource {} updated (npath: {:?})", path, npath))
 }
 
@@ -433,7 +411,6 @@ struct UpdateResource {
 async fn update_resource_value(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path((w_id, path)): Path<(String, StripPath)>,
     Json(nv): Json<UpdateResource>,
 ) -> Result<String> {
@@ -459,14 +436,6 @@ async fn update_resource_value(
     )
     .await?;
     tx.commit().await?;
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::UpdateResource {
-            workspace: w_id,
-            old_path: path.to_owned(),
-            new_path: path.to_owned(),
-        },
-    );
 
     Ok(format!("value of resource {} updated", path))
 }
@@ -477,7 +446,7 @@ async fn list_resource_types(
 ) -> JsonResult<Vec<ResourceType>> {
     let rows = sqlx::query_as!(
         ResourceType,
-        "SELECT * from resource_type WHERE (workspace_id = $1 OR workspace_id = 'admins') ORDER \
+        "SELECT * from resource_type WHERE (workspace_id = $1 OR workspace_id = 'starter' OR workspace_id = 'admins') ORDER \
          BY name",
         &w_id
     )
@@ -492,7 +461,7 @@ async fn list_resource_types_names(
     Path(w_id): Path<String>,
 ) -> JsonResult<Vec<String>> {
     let rows = sqlx::query_scalar!(
-        "SELECT name from resource_type WHERE (workspace_id = $1 OR workspace_id = 'admins') \
+        "SELECT name from resource_type WHERE (workspace_id = $1 OR workspace_id = 'starter' OR workspace_id = 'admins') \
          ORDER BY name",
         &w_id
     )
@@ -511,7 +480,8 @@ async fn get_resource_type(
 
     let resource_type_o = sqlx::query_as!(
         ResourceType,
-        "SELECT * from resource_type WHERE name = $1 AND (workspace_id = $2 OR workspace_id = 'admins')",
+        "SELECT * from resource_type WHERE name = $1 AND (workspace_id = $2 OR workspace_id = \
+         'starter' OR workspace_id = 'admins')",
         &name,
         &w_id
     )
@@ -528,7 +498,8 @@ async fn exists_resource_type(
     Path((w_id, name)): Path<(String, String)>,
 ) -> JsonResult<bool> {
     let exists = sqlx::query_scalar!(
-        "SELECT EXISTS(SELECT 1 FROM resource_type WHERE name = $1 AND (workspace_id = $2 OR workspace_id = 'admins'))",
+        "SELECT EXISTS(SELECT 1 FROM resource_type WHERE name = $1 AND (workspace_id = $2 OR workspace_id = \
+            'starter' OR workspace_id = 'admins'))",
         name,
         w_id
     )
@@ -542,7 +513,6 @@ async fn exists_resource_type(
 async fn create_resource_type(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path(w_id): Path<String>,
     Json(resource_type): Json<CreateResourceType>,
 ) -> Result<(StatusCode, String)> {
@@ -573,11 +543,6 @@ async fn create_resource_type(
     .await?;
     tx.commit().await?;
 
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::CreateResourceType { name: resource_type.name.clone() },
-    );
-
     Ok((
         StatusCode::CREATED,
         format!("resource_type {} created", resource_type.name),
@@ -609,7 +574,6 @@ async fn check_rt_path_conflict<'c>(
 async fn delete_resource_type(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path((w_id, name)): Path<(String, String)>,
 ) -> Result<String> {
     require_admin(authed.is_admin, &authed.username)?;
@@ -634,10 +598,6 @@ async fn delete_resource_type(
     )
     .await?;
     tx.commit().await?;
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::DeleteResourceType { name: name.clone() },
-    );
 
     Ok(format!("resource_type {} deleted", name))
 }
@@ -645,7 +605,6 @@ async fn delete_resource_type(
 async fn update_resource_type(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path((w_id, name)): Path<(String, String)>,
     Json(ns): Json<EditResourceType>,
 ) -> Result<String> {
@@ -675,10 +634,6 @@ async fn update_resource_type(
     )
     .await?;
     tx.commit().await?;
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::UpdateResourceType { name: name.clone() },
-    );
 
     Ok(format!("resource_type {} updated", name))
 }

backend/windmill-api/src/scripts.rs

@@ -6,6 +6,7 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
+use reqwest::Client;
 use sql_builder::prelude::*;
 use windmill_audit::{audit_log, ActionKind};
 
@@ -13,8 +14,6 @@ use crate::{
     db::{UserDB, DB},
     schedule::clear_schedule,
     users::{require_owner_of_path, Authed},
-    webhook_util::{WebhookMessage, WebhookShared},
-    HTTP_CLIENT,
 };
 use axum::{
     extract::{Extension, Path, Query},
@@ -70,7 +69,6 @@ pub fn workspaced_service() -> Router {
         .route("/exists/p/*path", get(exists_script_by_path))
         .route("/archive/h/:hash", post(archive_script_by_hash))
         .route("/delete/h/:hash", post(delete_script_by_hash))
-        .route("/delete/p/*path", post(delete_script_by_path))
         .route("/get/h/:hash", get(get_script_by_hash))
         .route("/raw/h/:hash", get(raw_script_by_hash))
         .route("/deployment_status/h/:hash", get(get_deployment_status))
@@ -112,7 +110,7 @@ async fn list_scripts(
         )
         .order_desc("favorite.path IS NOT NULL")
         .order_by("created_at", lq.order_desc.unwrap_or(true))
-        .and_where("o.workspace_id = ?".bind(&w_id))
+        .and_where("o.workspace_id = ? OR o.workspace_id = 'starter'".bind(&w_id))
         .offset(offset)
         .limit(per_page)
         .clone();
@@ -121,10 +119,9 @@ async fn list_scripts(
         sqlb.and_where_eq(
             "created_at",
             "(select max(created_at) from script where o.path = path 
-            AND workspace_id = ?)"
+            AND (workspace_id = ? OR workspace_id = 'starter'))"
                 .bind(&w_id),
         );
-        sqlb.and_where_eq("archived", true);
     } else {
         sqlb.and_where_eq("archived", false);
     }
@@ -165,9 +162,12 @@ async fn list_scripts(
     Ok(Json(rows))
 }
 
-async fn list_hub_scripts(Authed { email, .. }: Authed) -> JsonResult<serde_json::Value> {
+async fn list_hub_scripts(
+    Authed { email, .. }: Authed,
+    Extension(http_client): Extension<Client>,
+) -> JsonResult<serde_json::Value> {
     let asks = list_elems_from_hub(
-        &HTTP_CLIENT,
+        http_client,
         "https://hub.windmill.dev/searchData?approved=true",
         &email,
     )
@@ -184,7 +184,6 @@ fn hash_script(ns: &NewScript) -> i64 {
 async fn create_script(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Extension(db): Extension<DB>,
     Path(w_id): Path<String>,
     Json(ns): Json<NewScript>,
@@ -379,7 +378,6 @@ async fn create_script(
             None,
             None,
             None,
-            None,
             false,
             false,
             None,
@@ -402,14 +400,6 @@ async fn create_script(
             Some([("hash", hash.to_string().as_str())].into()),
         )
         .await?;
-        webhook.send_message(
-            w_id.clone(),
-            WebhookMessage::UpdateScript {
-                workspace: w_id,
-                path: ns.path.clone(),
-                hash: hash.to_string(),
-            },
-        );
     } else {
         audit_log(
             &mut tx,
@@ -427,14 +417,6 @@ async fn create_script(
             ),
         )
         .await?;
-        webhook.send_message(
-            w_id.clone(),
-            WebhookMessage::CreateScript {
-                workspace: w_id,
-                path: ns.path.clone(),
-                hash: hash.to_string(),
-            },
-        );
     }
 
     tx.commit().await?;
@@ -442,16 +424,21 @@ async fn create_script(
     Ok((StatusCode::CREATED, format!("{}", hash)))
 }
 
-pub async fn get_hub_script_by_path(authed: Authed, Path(path): Path<StripPath>) -> Result<String> {
-    windmill_common::scripts::get_hub_script_by_path(&authed.email, path, &HTTP_CLIENT).await
+pub async fn get_hub_script_by_path(
+    authed: Authed,
+    Path(path): Path<StripPath>,
+    Extension(http_client): Extension<Client>,
+) -> Result<String> {
+    windmill_common::scripts::get_hub_script_by_path(&authed.email, path, http_client).await
 }
 
 pub async fn get_full_hub_script_by_path(
     Authed { email, .. }: Authed,
     Path(path): Path<StripPath>,
+    Extension(http_client): Extension<Client>,
 ) -> JsonResult<HubScript> {
     Ok(Json(
-        windmill_common::scripts::get_full_hub_script_by_path(&email, path, &HTTP_CLIENT).await?,
+        windmill_common::scripts::get_full_hub_script_by_path(&email, path, http_client).await?,
     ))
 }
 
@@ -464,9 +451,9 @@ async fn get_script_by_path(
     let mut tx = user_db.begin(&authed).await?;
 
     let script_o = sqlx::query_as::<_, Script>(
-        "SELECT * FROM script WHERE path = $1 AND workspace_id = $2 \
+        "SELECT * FROM script WHERE path = $1 AND (workspace_id = $2 OR workspace_id = 'starter') \
          AND created_at = (SELECT max(created_at) FROM script WHERE path = $1 AND \
-         workspace_id = $2)",
+         (workspace_id = $2 OR workspace_id = 'starter'))",
     )
     .bind(path)
     .bind(w_id)
@@ -505,12 +492,11 @@ async fn raw_script_by_path(
     let mut tx = user_db.begin(&authed).await?;
 
     let content_o = sqlx::query_scalar!(
-        "SELECT content FROM script WHERE path = $1 AND workspace_id = $2 \
+        "SELECT content FROM script WHERE path = $1 AND (workspace_id = $2 OR workspace_id = 'starter') \
          AND
          created_at = (SELECT max(created_at) FROM script WHERE path = $1 AND archived = false AND \
-         workspace_id = $2)",
-        path,
-        w_id
+         (workspace_id = $2 OR workspace_id = 'starter'))",
+         path, w_id
     )
     .fetch_optional(&mut tx)
     .await?;
@@ -527,8 +513,10 @@ async fn exists_script_by_path(
     let path = path.to_path();
 
     let exists = sqlx::query_scalar!(
-        "SELECT EXISTS(SELECT 1 FROM script WHERE path = $1 AND workspace_id = $2 AND
-         created_at = (SELECT max(created_at) FROM script WHERE path = $1 AND workspace_id = $2))",
+        "SELECT EXISTS(SELECT 1 FROM script WHERE path = $1 AND (workspace_id = $2 OR \
+         workspace_id = 'starter') AND
+         created_at = (SELECT max(created_at) FROM script WHERE path = $1 AND (workspace_id = $2 \
+         OR workspace_id = 'starter')))",
         path,
         w_id
     )
@@ -544,12 +532,13 @@ async fn get_script_by_hash_internal<'c>(
     workspace_id: &str,
     hash: &ScriptHash,
 ) -> Result<Script> {
-    let script_o =
-        sqlx::query_as::<_, Script>("SELECT * FROM script WHERE hash = $1 AND workspace_id = $2")
-            .bind(hash)
-            .bind(workspace_id)
-            .fetch_optional(db)
-            .await?;
+    let script_o = sqlx::query_as::<_, Script>(
+        "SELECT * FROM script WHERE hash = $1 AND (workspace_id = $2 OR workspace_id = 'starter')",
+    )
+    .bind(hash)
+    .bind(workspace_id)
+    .fetch_optional(db)
+    .await?;
 
     let script = not_found_if_none(script_o, "Script", hash.to_string())?;
     Ok(script)
@@ -595,7 +584,8 @@ async fn get_deployment_status(
     let mut tx = user_db.begin(&authed).await?;
     let status_o: Option<DeploymentStatus> = sqlx::query_as!(
         DeploymentStatus,
-        "SELECT lock, lock_error_logs FROM script WHERE hash = $1 AND workspace_id = $2",
+        "SELECT lock, lock_error_logs FROM script WHERE hash = $1 AND (workspace_id = $2 OR \
+         workspace_id = 'starter')",
         hash.0,
         w_id,
     )
@@ -610,7 +600,6 @@ async fn get_deployment_status(
 
 async fn archive_script_by_path(
     authed: Authed,
-    Extension(webhook): Extension<WebhookShared>,
     Extension(user_db): Extension<UserDB>,
     Extension(db): Extension<DB>,
     Path((w_id, path)): Path<(String, StripPath)>,
@@ -637,10 +626,6 @@ async fn archive_script_by_path(
     )
     .await?;
     tx.commit().await?;
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::DeleteScript { workspace: w_id, hash: hash.to_string() },
-    );
 
     Ok(())
 }
@@ -648,7 +633,6 @@ async fn archive_script_by_path(
 async fn archive_script_by_hash(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path((w_id, hash)): Path<(String, ScriptHash)>,
 ) -> JsonResult<Script> {
     let mut tx = user_db.begin(&authed).await?;
@@ -673,18 +657,12 @@ async fn archive_script_by_hash(
     .await?;
     tx.commit().await?;
 
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::DeleteScript { workspace: w_id, hash: hash.to_string() },
-    );
-
     Ok(Json(script))
 }
 
 async fn delete_script_by_hash(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Extension(db): Extension<DB>,
     Path((w_id, hash)): Path<(String, ScriptHash)>,
 ) -> JsonResult<Script> {
@@ -713,51 +691,6 @@ async fn delete_script_by_hash(
     .await?;
     tx.commit().await?;
 
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::DeleteScript { workspace: w_id, hash: hash.to_string() },
-    );
-
-    Ok(Json(script))
-}
-
-async fn delete_script_by_path(
-    authed: Authed,
-    Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
-    Extension(db): Extension<DB>,
-    Path((w_id, path)): Path<(String, StripPath)>,
-) -> JsonResult<String> {
-    let mut tx = user_db.begin(&authed).await?;
-    let path = path.to_path();
-
-    require_admin(authed.is_admin, &authed.username)?;
-    let script = sqlx::query_scalar!(
-        "DELETE FROM script WHERE path = $1 AND workspace_id = $2 RETURNING path",
-        path,
-        w_id
-    )
-    .fetch_one(&db)
-    .await
-    .map_err(|e| Error::InternalErr(format!("deleting script by path {w_id}: {e}")))?;
-
-    audit_log(
-        &mut tx,
-        &authed.username,
-        "scripts.delete",
-        ActionKind::Delete,
-        &w_id,
-        Some(&path),
-        Some([("workspace", w_id.as_str())].into()),
-    )
-    .await?;
-    tx.commit().await?;
-
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::DeleteScriptPath { workspace: w_id, path: path.to_string() },
-    );
-
     Ok(Json(script))
 }
 

backend/windmill-api/src/static_assets.rs

@@ -9,41 +9,58 @@
 use axum::{
     body::{self, BoxBody},
     extract::OriginalUri,
-    http::{header, Response},
+    http::{header, response::Builder, Response},
     response::IntoResponse,
+    Extension,
 };
 
-use hyper::Uri;
+use crate::{CloudHosted, ContentSecurityPolicy, IsSecure};
 use mime_guess::mime;
 use rust_embed::RustEmbed;
+use std::sync::Arc;
 
 // static_handler is a handler that serves static files from the
-pub async fn static_handler(OriginalUri(original_uri): OriginalUri) -> StaticFile {
-    StaticFile(original_uri)
+pub async fn static_handler(
+    Extension(is_secure): Extension<Arc<IsSecure>>,
+    Extension(is_cloud_hosted): Extension<Arc<CloudHosted>>,
+    Extension(csp): Extension<Arc<ContentSecurityPolicy>>,
+    OriginalUri(original_uri): OriginalUri,
+) -> StaticFile {
+    let path = original_uri.path().trim_start_matches('/').to_string();
+    StaticFile(path, is_secure.0, is_cloud_hosted.0, csp)
 }
 
 #[derive(RustEmbed)]
 #[folder = "../../frontend/build/"]
 struct Asset;
-pub struct StaticFile(Uri);
+pub struct StaticFile(
+    pub String,
+    pub bool,
+    pub bool,
+    pub Arc<ContentSecurityPolicy>,
+);
 
 impl IntoResponse for StaticFile {
     fn into_response(self) -> Response<BoxBody> {
-        let path = self.0.path().trim_start_matches('/');
-        serve_path(path)
+        let path = self.0;
+        let can_set_security_headers = self.1 && self.2;
+        let csp = self.3;
+        serve_path(path, can_set_security_headers, csp)
     }
 }
 
-const TWO_HUNDRED: &str = "200.html";
-
-fn serve_path(path: &str) -> Response<BoxBody> {
+fn serve_path(
+    path: String,
+    can_set_security_headers: bool,
+    csp: Arc<ContentSecurityPolicy>,
+) -> Response<BoxBody> {
     if path.starts_with("api/") {
         return Response::builder()
             .status(404)
             .body(body::boxed(body::Empty::new()))
             .unwrap();
     }
-    match Asset::get(path) {
+    match Asset::get(path.as_str()) {
         Some(content) => {
             let body = body::boxed(body::Full::from(content.data));
             let mime = mime_guess::from_path(path).first_or_octet_stream();
@@ -58,12 +75,26 @@ fn serve_path(path: &str) -> Response<BoxBody> {
                 res = res.header(header::CACHE_CONTROL, "no-cache, no-store, must-revalidate");
             }
 
+            if can_set_security_headers {
+                res = set_security_headers(res, csp);
+            }
             res.body(body).unwrap()
         }
-        None if path.starts_with("_app/") => Response::builder()
+        None if path.as_str().starts_with("_app/") => Response::builder()
             .status(404)
             .body(body::boxed(body::Empty::new()))
             .unwrap(),
-        None => serve_path(TWO_HUNDRED),
+        None => serve_path("200.html".to_owned(), can_set_security_headers, csp),
     }
 }
+
+fn set_security_headers(mut res: Builder, csp: Arc<ContentSecurityPolicy>) -> Builder {
+    res = res.header("X-Frame-Options", "DENY");
+    res = res.header("X-Content-Type-Options", "nosniff");
+
+    if !csp.0.is_empty() {
+        res = res.header("Content-Security-Policy", &csp.0);
+    }
+
+    res
+}

backend/windmill-api/src/users.rs

@@ -13,7 +13,7 @@ use crate::{
     folders::get_folders_for_user,
     utils::require_super_admin,
     workspaces::invite_user_to_all_auto_invite_worspaces,
-    COOKIE_DOMAIN, HTTP_CLIENT, IS_SECURE,
+    CookieDomain, IsSecure,
 };
 use argon2::{password_hash::SaltString, Argon2, PasswordHash, PasswordHasher, PasswordVerifier};
 use axum::{
@@ -25,9 +25,7 @@ use axum::{
     Json, Router,
 };
 use hyper::{header::LOCATION, StatusCode};
-use lazy_static::lazy_static;
 use rand::rngs::OsRng;
-use regex::Regex;
 use retainer::Cache;
 use serde::{Deserialize, Serialize};
 use sqlx::FromRow;
@@ -37,7 +35,6 @@ use tracing::{Instrument, Span};
 use windmill_audit::{audit_log, ActionKind};
 use windmill_common::{
     error::{self, Error, JsonResult, Result},
-    users::SUPERADMIN_SECRET_EMAIL,
     utils::{not_found_if_none, rd_string, require_admin, Pagination, StripPath},
 };
 use windmill_queue::CLOUD_HOSTED;
@@ -269,7 +266,7 @@ impl AuthCache {
                     .unwrap_or(false)
                 {
                     Some(Authed {
-                        email: SUPERADMIN_SECRET_EMAIL.to_string(),
+                        email: "superadmin_secret@windmill.dev".to_string(),
                         username: "superadmin_secret".to_string(),
                         is_admin: true,
                         groups: Vec::new(),
@@ -723,12 +720,14 @@ async fn logout(
     Tokened { token }: Tokened,
     cookies: Cookies,
     Extension(db): Extension<DB>,
+    Extension(cookie_domain): Extension<Arc<CookieDomain>>,
     Query(LogoutQuery { rd }): Query<LogoutQuery>,
 ) -> Result<Response> {
     let mut cookie = Cookie::new(COOKIE_NAME, "");
     cookie.set_path(COOKIE_PATH);
-    if COOKIE_DOMAIN.is_some() {
-        cookie.set_domain(COOKIE_DOMAIN.clone().unwrap());
+    let domain = cookie_domain.0.clone();
+    if domain.is_some() {
+        cookie.set_domain(domain.clone().unwrap());
     }
     cookies.remove(cookie);
     let mut tx = db.begin().await?;
@@ -1000,10 +999,6 @@ async fn decline_invite(
     }
 }
 
-lazy_static! {
-    pub static ref VALID_USERNAME: Regex = Regex::new(r#"^[a-zA-Z_0-9]+$"#).unwrap();
-}
-
 async fn accept_invite(
     Authed { email, .. }: Authed,
     Extension(db): Extension<DB>,
@@ -1012,13 +1007,6 @@ async fn accept_invite(
     if &nu.username == "bot" {
         return Err(Error::BadRequest("bot is a reserved username".to_string()));
     }
-
-    if !VALID_USERNAME.is_match(&nu.username) {
-        return Err(windmill_common::error::Error::BadRequest(format!(
-            "Usermame can only contain alphanumeric characters and underscores"
-        )));
-    }
-
     let mut tx = db.begin().await?;
 
     let r = sqlx::query!(
@@ -1091,12 +1079,6 @@ async fn add_user_to_workspace<'c>(
         )));
     }
 
-    if !VALID_USERNAME.is_match(username) {
-        return Err(windmill_common::error::Error::BadRequest(format!(
-            "Usermame can only contain alphanumeric characters and underscores"
-        )));
-    }
-
     let already_exists_email = sqlx::query_scalar!(
         "SELECT EXISTS(SELECT 1 FROM usr WHERE workspace_id = $1 AND email = $2)",
         &w_id,
@@ -1288,10 +1270,6 @@ async fn delete_user(
     Ok(format!("email {} deleted", &email_to_delete))
 }
 
-lazy_static::lazy_static! {
-    pub static ref NEW_USER_WEBHOOK: Option<String> = std::env::var("NEW_USER_WEBHOOK").ok();
-}
-
 async fn create_user(
     Authed { email, .. }: Authed,
     Extension(db): Extension<DB>,
@@ -1302,12 +1280,6 @@ async fn create_user(
 
     require_super_admin(&mut tx, &email).await?;
 
-    if nu.email == SUPERADMIN_SECRET_EMAIL {
-        return Err(Error::BadRequest(
-            "The superadmin email is a reserved email".into(),
-        ));
-    }
-
     sqlx::query!(
         "INSERT INTO password(email, verified, password_hash, login_type, super_admin, name, \
          company)
@@ -1333,18 +1305,6 @@ async fn create_user(
     )
     .await?;
     tx.commit().await?;
-
-    if let Some(new_user_webhook) = NEW_USER_WEBHOOK.clone() {
-        let _ = HTTP_CLIENT
-            .post(&new_user_webhook)
-            .json(
-                &serde_json::json!({"email" : &nu.email, "name": &nu.name, "event": "global_add"}),
-            )
-            .send()
-            .await
-            .map_err(|e| tracing::error!("Error sending new user webhook: {}", e.to_string()));
-    }
-
     invite_user_to_all_auto_invite_worspaces(&db, &nu.email).await?;
 
     Ok((StatusCode::CREATED, format!("email {} created", nu.email)))
@@ -1589,19 +1549,21 @@ async fn login(
     cookies: Cookies,
     Extension(db): Extension<DB>,
     Extension(argon2): Extension<Arc<Argon2<'_>>>,
+    Extension(is_secure): Extension<Arc<IsSecure>>,
+    Extension(cookie_domain): Extension<Arc<CookieDomain>>,
     Json(Login { email, password }): Json<Login>,
 ) -> Result<String> {
     let mut tx = db.begin().await?;
 
-    let email_w_h: Option<(String, String, bool, bool)> = sqlx::query_as(
-        "SELECT email, password_hash, super_admin, first_time_user FROM password WHERE email = $1 AND login_type = \
+    let email_w_h: Option<(String, String, bool)> = sqlx::query_as(
+        "SELECT email, password_hash, super_admin FROM password WHERE email = $1 AND login_type = \
          'password'",
     )
     .bind(&email)
     .fetch_optional(&mut tx)
     .await?;
 
-    if let Some((email, hash, super_admin, first_time_user)) = email_w_h {
+    if let Some((email, hash, super_admin)) = email_w_h {
         let parsed_hash =
             PasswordHash::new(&hash).map_err(|e| Error::InternalErr(e.to_string()))?;
         if argon2
@@ -1610,27 +1572,15 @@ async fn login(
         {
             Err(Error::BadRequest("Invalid login".to_string()))
         } else {
-            if first_time_user {
-                sqlx::query_scalar!(
-                    "UPDATE password SET first_time_user = false WHERE email = $1",
-                    &email
-                )
-                .execute(&mut tx)
-                .await?;
-                let mut c = Cookie::new("first_time", "1");
-                if let Some(domain) = COOKIE_DOMAIN.as_ref() {
-                    c.set_domain(domain);
-                }
-                c.set_secure(false);
-                c.set_expires(time::OffsetDateTime::now_utc() + time::Duration::minutes(15));
-                c.set_http_only(false);
-                c.set_path("/");
-
-                cookies.add(c);
-            }
-
-            let token = create_session_token(&email, super_admin, &mut tx, cookies).await?;
-
+            let token = create_session_token(
+                &email,
+                super_admin,
+                &mut tx,
+                cookies,
+                is_secure.0,
+                &cookie_domain.as_ref().0,
+            )
+            .await?;
             tx.commit().await?;
             Ok(token)
         }
@@ -1644,6 +1594,8 @@ pub async fn create_session_token<'c>(
     super_admin: bool,
     tx: &mut sqlx::Transaction<'c, sqlx::Postgres>,
     cookies: Cookies,
+    is_secure: bool,
+    domain: &Option<String>,
 ) -> Result<String> {
     let token = rd_string(30);
     sqlx::query!(
@@ -1659,12 +1611,12 @@ pub async fn create_session_token<'c>(
     .execute(tx)
     .await?;
     let mut cookie = Cookie::new(COOKIE_NAME, token.clone());
-    cookie.set_secure(*IS_SECURE);
-    cookie.set_same_site(Some(cookie::SameSite::Lax));
+    cookie.set_secure(is_secure);
+    cookie.set_same_site(cookie::SameSite::Lax);
     cookie.set_http_only(true);
     cookie.set_path(COOKIE_PATH);
-    if COOKIE_DOMAIN.is_some() {
-        cookie.set_domain(COOKIE_DOMAIN.clone().unwrap());
+    if domain.is_some() {
+        cookie.set_domain(domain.clone().unwrap());
     }
     let mut expire: OffsetDateTime = time::OffsetDateTime::now_utc();
     expire += time::Duration::days(3);

backend/windmill-api/src/utils.rs

@@ -7,24 +7,16 @@
  */
 
 use sqlx::{Postgres, Transaction};
-use windmill_common::{
-    error::{self, Error},
-    users::SUPERADMIN_SECRET_EMAIL,
-};
+use windmill_common::error::{self, Error};
 
 pub async fn require_super_admin<'c>(
     db: &mut Transaction<'c, Postgres>,
     email: &str,
 ) -> error::Result<()> {
-    if email == SUPERADMIN_SECRET_EMAIL {
-        return Ok(());
-    }
     let is_admin = sqlx::query_scalar!("SELECT super_admin FROM password WHERE email = $1", email)
-        .fetch_optional(db)
+        .fetch_one(db)
         .await
-        .map_err(|e| Error::InternalErr(format!("fetching super admin: {e}")))?
-        .unwrap_or(false);
-
+        .map_err(|e| Error::InternalErr(format!("fetching super admin: {e}")))?;
     if !is_admin {
         Err(Error::NotAuthorized(
             "This endpoint require caller to be a super admin".to_owned(),

backend/windmill-api/src/variables.rs

@@ -6,11 +6,13 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
+use std::sync::Arc;
+
 use crate::{
     db::{UserDB, DB},
-    oauth2::_refresh_token,
+    oauth2::{AllClients, _refresh_token},
     users::{require_owner_of_path, Authed},
-    webhook_util::{WebhookMessage, WebhookShared},
+    BaseUrl,
 };
 /*
  * Author: Ruben Fiszel
@@ -26,7 +28,6 @@ use axum::{
     Json, Router,
 };
 use hyper::StatusCode;
-use serde_json::Value;
 use windmill_audit::{audit_log, ActionKind};
 use windmill_common::{
     error::{Error, JsonResult, Result},
@@ -35,6 +36,7 @@ use windmill_common::{
 };
 
 use magic_crypt::{MagicCrypt256, MagicCryptTrait};
+use reqwest::Client;
 use serde::Deserialize;
 use sqlx::{Postgres, Transaction};
 
@@ -51,6 +53,7 @@ pub fn workspaced_service() -> Router {
 
 async fn list_contextual_variables(
     Path(w_id): Path<String>,
+    Extension(base_url): Extension<Arc<BaseUrl>>,
     Authed { username, email, .. }: Authed,
 ) -> JsonResult<Vec<ContextualVariable>> {
     Ok(Json(
@@ -61,6 +64,7 @@ async fn list_contextual_variables(
             &username,
             "017e0ad5-f499-73b6-5488-92a61c5196dd",
             format!("u/{username}").as_str(),
+            &base_url.0,
             Some("u/user/script_path".to_string()),
             Some("017e0ad5-f499-73b6-5488-92a61c5196dd".to_string()),
             Some("u/user/encapsulating_flow_path".to_string()),
@@ -86,7 +90,7 @@ async fn list_variables(
          from variable
          LEFT JOIN account ON variable.account = account.id AND account.workspace_id = variable.workspace_id
          LEFT JOIN resource ON resource.path = variable.path AND resource.workspace_id = variable.workspace_id
-         WHERE variable.workspace_id = $1 ORDER BY path",
+         WHERE variable.workspace_id = $1 OR (is_secret IS NOT TRUE AND variable.workspace_id = 'starter') ORDER BY path",
     )
     .bind(&w_id)
     .fetch_all(&mut tx)
@@ -106,6 +110,8 @@ async fn get_variable(
     Extension(user_db): Extension<UserDB>,
     Query(q): Query<GetVariableQuery>,
     Path((w_id, path)): Path<(String, StripPath)>,
+    Extension(clients): Extension<Arc<AllClients>>,
+    Extension(http_client): Extension<Client>,
 ) -> JsonResult<ListableVariable> {
     let path = path.to_path();
     let mut tx = user_db.begin(&authed).await?;
@@ -117,7 +123,8 @@ async fn get_variable(
         from variable
         LEFT JOIN account ON variable.account = account.id
         LEFT JOIN resource ON resource.path = variable.path AND resource.workspace_id = variable.workspace_id
-        WHERE variable.path = $1 AND variable.workspace_id = $2
+        WHERE variable.path = $1 AND (variable.workspace_id = $2 OR (is_secret IS NOT TRUE AND \
+         variable.workspace_id = 'starter')) 
         LIMIT 1",
     )
     .bind(&path)
@@ -143,7 +150,17 @@ async fn get_variable(
         let value = variable.value.unwrap_or_else(|| "".to_string());
         ListableVariable {
             value: if variable.is_expired.unwrap_or(false) && variable.account.is_some() {
-                Some(_refresh_token(tx, &variable.path, w_id, variable.account.unwrap()).await?)
+                Some(
+                    _refresh_token(
+                        tx,
+                        &variable.path,
+                        w_id,
+                        variable.account.unwrap(),
+                        clients,
+                        http_client,
+                    )
+                    .await?,
+                )
             } else if !value.is_empty() && decrypt_secret {
                 let mc = build_crypt(&mut tx, &w_id).await?;
                 tx.commit().await?;
@@ -207,15 +224,13 @@ async fn check_path_conflict<'c>(
 async fn create_variable(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path(w_id): Path<String>,
-    Query(AlreadyEncrypted { already_encrypted }): Query<AlreadyEncrypted>,
     Json(variable): Json<CreateVariable>,
 ) -> Result<(StatusCode, String)> {
     let mut tx = user_db.begin(&authed).await?;
 
     check_path_conflict(&mut tx, &w_id, &variable.path).await?;
-    let value = if variable.is_secret && !already_encrypted.unwrap_or(false) {
+    let value = if variable.is_secret {
         let mc = build_crypt(&mut tx, &w_id).await?;
         encrypt(&mc, &variable.value)
     } else {
@@ -250,11 +265,6 @@ async fn create_variable(
 
     tx.commit().await?;
 
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::CreateVariable { workspace: w_id, path: variable.path.clone() },
-    );
-
     Ok((
         StatusCode::CREATED,
         format!("variable {} created", variable.path),
@@ -264,7 +274,6 @@ async fn create_variable(
 async fn delete_variable(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Path((w_id, path)): Path<(String, StripPath)>,
 ) -> Result<String> {
     let path = path.to_path();
@@ -297,11 +306,6 @@ async fn delete_variable(
 
     tx.commit().await?;
 
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::DeleteVariable { workspace: w_id, path: path.to_owned() },
-    );
-
     Ok(format!("variable {} deleted", path))
 }
 
@@ -313,18 +317,11 @@ struct EditVariable {
     description: Option<String>,
 }
 
-#[derive(Deserialize)]
-struct AlreadyEncrypted {
-    already_encrypted: Option<bool>,
-}
-
 async fn update_variable(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
-    Extension(webhook): Extension<WebhookShared>,
     Extension(db): Extension<DB>,
     Path((w_id, path)): Path<(String, StripPath)>,
-    Query(AlreadyEncrypted { already_encrypted }): Query<AlreadyEncrypted>,
     Json(ns): Json<EditVariable>,
 ) -> Result<String> {
     use sql_builder::prelude::*;
@@ -350,7 +347,7 @@ async fn update_variable(
         .await?
         .unwrap_or(false);
 
-        let value = if is_secret && !already_encrypted.unwrap_or(false) {
+        let value = if is_secret {
             let mc = build_crypt(&mut tx, &w_id).await?;
             encrypt(&mc, &nvalue)
         } else {
@@ -379,27 +376,9 @@ async fn update_variable(
             if !authed.is_admin {
                 require_owner_of_path(&w_id, &authed.username, &authed.groups, &path, &db).await?;
             }
-            let mut v = sqlx::query_scalar!(
-                "SELECT value FROM resource  WHERE path = $1 AND workspace_id = $2",
-                path,
-                w_id
-            )
-            .fetch_optional(&mut tx)
-            .await?
-            .flatten();
-
-            if let Some(old_v) = v {
-                v = Some(replace_path(
-                    old_v,
-                    &format!("$var:{path}"),
-                    &format!("$var:{npath}"),
-                ))
-            }
-
             sqlx::query!(
-                "UPDATE resource SET path = $1, value = $2 WHERE path = $3 AND workspace_id = $4",
+                "UPDATE resource SET path = $1 WHERE path = $2 AND workspace_id = $3",
                 npath,
-                v,
                 path,
                 w_id
             )
@@ -426,35 +405,9 @@ async fn update_variable(
     .await?;
     tx.commit().await?;
 
-    webhook.send_message(
-        w_id.clone(),
-        WebhookMessage::UpdateVariable {
-            workspace: w_id,
-            old_path: path.to_owned(),
-            new_path: npath.clone(),
-        },
-    );
-
     Ok(format!("variable {} updated (npath: {:?})", path, npath))
 }
 
-fn replace_path(v: serde_json::Value, path: &str, npath: &str) -> Value {
-    match v {
-        Value::Object(v) => Value::Object(
-            v.into_iter()
-                .map(|(k, v)| (k, replace_path(v, path, npath)))
-                .collect(),
-        ),
-        Value::Array(arr) => Value::Array(
-            arr.into_iter()
-                .map(|v| replace_path(v, path, npath))
-                .collect(),
-        ),
-        Value::String(s) if s == path => Value::String(npath.to_owned()),
-        _ => v,
-    }
-}
-
 pub async fn build_crypt<'c>(
     db: &mut Transaction<'c, Postgres>,
     w_id: &str,

backend/windmill-api/src/webhook_util.rs

@@ -1,114 +0,0 @@
-use std::time::Duration;
-
-use serde::Serialize;
-use tokio::{select, sync::mpsc, time::interval};
-
-use crate::db::DB;
-
-lazy_static::lazy_static! {
-    // TODO: these aren't synced, they should be moved into the queue abstraction once/if that happens.
-    static ref WEBHOOK_REQUEST_COUNT: prometheus::Histogram = prometheus::register_histogram!(
-        "webhook_request",
-        "Histogram of webhook requests made"
-    )
-    .unwrap();
-}
-
-#[derive(Serialize)]
-#[serde(tag = "type")]
-pub enum WebhookMessage {
-    // See https://serde.rs/enum-representations.html#internally-tagged for how this looks in JSON
-    CreateApp { workspace: String, path: String },
-    DeleteApp { workspace: String, path: String },
-    UpdateApp { workspace: String, old_path: String, new_path: String },
-    CreateFlow { workspace: String, path: String },
-    UpdateFlow { workspace: String, old_path: String, new_path: String },
-    ArchiveFlow { workspace: String, path: String },
-    DeleteFlow { workspace: String, path: String },
-    CreateFolder { workspace: String, name: String },
-    UpdateFolder { workspace: String, name: String },
-    DeleteFolder { workspace: String, name: String },
-    DeleteResource { workspace: String, path: String },
-    CreateResource { workspace: String, path: String },
-    UpdateResource { workspace: String, old_path: String, new_path: String },
-    CreateResourceType { name: String },
-    DeleteResourceType { name: String },
-    UpdateResourceType { name: String },
-    CreateScript { workspace: String, path: String, hash: String },
-    UpdateScript { workspace: String, path: String, hash: String },
-    DeleteScript { workspace: String, hash: String },
-    DeleteScriptPath { workspace: String, path: String },
-    CreateVariable { workspace: String, path: String },
-    UpdateVariable { workspace: String, old_path: String, new_path: String },
-    DeleteVariable { workspace: String, path: String },
-}
-
-#[derive(Clone)]
-pub struct WebhookShared {
-    pub channel: mpsc::UnboundedSender<(String, WebhookMessage)>,
-}
-
-impl WebhookShared {
-    pub fn new(mut shutdown_rx: tokio::sync::broadcast::Receiver<()>, db: DB) -> Self {
-        let (tx, mut rx) = mpsc::unbounded_channel::<(String, WebhookMessage)>();
-        let _process = tokio::spawn(async move {
-            let client = reqwest::Client::builder()
-                // TODO: investigate pool timeouts and such if TCP load is high
-                .timeout(Duration::from_secs(5))
-                .build()
-                .unwrap();
-            let cache = retainer::Cache::new();
-            let mut cache_purge_interval = interval(Duration::from_secs(30));
-
-            loop {
-                select! {
-                    biased;
-                    _ = shutdown_rx.recv() => break,
-                    r = rx.recv() => match r {
-                        Some((workspace_id, message)) => {
-                            let url_guard = match cache.get(&workspace_id).await {
-                                Some(guard) => {
-                                    guard
-                                },
-                                None => {
-                                    let Ok(webook_opt) =
-                                        sqlx::query_scalar!(
-                                            "SELECT webhook FROM workspace_settings WHERE workspace_id = $1",
-                                            workspace_id
-                                        )
-                                        .fetch_one(
-                                            &db,
-                                        )
-                                        .await else {
-                                            tracing::error!("Webhook Message to send - but cannot get workspace settings! Workspace: {workspace_id}");
-                                            continue;
-                                        };
-                                    cache.insert(workspace_id.clone(), webook_opt, Duration::from_secs(30)).await;
-                                    cache.get(&workspace_id).await.unwrap()
-                                }
-                            };
-                            let webook_opt = url_guard.value();
-                            if let Some(url) = webook_opt {
-                                let timer = WEBHOOK_REQUEST_COUNT.start_timer();
-                                let _ = client.post(url).json(&message).send().await;
-                                timer.stop_and_record();
-                                drop(url_guard);
-                            }
-                        },
-                        None => break,
-                    },
-                    _ = futures::future::poll_fn(|cx| cache_purge_interval.poll_tick(cx)) => {
-                        tracing::trace!("Purging Webhook Cache");
-                        cache.purge(10, 0.50).await;
-                    },
-                }
-            }
-        });
-
-        Self { channel: tx }
-    }
-
-    pub fn send_message(&self, workspace_id: String, message: WebhookMessage) {
-        let _ = self.channel.send((workspace_id.clone(), message));
-    }
-}

backend/windmill-api/src/worker_ping.rs

@@ -28,7 +28,7 @@ pub fn global_service() -> Router {
 struct WorkerPing {
     worker: String,
     worker_instance: String,
-    last_ping: Option<i32>,
+    ping_at: chrono::DateTime<chrono::Utc>,
     started_at: chrono::DateTime<chrono::Utc>,
     ip: String,
     jobs_executed: i32,
@@ -45,7 +45,7 @@ async fn list_worker_pings(
 
     let rows = sqlx::query_as!(
         WorkerPing,
-        "SELECT worker, worker_instance,  EXTRACT(EPOCH FROM (now() - ping_at))::integer as last_ping, started_at, ip, jobs_executed FROM worker_ping ORDER BY ping_at desc LIMIT $1 OFFSET $2",
+        "SELECT * FROM worker_ping ORDER BY ping_at desc LIMIT $1 OFFSET $2",
         per_page as i64,
         offset as i64
     )

backend/windmill-api/src/workspaces.rs

@@ -6,33 +6,24 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
-#[cfg(feature = "enterprise")]
-use std::str::FromStr;
+use std::{str::FromStr, sync::Arc};
 
-#[cfg(feature = "enterprise")]
-use crate::BASE_URL;
 use crate::{
-    apps::AppWithLastVersion,
     db::{UserDB, DB},
     folders::Folder,
     resources::{Resource, ResourceType},
-    users::{Authed, WorkspaceInvite, NEW_USER_WEBHOOK, VALID_USERNAME},
+    users::{Authed, WorkspaceInvite},
     utils::require_super_admin,
-    variables::build_crypt,
-    HTTP_CLIENT,
+    BaseUrl,
 };
-#[cfg(feature = "enterprise")]
-use axum::response::Redirect;
 use axum::{
     body::StreamBody,
     extract::{Extension, Path, Query},
     headers,
-    response::IntoResponse,
+    response::{IntoResponse, Redirect},
     routing::{delete, get, post},
     Json, Router,
 };
-use magic_crypt::MagicCryptTrait;
-#[cfg(feature = "enterprise")]
 use stripe::CustomerId;
 use windmill_audit::{audit_log, ActionKind};
 use windmill_common::{
@@ -51,7 +42,7 @@ use tokio::fs::File;
 use tokio_util::io::ReaderStream;
 
 pub fn workspaced_service() -> Router {
-    let router = Router::new()
+    Router::new()
         .route("/list_pending_invites", get(list_pending_invites))
         .route("/update", post(edit_workspace))
         .route("/archive", post(archive_workspace))
@@ -60,20 +51,11 @@ pub fn workspaced_service() -> Router {
         .route("/delete_invite", post(delete_invite))
         .route("/get_settings", get(get_settings))
         .route("/edit_slack_command", post(edit_slack_command))
-        .route("/edit_webhook", post(edit_webhook))
         .route("/edit_auto_invite", post(edit_auto_invite))
         .route("/tarball", get(tarball_workspace))
-        .route("/premium_info", get(premium_info));
-
-    #[cfg(feature = "enterprise")]
-    tracing::info!("stripe enabled");
-
-    #[cfg(feature = "enterprise")]
-    let router = router
+        .route("/premium_info", get(premium_info))
         .route("/checkout", get(stripe_checkout))
-        .route("/billing_portal", get(stripe_portal));
-
-    router
+        .route("/billing_portal", get(stripe_portal))
 }
 pub fn global_service() -> Router {
     Router::new()
@@ -108,7 +90,6 @@ pub struct WorkspaceSettings {
     pub auto_invite_operator: Option<bool>,
     pub customer_id: Option<String>,
     pub plan: Option<String>,
-    pub webhook: Option<String>,
 }
 
 #[derive(FromRow, Serialize, Debug)]
@@ -136,11 +117,6 @@ struct EditAutoInvite {
     operator: Option<bool>,
 }
 
-#[derive(Deserialize)]
-struct EditWebhook {
-    webhook: Option<String>,
-}
-
 #[derive(Deserialize)]
 struct CreateWorkspace {
     id: String,
@@ -233,25 +209,24 @@ async fn premium_info(
     Ok(Json(row))
 }
 
-#[cfg(feature = "enterprise")]
 #[derive(Deserialize)]
 struct PlanQuery {
     plan: String,
 }
 
-#[cfg(feature = "enterprise")]
 async fn stripe_checkout(
     authed: Authed,
     Path(w_id): Path<String>,
     Query(plan): Query<PlanQuery>,
+    Extension(base_url): Extension<Arc<BaseUrl>>,
 ) -> Result<Redirect> {
     // #[cfg(feature = "enterprise")]
     {
         require_admin(authed.is_admin, &authed.username)?;
 
         let client = stripe::Client::new(std::env::var("STRIPE_KEY").expect("STRIPE_KEY"));
-        let success_rd = format!("{}/workspace_settings/checkout?success=true", *BASE_URL);
-        let failure_rd = format!("{}/workspace_settings/checkout?success=false", *BASE_URL);
+        let success_rd = format!("{}/workspace_settings/checkout?success=true", base_url.0);
+        let failure_rd = format!("{}/workspace_settings/checkout?success=false", base_url.0);
         let checkout_session = {
             let mut params = stripe::CreateCheckoutSession::new(&failure_rd, &success_rd);
             params.mode = Some(stripe::CheckoutSessionMode::Subscription);
@@ -305,11 +280,11 @@ async fn stripe_checkout(
     }
 }
 
-#[cfg(feature = "enterprise")]
 async fn stripe_portal(
     authed: Authed,
     Path(w_id): Path<String>,
     Extension(db): Extension<DB>,
+    Extension(base_url): Extension<Arc<BaseUrl>>,
 ) -> Result<Redirect> {
     require_admin(authed.is_admin, &authed.username)?;
     let customer_id = sqlx::query_scalar!(
@@ -320,7 +295,7 @@ async fn stripe_portal(
     .await?
     .ok_or_else(|| Error::InternalErr(format!("no customer id for workspace {}", w_id)))?;
     let client = stripe::Client::new(std::env::var("STRIPE_KEY").expect("STRIPE_KEY"));
-    let success_rd = format!("{}/workspace_settings?tab=premium", *BASE_URL);
+    let success_rd = format!("{}/workspace_settings?tab=premium", base_url.0);
     let portal_session = {
         let customer_id = CustomerId::from_str(&customer_id).unwrap();
         let mut params = stripe::CreateBillingPortalSession::new(customer_id);
@@ -544,48 +519,6 @@ async fn edit_auto_invite(
     ))
 }
 
-async fn edit_webhook(
-    authed: Authed,
-    Extension(db): Extension<DB>,
-    Path(w_id): Path<String>,
-    Authed { is_admin, username, .. }: Authed,
-    Json(ew): Json<EditWebhook>,
-) -> Result<String> {
-    require_admin(is_admin, &username)?;
-
-    let mut tx = db.begin().await?;
-
-    if let Some(webhook) = &ew.webhook {
-        sqlx::query!(
-            "UPDATE workspace_settings SET webhook = $1 WHERE workspace_id = $2",
-            webhook,
-            &w_id
-        )
-        .execute(&mut tx)
-        .await?;
-    } else {
-        sqlx::query!(
-            "UPDATE workspace_settings SET webhook = NULL WHERE workspace_id = $1",
-            &w_id,
-        )
-        .execute(&mut tx)
-        .await?;
-    }
-    audit_log(
-        &mut tx,
-        &authed.username,
-        "workspaces.edit_webhook",
-        ActionKind::Update,
-        &w_id,
-        Some(&authed.email),
-        Some([("webhook", &format!("{:?}", ew.webhook)[..])].into()),
-    )
-    .await?;
-    tx.commit().await?;
-
-    Ok(format!("Edit webhook for workspace {}", &w_id))
-}
-
 async fn list_workspaces_as_super_admin(
     authed: Authed,
     Extension(user_db): Extension<UserDB>,
@@ -679,19 +612,19 @@ async fn create_workspace(
     .execute(&mut tx)
     .await?;
 
-    // let mc = magic_crypt::new_magic_crypt!(key, 256);
-    // sqlx::query!(
-    //     "INSERT INTO variable
-    //         (workspace_id, path, value, is_secret, description)
-    //         VALUES ($1, 'g/all/pretty_secret', $2, true, 'This item is secret'),
-    //             ($3, 'g/all/not_secret', $4, false, 'This item is not secret')",
-    //     nw.id,
-    //     crate::variables::encrypt(&mc, "pretty secret value"),
-    //     nw.id,
-    //     "finland does not actually exist",
-    // )
-    // .execute(&mut tx)
-    // .await?;
+    let mc = magic_crypt::new_magic_crypt!(key, 256);
+    sqlx::query!(
+        "INSERT INTO variable
+            (workspace_id, path, value, is_secret, description)
+            VALUES ($1, 'g/all/pretty_secret', $2, true, 'This item is secret'), 
+                ($3, 'g/all/not_secret', $4, false, 'This item is not secret')",
+        nw.id,
+        crate::variables::encrypt(&mc, "pretty secret value"),
+        nw.id,
+        "finland does not actually exist",
+    )
+    .execute(&mut tx)
+    .await?;
 
     sqlx::query!(
         "INSERT INTO usr
@@ -964,15 +897,6 @@ async fn invite_user(
 
     tx.commit().await?;
 
-    if let Some(new_user_webhook) = NEW_USER_WEBHOOK.clone() {
-        let _ = &HTTP_CLIENT
-            .post(&new_user_webhook)
-            .json(&serde_json::json!({"email" : &nu.email, "event": "workspace_invite"}))
-            .send()
-            .await
-            .map_err(|e| tracing::error!("Error sending new user webhook: {}", e.to_string()));
-    }
-
     Ok((
         StatusCode::CREATED,
         format!("user with email {} invited", nu.email),
@@ -988,11 +912,6 @@ async fn add_user(
     require_admin(is_admin, &username)?;
 
     let mut tx = db.begin().await?;
-    if !VALID_USERNAME.is_match(&nu.username) {
-        return Err(windmill_common::error::Error::BadRequest(format!(
-            "Usermame can only contain alphanumeric characters and underscores"
-        )));
-    }
 
     sqlx::query!(
         "INSERT INTO usr
@@ -1007,27 +926,8 @@ async fn add_user(
     .execute(&mut tx)
     .await?;
 
-    sqlx::query_as!(
-        Group,
-        "INSERT INTO usr_to_group (workspace_id, usr, group_) VALUES ($1, $2, $3) ON CONFLICT DO NOTHING",
-        &w_id,
-        nu.username,
-        "all",
-    )
-    .execute(&mut tx)
-    .await?;
-
     tx.commit().await?;
 
-    if let Some(new_user_webhook) = NEW_USER_WEBHOOK.clone() {
-        let _ = HTTP_CLIENT
-            .post(&new_user_webhook)
-            .json(&serde_json::json!({"email" : &nu.email, "event": "workspace_add"}))
-            .send()
-            .await
-            .map_err(|e| tracing::error!("Error sending new user webhook: {}", e.to_string()));
-    }
-
     Ok((
         StatusCode::CREATED,
         format!("user with email {} added", nu.email),
@@ -1090,122 +990,22 @@ struct ScriptMetadata {
     schema: Option<Schema>,
     is_template: bool,
     lock: Vec<String>,
-    kind: String,
-}
-
-enum ArchiveImpl {
-    Zip(async_zip::write::ZipFileWriter<File>),
-    Tar(tokio_tar::Builder<File>),
-}
-
-impl ArchiveImpl {
-    async fn write_to_archive(&mut self, content: &str, path: &str) -> Result<()> {
-        match self {
-            ArchiveImpl::Tar(t) => {
-                let bytes = content.as_bytes();
-                let mut header = tokio_tar::Header::new_gnu();
-                header.set_size(bytes.len() as u64);
-                header.set_mtime(0);
-                header.set_uid(0);
-                header.set_gid(0);
-                header.set_mode(0o777);
-                header.set_cksum();
-                t.append_data(&mut header, path, bytes).await?;
-            }
-            ArchiveImpl::Zip(z) => {
-                let header = async_zip::ZipEntryBuilder::new(
-                    path.to_owned(),
-                    async_zip::Compression::Deflate,
-                )
-                .last_modification_date(Default::default())
-                .unix_permissions(0o777)
-                .build();
-                z.write_entry_whole(header, content.as_bytes())
-                    .await
-                    .map_err(to_anyhow)?;
-            }
-        }
-        Ok(())
-    }
-    async fn finish(self) -> Result<()> {
-        match self {
-            ArchiveImpl::Tar(t) => t.into_inner().await?,
-            ArchiveImpl::Zip(z) => z.close().await.map_err(to_anyhow)?,
-        }
-        .sync_all()
-        .await?;
-
-        Ok(())
-    }
-}
-
-#[derive(Deserialize)]
-struct ArchiveQueryParams {
-    archive_type: Option<String>,
-    plain_secret: Option<bool>,
-}
-
-#[inline]
-pub fn to_string_without_metadata<T>(value: &T, preserve_extra_perms: bool) -> Result<String>
-where
-    T: ?Sized + Serialize,
-{
-    let value = serde_json::to_value(value).map_err(to_anyhow)?;
-    value
-        .as_object()
-        .map(|obj| {
-            let mut obj = obj.clone();
-            for key in [
-                "workspace_id",
-                "path",
-                "name",
-                "versions",
-                "id",
-                "created_at",
-                "updated_at",
-                "created_by",
-                "updated_by",
-                "edited_at",
-                "edited_by",
-                "archived",
-            ] {
-                if obj.contains_key(key) {
-                    obj.remove(key);
-                }
-            }
-
-            if !preserve_extra_perms && obj.contains_key("extra_perms") {
-                obj.remove("extra_perms");
-            }
-
-            serde_json::to_string_pretty(&obj).ok()
-        })
-        .flatten()
-        .ok_or_else(|| Error::BadRequest("Impossible to serialize value".to_string()))
 }
 
 async fn tarball_workspace(
     authed: Authed,
     Extension(db): Extension<DB>,
     Path(w_id): Path<String>,
-    Query(ArchiveQueryParams { archive_type, plain_secret }): Query<ArchiveQueryParams>,
 ) -> Result<([(headers::HeaderName, String); 2], impl IntoResponse)> {
     require_admin(authed.is_admin, &authed.username)?;
 
     let tmp_dir = TempDir::new_in(".")?;
 
-    let name = match archive_type.as_deref() {
-        Some("tar") | None => Ok(format!("windmill-{w_id}.tar")),
-        Some("zip") => Ok(format!("windmill-{w_id}.zip")),
-        Some(t) => Err(Error::BadRequest(format!("Invalid Archive Type {t}"))),
-    }?;
+    let name = format!("windmill-{w_id}.tar");
     let file_path = tmp_dir.path().join(&name);
     let file = File::create(&file_path).await?;
-    let mut archive = match archive_type.as_deref() {
-        Some("tar") | None => Ok(ArchiveImpl::Tar(tokio_tar::Builder::new(file))),
-        Some("zip") => Ok(ArchiveImpl::Zip(async_zip::write::ZipFileWriter::new(file))),
-        Some(t) => Err(Error::BadRequest(format!("Invalid Archive Type {t}"))),
-    }?;
+    let mut a = tokio_tar::Builder::new(file);
+
     {
         let folders = sqlx::query_as::<_, Folder>("SELECT * FROM folder WHERE workspace_id = $1")
             .bind(&w_id)
@@ -1213,12 +1013,12 @@ async fn tarball_workspace(
             .await?;
 
         for folder in folders {
-            archive
-                .write_to_archive(
-                    &to_string_without_metadata(&folder, true).unwrap(),
-                    &format!("f/{}/folder.meta.json", folder.name),
-                )
-                .await?;
+            write_to_archive(
+                serde_json::to_string_pretty(&folder).unwrap(),
+                format!("f/{}/folder.meta.json", folder.name),
+                &mut a,
+            )
+            .await?;
         }
     }
 
@@ -1239,9 +1039,7 @@ async fn tarball_workspace(
                 ScriptLang::Go => "go",
                 ScriptLang::Bash => "sh",
             };
-            archive
-                .write_to_archive(&script.content, &format!("{}.{}", script.path, ext))
-                .await?;
+            write_to_archive(script.content, format!("{}.{}", script.path, ext), &mut a).await?;
 
             let lock = script
                 .lock
@@ -1254,13 +1052,10 @@ async fn tarball_workspace(
                 description: script.description,
                 schema: script.schema,
                 is_template: script.is_template,
-                kind: script.kind.to_string(),
                 lock,
             };
             let metadata_str = serde_json::to_string_pretty(&metadata).unwrap();
-            archive
-                .write_to_archive(&metadata_str, &format!("{}.script.json", script.path))
-                .await?;
+            write_to_archive(metadata_str, format!("{}.script.json", script.path), &mut a).await?;
         }
     }
 
@@ -1274,10 +1069,13 @@ async fn tarball_workspace(
         .await?;
 
         for resource in resources {
-            let resource_str = &to_string_without_metadata(&resource, false).unwrap();
-            archive
-                .write_to_archive(&resource_str, &format!("{}.resource.json", resource.path))
-                .await?;
+            let resource_str = serde_json::to_string_pretty(&resource).unwrap();
+            write_to_archive(
+                resource_str,
+                format!("{}.resource.json", resource.path),
+                &mut a,
+            )
+            .await?;
         }
     }
 
@@ -1291,13 +1089,13 @@ async fn tarball_workspace(
         .await?;
 
         for resource_type in resource_types {
-            let resource_str = &to_string_without_metadata(&resource_type, false).unwrap();
-            archive
-                .write_to_archive(
-                    &resource_str,
-                    &format!("{}.resource-type.json", resource_type.name),
-                )
-                .await?;
+            let resource_str = serde_json::to_string_pretty(&resource_type).unwrap();
+            write_to_archive(
+                resource_str,
+                format!("{}.resource-type.json", resource_type.name),
+                &mut a,
+            )
+            .await?;
         }
     }
 
@@ -1310,57 +1108,25 @@ async fn tarball_workspace(
         .await?;
 
         for flow in flows {
-            let flow_str = &to_string_without_metadata(&flow, false).unwrap();
-            archive
-                .write_to_archive(&flow_str, &format!("{}.flow.json", flow.path))
-                .await?;
+            let flow_str = serde_json::to_string_pretty(&flow).unwrap();
+            write_to_archive(flow_str, format!("{}.flow.json", flow.path), &mut a).await?;
         }
     }
 
     {
         let variables = sqlx::query_as::<_, ExportableListableVariable>(
-            "SELECT *, false as is_expired FROM variable WHERE workspace_id = $1",
+            "SELECT *, false as is_expired FROM variable WHERE workspace_id = $1 AND is_secret = false",
         )
         .bind(&w_id)
         .fetch_all(&db)
         .await?;
 
-        let mc = build_crypt(&mut db.begin().await?, &w_id).await?;
-
-        for mut var in variables {
-            if plain_secret.unwrap_or(false) && var.value.is_some() {
-                var.value = Some(
-                    mc.decrypt_base64_to_string(var.value.unwrap())
-                        .map_err(|e| Error::InternalErr(e.to_string()))?,
-                );
-            }
-            let var_str = &to_string_without_metadata(&var, false).unwrap();
-            archive
-                .write_to_archive(&var_str, &format!("{}.variable.json", var.path))
-                .await?;
+        for var in variables {
+            let flow_str = serde_json::to_string_pretty(&var).unwrap();
+            write_to_archive(flow_str, format!("{}.variable.json", var.path), &mut a).await?;
         }
     }
-
-    {
-        let apps = sqlx::query_as!(
-            AppWithLastVersion,
-            "SELECT app.id, app.path, app.summary, app.versions, app.policy,
-            app.extra_perms, app_version.value, 
-            app_version.created_at, app_version.created_by from app, app_version 
-            WHERE app.workspace_id = $1 AND app_version.id = app.versions[array_upper(app.versions, 1)]",
-            &w_id
-        )
-        .fetch_all(&db)
-        .await?;
-
-        for app in apps {
-            let app_str = &to_string_without_metadata(&app, false).unwrap();
-            archive
-                .write_to_archive(&app_str, &format!("{}.app.json", app.path))
-                .await?;
-        }
-    }
-    archive.finish().await?;
+    a.into_inner().await?;
 
     let file = tokio::fs::File::open(file_path).await?;
 
@@ -1377,3 +1143,20 @@ async fn tarball_workspace(
 
     Ok((headers, body))
 }
+
+async fn write_to_archive(
+    content: String,
+    path: String,
+    a: &mut tokio_tar::Builder<File>,
+) -> Result<()> {
+    let bytes = content.as_bytes();
+    let mut header = tokio_tar::Header::new_gnu();
+    header.set_size(bytes.len() as u64);
+    header.set_mtime(0);
+    header.set_uid(0);
+    header.set_gid(0);
+    header.set_mode(0o777);
+    header.set_cksum();
+    a.append_data(&mut header, path, bytes).await?;
+    Ok(())
+}

backend/windmill-common/Cargo.toml

@@ -41,4 +41,3 @@ hyper = { workspace = true, optional = true }
 tokio = { workspace = true, optional = true }
 reqwest = { workspace = true, optional = true }
 tracing-subscriber = { workspace = true, optional = true }
-lazy_static.workspace = true

backend/windmill-common/src/flow_status.rs

@@ -125,7 +125,7 @@ pub enum FlowStatusModule {
     },
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone)]
 pub enum JobResult {
     SingleJob(Uuid),
     ListJob(Vec<Uuid>),

backend/windmill-common/src/flows.rs

@@ -59,7 +59,6 @@ pub struct NewFlow {
 #[derive(Deserialize, Serialize, Debug, Clone, Default)]
 pub struct FlowValue {
     pub modules: Vec<FlowModule>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     #[serde(default)]
     pub failure_module: Option<FlowModule>,
     #[serde(default)]
@@ -153,9 +152,7 @@ pub struct FlowModule {
     #[serde(alias = "input_transform")]
     pub input_transforms: HashMap<String, InputTransform>,
     pub value: FlowModuleValue,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub stop_after_if: Option<StopAfterIf>,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub summary: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub suspend: Option<Suspend>,
@@ -248,9 +245,7 @@ pub enum FlowModuleValue {
         #[serde(alias = "input_transform")]
         input_transforms: HashMap<String, InputTransform>,
         content: String,
-        #[serde(skip_serializing_if = "Option::is_none")]
         lock: Option<String>,
-        #[serde(skip_serializing_if = "Option::is_none")]
         path: Option<String>,
         language: ScriptLang,
     },

backend/windmill-common/src/lib.rs

@@ -26,13 +26,12 @@ pub mod variables;
 #[cfg(feature = "tracing_init")]
 pub mod tracing_init;
 
+pub const DEFAULT_NUM_WORKERS: usize = 3;
+pub const DEFAULT_TIMEOUT: i32 = 300;
+pub const DEFAULT_SLEEP_QUEUE: u64 = 50;
 pub const DEFAULT_MAX_CONNECTIONS_SERVER: u32 = 50;
 pub const DEFAULT_MAX_CONNECTIONS_WORKER: u32 = 3;
 
-lazy_static::lazy_static! {
-    pub static ref BASE_URL: String = std::env::var("BASE_URL").unwrap_or_else(|_| "http://localhost".to_string());
-}
-
 #[cfg(feature = "tokio")]
 pub async fn shutdown_signal(tx: tokio::sync::broadcast::Sender<()>) -> anyhow::Result<()> {
     use std::io;
@@ -124,8 +123,10 @@ pub async fn get_latest_hash_for_path<'c>(
     script_path: &str,
 ) -> error::Result<scripts::ScriptHash> {
     let script_hash_o = sqlx::query_scalar!(
-        "select hash from script where path = $1 AND workspace_id = $2 AND
-    created_at = (SELECT max(created_at) FROM script WHERE path = $1 AND workspace_id = $2) AND
+        "select hash from script where path = $1 AND (workspace_id = $2 OR workspace_id = \
+         'starter') AND
+    created_at = (SELECT max(created_at) FROM script WHERE path = $1 AND (workspace_id = $2 OR \
+         workspace_id = 'starter')) AND
     deleted = false",
         script_path,
         w_id

backend/windmill-common/src/scripts.rs

@@ -7,7 +7,7 @@
  */
 
 use std::{
-    fmt::{self, Display},
+    fmt::Display,
     hash::{Hash, Hasher},
 };
 
@@ -103,18 +103,6 @@ pub enum ScriptKind {
     Approval,
 }
 
-impl Display for ScriptKind {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.write_str(match self {
-            ScriptKind::Trigger => "trigger",
-            ScriptKind::Failure => "failure",
-            ScriptKind::Script => "script",
-            ScriptKind::Approval => "approval",
-        })?;
-        Ok(())
-    }
-}
-
 #[derive(Serialize)]
 #[cfg_attr(feature = "sqlx", derive(sqlx::FromRow))]
 pub struct Script {
@@ -222,7 +210,7 @@ pub fn to_hex_string(i: &i64) -> String {
 pub async fn get_hub_script_by_path(
     email: &str,
     path: StripPath,
-    http_client: &reqwest::Client,
+    http_client: reqwest::Client,
 ) -> crate::error::Result<String> {
     use crate::{
         error::{to_anyhow, Error},
@@ -251,7 +239,7 @@ pub async fn get_hub_script_by_path(
 pub async fn get_full_hub_script_by_path(
     email: &str,
     path: StripPath,
-    http_client: &reqwest::Client,
+    http_client: reqwest::Client,
 ) -> crate::error::Result<HubScript> {
     use crate::{
         error::{to_anyhow, Error},

backend/windmill-common/src/users.rs

@@ -6,8 +6,6 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
-pub const SUPERADMIN_SECRET_EMAIL: &str = "superadmin_secret@windmill.dev";
-
 pub fn username_to_permissioned_as(user: &str) -> String {
     if user.contains('@') {
         user.to_string()

backend/windmill-common/src/utils.rs

@@ -74,7 +74,7 @@ pub fn not_found_if_none<T, U: AsRef<str>>(opt: Option<T>, kind: &str, name: U)
 
 #[cfg(feature = "reqwest")]
 pub async fn list_elems_from_hub(
-    http_client: &reqwest::Client,
+    http_client: reqwest::Client,
     url: &str,
     email: &str,
 ) -> Result<serde_json::Value> {
@@ -88,7 +88,7 @@ pub async fn list_elems_from_hub(
 
 #[cfg(feature = "reqwest")]
 pub async fn http_get_from_hub(
-    http_client: &reqwest::Client,
+    http_client: reqwest::Client,
     url: &str,
     email: &str,
     plain: bool,

backend/windmill-common/src/variables.rs

@@ -8,8 +8,6 @@
 
 use serde::{Deserialize, Serialize};
 
-use crate::BASE_URL;
-
 #[derive(Serialize, Clone)]
 
 pub struct ContextualVariable {
@@ -68,6 +66,7 @@ pub fn get_reserved_variables(
     username: &str,
     job_id: &str,
     permissioned_as: &str,
+    base_url: &str,
     path: Option<String>,
     flow_id: Option<String>,
     flow_path: Option<String>,
@@ -115,7 +114,7 @@ pub fn get_reserved_variables(
         },
         ContextualVariable {
             name: "WM_BASE_URL".to_string(),
-            value: BASE_URL.clone(),
+            value: base_url.to_string(),
             description: "base url of this instance".to_string(),
         },
         ContextualVariable {

backend/windmill-queue/src/jobs.rs

@@ -6,10 +6,9 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
-use std::collections::HashMap;
+use std::{collections::HashMap, str::FromStr};
 
 use anyhow::Context;
-use reqwest::Client;
 use serde::{Deserialize, Serialize};
 use sqlx::{Pool, Postgres, Transaction};
 use tracing::{instrument, Instrument};
@@ -17,7 +16,7 @@ use ulid::Ulid;
 use uuid::Uuid;
 use windmill_audit::{audit_log, ActionKind};
 use windmill_common::{
-    error::{self, Error},
+    error::{self, to_anyhow, Error},
     flow_status::{FlowStatus, JobResult, MAX_RETRY_ATTEMPTS, MAX_RETRY_INTERVAL},
     flows::{FlowModule, FlowModuleValue, FlowValue},
     scripts::{get_full_hub_script_by_path, HubScript, ScriptHash, ScriptLang},
@@ -25,10 +24,6 @@ use windmill_common::{
 };
 
 lazy_static::lazy_static! {
-    pub static ref HTTP_CLIENT: Client = reqwest::ClientBuilder::new()
-        .user_agent("windmill/beta")
-        .build().unwrap();
-
     // TODO: these aren't synced, they should be moved into the queue abstraction once/if that happens.
     static ref QUEUE_PUSH_COUNT: prometheus::IntCounter = prometheus::register_int_counter!(
         "queue_push_count",
@@ -50,7 +45,7 @@ lazy_static::lazy_static! {
 }
 
 const MAX_FREE_EXECS: i32 = 1000;
-const MAX_FREE_CONCURRENT_RUNS: i32 = 15;
+const MAX_FREE_CONCURRENT_RUNS: i32 = 3;
 
 pub async fn cancel_job<'c>(
     username: &str,
@@ -87,32 +82,7 @@ pub async fn cancel_job<'c>(
     Ok((tx, job_option))
 }
 
-pub async fn pull(
-    db: &Pool<Postgres>,
-    whitelist_workspaces: Option<Vec<String>>,
-    blacklist_workspaces: Option<Vec<String>>,
-) -> windmill_common::error::Result<Option<QueuedJob>> {
-    let mut workspaces_filter = String::new();
-    if let Some(whitelist) = whitelist_workspaces {
-        workspaces_filter.push_str(&format!(
-            " AND workspace_id IN ({})",
-            whitelist
-                .into_iter()
-                .map(|x| format!("'{x}'"))
-                .collect::<Vec<String>>()
-                .join(",")
-        ));
-    }
-    if let Some(blacklist) = blacklist_workspaces {
-        workspaces_filter.push_str(&format!(
-            " AND workspace_id NOT IN ({})",
-            blacklist
-                .into_iter()
-                .map(|x| format!("'{x}'"))
-                .collect::<Vec<String>>()
-                .join(",")
-        ));
-    }
+pub async fn pull(db: &Pool<Postgres>) -> windmill_common::error::Result<Option<QueuedJob>> {
     /* Jobs can be started if they:
      * - haven't been started before,
      *   running = false
@@ -120,7 +90,7 @@ pub async fn pull(
      *   suspend_until is non-null
      *   and suspend = 0 when the resume messages are received
      *   or suspend_until <= now() if it has timed out */
-    let job: Option<QueuedJob> = sqlx::query_as::<_, QueuedJob>(&format!(
+    let job: Option<QueuedJob> = sqlx::query_as::<_, QueuedJob>(
         "UPDATE queue
             SET running = true
               , started_at = coalesce(started_at, now())
@@ -129,17 +99,17 @@ pub async fn pull(
             WHERE id = (
                 SELECT id
                 FROM queue
-                WHERE ((running = false
+                WHERE (    running = false
                        AND scheduled_for <= now())
                    OR (suspend_until IS NOT NULL
                        AND (   suspend <= 0
-                            OR suspend_until <= now()))) {workspaces_filter}
+                            OR suspend_until <= now()))
                 ORDER BY scheduled_for
                 FOR UPDATE SKIP LOCKED
                 LIMIT 1
             )
-            RETURNING *"
-    ))
+            RETURNING *",
+    )
     .fetch_optional(db)
     .await?;
 
@@ -152,24 +122,55 @@ pub async fn pull(
 
 pub async fn get_result_by_id(
     db: Pool<Postgres>,
+    mut skip_direct: bool,
     w_id: String,
-    flow_id: Uuid,
+    flow_id: String,
     node_id: String,
 ) -> error::Result<serde_json::Value> {
-    let job_result: Option<JobResult> = sqlx::query_scalar!(
-        "SELECT leaf_jobs->$1::text FROM queue WHERE COALESCE((SELECT root_job FROM queue WHERE id = $2), $2) = id AND workspace_id = $3",
-        node_id,
-        flow_id,
-        w_id,
-    )
-    .fetch_optional(&db)
-    .await?
-    .flatten()
-    .map(|x| serde_json::from_value(x).ok())
-    .flatten();
-
+    let mut result_id: Option<JobResult> = None;
+    let mut parent_id = Uuid::from_str(&flow_id).ok();
+    while result_id.is_none() && parent_id.is_some() {
+        if !skip_direct {
+            let r = sqlx::query!(
+                "SELECT flow_status, parent_job FROM completed_job WHERE id = $1 AND workspace_id = $2 UNION ALL SELECT flow_status, parent_job FROM queue WHERE id = $1 AND workspace_id = $2 ",
+                parent_id.unwrap(),
+                w_id,
+            )
+            .fetch_optional(&db)
+            .await?;
+            if let Some(r) = r {
+                let value = r
+                    .flow_status
+                    .as_ref()
+                    .ok_or_else(|| Error::InternalErr(format!("requiring a flow status value")))?
+                    .to_owned();
+                parent_id = r.parent_job;
+                let status_o = serde_json::from_value::<FlowStatus>(value).ok();
+                result_id = status_o.and_then(|status| {
+                    status
+                        .modules
+                        .iter()
+                        .find(|m| m.id() == node_id)
+                        .and_then(|m| m.job_result())
+                });
+            } else {
+                parent_id = None;
+            }
+        } else {
+            let q_parent = sqlx::query_scalar!(
+                "SELECT parent_job FROM completed_job WHERE id = $1 AND workspace_id = $2 UNION ALL SELECT parent_job FROM queue WHERE id = $1 AND workspace_id = $2",
+                parent_id.unwrap(),
+                w_id,
+            )
+            .fetch_optional(&db)
+            .await?
+            .flatten();
+            parent_id = q_parent;
+            skip_direct = false
+        }
+    }
     let result_id = windmill_common::utils::not_found_if_none(
-        job_result,
+        result_id,
         "Flow result by id",
         format!("{}, {}", flow_id, node_id),
     )?;
@@ -251,7 +252,6 @@ pub async fn push<'c>(
     scheduled_for_o: Option<chrono::DateTime<chrono::Utc>>,
     schedule_path: Option<String>,
     parent_job: Option<Uuid>,
-    root_job: Option<Uuid>,
     is_flow_step: bool,
     mut same_worker: bool,
     pre_run_error: Option<&windmill_common::error::Error>,
@@ -321,10 +321,7 @@ pub async fn push<'c>(
                     .unwrap_or(false);
 
             if !is_super_admin {
-                if usage > MAX_FREE_EXECS
-                    && !matches!(job_payload, JobPayload::Dependencies { .. })
-                    && !matches!(job_payload, JobPayload::FlowDependencies { .. })
-                {
+                if usage > MAX_FREE_EXECS {
                     return Err(error::Error::BadRequest(format!(
                     "User {email} has exceeded the free usage limit of {MAX_FREE_EXECS} that applies outside of premium workspaces."
                 )));
@@ -362,7 +359,8 @@ pub async fn push<'c>(
         match job_payload {
             JobPayload::ScriptHash { hash, path } => {
                 let language = sqlx::query_scalar!(
-                    "SELECT language as \"language: ScriptLang\" FROM script WHERE hash = $1 AND workspace_id = $2",
+                    "SELECT language as \"language: ScriptLang\" FROM script WHERE hash = $1 AND \
+                 (workspace_id = $2 OR workspace_id = 'starter')",
                     hash.0,
                     workspace_id
                 )
@@ -383,7 +381,7 @@ pub async fn push<'c>(
                 )
             }
             JobPayload::ScriptHub { path } => {
-                let script = get_hub_script(&HTTP_CLIENT, path.clone(), email)
+                let script = get_hub_script(path.clone(), email)
                     .await
                     .context("error fetching hub script")?;
                 (
@@ -413,10 +411,11 @@ pub async fn push<'c>(
             ),
             JobPayload::FlowDependencies { path } => {
                 let value_json = sqlx::query_scalar!(
-                    "SELECT value FROM flow WHERE path = $1 AND workspace_id = $2",
-                    path,
-                    workspace_id
-                )
+                "SELECT value FROM flow WHERE path = $1 AND (workspace_id = $2 OR workspace_id = \
+                 'starter')",
+                path,
+                workspace_id
+            )
                 .fetch_optional(&mut tx)
                 .await?
                 .ok_or_else(|| Error::InternalErr(format!("not found flow at path {:?}", path)))?;
@@ -439,10 +438,11 @@ pub async fn push<'c>(
             }
             JobPayload::Flow(flow) => {
                 let value_json = sqlx::query_scalar!(
-                    "SELECT value FROM flow WHERE path = $1 AND workspace_id = $2",
-                    flow,
-                    workspace_id
-                )
+                "SELECT value FROM flow WHERE path = $1 AND (workspace_id = $2 OR workspace_id = \
+                 'starter')",
+                flow,
+                workspace_id
+            )
                 .fetch_optional(&mut tx)
                 .await?
                 .ok_or_else(|| Error::InternalErr(format!("not found flow at path {:?}", flow)))?;
@@ -504,13 +504,12 @@ pub async fn push<'c>(
         .unwrap_or_else(|| (None, None));
 
     let flow_status = raw_flow.as_ref().map(FlowStatus::new);
-
     let uuid = sqlx::query_scalar!(
         "INSERT INTO queue
             (workspace_id, id, running, parent_job, created_by, permissioned_as, scheduled_for, 
                 script_hash, script_path, raw_code, raw_lock, args, job_kind, schedule_path, raw_flow, \
-         flow_status, is_flow_step, language, started_at, same_worker, pre_run_error, email, visible_to_owner, root_job)
-            VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, CASE WHEN $3 THEN now() END, $19, $20, $21, $22, $23) \
+         flow_status, is_flow_step, language, started_at, same_worker, pre_run_error, email, visible_to_owner)
+            VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, CASE WHEN $3 THEN now() END, $19, $20, $21, $22) \
          RETURNING id",
         workspace_id,
         job_id,
@@ -533,8 +532,7 @@ pub async fn push<'c>(
         same_worker,
         pre_run_error.map(|e| e.to_string()),
         email,
-        visible_to_owner,
-        root_job
+        visible_to_owner
     )
     .fetch_one(&mut tx)
     .await
@@ -587,14 +585,17 @@ pub fn canceled_job_to_result(job: &QueuedJob) -> serde_json::Value {
     serde_json::json!({"message": format!("Job canceled: {reason} by {canceler}"), "name": "Canceled", "reason": reason, "canceler": canceler})
 }
 
-pub async fn get_hub_script(
-    client: &reqwest::Client,
-    path: String,
-    email: &str,
-) -> error::Result<HubScript> {
-    get_full_hub_script_by_path(email, StripPath(path), client)
-        .await
-        .map(|e| e)
+pub async fn get_hub_script(path: String, email: &str) -> error::Result<HubScript> {
+    get_full_hub_script_by_path(
+        email,
+        StripPath(path),
+        reqwest::ClientBuilder::new()
+            .user_agent("windmill/beta")
+            .build()
+            .map_err(to_anyhow)?,
+    )
+    .await
+    .map(|e| e)
 }
 
 #[derive(Debug, sqlx::FromRow, Serialize, Clone)]
@@ -645,12 +646,6 @@ pub struct QueuedJob {
     pub visible_to_owner: bool,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub suspend: Option<i32>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mem_peak: Option<i32>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub root_job: Option<Uuid>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub leaf_jobs: Option<serde_json::Value>,
 }
 
 impl QueuedJob {
@@ -658,7 +653,7 @@ impl QueuedJob {
         self.script_path
             .as_ref()
             .map(String::as_str)
-            .unwrap_or("tmp/main")
+            .unwrap_or("NO_FLOW_PATH")
     }
 }
 

backend/windmill-queue/src/schedule.rs

@@ -85,7 +85,6 @@ pub async fn push_scheduled_job<'c>(
         Some(next),
         Some(schedule.path.clone()),
         None,
-        None,
         false,
         false,
         None,

backend/windmill-worker/Cargo.toml

@@ -3,10 +3,11 @@ name = "windmill-worker"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
+default-run = "worker"
 
-[lib]
-name = "windmill_worker"
-path = "src/lib.rs"
+[[bin]]
+name = "worker"
+path = "./src/main.rs"
 
 [features]
 default = []
@@ -48,4 +49,3 @@ deno_core.workspace = true
 const_format.workspace = true
 git-version.workspace = true
 dyn-iter.workspace = true
-once_cell.workspace = true

backend/windmill-worker/nsjail/run.deno.config.proto

@@ -61,8 +61,8 @@ mount {
 
 
 mount {
-    src: "{JOB_DIR}/wrapper.ts"
-    dst: "/tmp/wrapper.ts"
+    src: "{JOB_DIR}/inner.ts"
+    dst: "/tmp/inner.ts"
     is_bind: true
 }
 

backend/windmill-worker/nsjail/run.python3.config.proto

@@ -66,8 +66,8 @@ mount {
 }
 
 mount {
-    src: "{JOB_DIR}/{MAIN}.py"
-    dst: "/tmp/{MAIN}.py"
+    src: "{JOB_DIR}/inner.py"
+    dst: "/tmp/inner.py"
     is_bind: true
 }
 
@@ -79,8 +79,8 @@ mount {
 }
 
 mount {
-    src: "{JOB_DIR}/wrapper.py"
-    dst: "/tmp/wrapper.py"
+    src: "{JOB_DIR}/main.py"
+    dst: "/tmp/main.py"
     is_bind: true
 }
 

backend/windmill-worker/src/jobs.rs

@@ -77,12 +77,6 @@ pub async fn add_completed_job(
             None
         };
 
-    let mem_peak = sqlx::query_scalar!("SELECT mem_peak FROM queue WHERE id = $1", &queued_job.id)
-        .fetch_optional(db)
-        .await
-        .ok()
-        .flatten()
-        .flatten();
     let mut tx = db.begin().await?;
     let job_id = queued_job.id.clone();
     sqlx::query!(
@@ -115,10 +109,9 @@ pub async fn add_completed_job(
                    , language
                    , email
                    , visible_to_owner
-                   , mem_peak
                 )
             VALUES ($1, $2, $3, $4, $5, $6, COALESCE($26, (EXTRACT('epoch' FROM (now())) - EXTRACT('epoch' FROM (COALESCE($6, now()))))*1000), $7, $8, $9,\
-                    $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $27, $28, $29)
+                    $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $27, $28)
          ON CONFLICT (id) DO UPDATE SET success = $7, result = $11, logs = concat(cj.logs, $12)",
         queued_job.workspace_id,
         queued_job.id,
@@ -147,8 +140,7 @@ pub async fn add_completed_job(
         queued_job.language: ScriptLang,
         duration: Option<i64>,
         queued_job.email,
-        queued_job.visible_to_owner,
-        mem_peak
+        queued_job.visible_to_owner
     )
     .execute(&mut tx)
     .await

backend/windmill-worker/src/js_eval.rs

@@ -6,11 +6,9 @@
  * LICENSE-AGPL for a copy of the license.
  */
 
-use std::{cell::RefCell, collections::HashMap, rc::Rc};
+use std::collections::HashMap;
 
-use deno_core::{
-    op, serde_v8, v8, v8::IsolateHandle, Extension, JsRuntime, OpState, RuntimeOptions,
-};
+use deno_core::{op, serde_v8, v8, v8::IsolateHandle, Extension, JsRuntime, RuntimeOptions};
 use itertools::Itertools;
 use lazy_static::lazy_static;
 use regex::Regex;
@@ -19,7 +17,10 @@ use tokio::{sync::oneshot, time::timeout};
 use uuid::Uuid;
 use windmill_common::{error::Error, flow_status::JobResult};
 
-use crate::AuthedClient;
+pub struct EvalCreds {
+    pub workspace: String,
+    pub token: String,
+}
 
 #[derive(Debug, Clone)]
 pub struct IdContext {
@@ -28,23 +29,21 @@ pub struct IdContext {
     pub previous_id: String,
 }
 
-pub struct OptAuthedClient(Option<AuthedClient>);
 pub async fn eval_timeout(
     expr: String,
     env: Vec<(String, serde_json::Value)>,
-    authed_client: Option<&AuthedClient>,
+    creds: Option<EvalCreds>,
     by_id: Option<IdContext>,
+    base_internal_url: String,
 ) -> anyhow::Result<serde_json::Value> {
     let expr2 = expr.clone();
     let (sender, mut receiver) = oneshot::channel::<IsolateHandle>();
-    let has_client = authed_client.is_some();
-    let authed_client = authed_client.cloned();
     timeout(
-        std::time::Duration::from_millis(10000),
+        std::time::Duration::from_millis(2000),
         tokio::task::spawn_blocking(move || {
             let mut ops = vec![];
 
-            if authed_client.is_some() {
+            if creds.is_some() {
                 ops.extend([
                     // An op for summing an array of numbers
                     // The op-layer automatically deserializes inputs
@@ -54,12 +53,12 @@ pub async fn eval_timeout(
                 ])
             }
 
-            if by_id.is_some() && authed_client.is_some() {
+            if by_id.is_some() {
                 ops.push(op_get_result::decl());
                 ops.push(op_get_id::decl());
             }
 
-            let ext = Extension::builder("js_eval").ops(ops).build();
+            let ext = Extension::builder().ops(ops).build();
             // Use our snapshot to provision our new runtime
             let options = RuntimeOptions {
                 extensions: vec![ext],
@@ -68,11 +67,6 @@ pub async fn eval_timeout(
             };
 
             let mut js_runtime = JsRuntime::new(options);
-            {
-                let op_state = js_runtime.op_state();
-                let mut op_state = op_state.borrow_mut();
-                op_state.put(OptAuthedClient(authed_client.clone()));
-            }
 
             sender
                 .send(js_runtime.v8_isolate().thread_safe_handle())
@@ -91,7 +85,14 @@ pub async fn eval_timeout(
 
             let expr = replace_with_await_result(expr);
 
-            let r = runtime.block_on(eval(&mut js_runtime, &expr, env, by_id, has_client))?;
+            let r = runtime.block_on(eval(
+                &mut js_runtime,
+                &expr,
+                env,
+                creds,
+                by_id,
+                &base_internal_url,
+            ))?;
 
             Ok(r) as anyhow::Result<Value>
         }),
@@ -102,7 +103,7 @@ pub async fn eval_timeout(
             isolate.terminate_execution();
         };
         Error::ExecutionErr(format!(
-            "The expression of evaluation `{expr2}` took too long to execute (>10000ms)"
+            "The expression of evaluation `{expr2}` took too long to execute (>2000ms)"
         ))
     })??
 }
@@ -143,30 +144,24 @@ fn add_closing_bracket(s: &str) -> String {
     s
 }
 
-const SPLIT_PAT: &str = ";";
+const SPLIT_PAT: &str = ";\n";
 async fn eval(
     context: &mut JsRuntime,
     expr: &str,
     env: Vec<(String, serde_json::Value)>,
+    creds: Option<EvalCreds>,
     by_id: Option<IdContext>,
-    has_client: bool,
+    base_internal_url: &str,
 ) -> anyhow::Result<serde_json::Value> {
-    let exprs = expr
-        .trim()
-        .split(SPLIT_PAT)
-        .map(|x| x.trim())
-        .filter(|x| !x.is_empty())
-        .collect::<Vec<&str>>();
-    let expr = if exprs.is_empty() {
-        "return undefined;".to_string()
-    } else {
-        format!(
-            "{};\n    return {};",
-            exprs.iter().take(exprs.len() - 1).join(";\n"),
-            exprs.last().unwrap()
-        )
-    };
-    let (api_code, by_id_code) = if has_client {
+    let expr = expr.trim();
+    let expr = format!(
+        "{}\nreturn {};",
+        expr.split(SPLIT_PAT)
+            .take(expr.split(SPLIT_PAT).count() - 1)
+            .join("\n"),
+        expr.split(SPLIT_PAT).last().unwrap_or_else(|| "")
+    );
+    let (api_code, by_id_code) = if let Some(EvalCreds { workspace, token }) = creds {
         let by_id_code = if let Some(by_id) = by_id {
             format!(
                 r#"
@@ -183,12 +178,12 @@ async function result_by_id(node_id) {{
         }}
     }} else {{
         let flow_job_id = "{}";
-        return await Deno.core.opAsync("op_get_id", [ flow_job_id, node_id]);
+        return await Deno.core.opAsync("op_get_id", [workspace, flow_job_id, token, base_url, node_id]);
     }}
 }}
 
 async function get_result(id) {{
-    return await Deno.core.opAsync("op_get_result", [id]);
+    return await Deno.core.opAsync("op_get_result", [workspace, id, token, base_url]);
 }}
 const results = new Proxy({{}}, {{
     get: function(target, name, receiver) {{
@@ -202,12 +197,12 @@ const results = new Proxy({{}}, {{
                     .into_iter()
                     .map(|(k, v)| {
                         let v_str = match v {
-                            JobResult::SingleJob(x) => format!("\"{x}\""),
+                            JobResult::SingleJob(x) => x.to_string(),
                             JobResult::ListJob(x) => {
-                                format!("[{}]", x.iter().map(|x| format!("\"{x}\"")).join(","))
+                                format!("[{}]", x.iter().map(|x| x.to_string()).join(","))
                             }
                         };
-                        format!("\"{k}\": {v_str}")
+                        format!("\"{k}\": \"{v_str}\"")
                     })
                     .join(","),
                 by_id.previous_id,
@@ -219,13 +214,17 @@ const results = new Proxy({{}}, {{
 
         let api_code = format!(
             r#"
+let workspace = "{workspace}";
+let base_url = "{}";
+let token = "{token}";
 async function variable(path) {{
-    return await Deno.core.opAsync("op_variable", [path]);
+    return await Deno.core.opAsync("op_variable", [workspace, path, token, base_url]);
 }}
 async function resource(path) {{
-    return await Deno.core.opAsync("op_resource", [path]);
+    return await Deno.core.opAsync("op_resource", [workspace, path, token, base_url]);
 }}
         "#,
+            base_internal_url,
         );
         (api_code, by_id_code)
     } else {
@@ -252,7 +251,7 @@ async function resource(path) {{
             .join(""),
     );
     tracing::debug!("{}", code);
-    let global = context.execute_script("<anon>", code)?;
+    let global = context.execute_script("<anon>", &code)?;
     let global = context.resolve_value(global).await?;
 
     let scope = &mut context.handle_scope();
@@ -274,83 +273,60 @@ async function resource(path) {{
 
 // TODO: Can we a) share the api configuration here somehow or b) just implement this natively in deno, via the deno client?
 #[op]
-async fn op_variable(
-    op_state: Rc<RefCell<OpState>>,
-    args: Vec<String>,
-) -> Result<String, anyhow::Error> {
-    let path = &args[0];
-    let client = op_state.borrow().borrow::<OptAuthedClient>().0.clone();
-    if let Some(client) = client {
-        let result = client
-            .get_client()
-            .get_variable(&client.workspace, path, None)
-            .await?;
-        Ok(result.into_inner().value.unwrap_or_else(|| "".to_owned()))
-    } else {
-        anyhow::bail!("No client found in op state");
-    }
+async fn op_variable(args: Vec<String>) -> Result<String, anyhow::Error> {
+    let workspace = &args[0];
+    let path = &args[1];
+    let token = &args[2];
+    let base_url = &args[3];
+    let client = windmill_api_client::create_client(base_url, token.clone());
+    let result = client.get_variable(workspace, path, None).await?;
+    Ok(result.into_inner().value.unwrap_or_else(|| "".to_owned()))
 }
 
 #[op]
-async fn op_get_result(
-    op_state: Rc<RefCell<OpState>>,
-    args: Vec<String>,
-) -> Result<serde_json::Value, anyhow::Error> {
-    let id = &args[0];
-    let client = op_state.borrow().borrow::<OptAuthedClient>().0.clone();
-    if let Some(client) = client {
-        let result = client
-            .get_client()
-            .get_completed_job_result(&client.workspace, &id.parse()?)
-            .await?
-            .clone();
-        Ok(serde_json::json!(result))
-    } else {
-        anyhow::bail!("No client found in op state");
-    }
+async fn op_get_result(args: Vec<String>) -> Result<serde_json::Value, anyhow::Error> {
+    let workspace = &args[0];
+    let id = &args[1];
+    let token = &args[2];
+    let base_url = &args[3];
+    let client = windmill_api_client::create_client(base_url, token.clone());
+    let result = client
+        .get_completed_job(workspace, &id.parse()?)
+        .await?
+        .result
+        .clone();
+    Ok(serde_json::json!(result))
 }
 
 #[op]
-async fn op_get_id(
-    op_state: Rc<RefCell<OpState>>,
-    args: Vec<String>,
-) -> Result<Option<serde_json::Value>, anyhow::Error> {
-    let flow_job_id = &args[0];
-    let node_id = &args[1];
+async fn op_get_id(args: Vec<String>) -> Result<Option<serde_json::Value>, anyhow::Error> {
+    let workspace = &args[0];
+    let flow_job_id = &args[1];
+    let token = &args[2];
+    let base_url = &args[3];
+    let node_id = &args[4];
 
-    let client = op_state.borrow().borrow::<OptAuthedClient>().0.clone();
-    if let Some(client) = client {
-        let result = client
-            .get_client()
-            .result_by_id(&client.workspace, flow_job_id, node_id)
-            .await
-            .map_or(None, |e| Some(e.into_inner()));
-        Ok(result)
-    } else {
-        anyhow::bail!("No client found in op state");
-    }
+    let client = windmill_api_client::create_client(base_url, token.clone());
+    let result = client
+        .result_by_id(workspace, flow_job_id, node_id, Some(true))
+        .await
+        .map_or(None, |e| Some(e.into_inner()));
+
+    Ok(result)
 }
 
 #[op]
-async fn op_resource(
-    op_state: Rc<RefCell<OpState>>,
-    args: Vec<String>,
-) -> Result<serde_json::Value, anyhow::Error> {
-    let path = &args[0];
-
-    let client = op_state.borrow().borrow::<OptAuthedClient>().0.clone();
-    if let Some(client) = client {
-        let result = client
-            .get_client()
-            .get_resource(&client.workspace, path)
-            .await?;
-        Ok(result
-            .into_inner()
-            .value
-            .unwrap_or_else(|| serde_json::json!({})))
-    } else {
-        anyhow::bail!("No client found in op state");
-    }
+async fn op_resource(args: Vec<String>) -> Result<serde_json::Value, anyhow::Error> {
+    let workspace = &args[0];
+    let path = &args[1];
+    let token = &args[2];
+    let base_url = &args[3];
+    let client = windmill_api_client::create_client(base_url, token.clone());
+    let result = client.get_resource(workspace, path).await?;
+    Ok(result
+        .into_inner()
+        .value
+        .unwrap_or_else(|| serde_json::json!({})))
 }
 
 #[cfg(test)]
@@ -370,7 +346,7 @@ mod tests {
         let code = "value.test + params.test";
 
         let mut runtime = JsRuntime::new(RuntimeOptions::default());
-        let res = eval(&mut runtime, code, env, None, false).await?;
+        let res = eval(&mut runtime, code, env, None, None, "").await?;
         assert_eq!(res, json!(4));
         Ok(())
     }
@@ -383,7 +359,7 @@ mod tests {
 multiline template`";
 
         let mut runtime = JsRuntime::new(RuntimeOptions::default());
-        let res = eval(&mut runtime, code, env, None, false).await?;
+        let res = eval(&mut runtime, code, env, None, None, "").await?;
         assert_eq!(res, json!("my 5\nmultiline template"));
         Ok(())
     }
@@ -396,7 +372,7 @@ multiline template`";
         ];
         let code = r#"params.test"#;
 
-        let res = eval_timeout(code.to_string(), env, None, None).await?;
+        let res = eval_timeout(code.to_string(), env, None, None, "".to_string()).await?;
         assert_eq!(res, json!(2));
         Ok(())
     }

backend/windmill-worker/src/main.rs

@@ -0,0 +1,138 @@
+/*
+ * Author: Ruben Fiszel
+ * Copyright: Windmill Labs, Inc 2022
+ * This file and its contents are licensed under the AGPLv3 License.
+ * Please see the included NOTICE for copyright information and
+ * LICENSE-AGPL for a copy of the license.
+ */
+
+use std::{net::SocketAddr, time::Duration};
+
+use anyhow::Context;
+use sqlx::{postgres::PgPoolOptions, Pool, Postgres};
+use windmill_common::{
+    error::{self, Error},
+    utils::rd_string,
+};
+
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
+    // dotenv().ok();
+
+    windmill_common::tracing_init::initialize_tracing();
+
+    let db = async {
+        let database_url = std::env::var("DATABASE_URL")
+            .map_err(|_| Error::BadConfig("DATABASE_URL env var is missing".to_string()))?;
+
+        let max_connections = match std::env::var("DATABASE_CONNECTIONS") {
+            Ok(n) => n.parse::<u32>().context("invalid DATABASE_CONNECTIONS")?,
+            Err(_) => 10,
+        };
+
+        Ok::<Pool<Postgres>, error::Error>(
+            PgPoolOptions::new()
+                .max_connections(max_connections)
+                .max_lifetime(Duration::from_secs(30 * 60)) // 30 mins
+                .connect(&database_url)
+                .await
+                .map_err(|err| Error::ConnectingToDatabase(err.to_string()))?,
+        )
+    }
+    .await?;
+
+    let metrics_addr: Option<SocketAddr> = std::env::var("METRICS_ADDR")
+        .ok()
+        .map(|s| {
+            s.parse::<bool>()
+                .map(|b| b.then(|| SocketAddr::from(([0, 0, 0, 0], 8001))))
+                .or_else(|_| s.parse::<SocketAddr>().map(Some))
+        })
+        .transpose()?
+        .flatten();
+
+    let (tx, rx) = tokio::sync::broadcast::channel::<()>(3);
+    let shutdown_signal = windmill_common::shutdown_signal(tx);
+
+    let base_internal_url =
+        std::env::var("BASE_INTERNAL_URL").unwrap_or_else(|_| "http://localhost:8000".to_string());
+
+    let base_url = std::env::var("BASE_URL").unwrap_or_else(|_| "http://localhost".to_string());
+
+    let timeout = std::env::var("TIMEOUT")
+        .ok()
+        .and_then(|x| x.parse::<i32>().ok())
+        .unwrap_or(windmill_common::DEFAULT_TIMEOUT);
+
+    let workers_f = async {
+        let sleep_queue = std::env::var("SLEEP_QUEUE")
+            .ok()
+            .and_then(|x| x.parse::<u64>().ok())
+            .unwrap_or(windmill_common::DEFAULT_SLEEP_QUEUE);
+        let disable_nuser = std::env::var("DISABLE_NUSER")
+            .ok()
+            .and_then(|x| x.parse::<bool>().ok())
+            .unwrap_or(false);
+        let disable_nsjail = std::env::var("DISABLE_NSJAIL")
+            .ok()
+            .and_then(|x| x.parse::<bool>().ok())
+            .unwrap_or(true);
+        let keep_job_dir = std::env::var("KEEP_JOB_DIR")
+            .ok()
+            .and_then(|x| x.parse::<bool>().ok())
+            .unwrap_or(false);
+        let sync_bucket = std::env::var("S3_CACHE_BUCKET")
+            .ok()
+            .map(|e| Some(e))
+            .unwrap_or(None);
+
+        tracing::info!(
+            "DISABLE_NSJAIL: {disable_nsjail}, DISABLE_NUSER: {disable_nuser}, BASE_URL: \
+                     {base_url}, SLEEP_QUEUE: {sleep_queue}, TIMEOUT: \
+                     {timeout}, KEEP_JOB_DIR: {keep_job_dir}"
+        );
+        let instance_name = rd_string(5);
+
+        let ip = windmill_common::external_ip::get_ip()
+            .await
+            .unwrap_or_else(|e| {
+                tracing::warn!(error = e.to_string(), "failed to get external IP");
+                "unretrievable IP".to_string()
+            });
+        let worker_name = format!("dt-worker-{}-{}", &instance_name, rd_string(5));
+        windmill_worker::run_worker(
+            &db.clone(),
+            timeout,
+            &instance_name,
+            worker_name,
+            1,
+            1,
+            &ip,
+            sleep_queue,
+            windmill_worker::WorkerConfig {
+                disable_nsjail,
+                disable_nuser,
+                base_internal_url,
+                base_url,
+                keep_job_dir,
+            },
+            sync_bucket,
+            rx.resubscribe(),
+        )
+        .await;
+        Ok(()) as anyhow::Result<()>
+    };
+
+    let metrics_f = async {
+        match metrics_addr {
+            Some(addr) => windmill_common::serve_metrics(addr, rx.resubscribe())
+                .await
+                .map_err(anyhow::Error::from),
+            None => Ok(()),
+        }
+    };
+
+    futures::try_join!(shutdown_signal, workers_f, metrics_f)?;
+
+    Ok(())
+}

backend/windmill-worker/src/main2.rs

@@ -1,92 +0,0 @@
-/*
- * Author: Ruben Fiszel
- * Copyright: Windmill Labs, Inc 2022
- * This file and its contents are licensed under the AGPLv3 License.
- * Please see the included NOTICE for copyright information and
- * LICENSE-AGPL for a copy of the license.
- */
-
-// use std::{net::SocketAddr, time::Duration};
-
-// use anyhow::Context;
-// use sqlx::{postgres::PgPoolOptions, Pool, Postgres};
-// use windmill_common::{
-//     error::{self, Error},
-//     utils::rd_string,
-// };
-
-// #[tokio::main]
-// async fn main() -> anyhow::Result<()> {
-//     // dotenv().ok();
-
-//     windmill_common::tracing_init::initialize_tracing();
-
-//     let db = async {
-//         let database_url = std::env::var("DATABASE_URL")
-//             .map_err(|_| Error::BadConfig("DATABASE_URL env var is missing".to_string()))?;
-
-//         let max_connections = match std::env::var("DATABASE_CONNECTIONS") {
-//             Ok(n) => n.parse::<u32>().context("invalid DATABASE_CONNECTIONS")?,
-//             Err(_) => 10,
-//         };
-
-//         Ok::<Pool<Postgres>, error::Error>(
-//             PgPoolOptions::new()
-//                 .max_connections(max_connections)
-//                 .max_lifetime(Duration::from_secs(30 * 60)) // 30 mins
-//                 .connect(&database_url)
-//                 .await
-//                 .map_err(|err| Error::ConnectingToDatabase(err.to_string()))?,
-//         )
-//     }
-//     .await?;
-
-//     let metrics_addr: Option<SocketAddr> = std::env::var("METRICS_ADDR")
-//         .ok()
-//         .map(|s| {
-//             s.parse::<bool>()
-//                 .map(|b| b.then(|| SocketAddr::from(([0, 0, 0, 0], 8001))))
-//                 .or_else(|_| s.parse::<SocketAddr>().map(Some))
-//         })
-//         .transpose()?
-//         .flatten();
-
-//     let (tx, rx) = tokio::sync::broadcast::channel::<()>(3);
-//     let shutdown_signal = windmill_common::shutdown_signal(tx);
-
-//     let workers_f = async {
-//         let instance_name = rd_string(5);
-
-//         let ip = windmill_common::external_ip::get_ip()
-//             .await
-//             .unwrap_or_else(|e| {
-//                 tracing::warn!(error = e.to_string(), "failed to get external IP");
-//                 "unretrievable IP".to_string()
-//             });
-//         let worker_name = format!("dt-worker-{}-{}", &instance_name, rd_string(5));
-//         windmill_worker::run_worker(
-//             &db.clone(),
-//             &instance_name,
-//             worker_name,
-//             1,
-//             1,
-//             &ip,
-//             rx.resubscribe(),
-//         )
-//         .await;
-//         Ok(()) as anyhow::Result<()>
-//     };
-
-//     let metrics_f = async {
-//         match metrics_addr {
-//             Some(addr) => windmill_common::serve_metrics(addr, rx.resubscribe())
-//                 .await
-//                 .map_err(anyhow::Error::from),
-//             None => Ok(()),
-//         }
-//     };
-
-//     futures::try_join!(shutdown_signal, workers_f, metrics_f)?;
-
-//     Ok(())
-// }

backend/windmill-worker/src/worker_flow.rs

@@ -11,8 +11,8 @@ use std::iter;
 use std::time::Duration;
 
 use crate::jobs::{add_completed_job, add_completed_job_error, schedule_again_if_scheduled};
-use crate::js_eval::{eval_timeout, IdContext};
-use crate::{worker, AuthedClient, KEEP_JOB_DIR};
+use crate::js_eval::{eval_timeout, EvalCreds, IdContext};
+use crate::worker;
 use anyhow::Context;
 use async_recursion::async_recursion;
 use dyn_iter::DynIter;
@@ -40,7 +40,7 @@ use windmill_queue::{
 // #[instrument(level = "trace", skip_all)]
 pub async fn update_flow_status_after_job_completion(
     db: &DB,
-    client: &AuthedClient,
+    client: &windmill_api_client::Client,
     flow: uuid::Uuid,
     job_id_for_status: &Uuid,
     w_id: &str,
@@ -50,8 +50,9 @@ pub async fn update_flow_status_after_job_completion(
     unrecoverable: bool,
     same_worker_tx: Sender<Uuid>,
     worker_dir: &str,
-    stop_early_override: Option<bool>,
+    keep_job_dir: bool,
     base_internal_url: &str,
+    stop_early_override: Option<bool>,
 ) -> error::Result<()> {
     tracing::debug!("UPDATE FLOW STATUS: {flow:?} {success} {result:?} {w_id}");
 
@@ -120,7 +121,8 @@ pub async fn update_flow_status_after_job_completion(
 
         let stop_early = success
             && if let Some(expr) = r.stop_early_expr.clone() {
-                compute_bool_from_expr(expr, &r.args, result.clone(), None, Some(client)).await?
+                compute_bool_from_expr(expr, &r.args, result.clone(), base_internal_url, None, None)
+                    .await?
             } else {
                 false
             };
@@ -325,21 +327,6 @@ pub async fn update_flow_status_after_job_completion(
             )
             .execute(&mut tx)
             .await?;
-
-            if let Some(job_result) = new_status.job_result() {
-                sqlx::query!(
-                    "
-            UPDATE queue
-               SET leaf_jobs = JSONB_SET(coalesce(leaf_jobs, '{}'::jsonb), ARRAY[$1::TEXT], $2)
-             WHERE COALESCE((SELECT root_job FROM queue WHERE id = $3), $3) = id
-            ",
-                    new_status.id(),
-                    json!(job_result),
-                    flow
-                )
-                .execute(&mut tx)
-                .await?;
-            }
         }
     }
 
@@ -395,12 +382,6 @@ pub async fn update_flow_status_after_job_completion(
         .await?
         .ok_or_else(|| Error::InternalErr(format!("requiring flow to be in the queue")))?;
 
-    let job_root = flow_job
-        .root_job
-        .map(|x| x.to_string())
-        .unwrap_or_else(|| "none".to_string());
-    tracing::info!(id = %flow_job.id, root_id = %job_root, "update flow status");
-
     let raw_flow = flow_job.parse_raw_flow();
     let module = raw_flow.as_ref().and_then(|module| {
         module_index.and_then(|i| module.modules.get(i).or(module.failure_module.as_ref()))
@@ -500,7 +481,7 @@ pub async fn update_flow_status_after_job_completion(
     };
 
     if done {
-        if flow_job.same_worker && !*KEEP_JOB_DIR {
+        if flow_job.same_worker && !keep_job_dir {
             let _ = tokio::fs::remove_dir_all(format!("{worker_dir}/{}", flow_job.id)).await;
         }
 
@@ -517,12 +498,13 @@ pub async fn update_flow_status_after_job_completion(
                 false,
                 same_worker_tx.clone(),
                 worker_dir,
+                keep_job_dir,
+                base_internal_url,
                 if stop_early {
                     Some(skip_if_stop_early)
                 } else {
                     None
                 },
-                base_internal_url,
             )
             .await?);
         }
@@ -577,7 +559,7 @@ async fn has_failure_module<'c>(
     flow: Uuid,
     tx: &mut sqlx::Transaction<'c, sqlx::Postgres>,
 ) -> Result<bool, Error> {
-    sqlx::query_scalar::<_, Option<bool>>(
+    sqlx::query_scalar(
         "
     SELECT raw_flow->'failure_module' != 'null'::jsonb
       FROM queue
@@ -588,7 +570,6 @@ async fn has_failure_module<'c>(
     .fetch_one(tx)
     .await
     .map_err(|e| Error::InternalErr(format!("error during retrieval of has_failure_module: {e}")))
-    .map(|v| v.unwrap_or(false))
 }
 
 fn next_retry(retry: &Retry, status: &RetryStatus) -> Option<(u16, Duration)> {
@@ -602,8 +583,9 @@ async fn compute_bool_from_expr(
     expr: String,
     flow_args: &Option<serde_json::Value>,
     result: serde_json::Value,
+    base_internal_url: &str,
     by_id: Option<IdContext>,
-    client: Option<&AuthedClient>,
+    creds: Option<EvalCreds>,
 ) -> error::Result<bool> {
     let flow_input = flow_args.clone().unwrap_or_else(|| json!({}));
     match eval_timeout(
@@ -614,8 +596,9 @@ async fn compute_bool_from_expr(
             ("previous_result".to_string(), result),
         ]
         .into(),
-        client,
+        creds,
         by_id,
+        base_internal_url.to_string(),
     )
     .await?
     {
@@ -690,10 +673,12 @@ async fn transform_input(
     flow_args: &Option<serde_json::Value>,
     last_result: serde_json::Value,
     input_transforms: &HashMap<String, InputTransform>,
+    workspace: &str,
+    token: &str,
     resumes: &[Value],
     approvers: Vec<String>,
     by_id: &IdContext,
-    client: &AuthedClient,
+    base_internal_url: &str,
 ) -> windmill_common::error::Result<Map<String, serde_json::Value>> {
     let mut mapped = serde_json::Map::new();
 
@@ -732,13 +717,19 @@ async fn transform_input(
                     context.push(("error".to_string(), error.unwrap().clone()));
                 }
 
-                let v = eval_timeout(expr.to_string(), context, Some(client), Some(by_id.clone()))
-                    .await
-                    .map_err(|e| {
-                        Error::ExecutionErr(format!(
-                            "Error during isolated evaluation of expression `{expr}`:\n{e}"
-                        ))
-                    })?;
+                let v = eval_timeout(
+                    expr.to_string(),
+                    context,
+                    Some(EvalCreds { workspace: workspace.to_string(), token: token.to_string() }),
+                    Some(by_id.clone()),
+                    base_internal_url.to_string(),
+                )
+                .await
+                .map_err(|e| {
+                    Error::ExecutionErr(format!(
+                        "Error during isolated evaluation of expression `{expr}`:\n{e}"
+                    ))
+                })?;
                 mapped.insert(key.to_string(), v);
                 ()
             }
@@ -752,7 +743,7 @@ async fn transform_input(
 pub async fn handle_flow(
     flow_job: &QueuedJob,
     db: &sqlx::Pool<sqlx::Postgres>,
-    client: &AuthedClient,
+    client: &windmill_api_client::Client,
     last_result: serde_json::Value,
     same_worker_tx: Sender<Uuid>,
     worker_dir: &str,
@@ -778,8 +769,8 @@ pub async fn handle_flow(
         client,
         last_result,
         same_worker_tx,
-        worker_dir,
         base_internal_url,
+        worker_dir,
     )
     .await?;
     Ok(())
@@ -792,18 +783,12 @@ async fn push_next_flow_job(
     mut status: FlowStatus,
     flow: FlowValue,
     db: &sqlx::Pool<sqlx::Postgres>,
-    client: &AuthedClient,
+    client: &windmill_api_client::Client,
     mut last_result: serde_json::Value,
     same_worker_tx: Sender<Uuid>,
-    worker_dir: &str,
     base_internal_url: &str,
+    worker_dir: &str,
 ) -> error::Result<()> {
-    let job_root = flow_job
-        .root_job
-        .map(|x| x.to_string())
-        .unwrap_or_else(|| "none".to_string());
-    tracing::info!(id = %flow_job.id, root_id = %job_root, "pushing next flow job");
-
     let mut i = usize::try_from(status.step)
         .with_context(|| format!("invalid module index {}", status.step))?;
 
@@ -831,8 +816,9 @@ async fn push_next_flow_job(
             true,
             same_worker_tx,
             worker_dir,
-            None,
+            false,
             base_internal_url,
+            None,
         )
         .await;
     }
@@ -872,6 +858,7 @@ async fn push_next_flow_job(
                         .into(),
                         None,
                         None,
+                        "".to_string(),
                     )
                     .await
                     .map_err(|e| {
@@ -1114,15 +1101,15 @@ async fn push_next_flow_job(
         _ => (),
     }
 
-    let mut transform_context: Option<IdContext> = None;
+    let mut transform_context: Option<TransformContext> = None;
 
     let args: windmill_common::error::Result<_> = match &module.value {
         FlowModuleValue::Script { input_transforms, .. }
         | FlowModuleValue::RawScript { input_transforms, .. }
         | FlowModuleValue::Flow { input_transforms, .. } => {
-            let ctx = get_transform_context(&flow_job, previous_id.clone(), &status).await?;
+            let ctx = get_transform_context(db, &flow_job, previous_id.clone(), &status).await?;
             transform_context = Some(ctx);
-            let by_id = transform_context.as_ref().unwrap();
+            let (token, by_id) = transform_context.as_ref().unwrap();
             transform_input(
                 &flow_job.args,
                 last_result.clone(),
@@ -1131,10 +1118,12 @@ async fn push_next_flow_job(
                 } else {
                     &module.input_transforms
                 },
+                &flow_job.workspace_id,
+                &token,
                 resume_messages.as_slice(),
                 approvers,
                 by_id,
-                client,
+                base_internal_url,
             )
             .await
         }
@@ -1167,17 +1156,17 @@ async fn push_next_flow_job(
         flow_job,
         &flow,
         transform_context,
+        db,
         tx,
         &module,
         &status,
         &status_module,
         last_result.clone(),
+        base_internal_url,
         previous_id,
-        client,
     )
     .await?;
     tx.commit().await?;
-    tracing::info!(id = %flow_job.id, root_id = %job_root, "next flow transform computed");
 
     let (job_payloads, next_status) = match next_flow_transform {
         NextFlowTransform::Continue(job_payload, next_state) => (job_payload, next_state),
@@ -1250,7 +1239,6 @@ async fn push_next_flow_job(
             Ok(v) => (Some(v), None),
             Err(e) => (None, Some(e)),
         };
-        let root_job = flow_job.root_job.or_else(|| Some(flow_job.id));
         let (uuid, inner_tx) = push(
             tx,
             &flow_job.workspace_id,
@@ -1262,7 +1250,6 @@ async fn push_next_flow_job(
             scheduled_for_o,
             flow_job.schedule_path.clone(),
             Some(flow_job.id),
-            root_job,
             true,
             continue_on_same_worker,
             err,
@@ -1374,7 +1361,6 @@ async fn push_next_flow_job(
     };
 
     tx.commit().await?;
-    tracing::info!(id = %flow_job.id, root_id = %job_root, "all next flow jobs pushed");
 
     if continue_on_same_worker {
         if !is_one_uuid {
@@ -1506,17 +1492,20 @@ async fn script_path_to_payload<'c>(
     Ok(job_payload)
 }
 
+type TransformContext = (String, IdContext);
+
 async fn compute_next_flow_transform<'c>(
     flow_job: &QueuedJob,
     flow: &FlowValue,
-    by_id: Option<IdContext>,
+    transform_context: Option<TransformContext>,
+    db: &DB,
     mut tx: sqlx::Transaction<'c, sqlx::Postgres>,
     module: &FlowModule,
     status: &FlowStatus,
     status_module: &FlowStatusModule,
     last_result: serde_json::Value,
+    base_internal_url: &str,
     previous_id: String,
-    client: &AuthedClient,
 ) -> error::Result<(sqlx::Transaction<'c, sqlx::Postgres>, NextFlowTransform)> {
     match &module.value {
         FlowModuleValue::Identity => Ok((
@@ -1547,7 +1536,7 @@ async fn compute_next_flow_transform<'c>(
         FlowModuleValue::RawScript { path, content, language, lock, .. } => {
             let path = path
                 .clone()
-                .or_else(|| Some(format!("{}/step-{}", flow_job.script_path(), status.step)));
+                .or_else(|| Some(format!("{}/{}", flow_job.script_path(), status.step)));
             Ok((
                 tx,
                 NextFlowTransform::Continue(
@@ -1569,10 +1558,10 @@ async fn compute_next_flow_transform<'c>(
                 FlowStatusModule::WaitingForPriorSteps { .. }
                 | FlowStatusModule::WaitingForEvents { .. }
                 | FlowStatusModule::WaitingForExecutor { .. } => {
-                    let by_id = if let Some(x) = by_id {
+                    let (token, by_id) = if let Some(x) = transform_context {
                         x
                     } else {
-                        get_transform_context(&flow_job, previous_id, &status).await?
+                        get_transform_context(db, &flow_job, previous_id, &status).await?
                     };
                     let flow_input = flow_job.args.clone().unwrap_or_else(|| json!({}));
                     /* Iterator is an InputTransform, evaluate it into an array. */
@@ -1585,8 +1574,10 @@ async fn compute_next_flow_transform<'c>(
                                 ("previous_result".to_string(), last_result.clone()),
                             ]
                         },
-                        Some(client),
+                        token,
+                        flow_job.workspace_id.clone(),
                         Some(by_id),
+                        base_internal_url,
                     )
                     .await?
                     .into_array()
@@ -1703,14 +1694,19 @@ async fn compute_next_flow_transform<'c>(
                 | FlowStatusModule::WaitingForEvents { .. }
                 | FlowStatusModule::WaitingForExecutor { .. } => {
                     let mut branch_chosen = BranchChosen::Default;
-                    let idcontext = get_transform_context(&flow_job, previous_id, &status).await?;
+                    let (token, idcontext) =
+                        get_transform_context(db, &flow_job, previous_id, &status).await?;
                     for (i, b) in branches.iter().enumerate() {
                         let pred = compute_bool_from_expr(
                             b.expr.to_string(),
                             &flow_job.args,
                             last_result.clone(),
+                            base_internal_url,
                             Some(idcontext.clone()),
-                            Some(client),
+                            Some(EvalCreds {
+                                workspace: flow_job.workspace_id.clone(),
+                                token: token.to_string(),
+                            }),
                         )
                         .await?;
 
@@ -1875,31 +1871,59 @@ async fn compute_next_flow_transform<'c>(
 }
 
 async fn get_transform_context(
+    db: &DB,
     flow_job: &QueuedJob,
     previous_id: String,
     status: &FlowStatus,
-) -> error::Result<IdContext> {
+) -> error::Result<TransformContext> {
+    let tx = db.begin().await?;
+    let (tx, new_token) = crate::create_token_for_owner(
+        tx,
+        &flow_job.workspace_id,
+        &flow_job.permissioned_as,
+        "transform-input",
+        10,
+        &flow_job.email,
+    )
+    .await?;
+    //we need to commit asap otherwise the token won't be valid for auth to check outside of this transaction
+    //which will happen with client http calls
+    tx.commit().await?;
     let steps_results: HashMap<String, JobResult> = status
         .modules
         .iter()
         .filter_map(|x| x.job_result().map(|y| (x.id(), y)))
         .collect();
 
-    Ok(IdContext { flow_job: flow_job.id, steps_results, previous_id })
+    Ok((
+        new_token,
+        IdContext { flow_job: flow_job.id, steps_results, previous_id },
+    ))
 }
 
 async fn evaluate_with<F>(
     transform: InputTransform,
     vars: F,
-    client: Option<&AuthedClient>,
+    token: String,
+    workspace: String,
     by_id: Option<IdContext>,
+    base_internal_url: &str,
 ) -> anyhow::Result<serde_json::Value>
 where
     F: FnOnce() -> Vec<(String, serde_json::Value)>,
 {
     match transform {
         InputTransform::Static { value } => Ok(value),
-        InputTransform::Javascript { expr } => eval_timeout(expr, vars(), client, by_id).await,
+        InputTransform::Javascript { expr } => {
+            eval_timeout(
+                expr,
+                vars(),
+                Some(EvalCreds { workspace, token }),
+                by_id,
+                base_internal_url.to_string(),
+            )
+            .await
+        }
     }
 }
 trait IntoArray: Sized {

cli/README.md

@@ -28,25 +28,12 @@ Flow Steps and Logs will be streamed during execution automatically.
 The CLI can push specifications to a windmill instance. See the
 [examples/](./examples/) folder for formats.
 
-## Switch to a different workspace
+### Pushing a folder
 
-```
-wmill workspace switch <workspace_name>
-```
-
-## Sync a workspace
-
-### Pull
-
-```
-wmill sync pull
-```
-
-### Push
-
-```
-wmill sync push
-```
+You can push all files in a folder at once using `wmill push` Files MUST be
+named resource_name.\<type\>.json. They will be pushed to the remote path they
+are in, for example the file `u/admin/fib/fib.script.json` will be pushed as a
+script to u/admin/fib/fib.
 
 ### Pushing individual files
 

cli/apps.ts

@@ -1,179 +0,0 @@
-import { requireLogin, resolveWorkspace, validatePath } from "./context.ts";
-import { Any, decoverto, model, property } from "./decoverto.ts";
-import {
-  AppService,
-  AppWithLastVersion,
-  colors,
-  Command,
-  ListableApp,
-  microdiff,
-  Policy,
-  Table,
-} from "./deps.ts";
-import {
-  Difference,
-  GlobalOptions,
-  PushDiffs,
-  Resource,
-  setValueByPath,
-} from "./types.ts";
-
-@model()
-export class AppFile implements Resource, PushDiffs {
-  @property(Any)
-  value: any;
-  @property(() => String)
-  summary: string;
-  @property(Any)
-  policy: Policy;
-
-  constructor(value: string, summary: string, policy: Policy) {
-    this.value = value;
-    this.summary = summary;
-    this.policy = policy;
-  }
-  async pushDiffs(
-    workspace: string,
-    remotePath: string,
-    diffs: Difference[]
-  ): Promise<void> {
-    let app: AppWithLastVersion | undefined = undefined;
-    try {
-      app = await AppService.getAppByPath({ workspace, path: remotePath });
-    } catch (e) {}
-
-    if (app) {
-      console.log(
-        colors.bold.yellow(
-          `Applying ${diffs.length} diffs to existing app... ${remotePath}`
-        )
-      );
-      const changeset: {
-        summary?: string | undefined;
-        value?: any;
-        policy?: Policy | undefined;
-      } = {};
-      for (const diff of diffs) {
-        if (
-          diff.type !== "REMOVE" &&
-          diff.path[0] !== "value" &&
-          diff.path[0] !== "policy" &&
-          (diff.path.length !== 1 ||
-            !["summary"].includes(diff.path[0] as string))
-        ) {
-          throw new Error("Invalid app diff with path " + diff.path);
-        }
-        if (diff.type === "CREATE" || diff.type === "CHANGE") {
-          setValueByPath(changeset, diff.path, diff.value);
-        } else if (diff.type === "REMOVE") {
-          setValueByPath(changeset, diff.path, null);
-        }
-      }
-
-      if (
-        (!changeset?.policy ||
-          JSON.stringify(changeset?.policy) == JSON.stringify(app.policy)) &&
-        (!changeset?.value ||
-          JSON.stringify(changeset?.value) == JSON.stringify(app.value)) &&
-        (!changeset?.summary || changeset.summary == app.summary)
-      ) {
-        console.log(
-          colors.yellow(`No changes to push for app ${remotePath}, skipping`)
-        );
-        return;
-      }
-
-      const hasChanges = Object.values(changeset).some(
-        (v) => v !== null && typeof v !== "undefined"
-      );
-      if (!hasChanges) {
-        return;
-      }
-
-      await AppService.updateApp({
-        workspace,
-        path: remotePath,
-        requestBody: changeset,
-      });
-    } else {
-      console.log(colors.yellow.bold("Creating new app..."));
-
-      await AppService.createApp({
-        workspace,
-        requestBody: {
-          path: remotePath,
-          policy: this.policy,
-          summary: this.summary,
-          value: this.value,
-        },
-      });
-    }
-  }
-  async push(workspace: string, remotePath: string): Promise<void> {
-    await this.pushDiffs(
-      workspace,
-      remotePath,
-      microdiff({}, this, { cyclesFix: false })
-    );
-  }
-}
-
-async function list(opts: GlobalOptions) {
-  const workspace = await resolveWorkspace(opts);
-  await requireLogin(opts);
-
-  let page = 0;
-  const perPage = 10;
-  const total: ListableApp[] = [];
-  while (true) {
-    const res = await AppService.listApps({
-      workspace: workspace.workspaceId,
-      page,
-      perPage,
-    });
-    page += 1;
-    total.push(...res);
-    if (res.length < perPage) {
-      break;
-    }
-  }
-
-  new Table()
-    .header(["path", "summary"])
-    .padding(2)
-    .border(true)
-    .body(total.map((x) => [x.path, x.summary]))
-    .render();
-}
-
-async function push(opts: GlobalOptions, filePath: string) {
-  const remotePath = filePath.split(".")[0];
-  if (!validatePath(remotePath)) {
-    return;
-  }
-  const workspace = await resolveWorkspace(opts);
-  await requireLogin(opts);
-
-  await pushApp(filePath, workspace.workspaceId, remotePath);
-  console.log(colors.bold.underline.green("App pushed"));
-}
-
-export async function pushApp(
-  filePath: string,
-  workspace: string,
-  remotePath: string
-) {
-  const data = decoverto
-    .type(AppFile)
-    .rawToInstance(await Deno.readTextFile(filePath));
-  await data.push(workspace, remotePath);
-}
-
-const command = new Command()
-  .description("app related commands")
-  .action(list as any)
-  .command("push", "push a local app ")
-  .arguments("<file_path:file>")
-  .action(push as any);
-
-export default command;

cli/context.ts

@@ -1,12 +1,10 @@
 // deno-lint-ignore-file no-explicit-any
-import { colors, GlobalUserInfo, setClient, UserService } from "./deps.ts";
-import { loginInteractive, tryGetLoginInfo } from "./login.ts";
+import { colors, setClient } from "./deps.ts";
+import { tryGetLoginInfo } from "./login.ts";
 import { GlobalOptions } from "./types.ts";
 import {
-  addWorkspace,
   getActiveWorkspace,
   getWorkspaceByName,
-  removeWorkspace,
   Workspace,
 } from "./workspace.ts";
 
@@ -18,12 +16,12 @@ export type Context = {
 };
 
 async function tryResolveWorkspace(
-  opts: GlobalOptions
+  opts: GlobalOptions,
 ): Promise<
   { isError: false; value: Workspace } | { isError: true; error: string }
 > {
   const cache = (opts as any).__secret_workspace;
-  if (cache) return { isError: false, value: cache };
+  if (cache) return cache;
 
   if (opts.workspace) {
     const e = await getWorkspaceByName(opts.workspace);
@@ -49,53 +47,30 @@ async function tryResolveWorkspace(
 }
 
 export async function resolveWorkspace(
-  opts: GlobalOptions
+  opts: GlobalOptions,
 ): Promise<Workspace> {
   const res = await tryResolveWorkspace(opts);
   if (res.isError) {
-    console.log(colors.red.bold(res.error));
+    console.log(res.error);
     return Deno.exit(-1);
   } else {
     return res.value;
   }
 }
 
-export async function requireLogin(
-  opts: GlobalOptions
-): Promise<GlobalUserInfo> {
+export async function requireLogin(opts: GlobalOptions) {
   const workspace = await resolveWorkspace(opts);
-  let token = await tryGetLoginInfo(opts);
 
+  let token = await tryGetLoginInfo(opts);
   if (!token) {
     token = workspace.token;
   }
 
   setClient(token, workspace.remote.substring(0, workspace.remote.length - 1));
-
-  try {
-    return await UserService.globalWhoami();
-  } catch {
-    console.log(
-      "! Could not reach API given existing credentials. Attempting to reauth..."
-    );
-    const newToken = await loginInteractive(workspace.remote);
-    if (!newToken) {
-      throw new Error("Could not reauth");
-    }
-    removeWorkspace(workspace.name, false, opts);
-    workspace.token = newToken;
-    addWorkspace(workspace, opts);
-
-    setClient(
-      token,
-      workspace.remote.substring(0, workspace.remote.length - 1)
-    );
-    return await UserService.globalWhoami();
-  }
 }
 
 export async function tryResolveVersion(
-  opts: GlobalOptions
+  opts: GlobalOptions,
 ): Promise<number | undefined> {
   if ((opts as any).__cache_version) {
     return (opts as any).__cache_version;
@@ -105,24 +80,41 @@ export async function tryResolveVersion(
   if (workspaceRes.isError) return undefined;
 
   const response = await fetch(
-    new URL(new URL(workspaceRes.value.remote).origin + "/api/version")
+    new URL(new URL(workspaceRes.value.remote).origin + "/api/version"),
   );
   const version = await response.text();
   try {
     return Number.parseInt(
-      version.split("-", 1)[0].replaceAll(".", "").replace("v", "")
+      version.split("-", 1)[0].replaceAll(".", "").replace("v", ""),
     );
   } catch {
     return undefined;
   }
 }
 
-export function validatePath(path: string): boolean {
-  if (!(path.startsWith("g") || path.startsWith("u") || path.startsWith("f"))) {
+export async function validatePath(
+  opts: GlobalOptions,
+  path: string,
+): Promise<boolean> {
+  const backendVersion = await tryResolveVersion(opts);
+  if (path.startsWith("f")) {
+    if (!backendVersion || backendVersion >= 1550) {
+      return true;
+    }
+    console.log(
+      `Attempting to use folders, but the current remote does not have support. Remote version is ${backendVersion} but folders are supported from 1560.`,
+    );
+    return false;
+  }
+
+  if (
+    !(path.startsWith("g") ||
+      path.startsWith("u"))
+  ) {
     console.log(
       colors.red(
-        "Given remote path looks invalid. Remote paths are typically of the form <u|g|f>/<username|group|folder>/..."
-      )
+        "Given remote path looks invalid. Remote paths are typically of the form <u|g|f>/<username|group|folder>/...",
+      ),
     );
     return false;
   }

cli/decoverto.ts

@@ -1,8 +0,0 @@
-// globally shared decoverto instance
-import { Decoverto } from "npm:decoverto";
-const decoverto = new Decoverto();
-
-// TODO: Properly type FlowModule
-
-export { Any, array, map, MapShape, model, property } from "npm:decoverto";
-export { decoverto };

cli/deps.ts

@@ -1,39 +1,32 @@
 // windmill
-export { setClient } from "https://deno.land/x/windmill@v1.69.3/mod.ts";
-export * from "https://deno.land/x/windmill@v1.69.3/windmill-api/index.ts";
+export { setClient } from "https://deno.land/x/windmill@v1.56.0/mod.ts";
+export * from "https://deno.land/x/windmill@v1.56.0/windmill-api/index.ts";
 
 // cliffy
-export { Command } from "https://deno.land/x/cliffy@v0.25.7/command/command.ts";
-export { Table } from "https://deno.land/x/cliffy@v0.25.7/table/table.ts";
-export { colors } from "https://deno.land/x/cliffy@v0.25.7/ansi/colors.ts";
-export { Secret } from "https://deno.land/x/cliffy@v0.25.7/prompt/secret.ts";
-export { Select } from "https://deno.land/x/cliffy@v0.25.7/prompt/select.ts";
-export { Confirm } from "https://deno.land/x/cliffy@v0.25.7/prompt/confirm.ts";
-export { Input } from "https://deno.land/x/cliffy@v0.25.7/prompt/input.ts";
+export { Command } from "https://deno.land/x/cliffy@v0.25.6/command/command.ts";
+export { Table } from "https://deno.land/x/cliffy@v0.25.6/table/table.ts";
+export { colors } from "https://deno.land/x/cliffy@v0.25.6/ansi/colors.ts";
+export { Secret } from "https://deno.land/x/cliffy@v0.25.6/prompt/secret.ts";
+export { Select } from "https://deno.land/x/cliffy@v0.25.6/prompt/select.ts";
+export { Confirm } from "https://deno.land/x/cliffy@v0.25.6/prompt/confirm.ts";
+export { Input } from "https://deno.land/x/cliffy@v0.25.6/prompt/input.ts";
 export {
   DenoLandProvider,
   UpgradeCommand,
-} from "https://deno.land/x/cliffy@v0.25.7/command/upgrade/mod.ts";
-export { CompletionsCommand } from "https://deno.land/x/cliffy@v0.25.7/command/completions/mod.ts";
+} from "https://deno.land/x/cliffy@v0.25.6/command/upgrade/mod.ts";
+
 // std
-export * as path from "https://deno.land/std@0.176.0/path/mod.ts";
-export { ensureDir } from "https://deno.land/std@0.176.0/fs/ensure_dir.ts";
+export { Untar } from "https://deno.land/std@0.170.0/archive/untar.ts";
+export * as path from "https://deno.land/std@0.170.0/path/mod.ts";
+export { ensureDir } from "https://deno.land/std@0.170.0/fs/ensure_dir.ts";
 export {
   copy,
   readAll,
   readerFromStreamReader,
-} from "https://deno.land/std@0.176.0/streams/mod.ts";
-export { DelimiterStream } from "https://deno.land/std@0.176.0/streams/mod.ts";
-export { iterateReader } from "https://deno.land/std@0.176.0/streams/iterate_reader.ts";
+} from "https://deno.land/std@0.170.0/streams/mod.ts";
+export { DelimiterStream } from "https://deno.land/std@0.170.0/streams/mod.ts";
 
 // other
 export { getAvailablePort } from "https://deno.land/x/port@1.0.0/mod.ts";
 export { default as dir } from "https://deno.land/x/dir@1.5.1/mod.ts";
 export { passwordGenerator } from "https://deno.land/x/password_generator@latest/mod.ts"; // TODO: I think the version is called latest, but it's still pinned.
-export { nanoid } from "https://deno.land/x/nanoid@v3.0.0/mod.ts";
-export * as cbor from "https://deno.land/x/cbor@v1.4.1/index.js";
-export { default as Murmurhash3 } from "https://deno.land/x/murmurhash@v1.0.0/mod.ts";
-export { default as microdiff } from "https://deno.land/x/microdiff@v1.3.1/index.ts";
-export { default as objectHash } from "https://deno.land/x/object_hash@2.0.3.1/mod.ts";
-export { default as gitignore_parser } from "npm:gitignore-parser";
-export { default as JSZip } from "npm:jszip@3.7.1";

cli/flow.ts

@@ -1,146 +1,67 @@
 // deno-lint-ignore-file no-explicit-any
-import {
-  Difference,
-  GlobalOptions,
-  PushDiffs,
-  Resource,
-  setValueByPath,
-} from "./types.ts";
+import { GlobalOptions } from "./types.ts";
 import {
   colors,
   Command,
   Flow,
   FlowService,
   JobService,
-  microdiff,
-  OpenFlowWPath,
+  OpenFlow,
   Table,
 } from "./deps.ts";
 import { requireLogin, resolveWorkspace, validatePath } from "./context.ts";
 import { resolve, track_job } from "./script.ts";
-import { Any, decoverto, model, property } from "./decoverto.ts";
-
-// this is effectively "OpenFlow" but a copy as it is accepted by the CLI
-@model()
-export class FlowFile implements Resource, PushDiffs {
-  @property(() => String)
-  summary: string;
-  @property(() => String)
-  description?: string;
-  @property(Any)
-  value: any;
-  @property(Any)
-  schema?: any;
-
-  constructor(value: any, summary?: string) {
-    this.summary = summary ?? "";
-    this.value = value;
-  }
-  async pushDiffs(
-    workspace: string,
-    remotePath: string,
-    diffs: Difference[]
-  ): Promise<void> {
-    if (
-      await FlowService.existsFlowByPath({
-        workspace: workspace,
-        path: remotePath,
-      })
-    ) {
-      console.log(
-        colors.bold.yellow(
-          `Applying ${diffs.length} diffs to existing flow... ${remotePath}`
-        )
-      );
-
-      // TODO: Make these optional in backend (not path ofc)
-      const changeset: OpenFlowWPath = {
-        path: remotePath,
-        summary: this.summary,
-        value: this.value,
-        description: this.description, // This is OpenAPIed as optional, but isn't
-        schema: this.schema, // Same
-      };
-      const base_changeset = { ...changeset };
-      for (const diff of diffs) {
-        if (
-          diff.type !== "REMOVE" &&
-          diff.path[0] !== "value" &&
-          (diff.path.length !== 1 ||
-            !["summary", "description", "schema"].includes(
-              diff.path[0] as string
-            ))
-        ) {
-          throw new Error("Invalid flow diff with path " + diff.path);
-        }
-        if (diff.type === "CREATE" || diff.type === "CHANGE") {
-          setValueByPath(changeset, diff.path, diff.value);
-        } else if (diff.type === "REMOVE") {
-          setValueByPath(changeset, diff.path, null);
-        }
-      }
-      const hasChanges = Object.values(changeset).some(
-        (v) => v !== null && typeof v !== "undefined"
-      );
-      if (!hasChanges) {
-        return;
-      }
-
-      const update = {
-        ...changeset,
-        ...base_changeset,
-      };
-
-      await FlowService.updateFlow({
-        workspace: workspace,
-        path: remotePath,
-        requestBody: update,
-      });
-    } else {
-      console.log(colors.bold.yellow("Creating new flow..."));
-      await FlowService.createFlow({
-        workspace: workspace,
-        requestBody: {
-          path: remotePath,
-          summary: this.summary,
-          value: this.value,
-          schema: this.schema,
-          description: this.description,
-        },
-      });
-    }
-  }
-  async push(workspace: string, remotePath: string): Promise<void> {
-    await this.pushDiffs(
-      workspace,
-      remotePath,
-      microdiff({}, this, { cyclesFix: false })
-    );
-  }
-}
 
 type Options = GlobalOptions;
 
 async function push(opts: Options, filePath: string, remotePath: string) {
-  if (!validatePath(remotePath)) {
+  if (!await validatePath(opts, remotePath)) {
     return;
   }
   const workspace = await resolveWorkspace(opts);
   await requireLogin(opts);
 
-  await pushFlow(filePath, workspace.workspaceId, remotePath);
-  console.log(colors.bold.underline.green("Flow pushed"));
+  await pushFlow(filePath, workspace.remote, remotePath);
+  console.log(colors.bold.underline.green("Flow successfully pushed"));
 }
 
 export async function pushFlow(
   filePath: string,
   workspace: string,
-  remotePath: string
+  remotePath: string,
 ) {
-  const data = decoverto
-    .type(FlowFile)
-    .rawToInstance(await Deno.readTextFile(filePath));
-  await data.push(workspace, remotePath);
+  const data: OpenFlow = JSON.parse(await Deno.readTextFile(filePath));
+  if (
+    await FlowService.existsFlowByPath({
+      workspace: workspace,
+      path: remotePath,
+    })
+  ) {
+    console.log(colors.bold.yellow("Updating existing flow..."));
+    await FlowService.updateFlow({
+      workspace: workspace,
+      path: remotePath,
+      requestBody: {
+        path: remotePath,
+        summary: data.summary,
+        value: data.value,
+        schema: data.schema,
+        description: data.description,
+      },
+    });
+  } else {
+    console.log(colors.bold.yellow("Creating new flow..."));
+    await FlowService.createFlow({
+      workspace: workspace,
+      requestBody: {
+        path: remotePath,
+        summary: data.summary,
+        value: data.value,
+        schema: data.schema,
+        description: data.description,
+      },
+    });
+  }
 }
 
 async function list(opts: GlobalOptions & { showArchived?: boolean }) {
@@ -165,23 +86,31 @@ async function list(opts: GlobalOptions & { showArchived?: boolean }) {
   }
 
   new Table()
-    .header(["path", "summary", "edited by"])
+    .header(["path", "summary", "edited at", "edited by"])
     .padding(2)
     .border(true)
-    .body(total.map((x) => [x.path, x.summary, x.edited_by]))
+    .body(
+      total.map((x) => [
+        x.path,
+        x.summary,
+        x.edited_at,
+        x.edited_by,
+        x.description ?? "-",
+      ]),
+    )
     .render();
 }
 async function run(
   opts: GlobalOptions & {
-    data?: string;
+    input: string[];
     silent: boolean;
   },
-  path: string
+  path: string,
 ) {
   const workspace = await resolveWorkspace(opts);
   await requireLogin(opts);
 
-  const input = opts.data ? await resolve(opts.data) : {};
+  const input = await resolve(opts.input);
 
   const id = await JobService.runFlowByPath({
     workspace: workspace.workspaceId,
@@ -217,7 +146,6 @@ async function run(
 
   if (!opts.silent) {
     console.log(colors.green.underline.bold("Flow ran to completion"));
-    console.log();
   }
   const jobInfo = await JobService.getCompletedJob({
     workspace: workspace.workspaceId,
@@ -232,19 +160,19 @@ const command = new Command()
   .action(list as any)
   .command(
     "push",
-    "push a local flow spec. This overrides any remote versions."
+    "push a local flow spec. This overrides any remote versions.",
   )
   .arguments("<file_path:string> <remote_path:string>")
   .action(push as any)
   .command("run", "run a flow by path.")
   .arguments("<path:string>")
   .option(
-    "-d --data <data:string>",
-    "Inputs specified as a JSON string or a file using @<filename> or stdin using @-."
+    "-i --input [inputs...:string]",
+    "Inputs specified as JSON objects or simply as <name>=<value>. Supports file inputs using @<filename> and stdin using @- these also need to be formatted as JSON. Later inputs override earlier ones.",
   )
   .option(
     "-s --silent",
-    "Do not ouput anything other then the final output. Useful for scripting."
+    "Do not ouput anything other then the final output. Useful for scripting.",
   )
   .action(run as any);
 

cli/folder.ts

@@ -1,143 +1,12 @@
-import { colors, Command, FolderService, microdiff } from "./deps.ts";
+import { colors, Command, Folder, FolderService } from "./deps.ts";
 import { requireLogin, resolveWorkspace, validatePath } from "./context.ts";
-import {
-  Difference,
-  GlobalOptions,
-  PushDiffs,
-  Resource,
-  setValueByPath,
-} from "./types.ts";
-import {
-  array,
-  decoverto,
-  map,
-  MapShape,
-  model,
-  property,
-} from "./decoverto.ts";
-
-@model()
-export class FolderFile implements Resource, PushDiffs {
-  @property(array(() => String))
-  owners: Array<string> | undefined;
-  @property(
-    map(
-      () => String,
-      () => Boolean,
-      { shape: MapShape.Object }
-    )
-  )
-  extra_perms: Map<string, boolean> | undefined;
-  @property(() => String)
-  display_name: string | undefined;
-
-  async push(workspace: string, remotePath: string): Promise<void> {
-    if (remotePath.startsWith("/")) {
-      remotePath = remotePath.substring(1);
-    }
-    if (remotePath.startsWith("f/")) {
-      remotePath = remotePath.substring(2);
-    }
-
-    await this.pushDiffs(
-      workspace,
-      remotePath,
-      microdiff({}, this, { cyclesFix: false })
-    );
-  }
-
-  async pushDiffs(
-    workspace: string,
-    remotePath: string,
-    diffs: Difference[]
-  ): Promise<void> {
-    if (remotePath.startsWith("/")) {
-      remotePath = remotePath.substring(1);
-    }
-    if (remotePath.startsWith("f/")) {
-      remotePath = remotePath.substring(2);
-    }
-
-    // TODO: Support this in backend
-    let exists: boolean;
-    try {
-      exists = !!(await FolderService.getFolder({
-        workspace,
-        name: remotePath,
-      }));
-    } catch {
-      exists = false;
-    }
-    if (exists) {
-      console.log(
-        colors.bold.yellow(
-          `Applying ${diffs.length} diffs to existing folder... ${remotePath}`
-        )
-      );
-
-      const changeset: {
-        owners?: string[] | undefined;
-        extra_perms?: any;
-        display_name?: string | undefined;
-      } = {};
-      for (const diff of diffs) {
-        if (
-          diff.type !== "REMOVE" &&
-          (diff.path.length !== 1 ||
-            !["owners", "extra_perms", "display_name"].includes(
-              diff.path[0] as string
-            ))
-        ) {
-          console.log(diff.path);
-          throw new Error("Invalid folder diff with path " + diff.path);
-        }
-        if (diff.type === "CREATE" || diff.type === "CHANGE") {
-          setValueByPath(changeset, diff.path, diff.value);
-        } else if (diff.type === "REMOVE") {
-          setValueByPath(changeset, diff.path, null);
-        }
-      }
-
-      const hasChanges = Object.values(changeset).some(
-        (v) => v !== null && typeof v !== "undefined"
-      );
-      if (!hasChanges) {
-        return;
-      }
-      try {
-        await FolderService.updateFolder({
-          workspace: workspace,
-          name: remotePath,
-          requestBody: {
-            ...changeset,
-            extra_perms: changeset.extra_perms
-              ? Object.fromEntries(this.extra_perms?.entries() ?? [])
-              : undefined,
-          },
-        });
-      } catch (e) {
-        console.error(colors.red.bold(e.body));
-        throw e;
-      }
-    } else {
-      console.log(colors.bold.yellow("Creating new folder: " + remotePath));
-      await FolderService.createFolder({
-        workspace: workspace,
-        requestBody: {
-          name: remotePath,
-          extra_perms: Object.fromEntries(this.extra_perms?.entries() ?? []),
-          owners: this.owners,
-        },
-      });
-    }
-  }
-}
+import { GlobalOptions } from "./types.ts";
 
 async function push(opts: GlobalOptions, filePath: string, remotePath: string) {
   const workspace = await resolveWorkspace(opts);
   await requireLogin(opts);
 
-  if (!validatePath(remotePath)) {
+  if (!await validatePath(opts, remotePath)) {
     return;
   }
 
@@ -149,25 +18,71 @@ async function push(opts: GlobalOptions, filePath: string, remotePath: string) {
   console.log(colors.bold.yellow("Pushing resource..."));
 
   await pushFolder(workspace.workspaceId, filePath, remotePath);
-  console.log(colors.bold.underline.green("Resource pushed"));
+  console.log(colors.bold.underline.green("Resource successfully pushed"));
 }
 
+type FolderFile = {
+  owners: Array<string> | undefined;
+  extra_perms: Record<string, boolean> | undefined;
+};
+
 export async function pushFolder(
   workspace: string,
   filePath: string,
-  remotePath: string
+  remotePath: string,
 ) {
-  const data = decoverto
-    .type(FolderFile)
-    .rawToInstance(await Deno.readTextFile(filePath));
-  data.push(workspace, remotePath);
+  if (remotePath.startsWith("/")) {
+    remotePath = remotePath.substring(1);
+  }
+  if (remotePath.startsWith("f/")) {
+    remotePath = remotePath.substring(2);
+  }
+  const data: FolderFile = JSON.parse(await Deno.readTextFile(filePath));
+  let optFolder: Folder | undefined;
+  try {
+    optFolder = await FolderService.getFolder({ workspace, name: remotePath });
+  } catch {
+    optFolder = undefined;
+  }
+
+  if (optFolder) {
+    // for (const [k, v] of Object.entries(optFolder.extra_perms)) {
+    //   if (!data.extra_perms || data.extra_perms[k] !== v) {
+    //     console.log(colors.red.underline.bold(`Extra Perms missmatch on ${k}`));
+    //     return;
+    //   }
+    // }
+
+    console.log(colors.yellow("Updating existing folder..."));
+    await FolderService.updateFolder({
+      workspace,
+      name: remotePath,
+      requestBody: {
+        extra_perms: data.extra_perms,
+        owners: data.owners,
+      },
+    });
+  } else {
+    console.log(colors.yellow("Creating new folder..."));
+    await FolderService.createFolder({
+      workspace,
+      requestBody: {
+        name: remotePath,
+        extra_perms: data.extra_perms,
+        owners: data.owners,
+      },
+    });
+
+    // HACK: Workaround backend automatically adding current user to folder.
+    await pushFolder(workspace, filePath, remotePath);
+  }
 }
 
 const command = new Command()
   .description("resource related commands")
   .command(
     "push",
-    "push a local folder spec. This overrides any remote versions."
+    "push a local folder spec. This overrides any remote versions.",
   )
   .arguments("<file_path:string> <remote_path:string>")
   .action(push as any);