From b884781076bd6fac83ea3c52f93ad3e708efb6d5 Mon Sep 17 00:00:00 2001 From: Grzegorz Zdunek Date: Wed, 9 Oct 2024 14:06:53 +0200 Subject: [PATCH] Lint and test fixes --- api/utils/keys/yubikey_common.go | 4 ++-- integration/proxy/teleterm_test.go | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/api/utils/keys/yubikey_common.go b/api/utils/keys/yubikey_common.go index ccda8577f9cc..78ffd1f86c91 100644 --- a/api/utils/keys/yubikey_common.go +++ b/api/utils/keys/yubikey_common.go @@ -38,10 +38,10 @@ type HardwareKeyPrompt interface { // PINAndPUK describes a response returned from HardwareKeyPrompt.ChangePIN. type PINAndPUK struct { // New PIN set by the user. - PIN string + PIN string // PUK used to change the PIN. // This is a new PUK if it has not been changed (from the default PUK). - PUK string + PUK string // PUKChanged is true if the user changed the default PUK. PUKChanged bool } diff --git a/integration/proxy/teleterm_test.go b/integration/proxy/teleterm_test.go index e6172b0e3e66..67feeda87944 100644 --- a/integration/proxy/teleterm_test.go +++ b/integration/proxy/teleterm_test.go @@ -38,6 +38,7 @@ import ( "github.com/gravitational/teleport/api/client/proto" "github.com/gravitational/teleport/api/constants" "github.com/gravitational/teleport/api/types" + "github.com/gravitational/teleport/api/utils/keys" api "github.com/gravitational/teleport/gen/proto/go/teleport/lib/teleterm/v1" "github.com/gravitational/teleport/integration/appaccess" dbhelpers "github.com/gravitational/teleport/integration/db" @@ -240,6 +241,9 @@ func testGatewayCertRenewal(ctx context.Context, t *testing.T, params gatewayCer // db cert has expired. Clock: fakeClock, WebauthnLogin: webauthnLogin, + HardwareKeyPromptConstructor: func(rootClusterURI uri.ResourceURI) keys.HardwareKeyPrompt { + return nil + }, }) require.NoError(t, err)