diff --git a/build.assets/Dockerfile-grpcbox b/build.assets/Dockerfile-grpcbox index dcb558518d7f1..09972f9de5132 100644 --- a/build.assets/Dockerfile-grpcbox +++ b/build.assets/Dockerfile-grpcbox @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM docker.io/golang:1.22 +FROM docker.io/golang:1.23 # Image layers go from less likely to most likely to change. RUN apt-get update && \ diff --git a/build.assets/tooling/go.mod b/build.assets/tooling/go.mod index 14db47e7fa4c9..9df617af709bb 100644 --- a/build.assets/tooling/go.mod +++ b/build.assets/tooling/go.mod @@ -2,6 +2,8 @@ module github.com/gravitational/teleport/build.assets/tooling go 1.22.6 +toolchain go1.23.0 + require ( github.com/Masterminds/sprig/v3 v3.2.3 github.com/alecthomas/kingpin/v2 v2.3.2 // replaced diff --git a/build.assets/versions.mk b/build.assets/versions.mk index 9b23853ec6ad9..39fca72040d5a 100644 --- a/build.assets/versions.mk +++ b/build.assets/versions.mk @@ -3,7 +3,7 @@ # Keep versions in sync with devbox.json, when applicable. # Sync with devbox.json. -GOLANG_VERSION ?= go1.22.6 +GOLANG_VERSION ?= go1.23.0 GOLANGCI_LINT_VERSION ?= v1.60.1 NODE_VERSION ?= 20.14.0 diff --git a/go.mod b/go.mod index f244a90fc0899..5f862c43c6f71 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,8 @@ module github.com/gravitational/teleport go 1.22.6 +toolchain go1.23.0 + require ( cloud.google.com/go/cloudsqlconn v1.11.1 cloud.google.com/go/compute v1.27.4 @@ -152,6 +154,7 @@ require ( github.com/okta/okta-sdk-golang/v2 v2.20.0 github.com/opencontainers/go-digest v1.0.0 github.com/opensearch-project/opensearch-go/v2 v2.3.0 + github.com/parquet-go/parquet-go v0.23.0 github.com/pavlo-v-chernykh/keystore-go/v4 v4.5.0 github.com/pelletier/go-toml v1.9.5 github.com/pkg/sftp v1.13.6 @@ -164,7 +167,6 @@ require ( github.com/russellhaering/goxmldsig v1.4.0 github.com/schollz/progressbar/v3 v3.14.6 github.com/scim2/filter-parser/v2 v2.2.0 - github.com/segmentio/parquet-go v0.0.0-20230712180008-5d42db8f0d47 github.com/shirou/gopsutil/v4 v4.24.7 github.com/sigstore/cosign/v2 v2.3.0 github.com/sigstore/sigstore v1.8.7 diff --git a/go.sum b/go.sum index 2ce1cf3c8b441..98587d547be1f 100644 --- a/go.sum +++ b/go.sum @@ -1987,6 +1987,8 @@ github.com/opensearch-project/opensearch-go/v2 v2.3.0 h1:nQIEMr+A92CkhHrZgUhcfsr github.com/opensearch-project/opensearch-go/v2 v2.3.0/go.mod h1:8LDr9FCgUTVoT+5ESjc2+iaZuldqE+23Iq0r1XeNue8= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= +github.com/parquet-go/parquet-go v0.23.0 h1:dyEU5oiHCtbASyItMCD2tXtT2nPmoPbKpqf0+nnGrmk= +github.com/parquet-go/parquet-go v0.23.0/go.mod h1:MnwbUcFHU6uBYMymKAlPPAw9yh3kE1wWl6Gl1uLdkNk= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/name v1.0.1 h1:9lnXOHeqeHHnWLbKfH6X98+4+ETVqFqxN09UXSjcMb0= github.com/pascaldekloe/name v1.0.1/go.mod h1:Z//MfYJnH4jVpQ9wkclwu2I2MkHmXTlT9wR5UZScttM= @@ -2139,8 +2141,6 @@ github.com/segmentio/encoding v0.4.0 h1:MEBYvRqiUB2nfR2criEXWqwdY6HJOUrCn5hboVOV github.com/segmentio/encoding v0.4.0/go.mod h1:/d03Cd8PoaDeceuhUUUQWjU0KhWjrmYrWPgtJHYZSnI= github.com/segmentio/ksuid v1.0.4 h1:sBo2BdShXjmcugAMwjugoGUdUV0pcxY5mW4xKRn3v4c= github.com/segmentio/ksuid v1.0.4/go.mod h1:/XUiZBD3kVx5SmUOl55voK5yeAbBNNIed+2O73XgrPE= -github.com/segmentio/parquet-go v0.0.0-20230712180008-5d42db8f0d47 h1:5am1AKPVBj3ncaEsqsGQl/cvsW5mSrO9NSPqWWhH8OA= -github.com/segmentio/parquet-go v0.0.0-20230712180008-5d42db8f0d47/go.mod h1:+J0xQnJjm8DuQUHBO7t57EnmPbstT6+b45+p3DC9k1Q= github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/shabbyrobe/gocovmerge v0.0.0-20190829150210-3e036491d500/go.mod h1:+njLrG5wSeoG4Ds61rFgEzKvenR2UHbjMoDHsczxly0= diff --git a/integrations/event-handler/go.mod b/integrations/event-handler/go.mod index 1dcb22957eb46..dd34a67bf911a 100644 --- a/integrations/event-handler/go.mod +++ b/integrations/event-handler/go.mod @@ -2,6 +2,8 @@ module github.com/gravitational/teleport/integrations/event-handler go 1.22.6 +toolchain go1.23.0 + require ( github.com/alecthomas/kong v0.9.0 github.com/google/uuid v1.6.0 diff --git a/integrations/terraform/go.mod b/integrations/terraform/go.mod index 44a3d0eec43c3..14fea5ab39816 100644 --- a/integrations/terraform/go.mod +++ b/integrations/terraform/go.mod @@ -2,6 +2,8 @@ module github.com/gravitational/teleport/integrations/terraform go 1.22.6 +toolchain go1.23.0 + // Doc generation tooling require github.com/hashicorp/terraform-plugin-docs v0.0.0 // replaced diff --git a/integrations/terraform/go.sum b/integrations/terraform/go.sum index 4fa5642d7a2fe..039e8bd95d572 100644 --- a/integrations/terraform/go.sum +++ b/integrations/terraform/go.sum @@ -1703,6 +1703,8 @@ github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQ github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= github.com/opensearch-project/opensearch-go/v2 v2.3.0 h1:nQIEMr+A92CkhHrZgUhcfsrZjibvB3APXf2a1VwCmMQ= github.com/opensearch-project/opensearch-go/v2 v2.3.0/go.mod h1:8LDr9FCgUTVoT+5ESjc2+iaZuldqE+23Iq0r1XeNue8= +github.com/parquet-go/parquet-go v0.23.0 h1:dyEU5oiHCtbASyItMCD2tXtT2nPmoPbKpqf0+nnGrmk= +github.com/parquet-go/parquet-go v0.23.0/go.mod h1:MnwbUcFHU6uBYMymKAlPPAw9yh3kE1wWl6Gl1uLdkNk= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/name v1.0.1 h1:9lnXOHeqeHHnWLbKfH6X98+4+ETVqFqxN09UXSjcMb0= github.com/pascaldekloe/name v1.0.1/go.mod h1:Z//MfYJnH4jVpQ9wkclwu2I2MkHmXTlT9wR5UZScttM= @@ -1816,8 +1818,6 @@ github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= github.com/segmentio/encoding v0.4.0 h1:MEBYvRqiUB2nfR2criEXWqwdY6HJOUrCn5hboVOVmy8= github.com/segmentio/encoding v0.4.0/go.mod h1:/d03Cd8PoaDeceuhUUUQWjU0KhWjrmYrWPgtJHYZSnI= -github.com/segmentio/parquet-go v0.0.0-20230712180008-5d42db8f0d47 h1:5am1AKPVBj3ncaEsqsGQl/cvsW5mSrO9NSPqWWhH8OA= -github.com/segmentio/parquet-go v0.0.0-20230712180008-5d42db8f0d47/go.mod h1:+J0xQnJjm8DuQUHBO7t57EnmPbstT6+b45+p3DC9k1Q= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= diff --git a/lib/events/athena/consumer.go b/lib/events/athena/consumer.go index 46d0d31dfb583..d13f5018409c2 100644 --- a/lib/events/athena/consumer.go +++ b/lib/events/athena/consumer.go @@ -39,7 +39,7 @@ import ( sqsTypes "github.com/aws/aws-sdk-go-v2/service/sqs/types" "github.com/google/uuid" "github.com/gravitational/trace" - "github.com/segmentio/parquet-go" + "github.com/parquet-go/parquet-go" log "github.com/sirupsen/logrus" "github.com/gravitational/teleport" diff --git a/lib/events/athena/consumer_test.go b/lib/events/athena/consumer_test.go index 727814f4d59d0..1aa12c684fcc7 100644 --- a/lib/events/athena/consumer_test.go +++ b/lib/events/athena/consumer_test.go @@ -41,7 +41,7 @@ import ( "github.com/google/uuid" "github.com/gravitational/trace" "github.com/jonboulle/clockwork" - "github.com/segmentio/parquet-go" + "github.com/parquet-go/parquet-go" "github.com/stretchr/testify/require" "github.com/gravitational/teleport" diff --git a/lib/events/dynamoevents/dynamoevents_test.go b/lib/events/dynamoevents/dynamoevents_test.go index 4123be5064fa2..8a4080c7e44c3 100644 --- a/lib/events/dynamoevents/dynamoevents_test.go +++ b/lib/events/dynamoevents/dynamoevents_test.go @@ -597,7 +597,7 @@ func TestCustomEndpoint(t *testing.T) { t.Setenv("AWS_SECRET_KEY", "alpaca") mux := http.NewServeMux() - mux.HandleFunc("/*", func(w http.ResponseWriter, r *http.Request) { + mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusTeapot) }) srv := httptest.NewServer(mux) @@ -610,5 +610,5 @@ func TestCustomEndpoint(t *testing.T) { }) assert.Error(t, err) assert.Nil(t, b) - require.Contains(t, err.Error(), fmt.Sprintf("StatusCode: %d", http.StatusTeapot)) + require.ErrorContains(t, err, fmt.Sprintf("StatusCode: %d", http.StatusTeapot)) }