From 51ca3a6cd78ab05ea03641549b3c6c21fa976584 Mon Sep 17 00:00:00 2001 From: Lorenzo Blasa Date: Thu, 10 Nov 2022 12:40:27 -0800 Subject: [PATCH] Expose env via flipperLib Summary: This change exposes the env variables via the FlipperLib interface used by plugins. The variables are already white-listed and safe to be used by plugins according to documentation. Reviewed By: antonk52 Differential Revision: D40852147 fbshipit-source-id: bbb3b052d33bf5cf75c81166af2400fe6a359256 --- .../src/flipperLibImplementation/index.tsx | 1 + desktop/flipper-plugin-core/src/plugin/FlipperLib.tsx | 2 ++ desktop/flipper-plugin-core/src/test-utils/test-utils.tsx | 1 + 3 files changed, 4 insertions(+) diff --git a/desktop/flipper-frontend-core/src/flipperLibImplementation/index.tsx b/desktop/flipper-frontend-core/src/flipperLibImplementation/index.tsx index 3233bcb62..96f052e2f 100644 --- a/desktop/flipper-frontend-core/src/flipperLibImplementation/index.tsx +++ b/desktop/flipper-frontend-core/src/flipperLibImplementation/index.tsx @@ -45,6 +45,7 @@ export function baseFlipperLibImplementation( }, environmentInfo: { os: renderHost.serverConfig.environmentInfo.os, + env: renderHost.serverConfig.env, }, intern: { graphGet: (...args) => diff --git a/desktop/flipper-plugin-core/src/plugin/FlipperLib.tsx b/desktop/flipper-plugin-core/src/plugin/FlipperLib.tsx index 3ce8c70a2..393c0fe88 100644 --- a/desktop/flipper-plugin-core/src/plugin/FlipperLib.tsx +++ b/desktop/flipper-plugin-core/src/plugin/FlipperLib.tsx @@ -26,6 +26,7 @@ import { EnvironmentInfo, FSStatsLike, FlipperServerCommands, + ENVIRONMENT_VARIABLES, } from 'flipper-common'; import {CreatePasteArgs, CreatePasteResult} from './Paste'; @@ -199,6 +200,7 @@ export interface FlipperLib { }; environmentInfo: { os: EnvironmentInfo['os']; + env: Partial>; }; remoteServerContext: RemoteServerContext; intern: InternAPI; diff --git a/desktop/flipper-plugin-core/src/test-utils/test-utils.tsx b/desktop/flipper-plugin-core/src/test-utils/test-utils.tsx index a33195c5c..70266e7a2 100644 --- a/desktop/flipper-plugin-core/src/test-utils/test-utils.tsx +++ b/desktop/flipper-plugin-core/src/test-utils/test-utils.tsx @@ -74,6 +74,7 @@ export function createMockFlipperLib(options?: StartPluginOptions): FlipperLib { unixname: 'test', platform: 'linux', }, + env: {}, }, intern: { graphGet: createStubFunction(),