Merge branch 'master' into tcsc/tctl-edit-aws-ic

Author: tcsc

.golangci.yml

@@ -166,6 +166,7 @@ linters-settings:
           - '!**/lib/services/suite/**'
           - '!**/lib/srv/mock.go'
           - '!**/lib/srv/db/redis/test.go'
+          - '!**/lib/tbot/workloadidentity/workloadattest/podman/test_server.go'
           - '!**/lib/teleterm/gatewaytest/**'
           - '!**/lib/utils/testhelpers.go'
           - '!**/lib/utils/testutils/**'
@@ -251,6 +252,7 @@ linters-settings:
           - '!**/lib/services/suite/**'
           - '!**/lib/srv/mock.go'
           - '!**/lib/srv/db/redis/test.go'
+          - '!**/lib/tbot/workloadidentity/workloadattest/podman/test_server.go'
           - '!**/lib/teleterm/gatewaytest/**'
           - '!**/lib/utils/cli.go'
           - '!**/lib/utils/testhelpers.go'

api/client/client.go

@@ -890,6 +890,12 @@ func (c *Client) WorkloadIdentityResourceServiceClient() workloadidentityv1pb.Wo
 	return workloadidentityv1pb.NewWorkloadIdentityResourceServiceClient(c.conn)
 }
 
+// WorkloadIdentityRevocationServiceClient returns an unadorned client for the
+// workload identity revocation service.
+func (c *Client) WorkloadIdentityRevocationServiceClient() workloadidentityv1pb.WorkloadIdentityRevocationServiceClient {
+	return workloadidentityv1pb.NewWorkloadIdentityRevocationServiceClient(c.conn)
+}
+
 // WorkloadIdentityIssuanceClient returns an unadorned client for the workload
 // identity service.
 func (c *Client) WorkloadIdentityIssuanceClient() workloadidentityv1pb.WorkloadIdentityIssuanceServiceClient {

api/client/usertask/usertask.go

@@ -35,24 +35,11 @@ func NewClient(grpcClient usertaskv1.UserTaskServiceClient) *Client {
 }
 
 // ListUserTasks returns a list of User Tasks.
-func (c *Client) ListUserTasks(ctx context.Context, pageSize int64, nextToken string) ([]*usertaskv1.UserTask, string, error) {
+func (c *Client) ListUserTasks(ctx context.Context, pageSize int64, nextToken string, filters *usertaskv1.ListUserTasksFilters) ([]*usertaskv1.UserTask, string, error) {
 	resp, err := c.grpcClient.ListUserTasks(ctx, &usertaskv1.ListUserTasksRequest{
 		PageSize:  pageSize,
 		PageToken: nextToken,
-	})
-	if err != nil {
-		return nil, "", trace.Wrap(err)
-	}
-
-	return resp.UserTasks, resp.NextPageToken, nil
-}
-
-// ListUserTasksByIntegration returns a list of User Tasks filtered by an integration.
-func (c *Client) ListUserTasksByIntegration(ctx context.Context, pageSize int64, nextToken string, integration string) ([]*usertaskv1.UserTask, string, error) {
-	resp, err := c.grpcClient.ListUserTasksByIntegration(ctx, &usertaskv1.ListUserTasksByIntegrationRequest{
-		PageSize:    pageSize,
-		PageToken:   nextToken,
-		Integration: integration,
+		Filters:   filters,
 	})
 	if err != nil {
 		return nil, "", trace.Wrap(err)