Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Teleterm: Define / Set AssumeStartTime fields #38480

Closed
wants to merge 7 commits into from
Closed

Teleterm: Define / Set AssumeStartTime fields #38480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ac1a368
Define start time fields for teleterm protos
kimlisa Feb 21, 2024
e11d99d
Set AssumeStartTime backend fields
kimlisa Feb 21, 2024
0d50dd1
Set AssumeStartTime frontend fields
kimlisa Feb 21, 2024
207c0ce
Create assume start time validating func
kimlisa Feb 21, 2024
255d1fc
Address CRs
kimlisa Feb 22, 2024
4bdd3e4
Remove extra client validation
kimlisa Feb 23, 2024
66c2592
Remove zero time checking
kimlisa Feb 23, 2024
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
22 changes: 22 additions & 0 deletions api/types/access_request_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ package types

import (
"testing"
"time"

"github.com/gravitational/trace"
"github.com/jonboulle/clockwork"
"github.com/stretchr/testify/require"
)

Expand All @@ -27,3 +30,22 @@ func TestAssertAccessRequestImplementsResourceWithLabels(t *testing.T) {
require.NoError(t, err)
require.Implements(t, (*ResourceWithLabels)(nil), ar)
}

func TestValidateAssumeStartTime(t *testing.T) {
clock := clockwork.NewFakeClock()

// Too far in the future.
invalidStartTime := clock.Now().UTC().Add(1000000 * time.Hour)
err := ValidateAssumeStartTime(invalidStartTime)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know where this function comes from, but shouldn't it accept the clock as an argument? In Go we cannot (shouldn't?) mock the system clock like in Jest. Most of the code that I saw that uses the clockwork package accepts the clock from outside so that tests can pass a fake clock. See lib/utils.VerifyCertificateExpiry for an example.

require.True(t, trace.IsBadParameter(err), "expected bad parameter, got %v", err)

// Valid Zero time.
validTime := time.Time{}
err = ValidateAssumeStartTime(validTime)
require.Empty(t, err)

// Valid time.
validTime = clock.Now().UTC().Add(1 * time.Hour)
err = ValidateAssumeStartTime(validTime)
require.Empty(t, err)
}
89 changes: 60 additions & 29 deletions gen/proto/go/teleport/lib/teleterm/v1/access_request.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading