Add promoted access list title to teleterm access request (#32717)

gravitational · Sep 29, 2023 · b9df6c6 · b9df6c6
1 parent 987c78e
commit b9df6c6
Show file tree

Hide file tree

Showing 5 changed files with 166 additions and 62 deletions.
diff --git a/gen/proto/go/teleport/lib/teleterm/v1/access_request.pb.go b/gen/proto/go/teleport/lib/teleterm/v1/access_request.pb.go
diff --git a/gen/proto/js/teleport/lib/teleterm/v1/access_request_pb.d.ts b/gen/proto/js/teleport/lib/teleterm/v1/access_request_pb.d.ts
diff --git a/gen/proto/js/teleport/lib/teleterm/v1/access_request_pb.js b/gen/proto/js/teleport/lib/teleterm/v1/access_request_pb.js
diff --git a/lib/teleterm/apiserver/handler/handler_access_requests.go b/lib/teleterm/apiserver/handler/handler_access_requests.go
@@ -111,11 +111,12 @@ func newAPIAccessRequest(req clusters.AccessRequest) *api.AccessRequest {
 	requestReviews := req.GetReviews()
 	for _, rev := range requestReviews {
 		reviews = append(reviews, &api.AccessRequestReview{
-			Author:  rev.Author,
-			Roles:   rev.Roles,
-			State:   rev.ProposedState.String(),
-			Reason:  rev.Reason,
-			Created: timestamppb.New(rev.Created),
+			Author:                  rev.Author,
+			Roles:                   rev.Roles,
+			State:                   rev.ProposedState.String(),
+			Reason:                  rev.Reason,
+			Created:                 timestamppb.New(rev.Created),
+			PromotedAccessListTitle: rev.GetAccessListTitle(),
 		})
 	}
 
@@ -153,19 +154,20 @@ func newAPIAccessRequest(req clusters.AccessRequest) *api.AccessRequest {
 	}
 
 	return &api.AccessRequest{
-		Id:                 req.GetName(),
-		State:              req.GetState().String(),
-		ResolveReason:      req.GetResolveReason(),
-		RequestReason:      req.GetRequestReason(),
-		User:               req.GetUser(),
-		Roles:              req.GetRoles(),
-		Created:            timestamppb.New(req.GetCreationTime()),
-		Expires:            timestamppb.New(req.GetAccessExpiry()),
-		Reviews:            reviews,
-		SuggestedReviewers: req.GetSuggestedReviewers(),
-		ThresholdNames:     thresholdNames,
-		ResourceIds:        requestedResourceIDs,
-		Resources:          resources,
+		Id:                      req.GetName(),
+		State:                   req.GetState().String(),
+		ResolveReason:           req.GetResolveReason(),
+		RequestReason:           req.GetRequestReason(),
+		User:                    req.GetUser(),
+		Roles:                   req.GetRoles(),
+		Created:                 timestamppb.New(req.GetCreationTime()),
+		Expires:                 timestamppb.New(req.GetAccessExpiry()),
+		Reviews:                 reviews,
+		SuggestedReviewers:      req.GetSuggestedReviewers(),
+		ThresholdNames:          thresholdNames,
+		ResourceIds:             requestedResourceIDs,
+		Resources:               resources,
+		PromotedAccessListTitle: req.GetPromotedAccessListTitle(),
 	}
 }