merge with main

.github/workflows/pre-release.yaml

@@ -20,7 +20,7 @@ jobs:
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
       - name: Build
         run: |
-          DOCKER_BUILDKIT=1 docker build -f ./build/package/servers.Dockerfile \
+          DOCKER_BUILDKIT=1 docker build -f ./build/package/servers.dockerfile \
             -t ghcr.io/hatchet-dev/hatchet/hatchet-api:${{steps.tag_name.outputs.tag}} \
             --build-arg SERVER_TARGET=api \
             --build-arg VERSION=${{steps.tag_name.outputs.tag}} \
@@ -44,7 +44,7 @@ jobs:
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
       - name: Build
         run: |
-          DOCKER_BUILDKIT=1 docker build -f ./build/package/servers.Dockerfile \
+          DOCKER_BUILDKIT=1 docker build -f ./build/package/servers.dockerfile \
             -t ghcr.io/hatchet-dev/hatchet/hatchet-admin:${{steps.tag_name.outputs.tag}} \
             --build-arg SERVER_TARGET=admin \
             --build-arg VERSION=${{steps.tag_name.outputs.tag}} \
@@ -68,7 +68,7 @@ jobs:
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
       - name: Build
         run: |
-          DOCKER_BUILDKIT=1 docker build -f ./build/package/servers.Dockerfile \
+          DOCKER_BUILDKIT=1 docker build -f ./build/package/servers.dockerfile \
             -t ghcr.io/hatchet-dev/hatchet/hatchet-engine:${{steps.tag_name.outputs.tag}} \
             --build-arg SERVER_TARGET=engine \
             --build-arg VERSION=${{steps.tag_name.outputs.tag}} \
@@ -92,7 +92,7 @@ jobs:
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
       - name: Build
         run: |
-          DOCKER_BUILDKIT=1 docker build -f ./build/package/migrate.Dockerfile \
+          DOCKER_BUILDKIT=1 docker build -f ./build/package/migrate.dockerfile \
             -t ghcr.io/hatchet-dev/hatchet/hatchet-migrate:${{steps.tag_name.outputs.tag}} \
             .
       - name: Push to GHCR
@@ -114,7 +114,7 @@ jobs:
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
       - name: Build
         run: |
-          DOCKER_BUILDKIT=1 docker build -f ./build/package/frontend.Dockerfile \
+          DOCKER_BUILDKIT=1 docker build -f ./build/package/frontend.dockerfile \
             -t ghcr.io/hatchet-dev/hatchet/hatchet-frontend:${{steps.tag_name.outputs.tag}} \
             .
       - name: Push to GHCR

build/package/frontend.Dockerfile → build/package/frontend.dockerfile

@@ -2,7 +2,7 @@ FROM node:18-alpine as build
 
 WORKDIR /app
 COPY ./frontend/app/package.json ./frontend/app/package-lock.json ./
-RUN npm install
+RUN npm ci
 COPY ./frontend/app ./
 RUN npm run build
 

build/package/migrate.dockerfile

@@ -0,0 +1,14 @@
+# Base Go environment
+# -------------------
+FROM golang:1.21-alpine as base
+WORKDIR /hatchet
+
+COPY go.mod go.sum ./
+
+RUN go mod download
+
+RUN go run github.com/steebchen/prisma-client-go prefetch
+
+COPY /prisma ./prisma
+
+CMD go run github.com/steebchen/prisma-client-go migrate deploy

build/package/servers.Dockerfile → build/package/servers.dockerfile

@@ -32,9 +32,7 @@ RUN go run github.com/steebchen/prisma-client-go generate --generator go
 FROM node:16-alpine as build-openapi
 WORKDIR /openapi
 
-RUN npm install -g npm@8.1
-
-RUN npm install -g @apidevtools/swagger-cli prisma
+RUN npm install -g npm@8.1 @apidevtools/swagger-cli prisma
 
 COPY /api-contracts/openapi ./openapi
 

cmd/hatchet-admin/cli/seed.go

@@ -23,7 +23,7 @@ var seedCmd = &cobra.Command{
 		err = runSeed(configLoader)
 
 		if err != nil {
-			fmt.Printf("Fatal: could not load server config: %v\n", err)
+			fmt.Printf("Fatal: could not run seed command: %v\n", err)
 			os.Exit(1)
 		}
 	},
@@ -137,6 +137,7 @@ func seedDev(repo repository.Repository, tenantId string) error {
 		if !errors.Is(err, db.ErrNotFound) {
 			return err
 		}
+
 		wf, err := repo.Workflow().CreateNewWorkflow(tenantId, &repository.CreateWorkflowVersionOpts{
 			Name:        "test-workflow",
 			Description: repository.StringPtr("This is a test workflow."),

examples/schedule-timeout/.hatchet/schedule-timeout-workflow.yaml

@@ -0,0 +1,10 @@
+name: "test-schedule-timeout"
+version: v0.1.0
+triggers:
+  events:
+    - user:create
+jobs:
+  timeout-job:
+    steps:
+      - id: timeout
+        action: timeout:timeout

examples/schedule-timeout/main.go

@@ -0,0 +1,47 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/hatchet-dev/hatchet/pkg/client"
+	"github.com/joho/godotenv"
+)
+
+type sampleEvent struct{}
+
+type timeoutInput struct{}
+
+func main() {
+	err := godotenv.Load()
+
+	if err != nil {
+		panic(err)
+	}
+
+	client, err := client.New(
+		client.InitWorkflows(),
+	)
+
+	if err != nil {
+		panic(err)
+	}
+
+	event := sampleEvent{}
+
+	// push an event
+	err = client.Event().Push(
+		context.Background(),
+		"user:create",
+		event,
+	)
+
+	if err != nil {
+		panic(err)
+	}
+
+	time.Sleep(35 * time.Second)
+
+	fmt.Println("step should have timed out")
+}

examples/timeout/main.go

@@ -44,7 +44,7 @@ func main() {
 
 	err = worker.RegisterAction("timeout:timeout", func(ctx context.Context, input *timeoutInput) (result any, err error) {
 		// wait for context done signal
-		timeStart := time.Now()
+		timeStart := time.Now().UTC()
 		<-ctx.Done()
 		fmt.Println("context cancelled in ", time.Since(timeStart).Seconds(), " seconds")
 

frontend/app/src/pages/main/workflow-runs/$run/index.tsx

@@ -260,6 +260,9 @@ function StepStatusSection({ stepRun }: { stepRun: StepRun }) {
             stepRun.step?.timeout || '60s'
           }`;
           break;
+        case 'SCHEDULING_TIMED_OUT':
+          statusText = `This step was cancelled because no workers were available to run ${stepRun.step?.action}`;
+          break;
         case 'PREVIOUS_STEP_TIMED_OUT':
           statusText = `This step was cancelled because the previous step timed out`;
           break;

frontend/app/src/pages/main/workflow-runs/components/run-statuses.tsx

@@ -28,6 +28,9 @@ export function RunStatus({
         case 'TIMED_OUT':
           text = 'Timed out';
           break;
+        case 'SCHEDULING_TIMED_OUT':
+          text = 'No workers available';
+          break;
         default:
           break;
       }

internal/auth/cookie/sessionstore.go

@@ -223,11 +223,11 @@ func (store *UserSessionStore) save(session *sessions.Session) error {
 	var expiresOn time.Time
 
 	if exOn == nil {
-		expiresOn = time.Now().Add(time.Second * time.Duration(session.Options.MaxAge))
+		expiresOn = time.Now().UTC().Add(time.Second * time.Duration(session.Options.MaxAge))
 	} else {
 		expiresOn = exOn.(time.Time)
-		if expiresOn.Sub(time.Now().Add(time.Second*time.Duration(session.Options.MaxAge))) < 0 {
-			expiresOn = time.Now().Add(time.Second * time.Duration(session.Options.MaxAge))
+		if expiresOn.Sub(time.Now().UTC().Add(time.Second*time.Duration(session.Options.MaxAge))) < 0 {
+			expiresOn = time.Now().UTC().Add(time.Second * time.Duration(session.Options.MaxAge))
 		}
 	}
 

internal/repository/prisma/dbsqlc/schema.sql

@@ -131,6 +131,7 @@ CREATE TABLE "StepRun" (
     "input" JSONB,
     "output" JSONB,
     "requeueAfter" TIMESTAMP(3),
+    "scheduleTimeoutAt" TIMESTAMP(3),
     "error" TEXT,
     "startedAt" TIMESTAMP(3),
     "finishedAt" TIMESTAMP(3),

internal/repository/prisma/dbsqlc/step_runs.sql

@@ -3,9 +3,14 @@ UPDATE
     "StepRun"
 SET
     "requeueAfter" = COALESCE(sqlc.narg('requeueAfter')::timestamp, "requeueAfter"),
+    "scheduleTimeoutAt" = COALESCE(sqlc.narg('scheduleTimeoutAt')::timestamp, "scheduleTimeoutAt"),
     "startedAt" = COALESCE(sqlc.narg('startedAt')::timestamp, "startedAt"),
     "finishedAt" = COALESCE(sqlc.narg('finishedAt')::timestamp, "finishedAt"),
-    "status" = COALESCE(sqlc.narg('status'), "status"),
+    "status" = CASE 
+        -- Final states are final, cannot be updated
+        WHEN "status" IN ('SUCCEEDED', 'FAILED', 'CANCELLED') THEN "status"
+        ELSE COALESCE(sqlc.narg('status'), "status")
+    END,
     "input" = COALESCE(sqlc.narg('input')::jsonb, "input"),
     "output" = COALESCE(sqlc.narg('output')::jsonb, "output"),
     "error" = COALESCE(sqlc.narg('error')::text, "error"),