MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-03-10 22:21:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(sandbox): propagate GOOGLE_GEMINI_BASE_URL&GOOGLE_VERTEX_BASE_URL env vars (#18231)

Browse Source
This commit is contained in:
Shreya Keshive
2026-02-03 16:40:41 -05:00
committed by GitHub
parent 69f8273481
commit 7a6dfa3704
2 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
packages/cli/src/utils/sandbox.test.ts
View File

@@ -374,6 +374,53 @@ describe('sandbox', () => {
);
});
it('should pass through GOOGLE_GEMINI_BASE_URL and GOOGLE_VERTEX_BASE_URL', async () => {
const config: SandboxConfig = {
command: 'docker',
image: 'gemini-cli-sandbox',
};
process.env['GOOGLE_GEMINI_BASE_URL'] = 'http://gemini.proxy';
process.env['GOOGLE_VERTEX_BASE_URL'] = 'http://vertex.proxy';
// Mock image check to return true
interface MockProcessWithStdout extends EventEmitter {
stdout: EventEmitter;
}
const mockImageCheckProcess = new EventEmitter() as MockProcessWithStdout;
mockImageCheckProcess.stdout = new EventEmitter();
vi.mocked(spawn).mockImplementationOnce(() => {
setTimeout(() => {
mockImageCheckProcess.stdout.emit('data', Buffer.from('image-id'));
mockImageCheckProcess.emit('close', 0);
}, 1);
return mockImageCheckProcess as unknown as ReturnType<typeof spawn>;
});
const mockSpawnProcess = new EventEmitter() as unknown as ReturnType<
typeof spawn
>;
mockSpawnProcess.on = vi.fn().mockImplementation((event, cb) => {
if (event === 'close') {
setTimeout(() => cb(0), 10);
}
return mockSpawnProcess;
});
vi.mocked(spawn).mockImplementationOnce(() => mockSpawnProcess);
await start_sandbox(config);
expect(spawn).toHaveBeenCalledWith(
'docker',
expect.arrayContaining([
'--env',
'GOOGLE_GEMINI_BASE_URL=http://gemini.proxy',
'--env',
'GOOGLE_VERTEX_BASE_URL=http://vertex.proxy',
]),
expect.any(Object),
);
});
it('should handle user creation on Linux if needed', async () => {
const config: SandboxConfig = {
command: 'docker',

14
packages/cli/src/utils/sandbox.ts
View File

@@ -460,6 +460,20 @@ export async function start_sandbox(
args.push('--env', `GOOGLE_API_KEY=${process.env['GOOGLE_API_KEY']}`);
}
// copy GOOGLE_GEMINI_BASE_URL and GOOGLE_VERTEX_BASE_URL
if (process.env['GOOGLE_GEMINI_BASE_URL']) {
args.push(
'--env',
`GOOGLE_GEMINI_BASE_URL=${process.env['GOOGLE_GEMINI_BASE_URL']}`,
);
}
if (process.env['GOOGLE_VERTEX_BASE_URL']) {
args.push(
'--env',
`GOOGLE_VERTEX_BASE_URL=${process.env['GOOGLE_VERTEX_BASE_URL']}`,
);
}
// copy GOOGLE_GENAI_USE_VERTEXAI
if (process.env['GOOGLE_GENAI_USE_VERTEXAI']) {
args.push(