feat(extension): resolve environment variables in extension configuration (#7213)

Co-authored-by: Tommaso Sciortino <sciortino@gmail.com> Co-authored-by: Jacob Richman <jacob314@gmail.com>
2026-04-21 10:34:35 -07:00 · 2025-08-29 19:53:39 +02:00
parent 3529595e6c
commit ea844857a2
5 changed files with 509 additions and 43 deletions
@@ -216,6 +216,100 @@ describe('loadExtensions', () => {
    );
    expect(loadedConfig.mcpServers?.['test-server'].cwd).toBe(expectedCwd);
  });
+
+  it('should resolve environment variables in extension configuration', () => {
+    process.env.TEST_API_KEY = 'test-api-key-123';
+    process.env.TEST_DB_URL = 'postgresql://localhost:5432/testdb';
+
+    try {
+      const workspaceExtensionsDir = path.join(
+        tempWorkspaceDir,
+        EXTENSIONS_DIRECTORY_NAME,
+      );
+      fs.mkdirSync(workspaceExtensionsDir, { recursive: true });
+
+      const extDir = path.join(workspaceExtensionsDir, 'test-extension');
+      fs.mkdirSync(extDir);
+
+      // Write config to a separate file for clarity and good practices
+      const configPath = path.join(extDir, EXTENSIONS_CONFIG_FILENAME);
+      const extensionConfig = {
+        name: 'test-extension',
+        version: '1.0.0',
+        mcpServers: {
+          'test-server': {
+            command: 'node',
+            args: ['server.js'],
+            env: {
+              API_KEY: '$TEST_API_KEY',
+              DATABASE_URL: '${TEST_DB_URL}',
+              STATIC_VALUE: 'no-substitution',
+            },
+          },
+        },
+      };
+      fs.writeFileSync(configPath, JSON.stringify(extensionConfig));
+
+      const extensions = loadExtensions(tempWorkspaceDir);
+
+      expect(extensions).toHaveLength(1);
+      const extension = extensions[0];
+      expect(extension.config.name).toBe('test-extension');
+      expect(extension.config.mcpServers).toBeDefined();
+
+      const serverConfig = extension.config.mcpServers?.['test-server'];
+      expect(serverConfig).toBeDefined();
+      expect(serverConfig?.env).toBeDefined();
+      expect(serverConfig?.env?.API_KEY).toBe('test-api-key-123');
+      expect(serverConfig?.env?.DATABASE_URL).toBe(
+        'postgresql://localhost:5432/testdb',
+      );
+      expect(serverConfig?.env?.STATIC_VALUE).toBe('no-substitution');
+    } finally {
+      delete process.env.TEST_API_KEY;
+      delete process.env.TEST_DB_URL;
+    }
+  });
+
+  it('should handle missing environment variables gracefully', () => {
+    const workspaceExtensionsDir = path.join(
+      tempWorkspaceDir,
+      EXTENSIONS_DIRECTORY_NAME,
+    );
+    fs.mkdirSync(workspaceExtensionsDir, { recursive: true });
+
+    const extDir = path.join(workspaceExtensionsDir, 'test-extension');
+    fs.mkdirSync(extDir);
+
+    const extensionConfig = {
+      name: 'test-extension',
+      version: '1.0.0',
+      mcpServers: {
+        'test-server': {
+          command: 'node',
+          args: ['server.js'],
+          env: {
+            MISSING_VAR: '$UNDEFINED_ENV_VAR',
+            MISSING_VAR_BRACES: '${ALSO_UNDEFINED}',
+          },
+        },
+      },
+    };
+
+    fs.writeFileSync(
+      path.join(extDir, EXTENSIONS_CONFIG_FILENAME),
+      JSON.stringify(extensionConfig),
+    );
+
+    const extensions = loadExtensions(tempWorkspaceDir);
+
+    expect(extensions).toHaveLength(1);
+    const extension = extensions[0];
+    const serverConfig = extension.config.mcpServers!['test-server'];
+    expect(serverConfig.env).toBeDefined();
+    expect(serverConfig.env!.MISSING_VAR).toBe('$UNDEFINED_ENV_VAR');
+    expect(serverConfig.env!.MISSING_VAR_BRACES).toBe('${ALSO_UNDEFINED}');
+  });
 });

 describe('annotateActiveExtensions', () => {