Skip to content

Commit 57d1799

Browse files
marcoandredinisgithub-actions
authored and
github-actions
committed
use admin client instead of backend directly
1 parent 46a4661 commit 57d1799

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

lib/auth/usertasks/usertasksv1/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ func (s *Service) updateStatus(ut *usertasksv1.UserTask, existing *usertasksv1.U
354354

355355
if existing != nil {
356356
// Inherit everything from existing UserTask.
357-
ut.Status.LastStateChange = cmp.Or(existing.Status.LastStateChange, ut.Status.LastStateChange)
357+
ut.Status.LastStateChange = cmp.Or(existing.GetStatus().GetLastStateChange(), ut.Status.LastStateChange)
358358

359359
// Update specific values.
360360
if existing.GetSpec().GetState() != ut.GetSpec().GetState() {

lib/web/usertasks_test.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
usertasksv1 "github.com/gravitational/teleport/api/gen/proto/go/teleport/usertasks/v1"
3232
"github.com/gravitational/teleport/api/types"
3333
"github.com/gravitational/teleport/api/types/usertasks"
34+
"github.com/gravitational/teleport/lib/auth"
3435
"github.com/gravitational/teleport/lib/services"
3536
"github.com/gravitational/teleport/lib/web/ui"
3637
)
@@ -53,6 +54,8 @@ func TestUserTask(t *testing.T) {
5354
})
5455
require.NoError(t, err)
5556
pack := env.proxies[0].authPack(t, userWithRW, []types.Role{roleRWUserTask})
57+
adminClient, err := env.server.NewClient(auth.TestAdmin())
58+
require.NoError(t, err)
5659

5760
getAllEndpoint := pack.clt.Endpoint("webapi", "sites", clusterName, "usertask")
5861
singleItemEndpoint := func(name string) string {
@@ -90,7 +93,7 @@ func TestUserTask(t *testing.T) {
9093
})
9194
require.NoError(t, err)
9295

93-
_, err = env.proxies[0].auth.Auth().CreateUserTask(ctx, userTask)
96+
_, err = adminClient.UserTasksServiceClient().CreateUserTask(ctx, userTask)
9497
require.NoError(t, err)
9598
userTaskForTest = userTask
9699
}

0 commit comments

Comments
 (0)