From c3a63e387340b214e5a3aefb2afb34d9c0c3737f Mon Sep 17 00:00:00 2001 From: Chris Thach Date: Thu, 9 Oct 2025 10:12:12 -0400 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20Bump=20Go=20to=201.25.2=20?= =?UTF-8?q?=E2=AC=86=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Chris Thach --- api/go.mod | 2 +- assets/backport/go.mod | 2 +- build.assets/Dockerfile-grpcbox | 10 +++++----- build.assets/tooling/go.mod | 2 +- build.assets/versions.mk | 2 +- examples/access-plugin-minimal/go.mod | 2 +- examples/api-sync-roles/go.mod | 2 +- examples/desktop-registration/go.mod | 2 +- examples/go-client/go.mod | 2 +- examples/service-discovery-api-client/go.mod | 2 +- examples/teleport-usage/go.mod | 2 +- go.mod | 2 +- integrations/event-handler/go.mod | 2 +- integrations/terraform-mwi/go.mod | 2 +- integrations/terraform/go.mod | 2 +- lib/service/service.go | 9 ++++++++- lib/teleterm/daemon/daemon_test.go | 1 + 17 files changed, 28 insertions(+), 20 deletions(-) diff --git a/api/go.mod b/api/go.mod index 81bc0f56b97a2..bb756a5ca0fd4 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/gravitational/teleport/api -go 1.25.1 +go 1.25.2 require ( github.com/charlievieth/strcase v0.0.5 diff --git a/assets/backport/go.mod b/assets/backport/go.mod index 951dc026d5467..1cb64485d7c3b 100644 --- a/assets/backport/go.mod +++ b/assets/backport/go.mod @@ -1,6 +1,6 @@ module github.com/teleport/assets/backport -go 1.25.1 +go 1.25.2 require ( github.com/google/go-github/v41 v41.0.0 diff --git a/build.assets/Dockerfile-grpcbox b/build.assets/Dockerfile-grpcbox index e0af179b19113..01c2def23b4c4 100644 --- a/build.assets/Dockerfile-grpcbox +++ b/build.assets/Dockerfile-grpcbox @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM docker.io/golang:1.25.1 +FROM docker.io/golang:1.25.2 # Image layers go from less likely to most likely to change. RUN apt-get update && \ @@ -47,7 +47,7 @@ RUN \ go -C /tooling-tmp run -exec true ./cmd/buf-plugin-linters && \ rm -rf /tooling-tmp - ARG UID - ARG GID - RUN mkdir -p /.cache /.npm && \ - chown -R $UID:$GID /.cache /.npm /go/pkg/mod/ +ARG UID +ARG GID +RUN mkdir -p /.cache /.npm && \ + chown -R $UID:$GID /.cache /.npm /go/pkg/mod/ diff --git a/build.assets/tooling/go.mod b/build.assets/tooling/go.mod index ad6a6f5f99b5b..78e16217b8c70 100644 --- a/build.assets/tooling/go.mod +++ b/build.assets/tooling/go.mod @@ -1,6 +1,6 @@ module github.com/gravitational/teleport/build.assets/tooling -go 1.25.1 +go 1.25.2 require ( buf.build/go/bufplugin v0.9.0 diff --git a/build.assets/versions.mk b/build.assets/versions.mk index 7acbe48fd9641..30199cad27ac3 100644 --- a/build.assets/versions.mk +++ b/build.assets/versions.mk @@ -2,7 +2,7 @@ # This file can be included in other Makefiles to avoid duplication. # Sync with devbox.json. -GOLANG_VERSION ?= go1.25.1 +GOLANG_VERSION ?= go1.25.2 GOLANGCI_LINT_VERSION ?= v2.4.0 # NOTE: Remember to update engines.node in package.json to match the major version. diff --git a/examples/access-plugin-minimal/go.mod b/examples/access-plugin-minimal/go.mod index 0c6a76d4d7fd8..4c13459dc3330 100644 --- a/examples/access-plugin-minimal/go.mod +++ b/examples/access-plugin-minimal/go.mod @@ -1,6 +1,6 @@ module teleport-sheets -go 1.25.1 +go 1.25.2 require ( github.com/gravitational/teleport/api v0.0.0-20250813020053-3df242da2a4a diff --git a/examples/api-sync-roles/go.mod b/examples/api-sync-roles/go.mod index 38f4c69e5f507..982bb5cbe7360 100644 --- a/examples/api-sync-roles/go.mod +++ b/examples/api-sync-roles/go.mod @@ -1,6 +1,6 @@ module sync-roles -go 1.25.1 +go 1.25.2 require ( github.com/gravitational/teleport/api v0.0.0-20250813020053-3df242da2a4a diff --git a/examples/desktop-registration/go.mod b/examples/desktop-registration/go.mod index 009b2a33b9e82..a4a642617baac 100644 --- a/examples/desktop-registration/go.mod +++ b/examples/desktop-registration/go.mod @@ -1,6 +1,6 @@ module teleport-desktop-registration -go 1.25.1 +go 1.25.2 require github.com/gravitational/teleport/api v0.0.0-20250813020053-3df242da2a4a diff --git a/examples/go-client/go.mod b/examples/go-client/go.mod index 98c8a9abe01a6..69b369adc4363 100644 --- a/examples/go-client/go.mod +++ b/examples/go-client/go.mod @@ -1,6 +1,6 @@ module go-client -go 1.25.1 +go 1.25.2 require github.com/gravitational/teleport/api v0.0.0-20250813020053-3df242da2a4a diff --git a/examples/service-discovery-api-client/go.mod b/examples/service-discovery-api-client/go.mod index 02a620e1c144a..e4aad64ab4774 100644 --- a/examples/service-discovery-api-client/go.mod +++ b/examples/service-discovery-api-client/go.mod @@ -1,6 +1,6 @@ module register-app-service -go 1.25.1 +go 1.25.2 require ( github.com/docker/docker v28.3.3+incompatible diff --git a/examples/teleport-usage/go.mod b/examples/teleport-usage/go.mod index 9076dabc4e184..5cdd4005197fa 100644 --- a/examples/teleport-usage/go.mod +++ b/examples/teleport-usage/go.mod @@ -1,6 +1,6 @@ module usage-script -go 1.25.1 +go 1.25.2 require ( github.com/aws/aws-sdk-go-v2 v1.38.0 diff --git a/go.mod b/go.mod index 4973d572d982b..7c9e1cd16e78f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/gravitational/teleport -go 1.25.1 +go 1.25.2 ignore ( ./build diff --git a/integrations/event-handler/go.mod b/integrations/event-handler/go.mod index d254c6264677a..433cd1d41ef06 100644 --- a/integrations/event-handler/go.mod +++ b/integrations/event-handler/go.mod @@ -1,6 +1,6 @@ module github.com/gravitational/teleport/integrations/event-handler -go 1.25.1 +go 1.25.2 require ( github.com/alecthomas/kong v1.12.1 diff --git a/integrations/terraform-mwi/go.mod b/integrations/terraform-mwi/go.mod index 1572222ed099d..6b29a0865fe38 100644 --- a/integrations/terraform-mwi/go.mod +++ b/integrations/terraform-mwi/go.mod @@ -1,6 +1,6 @@ module github.com/gravitational/teleport/integrations/terraform-mwi -go 1.25.1 +go 1.25.2 require ( github.com/gravitational/teleport v0.0.0-00010101000000-000000000000 diff --git a/integrations/terraform/go.mod b/integrations/terraform/go.mod index 36afba354815e..2603161d402ef 100644 --- a/integrations/terraform/go.mod +++ b/integrations/terraform/go.mod @@ -1,6 +1,6 @@ module github.com/gravitational/teleport/integrations/terraform -go 1.25.1 +go 1.25.2 // TF provider dependencies require ( diff --git a/lib/service/service.go b/lib/service/service.go index d90e18a0ff631..04f74bbe0d7de 100644 --- a/lib/service/service.go +++ b/lib/service/service.go @@ -6979,7 +6979,11 @@ func initSelfSignedHTTPSCert(cfg *servicecfg.Config) (err error) { } cfg.Logger.WarnContext(ctx, "Generating self-signed key and cert.", "key_path", keyPath, "cert_path", certPath) - hosts := []string{cfg.Hostname, "localhost"} + hosts := []string{"localhost"} + if cfg.Hostname != "" { + hosts = append(hosts, cfg.Hostname) + } + var ips []string // add web public address hosts to self-signed cert @@ -6990,6 +6994,9 @@ func initSelfSignedHTTPSCert(cfg *servicecfg.Config) (err error) { cfg.Logger.WarnContext(ctx, "Error parsing proxy.public_address, skipping adding to self-signed cert", "public_address", addr.String(), "error", err) continue } + if proxyHost == "" { + continue + } // If the address is a IP have it added as IP SAN if ip := net.ParseIP(proxyHost); ip != nil { ips = append(ips, proxyHost) diff --git a/lib/teleterm/daemon/daemon_test.go b/lib/teleterm/daemon/daemon_test.go index 21ef638fd4331..8f26933f9c705 100644 --- a/lib/teleterm/daemon/daemon_test.go +++ b/lib/teleterm/daemon/daemon_test.go @@ -91,6 +91,7 @@ func (m *mockGatewayCreator) CreateGateway(ctx context.Context, params clusters. WebProxyAddr: hs.Listener.Addr().String(), TCPPortAllocator: m.tcpPortAllocator, KubeconfigsDir: m.t.TempDir(), + ClusterName: "test-cluster", // Required to generate valid DNS SANs in cert. Cert: gatewaytest.MustGenCertSignedWithCA(m.t, ca, identity), } From c5e17b39ea13d25b2d9352d4980d4af7f9a7036e Mon Sep 17 00:00:00 2001 From: Chris Thach Date: Tue, 14 Oct 2025 09:12:26 -0400 Subject: [PATCH 2/2] fix: Bump to Go 1.25.3. Revert handling of breaking changes. Signed-off-by: Chris Thach --- api/go.mod | 2 +- assets/backport/go.mod | 2 +- build.assets/Dockerfile-grpcbox | 2 +- build.assets/tooling/go.mod | 2 +- build.assets/versions.mk | 2 +- examples/access-plugin-minimal/go.mod | 2 +- examples/api-sync-roles/go.mod | 2 +- examples/desktop-registration/go.mod | 2 +- examples/go-client/go.mod | 2 +- examples/service-discovery-api-client/go.mod | 2 +- examples/teleport-usage/go.mod | 2 +- go.mod | 2 +- integrations/event-handler/go.mod | 2 +- integrations/terraform-mwi/go.mod | 2 +- integrations/terraform/go.mod | 2 +- lib/service/service.go | 9 +-------- lib/teleterm/daemon/daemon_test.go | 1 - 17 files changed, 16 insertions(+), 24 deletions(-) diff --git a/api/go.mod b/api/go.mod index bb756a5ca0fd4..8b976127275f8 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/gravitational/teleport/api -go 1.25.2 +go 1.25.3 require ( github.com/charlievieth/strcase v0.0.5 diff --git a/assets/backport/go.mod b/assets/backport/go.mod index 1cb64485d7c3b..bf9f0429e7d88 100644 --- a/assets/backport/go.mod +++ b/assets/backport/go.mod @@ -1,6 +1,6 @@ module github.com/teleport/assets/backport -go 1.25.2 +go 1.25.3 require ( github.com/google/go-github/v41 v41.0.0 diff --git a/build.assets/Dockerfile-grpcbox b/build.assets/Dockerfile-grpcbox index 01c2def23b4c4..c28c2abee84b8 100644 --- a/build.assets/Dockerfile-grpcbox +++ b/build.assets/Dockerfile-grpcbox @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM docker.io/golang:1.25.2 +FROM docker.io/golang:1.25.3 # 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 78e16217b8c70..f4036424a6a76 100644 --- a/build.assets/tooling/go.mod +++ b/build.assets/tooling/go.mod @@ -1,6 +1,6 @@ module github.com/gravitational/teleport/build.assets/tooling -go 1.25.2 +go 1.25.3 require ( buf.build/go/bufplugin v0.9.0 diff --git a/build.assets/versions.mk b/build.assets/versions.mk index 30199cad27ac3..362ea722f08d4 100644 --- a/build.assets/versions.mk +++ b/build.assets/versions.mk @@ -2,7 +2,7 @@ # This file can be included in other Makefiles to avoid duplication. # Sync with devbox.json. -GOLANG_VERSION ?= go1.25.2 +GOLANG_VERSION ?= go1.25.3 GOLANGCI_LINT_VERSION ?= v2.4.0 # NOTE: Remember to update engines.node in package.json to match the major version. diff --git a/examples/access-plugin-minimal/go.mod b/examples/access-plugin-minimal/go.mod index 4c13459dc3330..4b7a3b4a50e47 100644 --- a/examples/access-plugin-minimal/go.mod +++ b/examples/access-plugin-minimal/go.mod @@ -1,6 +1,6 @@ module teleport-sheets -go 1.25.2 +go 1.25.3 require ( github.com/gravitational/teleport/api v0.0.0-20250813020053-3df242da2a4a diff --git a/examples/api-sync-roles/go.mod b/examples/api-sync-roles/go.mod index 982bb5cbe7360..cc1a7450703c5 100644 --- a/examples/api-sync-roles/go.mod +++ b/examples/api-sync-roles/go.mod @@ -1,6 +1,6 @@ module sync-roles -go 1.25.2 +go 1.25.3 require ( github.com/gravitational/teleport/api v0.0.0-20250813020053-3df242da2a4a diff --git a/examples/desktop-registration/go.mod b/examples/desktop-registration/go.mod index a4a642617baac..2731f0263fa6f 100644 --- a/examples/desktop-registration/go.mod +++ b/examples/desktop-registration/go.mod @@ -1,6 +1,6 @@ module teleport-desktop-registration -go 1.25.2 +go 1.25.3 require github.com/gravitational/teleport/api v0.0.0-20250813020053-3df242da2a4a diff --git a/examples/go-client/go.mod b/examples/go-client/go.mod index 69b369adc4363..a3edaff31fe44 100644 --- a/examples/go-client/go.mod +++ b/examples/go-client/go.mod @@ -1,6 +1,6 @@ module go-client -go 1.25.2 +go 1.25.3 require github.com/gravitational/teleport/api v0.0.0-20250813020053-3df242da2a4a diff --git a/examples/service-discovery-api-client/go.mod b/examples/service-discovery-api-client/go.mod index e4aad64ab4774..edb08cbdb8063 100644 --- a/examples/service-discovery-api-client/go.mod +++ b/examples/service-discovery-api-client/go.mod @@ -1,6 +1,6 @@ module register-app-service -go 1.25.2 +go 1.25.3 require ( github.com/docker/docker v28.3.3+incompatible diff --git a/examples/teleport-usage/go.mod b/examples/teleport-usage/go.mod index 5cdd4005197fa..cd6a06056372f 100644 --- a/examples/teleport-usage/go.mod +++ b/examples/teleport-usage/go.mod @@ -1,6 +1,6 @@ module usage-script -go 1.25.2 +go 1.25.3 require ( github.com/aws/aws-sdk-go-v2 v1.38.0 diff --git a/go.mod b/go.mod index 7c9e1cd16e78f..ca934fd1ca139 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/gravitational/teleport -go 1.25.2 +go 1.25.3 ignore ( ./build diff --git a/integrations/event-handler/go.mod b/integrations/event-handler/go.mod index 433cd1d41ef06..cae549f3189b0 100644 --- a/integrations/event-handler/go.mod +++ b/integrations/event-handler/go.mod @@ -1,6 +1,6 @@ module github.com/gravitational/teleport/integrations/event-handler -go 1.25.2 +go 1.25.3 require ( github.com/alecthomas/kong v1.12.1 diff --git a/integrations/terraform-mwi/go.mod b/integrations/terraform-mwi/go.mod index 6b29a0865fe38..759074716dd91 100644 --- a/integrations/terraform-mwi/go.mod +++ b/integrations/terraform-mwi/go.mod @@ -1,6 +1,6 @@ module github.com/gravitational/teleport/integrations/terraform-mwi -go 1.25.2 +go 1.25.3 require ( github.com/gravitational/teleport v0.0.0-00010101000000-000000000000 diff --git a/integrations/terraform/go.mod b/integrations/terraform/go.mod index 2603161d402ef..87f287ec6c9f5 100644 --- a/integrations/terraform/go.mod +++ b/integrations/terraform/go.mod @@ -1,6 +1,6 @@ module github.com/gravitational/teleport/integrations/terraform -go 1.25.2 +go 1.25.3 // TF provider dependencies require ( diff --git a/lib/service/service.go b/lib/service/service.go index 04f74bbe0d7de..d90e18a0ff631 100644 --- a/lib/service/service.go +++ b/lib/service/service.go @@ -6979,11 +6979,7 @@ func initSelfSignedHTTPSCert(cfg *servicecfg.Config) (err error) { } cfg.Logger.WarnContext(ctx, "Generating self-signed key and cert.", "key_path", keyPath, "cert_path", certPath) - hosts := []string{"localhost"} - if cfg.Hostname != "" { - hosts = append(hosts, cfg.Hostname) - } - + hosts := []string{cfg.Hostname, "localhost"} var ips []string // add web public address hosts to self-signed cert @@ -6994,9 +6990,6 @@ func initSelfSignedHTTPSCert(cfg *servicecfg.Config) (err error) { cfg.Logger.WarnContext(ctx, "Error parsing proxy.public_address, skipping adding to self-signed cert", "public_address", addr.String(), "error", err) continue } - if proxyHost == "" { - continue - } // If the address is a IP have it added as IP SAN if ip := net.ParseIP(proxyHost); ip != nil { ips = append(ips, proxyHost) diff --git a/lib/teleterm/daemon/daemon_test.go b/lib/teleterm/daemon/daemon_test.go index 8f26933f9c705..21ef638fd4331 100644 --- a/lib/teleterm/daemon/daemon_test.go +++ b/lib/teleterm/daemon/daemon_test.go @@ -91,7 +91,6 @@ func (m *mockGatewayCreator) CreateGateway(ctx context.Context, params clusters. WebProxyAddr: hs.Listener.Addr().String(), TCPPortAllocator: m.tcpPortAllocator, KubeconfigsDir: m.t.TempDir(), - ClusterName: "test-cluster", // Required to generate valid DNS SANs in cert. Cert: gatewaytest.MustGenCertSignedWithCA(m.t, ca, identity), }