Skip to content

Commit

Permalink
Upgrade deps and deal with deprecations (#690)
Browse files Browse the repository at this point in the history
1. Upgrade to Go 1.23
2. Move off old gRPC API
3. Fix contexts and enable `passthrough` in gRPC for testing
4. Downgrade go's gRPC library until there's more time to address an
ALPN + HTTP/2 issue
  • Loading branch information
sourishkrout authored Oct 25, 2024
1 parent 6f18ca0 commit 9fde944
Show file tree
Hide file tree
Showing 16 changed files with 217 additions and 194 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: ["1.22"]
go: ["1.23"]
name: Lint with Go ${{ matrix.go }}
steps:
- uses: actions/checkout@v4
Expand All @@ -36,7 +36,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go: ["1.22"]
go: ["1.23"]
os: [ubuntu-latest, windows-latest]
name: Build and test with Go ${{ matrix.go }} on ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v5
with:
go-version: ">=1.22"
go-version: ">=1.23"
- name: Setup & build
uses: stateful/runme-action@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: "1.22"
go-version: "1.23"

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand Down
2 changes: 1 addition & 1 deletion docker/runme-test-env.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22-bookworm
FROM golang:1.23-bookworm

LABEL org.opencontainers.image.authors="StatefulHQ <[email protected]>"
LABEL org.opencontainers.image.source="https://github.com/stateful/runme"
Expand Down
6 changes: 4 additions & 2 deletions examples/grpc-client/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ func run() error {
}

credentials := credentials.NewTLS(tlsConfig)

conn, err := grpc.Dial(*addr, grpc.WithTransportCredentials(credentials))
conn, err := grpc.NewClient(
*addr,
grpc.WithTransportCredentials(credentials),
)
if err != nil {
return errors.Wrap(err, "failed to connect")
}
Expand Down
99 changes: 49 additions & 50 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,70 +1,70 @@
module github.com/stateful/runme/v3

go 1.22.0
go 1.23

toolchain go1.23.2

// replace github.com/stateful/godotenv => ../godotenv

require (
github.com/Masterminds/semver/v3 v3.2.1
github.com/Masterminds/semver/v3 v3.3.0
github.com/Microsoft/go-winio v0.6.2
github.com/atotto/clipboard v0.1.4
github.com/charmbracelet/bubbletea v0.26.6
github.com/charmbracelet/lipgloss v0.12.1
github.com/cli/cli/v2 v2.53.0
github.com/cli/go-gh/v2 v2.9.0
github.com/charmbracelet/bubbletea v1.1.2
github.com/charmbracelet/lipgloss v0.13.1
github.com/cli/cli/v2 v2.60.0
github.com/cli/go-gh/v2 v2.11.0
github.com/containerd/console v1.0.4
github.com/creack/pty v1.1.21
github.com/docker/docker v27.1.1+incompatible
github.com/creack/pty v1.1.23
github.com/docker/docker v27.3.1+incompatible
github.com/expr-lang/expr v1.16.9
github.com/fatih/color v1.17.0
github.com/fatih/color v1.18.0
github.com/fullstorydev/grpcurl v1.9.1
github.com/gabriel-vasile/mimetype v1.4.5
github.com/go-git/go-billy/v5 v5.5.0
github.com/gabriel-vasile/mimetype v1.4.6
github.com/go-git/go-billy/v5 v5.6.0
github.com/gobwas/glob v0.2.3
github.com/golang/mock v1.6.0
github.com/google/go-github/v45 v45.2.0
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
github.com/graphql-go/graphql v0.8.1
github.com/jhump/protoreflect v1.16.0
github.com/jhump/protoreflect v1.17.0
github.com/mattn/go-isatty v0.0.20
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d
github.com/muesli/cancelreader v0.2.2
github.com/oklog/ulid/v2 v2.1.0
github.com/opencontainers/image-spec v1.1.0
github.com/otiai10/copy v1.14.0
github.com/rogpeppe/go-internal v1.12.0
github.com/rogpeppe/go-internal v1.13.1
github.com/rwtodd/Go.Sed v0.0.0-20240405174034-bb8ed5da0fd0
github.com/stateful/godotenv v0.0.0-20240309032207-c7bc0b812915
github.com/vektah/gqlparser/v2 v2.5.16
github.com/vektah/gqlparser/v2 v2.5.18
github.com/xo/dburl v0.23.2
github.com/yuin/goldmark v1.7.4
go.uber.org/dig v1.17.1
github.com/yuin/goldmark v1.7.8
go.uber.org/dig v1.18.0
go.uber.org/multierr v1.11.0
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
golang.org/x/oauth2 v0.21.0
golang.org/x/sys v0.22.0
golang.org/x/term v0.22.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20240725223205-93522f1f2a9f
google.golang.org/protobuf v1.34.2
mvdan.cc/sh/v3 v3.8.0
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
golang.org/x/oauth2 v0.23.0
golang.org/x/sys v0.26.0
golang.org/x/term v0.25.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38
google.golang.org/protobuf v1.35.1
mvdan.cc/sh/v3 v3.10.0
)

require (
dario.cat/mergo v1.0.0 // indirect
dario.cat/mergo v1.0.1 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/bufbuild/protocompile v0.14.0 // indirect
github.com/charmbracelet/x/ansi v0.1.4 // indirect
github.com/charmbracelet/x/input v0.1.3 // indirect
github.com/charmbracelet/x/term v0.1.1 // indirect
github.com/charmbracelet/x/windows v0.1.2 // indirect
github.com/cncf/xds/go v0.0.0-20240723142845-024c85f92f20 // indirect
github.com/bufbuild/protocompile v0.14.1 // indirect
github.com/charmbracelet/x/ansi v0.4.0 // indirect
github.com/charmbracelet/x/term v0.2.0 // indirect
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/cyphar/filepath-securejoin v0.3.1 // indirect
github.com/cyphar/filepath-securejoin v0.3.4 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/envoyproxy/go-control-plane v0.12.0 // indirect
github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
github.com/envoyproxy/go-control-plane v0.13.1 // indirect
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.2 // indirect
Expand All @@ -75,16 +75,15 @@ require (
github.com/moby/term v0.5.0 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
go.opentelemetry.io/otel v1.31.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.31.0 // indirect
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
golang.org/x/net v0.27.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect
gotest.tools/v3 v3.5.1 // indirect
)

Expand All @@ -93,7 +92,7 @@ require (
github.com/briandowns/spinner v1.23.1 // indirect
github.com/cli/go-gh v1.2.1
github.com/cli/safeexec v1.0.1 // indirect
github.com/cloudflare/circl v1.3.9 // indirect
github.com/cloudflare/circl v1.5.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
Expand All @@ -118,34 +117,34 @@ require (
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/skeema/knownhosts v1.3.0 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/tools v0.23.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/tools v0.26.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/Khan/genqlient v0.7.0
github.com/charmbracelet/bubbles v0.18.0
github.com/charmbracelet/bubbles v0.20.0
github.com/elliotchance/orderedmap v1.6.0
github.com/go-git/go-git/v5 v5.12.0
github.com/go-playground/assert/v2 v2.2.0
github.com/go-playground/validator/v10 v10.22.0
github.com/go-playground/validator/v10 v10.22.1
github.com/golang-jwt/jwt/v4 v4.5.0
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.6.0
github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/henvic/httpretty v0.1.3
github.com/henvic/httpretty v0.1.4
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.2
github.com/pelletier/go-toml/v2 v2.2.3
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
github.com/pkg/errors v0.9.1
github.com/pkg/term v1.2.0-beta.2.0.20211217091447-1a4a3b719465
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
go.uber.org/zap v1.27.0
golang.org/x/sync v0.7.0
google.golang.org/grpc v1.65.0
golang.org/x/sync v0.8.0
google.golang.org/grpc v1.66.0 // downgrade due to issue with ALPN and HTTP/2
)
Loading

0 comments on commit 9fde944

Please sign in to comment.