Add retry with relogin to change target port

gravitational · Jan 13, 2025 · 41b1f2e · 41b1f2e
1 parent 1dd43af
commit 41b1f2e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 13 deletions.
diff --git a/lib/teleterm/daemon/daemon.go b/lib/teleterm/daemon/daemon.go
@@ -528,8 +528,12 @@ func (s *Service) SetGatewayTargetSubresourceName(ctx context.Context, gatewayUR
 			return nil, trace.Wrap(err)
 		}
 
-		app, err := clusters.GetApp(ctx, clusterClient.CurrentCluster(), targetURI.GetAppName())
-		if err != nil {
+		var app types.Application
+		if err := clusters.AddMetadataToRetryableError(ctx, func() error {
+			var err error
+			app, err = clusters.GetApp(ctx, clusterClient.CurrentCluster(), targetURI.GetAppName())
+			return trace.Wrap(err)
+		}); err != nil {
 			return nil, trace.Wrap(err)
 		}
 

diff --git a/web/packages/teleterm/src/ui/DocumentGateway/useGateway.ts b/web/packages/teleterm/src/ui/DocumentGateway/useGateway.ts
@@ -100,18 +100,26 @@ export function useGateway(doc: DocumentGateway) {
   const [changeTargetSubresourceNameAttempt, changeTargetSubresourceName] =
     useAsync(
       useCallback(
-        async (name: string) => {
-          const updatedGateway =
-            await clustersService.setGatewayTargetSubresourceName(
-              doc.gatewayUri,
-              name
-            );
+        (name: string) =>
+          retryWithRelogin(ctx, doc.targetUri, async () => {
+            const updatedGateway =
+              await clustersService.setGatewayTargetSubresourceName(
+                doc.gatewayUri,
+                name
+              );
 
-          documentsService.update(doc.uri, {
-            targetSubresourceName: updatedGateway.targetSubresourceName,
-          });
-        },
-        [clustersService, documentsService, doc.uri, doc.gatewayUri]
+            documentsService.update(doc.uri, {
+              targetSubresourceName: updatedGateway.targetSubresourceName,
+            });
+          }),
+        [
+          clustersService,
+          documentsService,
+          doc.uri,
+          doc.gatewayUri,
+          ctx,
+          doc.targetUri,
+        ]
       )
     );