[v15] Teleterm: add new access request fields (#39050)

lib/teleterm/apiserver/handler/handler_access_requests.go

@@ -163,6 +163,7 @@ func newAPIAccessRequest(req clusters.AccessRequest) *api.AccessRequest {
 			Reason:                  rev.Reason,
 			Created:                 timestamppb.New(rev.Created),
 			PromotedAccessListTitle: rev.GetAccessListTitle(),
+			AssumeStartTime:         getProtoTimestamp(rev.AssumeStartTime),
 		})
 	}
 
@@ -214,6 +215,10 @@ func newAPIAccessRequest(req clusters.AccessRequest) *api.AccessRequest {
 		ResourceIds:             requestedResourceIDs,
 		Resources:               resources,
 		PromotedAccessListTitle: req.GetPromotedAccessListTitle(),
+		AssumeStartTime:         getProtoTimestamp(req.GetAssumeStartTime()),
+		MaxDuration:             timestamppb.New(req.GetMaxDuration()),
+		RequestTtl:              timestamppb.New(req.Expiry()),
+		SessionTtl:              timestamppb.New(req.GetSessionTLL()),
 	}
 }
 

lib/teleterm/apiserver/handler/time_converter.go

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2024 Gravitational, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package handler
+
+import (
+	"time"
+
+	"google.golang.org/protobuf/types/known/timestamppb"
+)
+
+func getProtoTimestamp(time *time.Time) *timestamppb.Timestamp {
+	var protoTime *timestamppb.Timestamp
+
+	if time != nil {
+		protoTime = timestamppb.New(*time)
+	}
+
+	return protoTime
+}

lib/teleterm/apiserver/handler/time_converter_test.go

@@ -0,0 +1,34 @@
+/**
+ * Copyright 2024 Gravitational, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package handler
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+	"google.golang.org/protobuf/types/known/timestamppb"
+)
+
+func TestGetProtoTimestamp(t *testing.T) {
+	ts := getProtoTimestamp(nil)
+	require.Empty(t, ts)
+
+	time := time.Now().UTC()
+	ts = getProtoTimestamp(&time)
+	require.Equal(t, timestamppb.New(time), ts)
+}