Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade Connect to 1.11.1 #445

Merged
merged 1 commit into from
Oct 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

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

2 changes: 1 addition & 1 deletion backend/common/download/download.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"path/filepath"

"connectrpc.com/connect"
"github.com/alecthomas/errors"
"github.com/bufbuild/connect-go"

"github.com/TBD54566975/ftl/backend/common/log"
"github.com/TBD54566975/ftl/backend/common/model"
Expand Down
4 changes: 2 additions & 2 deletions backend/common/plugin/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"syscall"
"time"

"connectrpc.com/connect"
"connectrpc.com/grpcreflect"
"github.com/alecthomas/errors"
"github.com/alecthomas/kong"
"github.com/bufbuild/connect-go"
grpcreflect "github.com/bufbuild/connect-grpcreflect-go"
"golang.org/x/net/http2"
"golang.org/x/net/http2/h2c"

Expand Down
2 changes: 1 addition & 1 deletion backend/common/plugin/spawn.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"syscall"
"time"

"connectrpc.com/connect"
"github.com/alecthomas/errors"
"github.com/bufbuild/connect-go"
"github.com/jpillora/backoff"

"github.com/TBD54566975/ftl/backend/common/exec"
Expand Down
4 changes: 2 additions & 2 deletions backend/common/rpc/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"net/http"

"connectrpc.com/connect"
"connectrpc.com/otelconnect"
"github.com/alecthomas/errors"
"github.com/bufbuild/connect-go"
otelconnect "github.com/bufbuild/connect-opentelemetry-go"

"github.com/TBD54566975/ftl/backend/common/log"
"github.com/TBD54566975/ftl/backend/common/model"
Expand Down
2 changes: 1 addition & 1 deletion backend/common/rpc/rpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"
"time"

"connectrpc.com/connect"
"github.com/alecthomas/errors"
"github.com/bufbuild/connect-go"
"github.com/jpillora/backoff"
"golang.org/x/net/http2"

Expand Down
4 changes: 2 additions & 2 deletions backend/common/rpc/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"strings"
"time"

"connectrpc.com/connect"
"connectrpc.com/grpcreflect"
"github.com/alecthomas/concurrency"
"github.com/alecthomas/errors"
"github.com/bufbuild/connect-go"
grpcreflect "github.com/bufbuild/connect-grpcreflect-go"
"github.com/rs/cors"
"golang.org/x/net/http2"
"golang.org/x/net/http2/h2c"
Expand Down
2 changes: 1 addition & 1 deletion backend/controller/console.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"encoding/json"
"time"

"connectrpc.com/connect"
"github.com/alecthomas/errors"
"github.com/alecthomas/types"
"github.com/bufbuild/connect-go"
"google.golang.org/protobuf/types/known/durationpb"
"google.golang.org/protobuf/types/known/timestamppb"

Expand Down
2 changes: 1 addition & 1 deletion backend/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import (
"sync"
"time"

"connectrpc.com/connect"
"github.com/alecthomas/concurrency"
"github.com/alecthomas/errors"
"github.com/alecthomas/kong"
"github.com/alecthomas/types"
"github.com/bufbuild/connect-go"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgxpool"
"github.com/jellydator/ttlcache/v3"
Expand Down
2 changes: 1 addition & 1 deletion backend/runner/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"syscall"
"time"

"connectrpc.com/connect"
"github.com/alecthomas/atomic"
"github.com/alecthomas/errors"
"github.com/alecthomas/types"
"github.com/bufbuild/connect-go"
"github.com/jpillora/backoff"
"github.com/otiai10/copy"
"google.golang.org/protobuf/types/known/structpb"
Expand Down
2 changes: 1 addition & 1 deletion bin/protoc-gen-connect-go
2 changes: 1 addition & 1 deletion cmd/ftl-go/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"strings"
"time"

"connectrpc.com/connect"
"github.com/alecthomas/errors"
"github.com/alecthomas/kong"
"github.com/bufbuild/connect-go"
"github.com/radovskyb/watcher"
"golang.org/x/mod/modfile"
"golang.org/x/sync/errgroup"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ftl/cmd_call.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"encoding/json"
"fmt"

"connectrpc.com/connect"
"github.com/alecthomas/errors"
"github.com/bufbuild/connect-go"
"github.com/titanous/json5"

"github.com/TBD54566975/ftl/go-runtime/sdk"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ftl/cmd_deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"path/filepath"
"strings"

"connectrpc.com/connect"
"github.com/alecthomas/errors"
"github.com/bufbuild/connect-go"
"golang.org/x/exp/maps"
"google.golang.org/protobuf/types/known/timestamppb"

Expand Down
2 changes: 1 addition & 1 deletion cmd/ftl/cmd_kill.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package main
import (
"context"

"connectrpc.com/connect"
"github.com/alecthomas/errors"
"github.com/bufbuild/connect-go"

"github.com/TBD54566975/ftl/backend/common/model"
ftlv1 "github.com/TBD54566975/ftl/protos/xyz/block/ftl/v1"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ftl/cmd_ps.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"sort"
"strings"

"connectrpc.com/connect"
"github.com/alecthomas/errors"
"github.com/bufbuild/connect-go"
"github.com/golang/protobuf/jsonpb"
"golang.org/x/exp/maps"

Expand Down
2 changes: 1 addition & 1 deletion cmd/ftl/cmd_schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

"connectrpc.com/connect"
"github.com/alecthomas/errors"
"github.com/bufbuild/connect-go"

"github.com/TBD54566975/ftl/backend/schema"
ftlv1 "github.com/TBD54566975/ftl/protos/xyz/block/ftl/v1"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ftl/cmd_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"os"

"connectrpc.com/connect"
"github.com/alecthomas/errors"
"github.com/bufbuild/connect-go"
"github.com/golang/protobuf/jsonpb"

ftlv1 "github.com/TBD54566975/ftl/protos/xyz/block/ftl/v1"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ftl/cmd_update.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package main
import (
"context"

"connectrpc.com/connect"
"github.com/alecthomas/errors"
"github.com/bufbuild/connect-go"

"github.com/TBD54566975/ftl/backend/common/model"
ftlv1 "github.com/TBD54566975/ftl/protos/xyz/block/ftl/v1"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ftl/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"runtime"
"syscall"

"connectrpc.com/connect"
"github.com/alecthomas/kong"
kongtoml "github.com/alecthomas/kong-toml"
"github.com/bufbuild/connect-go"

_ "github.com/TBD54566975/ftl/backend/common/automaxprocs" // Set GOMAXPROCS to match Linux container CPU quota.
"github.com/TBD54566975/ftl/backend/common/log"
Expand Down
8 changes: 4 additions & 4 deletions examples/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ replace github.com/TBD54566975/ftl => ../
require github.com/TBD54566975/ftl v0.0.0-00010101000000-000000000000

require (
connectrpc.com/connect v1.11.1 // indirect
connectrpc.com/grpcreflect v1.2.0 // indirect
connectrpc.com/otelconnect v0.5.0 // indirect
github.com/alecthomas/concurrency v0.0.2 // indirect
github.com/alecthomas/errors v0.4.0 // indirect
github.com/alecthomas/participle/v2 v2.0.0 // indirect
github.com/alecthomas/types v0.7.1 // indirect
github.com/alessio/shellescape v1.4.1 // indirect
github.com/bufbuild/connect-go v1.8.0 // indirect
github.com/bufbuild/connect-grpcreflect-go v1.1.0 // indirect
github.com/bufbuild/connect-opentelemetry-go v0.3.0 // indirect
github.com/danieljoos/wincred v1.1.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
Expand All @@ -37,5 +37,5 @@ require (
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
)
20 changes: 10 additions & 10 deletions examples/go.sum

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

8 changes: 4 additions & 4 deletions examples/online-boutique/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ require (
)

require (
connectrpc.com/connect v1.11.1 // indirect
connectrpc.com/grpcreflect v1.2.0 // indirect
connectrpc.com/otelconnect v0.5.0 // indirect
github.com/alecthomas/concurrency v0.0.2 // indirect
github.com/alecthomas/participle/v2 v2.0.0 // indirect
github.com/alecthomas/types v0.7.1 // indirect
github.com/alessio/shellescape v1.4.1 // indirect
github.com/bufbuild/connect-go v1.8.0 // indirect
github.com/bufbuild/connect-grpcreflect-go v1.1.0 // indirect
github.com/bufbuild/connect-opentelemetry-go v0.3.0 // indirect
github.com/danieljoos/wincred v1.1.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
Expand All @@ -40,5 +40,5 @@ require (
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
)
Loading