Skip to content

Commit

Permalink
fix: more build fixes (#3763)
Browse files Browse the repository at this point in the history
  • Loading branch information
@stuartwdouglas
stuartwdouglas authored Dec 16, 2024
1 parent bc2f440 commit 1ef0c89
Show file tree
Hide file tree
Showing 27 changed files with 124 additions and 135 deletions.
2 changes: 1 addition & 1 deletion backend/runner/runner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import (
"connectrpc.com/connect"
"github.com/alecthomas/atomic"
"github.com/alecthomas/types/optional"
mysql "github.com/block/ftl-mysql-auth-proxy"
"github.com/jpillora/backoff"
"github.com/otiai10/copy"
"github.com/puzpuzpuz/xsync/v3"
"golang.org/x/sync/errgroup"
"google.golang.org/protobuf/types/known/structpb"
"google.golang.org/protobuf/types/known/timestamppb"

mysql "github.com/block/ftl-mysql-auth-proxy"
"github.com/block/ftl/backend/controller/artefacts"
ftldeploymentconnect "github.com/block/ftl/backend/protos/xyz/block/ftl/deployment/v1/deploymentpbconnect"
ftlleaseconnect "github.com/block/ftl/backend/protos/xyz/block/ftl/lease/v1/leasepbconnect"
Expand Down
190 changes: 93 additions & 97 deletions cmd/go2proto/testdata/testdatapb/model.pb.go
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion cmd/go2proto/testdata/testdatapb/model.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ syntax = "proto3";

package xyz.block.ftl.go2proto.test;

import "google/protobuf/timestamp.proto";
import "google/protobuf/duration.proto";

option go_package = "github.com/block/ftl/cmd/go2proto/testdata/testdatapb";
Expand Down
13 changes: 6 additions & 7 deletions common/protos/xyz/block/ftl/schema/v1/schema.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion go-runtime/schema/call/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl-golang-tools/go/analysis/passes/inspect"
"github.com/block/ftl-golang-tools/go/ast/inspector"

"github.com/block/ftl/go-runtime/schema/common"
)

Expand Down
4 changes: 2 additions & 2 deletions go-runtime/schema/common/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"strings"

"github.com/alecthomas/types/optional"
"github.com/puzpuzpuz/xsync/v3"

"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl-golang-tools/go/analysis/passes/inspect"
"github.com/block/ftl-golang-tools/go/ast/inspector"
"github.com/puzpuzpuz/xsync/v3"

"github.com/block/ftl/common/schema"
"github.com/block/ftl/common/strcase"
)
Expand Down
2 changes: 1 addition & 1 deletion go-runtime/schema/common/directive.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/alecthomas/participle/v2"
"github.com/alecthomas/types/optional"
"github.com/block/ftl-golang-tools/go/analysis"

"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl/common/cron"
"github.com/block/ftl/common/schema"
)
Expand Down
1 change: 0 additions & 1 deletion go-runtime/schema/common/error.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"unicode/utf8"

"github.com/block/ftl-golang-tools/go/analysis"

"github.com/block/ftl/common/builderrors"
)

Expand Down
2 changes: 1 addition & 1 deletion go-runtime/schema/common/fact.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"reflect"

"github.com/alecthomas/types/optional"
"github.com/block/ftl-golang-tools/go/analysis"

"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl/common/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion go-runtime/schema/config/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"go/types"

"github.com/alecthomas/types/optional"
"github.com/block/ftl-golang-tools/go/analysis"

"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl/common/schema"
"github.com/block/ftl/common/strcase"
"github.com/block/ftl/go-runtime/schema/common"
Expand Down
2 changes: 1 addition & 1 deletion go-runtime/schema/data/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"unicode"

"github.com/alecthomas/types/optional"
"github.com/block/ftl-golang-tools/go/analysis"

"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl/common/schema"
"github.com/block/ftl/common/strcase"
"github.com/block/ftl/go-runtime/schema/common"
Expand Down
2 changes: 1 addition & 1 deletion go-runtime/schema/database/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"go/types"

"github.com/alecthomas/types/optional"
"github.com/block/ftl-golang-tools/go/analysis"

"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl/common/schema"
"github.com/block/ftl/go-runtime/schema/common"
)
Expand Down
2 changes: 1 addition & 1 deletion go-runtime/schema/enum/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"

"github.com/alecthomas/types/optional"
"github.com/block/ftl-golang-tools/go/analysis"

"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl/common/schema"
"github.com/block/ftl/common/strcase"
"github.com/block/ftl/go-runtime/schema/common"
Expand Down
6 changes: 3 additions & 3 deletions go-runtime/schema/extract.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (

"github.com/alecthomas/types/optional"
"github.com/alecthomas/types/tuple"
sets "github.com/deckarep/golang-set/v2"
"golang.org/x/exp/maps"

"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl-golang-tools/go/analysis/passes/inspect"
checker "github.com/block/ftl-golang-tools/go/analysis/programmaticchecker"
"github.com/block/ftl-golang-tools/go/packages"
sets "github.com/deckarep/golang-set/v2"
"golang.org/x/exp/maps"

"github.com/block/ftl/common/builderrors"
"github.com/block/ftl/common/schema"
"github.com/block/ftl/common/strcase"
Expand Down
2 changes: 1 addition & 1 deletion go-runtime/schema/finalize/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"strings"

"github.com/alecthomas/types/optional"

"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl-golang-tools/go/analysis/passes/inspect"
"github.com/block/ftl-golang-tools/go/ast/inspector"

"github.com/block/ftl/common/schema"
"github.com/block/ftl/common/strcase"
"github.com/block/ftl/go-runtime/schema/common"
Expand Down
1 change: 0 additions & 1 deletion go-runtime/schema/initialize/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (

"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl-golang-tools/go/packages"

"github.com/block/ftl/common/slices"
)

Expand Down
4 changes: 2 additions & 2 deletions go-runtime/schema/metadata/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"reflect"

"github.com/alecthomas/types/optional"
sets "github.com/deckarep/golang-set/v2"

"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl-golang-tools/go/analysis/passes/inspect"
"github.com/block/ftl-golang-tools/go/ast/inspector"
sets "github.com/deckarep/golang-set/v2"

"github.com/block/ftl/common/schema"
"github.com/block/ftl/go-runtime/schema/common"
)
Expand Down
1 change: 0 additions & 1 deletion go-runtime/schema/resourceconfig/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl-golang-tools/go/analysis/passes/inspect"
"github.com/block/ftl-golang-tools/go/ast/inspector"

"github.com/block/ftl/go-runtime/schema/common"
)

Expand Down
2 changes: 1 addition & 1 deletion go-runtime/schema/secret/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"go/types"

"github.com/alecthomas/types/optional"
"github.com/block/ftl-golang-tools/go/analysis"

"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl/common/schema"
"github.com/block/ftl/common/strcase"
"github.com/block/ftl/go-runtime/schema/common"
Expand Down
2 changes: 1 addition & 1 deletion go-runtime/schema/topic/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"go/types"

"github.com/alecthomas/types/optional"
"github.com/block/ftl-golang-tools/go/analysis"

"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl/common/schema"
"github.com/block/ftl/common/strcase"
"github.com/block/ftl/go-runtime/schema/common"
Expand Down
4 changes: 2 additions & 2 deletions go-runtime/schema/transitive/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"go/types"

"github.com/alecthomas/types/optional"
sets "github.com/deckarep/golang-set/v2"

"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl-golang-tools/go/analysis/passes/inspect"
"github.com/block/ftl-golang-tools/go/ast/inspector"
sets "github.com/deckarep/golang-set/v2"

"github.com/block/ftl/common/schema"
"github.com/block/ftl/go-runtime/schema/common"
)
Expand Down
2 changes: 1 addition & 1 deletion go-runtime/schema/typealias/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strings"

"github.com/alecthomas/types/optional"
"github.com/block/ftl-golang-tools/go/analysis"

"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl/common/schema"
"github.com/block/ftl/common/strcase"
"github.com/block/ftl/go-runtime/schema/common"
Expand Down
1 change: 0 additions & 1 deletion go-runtime/schema/typeenum/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl-golang-tools/go/analysis/passes/inspect"
"github.com/block/ftl-golang-tools/go/ast/inspector"

"github.com/block/ftl/common/schema"
"github.com/block/ftl/common/strcase"
"github.com/block/ftl/go-runtime/schema/common"
Expand Down
2 changes: 1 addition & 1 deletion go-runtime/schema/typeenumvariant/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"go/types"

"github.com/alecthomas/types/optional"

"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl-golang-tools/go/analysis/passes/inspect"
"github.com/block/ftl-golang-tools/go/ast/inspector"

"github.com/block/ftl/common/schema"
"github.com/block/ftl/common/strcase"
"github.com/block/ftl/go-runtime/schema/common"
Expand Down
2 changes: 1 addition & 1 deletion go-runtime/schema/valueenumvariant/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"strconv"

"github.com/alecthomas/types/optional"

"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl-golang-tools/go/analysis/passes/inspect"
"github.com/block/ftl-golang-tools/go/ast/inspector"

"github.com/block/ftl/common/schema"
"github.com/block/ftl/common/strcase"
"github.com/block/ftl/go-runtime/schema/common"
Expand Down
2 changes: 1 addition & 1 deletion go-runtime/schema/verb/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"unicode"

"github.com/alecthomas/types/optional"
"github.com/block/ftl-golang-tools/go/analysis"

"github.com/block/ftl-golang-tools/go/analysis"
"github.com/block/ftl/common/schema"
"github.com/block/ftl/common/strcase"
"github.com/block/ftl/go-runtime/schema/common"
Expand Down
4 changes: 2 additions & 2 deletions python-runtime/ftl/src/ftl/protos/xyz/block/ftl/schema/v1/schema_pb2.py
View file

Large diffs are not rendered by default.

0 comments on commit 1ef0c89

Please sign in to comment.