chore: attempt to auto format PRs

.github/workflows/autofmt.yml → .github/workflows/autofmtpr.yml

@@ -1,16 +1,13 @@
 on:
-  schedule:
-    # Run daily
-    - cron: "0 22 * * *"
-name: Auto-format
+  pull_request:
+name: Auto-format Pull Request
 jobs:
   format:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: main
-          fetch-depth: 0
+          ref: ${{ github.head_ref }}
           token: ${{ secrets.FTL_AUTOFMT_TOKEN }}
       - name: Init Hermit
         run: ./bin/hermit env -r >> "$GITHUB_ENV"
@@ -20,9 +17,11 @@ jobs:
         id: git-check
         run: echo "modified=$(if git diff-index --quiet HEAD --; then echo "false"; else echo "true"; fi)" >> "$GITHUB_OUTPUT"
       - name: Push changes
+        env:
+          HEAD: ${{ github.head_ref }}
         if: steps.git-check.outputs.modified == 'true'
         run: |
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
           git config --global user.name "github-actions[bot]"
           git commit -am "chore(autofmt): Automated formatting"
-          git push
+          git push origin "$HEAD"

backend/controller/admin/client.go

@@ -8,6 +8,7 @@ import (
 	"net/url"
 
 	"connectrpc.com/connect"
+
 	ftlv1 "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1"
 	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect"
 )

backend/controller/admin/local_client.go

@@ -5,11 +5,12 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/alecthomas/types/optional"
+
 	"github.com/TBD54566975/ftl/backend/schema"
 	"github.com/TBD54566975/ftl/buildengine"
 	cf "github.com/TBD54566975/ftl/common/configuration"
 	"github.com/TBD54566975/ftl/common/projectconfig"
-	"github.com/alecthomas/types/optional"
 )
 
 // localClient reads and writes to local projectconfig files without making any network

backend/controller/console.go

@@ -7,10 +7,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/reugn/go-quartz/logger"
-
 	"connectrpc.com/connect"
 	"github.com/alecthomas/types/optional"
+	"github.com/reugn/go-quartz/logger"
 	"google.golang.org/protobuf/types/known/durationpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 

backend/controller/controller.go

@@ -7,7 +7,6 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"github.com/TBD54566975/ftl/backend/controller/observability"
 	"hash"
 	"io"
 	"math/rand"
@@ -43,6 +42,7 @@ import (
 	"github.com/TBD54566975/ftl/backend/controller/dal"
 	"github.com/TBD54566975/ftl/backend/controller/ingress"
 	"github.com/TBD54566975/ftl/backend/controller/leases"
+	"github.com/TBD54566975/ftl/backend/controller/observability"
 	"github.com/TBD54566975/ftl/backend/controller/pubsub"
 	"github.com/TBD54566975/ftl/backend/controller/scaling"
 	"github.com/TBD54566975/ftl/backend/controller/scaling/localscaling"

backend/controller/dal/fsm.go

@@ -5,12 +5,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/TBD54566975/ftl/backend/controller/observability"
 	"time"
 
 	"github.com/alecthomas/types/optional"
 
 	"github.com/TBD54566975/ftl/backend/controller/leases"
+	"github.com/TBD54566975/ftl/backend/controller/observability"
 	"github.com/TBD54566975/ftl/backend/controller/sql"
 	dalerrs "github.com/TBD54566975/ftl/backend/dal"
 	"github.com/TBD54566975/ftl/backend/schema"

backend/controller/ingress/request.go

@@ -9,9 +9,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/alecthomas/types/optional"
+
 	"github.com/TBD54566975/ftl/backend/controller/dal"
 	"github.com/TBD54566975/ftl/backend/schema"
-	"github.com/alecthomas/types/optional"
 )
 
 // BuildRequestBody extracts the HttpRequest body from an HTTP request.

backend/controller/observability/fsm.go

@@ -3,11 +3,13 @@ package observability
 import (
 	"context"
 	"fmt"
-	"github.com/TBD54566975/ftl/backend/schema"
-	"github.com/TBD54566975/ftl/internal/observability"
+
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
+
+	"github.com/TBD54566975/ftl/backend/schema"
+	"github.com/TBD54566975/ftl/internal/observability"
 )
 
 const (

backend/controller/pubsub/manager.go

@@ -4,10 +4,11 @@ import (
 	"context"
 	"time"
 
+	"github.com/jpillora/backoff"
+
 	"github.com/TBD54566975/ftl/backend/controller/dal"
 	"github.com/TBD54566975/ftl/backend/controller/scheduledtask"
 	"github.com/TBD54566975/ftl/internal/log"
-	"github.com/jpillora/backoff"
 )
 
 const (

backend/controller/sql/conn.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+
 	"github.com/jackc/pgx/v5"
 )
 

backend/schema/metadatasubscriber.go

@@ -3,8 +3,9 @@ package schema
 import (
 	"fmt"
 
-	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"
 	"google.golang.org/protobuf/proto"
+
+	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"
 )
 
 type MetadataSubscriber struct {

backend/schema/metadatatypemap.go

@@ -3,8 +3,9 @@ package schema
 import (
 	"fmt"
 
-	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"
 	"google.golang.org/protobuf/reflect/protoreflect"
+
+	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"
 )
 
 type MetadataTypeMap struct {

backend/schema/topic.go

@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"
 	"google.golang.org/protobuf/proto"
+
+	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"
 )
 
 type Topic struct {

buildengine/build_kotlin.go

@@ -9,12 +9,11 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/TBD54566975/scaffolder"
 	"github.com/beevik/etree"
 	sets "github.com/deckarep/golang-set/v2"
 	"golang.org/x/exp/maps"
 
-	"github.com/TBD54566975/scaffolder"
-
 	"github.com/TBD54566975/ftl"
 	"github.com/TBD54566975/ftl/backend/schema"
 	"github.com/TBD54566975/ftl/internal"

buildengine/build_rust.go

@@ -3,6 +3,7 @@ package buildengine
 import (
 	"context"
 	"fmt"
+
 	"github.com/TBD54566975/ftl/backend/schema"
 	"github.com/TBD54566975/ftl/internal/exec"
 	"github.com/TBD54566975/ftl/internal/log"

cmd/ftl/cmd_config.go

@@ -8,7 +8,6 @@ import (
 	"os"
 
 	"connectrpc.com/connect"
-
 	"github.com/alecthomas/types/optional"
 
 	"github.com/TBD54566975/ftl/backend/controller/admin"

cmd/ftl/cmd_dev.go

@@ -6,9 +6,8 @@ import (
 	"fmt"
 	"time"
 
-	"golang.org/x/sync/errgroup"
-
 	"github.com/alecthomas/types/optional"
+	"golang.org/x/sync/errgroup"
 
 	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect"
 	"github.com/TBD54566975/ftl/buildengine"

cmd/ftl/cmd_schema_diff.go

@@ -7,6 +7,7 @@ import (
 	"os"
 
 	"connectrpc.com/connect"
+	"github.com/alecthomas/chroma/v2/quick"
 	"github.com/hexops/gotextdiff"
 	"github.com/hexops/gotextdiff/myers"
 	"github.com/hexops/gotextdiff/span"
@@ -18,7 +19,6 @@ import (
 	"github.com/TBD54566975/ftl/backend/schema"
 	"github.com/TBD54566975/ftl/internal/log"
 	"github.com/TBD54566975/ftl/internal/rpc"
-	"github.com/alecthomas/chroma/v2/quick"
 )
 
 type schemaDiffCmd struct {

cmd/ftl/cmd_secret.go

@@ -8,7 +8,6 @@ import (
 	"os"
 
 	"connectrpc.com/connect"
-
 	"github.com/alecthomas/types/optional"
 	"github.com/mattn/go-isatty"
 	"golang.org/x/term"

cmd/ftl/main.go

@@ -15,7 +15,6 @@ import (
 
 	"github.com/TBD54566975/ftl"
 	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect"
-
 	"github.com/TBD54566975/ftl/common/projectconfig"
 	_ "github.com/TBD54566975/ftl/internal/automaxprocs" // Set GOMAXPROCS to match Linux container CPU quota.
 	"github.com/TBD54566975/ftl/internal/log"

common/configuration/asm.go

@@ -6,16 +6,15 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/TBD54566975/ftl/internal/rpc"
 	"github.com/alecthomas/types/optional"
+	"github.com/aws/aws-sdk-go-v2/service/secretsmanager"
 	"github.com/puzpuzpuz/xsync/v3"
 
 	"github.com/TBD54566975/ftl/backend/controller/leader"
 	"github.com/TBD54566975/ftl/backend/controller/leases"
 	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect"
 	"github.com/TBD54566975/ftl/internal/log"
-
-	"github.com/aws/aws-sdk-go-v2/service/secretsmanager"
+	"github.com/TBD54566975/ftl/internal/rpc"
 )
 
 type asmClient interface {

common/configuration/asm_follower.go

@@ -6,9 +6,9 @@ import (
 	"net/url"
 	"time"
 
+	"connectrpc.com/connect"
 	"github.com/puzpuzpuz/xsync/v3"
 
-	"connectrpc.com/connect"
 	ftlv1 "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1"
 	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect"
 )

common/configuration/asm_leader.go

@@ -7,14 +7,14 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/puzpuzpuz/xsync/v3"
-
-	"github.com/TBD54566975/ftl/internal/slices"
 	"github.com/alecthomas/types/optional"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/secretsmanager"
 	"github.com/aws/aws-sdk-go-v2/service/secretsmanager/types"
 	"github.com/aws/smithy-go"
+	"github.com/puzpuzpuz/xsync/v3"
+
+	"github.com/TBD54566975/ftl/internal/slices"
 )
 
 const asmLeaderSyncInterval = time.Minute * 5

common/configuration/cache.go

@@ -7,11 +7,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/TBD54566975/ftl/internal/log"
-	"github.com/TBD54566975/ftl/internal/slices"
 	"github.com/alecthomas/types/optional"
 	"github.com/alecthomas/types/pubsub"
 	"github.com/puzpuzpuz/xsync/v3"
+
+	"github.com/TBD54566975/ftl/internal/log"
+	"github.com/TBD54566975/ftl/internal/slices"
 )
 
 const (

common/configuration/db_secret_resolver.go

@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/TBD54566975/ftl/common/configuration/dal"
 	"github.com/alecthomas/types/optional"
+
+	"github.com/TBD54566975/ftl/common/configuration/dal"
 )
 
 // DBSecretResolver loads values a project's secrets from the given database.

common/configuration/manual_sync_utils.go

@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/alecthomas/atomic"
-
 	"github.com/alecthomas/types/optional"
 	"github.com/puzpuzpuz/xsync/v3"
 )

go-runtime/compile/build.go

@@ -13,6 +13,7 @@ import (
 	"strings"
 	"unicode"
 
+	"github.com/TBD54566975/scaffolder"
 	"github.com/alecthomas/types/optional"
 	sets "github.com/deckarep/golang-set/v2"
 	"golang.org/x/exp/maps"
@@ -22,8 +23,6 @@ import (
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
-	"github.com/TBD54566975/scaffolder"
-
 	"github.com/TBD54566975/ftl"
 	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"
 	"github.com/TBD54566975/ftl/backend/schema"

go-runtime/ftl/ftltest/fake.go

@@ -7,11 +7,12 @@ import (
 	"reflect"
 	"strings"
 
+	"github.com/alecthomas/types/optional"
+
 	"github.com/TBD54566975/ftl/backend/schema"
 	"github.com/TBD54566975/ftl/common/configuration"
 	"github.com/TBD54566975/ftl/go-runtime/ftl"
 	"github.com/TBD54566975/ftl/go-runtime/internal"
-	"github.com/alecthomas/types/optional"
 )
 
 // pubSubEvent is a sum type for all events that can be published to the pubsub system.

go-runtime/ftl/ftltest/pubsub.go

@@ -8,12 +8,13 @@ import (
 	"sync"
 	"time"
 
+	"github.com/alecthomas/types/optional"
+	"github.com/alecthomas/types/pubsub"
+
 	"github.com/TBD54566975/ftl/backend/schema"
 	"github.com/TBD54566975/ftl/go-runtime/ftl"
 	"github.com/TBD54566975/ftl/internal/log"
 	"github.com/TBD54566975/ftl/internal/slices"
-	"github.com/alecthomas/types/optional"
-	"github.com/alecthomas/types/pubsub"
 )
 
 type fakePubSub struct {

go-runtime/ftl/leases.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"connectrpc.com/connect"
+	"github.com/alecthomas/types/optional"
 	"google.golang.org/protobuf/types/known/durationpb"
 
 	ftlv1 "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1"
@@ -18,7 +19,6 @@ import (
 	"github.com/TBD54566975/ftl/internal/log"
 	"github.com/TBD54566975/ftl/internal/modulecontext"
 	"github.com/TBD54566975/ftl/internal/rpc"
-	"github.com/alecthomas/types/optional"
 )
 
 // ErrLeaseHeld is returned when an attempt is made to acquire a lease that is