Don't show background item notification when launch daemon is not sup…

…ported
gravitational · Aug 1, 2024 · 51caae9 · 51caae9
1 parent 15187ea
commit 51caae9
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 39 deletions.
diff --git a/gen/proto/go/teleport/lib/teleterm/vnet/v1/vnet_service.pb.go b/gen/proto/go/teleport/lib/teleterm/vnet/v1/vnet_service.pb.go
diff --git a/gen/proto/ts/teleport/lib/teleterm/vnet/v1/vnet_service_pb.ts b/gen/proto/ts/teleport/lib/teleterm/vnet/v1/vnet_service_pb.ts
diff --git a/lib/teleterm/vnet/service_daemon_darwin.go b/lib/teleterm/vnet/service_daemon_darwin.go
@@ -49,6 +49,8 @@ func backgroundItemStatusFromServiceStatus(status vnetdaemon.ServiceStatus) api.
 		return api.BackgroundItemStatus_BACKGROUND_ITEM_STATUS_REQUIRES_APPROVAL
 	case vnetdaemon.ServiceStatusNotFound:
 		return api.BackgroundItemStatus_BACKGROUND_ITEM_STATUS_NOT_FOUND
+	case vnetdaemon.ServiceStatusNotSupported:
+		return api.BackgroundItemStatus_BACKGROUND_ITEM_STATUS_NOT_SUPPORTED
 	default:
 		return api.BackgroundItemStatus_BACKGROUND_ITEM_STATUS_UNSPECIFIED
 	}

diff --git a/lib/vnet/daemon/client_darwin.go b/lib/vnet/daemon/client_darwin.go
@@ -200,6 +200,8 @@ const (
 	ServiceStatusEnabled          ServiceStatus = 1
 	ServiceStatusRequiresApproval ServiceStatus = 2
 	ServiceStatusNotFound         ServiceStatus = 3
+	// ServiceStatusNotSupported is returned by us when macOS version is < 13.0.
+	ServiceStatusNotSupported ServiceStatus = -1
 )
 
 func (s ServiceStatus) String() string {
@@ -212,6 +214,8 @@ func (s ServiceStatus) String() string {
 		return "requires approval"
 	case ServiceStatusNotFound:
 		return "not found"
+	case ServiceStatusNotSupported:
+		return "not supported"
 	default:
 		return strconv.Itoa(int(s))
 	}

diff --git a/proto/teleport/lib/teleterm/vnet/v1/vnet_service.proto b/proto/teleport/lib/teleterm/vnet/v1/vnet_service.proto
@@ -80,4 +80,5 @@ enum BackgroundItemStatus {
   BACKGROUND_ITEM_STATUS_ENABLED = 2;
   BACKGROUND_ITEM_STATUS_REQUIRES_APPROVAL = 3;
   BACKGROUND_ITEM_STATUS_NOT_FOUND = 4;
+  BACKGROUND_ITEM_STATUS_NOT_SUPPORTED = 5;
 }
diff --git a/web/packages/teleterm/src/ui/Vnet/vnetContext.tsx b/web/packages/teleterm/src/ui/Vnet/vnetContext.tsx
@@ -207,7 +207,11 @@ const notifyAboutDaemonBackgroundItem = async (ctx: IAppContext) => {
     throw error;
   }
 
-  if (backgroundItemStatus === BackgroundItemStatus.ENABLED) {
+  if (
+    backgroundItemStatus === BackgroundItemStatus.ENABLED ||
+    backgroundItemStatus === BackgroundItemStatus.NOT_SUPPORTED ||
+    backgroundItemStatus === BackgroundItemStatus.UNSPECIFIED
+  ) {
     return;
   }