Skip to content
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
5 changes: 1 addition & 4 deletions .github/workflows/build-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,5 @@ jobs:
go-version-file: api/go.mod
cache-dependency-path: api/go.sum

- name: Init workspace
run: go work init . ./api/

- name: Build
run: go build ./api/...
run: cd api; go build ./...
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ output:
uniq-by-line: false

run:
go: '1.20'
go: '1.21'
build-tags: []
skip-dirs:
- (^|/)node_modules/
Expand Down
2 changes: 1 addition & 1 deletion build.assets/Dockerfile-grpcbox
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

FROM docker.io/golang:1.20
FROM docker.io/golang:1.21

# Image layers go from less likely to most likely to change.
RUN apt-get update && \
Expand Down
2 changes: 1 addition & 1 deletion build.assets/versions.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Keep all tool versions in one place.
# This file can be included in other Makefiles to avoid duplication.

GOLANG_VERSION ?= go1.20.13
GOLANG_VERSION ?= go1.21.6

NODE_VERSION ?= 18.18.2

Expand Down
2 changes: 1 addition & 1 deletion docs/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -1925,7 +1925,7 @@
"teleport": {
"major_version": "13",
"version": "13.4.15",
"golang": "1.20",
"golang": "1.21",
"plugin": {
"version": "13.4.15"
},
Expand Down
2 changes: 1 addition & 1 deletion e
Submodule e updated from da595f to 8fb7e7
6 changes: 3 additions & 3 deletions lib/auth/tls_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ func TestAutoRotation(t *testing.T) {
// this is not going to be a problem in real teleport
// as it reloads the full server after reload
_, err = tt.server.CloneClient(proxy).GetNodes(ctx, apidefaults.Namespace)
require.ErrorContains(t, err, "bad certificate")
require.ErrorContains(t, err, "certificate")

// new clients work
_, err = tt.server.CloneClient(newProxy).GetNodes(ctx, apidefaults.Namespace)
Expand Down Expand Up @@ -617,7 +617,7 @@ func TestManualRotation(t *testing.T) {
// this is not going to be a problem in real teleport
// as it reloads the full server after reload
_, err = tt.server.CloneClient(proxy).GetNodes(ctx, apidefaults.Namespace)
require.ErrorContains(t, err, "bad certificate")
require.ErrorContains(t, err, "certificate")

// new clients work
_, err = tt.server.CloneClient(newProxy).GetNodes(ctx, apidefaults.Namespace)
Expand Down Expand Up @@ -712,7 +712,7 @@ func TestRollback(t *testing.T) {

// clients with new creds will no longer work
_, err = tt.server.CloneClient(newProxy).GetNodes(ctx, apidefaults.Namespace)
require.ErrorContains(t, err, "bad certificate")
require.ErrorContains(t, err, "certificate")

// clients with old creds will still work
_, err = tt.server.CloneClient(proxy).GetNodes(ctx, apidefaults.Namespace)
Expand Down
4 changes: 2 additions & 2 deletions lib/teleterm/teleterm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func TestStart(t *testing.T) {
return &tls.Config{InsecureSkipVerify: true}
},
connReadExpectationFunc: func(t *testing.T, connReadErr error) {
require.ErrorContains(t, connReadErr, "tls: bad certificate")
require.ErrorContains(t, connReadErr, "tls:")
},
},
{
Expand All @@ -94,7 +94,7 @@ func TestStart(t *testing.T) {
return &tls.Config{InsecureSkipVerify: true}
},
connReadExpectationFunc: func(t *testing.T, connReadErr error) {
require.ErrorContains(t, connReadErr, "tls: bad certificate")
require.ErrorContains(t, connReadErr, "tls:")
},
},
}
Expand Down