From 15187eaa8e3b8bd8012067f7efbbce5c651fd3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Cie=C5=9Blak?= Date: Wed, 31 Jul 2024 17:13:58 +0200 Subject: [PATCH] Remove feature flag --- lib/teleterm/vnet/service_daemon_darwin.go | 6 ------ lib/vnet/setup_daemon_darwin.go | 10 +--------- web/packages/teleterm/src/mainProcess/mainProcess.ts | 3 --- .../teleterm/src/services/config/appConfigSchema.ts | 4 ---- 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/lib/teleterm/vnet/service_daemon_darwin.go b/lib/teleterm/vnet/service_daemon_darwin.go index 67b55d15b8b4..8b7dd5a2aa75 100644 --- a/lib/teleterm/vnet/service_daemon_darwin.go +++ b/lib/teleterm/vnet/service_daemon_darwin.go @@ -21,20 +21,14 @@ package vnet import ( "context" - "os" "github.com/gravitational/trace" api "github.com/gravitational/teleport/gen/proto/go/teleport/lib/teleterm/vnet/v1" - "github.com/gravitational/teleport/lib/vnet" vnetdaemon "github.com/gravitational/teleport/lib/vnet/daemon" ) func (s *Service) GetBackgroundItemStatus(ctx context.Context, req *api.GetBackgroundItemStatusRequest) (*api.GetBackgroundItemStatusResponse, error) { - if os.Getenv(vnet.EnvFeatureFlag) != "yes" { - return nil, trace.NotImplemented("tsh was built with VNet daemon support, but the feature flag is not enabled") - } - status, err := vnetdaemon.DaemonStatus() if err != nil { return nil, trace.Wrap(err) diff --git a/lib/vnet/setup_daemon_darwin.go b/lib/vnet/setup_daemon_darwin.go index b777dfbd674f..dd6676b02b85 100644 --- a/lib/vnet/setup_daemon_darwin.go +++ b/lib/vnet/setup_daemon_darwin.go @@ -21,22 +21,14 @@ package vnet import ( "context" - "os" "github.com/gravitational/trace" "github.com/gravitational/teleport/lib/vnet/daemon" ) -const EnvFeatureFlag = "VNETDAEMON" - func execAdminProcess(ctx context.Context, config daemon.Config) error { - // TODO(ravicious): Remove the feature env var after the daemon gets implemented. - if os.Getenv(EnvFeatureFlag) == "yes" { - return trace.Wrap(daemon.RegisterAndCall(ctx, config)) - } - - return trace.Wrap(execAdminSubcommand(ctx, config)) + return trace.Wrap(daemon.RegisterAndCall(ctx, config)) } func DaemonSubcommand(ctx context.Context) error { diff --git a/web/packages/teleterm/src/mainProcess/mainProcess.ts b/web/packages/teleterm/src/mainProcess/mainProcess.ts index 813658ae2411..58cf66059aee 100644 --- a/web/packages/teleterm/src/mainProcess/mainProcess.ts +++ b/web/packages/teleterm/src/mainProcess/mainProcess.ts @@ -188,9 +188,6 @@ export default class MainProcess { env: { ...process.env, TELEPORT_HOME: homeDir, - VNETDAEMON: this.configService.get('feature.vnetDaemon').value - ? 'yes' - : undefined, }, } ); diff --git a/web/packages/teleterm/src/services/config/appConfigSchema.ts b/web/packages/teleterm/src/services/config/appConfigSchema.ts index bc8713886aa5..453198daca3a 100644 --- a/web/packages/teleterm/src/services/config/appConfigSchema.ts +++ b/web/packages/teleterm/src/services/config/appConfigSchema.ts @@ -131,10 +131,6 @@ export const createAppConfigSchema = (platform: Platform) => { .boolean() .default(false) .describe('Disables SSH connection resumption.'), - 'feature.vnetDaemon': z - .boolean() - .default(false) - .describe('Use daemon instead of osascript for VNet'), }); };