Skip to content

Commit

Permalink
dep: update to go 1.23.4 and upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
zllovesuki committed Dec 10, 2024
1 parent d687121 commit 44dcb32
Show file tree
Hide file tree
Showing 18 changed files with 177 additions and 226 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
go: ["1.22.2"]
go: ["1.23.4"]
env:
OS: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: "1.22.2"
go-version: "1.23.4"
- uses: actions/cache@v3
with:
path: |
Expand All @@ -76,7 +76,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: "1.22.2"
go-version: "1.23.4"
- uses: actions/cache@v3
with:
path: |
Expand All @@ -99,7 +99,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: "1.22.2"
go-version: "1.23.4"
- uses: actions/cache@v3
with:
path: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pull.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
go: ["1.22.2"]
go: ["1.23.4"]
env:
OS: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: "1.22.2"
go-version: "1.23.4"
- uses: actions/cache@v3
with:
path: |
Expand All @@ -68,7 +68,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: "1.22.2"
go-version: "1.23.4"
- uses: actions/cache@v3
with:
path: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

FROM --platform=$BUILDPLATFORM golang:1.22.2-alpine as builder
FROM --platform=$BUILDPLATFORM golang:1.23.4-alpine as builder
RUN apk --no-cache add ca-certificates git
WORKDIR /app
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

FROM golang:1.22.2-bullseye as builder
FROM golang:1.23.4-bullseye as builder
RUN apt install ca-certificates gcc
WORKDIR /app
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.flyio
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.2-alpine as builder
FROM golang:1.23.4-alpine as builder
RUN apk --no-cache add ca-certificates
WORKDIR /app
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.validator
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

FROM --platform=$BUILDPLATFORM golang:1.22.2-alpine as builder
FROM --platform=$BUILDPLATFORM golang:1.23.4-alpine as builder
RUN apk --no-cache add ca-certificates git
WORKDIR /app
COPY . .
Expand Down
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ integration_dep_up:

integration_dep_down:
docker compose -f compose-integration.yaml down
docker compose -f compose-integration.yaml stop
docker compose -f compose-integration.yaml rm

clean:
-rm bin/*
Expand All @@ -195,6 +197,11 @@ certs:
openssl x509 -req -CA certs/ca.crt -CAkey certs/ca.key -in certs/node.csr -out certs/node.crt -days 365 -CAcreateserial -extfile dev/openssl.txt
# Create Client CA
go run ./cmd/pki/ca
# Generate pebble test cert
openssl ecparam -name prime256v1 -genkey -noout -out certs/pebble.key
openssl req -new -key certs/pebble.key -out certs/pebble.csr -subj "/CN=localhost" -addext "subjectAltName = DNS:localhost, DNS:pebble, IP:127.0.0.1"
openssl req -text -in certs/pebble.csr -noout -verify
openssl x509 -req -CA dev/pebble/certs/cert.pem -CAkey dev/pebble/certs/key.pem -in certs/pebble.csr -out certs/pebble.pem -days 365 -CAcreateserial -extfile dev/openssl.txt

fly_deploy:
flyctl deploy --build-arg GIT_HASH=$$(git rev-parse --short HEAD)
Expand Down
2 changes: 1 addition & 1 deletion acme/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"go.miragespace.co/specter/spec/tun"

"github.com/caddyserver/certmagic"
"github.com/mholt/acmez"
"github.com/mholt/acmez/v2"
"go.uber.org/zap"
)

Expand Down
4 changes: 2 additions & 2 deletions acme/solver.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"go.miragespace.co/specter/spec/chord"
"go.miragespace.co/specter/spec/tun"

"github.com/mholt/acmez"
"github.com/mholt/acmez/acme"
"github.com/mholt/acmez/v2"
"github.com/mholt/acmez/v2/acme"
)

type ChordSolver struct {
Expand Down
2 changes: 1 addition & 1 deletion acme/solver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"go.miragespace.co/specter/spec/protocol"
"go.miragespace.co/specter/spec/tun"

"github.com/mholt/acmez/acme"
"github.com/mholt/acmez/v2/acme"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
)
Expand Down
3 changes: 2 additions & 1 deletion compose-pebble.common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ services:
- PEBBLE_VA_NOSLEEP=1
- PEBBLE_VA_ALWAYS_VALID=1
volumes:
- ./dev/pebble:/pebble:ro
- ./dev/pebble:/pebble:ro
- ./certs:/certs:ro
20 changes: 0 additions & 20 deletions dev/pebble/certs/localhost/cert.pem

This file was deleted.

27 changes: 0 additions & 27 deletions dev/pebble/certs/localhost/key.pem

This file was deleted.

4 changes: 2 additions & 2 deletions dev/pebble/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"pebble": {
"listenAddress": "0.0.0.0:14000",
"managementListenAddress": "0.0.0.0:15000",
"certificate": "/pebble/certs/localhost/cert.pem",
"privateKey": "/pebble/certs/localhost/key.pem",
"certificate": "/certs/pebble.pem",
"privateKey": "/certs/pebble.key",
"httpPort": 5002,
"tlsPort": 5001,
"ocspResponderURL": "",
Expand Down
4 changes: 2 additions & 2 deletions gateway/gateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,12 @@ func New(conf GatewayConfig) *Gateway {
ErrorLog: util.GetStdLogger(filteredLogger, "h2Tunnel"),
}
g.quicApexServer = &http3.Server{
QuicConfig: qCfg,
QUICConfig: qCfg,
EnableDatagrams: false,
Handler: apex,
}
g.h3TunnelServer = &http3.Server{
QuicConfig: qCfg,
QUICConfig: qCfg,
EnableDatagrams: false,
Handler: proxyHandler,
}
Expand Down
88 changes: 45 additions & 43 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
module go.miragespace.co/specter

go 1.21
go 1.23.4

require (
github.com/Microsoft/go-winio v0.6.1
github.com/TheZeroSlave/zapsentry v1.22.1
github.com/Yiling-J/theine-go v0.3.2
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9
github.com/avast/retry-go/v4 v4.5.1
github.com/caddyserver/certmagic v0.20.0
github.com/Microsoft/go-winio v0.6.2
github.com/TheZeroSlave/zapsentry v1.23.0
github.com/Yiling-J/theine-go v0.6.0
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b
github.com/avast/retry-go/v4 v4.6.0
github.com/caddyserver/certmagic v0.21.4
github.com/dominikbraun/graph v0.23.0
github.com/getsentry/sentry-go v0.27.0
github.com/go-chi/chi/v5 v5.0.12
github.com/gorilla/websocket v1.5.1
github.com/getsentry/sentry-go v0.30.0
github.com/go-chi/chi/v5 v5.1.0
github.com/gorilla/websocket v1.5.3
github.com/iangudger/memnet v0.0.0-20220731214234-823edbed1e9d
github.com/jedib0t/go-pretty/v6 v6.5.6
github.com/jedib0t/go-pretty/v6 v6.6.4
github.com/libp2p/go-buffer-pool v0.1.0
github.com/libp2p/go-yamux/v4 v4.0.1
github.com/mholt/acmez v1.2.0
github.com/miekg/dns v1.1.58
github.com/mholt/acmez/v2 v2.0.3
github.com/miekg/dns v1.1.62
github.com/montanaflynn/stats v0.7.1
github.com/ncruces/go-dns v1.2.5
github.com/pires/go-proxyproto v0.7.0
github.com/pires/go-proxyproto v0.8.0
github.com/planetscale/vtprotobuf v0.6.0
github.com/quic-go/quic-go v0.42.0
github.com/sethvargo/go-diceware v0.3.0
github.com/stretchr/testify v1.9.0
github.com/tidwall/wal v1.1.7
github.com/quic-go/quic-go v0.48.2
github.com/sethvargo/go-diceware v0.4.0
github.com/stretchr/testify v1.10.0
github.com/tidwall/wal v1.1.8
github.com/twitchtv/twirp v8.1.3+incompatible
github.com/urfave/cli/v2 v2.27.1
github.com/urfave/cli/v2 v2.27.5
github.com/zeebo/xxh3 v1.0.2
github.com/zhangyunhao116/skipmap v0.10.1
github.com/zhangyunhao116/skipset v0.13.0
go.uber.org/atomic v1.11.0
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8
golang.org/x/net v0.23.0
golang.org/x/sync v0.6.0
golang.org/x/sys v0.18.0
google.golang.org/protobuf v1.33.0
golang.org/x/exp v0.0.0-20241210194714-1829a127f884
golang.org/x/net v0.32.0
golang.org/x/sync v0.10.0
golang.org/x/sys v0.28.0
google.golang.org/protobuf v1.35.2
gopkg.in/yaml.v3 v3.0.1
kon.nect.sh/httprate v0.7.3
moul.io/zapfilter v1.7.0
Expand All @@ -48,32 +48,34 @@ require (
replace gitub.com/iangudger/memnet v0.0.0-20220731214234-823edbed1e9d => github.com/miragespace/memnet v0.0.0-20240328231002-8045afef8f5b

require (
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/caddyserver/zerossl v0.1.3 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/gammazero/deque v0.2.1 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/google/pprof v0.0.0-20230131232505-5a9e8f65f08f // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/libdns/libdns v0.2.1 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/onsi/ginkgo/v2 v2.9.5 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/libdns/libdns v0.2.2 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/onsi/ginkgo/v2 v2.22.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/quic-go/qpack v0.4.0 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/quic-go/qpack v0.5.1 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/tidwall/gjson v1.14.4 // indirect
github.com/tidwall/gjson v1.18.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
github.com/tidwall/tinylru v1.2.1 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
github.com/zeebo/blake3 v0.2.3 // indirect
github.com/zhangyunhao116/fastrand v0.3.0 // indirect
go.uber.org/mock v0.4.0 // indirect
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
github.com/zeebo/blake3 v0.2.4 // indirect
github.com/zhangyunhao116/fastrand v0.5.0 // indirect
go.uber.org/mock v0.5.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/mod v0.16.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.19.0 // indirect
golang.org/x/crypto v0.30.0 // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/tools v0.28.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
)
Loading

0 comments on commit 44dcb32

Please sign in to comment.